From 107e9515b35544cb8e4ac66838b9a37f95cdfa89 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Tue, 11 Jul 2017 11:23:38 -0400
Subject: [PATCH] Update to iD v2.3.1

---
 vendor/assets/iD/iD.js                 |  125 +-
 vendor/assets/iD/iD/locales/ar.json    |   24 +-
 vendor/assets/iD/iD/locales/es.json    |   57 +-
 vendor/assets/iD/iD/locales/gl.json    | 2101 ++++++++----------------
 vendor/assets/iD/iD/locales/hu.json    |   57 +-
 vendor/assets/iD/iD/locales/pl.json    |  287 ++--
 vendor/assets/iD/iD/locales/sv.json    |   26 +-
 vendor/assets/iD/iD/locales/uk.json    |   58 +-
 vendor/assets/iD/iD/locales/vi.json    |  107 +-
 vendor/assets/iD/iD/locales/zh-CN.json |   62 +-
 10 files changed, 1318 insertions(+), 1586 deletions(-)

diff --git a/vendor/assets/iD/iD.js b/vendor/assets/iD/iD.js
index 49c018691..3c0935a3d 100644
--- a/vendor/assets/iD/iD.js
+++ b/vendor/assets/iD/iD.js
@@ -18606,7 +18606,7 @@ var dataLocales = {"af":{"rtl":false},"ar":{"rtl":true},"ar-AA":{"rtl":true},"as
 
 var dataPhoneFormats = {"us":"+1-202-555-1234","ca":"+1-226-555-1234","bs":"+1-242-555-1234","bb":"+1-246-555-1234","ai":"+1-264-555-1234","ag":"+1-268-555-1234","vg":"+1-284-555-1234","vi":"+1-340-555-1234","ky":"+1-345-555-1234","bm":"+1-441-555-1234","gd":"+1-473-555-1234","tc":"+1-649-555-1234","ms":"+1-664-555-1234","mp":"+1-670-555-1234","gu":"+1-671-555-1234","as":"+1-684-555-1234","sx":"+1-721-555-1234","lc":"+1-758-555-1234","dm":"+1-767-555-1234","vc":"+1-784-555-1234","pr":"+1-787-555-1234","do":"+1-809-555-1234","tt":"+1-868-555-1234","kn":"+1-869-555-1234","jm":"+1-876-555-1234","za":"+27 11 907 1111","nl":"+31 42 123 4567","fr":"+33 1 23 45 67 89","es":"+34 989 12 34 56","pt":"+351 211 123456","ie":"+353 20 912 3456","fi":"+358 40 123 4567","hu":"+36 1 123 45 67","hr":"+385 01 123 4567","si":"+386 31 123 4567","it":"+39 01 123 456","va":"+39 01 123 456","gb":"+44 1632 961234","gg":"+44 1632 961234","im":"+44 1632 961234","je":"+44 1632 961234","se":"+46 31 123 4567","no":"+47 22 12 34 56","sj":"+47 22 12 34 56","pl":"+48 42 123 4567","de":"+49 89 1234567","br":"+55 11 0982 1098","ru":"+7 495 1234567","kz":"+7 495 1234567","vn":"+84 1 234 5678","hk":"+852 1234 5678","cn":"+86 10 12345678","tw":"+886 1 2345 6789","tr":"+90 312 123 4567","ua":"+380 44 123 4567"};
 
-var dataShortcuts = [{"tab":"browsing","text":"shortcuts.browsing.title","columns":[{"rows":[{"section":"navigation","text":"shortcuts.browsing.navigation.title"},{"shortcuts":["↓","↑","←","→"],"text":"shortcuts.browsing.navigation.pan","separator":","},{"modifiers":["⌘"],"shortcuts":["↓","↑","←","→"],"text":"shortcuts.browsing.navigation.pan_more","separator":","},{"shortcuts":["+","-"],"text":"shortcuts.browsing.navigation.zoom","separator":","},{"modifiers":["⌘"],"shortcuts":["+","-"],"text":"shortcuts.browsing.navigation.zoom_more","separator":","},{"section":"help","text":"shortcuts.browsing.help.title"},{"shortcuts":["help.key"],"text":"shortcuts.browsing.help.help"},{"shortcuts":["shortcuts.toggle.key"],"text":"shortcuts.browsing.help.keyboard"},{"section":"display_options","text":"shortcuts.browsing.display_options.title"},{"shortcuts":["background.key"],"text":"shortcuts.browsing.display_options.background"},{"modifiers":["⌘"],"shortcuts":["background.key"],"text":"shortcuts.browsing.display_options.background_switch"},{"shortcuts":["map_data.key"],"text":"shortcuts.browsing.display_options.map_data"},{"modifiers":["⌃","⌘"],"shortcuts":["F","F11"],"text":"shortcuts.browsing.display_options.fullscreen"},{"shortcuts":["area_fill.wireframe.key"],"text":"shortcuts.browsing.display_options.wireframe"},{"shortcuts":["background.minimap.key"],"text":"shortcuts.browsing.display_options.minimap"}]},{"rows":[{"section":"selecting","text":"shortcuts.browsing.selecting.title"},{"shortcuts":["Left-click"],"text":"shortcuts.browsing.selecting.select_one"},{"modifiers":["⇧"],"shortcuts":["Left-click"],"text":"shortcuts.browsing.selecting.select_multi"},{"modifiers":["⇧"],"shortcuts":["Left-click"],"gesture":"shortcuts.gesture.drag","text":"shortcuts.browsing.selecting.lasso"},{"shortcuts":[],"text":""},{"section":"with_selected","text":"shortcuts.browsing.with_selected.title"},{"shortcuts":["Right-click","shortcuts.key.space"],"text":"shortcuts.browsing.with_selected.edit_menu"},{"shortcuts":[],"text":""},{"section":"vertex_selected","text":"shortcuts.browsing.vertex_selected.title"},{"shortcuts":["[","↖"],"text":"shortcuts.browsing.vertex_selected.previous"},{"shortcuts":["]","↘"],"text":"shortcuts.browsing.vertex_selected.next"},{"shortcuts":["{","⇞"],"text":"shortcuts.browsing.vertex_selected.first"},{"shortcuts":["}","⇟"],"text":"shortcuts.browsing.vertex_selected.last"},{"shortcuts":["\\","shortcuts.key.pause"],"text":"shortcuts.browsing.vertex_selected.change_parent"}]}]},{"tab":"editing","text":"shortcuts.editing.title","columns":[{"rows":[{"section":"drawing","text":"shortcuts.editing.drawing.title"},{"shortcuts":["1"],"text":"shortcuts.editing.drawing.add_point"},{"shortcuts":["2"],"text":"shortcuts.editing.drawing.add_line"},{"shortcuts":["3"],"text":"shortcuts.editing.drawing.add_area"},{"shortcuts":["shortcuts.key.space"],"text":"shortcuts.editing.drawing.place_point"},{"shortcuts":["⌥"],"text":"shortcuts.editing.drawing.disable_snap"},{"shortcuts":["↵","⎋"],"text":"shortcuts.editing.drawing.stop_line"},{"section":"commands","text":"shortcuts.editing.commands.title"},{"modifiers":["⌘"],"shortcuts":["C"],"text":"shortcuts.editing.commands.copy"},{"modifiers":["⌘"],"shortcuts":["V"],"text":"shortcuts.editing.commands.paste"},{"modifiers":["⌘"],"shortcuts":["Z"],"text":"shortcuts.editing.commands.undo"},{"modifiers":["⌘","⇧"],"shortcuts":["Z"],"text":"shortcuts.editing.commands.redo"},{"modifiers":["⌘"],"shortcuts":["S"],"text":"shortcuts.editing.commands.save"}]},{"rows":[{"section":"operations","text":"shortcuts.editing.operations.title"},{"shortcuts":["operations.continue.key"],"text":"shortcuts.editing.operations.continue_line"},{"shortcuts":["operations.merge.key"],"text":"shortcuts.editing.operations.merge"},{"shortcuts":["operations.disconnect.key"],"text":"shortcuts.editing.operations.disconnect"},{"shortcuts":["operations.split.key"],"text":"shortcuts.editing.operations.split"},{"shortcuts":["operations.reverse.key"],"text":"shortcuts.editing.operations.reverse"},{"shortcuts":["operations.move.key"],"text":"shortcuts.editing.operations.move"},{"shortcuts":["operations.rotate.key"],"text":"shortcuts.editing.operations.rotate"},{"shortcuts":["operations.orthogonalize.key"],"text":"shortcuts.editing.operations.orthogonalize"},{"shortcuts":["operations.circularize.key"],"text":"shortcuts.editing.operations.circularize"},{"shortcuts":["operations.reflect.key.long"],"text":"shortcuts.editing.operations.reflect_long"},{"shortcuts":["operations.reflect.key.short"],"text":"shortcuts.editing.operations.reflect_short"},{"modifiers":["⌘"],"shortcuts":["⌫"],"text":"shortcuts.editing.operations.delete"}]}]},{"tab":"tools","text":"shortcuts.tools.title","columns":[{"rows":[{"section":"info","text":"shortcuts.tools.info.title"},{"modifiers":["⌘"],"shortcuts":["info_panels.key"],"text":"shortcuts.tools.info.all"},{"modifiers":["⌘","⇧"],"shortcuts":["info_panels.background.key"],"text":"shortcuts.tools.info.background"},{"modifiers":["⌘","⇧"],"shortcuts":["info_panels.history.key"],"text":"shortcuts.tools.info.history"},{"modifiers":["⌘","⇧"],"shortcuts":["info_panels.location.key"],"text":"shortcuts.tools.info.location"},{"modifiers":["⌘","⇧"],"shortcuts":["info_panels.measurement.key"],"text":"shortcuts.tools.info.measurement"}]}]}];
+var dataShortcuts = [{"tab":"browsing","text":"shortcuts.browsing.title","columns":[{"rows":[{"section":"navigation","text":"shortcuts.browsing.navigation.title"},{"shortcuts":["↓","↑","←","→"],"text":"shortcuts.browsing.navigation.pan","separator":","},{"modifiers":["⌘"],"shortcuts":["↓","↑","←","→"],"text":"shortcuts.browsing.navigation.pan_more","separator":","},{"shortcuts":["+","-"],"text":"shortcuts.browsing.navigation.zoom","separator":","},{"modifiers":["⌘"],"shortcuts":["+","-"],"text":"shortcuts.browsing.navigation.zoom_more","separator":","},{"section":"help","text":"shortcuts.browsing.help.title"},{"shortcuts":["help.key"],"text":"shortcuts.browsing.help.help"},{"shortcuts":["shortcuts.toggle.key"],"text":"shortcuts.browsing.help.keyboard"},{"section":"display_options","text":"shortcuts.browsing.display_options.title"},{"shortcuts":["background.key"],"text":"shortcuts.browsing.display_options.background"},{"modifiers":["⌘"],"shortcuts":["background.key"],"text":"shortcuts.browsing.display_options.background_switch"},{"shortcuts":["map_data.key"],"text":"shortcuts.browsing.display_options.map_data"},{"modifiers":["⌃","⌘"],"shortcuts":["F","F11"],"text":"shortcuts.browsing.display_options.fullscreen"},{"shortcuts":["area_fill.wireframe.key"],"text":"shortcuts.browsing.display_options.wireframe"},{"shortcuts":["background.minimap.key"],"text":"shortcuts.browsing.display_options.minimap"}]},{"rows":[{"section":"selecting","text":"shortcuts.browsing.selecting.title"},{"shortcuts":["Left-click"],"text":"shortcuts.browsing.selecting.select_one"},{"modifiers":["⇧"],"shortcuts":["Left-click"],"text":"shortcuts.browsing.selecting.select_multi"},{"modifiers":["⇧"],"shortcuts":["Left-click"],"gesture":"shortcuts.gesture.drag","text":"shortcuts.browsing.selecting.lasso"},{"shortcuts":[],"text":""},{"section":"with_selected","text":"shortcuts.browsing.with_selected.title"},{"shortcuts":["Right-click","shortcuts.key.space"],"text":"shortcuts.browsing.with_selected.edit_menu"},{"shortcuts":[],"text":""},{"section":"vertex_selected","text":"shortcuts.browsing.vertex_selected.title"},{"shortcuts":["[","↖"],"text":"shortcuts.browsing.vertex_selected.previous"},{"shortcuts":["]","↘"],"text":"shortcuts.browsing.vertex_selected.next"},{"shortcuts":["{","⇞"],"text":"shortcuts.browsing.vertex_selected.first"},{"shortcuts":["}","⇟"],"text":"shortcuts.browsing.vertex_selected.last"},{"shortcuts":["\\","shortcuts.key.pause"],"text":"shortcuts.browsing.vertex_selected.change_parent"}]}]},{"tab":"editing","text":"shortcuts.editing.title","columns":[{"rows":[{"section":"drawing","text":"shortcuts.editing.drawing.title"},{"shortcuts":["1"],"text":"shortcuts.editing.drawing.add_point"},{"shortcuts":["2"],"text":"shortcuts.editing.drawing.add_line"},{"shortcuts":["3"],"text":"shortcuts.editing.drawing.add_area"},{"shortcuts":["Left-click","shortcuts.key.space"],"text":"shortcuts.editing.drawing.place_point"},{"shortcuts":["⌥"],"text":"shortcuts.editing.drawing.disable_snap"},{"shortcuts":["↵","⎋"],"text":"shortcuts.editing.drawing.stop_line"},{"section":"commands","text":"shortcuts.editing.commands.title"},{"modifiers":["⌘"],"shortcuts":["C"],"text":"shortcuts.editing.commands.copy"},{"modifiers":["⌘"],"shortcuts":["V"],"text":"shortcuts.editing.commands.paste"},{"modifiers":["⌘"],"shortcuts":["Z"],"text":"shortcuts.editing.commands.undo"},{"modifiers":["⌘","⇧"],"shortcuts":["Z"],"text":"shortcuts.editing.commands.redo"},{"modifiers":["⌘"],"shortcuts":["S"],"text":"shortcuts.editing.commands.save"}]},{"rows":[{"section":"operations","text":"shortcuts.editing.operations.title"},{"shortcuts":["operations.continue.key"],"text":"shortcuts.editing.operations.continue_line"},{"shortcuts":["operations.merge.key"],"text":"shortcuts.editing.operations.merge"},{"shortcuts":["operations.disconnect.key"],"text":"shortcuts.editing.operations.disconnect"},{"shortcuts":["operations.split.key"],"text":"shortcuts.editing.operations.split"},{"shortcuts":["operations.reverse.key"],"text":"shortcuts.editing.operations.reverse"},{"shortcuts":["operations.move.key"],"text":"shortcuts.editing.operations.move"},{"shortcuts":["operations.rotate.key"],"text":"shortcuts.editing.operations.rotate"},{"shortcuts":["operations.orthogonalize.key"],"text":"shortcuts.editing.operations.orthogonalize"},{"shortcuts":["operations.circularize.key"],"text":"shortcuts.editing.operations.circularize"},{"shortcuts":["operations.reflect.key.long"],"text":"shortcuts.editing.operations.reflect_long"},{"shortcuts":["operations.reflect.key.short"],"text":"shortcuts.editing.operations.reflect_short"},{"modifiers":["⌘"],"shortcuts":["⌫"],"text":"shortcuts.editing.operations.delete"}]}]},{"tab":"tools","text":"shortcuts.tools.title","columns":[{"rows":[{"section":"info","text":"shortcuts.tools.info.title"},{"modifiers":["⌘"],"shortcuts":["info_panels.key"],"text":"shortcuts.tools.info.all"},{"modifiers":["⌘","⇧"],"shortcuts":["info_panels.background.key"],"text":"shortcuts.tools.info.background"},{"modifiers":["⌘","⇧"],"shortcuts":["info_panels.history.key"],"text":"shortcuts.tools.info.history"},{"modifiers":["⌘","⇧"],"shortcuts":["info_panels.location.key"],"text":"shortcuts.tools.info.location"},{"modifiers":["⌘","⇧"],"shortcuts":["info_panels.measurement.key"],"text":"shortcuts.tools.info.measurement"}]}]}];
 
 var type = "FeatureCollection";
 var features = [{"type":"Feature","properties":{},"geometry":{"type":"Polygon","coordinates":[[[1.97754,51.13111],[1.8457,63.45051],[-10.45898,57.01681],[-6.82251,55.26503],[-7.25583,55.06525],[-7.26546,55.0665],[-7.26992,55.06419],[-7.2725,55.06346],[-7.27818,55.05362],[-7.2893,55.04735],[-7.29939,55.0561],[-7.31835,55.04475],[-7.3447,55.05079],[-7.38831,55.02389],[-7.40547,55.00292],[-7.39157,54.99507],[-7.40075,54.98892],[-7.40706,54.98291],[-7.40363,54.97963],[-7.40633,54.97813],[-7.39835,54.97013],[-7.40745,54.96357],[-7.40178,54.95961],[-7.40727,54.95515],[-7.3944,54.94376],[-7.44444,54.93858],[-7.45216,54.89793],[-7.44204,54.87532],[-7.4713,54.83431],[-7.48092,54.83093],[-7.49216,54.82185],[-7.55121,54.79054],[-7.5443,54.78609],[-7.54958,54.75653],[-7.5349,54.74917],[-7.54881,54.74068],[-7.55941,54.74556],[-7.57894,54.74221],[-7.57507,54.7494],[-7.58606,54.75039],[-7.58872,54.74377],[-7.60031,54.74603],[-7.60632,54.74405],[-7.61662,54.74459],[-7.63593,54.75108],[-7.68854,54.72968],[-7.72064,54.72155],[-7.75094,54.70469],[-7.79094,54.71942],[-7.8051,54.71932],[-7.83497,54.73632],[-7.85419,54.72745],[-7.91496,54.67582],[-7.90174,54.66182],[-7.83832,54.63401],[-7.7433,54.6188],[-7.70863,54.63485],[-7.70682,54.6189],[-7.69386,54.6188],[-7.69631,54.61125],[-7.75845,54.59509],[-7.78708,54.58],[-7.79446,54.58141],[-7.79969,54.57704],[-7.79673,54.56915],[-7.8184,54.56315],[-7.83334,54.55227],[-7.82737,54.54299],[-7.85007,54.53363],[-7.90741,54.53722],[-7.93213,54.53388],[-8.00487,54.54568],[-8.03727,54.51162],[-8.04285,54.48759],[-8.08027,54.48829],[-8.09988,54.48395],[-8.09126,54.4765],[-8.111,54.47807],[-8.11512,54.46904],[-8.16542,54.46914],[-8.1776,54.46485],[-8.14293,54.45003],[-8.16284,54.4413],[-8.08731,54.4002],[-8.06062,54.37051],[-8.03289,54.35711],[-8.00054,54.34835],[-7.93333,54.30561],[-7.85849,54.29151],[-7.87067,54.28794],[-7.87265,54.26648],[-7.86123,54.25931],[-7.85917,54.21256],[-7.71043,54.20307],[-7.70193,54.20776],[-7.68828,54.202],[-7.67644,54.18906],[-7.66082,54.1871],[-7.62554,54.16545],[-7.62541,54.15319],[-7.61026,54.14353],[-7.57421,54.14142],[-7.57181,54.13287],[-7.56228,54.12704],[-7.51379,54.12998],[-7.47944,54.122],[-7.47169,54.12665],[-7.47075,54.13318],[-7.44684,54.15168],[-7.40792,54.156],[-7.42579,54.14092],[-7.41903,54.13629],[-7.3744,54.14172],[-7.37234,54.13881],[-7.39509,54.12624],[-7.39182,54.12017],[-7.36341,54.13157],[-7.34518,54.11577],[-7.32471,54.12123],[-7.32003,54.11379],[-7.3078,54.11718],[-7.30548,54.12347],[-7.31591,54.12697],[-7.31213,54.13162],[-7.3187,54.13411],[-7.31857,54.13745],[-7.32222,54.13836],[-7.32737,54.13544],[-7.3399,54.14585],[-7.30827,54.16716],[-7.30024,54.16625],[-7.29029,54.1715],[-7.28158,54.16839],[-7.2863,54.14919],[-7.29874,54.14904],[-7.30162,54.14411],[-7.28411,54.13971],[-7.29192,54.13071],[-7.29737,54.133],[-7.30883,54.13242],[-7.30333,54.12251],[-7.29218,54.11929],[-7.27844,54.12282],[-7.27707,54.12986],[-7.26613,54.13624],[-7.2566,54.16354],[-7.24015,54.17125],[-7.2575,54.17678],[-7.2581,54.19257],[-7.25179,54.19403],[-7.23608,54.1935],[-7.23338,54.19792],[-7.24317,54.20076],[-7.24892,54.1977],[-7.25183,54.20201],[-7.24119,54.20623],[-7.23094,54.20578],[-7.23269,54.20912],[-7.22188,54.21607],[-7.20643,54.2117],[-7.18506,54.22485],[-7.17055,54.21742],[-7.14721,54.22488],[-7.14633,54.23008],[-7.15051,54.23165],[-7.14613,54.23983],[-7.15802,54.24434],[-7.13985,54.25298],[-7.15255,54.26235],[-7.16064,54.27405],[-7.17991,54.27144],[-7.17201,54.28627],[-7.21252,54.2985],[-7.19888,54.31117],[-7.17918,54.30946],[-7.1812,54.3397],[-7.15339,54.33514],[-7.10253,54.35811],[-7.10811,54.36677],[-7.06927,54.3899],[-7.05593,54.41056],[-7.02898,54.42135],[-7.00198,54.40832],[-6.98683,54.40829],[-6.97562,54.40014],[-6.96774,54.40145],[-6.90682,54.36966],[-6.89772,54.35075],[-6.87527,54.33853],[-6.86512,54.32568],[-6.85163,54.29137],[-6.87452,54.28677],[-6.87791,54.27918],[-6.86673,54.27522],[-6.85177,54.26489],[-6.83693,54.26658],[-6.82165,54.24346],[-6.81633,54.22299],[-6.80045,54.22108],[-6.80122,54.21338],[-6.77599,54.19965],[-6.75573,54.1987],[-6.74316,54.18258],[-6.73406,54.18566],[-6.72445,54.18127],[-6.70295,54.20036],[-6.69166,54.20018],[-6.68673,54.19398],[-6.669,54.19584],[-6.65248,54.18102],[-6.6433,54.17801],[-6.63467,54.16449],[-6.63179,54.14766],[-6.64081,54.14238],[-6.63935,54.13599],[-6.66149,54.1205],[-6.6481,54.10153],[-6.66119,54.0934],[-6.66458,54.06629],[-6.64681,54.05873],[-6.62501,54.03737],[-6.59291,54.04755],[-6.58905,54.05808],[-6.5597,54.0481],[-6.52897,54.05888],[-6.50442,54.05566],[-6.47824,54.07004],[-6.47919,54.07762],[-6.43601,54.05959],[-6.36314,54.07057],[-6.36589,54.09338],[-6.36293,54.09758],[-6.37104,54.11497],[-6.3522,54.11084],[-6.34242,54.1114],[-6.33589,54.10833],[-6.33636,54.09469],[-6.31808,54.09096],[-6.30903,54.10463],[-6.29165,54.11235],[-6.28246,54.11145],[-6.26272,54.09786],[-5.35583,53.72597],[-7.0752,49.23912],[-1.83472,49.02346],[-2.12036,49.94415],[1.97754,51.13111]]]}},{"type":"Feature","properties":{},"geometry":{"type":"Polygon","coordinates":[[[-65.2,18.7],[-65,16.3],[-63.7,19.2],[-65.2,18.7]]]}},{"type":"Feature","properties":{},"geometry":{"type":"Polygon","coordinates":[[[-63,-50.5],[-55,-51],[-60,-54],[-63,-50.5]]]}},{"type":"Feature","properties":{},"geometry":{"type":"Polygon","coordinates":[[[-139.19952,60.08402],[-141,60.30621],[-141,76],[-169,68.63655],[-169,65.20147],[-180,61],[-180,-4],[-154,9],[-133.76404,54.54021],[-130.73868,54.71986],[-129.96277,55.29163],[-130.15228,55.7758],[-130.01787,55.90688],[-130.00362,56.00798],[-130.10284,56.12336],[-130.24498,56.09656],[-130.42625,56.14249],[-131.87439,56.79787],[-135.02884,59.56285],[-135.11759,59.62306],[-135.15827,59.6261],[-135.47928,59.79822],[-136.28677,59.57955],[-136.30531,59.46462],[-136.36836,59.44898],[-136.47697,59.46558],[-137.19727,59.01935],[-139.19952,60.08402]]]}},{"type":"Feature","properties":{},"geometry":{"type":"Polygon","coordinates":[[[-111.96064,48.99841],[-121.22623,49.00049],[-122.26513,49.00246],[-122.7565,49.00208],[-123.32218,49.00218],[-122.97821,48.76524],[-123.2666,48.69821],[-123.21991,48.21186],[-125.80444,48.60749],[-124.32129,31.54109],[-117.125,32.53429],[-116.82417,32.55996],[-115.88036,32.63735],[-115.49738,32.66486],[-114.71984,32.71877],[-114.7649,32.64602],[-114.80885,32.60959],[-114.81481,32.49451],[-112.81743,31.88004],[-111.07481,31.33224],[-109.56051,31.33402],[-108.20847,31.33384],[-108.20838,31.78363],[-106.52847,31.78391],[-106.52781,31.78086],[-106.52249,31.77501],[-106.51249,31.76933],[-106.50988,31.7612],[-106.50709,31.76123],[-106.48896,31.74806],[-106.48473,31.74769],[-106.4719,31.75101],[-106.46816,31.75897],[-106.45434,31.76466],[-106.45035,31.76426],[-106.43516,31.75492],[-106.41484,31.75101],[-106.37864,31.73021],[-106.37225,31.71174],[-106.34924,31.69633],[-106.33289,31.66178],[-106.3068,31.62459],[-106.28079,31.56179],[-106.24775,31.54226],[-106.2329,31.49982],[-106.2105,31.46857],[-106.08201,31.39863],[-106.00554,31.39233],[-105.76401,31.17051],[-105.58548,31.06117],[-105.56419,30.98526],[-104.99153,30.6639],[-104.97162,30.60896],[-104.90639,30.57822],[-104.83772,30.38117],[-104.70177,30.20567],[-104.68048,29.92399],[-104.57611,29.77838],[-104.51157,29.63674],[-104.39758,29.57047],[-104.39278,29.55293],[-104.05769,29.32173],[-103.79883,29.2581],[-103.78196,29.26555],[-103.76759,29.22799],[-103.14102,28.93666],[-102.86087,29.2217],[-102.65076,29.79418],[-101.41068,29.73457],[-101.26511,29.51372],[-101.05997,29.452],[-101.04083,29.38038],[-100.96303,29.34735],[-100.94406,29.34369],[-100.94071,29.33351],[-100.92775,29.32663],[-100.89814,29.30957],[-100.87818,29.28086],[-100.80076,29.2238],[-100.76437,29.15981],[-100.67047,29.08663],[-100.6412,28.91299],[-100.63236,28.90255],[-100.61296,28.89939],[-100.534,28.75622],[-100.51495,28.74531],[-100.50705,28.7143],[-100.51203,28.70666],[-100.51014,28.69127],[-100.50048,28.66186],[-100.45547,28.6381],[-100.44697,28.60743],[-100.35599,28.45239],[-100.34946,28.39653],[-100.29488,28.31315],[-100.29591,28.27324],[-100.17197,28.17493],[-99.93645,27.9568],[-99.87722,27.80173],[-99.79671,27.73338],[-99.772,27.72532],[-99.74556,27.69979],[-99.71947,27.65981],[-99.5957,27.59974],[-99.54094,27.60537],[-99.53055,27.57973],[-99.52034,27.55782],[-99.52802,27.49773],[-99.50141,27.49986],[-99.48755,27.49518],[-99.47897,27.48421],[-99.48661,27.46453],[-99.49534,27.44861],[-99.48927,27.40941],[-99.53957,27.31565],[-99.43588,27.19678],[-99.46404,27.01968],[-99.16698,26.56039],[-99.17474,26.53939],[-99.12698,26.51958],[-99.1135,26.42954],[-99.08355,26.39625],[-99.06007,26.39737],[-99.03634,26.41255],[-99.02042,26.40598],[-99.01291,26.39364],[-98.95686,26.38641],[-98.9566,26.37365],[-98.94523,26.36949],[-98.90013,26.36419],[-98.89905,26.35454],[-98.80305,26.36626],[-98.78254,26.30511],[-98.66667,26.23457],[-98.58496,26.24647],[-98.57951,26.23434],[-98.56519,26.23987],[-98.56294,26.22464],[-98.50599,26.20858],[-98.44806,26.21236],[-98.38617,26.15721],[-98.34176,26.15278],[-98.33579,26.1388],[-98.30626,26.10003],[-98.28841,26.10512],[-98.26524,26.0914],[-98.19898,26.06411],[-98.09577,26.05698],[-98.07568,26.06667],[-98.08302,26.03396],[-97.9771,26.04136],[-97.9532,26.06179],[-97.81643,26.04475],[-97.77017,26.02439],[-97.73884,26.02902],[-97.5289,25.90648],[-97.52151,25.88625],[-97.50615,25.89031],[-97.49851,25.89903],[-97.49637,25.89641],[-97.49748,25.88008],[-97.49422,25.87981],[-97.48847,25.88564],[-97.46409,25.88174],[-97.42607,25.842],[-97.36856,25.8396],[-97.26231,25.94724],[-80.81543,24.00633],[-66.87378,44.77794],[-67.16148,45.16715],[-67.2286,45.16739],[-67.26246,45.18797],[-67.28311,45.19175],[-67.28959,45.18784],[-67.29332,45.17568],[-67.29049,45.17317],[-67.3001,45.16776],[-67.3025,45.16122],[-67.29761,45.14766],[-67.33975,45.1255],[-67.40524,45.16122],[-67.40387,45.17139],[-67.4818,45.27682],[-67.42172,45.38543],[-67.45262,45.41008],[-67.50498,45.4889],[-67.41623,45.50105],[-67.42219,45.55661],[-67.42902,45.56833],[-67.42331,45.57154],[-67.42498,45.57836],[-67.45193,45.60323],[-67.77981,45.6738],[-67.79019,47.06776],[-67.88006,47.1067],[-67.91319,47.14793],[-67.92598,47.15418],[-67.95181,47.1875],[-68.02374,47.23915],[-68.13017,47.29309],[-68.17669,47.32893],[-68.24046,47.35354],[-68.32809,47.36005],[-68.36363,47.35476],[-68.38054,47.34167],[-68.38509,47.30321],[-68.37367,47.28796],[-68.4377,47.28232],[-68.47916,47.29623],[-68.51074,47.29885],[-68.54593,47.28441],[-68.58408,47.28482],[-68.59777,47.27134],[-68.59271,47.25762],[-68.61889,47.24148],[-68.68936,47.24125],[-68.71768,47.23676],[-68.80128,47.21423],[-68.89629,47.17676],[-69.05354,47.24847],[-69.04924,47.41798],[-69.22425,47.45961],[-69.99729,46.69558],[-70.0569,46.4149],[-70.25551,46.10871],[-70.29001,46.09431],[-70.39919,45.80667],[-70.83229,45.40062],[-70.80794,45.37878],[-70.82663,45.2367],[-70.87538,45.23453],[-70.92138,45.28099],[-70.90645,45.30918],[-71.0109,45.34798],[-71.08429,45.30556],[-71.1454,45.24226],[-71.20525,45.25278],[-71.28925,45.30097],[-71.41405,45.23513],[-71.43044,45.12381],[-71.49692,45.06991],[-71.50623,45.04878],[-71.49284,45.03629],[-71.50027,45.01372],[-71.79359,45.01075],[-72.08774,45.00581],[-72.14155,45.00568],[-72.15282,45.00609],[-72.17142,45.00584],[-72.25847,45.00436],[-72.38795,45.00626],[-72.4496,45.00863],[-72.5356,45.00936],[-72.66257,45.01523],[-72.82537,45.01642],[-73.08466,45.01561],[-73.45219,45.00875],[-74.14699,44.99145],[-74.33753,44.9923],[-74.50786,44.99798],[-74.66158,44.99949],[-74.71244,44.99734],[-74.75887,44.98708],[-74.76368,45.00632],[-74.78977,45.00365],[-74.82376,45.01773],[-74.94186,44.98229],[-75.30098,44.83883],[-75.30304,44.82836],[-75.59418,44.6457],[-75.97269,44.33502],[-75.97295,44.34595],[-76.00059,44.34797],[-76.17645,44.2865],[-76.18744,44.22158],[-76.88782,43.82759],[-79.16851,43.32168],[-79.05487,43.25371],[-79.05092,43.169],[-79.04603,43.16093],[-79.04208,43.13942],[-79.07002,43.12038],[-79.06015,43.114],[-79.0568,43.10474],[-79.0774,43.07861],[-78.9996,43.05484],[-79.02311,43.02071],[-79.02552,42.99473],[-78.96235,42.9573],[-78.91188,42.9426],[-78.90398,42.89181],[-82.42767,41.47978],[-83.14316,42.03807],[-83.12805,42.23843],[-83.09715,42.29052],[-83.07252,42.31515],[-82.94575,42.34332],[-82.59676,42.5479],[-82.51368,42.61785],[-82.5108,42.66464],[-82.4675,42.76415],[-82.48055,42.80573],[-82.45497,42.9284],[-82.41334,42.97099],[-82.42596,42.99536],[-82.15851,43.39507],[-83.53729,46.098],[-83.96301,46.05036],[-84.11021,46.23851],[-84.09794,46.25656],[-84.11613,46.26878],[-84.11905,46.31516],[-84.10721,46.3218],[-84.14394,46.41076],[-84.11682,46.51576],[-84.13536,46.53218],[-84.16162,46.5284],[-84.21621,46.53891],[-84.26994,46.49189],[-84.36092,46.50997],[-84.55284,46.4407],[-84.95178,46.77185],[-89.59179,48.00307],[-89.67547,48.00371],[-90.87204,48.25943],[-91.41312,48.06753],[-92.99377,48.62474],[-93.34877,48.62604],[-93.35529,48.61124],[-93.37074,48.60584],[-93.39812,48.60369],[-93.40542,48.61089],[-93.43846,48.59478],[-93.46859,48.59205],[-93.45735,48.56667],[-93.46533,48.54593],[-93.64763,48.51751],[-93.80625,48.51888],[-93.80642,48.58047],[-93.83328,48.62582],[-93.84865,48.63064],[-93.93388,48.6326],[-94.01327,48.64471],[-94.16176,48.64697],[-94.25025,48.65463],[-94.24931,48.67827],[-94.26046,48.69816],[-94.30578,48.71073],[-94.32758,48.70433],[-94.36123,48.70478],[-94.38406,48.71135],[-94.41629,48.71067],[-94.44294,48.69266],[-94.53615,48.7024],[-94.55031,48.71419],[-94.58894,48.71928],[-94.69425,48.77938],[-94.70129,48.83376],[-94.68996,48.83953],[-94.68395,48.99914],[-111.96064,48.99841]]]}},{"type":"Feature","properties":{},"geometry":{"type":"Polygon","coordinates":[[[180,55],[170,53],[180,49],[180,55]]]}},{"type":"Feature","properties":{},"geometry":{"type":"Polygon","coordinates":[[[143,22],[147,22],[147,12],[143,12],[143,22]]]}},{"type":"Feature","properties":{},"geometry":{"type":"Polygon","coordinates":[[[-171.5,-10],[-171,-15],[-167,-15],[-171.5,-10]]]}}];
@@ -21806,7 +21806,7 @@ function nogamma(a, b) {
   return d ? linear(a, d) : constant$3(isNaN(a) ? b : a);
 }
 
-var interpolateRgb = ((function rgbGamma(y) {
+var interpolateRgb = (function rgbGamma(y) {
   var color$$1 = gamma(y);
 
   function rgb$$1(start, end) {
@@ -21826,7 +21826,7 @@ var interpolateRgb = ((function rgbGamma(y) {
   rgb$$1.gamma = rgbGamma;
 
   return rgb$$1;
-}))(1);
+})(1);
 
 function rgbSpline(spline) {
   return function(colors) {
@@ -29921,7 +29921,7 @@ function squarifyRatio(ratio, parent, x0, y0, x1, y1) {
   return rows;
 }
 
-var squarify = ((function custom(ratio) {
+var squarify = (function custom(ratio) {
 
   function squarify(parent, x0, y0, x1, y1) {
     squarifyRatio(ratio, parent, x0, y0, x1, y1);
@@ -29932,7 +29932,7 @@ var squarify = ((function custom(ratio) {
   };
 
   return squarify;
-}))(phi);
+})(phi);
 
 var index$6 = function() {
   var tile = squarify,
@@ -30075,7 +30075,7 @@ var sliceDice = function(parent, x0, y0, x1, y1) {
   (parent.depth & 1 ? treemapSlice : treemapDice)(parent, x0, y0, x1, y1);
 };
 
-var resquarify = ((function custom(ratio) {
+var resquarify = (function custom(ratio) {
 
   function resquarify(parent, x0, y0, x1, y1) {
     if ((rows = parent._squarify) && (rows.ratio === ratio)) {
@@ -30106,7 +30106,7 @@ var resquarify = ((function custom(ratio) {
   };
 
   return resquarify;
-}))(phi);
+})(phi);
 
 var d3polygonArea = function(polygon) {
   var i = -1,
@@ -30368,7 +30368,7 @@ var defaultSource$1 = function() {
   return Math.random();
 };
 
-var uniform = ((function sourceRandomUniform(source) {
+var uniform = (function sourceRandomUniform(source) {
   function randomUniform(min, max) {
     min = min == null ? 0 : +min;
     max = max == null ? 1 : +max;
@@ -30382,9 +30382,9 @@ var uniform = ((function sourceRandomUniform(source) {
   randomUniform.source = sourceRandomUniform;
 
   return randomUniform;
-}))(defaultSource$1);
+})(defaultSource$1);
 
-var normal = ((function sourceRandomNormal(source) {
+var normal = (function sourceRandomNormal(source) {
   function randomNormal(mu, sigma) {
     var x, r;
     mu = mu == null ? 0 : +mu;
@@ -30409,9 +30409,9 @@ var normal = ((function sourceRandomNormal(source) {
   randomNormal.source = sourceRandomNormal;
 
   return randomNormal;
-}))(defaultSource$1);
+})(defaultSource$1);
 
-var logNormal = ((function sourceRandomLogNormal(source) {
+var logNormal = (function sourceRandomLogNormal(source) {
   function randomLogNormal() {
     var randomNormal = normal.source(source).apply(this, arguments);
     return function() {
@@ -30422,9 +30422,9 @@ var logNormal = ((function sourceRandomLogNormal(source) {
   randomLogNormal.source = sourceRandomLogNormal;
 
   return randomLogNormal;
-}))(defaultSource$1);
+})(defaultSource$1);
 
-var irwinHall = ((function sourceRandomIrwinHall(source) {
+var irwinHall = (function sourceRandomIrwinHall(source) {
   function randomIrwinHall(n) {
     return function() {
       for (var sum = 0, i = 0; i < n; ++i) sum += source();
@@ -30435,9 +30435,9 @@ var irwinHall = ((function sourceRandomIrwinHall(source) {
   randomIrwinHall.source = sourceRandomIrwinHall;
 
   return randomIrwinHall;
-}))(defaultSource$1);
+})(defaultSource$1);
 
-var bates = ((function sourceRandomBates(source) {
+var bates = (function sourceRandomBates(source) {
   function randomBates(n) {
     var randomIrwinHall = irwinHall.source(source)(n);
     return function() {
@@ -30448,9 +30448,9 @@ var bates = ((function sourceRandomBates(source) {
   randomBates.source = sourceRandomBates;
 
   return randomBates;
-}))(defaultSource$1);
+})(defaultSource$1);
 
-var exponential$1 = ((function sourceRandomExponential(source) {
+var exponential$1 = (function sourceRandomExponential(source) {
   function randomExponential(lambda) {
     return function() {
       return -Math.log(1 - source()) / lambda;
@@ -30460,7 +30460,7 @@ var exponential$1 = ((function sourceRandomExponential(source) {
   randomExponential.source = sourceRandomExponential;
 
   return randomExponential;
-}))(defaultSource$1);
+})(defaultSource$1);
 
 var request = function(url, callback) {
   var request,
@@ -33483,7 +33483,7 @@ Bundle.prototype = {
   }
 };
 
-var bundle = ((function custom(beta) {
+var bundle = (function custom(beta) {
 
   function bundle(context) {
     return beta === 1 ? new Basis(context) : new Bundle(context, beta);
@@ -33494,7 +33494,7 @@ var bundle = ((function custom(beta) {
   };
 
   return bundle;
-}))(0.85);
+})(0.85);
 
 function point$3(that, x, y) {
   that._context.bezierCurveTo(
@@ -33545,7 +33545,7 @@ Cardinal.prototype = {
   }
 };
 
-var cardinal = ((function custom(tension) {
+var cardinal = (function custom(tension) {
 
   function cardinal(context) {
     return new Cardinal(context, tension);
@@ -33556,7 +33556,7 @@ var cardinal = ((function custom(tension) {
   };
 
   return cardinal;
-}))(0);
+})(0);
 
 function CardinalClosed(context, tension) {
   this._context = context;
@@ -33604,7 +33604,7 @@ CardinalClosed.prototype = {
   }
 };
 
-var cardinalClosed = ((function custom(tension) {
+var cardinalClosed = (function custom(tension) {
 
   function cardinal$$1(context) {
     return new CardinalClosed(context, tension);
@@ -33615,7 +33615,7 @@ var cardinalClosed = ((function custom(tension) {
   };
 
   return cardinal$$1;
-}))(0);
+})(0);
 
 function CardinalOpen(context, tension) {
   this._context = context;
@@ -33652,7 +33652,7 @@ CardinalOpen.prototype = {
   }
 };
 
-var cardinalOpen = ((function custom(tension) {
+var cardinalOpen = (function custom(tension) {
 
   function cardinal$$1(context) {
     return new CardinalOpen(context, tension);
@@ -33663,7 +33663,7 @@ var cardinalOpen = ((function custom(tension) {
   };
 
   return cardinal$$1;
-}))(0);
+})(0);
 
 function point$4(that, x, y) {
   var x1 = that._x1,
@@ -33738,7 +33738,7 @@ CatmullRom.prototype = {
   }
 };
 
-var catmullRom = ((function custom(alpha) {
+var catmullRom = (function custom(alpha) {
 
   function catmullRom(context) {
     return alpha ? new CatmullRom(context, alpha) : new Cardinal(context, 0);
@@ -33749,7 +33749,7 @@ var catmullRom = ((function custom(alpha) {
   };
 
   return catmullRom;
-}))(0.5);
+})(0.5);
 
 function CatmullRomClosed(context, alpha) {
   this._context = context;
@@ -33809,7 +33809,7 @@ CatmullRomClosed.prototype = {
   }
 };
 
-var catmullRomClosed = ((function custom(alpha) {
+var catmullRomClosed = (function custom(alpha) {
 
   function catmullRom$$1(context) {
     return alpha ? new CatmullRomClosed(context, alpha) : new CardinalClosed(context, 0);
@@ -33820,7 +33820,7 @@ var catmullRomClosed = ((function custom(alpha) {
   };
 
   return catmullRom$$1;
-}))(0.5);
+})(0.5);
 
 function CatmullRomOpen(context, alpha) {
   this._context = context;
@@ -33869,7 +33869,7 @@ CatmullRomOpen.prototype = {
   }
 };
 
-var catmullRomOpen = ((function custom(alpha) {
+var catmullRomOpen = (function custom(alpha) {
 
   function catmullRom$$1(context) {
     return alpha ? new CatmullRomOpen(context, alpha) : new CardinalOpen(context, 0);
@@ -33880,7 +33880,7 @@ var catmullRomOpen = ((function custom(alpha) {
   };
 
   return catmullRom$$1;
-}))(0.5);
+})(0.5);
 
 function LinearClosed(context) {
   this._context = context;
@@ -55396,7 +55396,8 @@ function rendererBackgroundSource(data) {
         offset = [0, 0],
         name = source.name,
         description = source.description,
-        best = !!source.best;
+        best = !!source.best,
+        template = source.template;
 
     source.scaleExtent = data.scaleExtent || [0, 20];
     source.overzoom = data.overzoom !== false;
@@ -55445,8 +55446,15 @@ function rendererBackgroundSource(data) {
     };
 
 
+    source.template = function(_) {
+        if (!arguments.length) return template;
+        if (source.id === 'custom') template = _;
+        return source;
+    };
+
+
     source.url = function(coord) {
-        return data.template
+        return template
             .replace('{x}', coord[0])
             .replace('{y}', coord[1])
             // TMS-flipped y coordinate
@@ -55620,7 +55628,7 @@ rendererBackgroundSource.Custom = function(template) {
 
 
     source.imageryUsed = function() {
-        return 'Custom (' + template + ')';
+        return 'Custom (' + source.template() + ')';
     };
 
 
@@ -55959,7 +55967,7 @@ function rendererBackground(context) {
 
         var id = b.id;
         if (id === 'custom') {
-            id = 'custom:' + b.template;
+            id = 'custom:' + b.template();
         }
 
         if (id) {
@@ -56030,14 +56038,15 @@ function rendererBackground(context) {
         // test source against OSM imagery blacklists..
         var blacklists = context.connection().imageryBlacklists();
 
-        var fail = false,
+        var template = d.template(),
+            fail = false,
             tested = 0,
             regex, i;
 
         for (i = 0; i < blacklists.length; i++) {
             try {
                 regex = new RegExp(blacklists[i]);
-                fail = regex.test(d.template);
+                fail = regex.test(template);
                 tested++;
                 if (fail) break;
             } catch (e) {
@@ -56048,7 +56057,7 @@ function rendererBackground(context) {
         // ensure at least one test was run.
         if (!tested) {
             regex = new RegExp('.*\.google(apis)?\..*/(vt|kh)[\?/].*([xyz]=.*){3}.*');
-            fail = regex.test(d.template);
+            fail = regex.test(template);
         }
 
         baseLayer.source(!fail ? d : rendererBackgroundSource.None());
@@ -57725,6 +57734,7 @@ function uiBackground(context) {
         opacityDefault = (context.storage('background-opacity') !== null) ?
             (+context.storage('background-opacity')) : 1.0,
         customTemplate = context.storage('background-custom-template') || '',
+        customSource = rendererBackgroundSource.Custom(customTemplate),
         previous;
 
     // Can be 0 from <1.3.0 use or due to issue #1923.
@@ -57812,23 +57822,22 @@ function uiBackground(context) {
         function editCustom() {
             event.preventDefault();
             var example = 'https://{switch:a,b,c}.tile.openstreetmap.org/{zoom}/{x}/{y}.png';
-            var template = window.prompt(t('background.custom_prompt', { example: example }), customTemplate);
+            var template = window.prompt(
+                t('background.custom_prompt', { example: example }),
+                customSource.template() || example
+            );
+
             if (template) {
-                setCustom(template);
+                context.storage('background-custom-template', template);
+                customTemplate = template;
+                customSource.template(template);
+                clickSetSource(customSource);
             } else {
                 selectLayer();
             }
         }
 
 
-        function setCustom(template) {
-            context.storage('background-custom-template', template);
-            var d = rendererBackgroundSource.Custom(template);
-            content.selectAll('.custom_layer').datum(d);
-            clickSetSource(d);
-        }
-
-
         function clickSetOverlay(d) {
             event.preventDefault();
             context.background().toggleOverlayLayer(d);
@@ -57887,12 +57896,6 @@ function uiBackground(context) {
             overlayList.call(drawList, 'checkbox', clickSetOverlay, function(d) { return d.overlay; });
 
             selectLayer();
-
-            var source = context.background().baseLayerSource();
-            if (source.id === 'custom') {
-                customTemplate = source.template;
-            }
-
             updateOffsetVal();
         }
 
@@ -58119,7 +58122,7 @@ function uiBackground(context) {
         var custom = backgroundList
             .append('li')
             .attr('class', 'custom_layer')
-            .datum(rendererBackgroundSource.Custom());
+            .datum(customSource);
 
         custom
             .append('button')
@@ -58138,8 +58141,8 @@ function uiBackground(context) {
             .attr('type', 'radio')
             .attr('name', 'layers')
             .on('change', function () {
-                if (customTemplate) {
-                    setCustom(customTemplate);
+                if (customSource.template()) {
+                    clickSetSource(customSource);
                 } else {
                     editCustom();
                 }
@@ -75001,7 +75004,7 @@ function setAreaKeys(value) {
 
 function coreContext() {
     var context = {};
-    context.version = '2.3.0';
+    context.version = '2.3.1';
 
     // create a special translation that contains the keys in place of the strings
     var tkeys = lodash.cloneDeep(en);
@@ -78142,7 +78145,7 @@ function actionSplit(nodeId, newWayIds) {
             if (relation.isRestriction()) {
                 var via = relation.memberByRole('via');
                 if (via && wayB.contains(via.id)) {
-                    relation = relation.updateMember({id: wayB.id}, relation.memberById(wayA.id).index);
+                    relation = relation.replaceMember(wayA, wayB);
                     graph = graph.replace(relation);
                 }
             } else {
diff --git a/vendor/assets/iD/iD/locales/ar.json b/vendor/assets/iD/iD/locales/ar.json
index 93bd39a64..a0500f2df 100644
--- a/vendor/assets/iD/iD/locales/ar.json
+++ b/vendor/assets/iD/iD/locales/ar.json
@@ -479,9 +479,9 @@
         },
         "splash": {
             "welcome": "مرحبا بك في محرر iD لخريطة الشارع المفتوحة OpenStreetMap.",
-            "text": "محرر الخرائط ID هو محرر سهل وجذاب ولكنه في نفس الوقت أداة قوية جدا وفعالة للمساهمة على أفضل خرائط حُرة ومجانية في العالم. هذا هو الإصدار {version}. لمزيد من المعلومات انظر {website} ، كما يمكنك الإبلاغ عن العلل والمشاكل على {github}.",
-            "walkthrough": "ابدء الجولة",
-            "start": "حرر الآن"
+            "text": "محرر الخرائط ID هو محرر سهل وجذاب ولكنه أيضًا أداة قوية جدا وفعالة للمساهمة في أفضل خرائط حُرة ومجانية في العالم. هذا هو الإصدار رقم {version}. لمزيد من المعلومات انظر {website} ، كما يمكنك الإبلاغ عن العلل والمشاكل على {github}.",
+            "walkthrough": "ابدء جولة للتعلم",
+            "start": "حرّر الآن"
         },
         "source_switch": {
             "live": "حي",
@@ -494,11 +494,11 @@
         "tag_reference": {
             "description": "الوصف",
             "on_wiki": "{tag} في wiki.osm.org",
-            "used_with": "يستخدم مع {type}"
+            "used_with": "يُستخدم مع {type}"
         },
         "validations": {
-            "disconnected_highway": "طريق سريع مقطوع الاتصال",
-            "disconnected_highway_tooltip": "يجب ربط الطرق بالطرق الآخرى أو بمداخل الأبنية.",
+            "disconnected_highway": "طريق سريع غير متصل",
+            "disconnected_highway_tooltip": "يجب وصل الطرق بالطرق الآخرى أو بمداخل الأبنية.",
             "untagged_point": "نقطة غير موسومة",
             "untagged_point_tooltip": "اختر نوع العنصر الذي يصف هذه النقطة.",
             "untagged_line": "خط غير موسوم",
@@ -574,10 +574,10 @@
             "welcome": {
                 "title": "مرحبًا",
                 "welcome": "أهلا بك ! هذه جولة ستعلمك أساسيات التحرير على خرائط الشارع المفتوحة OpenStreetMap.",
-                "practice": "جميع البيانات في هذه الجولة هي فقط للممارسة والتعلم، وأي تغييرات أو تعديلات ستقوم بها في هذه الجولة لن يتم حفظها.",
+                "practice": "جميع البيانات في هذه الجولة هي من أجل الممارسة والتعلم، وأي تغييرات أو تعديلات ستقوم بها في هذه الجولة لن يتم حفظها.",
                 "words": "ستعرض عليك هذه الجولة بعض الكلمات والمفاهيم الجديدة. عند عرض كلمة جديدة أو مفهوم جديد سنستخدم *الخط المائل*.",
-                "mouse": "يمكنك استخدام أي جهاز إدخال لتحرير الخريطة، ولكن في هذه الجولة سنفترض أن لديك فأرة تحتوي زرّ أيمن وزرّ أيسر.. **إذا كنت ترغب بتوصيل فأرة حاسوب، فافعل ذلك الآن، ثم انقر على موافق**",
-                "leftclick": "عندما يُطلب منك في هذه الجولة أن تقوم بالنقر أو النقر المزدوج، فإنه يعني النقر بالزر الأيسر للفأرة. في لوحة اللمس كما في أجهزة الحاسوب المحمولة قد تكون نقرة واحدة أو لمسة واحدة. **أنقر بالزر الأيسر للفأرة {num} مرات.**",
+                "mouse": "يمكنك استخدام أي جهاز إدخال لتحرير الخريطة، ولكن في هذه الجولة سنفترض أن لديك فأرة تحتوي زرّ أيمن وزرّ أيسر. **إذا كنت ترغب بتوصيل فأرة حاسوب، فافعل ذلك الآن، ثم انقر على موافق**",
+                "leftclick": "عندما يُطلب منك في هذه الجولة أن تقوم بالنقر أو النقر المزدوج، فإنه يعني النقر بالزر الأيسر للفأرة.\nفي لوحة اللمس كما في أجهزة الحاسوب المحمولة قد تكون نقرة واحدة أو لمسة واحدة. **أنقر بالزر الأيسر للفأرة {num} مرات.**",
                 "rightclick": "في بعض الأحيان قد يُطلب منك أن تنقر بالزر الأيمن للفأرة. قد يكون هذا كضغط مفتاح Ctrl على لوحة المفاتيح، أو اللمس باصبعين على لوحة اللمس كما في الأجهزة المحمولة. كما قد تحتوي لوحة مفاتيحك على مفتاح \"القائمة\" والذي يعمل نفس عمل النقر الأيمن للفأرة. **أنقر بالزرّ الأيمن للفأرة  {num} مرات.**",
                 "chapters": "إلى الآن، الأمور جيدة!. يمكنك استخدام الأزرار أدناه لتخطي أقسام الجولة في أي وقت، أو إعادة قسم ما من البداية إذا واجهت مشكلة. دعنا نبدأ! **أنقر '{next}' للمتابعة.**"
             },
@@ -586,7 +586,11 @@
                 "drag": "منطقة الخريطة الأساسية والتي يظهر عليها بيانات OpenStreetMap فوق الخلفية. {br}يمكنك سحب الخريطة وتحريكها عن طريق الضغط مع الاستمرار على زر الفأرة الأيسر مع تحريك الفأرة. كما يمكنك أيضا استخدام مفاتيح الأسهم في لوحة المفاتيح لنفس الغرض. **اسحب الخريطة!**",
                 "zoom": "يمكنك تكبير أو تصغير الخريطة عن طريق إدارة عجلة الفأرة الوسطى، أو عن طريق الضغط على أزرار {plus} / {minus} في لوحة المفاتيح. **كبّر الخريطة وصغّرها!**",
                 "features": "نحن نستخدم كلمة *عناصر* لوصف الأشياء الظاهرة على الخريطة. أي شيء في العالم الحقيقي يمكن وصفه كعنصر في خرائط OpenStreetMap.",
-                "points_lines_areas": "عناصر الخريطة تتمثل في ثلاثة أشياء أساسية وهي *النقاط، والخطوط، والمساحات.*"
+                "points_lines_areas": "عناصر الخريطة تتمثل في ثلاثة أشياء أساسية وهي *النقاط، والخطوط، والمساحات.*",
+                "click_townhall": "جميع العناصر على الخريطة يمكن تحديدها عن طريق النقر عليها. **انقر على النقطة لتحديدها.**",
+                "selected_townhall": "رائع! ، تم تحديد النقطة. العناصر المُحددة تظهر بحد متوهج ينبض باستمرار.",
+                "editor_townhall": "عند تحديد عنصر، فإن *محرر العناصر* يظهر إلى جانب الخريطة على اليمين.",
+                "preset_townhall": "في الجزء العلوي من محرر العناصر يظهر نوع العنصر. هذه النقطة هي {preset}."
             },
             "points": {
                 "title": "النقاط",
diff --git a/vendor/assets/iD/iD/locales/es.json b/vendor/assets/iD/iD/locales/es.json
index b40adb711..928359e2e 100644
--- a/vendor/assets/iD/iD/locales/es.json
+++ b/vendor/assets/iD/iD/locales/es.json
@@ -2,7 +2,7 @@
     "es": {
         "modes": {
             "add_area": {
-                "title": "Área",
+                "title": "Árezo",
                 "description": "Añade parques, edificios, lagos, bosques u otras áreas al mapa.",
                 "tail": "Haga clic en el mapa para empezar a dibujar un área, como un parque, lago o edificio."
             },
@@ -352,22 +352,33 @@
             "key": "I",
             "background": {
                 "key": "B",
-                "title": "Fondo"
+                "title": "Fondo",
+                "zoom": "Acercamiento",
+                "vintage": "Época",
+                "unknown": "Desconocido",
+                "show_tiles": "Mostrar teselas",
+                "hide_tiles": "Ocultar teselas"
             },
             "history": {
                 "key": "H",
                 "title": "Historial",
+                "selected": "{n} seleccionado",
                 "version": "Versión",
                 "last_edit": "Última edición",
                 "edited_by": "Editado por",
                 "changeset": "Conjunto de cambios",
+                "unknown": "Desconocido",
                 "link_text": "Historial en openstreetmap.org"
             },
             "location": {
-                "key": "L"
+                "key": "L",
+                "title": "Ubicación",
+                "unknown_location": "Ubicación desconocida"
             },
             "measurement": {
                 "key": "M",
+                "title": "Medición",
+                "selected": "{n} seleccionado",
                 "geometry": "Geometría",
                 "closed": "cerrada",
                 "center": "Centro",
@@ -375,6 +386,7 @@
                 "length": "Longitud",
                 "area": "Área",
                 "centroid": "Centroide",
+                "location": "Ubicación",
                 "metric": "Métrico",
                 "imperial": "Imperial"
             }
@@ -448,13 +460,15 @@
             "switch": "Volver a este fondo",
             "custom": "Personalizado",
             "custom_button": "Editar fondo personalizado",
+            "custom_prompt": "Introduzca una plantilla URL de tesela. Los tokens válidos son:\n  - {zoom}/{z}, {x}, {y} para el esquema de tesela Z / X / Y\n  - {ty} para coordenadas Y invertidas del estilo TMS\n  - {u} para el esquema cuádruple\n  - {switch:a,b,c} para la multiplexación del servidor DNS\n\nEjemplo:\n{example}",
             "fix_misalignment": "Ajustar desplazamiento de imágenes",
             "imagery_source_faq": "¿De dónde vienen estas imágenes?",
             "reset": "reiniciar",
             "offset": "Arrastre en cualquier lugar del área gris de abajo para ajustar el desplazamiento de imágenes, o introduzca los valores de desplazamiento en metros.",
             "minimap": {
                 "description": "Minimapa",
-                "tooltip": "Mostrar una vista alejada del mapa para ayudar a ubicar el área que se muestra actualmente."
+                "tooltip": "Mostrar una vista alejada del mapa para ayudar a ubicar el área que se muestra actualmente.",
+                "key": "/"
             }
         },
         "map_data": {
@@ -533,7 +547,9 @@
         },
         "restore": {
             "heading": "Tiene cambios sin guardar",
-            "description": "¿Quiere recuperar los cambios no guardados de una sesión de edición previa?"
+            "description": "¿Quiere recuperar los cambios no guardados de una sesión de edición previa?",
+            "restore": "Restaurar mis cambios",
+            "reset": "Descartar mis cambios"
         },
         "save": {
             "title": "Guardar",
@@ -832,6 +848,7 @@
                 "title": "Áreas",
                 "add_playground": "Las *áreas* son utilizadas para mostrar los límites de elementos como lagos, edificios y áreas residenciales.{br}Estos pueden ser utilizados para mapear con más detalle muchos elementos que normalmente podría mapear como puntos. **Haga clic en el botón área {button} para añadir una nueva área.**",
                 "start_playground": "Vamos a añadir esta zona de juegos al mapa dibujando un área.  Las áreas se dibujan colocando *nodos* a lo largo del borde exterior del elemento. **Haga clic o presione la barra espaciadora para colocar un nodo inicial en una de las esquinas de la zona de juegos.**",
+                "continue_playground": "Continúe dibujando el área colocando más nodos a lo largo del borde del patio. Está bien conectar el área a los caminos existentes.{br}Consejo: Puede mantener pulsada la tecla '{alt}' para evitar que los nodos se conecten a otros elementos. **Continuar dibujando un área para el patio de recreo.**",
                 "finish_playground": "Termine el área presionando la tecla retorno, o haciendo clic nuevamente en el primer o último nodo. **Termine de dibujar un área para la zona de juegos.**",
                 "search_playground": "**Busque '{preset}'.**",
                 "choose_playground": "**Elija {preset} de la lista.**",
@@ -896,6 +913,8 @@
             },
             "startediting": {
                 "title": "Empezar a editar",
+                "help": "Ahora está listo para editar OpenStreetMap.{br}Puede volver a reproducir este tutorial en cualquier momento o ver más documentación haciendo clic en el botón {button} o pulsando la tecla '{key}'.",
+                "shortcuts": "Puede ver una lista de comandos junto con sus atajos de teclado pulsando la tecla '{key}'.",
                 "save": "¡No olvide guardar sus cambios regularmente!",
                 "start": "¡Comience a mapear!"
             }
@@ -903,6 +922,9 @@
         "shortcuts": {
             "title": "Atajos de teclado",
             "tooltip": "Muestra la pantalla de atajos de teclado.",
+            "toggle": {
+                "key": "?"
+            },
             "key": {
                 "alt": "Alt",
                 "backspace": "Retroceso",
@@ -1002,6 +1024,17 @@
                     "redo": "Rehace la última acción",
                     "save": "Guarda cambios"
                 }
+            },
+            "tools": {
+                "title": "Herramientas",
+                "info": {
+                    "title": "Información",
+                    "all": "Alternar todos los paneles de información",
+                    "background": "Alternar panel de fondo",
+                    "history": "Alternar panel de historial",
+                    "location": "Alternar panel de ubicación",
+                    "measurement": "Alternar panel de medición"
+                }
             }
         },
         "presets": {
@@ -5199,6 +5232,20 @@
                 },
                 "name": "Waymarked Trails: Deportes de invierno"
             },
+            "basemap.at": {
+                "attribution": {
+                    "text": "basemap.at"
+                },
+                "description": "Mapa base de Austria, basado en datos del gobierno.",
+                "name": "basemap.at"
+            },
+            "basemap.at-orthofoto": {
+                "attribution": {
+                    "text": "basemap.at"
+                },
+                "description": "Capa de ortofoto proporcionada por basemap.at. \"Sucesor\" de las imágenes de geoimage.at.",
+                "name": "Ortofoto de basemap.at"
+            },
             "hike_n_bike": {
                 "attribution": {
                     "text": "© contribuidores OpenStreetMap"
diff --git a/vendor/assets/iD/iD/locales/gl.json b/vendor/assets/iD/iD/locales/gl.json
index d56df7572..cb05aaf95 100644
--- a/vendor/assets/iD/iD/locales/gl.json
+++ b/vendor/assets/iD/iD/locales/gl.json
@@ -354,6 +354,7 @@
                 "key": "B",
                 "title": "Fondo",
                 "zoom": "Zoom",
+                "vintage": "Retro",
                 "unknown": "Descoñecido",
                 "show_tiles": "Amosar teselas",
                 "hide_tiles": "Ocultar teselas"
@@ -546,7 +547,9 @@
         },
         "restore": {
             "heading": "Tes cambios sen gardar",
-            "description": "Queres recuperar os cambios non gardados da sesión de edición anterior?"
+            "description": "Queres recuperar os cambios non gardados da sesión de edición anterior?",
+            "restore": "Recuperar meus trocos",
+            "reset": "Desbotar meus trocos"
         },
         "save": {
             "title": "Gardar",
@@ -1152,7 +1155,7 @@
                         "postcode": "Código postal",
                         "province": "Provincia",
                         "province!jp": "Concello",
-                        "quarter": "Trimestre",
+                        "quarter": "Distrito",
                         "quarter!jp": "Ōaza/Machi",
                         "state": "Estado",
                         "street": "Rúa",
@@ -1299,7 +1302,7 @@
                     "label": "Tipo de Cámara",
                     "options": {
                         "dome": "Cúpula",
-                        "fixed": "Amañar",
+                        "fixed": "Fixa",
                         "panning": "Barrido"
                     }
                 },
@@ -1351,7 +1354,7 @@
                     "label": "Tipo"
                 },
                 "contact/webcam": {
-                    "label": "Webcam URL",
+                    "label": "URL da webcam",
                     "placeholder": "http://exemplo.gal/"
                 },
                 "content": {
@@ -1778,7 +1781,7 @@
                     "placeholder": "Local, Rexional, Nacional, Internacional"
                 },
                 "network_road": {
-                    "label": "Network"
+                    "label": "Rede"
                 },
                 "note": {
                     "label": "Nota"
@@ -1809,14 +1812,14 @@
                     "label": "Operador"
                 },
                 "outdoor_seating": {
-                    "label": "Estar ao aire libre"
+                    "label": "Terraza"
                 },
                 "par": {
                     "label": "Par",
                     "placeholder": "3, 4, 5..."
                 },
                 "parallel_direction": {
-                    "label": "Enderezo",
+                    "label": "Dirección",
                     "options": {
                         "backward": "Atrás",
                         "forward": "Adiante"
@@ -1845,7 +1848,7 @@
                     "placeholder": "+34 989 12 34 56"
                 },
                 "piste/difficulty": {
-                    "label": "Difícil",
+                    "label": "Dificultade",
                     "options": {
                         "advanced": "Avanzado (black diamond)",
                         "easy": "Doado (green circle)",
@@ -1853,7 +1856,7 @@
                         "extreme": "Extremo (require equipamento de escalada)",
                         "freeride": "Por libre (fora da pista)",
                         "intermediate": "Intermedio (cadrado azul)",
-                        "novice": "Aviso (instructor)"
+                        "novice": "Principiante (aprendizaxe)"
                     },
                     "placeholder": "Doado, Intermedio, Avanzado..."
                 },
@@ -1913,7 +1916,7 @@
                     "label": "Tipo de reciclaxe",
                     "options": {
                         "centre": "Centro de Reciclaxe",
-                        "container": "Container"
+                        "container": "Contedor"
                     }
                 },
                 "ref": {
@@ -1941,19 +1944,19 @@
                     "label": "Tipo"
                 },
                 "sac_scale": {
-                    "label": "Difícil Camiñata",
+                    "label": "Dificultade do sendeirismo",
                     "options": {
-                        "alpine_hiking": "T4: Camiñata Alpina",
-                        "demanding_alpine_hiking": "T5: Camiñata alpina exixente",
-                        "demanding_mountain_hiking": "T3: Esixente Camiñata de Montaña",
-                        "difficult_alpine_hiking": "T6: Dificil Camiñata Alpina",
-                        "hiking": "T1: Camiñata",
-                        "mountain_hiking": "T2: Camiñata de Montaña"
+                        "alpine_hiking": "T4: Sendeirismo alpino",
+                        "demanding_alpine_hiking": "T5: Sendeirismo alpino exixente",
+                        "demanding_mountain_hiking": "T3: Sendeirismo de montaña exixente",
+                        "difficult_alpine_hiking": "T6: Sendeirismo alpino difícil",
+                        "hiking": "T1: Sendeirismo",
+                        "mountain_hiking": "T2: Sendeirismo de montaña"
                     },
-                    "placeholder": "Montaña Senderismo, Sendeirismo alpino ..."
+                    "placeholder": "Sendeirismo de montaña, sendeirismo alpino"
                 },
                 "sanitary_dump_station": {
-                    "label": "Servizo WC"
+                    "label": "Área de desagüe para caravanas"
                 },
                 "seasonal": {
                     "label": "Estacional"
@@ -2003,10 +2006,10 @@
                 "smoking": {
                     "label": "Fumar",
                     "options": {
-                        "dedicated": "Adicado a fumadores (e.g. club fumadores)",
+                        "dedicated": "Adicado a fumadores (p.ex. club fumadores)",
                         "isolated": "En zonas de fumadores, fisicamente illadas",
                         "no": "Non fumar en ningures",
-                        "outside": "Saída permitida",
+                        "outside": "Permitido no exterior",
                         "separated": "En zonas de fumadores, non fisicamente illadas",
                         "yes": "Permitido en todas partes"
                     },
@@ -2090,7 +2093,7 @@
                     "label": "Superficie"
                 },
                 "surveillance": {
-                    "label": "Vixilancia de Cativos"
+                    "label": "Tipo de vixilancia"
                 },
                 "surveillance/type": {
                     "label": "Tipo de Vixilancia",
@@ -2217,316 +2220,246 @@
             },
             "presets": {
                 "address": {
-                    "name": "Enderezo",
-                    "terms": "<translate with synonyms or related terms for 'Address', separated by commas>"
+                    "name": "Enderezo"
                 },
                 "advertising/billboard": {
-                    "name": "Carteleira",
-                    "terms": "<translate with synonyms or related terms for 'Billboard', separated by commas>"
+                    "name": "Carteleira"
                 },
                 "aerialway": {
                     "name": "Vía Aérea"
                 },
                 "aerialway/cable_car": {
-                    "name": "Teleférico",
-                    "terms": "<translate with synonyms or related terms for 'Cable Car', separated by commas>"
+                    "name": "Teleférico"
                 },
                 "aerialway/chair_lift": {
-                    "name": "Ascensor de Cadeiras",
-                    "terms": "<translate with synonyms or related terms for 'Chair Lift', separated by commas>"
+                    "name": "Ascensor de Cadeiras"
                 },
                 "aerialway/drag_lift": {
-                    "name": "Ascensor de Arrastre",
-                    "terms": "<translate with synonyms or related terms for 'Drag Lift', separated by commas>"
+                    "name": "Ascensor de Arrastre"
                 },
                 "aerialway/gondola": {
-                    "name": "Góndola",
-                    "terms": "<translate with synonyms or related terms for 'Gondola', separated by commas>"
+                    "name": "Góndola"
                 },
                 "aerialway/goods": {
-                    "name": "Camiño aéreo de mercadorías",
-                    "terms": "<translate with synonyms or related terms for 'Goods Aerialway', separated by commas>"
+                    "name": "Camiño aéreo de mercadorías"
                 },
                 "aerialway/magic_carpet": {
-                    "name": "Ascensor Magic Carpet",
-                    "terms": "<translate with synonyms or related terms for 'Magic Carpet Lift', separated by commas>"
+                    "name": "Ascensor Magic Carpet"
                 },
                 "aerialway/mixed_lift": {
-                    "name": "Elevador Mixto",
-                    "terms": "<translate with synonyms or related terms for 'Mixed Lift', separated by commas"
+                    "name": "Elevador Mixto"
                 },
                 "aerialway/platter": {
-                    "name": "Plataforma Elevadora",
-                    "terms": "<translate with synonyms or related terms for 'Platter Lift', separated by commas>"
+                    "name": "Plataforma Elevadora"
                 },
                 "aerialway/pylon": {
-                    "name": "Pilón Vía Aérea",
-                    "terms": "<translate with synonyms or related terms for 'Aerialway Pylon', separated by commas>"
+                    "name": "Pilón Vía Aérea"
                 },
                 "aerialway/rope_tow": {
-                    "name": "Ascensor de Corda de Remolque",
-                    "terms": "<translate with synonyms or related terms for 'Rope Tow Lift', separated by commas>"
+                    "name": "Ascensor de Corda de Remolque"
                 },
                 "aerialway/station": {
-                    "name": "Estación Vía Aérea",
-                    "terms": "<translate with synonyms or related terms for 'Aerialway Station', separated by commas>"
+                    "name": "Estación Vía Aérea"
                 },
                 "aerialway/t-bar": {
-                    "name": "Elevador en T-bar",
-                    "terms": "<translate with synonyms or related terms for 'T-bar Lift', separated by commas>"
+                    "name": "Elevador en T-bar"
                 },
                 "aeroway": {
                     "name": "Vía aérea"
                 },
                 "aeroway/aerodrome": {
                     "name": "Aeroporto",
-                    "terms": "<translate with synonyms or related terms for 'Airport', separated by commas>"
+                    "terms": "aeroporto, avión, aeródromo, terminal"
                 },
                 "aeroway/apron": {
-                    "name": "Diantal",
-                    "terms": "<translate with synonyms or related terms for 'Apron', separated by commas>"
+                    "name": "Diantal"
                 },
                 "aeroway/gate": {
-                    "name": "Aeroporto Porta",
-                    "terms": "<translate with synonyms or related terms for 'Airport Gate', separated by commas>"
+                    "name": "Aeroporto Porta"
                 },
                 "aeroway/hangar": {
-                    "name": "Hangar",
-                    "terms": "<translate with synonyms or related terms for 'Hangar', separated by commas>"
+                    "name": "Hangar"
                 },
                 "aeroway/helipad": {
                     "name": "Heliporto",
-                    "terms": "<translate with synonyms or related terms for 'Helipad', separated by commas>"
+                    "terms": "heliporto, helicóptero"
                 },
                 "aeroway/runway": {
-                    "name": "Pista",
-                    "terms": "<translate with synonyms or related terms for 'Runway', separated by commas>"
+                    "name": "Pista"
                 },
                 "aeroway/taxiway": {
-                    "name": "Carril Taxi",
-                    "terms": "<translate with synonyms or related terms for 'Taxiway', separated by commas>"
+                    "name": "Carril Taxi"
                 },
                 "aeroway/terminal": {
-                    "name": "Aeroporto Terminal",
-                    "terms": "<translate with synonyms or related terms for 'Airport Terminal', separated by commas>"
+                    "name": "Aeroporto Terminal"
                 },
                 "amenity": {
                     "name": "Instalacións"
                 },
                 "amenity/animal_boarding": {
-                    "name": "Embarque de Animais",
-                    "terms": "<translate with synonyms or related terms for 'Animal Boarding Facility', separated by commas>"
+                    "name": "Embarque de Animais"
                 },
                 "amenity/animal_breeding": {
-                    "name": "Mellora Animal",
-                    "terms": "<translate with synonyms or related terms for 'Animal Breeding Facility', separated by commas>"
+                    "name": "Mellora Animal"
                 },
                 "amenity/animal_shelter": {
-                    "name": "Pousada Animal",
-                    "terms": "<translate with synonyms or related terms for 'Animal Shelter', separated by commas>"
+                    "name": "Pousada Animal"
                 },
                 "amenity/arts_centre": {
-                    "name": "Centro de Arte",
-                    "terms": "<translate with synonyms or related terms for 'Arts Center', separated by commas>"
+                    "name": "Centro de Arte"
                 },
                 "amenity/atm": {
-                    "name": "Caixeiro automático",
-                    "terms": "<translate with synonyms or related terms for 'ATM', separated by commas>"
+                    "name": "Caixeiro automático"
                 },
                 "amenity/bank": {
                     "name": "Banco",
-                    "terms": "<translate with synonyms or related terms for 'Bank', separated by commas>"
+                    "terms": "banco, caixa, entidade financeira"
                 },
                 "amenity/bar": {
                     "name": "Bar de copas",
                     "terms": "pub, bar, bar de copas, bebidas"
                 },
                 "amenity/bbq": {
-                    "name": "Barbacoa/Grella",
-                    "terms": "<translate with synonyms or related terms for 'Barbecue/Grill', separated by commas>"
+                    "name": "Barbacoa/Grella"
                 },
                 "amenity/bench": {
-                    "name": "Banco",
-                    "terms": "<translate with synonyms or related terms for 'Bench', separated by commas>"
+                    "name": "Banco"
                 },
                 "amenity/bicycle_parking": {
-                    "name": "Aparcadoiro de bicicletas",
-                    "terms": "<translate with synonyms or related terms for 'Bicycle Parking', separated by commas>"
+                    "name": "Aparcadoiro de bicicletas"
                 },
                 "amenity/bicycle_rental": {
-                    "name": "Alugamento de bicicletas",
-                    "terms": "<translate with synonyms or related terms for 'Bicycle Rental', separated by commas>"
+                    "name": "Alugamento de bicicletas"
                 },
                 "amenity/bicycle_repair_station": {
-                    "name": "Lugar para ferramentas de reparación de bicicletas",
-                    "terms": "<translate with synonyms or related terms for 'Bicycle Repair Tool Stand', separated by commas>"
+                    "name": "Lugar para ferramentas de reparación de bicicletas"
                 },
                 "amenity/biergarten": {
-                    "name": "Xardín da Cervexa",
-                    "terms": "<translate with synonyms or related terms for 'Beer Garden', separated by commas>"
+                    "name": "Xardín da Cervexa"
                 },
                 "amenity/boat_rental": {
-                    "name": "Aluguer de Botes",
-                    "terms": "<translate with synonyms or related terms for 'Boat Rental', separated by commas>"
+                    "name": "Aluguer de Botes"
                 },
                 "amenity/bureau_de_change": {
-                    "name": "Troco de Divisas",
-                    "terms": "<translate with synonyms or related terms for 'Currency Exchange', separated by commas>"
+                    "name": "Troco de Divisas"
                 },
                 "amenity/bus_station": {
-                    "name": "Estación de autobuses",
-                    "terms": "<translate with synonyms or related terms for 'Bus Station', separated by commas>"
+                    "name": "Estación de autobuses"
                 },
                 "amenity/cafe": {
                     "name": "Cafetería",
                     "terms": "cafetería, café, bar"
                 },
                 "amenity/car_rental": {
-                    "name": "Aluguer de automóbiles",
-                    "terms": "<translate with synonyms or related terms for 'Car Rental', separated by commas>"
+                    "name": "Aluguer de automóbiles"
                 },
                 "amenity/car_sharing": {
-                    "name": "Auto Compartido",
-                    "terms": "<translate with synonyms or related terms for 'Car Sharing', separated by commas>"
+                    "name": "Auto Compartido"
                 },
                 "amenity/car_wash": {
-                    "name": "Lavado de automóbiles",
-                    "terms": "<translate with synonyms or related terms for 'Car Wash', separated by commas>"
+                    "name": "Lavado de automóbiles"
                 },
                 "amenity/casino": {
-                    "name": "Casino",
-                    "terms": "<translate with synonyms or related terms for 'Casino', separated by commas>"
+                    "name": "Casino"
                 },
                 "amenity/charging_station": {
-                    "name": "Estación de carga",
-                    "terms": "<translate with synonyms or related terms for 'Charging Station', separated by commas>"
+                    "name": "Estación de carga"
                 },
                 "amenity/childcare": {
-                    "name": "Cuidadora/niñeira",
-                    "terms": "<translate with synonyms or related terms for 'Nursery/Childcare', separated by commas>"
+                    "name": "Cuidadora/niñeira"
                 },
                 "amenity/cinema": {
-                    "name": "Cine",
-                    "terms": "<translate with synonyms or related terms for 'Cinema', separated by commas>"
+                    "name": "Cine"
                 },
                 "amenity/clinic": {
-                    "name": "Clínica",
-                    "terms": "<translate with synonyms or related terms for 'Clinic', separated by commas>"
+                    "name": "Clínica"
                 },
                 "amenity/clock": {
-                    "name": "Reloxo",
-                    "terms": "<translate with synonyms or related terms for 'Clock', separated by commas>"
+                    "name": "Reloxo"
                 },
                 "amenity/college": {
-                    "name": "Zona Universitaria",
-                    "terms": "<translate with synonyms or related terms for 'College Grounds', separated by commas>"
+                    "name": "Zona Universitaria"
                 },
                 "amenity/community_centre": {
-                    "name": "Centro Comunitario",
-                    "terms": "<translate with synonyms or related terms for 'Community Center', separated by commas>"
+                    "name": "Centro Comunitario"
                 },
                 "amenity/compressed_air": {
-                    "name": "Aire Comprimido",
-                    "terms": "<translate with synonyms or related terms for 'Compressed Air', separated by commas>"
+                    "name": "Aire Comprimido"
                 },
                 "amenity/courthouse": {
-                    "name": "Pazo de xustiza",
-                    "terms": "<translate with synonyms or related terms for 'Courthouse', separated by commas>"
+                    "name": "Pazo de xustiza"
                 },
                 "amenity/coworking_space": {
                     "name": "Espacio de Cotraballo"
                 },
                 "amenity/crematorium": {
-                    "name": "Crematorio",
-                    "terms": "<translate with synonyms or related terms for 'Crematorium', separated by commas>"
+                    "name": "Crematorio"
                 },
                 "amenity/dentist": {
-                    "name": "Dentista",
-                    "terms": "<translate with synonyms or related terms for 'Dentist', separated by commas>"
+                    "name": "Dentista"
                 },
                 "amenity/doctors": {
-                    "name": "Doutor",
-                    "terms": "<translate with synonyms or related terms for 'Doctor', separated by commas>"
+                    "name": "Doutor"
                 },
                 "amenity/dojo": {
-                    "name": "Dojo/Academia de Artes Marciais",
-                    "terms": "<translate with synonyms or related terms for 'Dojo / Martial Arts Academy', separated by commas>"
+                    "name": "Dojo/Academia de Artes Marciais"
                 },
                 "amenity/drinking_water": {
-                    "name": "Fonte",
-                    "terms": "<translate with synonyms or related terms for 'Drinking Water', separated by commas>"
+                    "name": "Fonte"
                 },
                 "amenity/driving_school": {
-                    "name": "Autoescola",
-                    "terms": "<translate with synonyms or related terms for 'Driving School', separated by commas>"
+                    "name": "Autoescola"
                 },
                 "amenity/embassy": {
-                    "name": "Embaixada",
-                    "terms": "<translate with synonyms or related terms for 'Embassy', separated by commas>"
+                    "name": "Embaixada"
                 },
                 "amenity/fast_food": {
-                    "name": "Comida Rápida",
-                    "terms": "<translate with synonyms or related terms for 'Fast Food', separated by commas>"
+                    "name": "Comida Rápida"
                 },
                 "amenity/ferry_terminal": {
-                    "name": "Terminal Ferry",
-                    "terms": "<translate with synonyms or related terms for 'Ferry Terminal', separated by commas>"
+                    "name": "Terminal Ferry"
                 },
                 "amenity/fire_station": {
-                    "name": "Parque de bombeiros",
-                    "terms": "<translate with synonyms or related terms for 'Fire Station', separated by commas>"
+                    "name": "Parque de bombeiros"
                 },
                 "amenity/food_court": {
-                    "name": "Zona de Comidas",
-                    "terms": "<translate with synonyms or related terms for 'Food Court', separated by commas>"
+                    "name": "Zona de Comidas"
                 },
                 "amenity/fountain": {
-                    "name": "Fonte ornamental",
-                    "terms": "<translate with synonyms or related terms for 'Fountain', separated by commas>"
+                    "name": "Fonte ornamental"
                 },
                 "amenity/fuel": {
-                    "name": "Gasolineira",
-                    "terms": "<translate with synonyms or related terms for 'Gas Station', separated by commas>"
+                    "name": "Gasolineira"
                 },
                 "amenity/grave_yard": {
-                    "name": "Cemiterio",
-                    "terms": "<translate with synonyms or related terms for 'Graveyard', separated by commas>"
+                    "name": "Cemiterio"
                 },
                 "amenity/grit_bin": {
-                    "name": "Papeleira",
-                    "terms": "<translate with synonyms or related terms for 'Grit Bin', separated by commas>"
+                    "name": "Papeleira"
                 },
                 "amenity/hospital": {
-                    "name": "Hospital",
-                    "terms": "<translate with synonyms or related terms for 'Hospital Grounds', separated by commas>"
+                    "name": "Hospital"
                 },
                 "amenity/hunting_stand": {
-                    "name": "Stand de Caza",
-                    "terms": "<translate with synonyms or related terms for 'Hunting Stand', separated by commas>"
+                    "name": "Stand de Caza"
                 },
                 "amenity/ice_cream": {
-                    "name": "Xeladería",
-                    "terms": "<translate with synonyms or related terms for 'Ice Cream Shop', separated by commas>"
+                    "name": "Xeladería"
                 },
                 "amenity/internet_cafe": {
-                    "name": "Internet Café",
-                    "terms": "<translate with synonyms or related terms for 'Internet Cafe', separated by commas>"
+                    "name": "Internet Café"
                 },
                 "amenity/kindergarten": {
-                    "name": "Preescolar/Xardín de Infancia Terreos",
-                    "terms": "<translate with synonyms or related terms for 'Preschool/Kindergarten Grounds', separated by commas>"
+                    "name": "Preescolar/Xardín de Infancia Terreos"
                 },
                 "amenity/library": {
-                    "name": "Biblioteca",
-                    "terms": "<translate with synonyms or related terms for 'Library', separated by commas>"
+                    "name": "Biblioteca"
                 },
                 "amenity/marketplace": {
-                    "name": "Mercado",
-                    "terms": "<translate with synonyms or related terms for 'Marketplace', separated by commas>"
+                    "name": "Mercado"
                 },
                 "amenity/motorcycle_parking": {
-                    "name": "Aparcamento de Motos",
-                    "terms": "<translate with synonyms or related terms for 'Motorcycle Parking', separated by commas>"
+                    "name": "Aparcamento de Motos"
                 },
                 "amenity/nightclub": {
                     "name": "Pub",
@@ -2536,88 +2469,72 @@
                     "name": "Residencia de Anciáns"
                 },
                 "amenity/parking": {
-                    "name": "Aparcadoiro de automóbiles",
-                    "terms": "<translate with synonyms or related terms for 'Car Parking', separated by commas>"
+                    "name": "Aparcadoiro de automóbiles"
                 },
                 "amenity/parking_entrance": {
-                    "name": "Garaxe Aparcamento Entrada/Saída",
-                    "terms": "<translate with synonyms or related terms for 'Parking Garage Entrance/Exit', separated by commas>"
+                    "name": "Garaxe Aparcamento Entrada/Saída"
                 },
                 "amenity/parking_space": {
-                    "name": "Espazo de Aparcamento",
-                    "terms": "<translate with synonyms or related terms for 'Parking Space', separated by commas>"
+                    "name": "Espazo de Aparcamento"
                 },
                 "amenity/pavilion": {
-                    "name": "Pavillón",
-                    "terms": "<translate with synonyms or related terms for 'Pavilion', separated by commas>"
+                    "name": "Pavillón"
                 },
                 "amenity/pharmacy": {
-                    "name": "Farmacia",
-                    "terms": "<translate with synonyms or related terms for 'Pharmacy', separated by commas>"
+                    "name": "Farmacia"
                 },
                 "amenity/place_of_worship": {
                     "name": "Lugar de culto",
                     "terms": "lugar de culto, igrexa, templo, capela, basílica, parroquia, santuario, ermida, catedral, sinagoga, mesquita"
                 },
                 "amenity/place_of_worship/buddhist": {
-                    "name": "Templo Budista",
-                    "terms": "<translate with synonyms or related terms for 'Buddhist Temple', separated by commas>"
+                    "name": "Templo Budista"
                 },
                 "amenity/place_of_worship/christian": {
                     "name": "Igrexa",
                     "terms": "igrexa, capela, parroquia, templo, ermida, santuario"
                 },
                 "amenity/place_of_worship/jewish": {
-                    "name": "Sinagoga",
-                    "terms": "<translate with synonyms or related terms for 'Synagogue', separated by commas>"
+                    "name": "Sinagoga"
                 },
                 "amenity/place_of_worship/muslim": {
-                    "name": "Mesquita",
-                    "terms": "<translate with synonyms or related terms for 'Mosque', separated by commas>"
+                    "name": "Mesquita"
                 },
                 "amenity/planetarium": {
-                    "name": "Planetario",
-                    "terms": "<translate with synonyms or related terms for 'Planetarium', separated by commas>"
+                    "name": "Planetario"
                 },
                 "amenity/police": {
                     "name": "Policía",
-                    "terms": "<translate with synonyms or related terms for 'Police', separated by commas>"
+                    "terms": "policía, comisaría, cuartel, policía local, policía nacional, garda civil, forzas de seguridade"
                 },
                 "amenity/post_box": {
                     "name": "Caixa do correo",
                     "terms": "correo, buzón, correos, mensaxería, postal"
                 },
                 "amenity/post_office": {
-                    "name": "Oficina de Correos",
-                    "terms": "<translate with synonyms or related terms for 'Post Office', separated by commas>"
+                    "name": "Oficina de Correos"
                 },
                 "amenity/prison": {
-                    "name": "Penitenciaria",
-                    "terms": "<translate with synonyms or related terms for 'Prison Grounds', separated by commas>"
+                    "name": "Penitenciaria"
                 },
                 "amenity/pub": {
                     "name": "Bar",
                     "terms": "Pub, bar, café, cafetería"
                 },
                 "amenity/public_bath": {
-                    "name": "Baño Público",
-                    "terms": "<translate with synonyms or related terms for 'Public Bath', separated by commas>"
+                    "name": "Baño Público"
                 },
                 "amenity/public_bookcase": {
-                    "name": "Estantería Pública",
-                    "terms": "<translate with synonyms or related terms for 'Public Bookcase', separated by commas>"
+                    "name": "Estantería Pública"
                 },
                 "amenity/ranger_station": {
-                    "name": "Garda Bosques Estación",
-                    "terms": "<translate with synonyms or related terms for 'Ranger Station', separated by commas>"
+                    "name": "Garda Bosques Estación"
                 },
                 "amenity/recycling": {
-                    "name": "Reciclaxe",
-                    "terms": "<translate with synonyms or related terms for 'Recycling', separated by commas>"
+                    "name": "Reciclaxe"
                 },
                 "amenity/recycling_centre": {
-                    "name": "Centro de Reciclaxe",
-                    "terms": "<translate with synonyms or related terms for 'Recycling Center', separated by commas>"
+                    "name": "Centro de Reciclaxe"
                 },
                 "amenity/register_office": {
                     "name": "Oficina de Rexistro"
@@ -2627,574 +2544,442 @@
                     "terms": "restaurante, mesón, taberna, comedor, comida, comer, xantar, cear, menú"
                 },
                 "amenity/sanitary_dump_station": {
-                    "name": "RV WC Eliminación",
-                    "terms": "<translate with synonyms or related terms for 'RV Toilet Disposal', separated by commas>"
+                    "name": "RV WC Eliminación"
                 },
                 "amenity/school": {
                     "name": "Escola Terreos",
                     "terms": "escola, colexio, instituto, educación, ensinanza, primaria, secundaria, ESO, bacharelato"
                 },
                 "amenity/scrapyard": {
-                    "name": "Depósito de Chatarra",
-                    "terms": "<translate with synonyms or related terms for 'Scrap Yard', separated by commas>"
+                    "name": "Depósito de Chatarra"
                 },
                 "amenity/shelter": {
-                    "name": "Abrigo",
-                    "terms": "<translate with synonyms or related terms for 'Shelter', separated by commas>"
+                    "name": "Abrigo"
                 },
                 "amenity/social_facility": {
-                    "name": "Axuda Social",
-                    "terms": "<translate with synonyms or related terms for 'Social Facility', separated by commas>"
+                    "name": "Axuda Social"
                 },
                 "amenity/social_facility/food_bank": {
-                    "name": "Banco de Alimentos",
-                    "terms": "<translate with synonyms or related terms for 'Food Bank', separated by commas>"
+                    "name": "Banco de Alimentos"
                 },
                 "amenity/social_facility/group_home": {
-                    "name": "Grupo de Vellos Fogar",
-                    "terms": "<translate with synonyms or related terms for 'Elderly Group Home', separated by commas>"
+                    "name": "Grupo de Vellos Fogar"
                 },
                 "amenity/social_facility/homeless_shelter": {
-                    "name": "Refuxio para Indixentes",
-                    "terms": "<translate with synonyms or related terms for 'Homeless Shelter', separated by commas>"
+                    "name": "Refuxio para Indixentes"
                 },
                 "amenity/social_facility/nursing_home": {
-                    "name": "Residencia de Anciáns",
-                    "terms": "<translate with synonyms or related terms for 'Nursing Home', separated by commas>"
+                    "name": "Residencia de Anciáns"
                 },
                 "amenity/studio": {
-                    "name": "Estudio",
-                    "terms": "<translate with synonyms or related terms for 'Studio', separated by commas>"
+                    "name": "Estudio"
                 },
                 "amenity/swimming_pool": {
                     "name": "Piscina"
                 },
                 "amenity/taxi": {
-                    "name": "Parada de taxis",
-                    "terms": "<translate with synonyms or related terms for 'Taxi Stand', separated by commas>"
+                    "name": "Parada de taxis"
                 },
                 "amenity/telephone": {
-                    "name": "Teléfono",
-                    "terms": "<translate with synonyms or related terms for 'Telephone', separated by commas>"
+                    "name": "Teléfono"
                 },
                 "amenity/theatre": {
-                    "name": "Teatro",
-                    "terms": "<translate with synonyms or related terms for 'Theater', separated by commas>"
+                    "name": "Teatro"
                 },
                 "amenity/toilets": {
-                    "name": "Aseos",
-                    "terms": "<translate with synonyms or related terms for 'Toilets', separated by commas>"
+                    "name": "Aseos"
                 },
                 "amenity/townhall": {
                     "name": "Casa do Concello",
                     "terms": "casa do concello, concello, consistorio, municipio, municipal, cabido"
                 },
                 "amenity/university": {
-                    "name": "Campus",
-                    "terms": "<translate with synonyms or related terms for 'University Grounds', separated by commas>"
+                    "name": "Campus"
                 },
                 "amenity/vending_machine": {
-                    "name": "Máquina de Vending",
-                    "terms": "<translate with synonyms or related terms for 'Vending Machine', separated by commas>"
+                    "name": "Máquina de Vending"
                 },
                 "amenity/vending_machine/cigarettes": {
-                    "name": "Expendedora de Tabaco",
-                    "terms": "<translate with synonyms or related terms for 'Cigarette Vending Machine', separated by commas>"
+                    "name": "Expendedora de Tabaco"
                 },
                 "amenity/vending_machine/condoms": {
-                    "name": "Expendedora de Condóns",
-                    "terms": "<translate with synonyms or related terms for 'Condom Vending Machine', separated by commas>"
+                    "name": "Expendedora de Condóns"
                 },
                 "amenity/vending_machine/drinks": {
-                    "name": "Mánquina de Vending, Bebidas",
-                    "terms": "<translate with synonyms or related terms for 'Drink Vending Machine', separated by commas>"
+                    "name": "Mánquina de Vending, Bebidas"
                 },
                 "amenity/vending_machine/excrement_bags": {
-                    "name": "Caca Can",
-                    "terms": "<translate with synonyms or related terms for 'Excrement Bag Vending Machine', separated by commas>"
+                    "name": "Caca Can"
                 },
                 "amenity/vending_machine/news_papers": {
                     "name": "Expendedora de Xornais"
                 },
                 "amenity/vending_machine/newspapers": {
-                    "name": "Máquina Expendedora de Xornais",
-                    "terms": "<translate with synonyms or related terms for 'Newspaper Vending Machine', separated by commas>"
+                    "name": "Máquina Expendedora de Xornais"
                 },
                 "amenity/vending_machine/parcel_pickup_dropoff": {
-                    "name": "Máquina expendedora de recollida/entrega de paquetes",
-                    "terms": "<translate with synonyms or related terms for 'Parcel Pickup/Dropoff Vending Machine', separated by commas>"
+                    "name": "Máquina expendedora de recollida/entrega de paquetes"
                 },
                 "amenity/vending_machine/parking_tickets": {
-                    "name": "Máquina Parquímetro",
-                    "terms": "<translate with synonyms or related terms for 'Parking Ticket Vending Machine', separated by commas>"
+                    "name": "Máquina Parquímetro"
                 },
                 "amenity/vending_machine/public_transport_tickets": {
-                    "name": "Expendedora Tickets de Tránsito",
-                    "terms": "<translate with synonyms or related terms for 'Transit Ticket Vending Machine', separated by commas>"
+                    "name": "Expendedora Tickets de Tránsito"
                 },
                 "amenity/vending_machine/sweets": {
-                    "name": "Expendedora de Snacks",
-                    "terms": "<translate with synonyms or related terms for 'Snack Vending Machine', separated by commas>"
+                    "name": "Expendedora de Snacks"
                 },
                 "amenity/veterinary": {
-                    "name": "Veterinario",
-                    "terms": "<translate with synonyms or related terms for 'Veterinary', separated by commas>"
+                    "name": "Veterinario"
                 },
                 "amenity/waste_basket": {
                     "name": "Papeleira",
-                    "terms": "<translate with synonyms or related terms for 'Waste Basket', separated by commas>"
+                    "terms": "papeleira, lixo, basura"
                 },
                 "amenity/waste_disposal": {
-                    "name": "Vertedeiro",
-                    "terms": "<translate with synonyms or related terms for 'Garbage Dumpster', separated by commas>"
+                    "name": "Vertedeiro"
                 },
                 "amenity/waste_transfer_station": {
-                    "name": "Estación de Bombeo Augas Residuais",
-                    "terms": "<translate with synonyms or related terms for 'Waste Transfer Station', separated by commas>"
+                    "name": "Estación de Bombeo Augas Residuais"
                 },
                 "amenity/water_point": {
-                    "name": "Auga potable de RV",
-                    "terms": "<translate with synonyms or related terms for 'RV Drinking Water', separated by commas>"
+                    "name": "Auga potable de RV"
                 },
                 "amenity/watering_place": {
-                    "name": "Bebedoiro de animais",
-                    "terms": "<translate with synonyms or related terms for 'Animal Watering Place', separated by commas>"
+                    "name": "Bebedoiro de animais"
                 },
                 "area": {
-                    "name": "Área",
-                    "terms": "<translate with synonyms or related terms for 'Area', separated by commas>"
+                    "name": "Área"
                 },
                 "area/highway": {
-                    "name": "Superficie da Estrada",
-                    "terms": "<translate with synonyms or related terms for 'Road Surface', separated by commas>"
+                    "name": "Superficie da Estrada"
                 },
                 "barrier": {
-                    "name": "Barreira",
-                    "terms": "<translate with synonyms or related terms for 'Barrier', separated by commas>"
+                    "name": "Barreira"
                 },
                 "barrier/block": {
-                    "name": "Bloque",
-                    "terms": "<translate with synonyms or related terms for 'Block', separated by commas>"
+                    "name": "Bloque"
                 },
                 "barrier/bollard": {
-                    "name": "Bolardo",
-                    "terms": "<translate with synonyms or related terms for 'Bollard', separated by commas>"
+                    "name": "Bolardo"
                 },
                 "barrier/border_control": {
-                    "name": "Alfándega",
-                    "terms": "<translate with synonyms or related terms for 'Border Control', separated by commas>"
+                    "name": "Alfándega"
                 },
                 "barrier/cattle_grid": {
-                    "name": "Reixa de Retención",
-                    "terms": "<translate with synonyms or related terms for 'Cattle Grid', separated by commas>"
+                    "name": "Reixa de Retención"
                 },
                 "barrier/city_wall": {
-                    "name": "Muralla",
-                    "terms": "<translate with synonyms or related terms for 'City Wall', separated by commas>"
+                    "name": "Muralla"
                 },
                 "barrier/cycle_barrier": {
-                    "name": "Barreira Ciclista",
-                    "terms": "<translate with synonyms or related terms for 'Cycle Barrier', separated by commas>"
+                    "name": "Barreira Ciclista"
                 },
                 "barrier/ditch": {
-                    "name": "Trincheira",
-                    "terms": "<translate with synonyms or related terms for 'Trench', separated by commas>"
+                    "name": "Trincheira"
                 },
                 "barrier/entrance": {
                     "name": "Entrada"
                 },
                 "barrier/fence": {
-                    "name": "Valado",
-                    "terms": "<translate with synonyms or related terms for 'Fence', separated by commas>"
+                    "name": "Valado"
                 },
                 "barrier/gate": {
-                    "name": "Porta",
-                    "terms": "<translate with synonyms or related terms for 'Gate', separated by commas>"
+                    "name": "Porta"
                 },
                 "barrier/hedge": {
-                    "name": "Cobertura",
-                    "terms": "<translate with synonyms or related terms for 'Hedge', separated by commas>"
+                    "name": "Cobertura"
                 },
                 "barrier/kissing_gate": {
-                    "name": "Porta Kissing",
-                    "terms": "<translate with synonyms or related terms for 'Kissing Gate', separated by commas>"
+                    "name": "Porta Kissing"
                 },
                 "barrier/lift_gate": {
-                    "name": "Barreira levadiza",
-                    "terms": "<translate with synonyms or related terms for 'Lift Gate', separated by commas>"
+                    "name": "Barreira levadiza"
                 },
                 "barrier/retaining_wall": {
-                    "name": "Muro de contención",
-                    "terms": "<translate with synonyms or related terms for 'Retaining Wall', separated by commas>"
+                    "name": "Muro de contención"
                 },
                 "barrier/stile": {
-                    "name": "Escada",
-                    "terms": "<translate with synonyms or related terms for 'Stile', separated by commas>"
+                    "name": "Escada"
                 },
                 "barrier/toll_booth": {
-                    "name": "Peaxe",
-                    "terms": "<translate with synonyms or related terms for 'Toll Booth', separated by commas>"
+                    "name": "Peaxe"
                 },
                 "barrier/wall": {
-                    "name": "Muro",
-                    "terms": "<translate with synonyms or related terms for 'Wall', separated by commas>"
+                    "name": "Muro"
                 },
                 "boundary/administrative": {
-                    "name": "Límite administrativo",
-                    "terms": "<translate with synonyms or related terms for 'Administrative Boundary', separated by commas>"
+                    "name": "Límite administrativo"
                 },
                 "building": {
-                    "name": "Edificio",
-                    "terms": "<translate with synonyms or related terms for 'Building', separated by commas>"
+                    "name": "Edificio"
                 },
                 "building/apartments": {
-                    "name": "Apartamentos",
-                    "terms": "<translate with synonyms or related terms for 'Apartments', separated by commas>"
+                    "name": "Apartamentos"
                 },
                 "building/barn": {
-                    "name": "Celeiro-Hórreo",
-                    "terms": "<translate with synonyms or related terms for 'Barn', separated by commas>"
+                    "name": "Celeiro-Hórreo"
                 },
                 "building/bunker": {
                     "name": "Bunker"
                 },
                 "building/cabin": {
-                    "name": "Cabina",
-                    "terms": "<translate with synonyms or related terms for 'Cabin', separated by commas>"
+                    "name": "Cabina"
                 },
                 "building/cathedral": {
-                    "name": "Catedral Edificio",
-                    "terms": "<translate with synonyms or related terms for 'Cathedral Building', separated by commas>"
+                    "name": "Catedral Edificio"
                 },
                 "building/chapel": {
-                    "name": "Capela Edificio",
-                    "terms": "<translate with synonyms or related terms for 'Chapel Building', separated by commas>"
+                    "name": "Capela Edificio"
                 },
                 "building/church": {
-                    "name": "Igrexa edificio",
-                    "terms": "<translate with synonyms or related terms for 'Church Building', separated by commas>"
+                    "name": "Igrexa edificio"
                 },
                 "building/college": {
-                    "name": "Colexio edificio",
-                    "terms": "<translate with synonyms or related terms for 'College Building', separated by commas>"
+                    "name": "Colexio edificio"
                 },
                 "building/commercial": {
-                    "name": "Comercial edificio",
-                    "terms": "<translate with synonyms or related terms for 'Commercial Building', separated by commas>"
+                    "name": "Comercial edificio"
                 },
                 "building/construction": {
-                    "name": "Edificio en Construción",
-                    "terms": "<translate with synonyms or related terms for 'Building Under Construction', separated by commas>"
+                    "name": "Edificio en Construción"
                 },
                 "building/detached": {
-                    "name": "Casa Illada",
-                    "terms": "<translate with synonyms or related terms for 'Detached House', separated by commas>"
+                    "name": "Casa Illada"
                 },
                 "building/dormitory": {
-                    "name": "Dormitorio",
-                    "terms": "<translate with synonyms or related terms for 'Dormitory', separated by commas>"
+                    "name": "Dormitorio"
                 },
                 "building/entrance": {
                     "name": "Entrada/Saída"
                 },
                 "building/garage": {
-                    "name": "Garaxe",
-                    "terms": "<translate with synonyms or related terms for 'Garage', separated by commas>"
+                    "name": "Garaxe"
                 },
                 "building/garages": {
-                    "name": "Garaxes",
-                    "terms": "<translate with synonyms or related terms for 'Garages', separated by commas>"
+                    "name": "Garaxes"
                 },
                 "building/greenhouse": {
-                    "name": "invernadoiro",
-                    "terms": "<translate with synonyms or related terms for 'Greenhouse', separated by commas>"
+                    "name": "invernadoiro"
                 },
                 "building/hospital": {
-                    "name": "Hospital edificio",
-                    "terms": "<translate with synonyms or related terms for 'Hospital Building', separated by commas>"
+                    "name": "Hospital edificio"
                 },
                 "building/hotel": {
-                    "name": "Hotel edificio",
-                    "terms": "<translate with synonyms or related terms for 'Hotel Building', separated by commas>"
+                    "name": "Hotel edificio"
                 },
                 "building/house": {
-                    "name": "Casa",
-                    "terms": "<translate with synonyms or related terms for 'House', separated by commas>"
+                    "name": "Casa"
                 },
                 "building/hut": {
-                    "name": "Refuxio",
-                    "terms": "<translate with synonyms or related terms for 'Hut', separated by commas>"
+                    "name": "Refuxio"
                 },
                 "building/industrial": {
-                    "name": "Edificio Industrial",
-                    "terms": "<translate with synonyms or related terms for 'Industrial Building', separated by commas>"
+                    "name": "Edificio Industrial"
                 },
                 "building/kindergarten": {
-                    "name": "Preescolar/Xardín de Infancia Edificio",
-                    "terms": "<translate with synonyms or related terms for 'Preschool/Kindergarten Building', separated by commas>"
+                    "name": "Preescolar/Xardín de Infancia Edificio"
                 },
                 "building/public": {
-                    "name": "Público Edificio",
-                    "terms": "<translate with synonyms or related terms for 'Public Building', separated by commas>"
+                    "name": "Público Edificio"
                 },
                 "building/residential": {
-                    "name": "Edificio Residencial",
-                    "terms": "<translate with synonyms or related terms for 'Residential Building', separated by commas>"
+                    "name": "Edificio Residencial"
                 },
                 "building/retail": {
-                    "name": "Minorista Edificio",
-                    "terms": "<translate with synonyms or related terms for 'Retail Building', separated by commas>"
+                    "name": "Minorista Edificio"
                 },
                 "building/roof": {
-                    "name": "Tellado",
-                    "terms": "<translate with synonyms or related terms for 'Roof', separated by commas>"
+                    "name": "Tellado"
                 },
                 "building/school": {
-                    "name": "Escola Edificio",
-                    "terms": "<translate with synonyms or related terms for 'School Building', separated by commas>"
+                    "name": "Escola Edificio"
                 },
                 "building/semidetached_house": {
-                    "name": "Casa Adosada",
-                    "terms": "<translate with synonyms or related terms for 'Semi-Detached House', separated by commas>"
+                    "name": "Casa Adosada"
                 },
                 "building/shed": {
-                    "name": "Galpón",
-                    "terms": "<translate with synonyms or related terms for 'Shed', separated by commas>"
+                    "name": "Galpón"
                 },
                 "building/stable": {
-                    "name": "Estable",
-                    "terms": "<translate with synonyms or related terms for 'Stable', separated by commas>"
+                    "name": "Estable"
                 },
                 "building/static_caravan": {
-                    "name": "Casa Móbil Estática",
-                    "terms": "<translate with synonyms or related terms for 'Static Mobile Home', separated by commas>"
+                    "name": "Casa Móbil Estática"
                 },
                 "building/terrace": {
-                    "name": "Casas en fila",
-                    "terms": "<translate with synonyms or related terms for 'Row Houses', separated by commas>"
+                    "name": "Casas en fila"
                 },
                 "building/train_station": {
                     "name": "Estación de tren"
                 },
                 "building/university": {
-                    "name": "Edificio Universitario",
-                    "terms": "<translate with synonyms or related terms for 'University Building', separated by commas>"
+                    "name": "Edificio Universitario"
                 },
                 "building/warehouse": {
-                    "name": "Almacén",
-                    "terms": "<translate with synonyms or related terms for 'Warehouse', separated by commas>"
+                    "name": "Almacén"
                 },
                 "camp_site/camp_pitch": {
-                    "name": "Campamento Pitch",
-                    "terms": "<translate with synonyms or related terms for 'Camp Pitch', separated by commas>"
+                    "name": "Campamento Pitch"
                 },
                 "club": {
-                    "name": "Clube",
-                    "terms": "<translate with synonyms or related terms for 'Club', separated by commas>"
+                    "name": "Clube"
                 },
                 "craft": {
-                    "name": "Oficio",
-                    "terms": "<translate with synonyms or related terms for 'Craft', separated by commas>"
+                    "name": "Oficio"
                 },
                 "craft/basket_maker": {
-                    "name": "Cesteiría",
-                    "terms": "<translate with synonyms or related terms for 'Basket Maker', separated by commas>"
+                    "name": "Cesteiría"
                 },
                 "craft/beekeeper": {
-                    "name": "Apicultor",
-                    "terms": "<translate with synonyms or related terms for 'Beekeeper', separated by commas>"
+                    "name": "Apicultor"
                 },
                 "craft/blacksmith": {
-                    "name": "Ferreiro",
-                    "terms": "<translate with synonyms or related terms for 'Blacksmith', separated by commas>"
+                    "name": "Ferreiro"
                 },
                 "craft/boatbuilder": {
-                    "name": "Carpinteiro de Ribeira",
-                    "terms": "<translate with synonyms or related terms for 'Boat Builder', separated by commas>"
+                    "name": "Carpinteiro de Ribeira"
                 },
                 "craft/bookbinder": {
-                    "name": "Encadernador",
-                    "terms": "<translate with synonyms or related terms for 'Bookbinder', separated by commas>"
+                    "name": "Encadernador"
                 },
                 "craft/brewery": {
-                    "name": "Cervexa",
-                    "terms": "<translate with synonyms or related terms for 'Brewery', separated by commas>"
+                    "name": "Cervexa"
                 },
                 "craft/carpenter": {
-                    "name": "Carpinteiro",
-                    "terms": "<translate with synonyms or related terms for 'Carpenter', separated by commas>"
+                    "name": "Carpinteiro"
                 },
                 "craft/carpet_layer": {
-                    "name": "Capa de Alfombra",
-                    "terms": "<translate with synonyms or related terms for 'Carpet Layer', separated by commas>"
+                    "name": "Capa de Alfombra"
                 },
                 "craft/caterer": {
-                    "name": "Provedor",
-                    "terms": "<translate with synonyms or related terms for 'Caterer', separated by commas>"
+                    "name": "Provedor"
                 },
                 "craft/clockmaker": {
-                    "name": "Reloxeiro",
-                    "terms": "<translate with synonyms or related terms for 'Clockmaker', separated by commas>"
+                    "name": "Reloxeiro"
                 },
                 "craft/confectionery": {
-                    "name": "Repostería",
-                    "terms": "<translate with synonyms or related terms for 'Confectionery', separated by commas>"
+                    "name": "Repostería"
                 },
                 "craft/distillery": {
-                    "name": "Destilaría",
-                    "terms": "<translate with synonyms or related terms for 'Distillery', separated by commas>"
+                    "name": "Destilaría"
                 },
                 "craft/dressmaker": {
-                    "name": "Costureiro/a",
-                    "terms": "<translate with synonyms or related terms for 'Dressmaker', separated by commas>"
+                    "name": "Costureiro/a"
                 },
                 "craft/electrician": {
-                    "name": "Electricista",
-                    "terms": "<translate with synonyms or related terms for 'Electrician', separated by commas>"
+                    "name": "Electricista"
                 },
                 "craft/electronics_repair": {
-                    "name": "Tenda de Reparacións Electrónicas",
-                    "terms": "<translate with synonyms or related terms for 'Electronics Repair Shop', separated by commas>"
+                    "name": "Tenda de Reparacións Electrónicas"
                 },
                 "craft/gardener": {
-                    "name": "Xardineiro/a",
-                    "terms": "<translate with synonyms or related terms for 'Gardener', separated by commas>"
+                    "name": "Xardineiro/a"
                 },
                 "craft/glaziery": {
-                    "name": "Glaciar",
-                    "terms": "<translate with synonyms or related terms for 'Glaziery', separated by commas>"
+                    "name": "Glaciar"
                 },
                 "craft/handicraft": {
-                    "name": "Artesanía",
-                    "terms": "<translate with synonyms or related terms for 'Handicraft', separated by commas>"
+                    "name": "Artesanía"
                 },
                 "craft/hvac": {
-                    "name": "HVAC",
-                    "terms": "<translate with synonyms or related terms for 'HVAC', separated by commas>"
+                    "name": "HVAC"
                 },
                 "craft/insulator": {
-                    "name": "Illador",
-                    "terms": "<translate with synonyms or related terms for 'Insulator', separated by commas>"
+                    "name": "Illador"
                 },
                 "craft/jeweler": {
                     "name": "Xoieiro"
                 },
                 "craft/key_cutter": {
-                    "name": "Copiado de Chaves",
-                    "terms": "<translate with synonyms or related terms for 'Key Cutter', separated by commas>"
+                    "name": "Copiado de Chaves"
                 },
                 "craft/locksmith": {
                     "name": "Cerraxeiro"
                 },
                 "craft/metal_construction": {
-                    "name": "Metal Construción",
-                    "terms": "<translate with synonyms or related terms for 'Metal Construction', separated by commas>"
+                    "name": "Metal Construción"
                 },
                 "craft/optician": {
                     "name": "Óptico"
                 },
                 "craft/painter": {
-                    "name": "Pintor",
-                    "terms": "<translate with synonyms or related terms for 'Painter', separated by commas>"
+                    "name": "Pintor"
                 },
                 "craft/photographer": {
-                    "name": "Fotógrafo",
-                    "terms": "<translate with synonyms or related terms for 'Photographer', separated by commas>"
+                    "name": "Fotógrafo"
                 },
                 "craft/photographic_laboratory": {
-                    "name": "Laboratorio de Fotografía",
-                    "terms": "<translate with synonyms or related terms for 'Photographic Laboratory', separated by commas>"
+                    "name": "Laboratorio de Fotografía"
                 },
                 "craft/plasterer": {
-                    "name": "Xesero",
-                    "terms": "<translate with synonyms or related terms for 'Plasterer', separated by commas>"
+                    "name": "Xesero"
                 },
                 "craft/plumber": {
-                    "name": "Fontaneiro",
-                    "terms": "<translate with synonyms or related terms for 'Plumber', separated by commas>"
+                    "name": "Fontaneiro"
                 },
                 "craft/pottery": {
-                    "name": "Cerámica",
-                    "terms": "<translate with synonyms or related terms for 'Pottery', separated by commas>"
+                    "name": "Cerámica"
                 },
                 "craft/rigger": {
-                    "name": "Aparellador",
-                    "terms": "<translate with synonyms or related terms for 'Rigger', separated by commas>"
+                    "name": "Aparellador"
                 },
                 "craft/roofer": {
-                    "name": "Tellador",
-                    "terms": "<translate with synonyms or related terms for 'Roofer', separated by commas>"
+                    "name": "Tellador"
                 },
                 "craft/saddler": {
-                    "name": "Seleiro",
-                    "terms": "<translate with synonyms or related terms for 'Saddler', separated by commas>"
+                    "name": "Seleiro"
                 },
                 "craft/sailmaker": {
-                    "name": "Fabricante de Velas Mariñas",
-                    "terms": "<translate with synonyms or related terms for 'Sailmaker', separated by commas>"
+                    "name": "Fabricante de Velas Mariñas"
                 },
                 "craft/sawmill": {
-                    "name": "Serraría",
-                    "terms": "<translate with synonyms or related terms for 'Sawmill', separated by commas>"
+                    "name": "Serraría"
                 },
                 "craft/scaffolder": {
-                    "name": "Scaffolder",
-                    "terms": "<translate with synonyms or related terms for 'Scaffolder', separated by commas>"
+                    "name": "Scaffolder"
                 },
                 "craft/sculpter": {
-                    "name": "Escultor",
-                    "terms": "<translate with synonyms or related terms for 'Sculpter', separated by commas>"
+                    "name": "Escultor"
                 },
                 "craft/shoemaker": {
-                    "name": "Zapateiro",
-                    "terms": "<translate with synonyms or related terms for 'Shoemaker', separated by commas>"
+                    "name": "Zapateiro"
                 },
                 "craft/stonemason": {
-                    "name": "Albanel",
-                    "terms": "<translate with synonyms or related terms for 'Stonemason', separated by commas>"
+                    "name": "Albanel"
                 },
                 "craft/sweep": {
-                    "name": "Limpa Chemineas",
-                    "terms": "<translate with synonyms or related terms for 'Chimney Sweep', separated by commas>"
+                    "name": "Limpa Chemineas"
                 },
                 "craft/tailor": {
                     "name": "Xastre"
                 },
                 "craft/tiler": {
-                    "name": "Tellador",
-                    "terms": "<translate with synonyms or related terms for 'Tiler', separated by commas>"
+                    "name": "Tellador"
                 },
                 "craft/tinsmith": {
-                    "name": "Follalateiro",
-                    "terms": "<translate with synonyms or related terms for 'Tinsmith', separated by commas>"
+                    "name": "Follalateiro"
                 },
                 "craft/upholsterer": {
-                    "name": "Tapiceiro",
-                    "terms": "<translate with synonyms or related terms for 'Upholsterer', separated by commas>"
+                    "name": "Tapiceiro"
                 },
                 "craft/watchmaker": {
-                    "name": "Reloxeiro",
-                    "terms": "<translate with synonyms or related terms for 'Watchmaker', separated by commas>"
+                    "name": "Reloxeiro"
                 },
                 "craft/window_construction": {
-                    "name": "Fabricación de Fiestras",
-                    "terms": "<translate with synonyms or related terms for 'Window Construction', separated by commas>"
+                    "name": "Fabricación de Fiestras"
                 },
                 "craft/winery": {
-                    "name": "Lagar",
-                    "terms": "<translate with synonyms or related terms for 'Winery', separated by commas>"
+                    "name": "Lagar"
                 },
                 "embankment": {
-                    "name": "Terraplén",
-                    "terms": "<translate with synonyms or related terms for 'Embankment', separated by commas>"
+                    "name": "Terraplén"
                 },
                 "emergency/ambulance_station": {
-                    "name": "Estación de Ambulancias",
-                    "terms": "<translate with synonyms or related terms for 'Ambulance Station', separated by commas>"
+                    "name": "Estación de Ambulancias"
                 },
                 "emergency/defibrillator": {
-                    "name": "Desfibrilador",
-                    "terms": "<translate with synonyms or related terms for 'Defibrillator', separated by commas>"
+                    "name": "Desfibrilador"
                 },
                 "emergency/designated": {
                     "name": "Acceso de emerxencia designado"
@@ -3203,8 +2988,7 @@
                     "name": "Acceso de Emerxencia Designado"
                 },
                 "emergency/fire_hydrant": {
-                    "name": "Boca de incendio",
-                    "terms": "<translate with synonyms or related terms for 'Fire Hydrant', separated by commas>"
+                    "name": "Boca de incendio"
                 },
                 "emergency/no": {
                     "name": "Sen Acceso de Emerxencia"
@@ -3213,8 +2997,7 @@
                     "name": "Acceso de Emerxencia Oficial"
                 },
                 "emergency/phone": {
-                    "name": "Teléfono de emerxencia",
-                    "terms": "<translate with synonyms or related terms for 'Emergency Phone', separated by commas>"
+                    "name": "Teléfono de emerxencia"
                 },
                 "emergency/private": {
                     "name": "Acceso de Emerxencia Privado"
@@ -3223,1918 +3006,1462 @@
                     "name": "Acceso de Emerxencia Si"
                 },
                 "entrance": {
-                    "name": "Entrada/Saída",
-                    "terms": "<translate with synonyms or related terms for 'Entrance/Exit', separated by commas>"
+                    "name": "Entrada/Saída"
                 },
                 "footway/crossing": {
-                    "name": "Cruce de Estradas",
-                    "terms": "<translate with synonyms or related terms for 'Street Crossing', separated by commas>"
+                    "name": "Cruce de Estradas"
                 },
                 "footway/crosswalk": {
-                    "name": "Paso de Peóns",
-                    "terms": "<translate with synonyms or related terms for 'Pedestrian Crosswalk', separated by commas>"
+                    "name": "Paso de Peóns"
                 },
                 "footway/sidewalk": {
-                    "name": "Beirarrúa",
-                    "terms": "<translate with synonyms or related terms for 'Sidewalk', separated by commas>"
+                    "name": "Beirarrúa"
                 },
                 "ford": {
-                    "name": "Vao",
-                    "terms": "<translate with synonyms or related terms for 'Ford', separated by commas>"
+                    "name": "Vao"
                 },
                 "golf/bunker": {
-                    "name": "Trampa de Area",
-                    "terms": "<translate with synonyms or related terms for 'Sand Trap', separated by commas>"
+                    "name": "Trampa de Area"
                 },
                 "golf/fairway": {
-                    "name": "Camiño Acceso",
-                    "terms": "<translate with synonyms or related terms for 'Fairway', separated by commas>"
+                    "name": "Camiño Acceso"
                 },
                 "golf/green": {
-                    "name": "Putting Green",
-                    "terms": "<translate with synonyms or related terms for 'Putting Green', separated by commas>"
+                    "name": "Putting Green"
                 },
                 "golf/hole": {
-                    "name": "Burato de Golf",
-                    "terms": "<translate with synonyms or related terms for 'Golf Hole', separated by commas>"
+                    "name": "Burato de Golf"
                 },
                 "golf/lateral_water_hazard_area": {
-                    "name": "Risco de Auga Lateral",
-                    "terms": "<translate with synonyms or related terms for 'Lateral Water Hazard', separated by commas>"
+                    "name": "Risco de Auga Lateral"
                 },
                 "golf/lateral_water_hazard_line": {
-                    "name": "Risco de Auga Lateral",
-                    "terms": "<translate with synonyms or related terms for 'Lateral Water Hazard', separated by commas>"
+                    "name": "Risco de Auga Lateral"
                 },
                 "golf/rough": {
-                    "name": "Duro",
-                    "terms": "<translate with synonyms or related terms for 'Rough', separated by commas>"
+                    "name": "Duro"
                 },
                 "golf/tee": {
-                    "name": "Caixa de Te",
-                    "terms": "<translate with synonyms or related terms for 'Tee Box', separated by commas>"
+                    "name": "Caixa de Te"
                 },
                 "golf/water_hazard_area": {
-                    "name": "Obstáculo de Auga",
-                    "terms": "<translate with synonyms or related terms for 'Water Hazard', separated by commas>"
+                    "name": "Obstáculo de Auga"
                 },
                 "golf/water_hazard_line": {
-                    "name": "Obstáculo de Auga",
-                    "terms": "<translate with synonyms or related terms for 'Water Hazard', separated by commas>"
+                    "name": "Obstáculo de Auga"
                 },
                 "healthcare/blood_donation": {
-                    "name": "Doación de Sangue",
-                    "terms": "<translate with synonyms or related terms for 'Blood Donor Center', separated by commas>"
+                    "name": "Doación de Sangue"
                 },
                 "highway": {
                     "name": "Estrada"
                 },
                 "highway/bridleway": {
-                    "name": "Camiño de ferradura",
-                    "terms": "<translate with synonyms or related terms for 'Bridle Path', separated by commas>"
+                    "name": "Camiño de ferradura"
                 },
                 "highway/bus_stop": {
-                    "name": "Parada de Autobús",
-                    "terms": "<translate with synonyms or related terms for 'Bus Stop', separated by commas>"
+                    "name": "Parada de Autobús"
                 },
                 "highway/corridor": {
-                    "name": "Corredor Interior",
-                    "terms": "<translate with synonyms or related terms for 'Indoor Corridor', separated by commas>"
+                    "name": "Corredor Interior"
                 },
                 "highway/crossing": {
                     "name": "Cruce",
-                    "terms": "<translate with synonyms or related terms for 'Street Crossing', separated by commas>"
+                    "terms": "paso peonil, paso peatonal, paso de cebra"
                 },
                 "highway/crosswalk": {
-                    "name": "Cruce Peonil",
-                    "terms": "<translate with synonyms or related terms for 'Pedestrian Crosswalk', separated by commas>"
+                    "name": "Cruce Peonil"
                 },
                 "highway/cycleway": {
-                    "name": "Senda Ciclista",
-                    "terms": "<translate with synonyms or related terms for 'Cycle Path', separated by commas>"
+                    "name": "Senda Ciclista"
                 },
                 "highway/elevator": {
-                    "name": "Montacargas",
-                    "terms": "<translate with synonyms or related terms for 'Elevator', separated by commas>"
+                    "name": "Montacargas"
                 },
                 "highway/footway": {
-                    "name": "Senda Peonil",
-                    "terms": "<translate with synonyms or related terms for 'Foot Path', separated by commas>"
+                    "name": "Senda Peonil"
                 },
                 "highway/give_way": {
-                    "name": "Ceda o Paso",
-                    "terms": "<translate with synonyms or related terms for 'Yield Sign', separated by commas>"
+                    "name": "Ceda o Paso"
                 },
                 "highway/living_street": {
-                    "name": "Rúa Residencial",
-                    "terms": "<translate with synonyms or related terms for 'Living Street', separated by commas>"
+                    "name": "Rúa Residencial"
                 },
                 "highway/mini_roundabout": {
-                    "name": "Mini Rotonda",
-                    "terms": "<translate with synonyms or related terms for 'Mini-Roundabout', separated by commas>"
+                    "name": "Mini Rotonda"
                 },
                 "highway/motorway": {
-                    "name": "Autovía",
-                    "terms": "<translate with synonyms or related terms for 'Motorway', separated by commas>"
+                    "name": "Autovía"
                 },
                 "highway/motorway_junction": {
-                    "name": "Saída/saída da autoestrada",
-                    "terms": "<translate with synonyms or related terms for 'Motorway Junction / Exit', separated by commas>"
+                    "name": "Saída/saída da autoestrada"
                 },
                 "highway/motorway_link": {
                     "name": "Enlace de autovía",
                     "terms": "autovía, autopista, enlace, entrada, saída, acceso"
                 },
                 "highway/path": {
-                    "name": "Camiño",
-                    "terms": "<translate with synonyms or related terms for 'Path', separated by commas>"
+                    "name": "Camiño"
                 },
                 "highway/pedestrian": {
-                    "name": "Rúa Peonil",
-                    "terms": "<translate with synonyms or related terms for 'Pedestrian Street', separated by commas>"
+                    "name": "Rúa Peonil"
                 },
                 "highway/primary": {
-                    "name": "Estrada Primaria",
-                    "terms": "<translate with synonyms or related terms for 'Primary Road', separated by commas>"
+                    "name": "Estrada Primaria"
                 },
                 "highway/primary_link": {
-                    "name": "Enlace a estrada primaria",
-                    "terms": "<translate with synonyms or related terms for 'Primary Link', separated by commas>"
+                    "name": "Enlace a estrada primaria"
                 },
                 "highway/raceway": {
-                    "name": "Pista de carreiras (Motorsport)",
-                    "terms": "<translate with synonyms or related terms for 'Racetrack (Motorsport)', separated by commas>"
+                    "name": "Pista de carreiras (Motorsport)"
                 },
                 "highway/residential": {
-                    "name": "Rúa urbana",
-                    "terms": "<translate with synonyms or related terms for 'Residential Road', separated by commas>"
+                    "name": "Rúa urbana"
                 },
                 "highway/rest_area": {
-                    "name": "Área de Descanso",
-                    "terms": "<translate with synonyms or related terms for 'Rest Area', separated by commas>"
+                    "name": "Área de Descanso"
                 },
                 "highway/road": {
-                    "name": "Vía de categoría descoñecida",
-                    "terms": "<translate with synonyms or related terms for 'Unknown Road', separated by commas>"
+                    "name": "Vía de categoría descoñecida"
                 },
                 "highway/secondary": {
-                    "name": "Estrada Secundaria",
-                    "terms": "<translate with synonyms or related terms for 'Secondary Road', separated by commas>"
+                    "name": "Estrada Secundaria"
                 },
                 "highway/secondary_link": {
-                    "name": "Ligazón a estrada secundaria",
-                    "terms": "<translate with synonyms or related terms for 'Secondary Link', separated by commas>"
+                    "name": "Ligazón a estrada secundaria"
                 },
                 "highway/service": {
-                    "name": "Vía de Servizo",
-                    "terms": "<translate with synonyms or related terms for 'Service Road', separated by commas>"
+                    "name": "Vía de Servizo"
                 },
                 "highway/service/alley": {
-                    "name": "Calexón",
-                    "terms": "<translate with synonyms or related terms for 'Alley', separated by commas>"
+                    "name": "Calexón"
                 },
                 "highway/service/drive-through": {
-                    "name": "Auto-Servizo",
-                    "terms": "<translate with synonyms or related terms for 'Drive-Through', separated by commas>"
+                    "name": "Auto-Servizo"
                 },
                 "highway/service/driveway": {
-                    "name": "Entrada de Garaxe",
-                    "terms": "<translate with synonyms or related terms for 'Driveway', separated by commas>"
+                    "name": "Entrada de Garaxe"
                 },
                 "highway/service/emergency_access": {
-                    "name": "Acceso de Emerxencia",
-                    "terms": "<translate with synonyms or related terms for 'Emergency Access', separated by commas>"
+                    "name": "Acceso de Emerxencia"
                 },
                 "highway/service/parking_aisle": {
-                    "name": "Pasillo de Aparcamento",
-                    "terms": "<translate with synonyms or related terms for 'Parking Aisle', separated by commas>"
+                    "name": "Pasillo de Aparcamento"
                 },
                 "highway/services": {
-                    "name": "Área de Servizo",
-                    "terms": "<translate with synonyms or related terms for 'Service Area', separated by commas>"
+                    "name": "Área de Servizo"
                 },
                 "highway/speed_camera": {
-                    "name": "Rádar Velocidade",
-                    "terms": "<translate with synonyms or related terms for 'Speed Camera', separated by commas>"
+                    "name": "Rádar Velocidade"
                 },
                 "highway/steps": {
-                    "name": "Escaleiras",
-                    "terms": "<translate with synonyms or related terms for 'Steps', separated by commas>"
+                    "name": "Escaleiras"
                 },
                 "highway/stop": {
-                    "name": "Sinal de Stop",
-                    "terms": "<translate with synonyms or related terms for 'Stop Sign', separated by commas>"
+                    "name": "Sinal de Stop"
                 },
                 "highway/street_lamp": {
-                    "name": "Farola",
-                    "terms": "<translate with synonyms or related terms for 'Street Lamp', separated by commas>"
+                    "name": "Farola"
                 },
                 "highway/tertiary": {
-                    "name": "Estrada terciaria",
-                    "terms": "<translate with synonyms or related terms for 'Tertiary Road', separated by commas>"
+                    "name": "Estrada terciaria"
                 },
                 "highway/tertiary_link": {
-                    "name": "Enlace a estrada terciaria",
-                    "terms": "<translate with synonyms or related terms for 'Tertiary Link', separated by commas>"
+                    "name": "Enlace a estrada terciaria"
                 },
                 "highway/track": {
-                    "name": "Pista Sen Mantemento",
-                    "terms": "<translate with synonyms or related terms for 'Unmaintained Track Road', separated by commas>"
+                    "name": "Pista Sen Mantemento"
                 },
                 "highway/traffic_mirror": {
-                    "name": "Espello de tráfico",
-                    "terms": "<translate with synonyms or related terms for 'Traffic Mirror', separated by commas>"
+                    "name": "Espello de tráfico"
                 },
                 "highway/traffic_signals": {
-                    "name": "Semáforo",
-                    "terms": "<translate with synonyms or related terms for 'Traffic Signals', separated by commas>"
+                    "name": "Semáforo"
                 },
                 "highway/trunk": {
-                    "name": "Estrada troncal",
-                    "terms": "<translate with synonyms or related terms for 'Trunk Road', separated by commas>"
+                    "name": "Estrada troncal"
                 },
                 "highway/trunk_link": {
-                    "name": "Ligazón a estrada troncal",
-                    "terms": "<translate with synonyms or related terms for 'Trunk Link', separated by commas>"
+                    "name": "Ligazón a estrada troncal"
                 },
                 "highway/turning_circle": {
-                    "name": "Círculo de xiro",
-                    "terms": "<translate with synonyms or related terms for 'Turning Circle', separated by commas>"
+                    "name": "Círculo de xiro"
                 },
                 "highway/turning_loop": {
-                    "name": "Rotonda (Illa)",
-                    "terms": "<translate with synonyms or related terms for 'Turning Loop (Island)', separated by commas>"
+                    "name": "Rotonda (Illa)"
                 },
                 "highway/unclassified": {
-                    "name": "Estrada Menor/Sen Clasificar",
-                    "terms": "<translate with synonyms or related terms for 'Minor/Unclassified Road', separated by commas>"
+                    "name": "Estrada Menor/Sen Clasificar"
                 },
                 "historic": {
-                    "name": "Lugar histórico",
-                    "terms": "<translate with synonyms or related terms for 'Historic Site', separated by commas>"
+                    "name": "Lugar histórico"
                 },
                 "historic/archaeological_site": {
-                    "name": "Sitio arqueolóxico",
-                    "terms": "<translate with synonyms or related terms for 'Archaeological Site', separated by commas>"
+                    "name": "Sitio arqueolóxico"
                 },
                 "historic/boundary_stone": {
                     "name": "Marco",
                     "terms": "marco, fito, mollón, mouteira, linde, pedra"
                 },
                 "historic/castle": {
-                    "name": "Castelo",
-                    "terms": "<translate with synonyms or related terms for 'Castle', separated by commas>"
+                    "name": "Castelo"
                 },
                 "historic/memorial": {
-                    "name": "Monumento conmemorativo",
-                    "terms": "<translate with synonyms or related terms for 'Memorial', separated by commas>"
+                    "name": "Monumento conmemorativo"
                 },
                 "historic/monument": {
-                    "name": "Monumento",
-                    "terms": "<translate with synonyms or related terms for 'Monument', separated by commas>"
+                    "name": "Monumento"
                 },
                 "historic/ruins": {
-                    "name": "Ruinas",
-                    "terms": "<translate with synonyms or related terms for 'Ruins', separated by commas>"
+                    "name": "Ruinas"
                 },
                 "historic/tomb": {
-                    "name": "Tumba",
-                    "terms": "<translate with synonyms or related terms for 'Tomb', separated by commas>"
+                    "name": "Tumba"
                 },
                 "historic/wayside_cross": {
-                    "name": "Cruceiro",
-                    "terms": "<translate with synonyms or related terms for 'Wayside Cross', separated by commas>"
+                    "name": "Cruceiro"
                 },
                 "historic/wayside_shrine": {
-                    "name": "Peto de ánimas",
-                    "terms": "<translate with synonyms or related terms for 'Wayside Shrine', separated by commas>"
+                    "name": "Peto de ánimas"
                 },
                 "junction": {
-                    "name": "Incorporación",
-                    "terms": "<translate with synonyms or related terms for 'Junction', separated by commas>"
+                    "name": "Incorporación"
                 },
                 "landuse": {
-                    "name": "Uso da Terra",
-                    "terms": "<translate with synonyms or related terms for 'Land Use', separated by commas>"
+                    "name": "Uso da Terra"
                 },
                 "landuse/allotments": {
-                    "name": "Xardín Comunitario",
-                    "terms": "<translate with synonyms or related terms for 'Community Garden', separated by commas>"
+                    "name": "Xardín Comunitario"
                 },
                 "landuse/aquaculture": {
-                    "name": "Acuacultura",
-                    "terms": "<translate with synonyms or related terms for 'Aquaculture', separated by commas>"
+                    "name": "Acuacultura"
                 },
                 "landuse/basin": {
-                    "name": "Cunca",
-                    "terms": "<translate with synonyms or related terms for 'Basin', separated by commas>"
+                    "name": "Cunca"
                 },
                 "landuse/cemetery": {
-                    "name": "Cemiterio",
-                    "terms": "<translate with synonyms or related terms for 'Cemetery', separated by commas>"
+                    "name": "Cemiterio"
                 },
                 "landuse/churchyard": {
-                    "name": "Adro",
-                    "terms": "<translate with synonyms or related terms for 'Churchyard', separated by commas>"
+                    "name": "Adro"
                 },
                 "landuse/commercial": {
-                    "name": "Área Comercial",
-                    "terms": "<translate with synonyms or related terms for 'Commercial Area', separated by commas>"
+                    "name": "Área Comercial"
                 },
                 "landuse/construction": {
-                    "name": "Construción",
-                    "terms": "<translate with synonyms or related terms for 'Construction', separated by commas>"
+                    "name": "Construción"
                 },
                 "landuse/farm": {
                     "name": "Terra de Cultivo"
                 },
                 "landuse/farmland": {
-                    "name": "Terra de Cultivo",
-                    "terms": "<translate with synonyms or related terms for 'Farmland', separated by commas>"
+                    "name": "Terra de Cultivo"
                 },
                 "landuse/farmyard": {
-                    "name": "Granxa",
-                    "terms": "<translate with synonyms or related terms for 'Farmyard', separated by commas>"
+                    "name": "Granxa"
                 },
                 "landuse/forest": {
-                    "name": "Forestal",
-                    "terms": "<translate with synonyms or related terms for 'Forest', separated by commas>"
+                    "name": "Forestal"
                 },
                 "landuse/garages": {
-                    "name": "Garaxes",
-                    "terms": "<translate with synonyms or related terms for 'Garages', separated by commas>"
+                    "name": "Garaxes"
                 },
                 "landuse/grass": {
-                    "name": "Herba",
-                    "terms": "<translate with synonyms or related terms for 'Grass', separated by commas>"
+                    "name": "Herba"
                 },
                 "landuse/harbour": {
-                    "name": "Peirao",
-                    "terms": "<translate with synonyms or related terms for 'Harbor', separated by commas>"
+                    "name": "Peirao"
                 },
                 "landuse/industrial": {
-                    "name": "Industrial Area",
-                    "terms": "<translate with synonyms or related terms for 'Industrial Area', separated by commas>"
+                    "name": "Industrial Area"
                 },
                 "landuse/landfill": {
-                    "name": "Terraplén",
-                    "terms": "<translate with synonyms or related terms for 'Landfill', separated by commas>"
+                    "name": "Terraplén"
                 },
                 "landuse/meadow": {
-                    "name": "Prado",
-                    "terms": "<translate with synonyms or related terms for 'Meadow', separated by commas>"
+                    "name": "Prado"
                 },
                 "landuse/military": {
-                    "name": "Zona Militar",
-                    "terms": "<traducir con sinónimos ou termos relacionados con 'Zona Militar', separados por comas>"
+                    "name": "Zona Militar"
                 },
                 "landuse/military/airfield": {
-                    "name": "Aeródromo Militar",
-                    "terms": "<translate with synonyms or related terms for 'Military Airfield', separated by commas>"
+                    "name": "Aeródromo Militar"
                 },
                 "landuse/military/barracks": {
-                    "name": "Barracóns",
-                    "terms": "<translate with synonyms or related terms for 'Barracks', separated by commas>"
+                    "name": "Barracóns"
                 },
                 "landuse/military/bunker": {
-                    "name": "Bunker Militar",
-                    "terms": "<translate with synonyms or related terms for 'Military Bunker', separated by commas>"
+                    "name": "Bunker Militar"
                 },
                 "landuse/military/checkpoint": {
-                    "name": "Checkpoint",
-                    "terms": "<translate with synonyms or related terms for 'Checkpoint', separated by commas>"
+                    "name": "Checkpoint"
                 },
                 "landuse/military/danger_area": {
-                    "name": "Área Perigosa",
-                    "terms": "<translate with synonyms or related terms for 'Danger Area', separated by commas>"
+                    "name": "Área Perigosa"
                 },
                 "landuse/military/naval_base": {
-                    "name": "Base Naval",
-                    "terms": "<translate with synonyms or related terms for 'Naval Base', separated by commas>"
+                    "name": "Base Naval"
                 },
                 "landuse/military/nuclear_explosion_site": {
-                    "name": "Explosión Nuclear Lugar",
-                    "terms": "<translate with synonyms or related terms for 'Nuclear Explosion Site', separated by commas>"
+                    "name": "Explosión Nuclear Lugar"
                 },
                 "landuse/military/obstacle_course": {
-                    "name": "Pista de Obstáculos",
-                    "terms": "<translate with synonyms or related terms for 'Obstacle Course', separated by commas>"
+                    "name": "Pista de Obstáculos"
                 },
                 "landuse/military/office": {
-                    "name": "Militar Oficina",
-                    "terms": "<translate with synonyms or related terms for 'Military Office', separated by commas>"
+                    "name": "Militar Oficina"
                 },
                 "landuse/military/range": {
-                    "name": "Franxa Militar",
-                    "terms": "<translate with synonyms or related terms for 'Military Range', separated by commas>"
+                    "name": "Franxa Militar"
                 },
                 "landuse/military/training_area": {
-                    "name": "Área de Entreno",
-                    "terms": "<translate with synonyms or related terms for 'Training Area', separated by commas>"
+                    "name": "Área de Entreno"
                 },
                 "landuse/orchard": {
-                    "name": "Área de froitais",
-                    "terms": "<translate with synonyms or related terms for 'Orchard', separated by commas>"
+                    "name": "Área de froitais"
                 },
                 "landuse/plant_nursery": {
-                    "name": "Viveiro de Plantas",
-                    "terms": "<translate with synonyms or related terms for 'Plant Nursery', separated by commas>"
+                    "name": "Viveiro de Plantas"
                 },
                 "landuse/quarry": {
-                    "name": "Canteira",
-                    "terms": "<translate with synonyms or related terms for 'Quarry', separated by commas>"
+                    "name": "Canteira"
                 },
                 "landuse/railway": {
-                    "name": "Corredor Ferroviario",
-                    "terms": "<translate with synonyms or related terms for 'Railway Corridor', separated by commas>"
+                    "name": "Corredor Ferroviario"
                 },
                 "landuse/recreation_ground": {
-                    "name": "Campo de Diversión",
-                    "terms": "<translate with synonyms or related terms for 'Recreation Ground', separated by commas>"
+                    "name": "Campo de Diversión"
                 },
                 "landuse/residential": {
-                    "name": "Área Residencial",
-                    "terms": "<translate with synonyms or related terms for 'Residential Area', separated by commas>"
+                    "name": "Área Residencial"
                 },
                 "landuse/retail": {
-                    "name": "Venda Minorista Área",
-                    "terms": "<translate with synonyms or related terms for 'Retail Area', separated by commas>"
+                    "name": "Venda Minorista Área"
                 },
                 "landuse/vineyard": {
-                    "name": "Viña",
-                    "terms": "<translate with synonyms or related terms for 'Vineyard', separated by commas>"
+                    "name": "Viña"
                 },
                 "leisure": {
-                    "name": "Ocio",
-                    "terms": "<translate with synonyms or related terms for 'Leisure', separated by commas>"
+                    "name": "Ocio"
                 },
                 "leisure/adult_gaming_centre": {
-                    "name": "Centro Recreativo para Adultos",
-                    "terms": "<translate with synonyms or related terms for 'Adult Gaming Center', separated by commas>"
+                    "name": "Centro Recreativo para Adultos"
                 },
                 "leisure/bird_hide": {
-                    "name": "Ocultado de Aves",
-                    "terms": "<translate with synonyms or related terms for 'Bird Hide', separated by commas>"
+                    "name": "Ocultado de Aves"
                 },
                 "leisure/bowling_alley": {
-                    "name": "Birlos",
-                    "terms": "<translate with synonyms or related terms for 'Bowling Alley', separated by commas>"
+                    "name": "Birlos"
                 },
                 "leisure/common": {
-                    "name": "Común",
-                    "terms": "<translate with synonyms or related terms for 'Common', separated by commas>"
+                    "name": "Común"
                 },
                 "leisure/dance": {
-                    "name": "Sala de Baile",
-                    "terms": "<translate with synonyms or related terms for 'Dance Hall', separated by commas>"
+                    "name": "Sala de Baile"
                 },
                 "leisure/dog_park": {
-                    "name": "Parque Canino",
-                    "terms": "<translate with synonyms or related terms for 'Dog Park', separated by commas>"
+                    "name": "Parque Canino"
                 },
                 "leisure/firepit": {
-                    "name": "Fogueira",
-                    "terms": "<translate with synonyms or related terms for 'Firepit', separated by commas>"
+                    "name": "Fogueira"
                 },
                 "leisure/fitness_centre": {
-                    "name": "Ximnasio/Fitness Centro",
-                    "terms": "<translate with synonyms or related terms for 'Gym / Fitness Center', separated by commas>"
+                    "name": "Ximnasio/Fitness Centro"
                 },
                 "leisure/fitness_centre/yoga": {
-                    "name": "Estudio de Yoga",
-                    "terms": "<translate with synonyms or related terms for 'Yoga Studio', separated by commas>"
+                    "name": "Estudio de Yoga"
                 },
                 "leisure/fitness_station": {
-                    "name": "Estación de ximnasia ao aire libre",
-                    "terms": "<translate with synonyms or related terms for 'Outdoor Fitness Station', separated by commas>"
+                    "name": "Estación de ximnasia ao aire libre"
                 },
                 "leisure/garden": {
-                    "name": "Xardín",
-                    "terms": "<translate with synonyms or related terms for 'Garden', separated by commas>"
+                    "name": "Xardín"
                 },
                 "leisure/golf_course": {
-                    "name": "Campo de Golf",
-                    "terms": "<translate with synonyms or related terms for 'Golf Course', separated by commas>"
+                    "name": "Campo de Golf"
                 },
                 "leisure/horse_riding": {
-                    "name": "Centro de Equitación",
-                    "terms": "<translate with synonyms or related terms for 'Horseback Riding Facility', separated by commas>"
+                    "name": "Centro de Equitación"
                 },
                 "leisure/ice_rink": {
-                    "name": "Pista de Xeo",
-                    "terms": "<translate with synonyms or related terms for 'Ice Rink', separated by commas>"
+                    "name": "Pista de Xeo"
                 },
                 "leisure/marina": {
-                    "name": "Marina",
-                    "terms": "<translate with synonyms or related terms for 'Marina', separated by commas>"
+                    "name": "Marina"
                 },
                 "leisure/miniature_golf": {
-                    "name": "Mini Golf",
-                    "terms": "<translate with synonyms or related terms for 'Miniature Golf', separated by commas>"
+                    "name": "Mini Golf"
                 },
                 "leisure/nature_reserve": {
-                    "name": "Reserva Natural",
-                    "terms": "<translate with synonyms or related terms for 'Nature Reserve', separated by commas>"
+                    "name": "Reserva Natural"
                 },
                 "leisure/park": {
                     "name": "Parque",
                     "terms": "parque, zona verde, xardín, alameda"
                 },
                 "leisure/picnic_table": {
-                    "name": "Mesa de Picnic",
-                    "terms": "<translate with synonyms or related terms for 'Picnic Table', separated by commas>"
+                    "name": "Mesa de Picnic"
                 },
                 "leisure/pitch": {
-                    "name": "Campo deportivo",
-                    "terms": "<translate with synonyms or related terms for 'Sport Pitch', separated by commas>"
+                    "name": "Campo deportivo"
                 },
                 "leisure/pitch/american_football": {
-                    "name": "Campo de fútbol americano",
-                    "terms": "<translate with synonyms or related terms for 'American Football Field', separated by commas>"
+                    "name": "Campo de fútbol americano"
                 },
                 "leisure/pitch/baseball": {
-                    "name": "Diamante de béisbol",
-                    "terms": "<translate with synonyms or related terms for 'Baseball Diamond', separated by commas>"
+                    "name": "Diamante de béisbol"
                 },
                 "leisure/pitch/basketball": {
-                    "name": "Cancha de baloncesto",
-                    "terms": "<translate with synonyms or related terms for 'Basketball Court', separated by commas>"
+                    "name": "Cancha de baloncesto"
                 },
                 "leisure/pitch/beachvolleyball": {
-                    "name": "Cancha de Voley Praia",
-                    "terms": "<translate with synonyms or related terms for 'Beach Volleyball Court', separated by commas>"
+                    "name": "Cancha de Voley Praia"
                 },
                 "leisure/pitch/bowls": {
-                    "name": "Bowling Green",
-                    "terms": "<translate with synonyms or related terms for 'Bowling Green', separated by commas>"
+                    "name": "Bowling Green"
                 },
                 "leisure/pitch/cricket": {
-                    "name": "Campo de Cricket",
-                    "terms": "<translate with synonyms or related terms for 'Cricket Field', separated by commas>"
+                    "name": "Campo de Cricket"
                 },
                 "leisure/pitch/equestrian": {
-                    "name": "Equitación Area",
-                    "terms": "<translate with synonyms or related terms for 'Riding Arena', separated by commas>"
+                    "name": "Equitación Area"
                 },
                 "leisure/pitch/rugby_league": {
-                    "name": "Campo Liga de Rugby",
-                    "terms": "<translate with synonyms or related terms for 'Rugby League Field', separated by commas>"
+                    "name": "Campo Liga de Rugby"
                 },
                 "leisure/pitch/rugby_union": {
-                    "name": "Campo Unión de Rugby",
-                    "terms": "<translate with synonyms or related terms for 'Rugby Union Field', separated by commas>"
+                    "name": "Campo Unión de Rugby"
                 },
                 "leisure/pitch/skateboard": {
-                    "name": "Parque de Skate",
-                    "terms": "<translate with synonyms or related terms for 'Skate Park', separated by commas>"
+                    "name": "Parque de Skate"
                 },
                 "leisure/pitch/soccer": {
-                    "name": "Campo de fútbol",
-                    "terms": "<translate with synonyms or related terms for 'Soccer Field', separated by commas>"
+                    "name": "Campo de fútbol"
                 },
                 "leisure/pitch/table_tennis": {
-                    "name": "Mesa de Ping Pong",
-                    "terms": "<translate with synonyms or related terms for 'Ping Pong Table', separated by commas>"
+                    "name": "Mesa de Ping Pong"
                 },
                 "leisure/pitch/tennis": {
-                    "name": "Cancha de tenis",
-                    "terms": "<translate with synonyms or related terms for 'Tennis Court', separated by commas>"
+                    "name": "Cancha de tenis"
                 },
                 "leisure/pitch/volleyball": {
-                    "name": "Cancha de voleibol",
-                    "terms": "<translate with synonyms or related terms for 'Volleyball Court', separated by commas>"
+                    "name": "Cancha de voleibol"
                 },
                 "leisure/playground": {
-                    "name": "Área de recreo",
-                    "terms": "<translate with synonyms or related terms for 'Playground', separated by commas>"
+                    "name": "Área de recreo"
                 },
                 "leisure/resort": {
-                    "name": "Recurso",
-                    "terms": "<translate with synonyms or related terms for 'Resort', separated by commas>"
+                    "name": "Recurso"
                 },
                 "leisure/running_track": {
-                    "name": "Pista de Carreiras (Velocidade)",
-                    "terms": "<translate with synonyms or related terms for 'Racetrack (Running)', separated by commas>"
+                    "name": "Pista de Carreiras (Velocidade)"
                 },
                 "leisure/slipway": {
-                    "name": "Rampla",
-                    "terms": "<translate with synonyms or related terms for 'Slipway', separated by commas>"
+                    "name": "Rampla"
                 },
                 "leisure/sports_centre": {
-                    "name": "Centro Deportivo/Complexo",
-                    "terms": "<translate with synonyms or related terms for 'Sports Center / Complex', separated by commas>"
+                    "name": "Centro Deportivo/Complexo"
                 },
                 "leisure/sports_centre/swimming": {
-                    "name": "Servizo de Piscina",
-                    "terms": "<translate with synonyms or related terms for 'Swimming Pool Facility', separated by commas>"
+                    "name": "Servizo de Piscina"
                 },
                 "leisure/stadium": {
-                    "name": "Estadio",
-                    "terms": "<translate with synonyms or related terms for 'Stadium', separated by commas>"
+                    "name": "Estadio"
                 },
                 "leisure/swimming_pool": {
-                    "name": "Piscina",
-                    "terms": "<translate with synonyms or related terms for 'Swimming Pool', separated by commas>"
+                    "name": "Piscina"
                 },
                 "leisure/track": {
-                    "name": "Pista de competición (non motorizada)",
-                    "terms": "<translate with synonyms or related terms for 'Racetrack (Non-Motorsport)', separated by commas>"
+                    "name": "Pista de competición (non motorizada)"
                 },
                 "leisure/water_park": {
-                    "name": "Parque Acuático",
-                    "terms": "<translate with synonyms or related terms for 'Water Park', separated by commas>"
+                    "name": "Parque Acuático"
                 },
                 "line": {
-                    "name": "Liña",
-                    "terms": "<translate with synonyms or related terms for 'Line', separated by commas>"
+                    "name": "Liña"
                 },
                 "man_made": {
-                    "name": "Estrutura artificial",
-                    "terms": "<translate with synonyms or related terms for 'Man Made', separated by commas>"
+                    "name": "Estrutura artificial"
                 },
                 "man_made/adit": {
-                    "name": "Santuario",
-                    "terms": "<translate with synonyms or related terms for 'Adit', separated by commas>"
+                    "name": "Santuario"
                 },
                 "man_made/breakwater": {
-                    "name": "Rompeondas",
-                    "terms": "<translate with synonyms or related terms for 'Breakwater', separated by commas>"
+                    "name": "Rompeondas"
                 },
                 "man_made/bridge": {
-                    "name": "Ponte",
-                    "terms": "<traducir con sinónimos ou termos relacionados con 'Ponte', separados por comas>"
+                    "name": "Ponte"
                 },
                 "man_made/chimney": {
-                    "name": "Cheminea",
-                    "terms": "<translate with synonyms or related terms for 'Chimney', separated by commas>"
+                    "name": "Cheminea"
                 },
                 "man_made/cutline": {
-                    "name": "Corta lumes",
-                    "terms": "<traducir con sinónimos ou termos relacionados con 'Cortalumes', separados por comas>"
+                    "name": "Corta lumes"
                 },
                 "man_made/embankment": {
                     "name": "Terraplén"
                 },
                 "man_made/flagpole": {
-                    "name": "Mantro de Bandeira",
-                    "terms": "<translate with synonyms or related terms for 'Flagpole', separated by commas>"
+                    "name": "Mantro de Bandeira"
                 },
                 "man_made/gasometer": {
-                    "name": "Gasómetro",
-                    "terms": "<translate with synonyms or related terms for 'Gasometer', separated by commas>"
+                    "name": "Gasómetro"
                 },
                 "man_made/groyne": {
-                    "name": "Dique",
-                    "terms": "<translate with synonyms or related terms for 'Groyne', separated by commas>"
+                    "name": "Dique"
                 },
                 "man_made/lighthouse": {
-                    "name": "Faro",
-                    "terms": "<translate with synonyms or related terms for 'Lighthouse', separated by commas>"
+                    "name": "Faro"
                 },
                 "man_made/mast": {
-                    "name": "Mastro",
-                    "terms": "<translate with synonyms or related terms for 'Mast', separated by commas>"
+                    "name": "Mastro"
                 },
                 "man_made/observation": {
-                    "name": "Torre de Observación",
-                    "terms": "<translate with synonyms or related terms for 'Observation Tower', separated by commas>"
+                    "name": "Torre de Observación"
                 },
                 "man_made/petroleum_well": {
-                    "name": "Pozo de Petróleo",
-                    "terms": "<translate with synonyms or related terms for 'Oil Well', separated by commas>"
+                    "name": "Pozo de Petróleo"
                 },
                 "man_made/pier": {
-                    "name": "Peirao",
-                    "terms": "<translate with synonyms or related terms for 'Pier', separated by commas>"
+                    "name": "Peirao"
                 },
                 "man_made/pipeline": {
-                    "name": "Tubería",
-                    "terms": "<translate with synonyms or related terms for 'Pipeline', separated by commas>"
+                    "name": "Tubería"
                 },
                 "man_made/pumping_station": {
-                    "name": "Estación de Bombeo",
-                    "terms": "<translate with synonyms or related terms for 'Pumping Station', separated by commas>"
+                    "name": "Estación de Bombeo"
                 },
                 "man_made/silo": {
-                    "name": "Silo",
-                    "terms": "<translate with synonyms or related terms for 'Silo', separated by commas>"
+                    "name": "Silo"
                 },
                 "man_made/storage_tank": {
-                    "name": "Tanque de Almacenamento",
-                    "terms": "<translate with synonyms or related terms for 'Storage Tank', separated by commas>"
+                    "name": "Tanque de Almacenamento"
                 },
                 "man_made/surveillance": {
-                    "name": "Vixilancia",
-                    "terms": "<translate with synonyms or related terms for 'Surveillance', separated by commas>"
+                    "name": "Vixilancia"
                 },
                 "man_made/surveillance_camera": {
-                    "name": "Vídeo Vixilancia",
-                    "terms": "<translate with synonyms or related terms for 'Surveillance Camera', separated by commas>"
+                    "name": "Vídeo Vixilancia"
                 },
                 "man_made/survey_point": {
-                    "name": "Vértice xeodésico",
-                    "terms": "<translate with synonyms or related terms for 'Survey Point', separated by commas>"
+                    "name": "Vértice xeodésico"
                 },
                 "man_made/tower": {
-                    "name": "Torre",
-                    "terms": "<translate with synonyms or related terms for 'Tower', separated by commas>"
+                    "name": "Torre"
                 },
                 "man_made/wastewater_plant": {
-                    "name": "Depuradora de augas",
-                    "terms": "<translate with synonyms or related terms for 'Wastewater Plant', separated by commas>"
+                    "name": "Depuradora de augas"
                 },
                 "man_made/water_tower": {
-                    "name": "Torre de auga",
-                    "terms": "<translate with synonyms or related terms for 'Water Tower', separated by commas>"
+                    "name": "Torre de auga"
                 },
                 "man_made/water_well": {
-                    "name": "Pozo",
-                    "terms": "<translate with synonyms or related terms for 'Water Well', separated by commas>"
+                    "name": "Pozo"
                 },
                 "man_made/water_works": {
-                    "name": "Traballos Acuáticos",
-                    "terms": "<translate with synonyms or related terms for 'Water Works', separated by commas>"
+                    "name": "Traballos Acuáticos"
                 },
                 "man_made/works": {
-                    "name": "Fábrica",
-                    "terms": "<translate with synonyms or related terms for 'Factory', separated by commas>"
+                    "name": "Fábrica"
                 },
                 "manhole": {
-                    "name": "Burato de home",
-                    "terms": "<translate with synonyms or related terms for 'Manhole', separated by commas>"
+                    "name": "Burato de home"
                 },
                 "manhole/drain": {
-                    "name": "Drenaxe da tormenta",
-                    "terms": "<translate with synonyms or related terms for 'Storm Drain', separated by commas>"
+                    "name": "Drenaxe da tormenta"
                 },
                 "natural": {
-                    "name": "Natural",
-                    "terms": "<translate with synonyms or related terms for 'Natural', separated by commas>"
+                    "name": "Natural"
                 },
                 "natural/bare_rock": {
-                    "name": "Rocha Pelada",
-                    "terms": "<translate with synonyms or related terms for 'Bare Rock', separated by commas>"
+                    "name": "Rocha Pelada"
                 },
                 "natural/bay": {
-                    "name": "Baía",
-                    "terms": "<translate with synonyms or related terms for 'Bay', separated by commas>"
+                    "name": "Baía"
                 },
                 "natural/beach": {
-                    "name": "Praia",
-                    "terms": "<translate with synonyms or related terms for 'Beach', separated by commas>"
+                    "name": "Praia"
                 },
                 "natural/cave_entrance": {
-                    "name": "Entrada de Cova",
-                    "terms": "<translate with synonyms or related terms for 'Cave Entrance', separated by commas>"
+                    "name": "Entrada de Cova"
                 },
                 "natural/cliff": {
-                    "name": "Cantil",
-                    "terms": "<translate with synonyms or related terms for 'Cliff', separated by commas>"
+                    "name": "Cantil"
                 },
                 "natural/coastline": {
                     "name": "Liña de costa",
-                    "terms": "<translate with synonyms or related terms for 'Coastline', separated by commas>"
+                    "terms": "liña de costa, costa, litoral, ribeira"
                 },
                 "natural/fell": {
-                    "name": "Caeu",
-                    "terms": "<translate with synonyms or related terms for 'Fell', separated by commas>"
+                    "name": "Caeu"
                 },
                 "natural/glacier": {
-                    "name": "Glaciar",
-                    "terms": "<translate with synonyms or related terms for 'Glacier', separated by commas>"
+                    "name": "Glaciar"
                 },
                 "natural/grassland": {
-                    "name": "Pradeira",
-                    "terms": "<translate with synonyms or related terms for 'Grassland', separated by commas>"
+                    "name": "Pradeira"
                 },
                 "natural/heath": {
-                    "name": "Uceira ou breixeira",
-                    "terms": "<translate with synonyms or related terms for 'Heath', separated by commas>"
+                    "name": "Uceira ou breixeira"
                 },
                 "natural/peak": {
                     "name": "Cume",
-                    "terms": "<translate with synonyms or related terms for 'Peak', separated by commas>"
+                    "terms": "pico, cume, montaña, monte, cúspide"
                 },
                 "natural/ridge": {
-                    "name": "Cume",
-                    "terms": "<translate with synonyms or related terms for 'Ridge', separated by commas>"
+                    "name": "Cume"
                 },
                 "natural/saddle": {
-                    "name": "Sillín",
-                    "terms": "<translate with synonyms or related terms for 'Saddle', separated by commas>"
+                    "name": "Sillín"
                 },
                 "natural/sand": {
-                    "name": "Area",
-                    "terms": "<translate with synonyms or related terms for 'Sand', separated by commas>"
+                    "name": "Area"
                 },
                 "natural/scree": {
-                    "name": "Laxas",
-                    "terms": "<translate with synonyms or related terms for 'Scree', separated by commas>"
+                    "name": "Laxas"
                 },
                 "natural/scrub": {
-                    "name": "Matogueira",
-                    "terms": "<translate with synonyms or related terms for 'Scrub', separated by commas>"
+                    "name": "Matogueira"
                 },
                 "natural/spring": {
-                    "name": "Manancial",
-                    "terms": "<translate with synonyms or related terms for 'Spring', separated by commas>"
+                    "name": "Manancial"
                 },
                 "natural/tree": {
-                    "name": "Árbore",
-                    "terms": "<translate with synonyms or related terms for 'Tree', separated by commas>"
+                    "name": "Árbore"
                 },
                 "natural/tree_row": {
-                    "name": "Fila de Árbores",
-                    "terms": "<translate with synonyms or related terms for 'Tree row', separated by commas>"
+                    "name": "Fila de Árbores"
                 },
                 "natural/volcano": {
-                    "name": "Volcán",
-                    "terms": "<translate with synonyms or related terms for 'Volcano', separated by commas>"
+                    "name": "Volcán"
                 },
                 "natural/water": {
-                    "name": "Auga",
-                    "terms": "<translate with synonyms or related terms for 'Water', separated by commas>"
+                    "name": "Auga"
                 },
                 "natural/water/lake": {
                     "name": "Lago",
-                    "terms": "<translate with synonyms or related terms for 'Lake', separated by commas>"
+                    "terms": "lago, lagoa, charca, auga"
                 },
                 "natural/water/pond": {
                     "name": "Estanque",
-                    "terms": "<translate with synonyms or related terms for 'Pond', separated by commas>"
+                    "terms": "auga, estanque, lagoa, charca"
                 },
                 "natural/water/reservoir": {
-                    "name": "Encoro",
-                    "terms": "<translate with synonyms or related terms for 'Reservoir', separated by commas>"
+                    "name": "Encoro"
                 },
                 "natural/wetland": {
-                    "name": "Pantano",
-                    "terms": "<translate with synonyms or related terms for 'Wetland', separated by commas>"
+                    "name": "Pantano"
                 },
                 "natural/wood": {
-                    "name": "Bosque",
-                    "terms": "<translate with synonyms or related terms for 'Wood', separated by commas>"
+                    "name": "Bosque"
                 },
                 "noexit/yes": {
-                    "name": "Sen Saída",
-                    "terms": "<translate with synonyms or related terms for 'No Exit', separated by commas>"
+                    "name": "Sen Saída"
                 },
                 "office": {
-                    "name": "Oficina",
-                    "terms": "<translate with synonyms or related terms for 'Office', separated by commas>"
+                    "name": "Oficina"
                 },
                 "office/accountant": {
-                    "name": "Contador",
-                    "terms": "<translate with synonyms or related terms for 'Accountant', separated by commas>"
+                    "name": "Contador"
                 },
                 "office/administrative": {
-                    "name": "Oficina Administrativa",
-                    "terms": "<translate with synonyms or related terms for 'Administrative Office', separated by commas>"
+                    "name": "Oficina Administrativa"
                 },
                 "office/architect": {
-                    "name": "Arquitecto",
-                    "terms": "<translate with synonyms or related terms for 'Architect', separated by commas>"
+                    "name": "Arquitecto"
                 },
                 "office/company": {
-                    "name": "Oficina de Empresa",
-                    "terms": "<translate with synonyms or related terms for 'Company Office', separated by commas>"
+                    "name": "Oficina de Empresa"
                 },
                 "office/coworking": {
-                    "name": "Espacio de Cotraballo",
-                    "terms": "<translate with synonyms or related terms for 'Coworking Space', separated by commas>"
+                    "name": "Espacio de Cotraballo"
                 },
                 "office/educational_institution": {
-                    "name": "Institución Educativa",
-                    "terms": "<translate with synonyms or related terms for 'Educational Institution', separated by commas>"
+                    "name": "Institución Educativa"
                 },
                 "office/employment_agency": {
-                    "name": "Axencia de Emprego",
-                    "terms": "<translate with synonyms or related terms for 'Employment Agency', separated by commas>"
+                    "name": "Axencia de Emprego"
                 },
                 "office/estate_agent": {
-                    "name": "Oficina Inmobiliaria",
-                    "terms": "<translate with synonyms or related terms for 'Real Estate Office', separated by commas>"
+                    "name": "Oficina Inmobiliaria"
                 },
                 "office/financial": {
-                    "name": "Oficina Financeira",
-                    "terms": "<translate with synonyms or related terms for 'Financial Office', separated by commas>"
+                    "name": "Oficina Financeira"
                 },
                 "office/government": {
-                    "name": "Gobernamental Oficina",
-                    "terms": "<translate with synonyms or related terms for 'Government Office', separated by commas>"
+                    "name": "Gobernamental Oficina"
                 },
                 "office/government/register_office": {
-                    "name": "Rexistro Oficina",
-                    "terms": "<translate with synonyms or related terms for 'Register Office', separated by commas>"
+                    "name": "Rexistro Oficina"
                 },
                 "office/insurance": {
-                    "name": "Oficina de Seguros",
-                    "terms": "<translate with synonyms or related terms for 'Insurance Office', separated by commas>"
+                    "name": "Oficina de Seguros"
                 },
                 "office/it": {
-                    "name": "IT Oficina",
-                    "terms": "<translate with synonyms or related terms for 'IT Office', separated by commas>"
+                    "name": "IT Oficina"
                 },
                 "office/lawyer": {
-                    "name": "Bufete",
-                    "terms": "<translate with synonyms or related terms for 'Law Office', separated by commas>"
+                    "name": "Bufete"
                 },
                 "office/lawyer/notary": {
-                    "name": "Notaría",
-                    "terms": "<translate with synonyms or related terms for 'Notary Office', separated by commas>"
+                    "name": "Notaría"
                 },
                 "office/newspaper": {
-                    "name": "Xornal",
-                    "terms": "<translate with synonyms or related terms for 'Newspaper', separated by commas>"
+                    "name": "Xornal"
                 },
                 "office/ngo": {
-                    "name": "Oficina ONG",
-                    "terms": "<translate with synonyms or related terms for 'NGO Office', separated by commas>"
+                    "name": "Oficina ONG"
                 },
                 "office/physician": {
-                    "name": "Médico",
-                    "terms": "<translate with synonyms or related terms for 'Physician', separated by commas>"
+                    "name": "Médico"
                 },
                 "office/political_party": {
-                    "name": "Partido Político",
-                    "terms": "<translate with synonyms or related terms for 'Political Party', separated by commas>"
+                    "name": "Partido Político"
                 },
                 "office/research": {
-                    "name": "Investigación Oficina",
-                    "terms": "<translate with synonyms or related terms for 'Research Office', separated by commas>"
+                    "name": "Investigación Oficina"
                 },
                 "office/telecommunication": {
-                    "name": "Oficina de Telecomunicacións",
-                    "terms": "<translate with synonyms or related terms for 'Telecom Office', separated by commas>"
+                    "name": "Oficina de Telecomunicacións"
                 },
                 "office/therapist": {
-                    "name": "Terapeuta",
-                    "terms": "<translate with synonyms or related terms for 'Therapist', separated by commas>"
+                    "name": "Terapeuta"
                 },
                 "office/travel_agent": {
                     "name": "Axencia de Viaxes"
                 },
                 "piste": {
-                    "name": "Pista/Pista de Esquí",
-                    "terms": "<translate with synonyms or related terms for 'Piste/Ski Trail', separated by commas>"
+                    "name": "Pista/Pista de Esquí"
                 },
                 "place": {
                     "name": "Lugar"
                 },
                 "place/city": {
-                    "name": "Cidade",
-                    "terms": "<translate with synonyms or related terms for 'City', separated by commas>"
+                    "name": "Cidade"
                 },
                 "place/farm": {
                     "name": "Granxa"
                 },
                 "place/hamlet": {
-                    "name": "Aldea",
-                    "terms": "<translate with synonyms or related terms for 'Hamlet', separated by commas>"
+                    "name": "Aldea"
                 },
                 "place/island": {
                     "name": "Illa",
-                    "terms": "<translate with synonyms or related terms for 'Island', separated by commas>"
+                    "terms": "illa, isla, illote, insua"
                 },
                 "place/isolated_dwelling": {
-                    "name": "Vivenda illada",
-                    "terms": "<translate with synonyms or related terms for 'Isolated Dwelling', separated by commas>"
+                    "name": "Vivenda illada"
                 },
                 "place/locality": {
-                    "name": "Lugar",
-                    "terms": "<translate with synonyms or related terms for 'Locality', separated by commas>"
+                    "name": "Lugar"
                 },
                 "place/neighbourhood": {
-                    "name": "Barrio",
-                    "terms": "<translate with synonyms or related terms for 'Neighborhood', separated by commas>"
+                    "name": "Barrio"
                 },
                 "place/quarter": {
-                    "name": "Sub-Borough / Quarter",
-                    "terms": "<translate with synonyms or related terms for 'Sub-Borough / Quarter', separated by commas>"
+                    "name": "Sub-Borough / Quarter"
                 },
                 "place/square": {
-                    "name": "Esquina",
-                    "terms": "<translate with synonyms or related terms for 'Square', separated by commas>"
+                    "name": "Esquina"
                 },
                 "place/suburb": {
-                    "name": "Barrio / Suburbio",
-                    "terms": "<translate with synonyms or related terms for 'Borough / Suburb', separated by commas>"
+                    "name": "Barrio / Suburbio"
                 },
                 "place/town": {
-                    "name": "Cidade",
-                    "terms": "<translate with synonyms or related terms for 'Town', separated by commas>"
+                    "name": "Cidade"
                 },
                 "place/village": {
-                    "name": "Vila",
-                    "terms": "<translate with synonyms or related terms for 'Village', separated by commas>"
+                    "name": "Vila"
                 },
                 "point": {
-                    "name": "Punto",
-                    "terms": "<translate with synonyms or related terms for 'Point', separated by commas>"
+                    "name": "Punto"
                 },
                 "power": {
                     "name": "Rede eléctrica"
                 },
                 "power/generator": {
-                    "name": "Xerador de enerxía",
-                    "terms": "<translate with synonyms or related terms for 'Power Generator', separated by commas>"
+                    "name": "Xerador de enerxía"
                 },
                 "power/line": {
-                    "name": "Liña de alta tensión",
-                    "terms": "<translate with synonyms or related terms for 'Power Line', separated by commas>"
+                    "name": "Liña de alta tensión"
                 },
                 "power/minor_line": {
-                    "name": "Liña Eléctrica de Baixa Tensión",
-                    "terms": "<translate with synonyms or related terms for 'Minor Power Line', separated by commas>"
+                    "name": "Liña Eléctrica de Baixa Tensión"
                 },
                 "power/plant": {
-                    "name": "Estación Central Eléctrica",
-                    "terms": "<translate with synonyms or related terms for 'Power Station Grounds', separated by commas>"
+                    "name": "Estación Central Eléctrica"
                 },
                 "power/pole": {
-                    "name": "Poste eléctrico",
-                    "terms": "<translate with synonyms or related terms for 'Power Pole', separated by commas>"
+                    "name": "Poste eléctrico"
                 },
                 "power/sub_station": {
                     "name": "Subestación"
                 },
                 "power/substation": {
-                    "name": "Subestación",
-                    "terms": "<translate with synonyms or related terms for 'Substation', separated by commas>"
+                    "name": "Subestación"
                 },
                 "power/tower": {
-                    "name": "Torre de Alta Tensión",
-                    "terms": "<translate with synonyms or related terms for 'High-Voltage Tower', separated by commas>"
+                    "name": "Torre de Alta Tensión"
                 },
                 "power/transformer": {
-                    "name": "Transformador",
-                    "terms": "<translate with synonyms or related terms for 'Transformer', separated by commas>"
+                    "name": "Transformador"
                 },
                 "public_transport/platform": {
-                    "name": "Plataforma",
-                    "terms": "<translate with synonyms or related terms for 'Platform', separated by commas>"
+                    "name": "Plataforma"
                 },
                 "public_transport/stop_position": {
-                    "name": "Posición de Stop",
-                    "terms": "<translate with synonyms or related terms for 'Stop Position', separated by commas>"
+                    "name": "Posición de Stop"
                 },
                 "railway": {
                     "name": "Ferrocarril"
                 },
                 "railway/abandoned": {
-                    "name": "Ferrocarril abandonado",
-                    "terms": "<translate with synonyms or related terms for 'Abandoned Railway', separated by commas>"
+                    "name": "Ferrocarril abandonado"
                 },
                 "railway/crossing": {
-                    "name": "Cruce Ferroviario (Camiño)",
-                    "terms": "<translate with synonyms or related terms for 'Railway Crossing (Path)', separated by commas>"
+                    "name": "Cruce Ferroviario (Camiño)"
                 },
                 "railway/disused": {
-                    "name": "Ferrocarril en desuso",
-                    "terms": "<translate with synonyms or related terms for 'Disused Railway', separated by commas>"
+                    "name": "Ferrocarril en desuso"
                 },
                 "railway/funicular": {
-                    "name": "Funicular",
-                    "terms": "<translate with synonyms or related terms for 'Funicular', separated by commas>"
+                    "name": "Funicular"
                 },
                 "railway/halt": {
-                    "name": "Halt Ferroviario",
-                    "terms": "<translate with synonyms or related terms for 'Railway Halt', separated by commas>"
+                    "name": "Halt Ferroviario"
                 },
                 "railway/level_crossing": {
-                    "name": "Cruce Ferroviario (Estrada)",
-                    "terms": "<translate with synonyms or related terms for 'Railway Crossing (Road)', separated by commas>"
+                    "name": "Cruce Ferroviario (Estrada)"
                 },
                 "railway/monorail": {
-                    "name": "Monorraíl",
-                    "terms": "<translate with synonyms or related terms for 'Monorail', separated by commas>"
+                    "name": "Monorraíl"
                 },
                 "railway/narrow_gauge": {
-                    "name": "Tren de Vía Estreita",
-                    "terms": "<translate with synonyms or related terms for 'Narrow Gauge Rail', separated by commas>"
+                    "name": "Tren de Vía Estreita"
                 },
                 "railway/platform": {
-                    "name": "Plataforma",
-                    "terms": "<translate with synonyms or related terms for 'Railway Platform', separated by commas>"
+                    "name": "Plataforma"
                 },
                 "railway/rail": {
-                    "name": "Vía de tren",
-                    "terms": "<translate with synonyms or related terms for 'Rail', separated by commas>"
+                    "name": "Vía de tren"
                 },
                 "railway/station": {
-                    "name": "Estación de ferrocarril",
-                    "terms": "<translate with synonyms or related terms for 'Railway Station', separated by commas>"
+                    "name": "Estación de ferrocarril"
                 },
                 "railway/subway": {
-                    "name": "Metro",
-                    "terms": "<translate with synonyms or related terms for 'Subway', separated by commas>"
+                    "name": "Metro"
                 },
                 "railway/subway_entrance": {
-                    "name": "Entrada de metro",
-                    "terms": "<translate with synonyms or related terms for 'Subway Entrance', separated by commas>"
+                    "name": "Entrada de metro"
                 },
                 "railway/tram": {
-                    "name": "Tranvía",
-                    "terms": "<translate with synonyms or related terms for 'Tram', separated by commas>"
+                    "name": "Tranvía"
                 },
                 "railway/tram_stop": {
-                    "name": "Parada de Tranvía",
-                    "terms": "<translate with synonyms or related terms for 'Tram Stop', separated by commas>"
+                    "name": "Parada de Tranvía"
                 },
                 "relation": {
-                    "name": "Relación",
-                    "terms": "<translate with synonyms or related terms for 'Relation', separated by commas>"
+                    "name": "Relación"
                 },
                 "roundabout": {
                     "name": "Rotonda"
                 },
                 "route/ferry": {
-                    "name": "Ruta de Ferry",
-                    "terms": "<translate with synonyms or related terms for 'Ferry Route', separated by commas>"
+                    "name": "Ruta de Ferry"
                 },
                 "shop": {
-                    "name": "Tenda",
-                    "terms": "<translate with synonyms or related terms for 'Shop', separated by commas>"
+                    "name": "Tenda"
                 },
                 "shop/alcohol": {
-                    "name": "Licorería",
-                    "terms": "<translate with synonyms or related terms for 'Liquor Store', separated by commas>"
+                    "name": "Licorería"
                 },
                 "shop/anime": {
-                    "name": "Anime Tenda",
-                    "terms": "<translate with synonyms or related terms for 'Anime Shop', separated by commas>"
+                    "name": "Anime Tenda"
                 },
                 "shop/antiques": {
-                    "name": "Antiguidades Tenda",
-                    "terms": "<translate with synonyms or related terms for 'Antiques Shop', separated by commas>"
+                    "name": "Antiguidades Tenda"
                 },
                 "shop/appliance": {
-                    "name": "Tenda de Electrodomésticos",
-                    "terms": "<translate with synonyms or related terms for 'Appliance Store', separated by commas>"
+                    "name": "Tenda de Electrodomésticos"
                 },
                 "shop/art": {
-                    "name": "Galería de Arte",
-                    "terms": "<translate with synonyms or related terms for 'Art Store', separated by commas>"
+                    "name": "Galería de Arte"
                 },
                 "shop/baby_goods": {
-                    "name": "Mercadorías para Bebés Tenda",
-                    "terms": "<translate with synonyms or related terms for 'Baby Goods Store', separated by commas>"
+                    "name": "Mercadorías para Bebés Tenda"
                 },
                 "shop/bag": {
-                    "name": "Maletas/Equipaxe Tenda",
-                    "terms": "<translate with synonyms or related terms for 'Bag/Luggage Store', separated by commas>"
+                    "name": "Maletas/Equipaxe Tenda"
                 },
                 "shop/bakery": {
-                    "name": "Panadería",
-                    "terms": "<translate with synonyms or related terms for 'Bakery', separated by commas>"
+                    "name": "Panadería"
                 },
                 "shop/bathroom_furnishing": {
-                    "name": "Tenda de Mobiliario de Baño",
-                    "terms": "<translate with synonyms or related terms for 'Bathroom Furnishing Store', separated by commas>"
+                    "name": "Tenda de Mobiliario de Baño"
                 },
                 "shop/beauty": {
-                    "name": "Salón de beleza",
-                    "terms": "<translate with synonyms or related terms for 'Beauty Shop', separated by commas>"
+                    "name": "Salón de beleza"
                 },
                 "shop/beauty/nails": {
-                    "name": "Salón de Unllas",
-                    "terms": "<translate with synonyms or related terms for 'Nail Salon', separated by commas>"
+                    "name": "Salón de Unllas"
                 },
                 "shop/beauty/tanning": {
-                    "name": "Salón de Bronceado",
-                    "terms": "<translate with synonyms or related terms for 'Tanning Salon', separated by commas>"
+                    "name": "Salón de Bronceado"
                 },
                 "shop/bed": {
-                    "name": "Ropa de cama/colchón",
-                    "terms": "<translate with synonyms or related terms for 'Bedding/Mattress Store', separated by commas>"
+                    "name": "Ropa de cama/colchón"
                 },
                 "shop/beverages": {
-                    "name": "Tenda de Bebidas",
-                    "terms": "<translate with synonyms or related terms for 'Beverage Store', separated by commas>"
+                    "name": "Tenda de Bebidas"
                 },
                 "shop/bicycle": {
-                    "name": "Tenda de bicicletas",
-                    "terms": "<translate with synonyms or related terms for 'Bicycle Shop', separated by commas>"
+                    "name": "Tenda de bicicletas"
                 },
                 "shop/bookmaker": {
-                    "name": "Corredor de Apostas",
-                    "terms": "<translate with synonyms or related terms for 'Bookmaker', separated by commas>"
+                    "name": "Corredor de Apostas"
                 },
                 "shop/books": {
-                    "name": "Libraría",
-                    "terms": "<translate with synonyms or related terms for 'Book Store', separated by commas>"
+                    "name": "Libraría"
                 },
                 "shop/boutique": {
-                    "name": "Boutique",
-                    "terms": "<translate with synonyms or related terms for 'Boutique', separated by commas>"
+                    "name": "Boutique"
                 },
                 "shop/butcher": {
-                    "name": "Carnicería",
-                    "terms": "<translate with synonyms or related terms for 'Butcher', separated by commas>"
+                    "name": "Carnicería"
                 },
                 "shop/candles": {
-                    "name": "Tenda de Velas",
-                    "terms": "<translate with synonyms or related terms for 'Candle Shop', separated by commas>"
+                    "name": "Tenda de Velas"
                 },
                 "shop/car": {
-                    "name": "Concesionario",
-                    "terms": "<translate with synonyms or related terms for 'Car Dealership', separated by commas>"
+                    "name": "Concesionario"
                 },
                 "shop/car_parts": {
-                    "name": "Tenda de recambios de automóbiles",
-                    "terms": "<translate with synonyms or related terms for 'Car Parts Store', separated by commas>"
+                    "name": "Tenda de recambios de automóbiles"
                 },
                 "shop/car_repair": {
-                    "name": "Taller de reparación de vehículos",
-                    "terms": "<translate with synonyms or related terms for 'Car Repair Shop', separated by commas>"
+                    "name": "Taller de reparación de vehículos"
                 },
                 "shop/carpet": {
-                    "name": "Alfombras Tenda",
-                    "terms": "<translate with synonyms or related terms for 'Carpet Store', separated by commas>"
+                    "name": "Alfombras Tenda"
                 },
                 "shop/charity": {
-                    "name": "Tenda Solidaria",
-                    "terms": "<translate with synonyms or related terms for 'Charity Store', separated by commas>"
+                    "name": "Tenda Solidaria"
                 },
                 "shop/cheese": {
-                    "name": "Queixos Tenda",
-                    "terms": "<translate with synonyms or related terms for 'Cheese Store', separated by commas>"
+                    "name": "Queixos Tenda"
                 },
                 "shop/chemist": {
-                    "name": "Droguería",
-                    "terms": "<translate with synonyms or related terms for 'Drugstore', separated by commas>"
+                    "name": "Droguería"
                 },
                 "shop/chocolate": {
-                    "name": "Chocolatería",
-                    "terms": "<translate with synonyms or related terms for 'Chocolate Store', separated by commas>"
+                    "name": "Chocolatería"
                 },
                 "shop/clothes": {
-                    "name": "Tenda de roupa",
-                    "terms": "<translate with synonyms or related terms for 'Clothing Store', separated by commas>"
+                    "name": "Tenda de roupa"
                 },
                 "shop/coffee": {
-                    "name": "Tenda de Café",
-                    "terms": "<translate with synonyms or related terms for 'Coffee Store', separated by commas>"
+                    "name": "Tenda de Café"
                 },
                 "shop/computer": {
-                    "name": "Tenda de informática",
-                    "terms": "<translate with synonyms or related terms for 'Computer Store', separated by commas>"
+                    "name": "Tenda de informática"
                 },
                 "shop/confectionery": {
-                    "name": "Larpeiradas Tenda",
-                    "terms": "<translate with synonyms or related terms for 'Candy Store', separated by commas>"
+                    "name": "Larpeiradas Tenda"
                 },
                 "shop/convenience": {
-                    "name": "Tenda de Barrio",
-                    "terms": "<translate with synonyms or related terms for 'Convenience Store', separated by commas>"
+                    "name": "Tenda de Barrio"
                 },
                 "shop/copyshop": {
-                    "name": "Copistería",
-                    "terms": "<translate with synonyms or related terms for 'Copy Store', separated by commas>"
+                    "name": "Copistería"
                 },
                 "shop/cosmetics": {
-                    "name": "Tenda de Cosméticos",
-                    "terms": "<translate with synonyms or related terms for 'Cosmetics Store', separated by commas>"
+                    "name": "Tenda de Cosméticos"
                 },
                 "shop/craft": {
-                    "name": "Artes e oficios tenda",
-                    "terms": "<translate with synonyms or related terms for 'Arts and Crafts Store', separated by commas>"
+                    "name": "Artes e oficios tenda"
                 },
                 "shop/curtain": {
-                    "name": "Tenda de Cortinas",
-                    "terms": "<translate with synonyms or related terms for 'Curtain Store', separated by commas>"
+                    "name": "Tenda de Cortinas"
                 },
                 "shop/dairy": {
-                    "name": "Tenda de Lácteos",
-                    "terms": "<translate with synonyms or related terms for 'Dairy Store', separated by commas>"
+                    "name": "Tenda de Lácteos"
                 },
                 "shop/deli": {
-                    "name": "Delicatessen",
-                    "terms": "<translate with synonyms or related terms for 'Deli', separated by commas>"
+                    "name": "Delicatessen"
                 },
                 "shop/department_store": {
-                    "name": "Grandes almacéns",
-                    "terms": "<translate with synonyms or related terms for 'Department Store', separated by commas>"
+                    "name": "Grandes almacéns"
                 },
                 "shop/doityourself": {
-                    "name": "Bricolaxe DIY",
-                    "terms": "<translate with synonyms or related terms for 'DIY Store', separated by commas>"
+                    "name": "Bricolaxe DIY"
                 },
                 "shop/dry_cleaning": {
-                    "name": "Lavandería en Seco",
-                    "terms": "<translate with synonyms or related terms for 'Dry Cleaner', separated by commas>"
+                    "name": "Lavandería en Seco"
                 },
                 "shop/e-cigarette": {
-                    "name": "E-Cigarros Tenda",
-                    "terms": "<translate with synonyms or related terms for 'E-Cigarette Shop', separated by commas>"
+                    "name": "E-Cigarros Tenda"
                 },
                 "shop/electronics": {
-                    "name": "Tenda de electrodomésticos",
-                    "terms": "<translate with synonyms or related terms for 'Electronics Store', separated by commas>"
+                    "name": "Tenda de electrodomésticos"
                 },
                 "shop/erotic": {
-                    "name": "Erótica Tenda",
-                    "terms": "<translate with synonyms or related terms for 'Erotic Store', separated by commas>"
+                    "name": "Erótica Tenda"
                 },
                 "shop/fabric": {
-                    "name": "Tenda de Teas",
-                    "terms": "<translate with synonyms or related terms for 'Fabric Store', separated by commas>"
+                    "name": "Tenda de Teas"
                 },
                 "shop/farm": {
-                    "name": "Cesta de produtos",
-                    "terms": "<translate with synonyms or related terms for 'Produce Stand', separated by commas>"
+                    "name": "Cesta de produtos"
                 },
                 "shop/fashion": {
-                    "name": "Tenda de Moda",
-                    "terms": "<translate with synonyms or related terms for 'Fashion Store', separated by commas>"
+                    "name": "Tenda de Moda"
                 },
                 "shop/fishmonger": {
                     "name": "Peixeiro"
                 },
                 "shop/florist": {
-                    "name": "Florería",
-                    "terms": "<translate with synonyms or related terms for 'Florist', separated by commas>"
+                    "name": "Florería"
                 },
                 "shop/frame": {
-                    "name": "Marcos Tenda",
-                    "terms": "<translate with synonyms or related terms for 'Framing Shop', separated by commas>"
+                    "name": "Marcos Tenda"
                 },
                 "shop/funeral_directors": {
-                    "name": "Funeraria",
-                    "terms": "<translate with synonyms or related terms for 'Funeral Home', separated by commas>"
+                    "name": "Funeraria"
                 },
                 "shop/furnace": {
-                    "name": "Fornos Tenda",
-                    "terms": "<translate with synonyms or related terms for 'Furnace Store', separated by commas>"
+                    "name": "Fornos Tenda"
                 },
                 "shop/furniture": {
-                    "name": "Tenda de mobles",
-                    "terms": "<translate with synonyms or related terms for 'Furniture Store', separated by commas>"
+                    "name": "Tenda de mobles"
                 },
                 "shop/garden_centre": {
-                    "name": "Centro de xardinería",
-                    "terms": "<translate with synonyms or related terms for 'Garden Center', separated by commas>"
+                    "name": "Centro de xardinería"
                 },
                 "shop/gas": {
-                    "name": "Bombonas Gas Tenda",
-                    "terms": "<translate with synonyms or related terms for 'Bottled Gas Shop', separated by commas>"
+                    "name": "Bombonas Gas Tenda"
                 },
                 "shop/gift": {
-                    "name": "Tenda de Regalos",
-                    "terms": "<translate with synonyms or related terms for 'Gift Shop', separated by commas>"
+                    "name": "Tenda de Regalos"
                 },
                 "shop/greengrocer": {
-                    "name": "Froitería",
-                    "terms": "<translate with synonyms or related terms for 'Greengrocer', separated by commas>"
+                    "name": "Froitería"
                 },
                 "shop/hairdresser": {
-                    "name": "Perruquería",
-                    "terms": "<translate with synonyms or related terms for 'Hairdresser', separated by commas>"
+                    "name": "Perruquería"
                 },
                 "shop/hardware": {
-                    "name": "Ferretería",
-                    "terms": "<translate with synonyms or related terms for 'Hardware Store', separated by commas>"
+                    "name": "Ferretería"
                 },
                 "shop/hearing_aids": {
-                    "name": "Audífonos Tenda",
-                    "terms": "<translate with synonyms or related terms for 'Hearing Aids Store', separated by commas>"
+                    "name": "Audífonos Tenda"
                 },
                 "shop/herbalist": {
-                    "name": "Herborista",
-                    "terms": "<translate with synonyms or related terms for 'Herbalist', separated by commas>"
+                    "name": "Herborista"
                 },
                 "shop/hifi": {
-                    "name": "Hifi Tenda",
-                    "terms": "<translate with synonyms or related terms for 'Hifi Store', separated by commas>"
+                    "name": "Hifi Tenda"
                 },
                 "shop/houseware": {
-                    "name": "Electrodomésticos Tenda",
-                    "terms": "<translate with synonyms or related terms for 'Houseware Store', separated by commas>"
+                    "name": "Electrodomésticos Tenda"
                 },
                 "shop/interior_decoration": {
-                    "name": "Decoración Interiores Tenda",
-                    "terms": "<translate with synonyms or related terms for 'Interior Decoration Store', separated by commas>"
+                    "name": "Decoración Interiores Tenda"
                 },
                 "shop/jewelry": {
-                    "name": "Xoiería",
-                    "terms": "<translate with synonyms or related terms for 'Jeweler', separated by commas>"
+                    "name": "Xoiería"
                 },
                 "shop/kiosk": {
-                    "name": "Kiosko Xornais",
-                    "terms": "<translate with synonyms or related terms for 'News Kiosk', separated by commas>"
+                    "name": "Kiosko Xornais"
                 },
                 "shop/kitchen": {
-                    "name": "Deseño Cociñas Tenda",
-                    "terms": "<translate with synonyms or related terms for 'Kitchen Design Store', separated by commas>"
+                    "name": "Deseño Cociñas Tenda"
                 },
                 "shop/laundry": {
-                    "name": "Lavandería",
-                    "terms": "<translate with synonyms or related terms for 'Laundry', separated by commas>"
+                    "name": "Lavandería"
                 },
                 "shop/leather": {
-                    "name": "Tenda de Peles",
-                    "terms": "<translate with synonyms or related terms for 'Leather Store', separated by commas>"
+                    "name": "Tenda de Peles"
                 },
                 "shop/locksmith": {
-                    "name": "Cerraxeiro",
-                    "terms": "<translate with synonyms or related terms for 'Locksmith', separated by commas>"
+                    "name": "Cerraxeiro"
                 },
                 "shop/lottery": {
-                    "name": "Tenda de Lotería",
-                    "terms": "<translate with synonyms or related terms for 'Lottery Shop', separated by commas>"
+                    "name": "Tenda de Lotería"
                 },
                 "shop/mall": {
-                    "name": "Centro comercial",
-                    "terms": "<translate with synonyms or related terms for 'Mall', separated by commas>"
+                    "name": "Centro comercial"
                 },
                 "shop/massage": {
-                    "name": "Fisioterapia",
-                    "terms": "<translate with synonyms or related terms for 'Massage Shop', separated by commas>"
+                    "name": "Fisioterapia"
                 },
                 "shop/medical_supply": {
-                    "name": "Tenda de suministros médicos",
-                    "terms": "<translate with synonyms or related terms for 'Medical Supply Store', separated by commas>"
+                    "name": "Tenda de suministros médicos"
                 },
                 "shop/mobile_phone": {
-                    "name": "Tenda de telefonía móvil",
-                    "terms": "<translate with synonyms or related terms for 'Mobile Phone Store', separated by commas>"
+                    "name": "Tenda de telefonía móvil"
                 },
                 "shop/money_lender": {
-                    "name": "Usureiro",
-                    "terms": "<translate with synonyms or related terms for 'Money Lender', separated by commas>"
+                    "name": "Usureiro"
                 },
                 "shop/motorcycle": {
-                    "name": "Concesionario de motocicletas",
-                    "terms": "<translate with synonyms or related terms for 'Motorcycle Dealership', separated by commas>"
+                    "name": "Concesionario de motocicletas"
                 },
                 "shop/music": {
-                    "name": "Tenda de música",
-                    "terms": "<translate with synonyms or related terms for 'Music Store', separated by commas>"
+                    "name": "Tenda de música"
                 },
                 "shop/musical_instrument": {
-                    "name": "Tenda Instrumentos Musicais",
-                    "terms": "<translate with synonyms or related terms for 'Musical Instrument Store', separated by commas>"
+                    "name": "Tenda Instrumentos Musicais"
                 },
                 "shop/newsagent": {
-                    "name": "Xornais/Revistas Tenda",
-                    "terms": "<translate with synonyms or related terms for 'Newspaper/Magazine Shop', separated by commas>"
+                    "name": "Xornais/Revistas Tenda"
                 },
                 "shop/nutrition_supplements": {
-                    "name": "Nutrición Suplemento Tenda",
-                    "terms": "<translate with synonyms or related terms for 'Nutrition Supplements Store', separated by commas>"
+                    "name": "Nutrición Suplemento Tenda"
                 },
                 "shop/optician": {
-                    "name": "Óptica",
-                    "terms": "<translate with synonyms or related terms for 'Optician', separated by commas>"
+                    "name": "Óptica"
                 },
                 "shop/organic": {
-                    "name": "Produtos Ecolóxicos Tenda",
-                    "terms": "<translate with synonyms or related terms for 'Organic Goods Store', separated by commas>"
+                    "name": "Produtos Ecolóxicos Tenda"
                 },
                 "shop/outdoor": {
-                    "name": "Tenda ao aire libre",
-                    "terms": "<translate with synonyms or related terms for 'Outdoors Store', separated by commas>"
+                    "name": "Tenda ao aire libre"
                 },
                 "shop/paint": {
-                    "name": "Pintura Tenda",
-                    "terms": "<translate with synonyms or related terms for 'Paint Store', separated by commas>"
+                    "name": "Pintura Tenda"
                 },
                 "shop/pastry": {
-                    "name": "Confitería",
-                    "terms": "<translate with synonyms or related terms for 'Pastry Shop', separated by commas>"
+                    "name": "Confitería"
                 },
                 "shop/pawnbroker": {
-                    "name": "Casa de Empeños",
-                    "terms": "<translate with synonyms or related terms for 'Pawn Shop', separated by commas>"
+                    "name": "Casa de Empeños"
                 },
                 "shop/perfumery": {
-                    "name": "Perfumaría",
-                    "terms": "<translate with synonyms or related terms for 'Perfume Store', separated by commas>"
+                    "name": "Perfumaría"
                 },
                 "shop/pet": {
-                    "name": "Tenda de mascotas",
-                    "terms": "<translate with synonyms or related terms for 'Pet Store', separated by commas>"
+                    "name": "Tenda de mascotas"
                 },
                 "shop/photo": {
-                    "name": "Tenda de Fotografía",
-                    "terms": "<translate with synonyms or related terms for 'Photography Store', separated by commas>"
+                    "name": "Tenda de Fotografía"
                 },
                 "shop/pyrotechnics": {
-                    "name": "Fogos artificiais tenda",
-                    "terms": "<translate with synonyms or related terms for 'Fireworks Store', separated by commas>"
+                    "name": "Fogos artificiais tenda"
                 },
                 "shop/radiotechnics": {
-                    "name": "Radio/Electrónica, Tenda de Compoñentes",
-                    "terms": "<translate with synonyms or related terms for 'Radio/Electronic Component Store', separated by commas>"
+                    "name": "Radio/Electrónica, Tenda de Compoñentes"
                 },
                 "shop/religion": {
-                    "name": "Relixiosa Tenda",
-                    "terms": "<translate with synonyms or related terms for 'Religious Store', separated by commas>"
+                    "name": "Relixiosa Tenda"
                 },
                 "shop/scuba_diving": {
-                    "name": "Mergullo Tenda",
-                    "terms": "<translate with synonyms or related terms for 'Scuba Diving Shop', separated by commas>"
+                    "name": "Mergullo Tenda"
                 },
                 "shop/seafood": {
-                    "name": "Tenda de Mariscos",
-                    "terms": "<translate with synonyms or related terms for 'Seafood Shop', separated by commas>"
+                    "name": "Tenda de Mariscos"
                 },
                 "shop/second_hand": {
-                    "name": "Consigna/tenda de segunda man",
-                    "terms": "<translate with synonyms or related terms for 'Consignment/Thrift Store', separated by commas>"
+                    "name": "Consigna/tenda de segunda man"
                 },
                 "shop/shoes": {
-                    "name": "Zapatería",
-                    "terms": "<translate with synonyms or related terms for 'Shoe Store', separated by commas>"
+                    "name": "Zapatería"
                 },
                 "shop/sports": {
-                    "name": "Deportiva Tenda",
-                    "terms": "<translate with synonyms or related terms for 'Sporting Goods Store', separated by commas>"
+                    "name": "Deportiva Tenda"
                 },
                 "shop/stationery": {
-                    "name": "Papelería",
-                    "terms": "<translate with synonyms or related terms for 'Stationery Store', separated by commas>"
+                    "name": "Papelería"
                 },
                 "shop/storage_rental": {
-                    "name": "Aluguer de Almacéns",
-                    "terms": "<translate with synonyms or related terms for 'Storage Rental', separated by commas>"
+                    "name": "Aluguer de Almacéns"
                 },
                 "shop/supermarket": {
-                    "name": "Supermercado",
-                    "terms": "<translate with synonyms or related terms for 'Supermarket', separated by commas>"
+                    "name": "Supermercado"
                 },
                 "shop/tailor": {
-                    "name": "Xastre",
-                    "terms": "<translate with synonyms or related terms for 'Tailor', separated by commas>"
+                    "name": "Xastre"
                 },
                 "shop/tattoo": {
-                    "name": "Salón de Tatuaxes",
-                    "terms": "<translate with synonyms or related terms for 'Tattoo Parlor', separated by commas>"
+                    "name": "Salón de Tatuaxes"
                 },
                 "shop/tea": {
-                    "name": "Te Tenda",
-                    "terms": "<translate with synonyms or related terms for 'Tea Store', separated by commas>"
+                    "name": "Te Tenda"
                 },
                 "shop/ticket": {
-                    "name": "Venda de Entradas",
-                    "terms": "<translate with synonyms or related terms for 'Ticket Seller', separated by commas>"
+                    "name": "Venda de Entradas"
                 },
                 "shop/tobacco": {
-                    "name": "Estanco",
-                    "terms": "<translate with synonyms or related terms for 'Tobacco Shop', separated by commas>"
+                    "name": "Estanco"
                 },
                 "shop/toys": {
-                    "name": "Tenda de xoguetes",
-                    "terms": "<translate with synonyms or related terms for 'Toy Store', separated by commas>"
+                    "name": "Tenda de xoguetes"
                 },
                 "shop/travel_agency": {
-                    "name": "Axencia de viaxes",
-                    "terms": "<translate with synonyms or related terms for 'Travel Agency', separated by commas>"
+                    "name": "Axencia de viaxes"
                 },
                 "shop/tyres": {
-                    "name": "Tenda de neumáticos",
-                    "terms": "<translate with synonyms or related terms for 'Tire Store', separated by commas>"
+                    "name": "Tenda de neumáticos"
                 },
                 "shop/vacant": {
                     "name": "Local baleiro"
                 },
                 "shop/vacuum_cleaner": {
-                    "name": "Aspiradoras Tenda",
-                    "terms": "<translate with synonyms or related terms for 'Vacuum Cleaner Store', separated by commas>"
+                    "name": "Aspiradoras Tenda"
                 },
                 "shop/variety_store": {
-                    "name": "Tenda de Variedades",
-                    "terms": "<translate with synonyms or related terms for 'Variety Store', separated by commas>"
+                    "name": "Tenda de Variedades"
                 },
                 "shop/video": {
-                    "name": "Videoclub",
-                    "terms": "<translate with synonyms or related terms for 'Video Store', separated by commas>"
+                    "name": "Videoclub"
                 },
                 "shop/video_games": {
-                    "name": "Video Xogos Tenda",
-                    "terms": "<translate with synonyms or related terms for 'Video Game Store', separated by commas>"
+                    "name": "Video Xogos Tenda"
                 },
                 "shop/watches": {
-                    "name": "Reloxería",
-                    "terms": "<translate with synonyms or related terms for 'Watches Shop', separated by commas>"
+                    "name": "Reloxería"
                 },
                 "shop/water_sports": {
-                    "name": "Deportes acuáticos/tenda de natación",
-                    "terms": "<translate with synonyms or related terms for 'Watersport/Swim Shop', separated by commas>"
+                    "name": "Deportes acuáticos/tenda de natación"
                 },
                 "shop/weapons": {
-                    "name": "Armería",
-                    "terms": "<translate with synonyms or related terms for 'Weapon Shop', separated by commas>"
+                    "name": "Armería"
                 },
                 "shop/window_blind": {
-                    "name": "Tenda de Venta a Cegas",
-                    "terms": "<translate with synonyms or related terms for 'Window Blind Store', separated by commas>"
+                    "name": "Tenda de Venta a Cegas"
                 },
                 "shop/wine": {
-                    "name": "Viño Tenda",
-                    "terms": "<translate with synonyms or related terms for 'Wine Shop', separated by commas>"
+                    "name": "Viño Tenda"
                 },
                 "tourism": {
-                    "name": "Turismo",
-                    "terms": "<translate with synonyms or related terms for 'Tourism', separated by commas>"
+                    "name": "Turismo"
                 },
                 "tourism/alpine_hut": {
-                    "name": "Cabana alpina",
-                    "terms": "<translate with synonyms or related terms for 'Alpine Hut', separated by commas>"
+                    "name": "Cabana alpina"
                 },
                 "tourism/apartment": {
-                    "name": "Apartamento de Convidados /Condo",
-                    "terms": "<translate with synonyms or related terms for 'Guest Apartment / Condo', separated by commas>"
+                    "name": "Apartamento de Convidados /Condo"
                 },
                 "tourism/aquarium": {
-                    "name": "Acuarium",
-                    "terms": "<translate with synonyms or related terms for 'Aquarium', separated by commas>"
+                    "name": "Acuarium"
                 },
                 "tourism/artwork": {
-                    "name": "Obra artística",
-                    "terms": "<translate with synonyms or related terms for 'Artwork', separated by commas>"
+                    "name": "Obra artística"
                 },
                 "tourism/attraction": {
-                    "name": "Atracción turística",
-                    "terms": "<translate with synonyms or related terms for 'Tourist Attraction', separated by commas>"
+                    "name": "Atracción turística"
                 },
                 "tourism/camp_site": {
-                    "name": "Área de camping",
-                    "terms": "<translate with synonyms or related terms for 'Campground', separated by commas>"
+                    "name": "Área de camping"
                 },
                 "tourism/caravan_site": {
-                    "name": "Parque de Caravanas",
-                    "terms": "<translate with synonyms or related terms for 'RV Park', separated by commas>"
+                    "name": "Parque de Caravanas"
                 },
                 "tourism/chalet": {
-                    "name": "Chalé",
-                    "terms": "<translate with synonyms or related terms for 'Chalet', separated by commas>"
+                    "name": "Chalé"
                 },
                 "tourism/gallery": {
-                    "name": "Galería de Arte",
-                    "terms": "<translate with synonyms or related terms for 'Art Gallery', separated by commas>"
+                    "name": "Galería de Arte"
                 },
                 "tourism/guest_house": {
                     "name": "Hostal",
                     "terms": "hostal, pensión, hospedaxe, fonda, pousada, aloxamento, habitación"
                 },
                 "tourism/hostel": {
-                    "name": "Albergue",
-                    "terms": "<translate with synonyms or related terms for 'Hostel', separated by commas>"
+                    "name": "Albergue"
                 },
                 "tourism/hotel": {
-                    "name": "Hotel",
-                    "terms": "<translate with synonyms or related terms for 'Hotel', separated by commas>"
+                    "name": "Hotel"
                 },
                 "tourism/information": {
-                    "name": "Información",
-                    "terms": "<translate with synonyms or related terms for 'Information', separated by commas>"
+                    "name": "Información"
                 },
                 "tourism/information/board": {
-                    "name": "Placa de información",
-                    "terms": "<translate with synonyms or related terms for 'Information Board', separated by commas>"
+                    "name": "Placa de información"
                 },
                 "tourism/information/guidepost": {
-                    "name": "Posto Guía",
-                    "terms": "<translate with synonyms or related terms for 'Guidepost', separated by commas>"
+                    "name": "Posto Guía"
                 },
                 "tourism/information/map": {
-                    "name": "Mapa",
-                    "terms": "<translate with synonyms or related terms for 'Map', separated by commas>"
+                    "name": "Mapa"
                 },
                 "tourism/information/office": {
-                    "name": "Oficina de Información Turística",
-                    "terms": "<translate with synonyms or related terms for 'Tourist Information Office', separated by commas>"
+                    "name": "Oficina de Información Turística"
                 },
                 "tourism/motel": {
-                    "name": "Motel",
-                    "terms": "<translate with synonyms or related terms for 'Motel', separated by commas>"
+                    "name": "Motel"
                 },
                 "tourism/museum": {
-                    "name": "Museo",
-                    "terms": "<translate with synonyms or related terms for 'Museum', separated by commas>"
+                    "name": "Museo"
                 },
                 "tourism/picnic_site": {
-                    "name": "Zona de picnic",
-                    "terms": "<translate with synonyms or related terms for 'Picnic Site', separated by commas>"
+                    "name": "Zona de picnic"
                 },
                 "tourism/theme_park": {
-                    "name": "Parque de atraccións",
-                    "terms": "<translate with synonyms or related terms for 'Theme Park', separated by commas>"
+                    "name": "Parque de atraccións"
                 },
                 "tourism/viewpoint": {
-                    "name": "Miradoiro",
-                    "terms": "<translate with synonyms or related terms for 'Viewpoint', separated by commas>"
+                    "name": "Miradoiro"
                 },
                 "tourism/zoo": {
-                    "name": "Zoo",
-                    "terms": "<translate with synonyms or related terms for 'Zoo', separated by commas>"
+                    "name": "Zoo"
                 },
                 "traffic_calming": {
-                    "name": "Acougo de Tráfico",
-                    "terms": "<translate with synonyms or related terms for 'Traffic Calming', separated by commas>"
+                    "name": "Acougo de Tráfico"
                 },
                 "traffic_calming/bump": {
-                    "name": "Banda de frenado",
-                    "terms": "<translate with synonyms or related terms for 'Speed Bump', separated by commas>"
+                    "name": "Banda de frenado"
                 },
                 "traffic_calming/chicane": {
-                    "name": "Chicán de Tráfico",
-                    "terms": "<translate with synonyms or related terms for 'Traffic Chicane', separated by commas>"
+                    "name": "Chicán de Tráfico"
                 },
                 "traffic_calming/choker": {
-                    "name": "Choker de tráfico",
-                    "terms": "<translate with synonyms or related terms for 'Traffic Choker', separated by commas>"
+                    "name": "Choker de tráfico"
                 },
                 "traffic_calming/cushion": {
-                    "name": "Almofa de Velocidade",
-                    "terms": "<translate with synonyms or related terms for 'Speed Cushion', separated by commas>"
+                    "name": "Almofa de Velocidade"
                 },
                 "traffic_calming/dip": {
-                    "name": "Soterrado",
-                    "terms": "<translate with synonyms or related terms for 'Dip', separated by commas>"
+                    "name": "Soterrado"
                 },
                 "traffic_calming/hump": {
-                    "name": "Speed Hump",
-                    "terms": "<translate with synonyms or related terms for 'Speed Hump', separated by commas>"
+                    "name": "Speed Hump"
                 },
                 "traffic_calming/island": {
-                    "name": "Illa de Tráfico",
-                    "terms": "<translate with synonyms or related terms for 'Traffic Island', separated by commas>"
+                    "name": "Illa de Tráfico"
                 },
                 "traffic_calming/rumble_strip": {
-                    "name": "Rumble Faixa",
-                    "terms": "<translate with synonyms or related terms for 'Rumble Strip', separated by commas>"
+                    "name": "Rumble Faixa"
                 },
                 "traffic_calming/table": {
-                    "name": "Cruce Peonil Elevado",
-                    "terms": "<translate with synonyms or related terms for 'Raised Pedestrian Crossing', separated by commas>"
+                    "name": "Cruce Peonil Elevado"
                 },
                 "type/boundary": {
-                    "name": "Límite",
-                    "terms": "<translate with synonyms or related terms for 'Boundary', separated by commas>"
+                    "name": "Límite"
                 },
                 "type/boundary/administrative": {
-                    "name": "Límite administrativo",
-                    "terms": "<translate with synonyms or related terms for 'Administrative Boundary', separated by commas>"
+                    "name": "Límite administrativo"
                 },
                 "type/multipolygon": {
                     "name": "Multipolígono"
                 },
                 "type/restriction": {
-                    "name": "Restrición",
-                    "terms": "<translate with synonyms or related terms for 'Restriction', separated by commas>"
+                    "name": "Restrición"
                 },
                 "type/restriction/no_left_turn": {
-                    "name": "Prohibido xirar á esquerda",
-                    "terms": "<translate with synonyms or related terms for 'No Left Turn', separated by commas>"
+                    "name": "Prohibido xirar á esquerda"
                 },
                 "type/restriction/no_right_turn": {
-                    "name": "Prohibido xirar á dereita",
-                    "terms": "<translate with synonyms or related terms for 'No Right Turn', separated by commas>"
+                    "name": "Prohibido xirar á dereita"
                 },
                 "type/restriction/no_straight_on": {
-                    "name": "Non Pradiante",
-                    "terms": "<translate with synonyms or related terms for 'No Straight On', separated by commas>"
+                    "name": "Non Pradiante"
                 },
                 "type/restriction/no_u_turn": {
-                    "name": "Prohibido o cambio de sentido",
-                    "terms": "<translate with synonyms or related terms for 'No U-turn', separated by commas>"
+                    "name": "Prohibido o cambio de sentido"
                 },
                 "type/restriction/only_left_turn": {
-                    "name": "Obrigatorio xirar á esquerda",
-                    "terms": "<translate with synonyms or related terms for 'Left Turn Only', separated by commas>"
+                    "name": "Obrigatorio xirar á esquerda"
                 },
                 "type/restriction/only_right_turn": {
-                    "name": "Obrigatorio xirar á dereita",
-                    "terms": "<translate with synonyms or related terms for 'Right Turn Only', separated by commas>"
+                    "name": "Obrigatorio xirar á dereita"
                 },
                 "type/restriction/only_straight_on": {
-                    "name": "Obrigatorio continuar recto",
-                    "terms": "<translate with synonyms or related terms for 'No Turns', separated by commas>"
+                    "name": "Obrigatorio continuar recto"
                 },
                 "type/route": {
-                    "name": "Ruta",
-                    "terms": "<translate with synonyms or related terms for 'Route', separated by commas>"
+                    "name": "Ruta"
                 },
                 "type/route/bicycle": {
-                    "name": "Ruta ciclista",
-                    "terms": "<translate with synonyms or related terms for 'Cycle Route', separated by commas>"
+                    "name": "Ruta ciclista"
                 },
                 "type/route/bus": {
-                    "name": "Ruta de autobús",
-                    "terms": "<translate with synonyms or related terms for 'Bus Route', separated by commas>"
+                    "name": "Ruta de autobús"
                 },
                 "type/route/detour": {
-                    "name": "Ruta de Desvío",
-                    "terms": "<translate with synonyms or related terms for 'Detour Route', separated by commas>"
+                    "name": "Ruta de Desvío"
                 },
                 "type/route/ferry": {
-                    "name": "Ruta do Ferry",
-                    "terms": "<translate with synonyms or related terms for 'Ferry Route', separated by commas>"
+                    "name": "Ruta do Ferry"
                 },
                 "type/route/foot": {
-                    "name": "Rúa a Pé",
-                    "terms": "<translate with synonyms or related terms for 'Foot Route', separated by commas>"
+                    "name": "Rúa a Pé"
                 },
                 "type/route/hiking": {
-                    "name": "Ruta de Camiñata",
-                    "terms": "<translate with synonyms or related terms for 'Hiking Route', separated by commas>"
+                    "name": "Ruta de Camiñata"
                 },
                 "type/route/horse": {
-                    "name": "Ruta de Equitación",
-                    "terms": "<translate with synonyms or related terms for 'Riding Route', separated by commas>"
+                    "name": "Ruta de Equitación"
                 },
                 "type/route/pipeline": {
-                    "name": "Ruta de Tubaría",
-                    "terms": "<translate with synonyms or related terms for 'Pipeline Route', separated by commas>"
+                    "name": "Ruta de Tubaría"
                 },
                 "type/route/power": {
-                    "name": "Ruta de Enerxía",
-                    "terms": "<translate with synonyms or related terms for 'Power Route', separated by commas>"
+                    "name": "Ruta de Enerxía"
                 },
                 "type/route/road": {
-                    "name": "Ruta de Estrada",
-                    "terms": "<translate with synonyms or related terms for 'Road Route', separated by commas>"
+                    "name": "Ruta de Estrada"
                 },
                 "type/route/train": {
-                    "name": "Ruta de Tren",
-                    "terms": "<translate with synonyms or related terms for 'Train Route', separated by commas>"
+                    "name": "Ruta de Tren"
                 },
                 "type/route/tram": {
-                    "name": "Ruta de Tranvía",
-                    "terms": "<translate with synonyms or related terms for 'Tram Route', separated by commas>"
+                    "name": "Ruta de Tranvía"
                 },
                 "type/route_master": {
-                    "name": "Ruta Mestre",
-                    "terms": "<translate with synonyms or related terms for 'Route Master', separated by commas>"
+                    "name": "Ruta Mestre"
                 },
                 "type/site": {
-                    "name": "Lugar",
-                    "terms": "<translate with synonyms or related terms for 'Site', separated by commas>"
+                    "name": "Lugar"
                 },
                 "vertex": {
-                    "name": "Outro",
-                    "terms": "<translate with synonyms or related terms for 'Other', separated by commas>"
+                    "name": "Outro"
                 },
                 "waterway": {
                     "name": "Vía de Auga"
                 },
                 "waterway/boatyard": {
-                    "name": "Estaleiro",
-                    "terms": "<translate with synonyms or related terms for 'Boatyard', separated by commas>"
+                    "name": "Estaleiro"
                 },
                 "waterway/canal": {
-                    "name": "Canal",
-                    "terms": "<translate with synonyms or related terms for 'Canal', separated by commas>"
+                    "name": "Canal"
                 },
                 "waterway/dam": {
-                    "name": "Presa",
-                    "terms": "<translate with synonyms or related terms for 'Dam', separated by commas>"
+                    "name": "Presa"
                 },
                 "waterway/ditch": {
-                    "name": "Cuneta",
-                    "terms": "<translate with synonyms or related terms for 'Ditch', separated by commas>"
+                    "name": "Cuneta"
                 },
                 "waterway/dock": {
-                    "name": "Dique Húmido/Dique Seco",
-                    "terms": "<translate with synonyms or related terms for 'Wet Dock / Dry Dock', separated by commas>"
+                    "name": "Dique Húmido/Dique Seco"
                 },
                 "waterway/drain": {
-                    "name": "Cuneta",
-                    "terms": "<translate with synonyms or related terms for 'Drain', separated by commas>"
+                    "name": "Cuneta"
                 },
                 "waterway/fuel": {
-                    "name": "Estación Mariá de Fuel",
-                    "terms": "<translate with synonyms or related terms for 'Marine Fuel Station', separated by commas>"
+                    "name": "Estación Mariá de Fuel"
                 },
                 "waterway/river": {
                     "name": "Río",
-                    "terms": "<translate with synonyms or related terms for 'River', separated by commas>"
+                    "terms": "río, regato, afluente, auga"
                 },
                 "waterway/riverbank": {
-                    "name": "Ribeira do río",
-                    "terms": "<translate with synonyms or related terms for 'Riverbank', separated by commas>"
+                    "name": "Ribeira do río"
                 },
                 "waterway/sanitary_dump_station": {
-                    "name": "WC Mariño Eliminación",
-                    "terms": "<translate with synonyms or related terms for 'Marine Toilet Disposal', separated by commas>"
+                    "name": "WC Mariño Eliminación"
                 },
                 "waterway/stream": {
                     "name": "Regato",
-                    "terms": "<translate with synonyms or related terms for 'Stream', separated by commas>"
+                    "terms": "río, regato, rego, torrente, auga"
                 },
                 "waterway/water_point": {
-                    "name": "Auga Potable Mariña",
-                    "terms": "<translate with synonyms or related terms for 'Marine Drinking Water', separated by commas>"
+                    "name": "Auga Potable Mariña"
                 },
                 "waterway/waterfall": {
-                    "name": "Fervenza",
-                    "terms": "<translate with synonyms or related terms for 'Waterfall', separated by commas>"
+                    "name": "Fervenza"
                 },
                 "waterway/weir": {
-                    "name": "Presa",
-                    "terms": "<translate with synonyms or related terms for 'Weir', separated by commas>"
+                    "name": "Presa"
                 }
             }
         },
diff --git a/vendor/assets/iD/iD/locales/hu.json b/vendor/assets/iD/iD/locales/hu.json
index 3e050ca25..03a683152 100644
--- a/vendor/assets/iD/iD/locales/hu.json
+++ b/vendor/assets/iD/iD/locales/hu.json
@@ -348,6 +348,48 @@
             "list": "Szerkesztette {users}",
             "truncated_list": "Szerkesztette {users} és {count} másik szerkesztő"
         },
+        "info_panels": {
+            "key": "I",
+            "background": {
+                "key": "B",
+                "title": "Háttér",
+                "zoom": "Nagyítás",
+                "unknown": "Ismeretlen",
+                "show_tiles": "Csempék megjelenítése",
+                "hide_tiles": "Csempék elrejtése"
+            },
+            "history": {
+                "key": "H",
+                "title": "Előzmények",
+                "selected": "{n} kiválasztott",
+                "version": "Verzió",
+                "last_edit": "Utolsó szerkesztés",
+                "edited_by": "Szerkesztette",
+                "changeset": "Módosításcsomag",
+                "unknown": "Ismeretlen",
+                "link_text": "Előzmények az openstreetmap.org-on"
+            },
+            "location": {
+                "key": "L",
+                "title": "Helyszín",
+                "unknown_location": "Ismeretlen helyszín"
+            },
+            "measurement": {
+                "key": "M",
+                "title": "Mérés",
+                "selected": "{n} kiválasztott",
+                "geometry": "Geometria",
+                "closed": "zárt",
+                "center": "Középpont",
+                "perimeter": "Kerület",
+                "length": "Hossz",
+                "area": "Terület",
+                "centroid": "Súlypont",
+                "location": "Helyszín",
+                "metric": "Metrikus",
+                "imperial": "Angolszász"
+            }
+        },
         "geometry": {
             "point": "pont",
             "vertex": "csúcspont",
@@ -503,7 +545,9 @@
         },
         "restore": {
             "heading": "Elmentetlen változtatásaid vannak",
-            "description": "Szeretnéd visszaállítani az elmentetlen változtatásokat az előző munkamenetből?"
+            "description": "Szeretnéd visszaállítani az elmentetlen változtatásokat az előző munkamenetből?",
+            "restore": "Módosítások visszaállítása",
+            "reset": "Módosításaim elvetése"
         },
         "save": {
             "title": "Mentés",
@@ -978,6 +1022,17 @@
                     "redo": "A legutóbbi művelet újra",
                     "save": "Módosítások mentése"
                 }
+            },
+            "tools": {
+                "title": "Eszközök",
+                "info": {
+                    "title": "Információ",
+                    "all": "Az összes információ panel kapcsolása",
+                    "background": "A háttér panel kapcsolása",
+                    "history": "Előzmények panel kapcsolása",
+                    "location": "Helyszín panel kapcsolása",
+                    "measurement": "Mérés panel kapcsolása"
+                }
             }
         },
         "presets": {
diff --git a/vendor/assets/iD/iD/locales/pl.json b/vendor/assets/iD/iD/locales/pl.json
index 7483fd156..79c4d8d5e 100644
--- a/vendor/assets/iD/iD/locales/pl.json
+++ b/vendor/assets/iD/iD/locales/pl.json
@@ -138,7 +138,7 @@
             },
             "connect": {
                 "annotation": {
-                    "point": "Połączono linię z węzłem.",
+                    "point": "Połączono linię z punktem.",
                     "vertex": "Połączono linie.",
                     "line": "Połączono drogę z linią.",
                     "area": "Połączono drogę z obszarem."
@@ -315,7 +315,7 @@
         "logout": "wyloguj",
         "loading_auth": "Łączenie z OpenStreetMap...",
         "report_a_bug": "Zgłoś błąd",
-        "help_translate": "Pomóż tłumaczyć",
+        "help_translate": "Pomóż przetłumaczyć",
         "feature_info": {
             "hidden_warning": "{count} ukrytych obiektów",
             "hidden_details": "Te obiekty są akutalnie ukryte: {details}"
@@ -352,31 +352,40 @@
             "key": "I",
             "background": {
                 "key": "B",
-                "title": "Tło",
+                "title": "Warstawa tła",
                 "zoom": "Powiększenie",
-                "unknown": "Nieznany",
-                "show_tiles": "Pokaż kafle",
-                "hide_tiles": "Ukryj kafle"
+                "vintage": "Datowanie",
+                "unknown": "Nieznane",
+                "show_tiles": "Pokaż dane kafli",
+                "hide_tiles": "Ukryj dane kafli"
             },
             "history": {
                 "key": "H",
                 "title": "Historia",
-                "selected": "[n] zaznaczono",
+                "selected": "{n} wybrano",
                 "version": "Wersja",
                 "last_edit": "Ostatnia edycja",
                 "edited_by": "Edytowane przez",
-                "changeset": "Zestaw zmian"
+                "changeset": "Zestaw zmian",
+                "unknown": "brak",
+                "link_text": "Historia na openstreetmap.org"
             },
             "location": {
-                "key": "L"
+                "key": "L",
+                "title": "Lokalizacja",
+                "unknown_location": "Lokalizacja nieznana"
             },
             "measurement": {
                 "key": "M",
-                "selected": "[n] zaznaczono",
+                "title": "Pomiary",
+                "selected": "{n} wybrano",
                 "geometry": "Geometria",
-                "closed": "zamknięte",
+                "closed": "zamknięty",
+                "center": "Środek",
+                "perimeter": "Obwód",
                 "length": "Długość",
                 "area": "Powierzchnia",
+                "centroid": "Centroida",
                 "location": "Lokalizacja",
                 "metric": "Metryczne",
                 "imperial": "Imperialne"
@@ -384,7 +393,7 @@
         },
         "geometry": {
             "point": "punkt",
-            "vertex": "węzeł",
+            "vertex": "wierzchołek",
             "line": "linia",
             "area": "obszar",
             "relation": "relacja"
@@ -417,10 +426,10 @@
             "remove": "Usuń",
             "search": "Szukaj",
             "multiselect": "Wybrane obiekty",
-            "unknown": "Nieznane",
+            "unknown": "brak",
             "incomplete": "<nie pobrane>",
             "feature_list": "Wyszukiwanie rodzaju obiektu",
-            "edit": "Edytuj obiekt",
+            "edit": "Edytor obiektu",
             "check": {
                 "yes": "Tak",
                 "no": "Nie",
@@ -442,7 +451,7 @@
             "add_fields": "Dodaj pole:"
         },
         "background": {
-            "title": "Tło",
+            "title": "Warstwa tła",
             "description": "Ustawienia tła",
             "key": "B",
             "percent_brightness": "Jasność {opacity}%",
@@ -451,7 +460,8 @@
             "switch": "Wróć do tego podkładu",
             "custom": "Własne",
             "custom_button": "Edycja własnego podkładu",
-            "fix_misalignment": "Przesunięcie podkładu",
+            "custom_prompt": "Wprowadź szablon dla URL kafla mapy. Obsługiwane symbole:\n   - {zoom}/{z}, {x}, {y} dla schematu adresowania kafla Z/X/Y\n   - {ty} dla odwróconej współrzędnej Y w adresowaniu TMS\n   - {u} dla QuadTiles\n   - {switch:a,b,c} dla multipleksacji serwerów na poziomie DNS\n\nPrzykład:\n{example}",
+            "fix_misalignment": "Przesunięcie warstwy tła",
             "imagery_source_faq": "Skąd pochodzi ta warstwa?",
             "reset": "Przywraca ustawienia",
             "offset": "Przeciągnij na szare pole poniżej, aby dostosować obrazek, lub wprowadź wartości przesunięcia w metrach.",
@@ -537,11 +547,13 @@
         },
         "restore": {
             "heading": "Masz niezapisane zmiany",
-            "description": "Przywrócić niezapisane zmiany z poprzedniej sesji?"
+            "description": "Przywrócić niezapisane zmiany z poprzedniej sesji?",
+            "restore": "Przywróć moje zmiany",
+            "reset": "Zapomnij moje zmiany"
         },
         "save": {
             "title": "Zapisz",
-            "help": "Zapisz zmiany na OpenStreetMap, aby były one widoczne dla innych.",
+            "help": "Sprawdź i zapisz zmiany na OpenStreetMap, aby były one widoczne dla innych.",
             "no_changes": "Brak zmian do zapisania.",
             "error": "Wystąpiły błędy podczas zapisywania. ",
             "status_code": "Serwer zwrócił kod {code}",
@@ -608,15 +620,15 @@
         "validations": {
             "disconnected_highway": "Droga odłączona od siatki innych dróg",
             "disconnected_highway_tooltip": "Drogi powinny być połączone z innymi drogami lub wejściami do budynków. ",
-            "old_multipolygon": "Tagi multipoligonu na linii zewnętrznej",
-            "old_multipolygon_tooltip": "Ten styl tagowania multipoligonu jest przestarzały. Tagi powinny zostać zapisane w relacji, a nie na zewnętrznej linii.",
-            "untagged_point": "Nieoznaczony punkt",
+            "old_multipolygon": "Znaczniki multipoligonu na linii zewnętrznej",
+            "old_multipolygon_tooltip": "Ten sposób oznaczania multipoligonu jest przestarzały. Znaczniki powinny być zapisane w relacji, a nie na zewnętrznej linii.",
+            "untagged_point": "Pusty punkt - brak znaczników",
             "untagged_point_tooltip": "Wybierz typ obiektu, który opisuje czym jest ten punkt.",
-            "untagged_line": "Nieoznaczona linia",
+            "untagged_line": "Pusta linia - brak znaczników",
             "untagged_line_tooltip": "Wybierz typ obiektu, który opisuje czym jest ta linia.",
             "untagged_area": "Nieoznaczony obszar",
             "untagged_area_tooltip": "Wybierz typ obiektu, który opisuje czym jest ten obszar.",
-            "untagged_relation": "Nieoznaczona relacja",
+            "untagged_relation": "Pusta relacja - brak znaczników",
             "untagged_relation_tooltip": "Wybierz typ obiektu, który opisuje czym jest ta relacja.",
             "many_deletions": "Usuwasz aż {n} obiektów! Czy na pewno chcesz to zrobić? Tym sposobem trwale usuniesz je z mapy, który wszyscy mogą zobaczyć na openstreetmap.org.",
             "tag_suggests_area": "Znacznik {tag} sugeruje, że linia powinna być obszarem, ale nim nie jest.",
@@ -632,7 +644,7 @@
             "local_layer": "Lokalny plik",
             "drag_drop": "Przeciągnij i upuść plik .gpx, .geojson lub .kml na stronę lub kliknij przycisk po prawej by go wybrać",
             "zoom": "Przybliż do warstwy",
-            "browse": "Zlokalizuj plik"
+            "browse": "Wczytaj plik"
         },
         "mapillary_images": {
             "tooltip": "Zdjęcia z serwisu Mapillary",
@@ -648,14 +660,15 @@
         "help": {
             "title": "Pomoc",
             "key": "H",
-            "help": "# Pomoc\n\nTo jest edytor [OpenStreetMap](http://www.openstreetmap.org/),\nwolnej i edytowalnej mapy świata. Możesz go używać do dodawania i\naktualizacji danych w twoim rejonie, czyniąc otwartą mapę świata lepszą\ndla każdego.\n\nModyfikacje wprowadzone na tej mapie będą widoczne dla wszystkich\nużywających OpenStreetMap. Aby wprowadzić modyfikacje,\nmusisz się [zalogować](https://www.openstreetmap.org/login).\n\n[Edytor iD](http://ideditor.com/) jest projektem społecznościowym z\n[kodem dostępnym na GitHub](https://github.com/openstreetmap/iD).\n",
-            "roads": "# Drogi\n\nMożesz tworzyć, poprawiać i usuwać drogi używając tego edytora. Drogi mogą być wszelkiego rodzaju:\nścieżki, ulice, szlaki, ścieżki rowerowe i tak dalej - każdy często uczęszczany odcinek powinien dać się\nprzedstawić.\n\n### Zaznaczanie\n\nKliknij drogę, aby ją zaznaczyć. Obwiednia powinna stać się widoczna, wraz z małym menu\nnarzędziowym na mapie oraz panelem bocznym pokazującym więcej informacji na temat drogi.\n\n### Modyfikowanie\n\nCzęsto będziesz widział drogi, które nie są wyrównane ze zdjęciami satelitarnymi lub śladami GPS.\nMożesz dopasować te drogi tak, aby były we właściwym miejscu.\n\nNajpierw kliknij drogę, którą chcesz zmienić. Podświetli ją to oraz pokaże punkty kontrolne, które\nmożesz przesunąć w lepsze miejsce. Jeżeli chcesz dodać nowe punkty kontrolne, aby droga\nbyła bardziej szczegółowa, dwukrotnie kliknij część drogi bez punktu, a w tym miejscu nowy się\npojawi.\n\nJeżeli droga łączy się z inną drogą, ale nie jest prawidłowo połączona z nią na mapie, możesz\nprzeciągnąć jeden z puntów kontrolnych na drugą drogę w celu ich połączenia. Prawidłowe połączenia\ndróg są ważne dla mapy i kluczowe dla wyznaczania tras.\n\nMożesz też kliknąć narzędzie 'Przesuń' lub nacisnąć klawisz `M` aby przesunąć jednocześnie całą\ndrogę, a następnie kliknąć ponownie, aby zachować to przesunięcie.\n\n### Usuwanie\n\nGdy droga jest całkiem błędna - widzisz, że nie istnieje na zdjęciach satelitarnych (a najlepiej sam\nsprawdziłeś w terenie, że jej nie ma) - możesz usunąć ją. Uważaj, gdy usuwasz obiekty - wyniki usunięcia,\ntak jak każdej modyfikacji, są widoczne dla wszystkich, a zdjęcie satelitarne często nie są aktualne,\nwięc droga może być po prostu nowo wybudowana.\n\nMożesz usunąć drogę przez zaznaczenie jej, a następnie kliknięcie ikony kosza lub wciśnięcie\nklawisza 'Delete'.\n\n### Tworzenie\n\nGdzieś tam powinna być droga, ale jej nie ma? Kliknij przycisk 'Linia' w górnym lewym rogu edytora\nlub naciśnij klawisz '2' na klawiaturze, aby zacząć rysować linię.\n\nKliknij początek drogi na mapie, aby zacząć rysować. Jeżeli droga odchodzi od już istniejącej, zacznij\nprzez kliknięcie w miejscu, w którym się łączą.\n\nNastępnie klikaj na punktach wzdłuż drogi tak, aby biegła ona odpowiednio według zdjęć satelitarnych\nlub GPS. Jeżeli droga, którą rysujesz, krzyżuje się z inną, połącz je, klikając na punkcie przecięcia. Gdy\nskończysz rysować, dwukrotnie kliknij ostatni punkt lub naciśnij klawisz 'Enter' na klawiaturze.\n",
-            "gps": "# GPS\n\nZebrane ślady GPS są ważnym źródłem danych dla OpenStreetMap. Ten edytor pozwala na użycie lokalnych śladów - plików \".gpx\" na twoim komputerze. Możesz je zbierać za pomocą aplikacji na smartfony jak również dedykowanych odbiorników GPS.\n\nBy uzyskać więcej informacji jak wykonać pomiar GPS, przeczytaj [Mapping with a smartphone, GPS, or paper](http://learnosm.org/en/mobile-mapping/).\n\nBy użyć śladu GPX do mapowania, przeciągnij i upuść plik GPX na mapę edytora. Jeśli został on rozpoznany, pojawi się na niej jako jasno-purpurowa linia. Kliknij na \"Dane mapy\" po prawej stronie by włączyć, wyłączyć lub przybilżyć widok mapy do miejsca w którym pojawił się ślad.\n\nSam ślad nie jest bezpośrednio przenoszony na serwery OpenStreetMap - najlepszym sposobem na wykorzystanie go jest nanoszenie informacji uzyskanych z niego na mapę, często używając go jako wskazówkę, możesz także [wysłać go na serwery OpenStreetMap](http://www.openstreetmap.org/trace/create)\npozwalając tym samym innym użytkownikom na korzystanie z niego.\n",
-            "imagery": "# Zdjęcia\n\nZdjęcia lotnicze/satelitarne są ważnym zasobem w rysowaniu map. Kolekcja zdjęć lotniczych,\nsatelitarnych i innych wolnodostępnych źródeł jest dostępna w edytorze w menu 'Ustawienia tła' po\nprawej stronie.\n\nDomyślnie wyświetlana jest warstwa zdjęć satelitarnych z [Bing Maps](http://www.bing.com/maps/),\nale w miarę przybliżania i pojawiają się nowe źródła. Niektóre kraje, takie jak Stany Zjednoczone, Francja\nczy Dania mają w pewnych miejscach dostępne zdjęcia bardzo wysokiej jakości.\n\nZdjęcia są czasem przesunięte względem danych na mapie z powodu błędu dostawcy zdjęć. Jeżeli\nwidzisz dużo dróg przesuniętych względem tła, zastanów się, zanim je wszystkie wyrównasz względem\ntła. Zamiast tego możesz dostosować przesunięcie zdjęć tak, aby zgadzały się z istniejącymi danymi przez\nnaciśnięcie przycisku 'Wyrównaj podkład' na dole Ustawień tła.\n",
-            "addresses": "# Adresy\n\nAdresy są jedną z najbardziej użytecznych informacji na mapie.\n\nMimo że adresy są często reprezentowane jako części ulic, w OpenStreetMap są one\nzapisywane jako atrybuty budynków i miejsc wzdłuż ulicy.\n\nMożesz dodać nową informację adresową do miejsc narysowanych w postaci\nobwiedni budynków jak również do tych narysowanych w postaci pojedynczych punktów.\nNajlepszym źródłem danych adresowych jest jak zwykle zwiedzanie okolicy\nlub własna wiedza - tak jak z każdym innym obiektem, kopiowanie danych z komercyjnych\nźródeł takich jak Google Maps jest zabronione.\n",
-            "inspector": "#Użycie Edytora\n\nEdytor jest to panel po lewej stronie strony który umożliwa Ci edycję szczegółów wybranego obiektu.\n\n### Wybór typu obiektu\n\nPo tym jak dodasz punkt, linię lub obszar, możesz wybrać jakim typem obiektu jest on. Na przykład czy jest to autostrada czy droga polna, supermarket czy kafejka. Edytor pokaże propozycje najczęściej występujących obiektów, ale możesz także wpisać w wyszukiwarce nazwę typu obiektu który chcesz oznaczyć.\n\nKliknij \"i\" w prawym-dolnym rogu przycisku z nazwą danego typu obiektu by dowiedzieć się więcej. Kliknięcie samego przcisku oznaczy obiekt jako obiekt danego typu.\n\n### Użycie Schematów oraz Edycja Tagów\n\nPo tym jak wybierzesz typ, lub zaznaczysz obiekt który już go posiada, edytor wyświetli zestaw pól w których zapisane będą szczegóły obiektu takie jak nazwa czy adres.\n\nPoniżej wcześniej wyświetlonych pól, możesz kliknąć na listę rozwijalną \"Dodaj pole\" i użyć jej do dodania innych detali, jak na przykład link do Wikipedii, ułatwienia dla niepełnosprawnych i inne.\n\nNa samym dole edytora, możesz dodać dowolne tagi do danego obiektu, klikając na \"Dodatkowe tagi\". [Taginfo](http://taginfo.openstreetmap.org/) jest wspaniałym narzędziem, które pozwoli Ci dowiedzieć się więcej na temat popularnych zestawów tagów.\n\nZmiany które zrobisz przy użyciu edytora są automatycznie pokazywane na mapie.\nMożesz cofnąć każdą zmianę klikając przycisk \"Cofnij\".\n",
-            "buildings": "# Budynki\n\nOpenStreetMap jest największą na świecie bazą budynków. Możesz\nprzyczynić się do rozwoju owej bazy.\n\n### Zaznaczanie\n\nMożesz zaznaczyć budynek przez kliknięcie jego obwodu. Podświetli\nto obiekt i otworzy małe menu narzędziowe oraz pasek boczny zawierający\ninformacje o budynku.\n\n### Modyfikowanie\n\nZdarza się, że budynki są umieszczone w nieprawidłowych miejscach\nlub mają nieodpowiednie tagi.\n\nAby przesunąć cały budynek, zaznacz go, a następnie wybierz narzędzie\nprzesuwania. Przesuń kursor myszy, aby zmienić pozycję obiektu, a następnie\nkliknij, gdy już będzie w odpowiednim miejscu.\n\nAby poprawić kształt budynku, kliknij i przeciągnij węzły, które tworzą obwód\nobiektu, w lepiej usytuowane miejsce.\n\n### Tworzenie\n\nJednym z głównych problemów podczas tworzenia budynków jest to,\nże OpenStreetMap przechowuje budynki zarówno w postaci punktów\njak i obszarów. Przyjęło się rysowanie budynków w postaci obszarów, a rysowanie\nfirm, domów czy innej infrastruktury w postaci punktów w obszarze budynku.\n\nZacznij rysować budynek w postaci obszaru przez kliknięcie przycisku 'Obszar'\nw górnym lewym rogu edytora i zakończ go przez naciśnięcie klawisza 'Enter'\nna klawiaturze lub przez kliknięcie na pierwszym rysowanym punkcie w celu\nzamknięcia obszaru.\n\n### Usuwanie\n\nJeżeli budynek jest całkiem błędny - widzisz, że nie ma go na zdjęciach satelitarnych,\na najlepiej sprawdziłeś w terenie, że nie istnieje - możesz go usunąć. Bądź ostrożny\nusuwając obiekty - tak jak po każdej innej modyfikacji, rezultaty są widoczne dla wszystkich,\na zdjęcia satelitarne często nie są aktualne, więc budynek może być po prostu nowo\nwybudowany.\n\nMożesz usunąć budynek przez kliknięcie na nim, a następnie na ikonie\nśmietnika lub wciśnięcie klawisza 'Delete'.\n",
-            "relations": "# Relacje\n\nRelacja to specjalny rodzaj obiektu w OpenStreetMap, który grupuje razem\ninne obiekty. Na przykład dwa powszechne rodzaje relacji to *relacje trasy*\nktóre grupują odcinki drogi należące do konkretnej autostrady lub drogi oraz\n*wielokąty* łączące razem kilka linii, które definiują bardziej złożony obszar\n(na przykład las z polaną w środku).\n\nKażdy element relacji nazywany jest *członkiem*. W pasku bocznym możesz\nzobaczyć do której relacji należy obiekt i kliknąć aby ją zaznaczyć. Gdy relacja\njest zaznaczona, ukaże nam się lista jej członków, które jednocześnie zostaną\npodświetlone na mapie.\n\nPrzeważnie edytor iD automatycznie sprawdza relacje podczas twoich edycji.\nTrzeba pamiętać o ważnej rzeczy, gdy kasujesz jakiś fragment linii (np. aby\ndokładniej go narysować), sprawdź wcześniej do jakich relacji należy oraz\njakie pełni w nich role aby uzupełnić te dane po wyrysowaniu linii.\n\n## Edycja relacji\n\nJeśli chcesz edytować relacje, oto podstawy wiedzy.\n\nAby dodać obiekt do relacji, zaznacz obiekt i wciśnij \"+\" w sekcji \"Wszystkie relacje\"\ni wybierz relację lub wpisz jej nazwę.\n\nAby utworzyć nową relację, zaznacz pierwszy obiekt, który ma być członkiem\nrelacji i wciśnij \"+\" w sekcji \"Wszystkie relacje\" i wybierz \"Nowa relacja...\"\n\nAby usunąć obiekt z relacji, zaznacz obiekt i kliknij ikonkę kosza obok\nrelacji, z której chcesz go usunąć.\n\nMożesz stworzyć wielokąt złożony z otworem używając narzędzia Scalanie.\nNarysuj dwa obszary, gdzie jeden znajduje się wewnątrz drugiego, zaznacz\noba przytrzymując klawisz Shift i kliknij przycisk \"Scal te linie\" (+).\n"
+            "help": "# Pomoc\n\nTo jest edytor [OpenStreetMap](http://www.openstreetmap.org/),\nwolnej i edytowalnej mapy świata. Możesz go używać do dodawania i\naktualizacji danych w twoim rejonie, czyniąc otwartą mapę świata lepszą\ndla każdego.\n\nModyfikacje wprowadzone na tej mapie będą widoczne dla wszystkich\nkorzystających z OpenStreetMap. Aby wprowadzić modyfikacje,\nmusisz się [zalogować](https://www.openstreetmap.org/login).\n\n[Edytor iD](http://ideditor.com/) jest projektem społecznościowym z\n[kodem dostępnym na GitHub](https://github.com/openstreetmap/iD).\n",
+            "editing_saving": "# Edytowanie i zapisywanie\n\nTen edytor został zaprojektowany do pracy online i korzystasz z niego teraz poprzez stronę internetową.\n\n### Wybieranie obiektów\n\nAby wybrać obiekt na mapie, taki jak droga czy POI, kliknij na nim. Spowoduje to podświetlenie wybranego obiektu, otwarcie panelu z informacjami o nim i wyświetlenie menu z działaniami, jakie możesz wykonać na obiekcie.\n\nAby wybrać wiele obiektów na raz, naciśnij i trzymaj klawisz 'Shift'. Następnie klikaj na obiektach, które chcesz wybrać, lub trzymając wciśnięty lewy przycisk myszy z jednoczesnym przeciągnięciem zaznacz prostokątem interesujący cię obszar na mapie. Spowoduje to wybranie wszystkich obiektów wewnątrz niego.\n\n### Zapisywanie edycji\n\nGdy wprowadzisz zmiany poprzez edycję dróg, budynków, miejsc itp., są one zapisane lokalnie aż do czasu przesłania ich na serwer. Nie przejmuj się, gdy popełnisz błąd - zmiany możesz wycofać poprzez kliknięcie na przycisku 'Cofnij', i przywrócić cofnięte zmiany poprzez kliknięcie na przycisku 'Ponów'.\n\nKliknij 'Zapisz' by zapisać grupę edycji - na przykład gdy skończyłeś jeden obszar miejscowości i chcesz przejść do edytowania kolejnego. Przed zapisem będzie jeszcze możliwość przejrzenia swoich edycji, edytor w tym zakresie dostarcza pomocnych podpowiedzi oraz ostrzeżeń w sytuacji, gdy coś w zmianach nie wygląda poprawnie.\n\nJeśli wszystko jest dobrze, to po wpisaniu komentarza wyjaśniającego wykonane zmiany, kliknij ponownie 'Zapisz' by wysłać zmiany do [OpenStreetMap.org](http://www.openstreetmap.org/), gdzie staną się one widoczne dla innych użytkowników oraz dostępne dla nich w celach edycji i dalszego uzupełniania mapy.\n\nJeśli nie masz czasu by skończyć rozpoczęte edytowanie, możesz w dowolnej chwili je przerwać poprzez zamknięcie Edytora. Nie musisz przy tym zapisywać zmian, Edytor zapamięta wszystko lokalnie i po powrocie do edytowania (do tej samej przeglądarki i na tym samym komputerze)  zaoferuje przywrócenie twojej pracy.\n\n### Korzystanie z edytora\n\nMożesz zobaczyć listę skrótów klawiaturowych po naciśnięciu klawisza `?`.\n",
+            "roads": "# Drogi\n\nMożesz tworzyć, poprawiać i usuwać drogi używając tego edytora. Drogi mogą różnorodne:\nścieżki, chodniki, ulice, drogi rowerowe i tak dalej - każdy często uczęszczany odcinek drogi powinien dać się prawidłowo przedstawić na mapie.\n\n### Zaznaczanie/wybieranie\n\nKliknij drogę, aby ją wybrać. Obrys powinien stać się widoczny, wraz z małym menu\nnarzędziowym na mapie oraz panelem bocznym pokazującym więcej informacji o drodze.\n\n### Edytowanie\n\nCzęsto zobaczysz drogi, które nie są wyrównane ze zdjęciami satelitarnymi lub śladami GPS.\nMożesz poprawić te drogi tak, aby były we właściwym miejscu.\n\nNajpierw kliknij na drodze, którą chcesz zmienić. Podświetli ją to oraz pokaże punkty kontrolne, które możesz przesunąć w prawidłowe miejsce. Jeżeli chcesz dodać nowe punkty kontrolne, aby droga była bardziej dokładnie pokazana, dwukrotnie kliknij na częśi drogi bez punktu, a dodany zostanie w tym miejscu nowy punkt.\n\nJeżeli droga łączy się z inną drogą, ale na mapie nie jest prawidłowo połączona z nią, możesz\nprzeciągnąć jeden z puntów kontrolnych na drugą drogę w celu ich połączenia. Prawidłowe połączenia dróg są ważne dla mapy i kluczowe dla wyznaczania tras w nawigacji.\n\nMożesz też kliknąć narzędzie 'Przesuń' lub nacisnąć klawisz `M` aby przesunąć jednocześnie całą\ndrogę, a następnie kliknąć ponownie, aby zatwierdzić to przesunięcie.\n\n### Usuwanie\n\nGdy droga jest całkiem błędna - widzisz, że nie istnieje na zdjęciach satelitarnych, a najlepiej gdy wiesz to po sprawdzeniu w terenie, możesz ją usunąć. Uważaj, gdy usuwasz obiekty - jak w przypadku każdej edycji, usunięcie to będzie widoczne dla wszystkich - a wykorzystane zdjęcie satelitarne może nie być aktualne, więc droga mogła zostać po prostu dopiero niedawno zbudowana i dlatego nie widać jej na zdjęciu.\n\nMożesz usunąć drogę wybierając ją kliknięciem, a następnie klikając na ikonie kosza na śmieci lub wciskając klawisz 'Delete'.\n\n### Tworzenie\n\nOkazało się, że gdzieś powinna być droga, ale jej nie ma? Kliknij przycisk 'Linia' w górnym lewym rogu edytora lub naciśnij klawisz '2' na klawiaturze, aby zacząć rysować linię.\n\nKliknij w miejscu, w którym zaczyna się droga, aby zacząć rysować. Jeżeli droga odchodzi od już istniejącej, zacznij rysowanie poprzez kliknięcie w miejscu, w którym się łączą.\n\nNastępnie klikaj wzdłuż drogi tworząc nowe punkty, tak, aby przebieg rysowanej drogi odpowiadał temu widocznemu na zdjęciach satelitarnych lub ścieżce GPS. Jeżeli droga, którą rysujesz, krzyżuje się z inną, połącz je, klikając na punkcie ich przecięcia. Gdy skończysz rysować, dwukrotnie kliknij ostatni punkt lub naciśnij klawisz 'Enter' na klawiaturze.\n",
+            "gps": "# GPS\n\nZebrane ślady GPS są ważnym źródłem danych dla OpenStreetMap. Ten edytor pozwala na użycie lokalnych śladów - plików \".gpx\" z twojego komputera. Możesz je zbierać za pomocą aplikacji na smartfony, jak również dedykowanych odbiorników GPS.\n\nBy uzyskać więcej informacji jak wykonać pomiar GPS, przeczytaj [Mapping with a smartphone, GPS, or paper](http://learnosm.org/en/mobile-mapping/).\n\nBy użyć śladu GPX do mapowania, przeciągnij i upuść plik GPX na mapę edytora. Jeśli zostanie on rozpoznany, pojawi się na niej jako jasno-purpurowa linia. Kliknij na \"Dane mapy\" po prawej stronie by włączyć, wyłączyć lub przybliżyć widok mapy do miejsca w którym pojawił się ślad.\n\nSam ślad nie jest bezpośrednio zapisywany na serwerach OpenStreetMap - najlepszym sposobem na wykorzystanie go jest rysowanie mapy na jego podstawie; możesz także [wysłać go na serwery OpenStreetMap](http://www.openstreetmap.org/trace/create)\npozwalając tym samym innym użytkownikom na korzystanie z niego.\n",
+            "imagery": "# Zdjęcia\n\nZdjęcia lotnicze/satelitarne są ważną pomocą w rysowaniu map. Kolekcja zdjęć lotniczych,\nsatelitarnych i innych z wolnodostępnych źródeł jest dostępna w edytorze w menu po prawej stronie jako przycisk 'Ustawienia tła'.\n\nDomyślnie dla Polski wyświetlana jest ortofotomapa 'Geoportal.gov.pl' wykonana ze zdjęć lotniczych. Poza krajem domyślną mapą są zdjęcia satelitarne [Bing Maps](http://www.bing.com/maps/), jednak w zależności od kraju mogą być też dostępne inne, lepsze zdjęcia. Niektóre kraje, np. Stany Zjednoczone, Francja czy Dania mają w pewnych miejscach dostępne zdjęcia bardzo wysokiej jakości.\n\nZdjęcia są czasem przesunięte względem danych na mapie z powodu braku ich kalibracji przez dostawcę zdjęć. Jeżeli widzisz dużo dróg przesuniętych względem tła, nie przesuwaj ich od razu w prawidłowe miejsce. Zamiast tego skoryguj przesunięcie zdjęć tak, aby zgadzały się z istniejącymi danymi, przez kliknięcie na 'Przesunięcie warstwy tła' na dole Ustawień tła.\n",
+            "addresses": "# Adresy\n\nAdresy są jedną z najbardziej użytecznych informacji na mapie.\n\nChociaż adresy są często reprezentowane jako części ulic, w OpenStreetMap są one\nzapisywane jako atrybuty budynków i miejsc wzdłuż ulicy.\n\nMożesz dodać nową informację adresową do obrysów budynków oraz do pojedynczych punktów. Pożądanym źródłem danych adresowych jest zwykle zwiedzanie okolicy\nlub własna wiedza. Tak jak w przypadku każdego innego obiektu, kopiowanie danych z komercyjnych źródeł takich jak Google Maps jest zabronione.\n",
+            "inspector": "#Korzystanie z Edytora Obiektu\n\nEdytor Obiektu jest to panel po lewej stronie, który umożliwa edycję szczegółów wybranego obiektu.\n\n### Wybór rodzaju obiektu\n\nGdy dodasz punkt, linię lub obszar, możesz wybrać jakim rodzajem obiektu on jest. Na przykład czy jest to autostrada czy droga osiedlowa, supermarket czy kafejka. Edytor Obiektu pokaże propozycje najczęściej występujących rodzajów obiektów, ale możesz też wyszukać inne poprzez wpisanie w polu wyszukiwania nazwy tego, czego szukasz.\n\nKliknij \"i\" w prawej części przycisku z nazwą danego rodzaju obiektu by dowiedzieć się więcej. Kliknij przycisk by oznaczyć wybrany obiekt jako obiekt danego rodzaju.\n\n\n### Korzystanie z formularzy oraz edycja znaczników\n\nPo tym jak wybierzesz rodzaj obiektu lub gdy zaznaczysz obiekt, który już ma określony rodzaj, Edytor Obiektu wyświetli zestaw pól z informacjami o obiekcie, takimi jak nazwa czy adres.\n\nPoniżej tych pól możesz kliknąć na listę rozwijalną \"Dodaj pole\" i użyć jej do dodania innych informacji, takich jak link do Wikipedii, dostęp dla wózków inwalidzkich i kilku innych.\n\nNa samym dole Edytora Obiektu możesz dodać dowolne znaczniki do wybranego obiektu poprzez kliknięcie na \"Wszystkie znaczniki\". [Taginfo](http://taginfo.openstreetmap.org/) jest wspaniałym narzędziem do poznania popularnych zestawów znaczników.\n\nZmiany, które zrobisz przy użyciu Edytora Obiektu, są automatycznie pokazywane na mapie.\nMożesz cofnąć każdą zmianę klikając przycisk \"Cofnij\".\n",
+            "buildings": "# Budynki\n\nOpenStreetMap jest największą na świecie bazą budynków. Możesz przyczynić się do rozwoju tej bazy.\n\n### Zaznaczanie/wybieranie\n\nMożesz wybrać budynek poprzez kliknięcie na jego obwodzie. Podświetli\nto obiekt i wyświetli panel boczny zawierający informacje o budynku.\nKlikając prawym klawiszem myszy dodatkowo otworzysz małe menu narzędziowe.\n\n### Edytowanie\n\nZdarza się, że budynki są umieszczone w nieprawidłowych miejscach lub mają nieodpowiednie znaczniki.\n\nAby przesunąć cały budynek, wybierz go klikając prawym klawiszem myszy, a następnie kliknij na narzędzie \"Przesuń\". Przesuwając myszą zmieniasz pozycję budynku. Kliknij, gdy będzie już w odpowiednim miejscu by zatwierdzić zmianę.\n\nAby poprawić kształt budynku, kliknij i przeciągnij węzły, które tworzą obwód\nobiektu, w prawidłowe miejsce.\n\n### Tworzenie\n\nJednym z głównych problemów związanych z budynkami jest to,\nże OpenStreetMap pozwala na zapisywanie budynki zarówno w postaci punktów jak i obszarów.\nPodstawową zasadą jest rysowanie budynków w postaci obszarów, a rysowanie\nPOI, firm, sklepów czy innej infrastruktury w postaci punktów wewnątrz budynku.\n\nZacznij rysować budynek w postaci obszaru przez kliknięcie przycisku 'Obszar'\nna górze edytora i zakończ rysowanie przez naciśnięcie klawisza 'Enter'\nna klawiaturze lub przez kliknięcie na pierwszym narysowanym punkcie.\n\n### Usuwanie\n\nJeżeli budynek jest całkiem błędny - widzisz, że nie istnieje na zdjęciach satelitarnych, a najlepiej gdy wiesz to po sprawdzeniu w terenie, możesz go usunąć. Uważaj, gdy usuwasz obiekty - jak w przypadku każdej edycji, usunięcie to będzie widoczne dla wszystkich - a wykorzystane zdjęcie satelitarne może nie być aktualne, więc budynek mógł zostać po prostu dopiero niedawno zbudowany i dlatego nie widać go na zdjęciu.\n\nUsuń budynek poprzez wybranie go kliknięciem,  a następnie kliknij na ikonie\nkosza na śmieci lub naciśnij klawisz 'Delete'.\n",
+            "relations": "# Relacje\n\nRelacja to specjalny rodzaj obiektu w OpenStreetMap, który grupuje razem\ninne obiekty. Na przykład dwa powszechne rodzaje relacji to *relacje trasy*\nktóre grupują odcinki drogi należące do konkretnej autostrady lub drogi oraz\n*wielokąty* łączące razem kilka linii, które definiują bardziej złożony obszar\n(na przykład las z polaną w środku).\n\nKażdy obiekt w relacji nazywany jest *członkiem*. W panelu bocznym możesz\nzobaczyć do jakich relacji należy obiekt, i kliknąć na relacji by ją wybrać. Gdy relacja\njest wybrana, listę jej wszystkich członków zobaczysz w panelu bocznym, zostanę oni jednocześnie podświetlone na mapie.\n\nPrzeważnie edytor iD automatycznie pilnuje relacji podczas twoich edycji.\nMusisz jednak pamiętać, że jeśli usuwasz jakiś fragment linii,  np. aby\ndokładniej go narysować, sprawdź wcześniej do jakich relacji należy oraz\njakie pełni w nich role. Po narysowaniu nowej linii dodaj ją do tych relacji w tych samych rolach.\n\n## Edycja relacji\n\nJeśli chcesz edytować relacje, oto podstawy wiedzy.\n\nBy dodać obiekt do relacji, wybierz obiekt i kliknij przycisk \"+\" w sekcji \"Wszystkie relacje\" na panelu bocznym, i wybierz relację lub wpisz jej nazwę.\n\nBy utworzyć nową relację, zaznacz pierwszy obiekt, który ma być członkiem\nrelacji i kliknij przycisk \"+\" w sekcji \"Wszystkie relacje\" i wybierz \"Nowa relacja...\"\n\nBy usunąć obiekt z relacji, zaznacz obiekt i kliknij ikonkę kosza na śmieci obok\nrelacji, z której chcesz go usunąć.\n\nMożesz stworzyć wielokąt złożony z otworami używając narzędzia \"Scalanie\".\nNarysuj dwa obszary, jeden znajdujący się wewnątrz drugiego. Wybierz oba przytrzymując klawisz Shift i klikając na nich. Kliknij prawym klawiszem myszy by wyświetlić menu narzędziowe. Wybierz w nim przycisk \"+\" (\"Scalanie\").\n\n"
         },
         "intro": {
             "done": "gotowe",
@@ -679,15 +692,15 @@
                     "2nd-avenue": "Długa",
                     "4th-avenue": "Marszałkowska",
                     "5th-avenue": "Perłowa",
-                    "6th-avenue": "Perłowa",
+                    "6th-avenue": "Brylantowa",
                     "6th-street": "Marii Skłodowskiej-Curie",
                     "7th-avenue": "Grzybowa",
                     "8th-avenue": "Legionów",
                     "9th-avenue": "Husarska",
                     "10th-avenue": "Beskidzka",
-                    "11th-avenue": "Lipowa",
+                    "11th-avenue": "Warszawska",
                     "12th-avenue": "Brzozowa",
-                    "access-point-employment": "Punkt Dostępu Pracowników",
+                    "access-point-employment": "undefined",
                     "adams-street": "Wspólna",
                     "andrews-elementary-school": "Szkoła Podstawowa im. Powstańców Warszawy",
                     "andrews-street": "Łomżyńska",
@@ -701,16 +714,16 @@
                     "conservation-park": "Park Konwersacji",
                     "constantine-street": "Wrocławska",
                     "cushman-street": "Truskawkowa",
-                    "dollar-tree": "Drzewo pieniędzy",
+                    "dollar-tree": "Dobry Ciuch",
                     "douglas-avenue": "Aleje Jerozolimskie",
                     "east-street": "Słoneczna ",
                     "elm-street": "Polna",
                     "flower-street": "Kwiatowa ",
                     "foster-street": "Henryka Sienkiewicza",
                     "french-street": "Francuska",
-                    "garden-street": "Pamiętajcie o ogrodach",
+                    "garden-street": "Ogrodowa",
                     "gem-pawnbroker": "Lombard U Stasia",
-                    "golden-finch-framing": "Farma Zbycha",
+                    "golden-finch-framing": "Pracownia Ram",
                     "grant-avenue": "Hoża",
                     "hoffman-pond": "Staw Jaracza",
                     "hoffman-street": "Jaracza",
@@ -721,7 +734,7 @@
                     "las-coffee-cafe": "Kawiarnia Nad Jeziorem",
                     "lincoln-avenue": "Rycerska",
                     "lowrys-books": "Książki Anety",
-                    "lynns-garage": "Garaż Adama",
+                    "lynns-garage": "Warsztat Adama",
                     "main-street-barbell": "Siłownia Pan Biceps",
                     "main-street-cafe": "Kawiarnia Na Głównej",
                     "main-street-fitness": "Miejski Fitness",
@@ -745,7 +758,7 @@
                     "pizza-hut": "Pizza Hut",
                     "portage-avenue": "Lipowa ",
                     "portage-river": "Rzeka Lipowa",
-                    "preferred-insurance-services": "Ubezpieczenia Na Życie",
+                    "preferred-insurance-services": "Ubezpieczenia na Życie",
                     "railroad-drive": "Kolejowa",
                     "river-city-appliance": "Europejskie AGD",
                     "river-drive": "Nadbrzeżna",
@@ -755,8 +768,8 @@
                     "riverwalk-trail": "Parkowa",
                     "riviera-theatre": "Teatr Roma",
                     "rocky-river": "Kamionkówka",
-                    "saint-joseph-river": "Czesława Małka",
-                    "scidmore-park-petting-zoo": "Ogródek zoologiczny w Chrząszczyżewoszycach",
+                    "saint-joseph-river": "Rega",
+                    "scidmore-park-petting-zoo": "Małe Zoo w Chrząszczyżewoszycach",
                     "scidmore-park": "Park Inwalidów Wojennych",
                     "scouter-park": "Park hulajnożny",
                     "sherwin-williams": "Mrówka",
@@ -767,96 +780,141 @@
                     "three-rivers-city-hall": "Urząd Miasta Chrząszczyżewoszyce",
                     "three-rivers-elementary-school": "Szkoła Podstawowa w Chrząszczyżewoszycach",
                     "three-rivers-fire-department": "Komenda Miejska Państwowej Straży Pożarnej w Chrząszczyżewoszycach",
-                    "three-rivers-high-school": "Uniwersytet w Chrząszczyżewoszczycach",
-                    "three-rivers-middle-school": "Szkoła Średnia w Chrząszczyżewoszyczycach",
+                    "three-rivers-high-school": "Liceum w Chrząszczyżewoszczycach",
+                    "three-rivers-middle-school": "Gimnazjum w Chrząszczyżewoszyczycach",
                     "three-rivers-municipal-airport": "Lotnisko Regionalne w Chrząszczyżewoszczycach",
                     "three-rivers-post-office": "Urząd Pocztowy w Chrząszczyżewoszczycach",
                     "three-rivers-public-library": "Biblioteka Publiczna w Chrząszczyżewoszczycach",
                     "three-rivers": "Chrząszczyżewoszyce",
                     "unique-jewelry": "Błyszcząca Biżuteria",
                     "walnut-street": "Elizy Orzeszkowej",
-                    "washington-street": "Warszawska",
+                    "washington-street": "Lipowa",
                     "water-street": "Józefa Piłsudskiego",
                     "west-street": "Zachodnia",
                     "wheeler-street": "Królewska",
                     "william-towing": "Pomoc Drogowa Janusza",
                     "willow-drive": "Pogodna",
                     "wood-street": "Drewniana",
-                    "world-fare": "Dobry Sklep"
+                    "world-fare": "Pamiątki"
                 }
             },
             "welcome": {
                 "title": "Witamy",
                 "welcome": "Witaj! Ten poradnik nauczy Cię podstaw edytowania OpenStreetMap.",
                 "practice": "Dane w tym poradniku są dostępne tylko w celach edukacyjnych, żadna zmiana wykonana w poradniku nie zostanie zapisana.",
-                "words": "Poradnik wprowadzi kilka nowych pojęć i koncepcji. Każdy nowy zwrot będzie zaznaczony *kursywą*.",
-                "mouse": "Możesz użyć dowolnego \"urządzenia wejścia\" aby edytować mapę, ale poradnik zakłada, że posiadasz myszkę z lewym i prawym przyciskiem. **Jeśli chcesz podłączyć myszkę, zrób to teraz, a potem naciśnij OK.**",
+                "words": "Poradnik wprowadzi kilka nowych pojęć i koncepcji. Każde nowe pojęcie będzie oznaczone *kursywą*.",
+                "mouse": "Możesz użyć dowolnego \"urządzenia wejścia\" aby edytować mapę, jednak poradnik zakłada, że posiadasz myszkę z lewym i prawym przyciskiem. **Jeśli chcesz podłączyć myszkę, zrób to teraz, następnie naciśnij OK.**",
                 "leftclick": "Kiedy poradnik prosi cię o kliknięcie lub podwójne kliknięcie, użyj lewego przycisku. Na touchpadzie może to być jedno kliknięcie, lub jedno dotknięcie. **Kliknij lewym przyciskiem {num} razy.**",
                 "rightclick": "Czasami możemy Cię poprosić o użycie prawego przycisku. Na touchpadzie może to być Ctrl+kliknięcie lub dotknięcie dwoma palcami. **Kliknij prawym przyciskiem {num} razy.**",
-                "chapters": "W porządku! Klikając na przyciski poniżej możesz w każdej chwili zrestartować rozdział (jeśli utknąłeś) lub pominąć te rozdziały, które Cię nie interesują. Zaczynajmy! **Kliknij '{next}', aby kontynuować.**"
+                "chapters": "Dobrze! Klikając na przyciski poniżej możesz pominąć te rozdziały, które Cię nie interesują,   lub zacząć rozdział od nowa, jeśli utknąłeś. Zaczynajmy! **Kliknij '{next}', aby kontynuować.**"
             },
             "navigation": {
                 "title": "Nawigacja",
-                "drag": "Główny obszar mapy pokazuje dane OpenStreetMap na tle podkładu.{br}Możesz poruszać się po niej, przeciągając i przewijając tak jak po każdej mapie internetowej. Dodatkowo możesz używać klawiszów strzałek. **Przeciągnij mapę!**",
-                "zoom": "Możesz przybliżać i oddalać widok poprzez kręcenie pokrętłem myszy, przy użyciu touchpada lub przycisków {plus} / {minus}. **Przybliż mapę!**",
-                "features": "By opisać rzeczy pojawiające się na mapie używamy słowa *obiekty*. Wszystko w świecie rzeczywistym może zostać odwzorowane - zmapowane - jako obiekt w OpenStreetMap.",
-                "points_lines_areas": "Obiekty mapy są przedstawione przy użyciu *punktów, linii oraz obszarów.*",
-                "nodes_ways": "W OpenStreetMap punkty (ang. points) często nazywane są *węzłami* (ang. nodes), zaś linie oraz obszary są czasami nazywane *ścieżkami* (ang. ways).",
-                "click_townhall": "Wszystkie obiekty mogą zostać zaznaczone poprzez kliknięcie. **Kliknij na punkt aby go wybrać.**",
-                "selected_townhall": "Wspaniale! Wybrałeś punkt. Wybrane obiekty odznaczają się pulsującą poświatą.",
-                "editor_townhall": "Gdy dowolny obiekt jest zaznaczony *edytor obiektów* staje się aktywny.",
-                "preset_townhall": "Na samej górze edytora prezentowany jest typ obiektu. Punkt który wybrałeś posiada typ {preset}.",
+                "drag": "Główny obszar mapy pokazuje dane OpenStreetMap umieszczone nad warstwą tła.{br}Możesz przesuwać mapę trzymając wciśnięty lewy przycisk myszy podczas ruszania nią. Poza tym możesz używać klawiszów strzałek. **Przeciągnij mapę!**",
+                "zoom": "Możesz przybliżać i oddalać widok poprzez kręcenie kółkiem myszy, poprzez użycie touchpada lub przycisków {plus} / {minus} po prawej stronie. **Przybliż mapę!**",
+                "features": "Rzeczy pojawiające się na mapie określamy słowem *obiekty*. Wszystko w świecie rzeczywistym może zostać zmapowane, czyli odwzorowane, jako obiekt w OpenStreetMap.",
+                "points_lines_areas": "Obiekty mapy są przedstawione przy użyciu *punktów, linii* oraz *obszarów.*",
+                "nodes_ways": "W OpenStreetMap punkty (ang. points) czasem nazywane są *węzłami* (ang. nodes), zaś linie oraz obszary są czasami nazywane *drogami* (ang. ways).",
+                "click_townhall": "Wszystkie obiekty mogą zostać wybrane poprzez kliknięcie na nich. **Kliknij na punkt, aby go wybrać.**",
+                "selected_townhall": "Świetnie! Wybrałeś punkt. Wybrane obiekty odznaczają się pulsującą poświatą.",
+                "editor_townhall": "Gdy dowolny obiekt jest wybrany *Edytor obiektu* staje się aktywny.",
+                "preset_townhall": "Na samej górze Edytora obiektu pokazany jest rodzaj obiektu. Punkt, który wybrałeś, posiada rodzaj \"{preset}\".",
+                "fields_townhall": "Środkowa część Edytora obiektu zawiera \"pola\" pokazujące atrybuty obiektu, takie jak jego nazwa i adres.",
+                "close_townhall": "**Zamknij Edytor obiektu poprzez naciśnięcie klawisza Esc lub kliknięcie na {button} w górnym rogu.**",
                 "search_street": "Możesz także wyszukiwać obiekty widoczne w aktualnym oknie, lub gdziekolwiek indziej na świecie. **Wyszukaj '{name}'.**",
-                "choose_street": "**Wybierz {name} z listy zaznaczonych.**",
-                "selected_street": "Świetnie! Wybrano {name}."
+                "choose_street": "**Wybierz {name} z listy.**",
+                "selected_street": "Świetnie! {name} została wybrana.",
+                "editor_street": "Widoczne pola dla ulicy są inne niż poprzednie pola dla Ratusza.{br} Dla tej ulicy Edytor obiektu pokazuje pola takie jak '{field1}' oraz '{field2}'. **Zamknij Edytor obiektu poprzez naciśnięcie klawisza Esc lub kliknięcie na {button} w górnym rogu.**",
+                "play": "Spróbuj poprzesuwać teraz mapę i wybierać inne obiekty, by zobaczyć jakie jeszcze inne rzeczy można umieszczać w OpenStreetMap. **W celu przejścia do następnego etapu samouczka, kliknij na '{next}'.**"
             },
             "points": {
                 "title": "Punkty",
-                "add_point": "*Punkty* mogą być używane do reprezentowania obiektów, takich jak sklepy, restauracje czy pomniki.{br}Zaznaczają one konkretną lokalizację i opisują co się tam znajduje. **Kliknij na przycisk Punkt {button}, aby dodać nowy punkt.**",
-                "search_cafe": "Istnieje wiele różnych obiektów, które mogą być reprezentowane za pomocą punktów. Dodany przed chwilą punkt jest kawiarnią. **Wyszukaj '{preset}'.**",
+                "add_point": "*Punkty* mogą być używane do reprezentowania obiektów takich jak sklepy, restauracje czy pomniki.{br}Wskazują one konkretną lokalizację i opisują co się w niej znajduje. **Kliknij na {button} Punkt, by dodać nowy punkt.**",
+                "place_point": "By umieścić nowy punkt na mapie, przesuń kursor myszy do miejsca, w którym powinien się znajdować. Następnie kliknij lewym klawiszem myszy lub naciśnij Spację.. **Przesuń kursor myszy nad ten budynek, kliknij lewy przycisk myszy lub naciśnij Spację.**",
+                "search_cafe": "Istnieje wiele różnych obiektów możliwych do przedstawienia w postaci punktów. Dodany przed chwilą punkt jest kawiarnią. **Wyszukaj '{preset}'.**",
                 "choose_cafe": "**Wybierz {preset} z listy.",
-                "feature_editor": "Punkt jest teraz oznaczony jako kawiarnia. Używając edytora, możemy dodać więcej informacji o tym obiekcie."
+                "feature_editor": "Punkt jest teraz oznaczony jako kawiarnia. Używając Edytora obiektu, możemy dodać więcej informacji o kawiarni.",
+                "add_name": "W OpenStreetMap wszystkie pola są opcjonalne, możesz zostawisz jakieś puste, jeśli nie wiesz, co wpisać.{br}Przyjmijmy, że znasz tę kawiarnię i wiesz jak się nazywa. **Wpisz nazwę kawiarni.**",
+                "add_close": "Edytor obiektu automatycznie zapamięta wszystkie twoje zmiany. **Kiedy wpiszesz już nazwę, naciśnij Esc, Enter lub kliknij na {button} by zamknąć Edytor obiektu.**",
+                "reselect": "Punkty często już istnieją, ale zawierają błędy lub są niekompletne. Możesz edytować istniejące punkty. **Kliknij na dopiero co utworzonej kawiarni, by ją wybrać.** ",
+                "update": "Wprowadź więcej informacji o tej kawiarni. Możesz zmienić jej nazwę, dodać rodzaj kuchni lub uzupełnić dane adresowe. **Zmień informacje o kawiarni.**",
+                "update_close": "**Gdy skończysz poprawiać kawiarnię, naciśnij klawisz Esc, Enter lub kliknij na {button} by zamknąć Edytor obiektu.**",
+                "rightclick": "Możesz kliknąć prawym klawiszem myszy na każdym obiekcie by wyświetlić \"menu edycyjne\" z listą działań, jakie możesz na nim wykonać. **Kliknij prawym przyciskiem myszy na utworzonym punkcie by wyświetlić menu edycyjne.**",
+                "delete": "Możesz usuwać obiekty, które nie istnieją w rzeczywistości.{br}Usunięcie obiektu z OpenStreetMap usuwa go dla wszystkich użytkowników mapy, przed jego skasowaniem należy więc mieć całkowitą pewność, że obiektu naprawdę nie ma. **Kliknij na przycisku {button} by usunąć punkt.**",
+                "undo": "Zawsze możesz wycofać wprowadzone zmiany, za wyjątkiem tych zapisanych już wcześniej w OpenStreetMap. **Kliknij przycisk {button} by cofnąć usunięcie i przywrócić punkt.**",
+                "play": "Wiesz już jak tworzyć i edytować punkty, poćwicz więc teraz tworząc kilka dodatkowych punktów. \n**W celu przejścia do następnego etapu samouczka, kliknij na '{next}'.**"
             },
             "areas": {
                 "title": "Obszary",
-                "add_playground": "*Obszary* służą do wyznaczania granic dla takich obiektów jak jeziora, budynki, czy osiedla mieszkaniowe.{br}Mogą również zostać użyte do mapowania wielu obiektów, które normalnie przedstawiane są za pomocą punktów. **Kliknij na przycisk Obszar {button}, aby dodać nowy obszar.**",
+                "add_playground": "*Obszary* służą do wyznaczania granic dla takich obiektów jak jeziora, budynki czy osiedla mieszkaniowe.{br}Mogą również zostać użyte do mapowania wielu obiektów, które zwykle przedstawiane są za pomocą punktów. **Kliknij na {button} Obszar, by dodać nowy obszar.**",
+                "start_playground": "Umieść plac zabaw na mapie poprzez narysowanie go jako obszaru. Obszary są rysowane poprzez umieszczanie \"węzłów\" wzdłuż zewnętrznego brzegu obiektu. **Kliknij lub naciśnij Spację i umieść punkt początkowy w jednym z rogów placu zabaw..**",
+                "continue_playground": "Dalej rysuj obszar, umieszczając więcej punktów wzdłuż brzegu placu zabaw. Możesz przy tym łączyć obszar z już istniejącymi ścieżkami. {br}Podpowiedź: jeśli będziesz trzymać wciśnięty klawisz 'Alt', tworzone węzły nie zostaną połączone do już istniejących obiektów. **Narysuj cały obszar placu zabaw.**",
+                "finish_playground": "Zakończ rysowanie obszaru poprzez naciśnięcie Enter lub poprzez ponowne kliknięcie na pierwszym lub ostatnim punkcie. **Zakończ rysowanie obszaru placu zabaw.**",
                 "search_playground": "**Wyszukaj '{preset}'.**",
                 "choose_playground": "** Wybierz {preset} z listy.**",
+                "add_field": "Plac zabaw nie ma żadnej nazwy, dlatego nie wpisuj nic w pole Nazwa.{br}Zamiast tego wpisz dodatkowe informacji o nim w polu \"Opis obiektu\".  **Rozwiń listę Dodaj pole.**",
                 "choose_field": "**Wybierz {field} z listy.**",
                 "retry_add_field": "Nie zaznaczyłeś pola {field}. Spróbuj ponownie.",
-                "describe_playground": "**Dodaj opis, a następnie przyciśnij przycisk {button}, aby zamknąć edytor.**"
+                "describe_playground": "**Dodaj opis, a następnie kliknij na przycisku {button}, by zamknąć Edytor obiektu.**",
+                "play": "Bardzo dobrze! Poćwicz rysując jeszcze kilka obszarów i sprawdź, jakie inne rodzaje obiektów obszarowych możesz dodać do OpenStreetMap. **W celu przejścia do następnego etapu samouczka, kliknij na '{next}'.**"
             },
             "lines": {
                 "title": "Linie",
-                "add_line": "*Linie* są używane do reprezentowania obiektów takich jak drogi, tory czy rzeki. **Naciśnij przycisk Linia {button}, aby dodać nową linię.**",
-                "intersect": "Kliknij lub wciśnij spację, aby dodać więcej punktów do linii.{br}Drogi i wiele innych typów linii są częścią większej sieci. Ważne jest ich prawidłowe połączenie, aby programy do wyznaczania tras działały poprawnie. **Kliknij na {name}, aby dodać skrzyżowanie łączące dwie linie.**",
+                "add_line": "*Linie* są używane do reprezentowania obiektów takich jak drogi, tory czy rzeki. **Kliknij na {button} Linia, by dodać nową linię.**",
+                "start_line": "Tutaj brakuje drogi.  Spróbuj ją dodać!{br}W OpenStreetMap, linie powinny być prowadzone środkiem drogi. W czasie rysowania możesz przesuwać mapę oraz ją przybliżać i oddalać. **Zacznij rysować nową linię poprzez kliknięcie na górze w początek brakującej drogi.**",
+                "intersect": "Kliknij lub naciśnij Spację, by dodać więcej punktów do linii.{br}Drogi i wiele innych rodzajów linii są częścią większej sieci. Ważne jest ich prawidłowe wzajemne połączenie, aby programy do nawigacji działały poprawnie. **Kliknij na ulicy {name}, by utworzyć połączenie tych dwóch linii.**",
                 "retry_intersect": "Droga musi się skrzyżować z drogą {name}. Spróbuj ponownie!",
+                "continue_line": "Dalej rysuj linię nowej drogi. Pamiętaj, że możesz przesuwać mapę oraz ją przybliżać i oddalać, gdy tego potrzebujesz.{br}Kiedy narysujesz wszystko, kliknij ponownie na ostatnim punkcie. **Dokończ rysowanie drogi.**",
                 "choose_category_road": "**Wybierz {category} z listy**",
-                "choose_preset_residential": "Istnieje wiele rodzajów dróg, jednak ta jest drogą lokalną. **Wybierz typ {preset}.**",
-                "retry_preset_residential": "Nie zaznaczyłeś typu {preset}. **Kliknij tutaj, aby wybrać ponownie.**",
-                "name_road": "**Nazwij drogę, a następnie wciśnij Escape, Enter lub wciśnij przycisk {button}, aby zamknąć edytor obiektów.**",
-                "did_name_road": "Nieźle! Następnie nauczysz się jak zmienić kształt linii.",
-                "update_line": "Zdarza się sytuację w których trzeba zmienić kształt istniejącej linii na inny. Geometria tej drogi nie jest w porządku.",
-                "finish_drag_endpoint": "Ta kropka wygląda dobrze. **Zwolnij lewy przycisk myszki, aby zakończyć przeciąganie.**",
-                "split_intersection": "**Naciśnij przycisk {button}, aby rozdzielić {street}.**",
-                "retry_split": "Nie nacisnąłeś na przycisk Rozdziel. Spróbuj ponownie.",
-                "did_split_single": "**Naciśnij górną część {street2}, aby ją wybrać.**",
-                "multi_rightclick": "Dobrze! Obie linie do usunięcia są już zaznaczone. **Kliknij prawym przyciskiem myszki na jedną z linii, aby wyświetlić menu edycji.**",
-                "multi_delete": "**Naciśnij przycisk {button}, aby usunąć dodatkowe linie.**",
-                "retry_delete": "Nie nacisnąłeś na przycisk Usuń. Spróbuj ponownie."
+                "choose_preset_residential": "Istnieje wiele rodzajów dróg, ta rysowana jest drogą lokalną. **Wybierz rodzaj {preset}.**",
+                "retry_preset_residential": "Nie wybrałeś rodzaju {preset}. **Kliknij tutaj, aby wybrać ponownie.**",
+                "name_road": "**Wpisz nazwę drogi, a następnie wciśnij klawisz Esc, Enter lub kliknij na {button}, by zamknąć Edytor obiektu.**",
+                "did_name_road": "Nieźle! Następnie nauczysz się, jak zmienić kształt linii.",
+                "update_line": "Zdarzają się sytuację, gdy konieczna jest zmiana kształtu istniejącej linii. Tutaj widzisz drogę, która nie wydaje się być dobrze narysowana.",
+                "add_node": "Możesz dodać parę węzłów do tej linii by poprawić jej kształt. Jednym ze sposobów jest dwukrotne kliknięcie myszą na linii w miejscu, w którym chcesz dodać węzeł.  **Kliknij dwukrotnie na linii, by utworzyć nowy węzeł.**",
+                "start_drag_endpoint": "Gdy linia jest wybrana, możesz przeciągnąć którykolwiek z jej węzłów poprzez kliknięcie i przytrzymanie lewego klawisza myszy wraz z jednoczesnym jej przesunięciem.**Przeciągnij punkt końcowy w miejsce, w którym te drogi faktycznie tworzą skrzyżowanie.**",
+                "finish_drag_endpoint": "To miejsce wygląda na właściwe. **Puść lewy przycisk myszki, by zakończyć przeciąganie.**",
+                "start_drag_midpoint": "Pośrodku węzłów linii są narysowane małe trójkąciki.  Dzięki nim także możliwe jest tworzenie nowych węzłów drogi - poprzez przeciągnięcie tych trójkącików w nowe miejsce.  **Przeciągnij trójkącik pośrodku by utworzyć nowy węzeł wzdłuż drogi..**",
+                "continue_drag_midpoint": "Linia wygląda teraz znacznie lepiej! Dalej poprawiaj linię poprzez dwukrotne kliknięcie lub przeciąganie trójkącików, aż jej kształt będzie odpowiadał kształtowi drogi.. **Jeśli wygląd linii jest już dobry, kliknij OK.**",
+                "delete_lines": "Możesz usuwać linie tych dróg, które nie istnieją w rzeczywistości.{br}Tutaj masz przykład ulicy {street}, która nie została jeszcze zbudowana. Możesz poprawić mapę w tym miejscu usuwając zbędne linie.",
+                "rightclick_intersection": "Najbliższą istniejąca ulicą jest ulica {street1}, tak więc musisz *rozdzielić* ulicę {street2} na tym skrzyżowaniu i usunąć wszystko co jest powyżej niego.. **Kliknij prawym klawiszem myszy na węźle skrzyżowania.**",
+                "split_intersection": "**Kliknij na {button}, by rozdzielić {street}.**",
+                "retry_split": "Musisz kliknąć na przycisku Rozdziel. Spróbuj ponownie.",
+                "did_split_multi": "Świetnie! Ulica {street1} jest teraz rozdzielona na dwie części. Górna część może zostać usunięta. **Kliknij na górnej części ulicy {street2}, by ją wybrać.**",
+                "did_split_single": "**Kliknij na górnej części ulicy {street2}, by ją wybrać.**",
+                "multi_select": "Ulica {selected} jest teraz wybrana. Wybierz także ulicę {other1}. Wiele obiektów naraz możesz zaznaczyć klikając na nich przy wciśniętym klawiszu Shift. **Shift+klik na {other2}.**",
+                "multi_rightclick": "Dobrze! Obie linie do usunięcia są teraz wybrane. **Kliknij prawym klawiszem myszy na jednej z linii, by wyświetlić menu edycji.**",
+                "multi_delete": "**Kliknij przycisk {button}, by usunąć zbędne linie.**",
+                "retry_delete": "Nie kliknąłeś na przycisku Usuń. Spróbuj ponownie.",
+                "play": "Świetnie! Wykorzystaj teraz zdobyte w tym etapie umiejętności i poćwicz edytowanie innych linii. **W celu przejścia do następnego etapu samouczka, kliknij na '{next}'.**"
             },
             "buildings": {
                 "title": "Budynki",
+                "add_building": "OpenStreetMap jest największą na świecie bazą budynków.{br}Możesz przyczynić się do rozwoju tej bazy obrysowując budynki, które jeszcze nie zostały zmapowane. **Kliknij na {button} Obszar, by dodać nowy obszar.**",
+                "start_building": "Dodaj ten budynek do mapy, obrysowując jego brzegi.{br}Budynki powinny być obrysowane u ich podstawy i możliwe jak najdokładniej.**Kliknij lub naciśnij Spację w jednym z narożników budynku, by umieścić pierwszy węzeł.**",
+                "continue_building": "Dalej dodawał węzły w celu obrysowania całego budynku. Pamiętaj, że możesz przybliżać mapę, jeśli chcesz precyzyjniej zmapować budynek.{br}Zakończ rysowanie budynku naciskając Enter lub klikając na pierwszym lub ostatnim z narysowanych węzłów.**Dokończ obrysowanie budynku.**",
+                "retry_building": "Chyba masz problemy z umieszczeniem węzłów w narożnikach budynku. Spróbuj ponownie!",
                 "choose_category_building": "**Wybierz {category} z listy.**",
-                "close": "**Naciśnij Escape lub wciśnij przycisk {button}, by zamknąć edytor obiektów.**",
+                "choose_preset_house": "Jest wiele rodzajów budynków, a ten wygląda na dom jednorodzinny.{br}Jeśli nie znasz rodzaju rysowanego budynku, możesz wybrać rodzaj ogólny.**Wybierz rodzaj {preset}.**",
+                "close": "**Naciśnij Esc lub kliknij przycisk {button}, by zamknąć Edytor obiektu.**",
+                "rightclick_building": "**Kliknij prawym klawiszem myszy by wybrać utworzony budynek i wyświetlić menu edycyjne.**",
                 "square_building": "Budynek, który właśnie dodałeś, będzie wyglądał lepiej z idealnie wyrównanymi narożnikami. **Kliknij na przycisk {button}, aby wyprostować kształt budynku.**",
-                "retry_square": "Nie nacisnąłeś na przycisk Popraw prostopadłość. Spróbuj ponownie.",
+                "retry_square": "Należy kliknąć na przycisku \"Popraw prostopadłość\". Spróbuj ponownie.",
+                "done_square": "Zauważ, jak narożniki budynku zmieniły położenie. Zaraz nauczysz się kolejnej przydatnej rzeczy.",
+                "add_tank": "Teraz obrysujesz okrągły zbiornik. **Kliknij na {button} Obszar, by dodać nowy obszar.**",
+                "start_tank": "Nie musisz rysować idealnego okręgu. Po prostu narysuj obszar wewnątrz zbiornika tak, by węzły dotykały jego brzegu. **Kliknij lub naciśnij Spację by umieścić pierwszy węzeł na brzegu zbiornika.**",
+                "continue_tank": "Dodaj jeszcze kilka węzłów wzdłuż brzegu. Okrąg zostanie utworzony między tymi węzłami.{br}Zakończ rysować obszar naciskając Enter lub klikając na pierwszym lub ostatnim z narysowanych węzłów. **Dokończ obrysowywanie zbiornika.**",
                 "search_tank": "**Wyszukaj '{preset}'.**",
                 "choose_tank": "**Wybierz {preset} z listy.**",
-                "retry_circle": "Nie nacisnąłeś na przycisk Zaokrąglij. Spróbuj ponownie."
+                "rightclick_tank": "**Kliknij prawym klawiszem myszy by wybrać utworzony zbiornik i wyświetlić menu edycyjne.**",
+                "circle_tank": "**Kliknij na {button} by zaokrąglić zbiornik.**",
+                "retry_circle": "Należy nacisnąć na przycisk Zaokrąglij. Spróbuj ponownie.",
+                "play": "Świetnie! Poćwicz obrysowywanie jeszcze na innych budynkach i wypróbuj pozostałe polecenia z menu edycyjnego. **W celu przejścia do następnego etapu samouczka, kliknij na '{next}'.**"
             },
             "startediting": {
                 "title": "Rozpocznij edytowanie",
+                "help": "Teraz możesz rozpocząć edytowanie OpenStreetMap!{br}Ten samouczek możesz uruchomić ponownie w dowolnym momencie, możesz też zajrzeć do dokumentacji klikając na przycisku pomocy {button} lub naciskając klawisz '{key}'.",
+                "shortcuts": "Możesz zobaczyć wszystkie polecenia wraz z ich skrótami klawiaturowymi po naciśnięciu klawisza '{key}'.",
                 "save": "Nie zapomnij o regularnym zapisywaniu swoich zmian!",
                 "start": "Zacznij mapować!"
             }
@@ -896,7 +954,8 @@
                     "title": "Nawigacja",
                     "pan": "Przesuń mapę",
                     "pan_more": "Przesuń mapę o jeden ekran",
-                    "zoom": "Przybliż / Oddal"
+                    "zoom": "Przybliż / Oddal",
+                    "zoom_more": "Przybliż / Oddal mocniej"
                 },
                 "help": {
                     "title": "Pomoc",
@@ -909,44 +968,45 @@
                     "background_switch": "Wróć do ostatniego podkładu",
                     "map_data": "Wyświetl opcje danych mapy",
                     "fullscreen": "Wejdź w tryb pełnoekranowy",
+                    "wireframe": "Przełącz tryb szkieletowy",
                     "minimap": "Przełącz minimapę"
                 },
                 "selecting": {
                     "title": "Wybieranie obiektów",
                     "select_one": "Wybierz jeden obiekt",
-                    "select_multi": "Wybieranie wielu obiektów",
-                    "lasso": "Narysuj lasso wyboru wokół obiektów"
+                    "select_multi": "Wybierz wiele obiektów",
+                    "lasso": "Wybierz obiekty lassem"
                 },
                 "with_selected": {
-                    "title": "Z zaznaczonym obiektem",
+                    "title": "Z wybranym obiektem",
                     "edit_menu": "Przełącz menu edycji"
                 },
                 "vertex_selected": {
-                    "title": "Z zaznaczonym węzłem",
+                    "title": "Z wybranym węzłem",
                     "previous": "Przejdź do poprzedniego węzła",
                     "next": "Przejdź do następnego węzła",
                     "first": "Przejdź do pierwszego węzła",
                     "last": "Przejdź do ostatniego węzła",
-                    "change_parent": "Przełącz nadrzędną drogę"
+                    "change_parent": "Następna linia z tym węzłem"
                 }
             },
             "editing": {
                 "title": "Edytowanie",
                 "drawing": {
                     "title": "Rysowanie",
-                    "add_point": "Tryb 'Dodawania punktu'",
-                    "add_line": "Tryb 'Dodawania linii'",
-                    "add_area": "Tryb 'Dodawania obszaru'",
+                    "add_point": "Tryb 'Dodawanie punktu'",
+                    "add_line": "Tryb 'Dodawanie linii'",
+                    "add_area": "Tryb 'Dodawanie obszaru'",
                     "place_point": "Umieść punkt",
-                    "disable_snap": "Przytrzymaj by wyłączyć przyciąganie do punktu",
+                    "disable_snap": "Przytrzymaj, by wyłączyć przyciąganie do punktu",
                     "stop_line": "Zakończ rysowanie linii lub obszaru"
                 },
                 "operations": {
                     "title": "Działania",
-                    "continue_line": "Kontynuuj linię w zaznaczonym węźle",
+                    "continue_line": "Kontynuuj linię w wybranym węźle",
                     "merge": "Złącz (połącz) wybrane obiekty",
-                    "disconnect": "Rozłącz obiekty w zaznaczonym węźle",
-                    "split": "Rozdziel linię na dwie części w zaznaczonym węźle",
+                    "disconnect": "Rozłącz obiekty w wybranym węźle",
+                    "split": "Rozdziel linię na dwie części w wybranym węźle",
                     "reverse": "Odwróć linię",
                     "move": "Przenieś wybrane obiekty",
                     "rotate": "Obróć wybrane obiekty",
@@ -964,6 +1024,17 @@
                     "redo": "Ponów ostatnie działanie",
                     "save": "Zapisz zmiany"
                 }
+            },
+            "tools": {
+                "title": "Narzędzia",
+                "info": {
+                    "title": "Informacja",
+                    "all": "Przełącz wszystkie panele informacyjne",
+                    "background": "Przełącz panel tła",
+                    "history": "Przełącz panel historii",
+                    "location": "Przełącz panel lokalizacji",
+                    "measurement": "Przełącz panel pomiarów"
+                }
             }
         },
         "presets": {
@@ -972,7 +1043,7 @@
                     "name": "Przeszkody"
                 },
                 "category-building": {
-                    "name": "Budynek"
+                    "name": "Budynki"
                 },
                 "category-golf": {
                     "name": "Golf"
@@ -1013,7 +1084,7 @@
             },
             "fields": {
                 "access": {
-                    "label": "Prawo wstępu mają",
+                    "label": "Prawo wstępu/wjazdu mają",
                     "options": {
                         "designated": {
                             "description": "Dostęp jest dozwolony na podstawie znaków lub określonych przepisów lokalnych",
@@ -2776,7 +2847,7 @@
                     "terms": "granica,administracyjna,granice,administracyjne"
                 },
                 "building": {
-                    "name": "Budynek",
+                    "name": "Budynek (ogólny)",
                     "terms": "budynek,budowla,dom"
                 },
                 "building/apartments": {
@@ -2791,28 +2862,28 @@
                     "name": "Bunkier"
                 },
                 "building/cabin": {
-                    "name": "Chata",
-                    "terms": "Kabina"
+                    "name": "Domek letniskowy/kempingowy",
+                    "terms": "chata, dom letniskowy"
                 },
                 "building/cathedral": {
                     "name": "Budynek katedralny",
                     "terms": "Budynek katedry, katedra"
                 },
                 "building/chapel": {
-                    "name": "kaplica",
+                    "name": "Kaplica",
                     "terms": "kapliczka"
                 },
                 "building/church": {
-                    "name": "kościół",
-                    "terms": "budynek kościelny"
+                    "name": "Budynek kościoła",
+                    "terms": "budynek kościelny, kościół, cerkiew"
                 },
                 "building/college": {
                     "name": "Budynek szkoły policealnej",
                     "terms": "Szkoła policealna"
                 },
                 "building/commercial": {
-                    "name": "Nieruchomość komercyjna",
-                    "terms": "sklep,komercyjny,sprzedaż,handlowy"
+                    "name": "Budynek handlowy/biurowy",
+                    "terms": "sklep,sprzedaż,handlowy,biurowy,biuro"
                 },
                 "building/construction": {
                     "name": "Budynek w budowie",
@@ -2850,7 +2921,7 @@
                     "terms": "budynek hotelowy"
                 },
                 "building/house": {
-                    "name": "Dom",
+                    "name": "Dom jednorodzinny",
                     "terms": "dom,domek,chata"
                 },
                 "building/hut": {
@@ -2879,7 +2950,7 @@
                 },
                 "building/roof": {
                     "name": "Zadaszenie",
-                    "terms": "Dach,"
+                    "terms": "dach,zadaszenia,wiata"
                 },
                 "building/school": {
                     "name": "Budynek szkolny",
@@ -2906,7 +2977,7 @@
                     "terms": "szeregówki"
                 },
                 "building/train_station": {
-                    "name": "Stacja kolejowa"
+                    "name": "Budynek dworca kolejowego"
                 },
                 "building/university": {
                     "name": "Budynek uczelni wyższej",
diff --git a/vendor/assets/iD/iD/locales/sv.json b/vendor/assets/iD/iD/locales/sv.json
index 051dbbac3..4befdb1bf 100644
--- a/vendor/assets/iD/iD/locales/sv.json
+++ b/vendor/assets/iD/iD/locales/sv.json
@@ -353,16 +353,21 @@
             "background": {
                 "key": "B",
                 "title": "Bakgrund",
+                "zoom": "Zoom",
                 "vintage": "Ålder",
-                "unknown": "Okänt"
+                "unknown": "Okänt",
+                "show_tiles": "Visa kartrutor",
+                "hide_tiles": "Dölj kartrutor"
             },
             "history": {
                 "key": "H",
+                "title": "Historik",
                 "selected": "{n} markerad(e)",
                 "version": "Version",
                 "last_edit": "Senast redigerad",
                 "edited_by": "Redigerad av",
-                "changeset": "Changeset",
+                "changeset": "Ändringsset",
+                "unknown": "Okänd",
                 "link_text": "Historik på openstreetmap.org"
             },
             "location": {
@@ -375,13 +380,13 @@
                 "title": "Mätning",
                 "selected": "{n} markerad(e)",
                 "geometry": "Geometri",
-                "closed": "sluten",
+                "closed": "slutet",
                 "center": "Centrum",
                 "perimeter": "Omkrets",
                 "length": "Längd",
                 "area": "Area",
                 "centroid": "Centrumpunkt",
-                "location": "Lokalisering",
+                "location": "Placering",
                 "metric": "Metriskt",
                 "imperial": "Brittiskt"
             }
@@ -542,7 +547,9 @@
         },
         "restore": {
             "heading": "Du har icke-sparade ändringar.",
-            "description": "Du har ändringar från förra sessionen som inte har sparats. Vill du hämta dessa ändringar?"
+            "description": "Du har ändringar från förra sessionen som inte har sparats. Vill du hämta dessa ändringar?",
+            "restore": "Återställ mina ändringar",
+            "reset": "Ta bort mina ändringar"
         },
         "save": {
             "title": "Spara",
@@ -972,7 +979,7 @@
                 },
                 "with_selected": {
                     "title": "Med objekt markerat",
-                    "edit_menu": "Visa/dölj redigerameny"
+                    "edit_menu": "Visa/dölj redigeringsmeny"
                 },
                 "vertex_selected": {
                     "title": "Med nod markerad",
@@ -1021,7 +1028,12 @@
             "tools": {
                 "title": "Verktyg",
                 "info": {
-                    "title": "Information"
+                    "title": "Information",
+                    "all": "Visa/dölj alla informationspaneler",
+                    "background": "Visa/dölj panelen Bakgrund",
+                    "history": "Visa/dölj panelen Historik",
+                    "location": "Visa/dölj panelen Lokalisering",
+                    "measurement": "Visa/dölj panelen Mätning"
                 }
             }
         },
diff --git a/vendor/assets/iD/iD/locales/uk.json b/vendor/assets/iD/iD/locales/uk.json
index 7447debbe..d4cd01e8f 100644
--- a/vendor/assets/iD/iD/locales/uk.json
+++ b/vendor/assets/iD/iD/locales/uk.json
@@ -348,6 +348,49 @@
             "list": "Редагували: {users}",
             "truncated_list": "Редагували: {users} та {count} інших"
         },
+        "info_panels": {
+            "key": "Ш",
+            "background": {
+                "key": "И",
+                "title": "Фон",
+                "zoom": "Масштаб",
+                "vintage": "Класичний",
+                "unknown": "Невідомо",
+                "show_tiles": "Показати тайли",
+                "hide_tiles": "Сховати тайли"
+            },
+            "history": {
+                "key": "Р",
+                "title": "Історія",
+                "selected": "{n} виділено",
+                "version": "Версія",
+                "last_edit": "Останні зміни",
+                "edited_by": "Змінено: ",
+                "changeset": "Набір змін",
+                "unknown": "Невідомо",
+                "link_text": "Історія на openstreetmap.org"
+            },
+            "location": {
+                "key": "Д",
+                "title": "Місцезнаходження",
+                "unknown_location": "Невідома позиція"
+            },
+            "measurement": {
+                "key": "Ь",
+                "title": "Вимірювання",
+                "selected": "{n} виділено",
+                "geometry": "Геометрія",
+                "closed": "замкнена",
+                "center": "Центр",
+                "perimeter": "Периметр",
+                "length": "Довжина",
+                "area": "Площа",
+                "centroid": "Центроїд",
+                "location": "Місце",
+                "metric": "Метрична",
+                "imperial": "Імперська"
+            }
+        },
         "geometry": {
             "point": "точка",
             "vertex": "вершина",
@@ -504,7 +547,9 @@
         },
         "restore": {
             "heading": "Ви маєте незбережені правки",
-            "description": "У вас виявилися незбережені правки з минулого разу. Відновити їх?"
+            "description": "У вас виявилися незбережені правки з минулого разу. Відновити їх?",
+            "restore": "Видновити мої зміни",
+            "reset": "Відкинути мої зміни"
         },
         "save": {
             "title": "Зберегти",
@@ -979,6 +1024,17 @@
                     "redo": "Повернути останю дію",
                     "save": "Зберегти зміни"
                 }
+            },
+            "tools": {
+                "title": "Інструменти",
+                "info": {
+                    "title": "Інформація",
+                    "all": "Показати/сховати всі інформ. панелі",
+                    "background": "Показати/сховати панель Фон",
+                    "history": "Показати/сховати панель Історія",
+                    "location": "Показати/сховати панель Місце",
+                    "measurement": "Показати/сховати панель Вимірювання"
+                }
             }
         },
         "presets": {
diff --git a/vendor/assets/iD/iD/locales/vi.json b/vendor/assets/iD/iD/locales/vi.json
index 1df5d113d..6ad040c5b 100644
--- a/vendor/assets/iD/iD/locales/vi.json
+++ b/vendor/assets/iD/iD/locales/vi.json
@@ -348,6 +348,49 @@
             "list": "Đóng góp bởi {users}",
             "truncated_list": "Đóng góp bởi {users} và {count} người khác"
         },
+        "info_panels": {
+            "key": "I",
+            "background": {
+                "key": "B",
+                "title": "Hình nền",
+                "zoom": "Mức thu phóng",
+                "vintage": "Lúc chụp",
+                "unknown": "Không rõ",
+                "show_tiles": "Hiện các Mảnh",
+                "hide_tiles": "Ẩn các Mảnh"
+            },
+            "history": {
+                "key": "L",
+                "title": "Lịch sử",
+                "selected": "{n} được chọn",
+                "version": "Phiên bản",
+                "last_edit": "Sửa đổi Cuối cùng",
+                "edited_by": "Người Sửa đổi",
+                "changeset": "Bộ thay đổi",
+                "unknown": "Không rõ",
+                "link_text": "Lịch sử tại openstreetmap.org"
+            },
+            "location": {
+                "key": "V",
+                "title": "Vị trí",
+                "unknown_location": "Vị trí Không rõ"
+            },
+            "measurement": {
+                "key": "M",
+                "title": "Đo lường",
+                "selected": "{n} được chọn",
+                "geometry": "Hình",
+                "closed": "đóng",
+                "center": "Tâm",
+                "perimeter": "Chu vi",
+                "length": "Chiều dài",
+                "area": "Diện tích",
+                "centroid": "Trọng tâm",
+                "location": "Vị trí",
+                "metric": "Hệ mét",
+                "imperial": "Hệ Anh"
+            }
+        },
         "geometry": {
             "point": "điểm",
             "vertex": "đỉnh",
@@ -410,24 +453,28 @@
         "background": {
             "title": "Hình nền",
             "description": "Tùy chọn Hình nền",
+            "key": "B",
             "percent_brightness": "Độ sáng {opacity}%",
             "none": "Không có",
             "best_imagery": "Nguồn hình ảnh hữu ích nhất đối với nơi này",
             "switch": "Quay về hình nền này",
             "custom": "Tùy biến",
             "custom_button": "Sửa hình nền tùy biến",
+            "custom_prompt": "Nhập định dạng URL của các mảnh bản đồ. Bạn có thể sử dụng các dấu hiệu:\n   - {zoom}/{z}, {x}, {y} cho định dạng mảnh Z/X/Y\n   - {ty} cho tọa độ Y kiểu TMS phản chiếu\n   - {u} cho định dạng quadtile\n   - {switch:a,b,c} để luân phiên các máy chủ DNS\n\nVí dụ:\n{example}",
             "fix_misalignment": "Chỉnh độ lệch hình ảnh",
             "imagery_source_faq": "Hình ảnh này được lấy từ đâu?",
             "reset": "đặt lại",
             "offset": "Kéo thả chuột ở vùng màu xám bên dưới để chỉnh độ lệch hình ảnh, hoặc nhập độ lệch được đo bằng mét.",
             "minimap": {
                 "description": "Bản đồ nhỏ",
-                "tooltip": "Mở một bản đồ thu nhỏ định vị trí đang được sửa đổi."
+                "tooltip": "Mở một bản đồ thu nhỏ định vị trí đang được sửa đổi.",
+                "key": "/"
             }
         },
         "map_data": {
             "title": "Dữ liệu Bản đồ",
             "description": "Dữ liệu Bản đồ",
+            "key": "F",
             "data_layers": "Các Lớp Dữ liệu",
             "fill_area": "Cách Tô màu các Vùng",
             "map_features": "Các Thể loại Đối tượng",
@@ -486,7 +533,8 @@
         "area_fill": {
             "wireframe": {
                 "description": "Không Tô (Khung lưới)",
-                "tooltip": "Chế độ khung lưới cho phép thấy rõ hình ảnh nền."
+                "tooltip": "Chế độ khung lưới cho phép thấy rõ hình ảnh nền.",
+                "key": "K"
             },
             "partial": {
                 "description": "Tô Mép",
@@ -499,7 +547,9 @@
         },
         "restore": {
             "heading": "Bạn có thay đổi chưa lưu",
-            "description": "Bạn có thay đổi chưa lưu từ một phiên làm việc trước đây. Bạn có muốn khôi phục các thay đổi này không?"
+            "description": "Bạn có thay đổi chưa lưu từ một phiên làm việc trước đây. Bạn có muốn khôi phục các thay đổi này không?",
+            "restore": "Phục hồi các thay đổi của tôi",
+            "reset": "Vứt bỏ các thay đổi của tôi"
         },
         "save": {
             "title": "LÆ°u",
@@ -609,6 +659,7 @@
         },
         "help": {
             "title": "Trợ giúp",
+            "key": "H",
             "help": "# Trợ giúp\n\nĐây là trình vẽ của [OpenStreetMap](http://www.openstreetmap.org/), bản đồ có mã nguồn mở và dữ liệu mở cho phép mọi người cùng sửa đổi. Bạn có thể sử dụng chương trình này để bổ sung và cập nhật dữ liệu bản đồ tại khu vực của bạn. Bạn có thể cải tiến bản đồ thế giới mở để cho mọi người sử dụng.\n\nCác sửa đổi của bạn trên bản đồ này sẽ xuất hiện cho mọi người dùng OpenStreetMap. Để sửa bản đồ, bạn cần phải [đăng nhập](https://www.openstreetmap.org/login).\n\n[Trình vẽ iD](http://ideditor.com/) là một dự án cộng tác và xuất bản [tất cả mã nguồn tại GitHub](https://github.com/openstreetmap/iD).\n",
             "editing_saving": "# Sửa đổi & Lưu giữ\n\nĐây là một chương trình vẽ trực tuyến, hiện tại bạn đang truy cập nó qua một trang Web.\n\n### Lựa chọn Đối tượng\n\nĐể lựa chọn một đối tượng, thí dụ con đường hay một điểm, nhấn chuột vào nó trên bản đồ. Khi đối tượng được chọn, bạn sẽ thấy một biểu mẫu ở bên phải chứa các chi tiết về đối tượng, cũng như một trình đơn chứa các tác vụ để thực hiện với đối tượng.\n\nĐể lựa chọn nhiều đối tượng cùng lúc, nhấn giữ phím Shift và nhấn chuột vào từng đối tượng một. Thay thế, nhấn giữ Shift và kéo chuột trên bản đồ để vẽ hộp bao. Các đối tượng nằm vào hộp này sẽ được chọn.\n\n### Lưu giữ Sửa đổi\n\nKhi bạn sửa đổi các tuyến đường, tòa nhà, và địa điểm, các thay đổi này được lưu giữ trên máy cho đến khi bạn đăng nó lên máy chủ. Đừng lo nhầm lẫn: chỉ việc nhấn vào các nút “Hoàn tác” và “Làm lại”.\n\nNhấn “Lưu” để hoàn thành các sửa đổi, thí dụ bạn vừa vẽ xong một khu và muốn bắt đầu vẽ khu mới. Trình vẽ sẽ trình bày các thay đổi để bạn xem lại, cũng như các gợi ý và cảnh báo nếu bạn đã sửa nhầm lẫn.\n\nSau khi vẽ xong, bạn sẽ nhập lời tóm lược các thay đổi và nhấn “Lưu” lần nữa để đăng các thay đổi lên [OpenStreetMap.org](http://www.openstreetmap.org/). Các thay đổi sẽ xuất hiện tại trang web này để mọi người xem và cập nhật nếu có sai sót.\n\nNếu bạn chưa xong mà cần rời khỏi máy tính, bạn có thể đóng trình vẽ này. Lần sau trở lại, trình vẽ này sẽ cho phép khôi phục các thay đổi chưa lưu của bạn (miễn là bạn sử dụng cùng máy tính và trình duyệt).\n\n### Sử dụng Chương trình\n\nBấm phím `?` để xem bảng phím tắt đầy đủ.\n",
             "roads": "# Đường sá\n\nTrình vẽ này cho phép tạo, sửa, và xóa các con đường. Con đường không nhất thiết phải là đường phố: có thể vẽ đường cao tốc, đường mòn, đường đi bộ, đường xe đạp…\n\n### Lựa chọn\n\nNhấn vào con đường để lựa chọn nó. Con đường sẽ được tô sáng, một trình đơn công cụ sẽ xuất hiện bên cạnh đường, và thanh bên sẽ trình bày các chi tiết của con đường.\n\n### Sửa đổi\n\nNhiều khi bạn sẽ gặp những con đường bị chệch đối với hình nền hoặc tuyến đường GPS. Bạn có thể chỉnh lại các con đường này để chính xác hơn.\n\nTrước tiên, nhấn vào con đường cần chỉnh lại. Đường sẽ được tô sáng và các nốt sẽ xuất hiện để bạn kéo sang vị trí đúng hơn. Để thêm chi tiết, nhấn đúp vào một khúc đường chưa có nốt, và một nốt mới sẽ xuất hiện để bạn kéo.\n\nNếu con đường nối với đường khác trên thực tiếp, nhưng trên bản đồ thì chưa nối liền, hãy kéo một nốt của một con đường sang đường kia để nối liền hai con đường. Nối liền các đường tại giao lộ là một điều rất quan trọng tăng khả năng chỉ đường.\n\nĐể di chuyển toàn bộ con đường cùng lúc, nhấn vào công cụ “Di chuyển” hoặc nhấn phím tắt `M`, chuyển chuột sang vị trí mới, rồi nhấn chuột để hoàn thành việc di chuyển.\n\n### Xóa\n\nHãy tưởng tượng bạn gặp một con đường hoàn toàn sai: bạn không thấy được con đường trong hình ảnh trên không và, theo lý tưởng, cũng đã ghé vào chỗ đó để xác nhận rằng nó không tồn tại. Nếu trường hợp này, bạn có thể xóa con đường hoàn toàn khỏi bản đồ. Xin cẩn thận khi xóa đối tượng: giống như mọi sửa đổi khác, mọi người sẽ thấy được kết quả. Ngoài ra, hình ảnh trên không nhiều khi lỗi thời – con đường có thể mới xây – thành thử tốt nhất là ghé vào chỗ đó để quan sát chắc chắn, nếu có thể.\n\nĐể xóa một con đường, lựa chọn nó bằng cách nhấn vào nó, rồi nhấn vào hình thùng rác hoặc nhấn phím Delete.\n\n### Tạo mới\n\nBạn có tìm ra một con đường chưa được vẽ trên bản đồ? Hãy bắt đầu vẽ đường kẻ mới bằng cách nhấn vào nút “Đường” ở phía trên bên trái của trình vẽ, hoặc nhấn phím tắt `2`.\n\nNhấn vào bản đồ tại điểm bắt đầu của con đường. Hoặc nếu con đường chia ra từ đường khác đã tồn tại, trước tiên nhấn chuột tại giao lộ giữa hai con đường này.\n\nSau đó, nhấn chuột lần lượt theo lối đường dùng hình ảnh trên không hoặc tuyến đường GPS. Khi nào con đường giao với đường khác, nhấn chuột tại giao lộ để nối liền hai con đường này. Sau khi vẽ xong, nhấn đúp vào nốt cuối dùng hoặc nhấn phím Return hay Enter.\n",
@@ -639,6 +690,7 @@
                 "name": {
                     "andrews-elementary-school": "Trường Tiểu học Nguyễn Văn A",
                     "conrail-railroad": "Hà Nội – Đồng Đăng",
+                    "rocky-river": "Sông Đá",
                     "southern-michigan-bank": "Ngân hàng Bắc Ninh",
                     "three-rivers-city-hall": "Tòa thị chính Tam Giang",
                     "three-rivers-elementary-school": "Trường Tiểu học Tam Giang",
@@ -701,6 +753,7 @@
                 "title": "Vùng",
                 "add_playground": "*Vùng* cho biết hình dạng của các đa giác như hồ nước, tòa nhà, và khu vực dân cư.{br}Bạn có thể cung cấp nhiều chi tiết hơn dùng vùng so với địa điểm. **Bấm nút {button} Vùng để bắt đầu vẽ vùng mới.**",
                 "start_playground": "Hãy vẽ một vùng để thêm sân chơi này vào bản đồ. Để vẽ vùng, đặt các *nốt* theo đường biên của vùng. **Nhấn chuột hoặc bấm phím cách để đặt nốt đầu tiên vào một góc của sân chơi.**",
+                "continue_playground": "Để tiếp tục vẽ vùng này, đặt thêm nốt theo đường biên của sân chơi. Bạn có thể nối liền vùng với các đường dạo đã tồn tại.{br}Mẹo vặt: Bạn có thể giữ xuống phím “{alt}” để tránh việc nối liền nốt với các đối tượng khác. **Tiếp tục vẽ vùng ứng với sân chơi này.**",
                 "finish_playground": "Để hoàn tất vùng, bấm Enter hoặc Return, hoặc nhấn chuột lần nữa vào nốt đầu tiên hoặc cuối dùng. **Vẽ xong vùng ứng với sân chơi.**",
                 "search_playground": "**Tìm “{preset}”.**",
                 "choose_playground": "**Chọn {preset} từ danh sách.**",
@@ -765,6 +818,8 @@
             },
             "startediting": {
                 "title": "Bắt đầu Sửa đổi",
+                "help": "Bạn sẵn sàng sửa đổi OpenStreetMap!{br}Lúc nào muốn được hướng dẫn lại hoặc xem thêm tài liệu, chỉ việc bấm nút {button} Trợ giúp hoặc phím “{key}”.",
+                "shortcuts": "Để xem danh sách các tác vụ cùng với phím tắt, bấm phím “{key}”.",
                 "save": "Hãy nhớ lưu các thay đổi của bạn thường xuyên!",
                 "start": "Hãy bắt đầu vẽ bản đồ!"
             }
@@ -772,6 +827,9 @@
         "shortcuts": {
             "title": "Phím tắt",
             "tooltip": "Xem bảng phím tắt.",
+            "toggle": {
+                "key": "?"
+            },
             "key": {
                 "alt": "Alt",
                 "backspace": "Backspace",
@@ -871,6 +929,17 @@
                     "redo": "Làm lại thao tác cuối cùng",
                     "save": "Lưu các thay đổi"
                 }
+            },
+            "tools": {
+                "title": "Công cụ",
+                "info": {
+                    "title": "Thông tin",
+                    "all": "Bật/tắt tất cả các bảng thông tin",
+                    "background": "Bật/tắt bảng hình nền",
+                    "history": "Bật/tắt bảng lịch sử",
+                    "location": "Bật/tắt bảng vị trí",
+                    "measurement": "Bật/tắt bảng đo lường"
+                }
             }
         },
         "presets": {
@@ -1443,6 +1512,9 @@
                 "kerb": {
                     "label": "Bờ Lề đường"
                 },
+                "label": {
+                    "label": "Chữ đề"
+                },
                 "lamp_type": {
                     "label": "Kiểu"
                 },
@@ -1514,6 +1586,9 @@
                 "man_made": {
                     "label": "Loại"
                 },
+                "manhole": {
+                    "label": "Kiểu"
+                },
                 "map_size": {
                     "label": "Phạm vi"
                 },
@@ -2467,6 +2542,10 @@
                     "name": "Sân Trường",
                     "terms": "sân trường, sân trường học, sân nhà trường, sân trung tâm giáo dục, san truong, san truong hoc, san nha truong, san trung tam giao duc"
                 },
+                "amenity/scrapyard": {
+                    "name": "Bãi Phế liệu",
+                    "terms": "phế liệu, ve chai, rác rưởi, sắt vụn, mảnh sắt, xe hơi, xe cộ, gạch vụn, phe lieu, ve chai, rac ruoi, sat vun, manh sat, xe hoi, xe co, gach vun"
+                },
                 "amenity/shelter": {
                     "name": "Nhà trú",
                     "terms": "nhà trú, chỗ che chở, nhà trú bão, nhà trú mưa, nhà trú ẩn, điểm trú bão, điểm trú mưa, điểm trú ẩn, túp lều, mái, nóc, cho che cho, nha tru bao, nha tru mua, nha tru an, diem tru bao, diem tru mau, diem tru an, tup leu, mai, noc"
@@ -3788,6 +3867,14 @@
                     "name": "Nhà máy",
                     "terms": "nhà máy, xí nghiệp, xưởng, hãng, nha may, xi nghiep, xuong, hang"
                 },
+                "manhole": {
+                    "name": "Hố ga",
+                    "terms": "hố ga, lỗ cống, miệng cống, viễn thông, ho ga, lo cong, mieng cong, vien thong"
+                },
+                "manhole/drain": {
+                    "name": "Cống Thoát Nước",
+                    "terms": "cống thoát nước mưa, cống nước mưa, cong thoat nuoc mua, cong nuoc mua"
+                },
                 "natural": {
                     "name": "Thiên nhiên",
                     "terms": "thiên nhiên, tự nhiên, thien nhien, tu nhien"
@@ -5068,6 +5155,20 @@
                 },
                 "name": "Waymarked Trails: Thể thao Mùa đông"
             },
+            "basemap.at": {
+                "attribution": {
+                    "text": "basemap.at"
+                },
+                "description": "Bản đồ gốc của Áo dựa trên dữ liệu chính phủ.",
+                "name": "basemap.at"
+            },
+            "basemap.at-orthofoto": {
+                "attribution": {
+                    "text": "basemap.at"
+                },
+                "description": "Lớp hình ảnh trực giao do basemap.at cung cấp. “Kế tiếp” hình ảnh geoimage.at.",
+                "name": "Hình ảnh trực giao basemap.at"
+            },
             "hike_n_bike": {
                 "attribution": {
                     "text": "© những người đóng góp vào OpenStreetMap"
diff --git a/vendor/assets/iD/iD/locales/zh-CN.json b/vendor/assets/iD/iD/locales/zh-CN.json
index c01181dd9..e6503dbd3 100644
--- a/vendor/assets/iD/iD/locales/zh-CN.json
+++ b/vendor/assets/iD/iD/locales/zh-CN.json
@@ -348,6 +348,49 @@
             "list": "{users}编辑",
             "truncated_list": "{users}及另外{count}人编辑"
         },
+        "info_panels": {
+            "key": "I",
+            "background": {
+                "key": "B",
+                "title": "背景",
+                "zoom": "缩放",
+                "vintage": "影像日期",
+                "unknown": "未知",
+                "show_tiles": "显示瓦片",
+                "hide_tiles": "隐藏瓦片"
+            },
+            "history": {
+                "key": "H",
+                "title": "历史",
+                "selected": "已选择 {n} 个",
+                "version": "版本",
+                "last_edit": "最近编辑",
+                "edited_by": "编辑者",
+                "changeset": "修改集合",
+                "unknown": "未知",
+                "link_text": "在 openstreetmap.org 上的历史记录"
+            },
+            "location": {
+                "key": "L",
+                "title": "位置",
+                "unknown_location": "未知地点"
+            },
+            "measurement": {
+                "key": "M",
+                "title": "测量",
+                "selected": "已选择 {n} 个",
+                "geometry": "几何",
+                "closed": "闭合",
+                "center": "中心",
+                "perimeter": "周长",
+                "length": "长度",
+                "area": "面积",
+                "centroid": "质心",
+                "location": "位置",
+                "metric": "公制",
+                "imperial": "英制"
+            }
+        },
         "geometry": {
             "point": "点",
             "vertex": "顶点",
@@ -503,7 +546,9 @@
         },
         "restore": {
             "heading": "您有未保存的更改",
-            "description": "您在上一次编辑时有未保存的修改，您想恢复这些修改吗？"
+            "description": "您在上一次编辑时有未保存的修改，您想恢复这些修改吗？",
+            "restore": "恢复我的修改",
+            "reset": "丢弃我的修改"
         },
         "save": {
             "title": "保存",
@@ -978,6 +1023,17 @@
                     "redo": "重做上一操作",
                     "save": "保存更改"
                 }
+            },
+            "tools": {
+                "title": "工具",
+                "info": {
+                    "title": "信息",
+                    "all": "切换全部信息面板",
+                    "background": "切换背景面板",
+                    "history": "切换历史面板",
+                    "location": "切换位置面板",
+                    "measurement": "切换测量面板"
+                }
             }
         },
         "presets": {
@@ -2578,7 +2634,7 @@
                 },
                 "amenity/school": {
                     "name": "学校",
-                    "terms": "学校场地"
+                    "terms": "学校,中学,小学"
                 },
                 "amenity/scrapyard": {
                     "name": "废品堆放场",
@@ -4866,7 +4922,7 @@
                 },
                 "tourism/theme_park": {
                     "name": "主题公园",
-                    "terms": "主题公园"
+                    "terms": "主题公园,乐园,度假区,娱乐,游乐园,游乐场,公园"
                 },
                 "tourism/viewpoint": {
                     "name": "观景点",
-- 
2.43.2