Update to iD v1.3.10

diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb
index 0f5ae41586b733d0fb4c826bc7445cf769e7097c..585276f1ea7253b80c8ec450719c443c87b1f91c 100644 (file)
--- a/vendor/assets/iD/iD.css.erb
+++ b/vendor/assets/iD/iD.css.erb
@@ -321,246 +321,264 @@ path.shadow.selected {
     stroke-opacity: 0.7;
 }
 
+path.line.stroke {
+    stroke: white;
+    stroke-width: 2;
+}
+
 path.area.stroke {
     stroke: white;
     stroke-width: 1;
 }
-
 path.area.fill {
-    fill:#fff;
-    fill-opacity:0.3;
+    fill: rgba(255, 255, 255, 0.3);
     fill-rule: evenodd;
 }
-
-path.line.stroke {
-    stroke: white;
-    stroke-width: 2;
+.preset-icon-fill-area {
+    border: 1px solid rgb(170, 170, 170);
+    background-color: rgba(170, 170, 170, 0.3);
 }
 
 path.stroke.tag-natural {
-    stroke: #b6e199;
+    stroke: rgb(182, 225, 153);
 }
 path.fill.tag-natural {
-    fill: #b6e199;
+    fill: rgba(182, 225, 153, 0.3);
+}
+.preset-icon-fill-area.tag-natural {
+    border-color: rgb(182, 225, 153);
+    background-color: rgba(182, 225, 153, 0.3);
 }
 
 path.stroke.tag-natural-water {
-    stroke: #77d3de;
+    stroke: rgb(119, 211, 222);
 }
 path.fill.tag-natural-water {
-    fill: #77d3de;
+    fill: rgba(119, 211, 222, 0.3);
+}
+.preset-icon-fill-area.tag-natural-water {
+    border-color: rgb(119, 211, 222);
+    background-color: rgba(119, 211, 222, 0.3);
 }
 
 path.stroke.tag-amenity-school {
-    stroke: #ffff94;
+    stroke: rgb(255, 255, 148);
 }
 path.fill.tag-amenity-school {
-    fill: #ffff94;
-    fill-opacity: 0.2;
+    fill: rgba(255, 255, 148, 0.2);
+}
+.preset-icon-fill-area.tag-amenity-school {
+    border-color: rgb(255, 255, 148);
+    background-color: rgba(255, 255, 148, 0.2);
 }
 
 path.stroke.tag-amenity-university {
-    stroke: #ffff94;
+    stroke: rgb(255, 255, 148);
 }
 path.fill.tag-amenity-university {
-    fill: #ffff94;
-    fill-opacity: 0.1;
-}
-
-path.stroke.tag-building {
-    stroke: #e06e5f;
+    fill: rgba(255, 255, 148, 0.1);
 }
-path.fill.tag-building {
-    fill: #e06e5f;
+.preset-icon-fill-area.tag-amenity-university {
+    border-color: rgb(255, 255, 148);
+    background-color: rgba(255, 255, 148, 0.1);
 }
 
-/* Landuse */
-
-
 path.stroke.tag-landuse,
 path.stroke.tag-natural-wood,
 path.stroke.tag-natural-tree,
 path.stroke.tag-natural-grassland,
+path.stroke.tag-natural-grass,
 path.stroke.tag-leisure-pitch,
 path.stroke.tag-leisure-park {
-    stroke: #8cd05f;
+    stroke: rgb(140, 208, 95);
+}
+path.fill.tag-landuse,
+path.fill.tag-natural-wood,
+path.fill.tag-natural-tree,
+path.fill.tag-natural-grassland,
+path.fill.tag-natural-grass,
+path.fill.tag-leisure-pitch,
+path.fill.tag-leisure-park {
+    fill: rgba(140, 208, 95, 0.2);
+}
+.preset-icon-fill-area.tag-landuse,
+.preset-icon-fill-area.tag-natural-wood,
+.preset-icon-fill-area.tag-natural-tree,
+.preset-icon-fill-area.tag-natural-grassland,
+.preset-icon-fill-area.tag-natural-grass,
+.preset-icon-fill-area.tag-leisure-pitch,
+.preset-icon-fill-area.tag-leisure-park {
+    border-color: rgb(140, 208, 95);
+    background-color: rgba(140, 208, 95, 0.2);
+}
+
+path.stroke.tag-landuse-residential {
+    stroke: rgb(224, 110, 95);
+}
+path.fill.tag-landuse-residential {
+    fill: rgba(224, 110, 95, 0.1);
+}
+.preset-icon-fill-area.tag-landuse-residential {
+    border-color: rgb(224, 110, 95);
+    background-color: rgba(224, 110, 95, 0.1);
 }
 
 path.stroke.tag-landuse-retail,
 path.stroke.tag-landuse-commercial {
-    stroke: #eab056;
+    stroke: rgb(234, 176, 86);
+}
+path.fill.tag-landuse-retail,
+path.fill.tag-landuse-commercial {
+    fill: rgba(234, 176, 86, 0.1);
+}
+.preset-icon-fill-area.tag-landuse-retail,
+.preset-icon-fill-area.tag-landuse-commercial {
+    border-color: rgb(234, 176, 86);
+    background-color: rgba(234, 176, 86, 0.1);
 }
 
 path.stroke.tag-landuse-industrial {
-    stroke: #e4a4f5;
+    stroke: rgb(228, 164, 245);
+}
+path.fill.tag-landuse-industrial {
+    fill: rgba(228, 164, 245, 0.1);
+}
+.preset-icon-fill-area.tag-landuse-industrial {
+    border-color: rgb(228, 164, 245);
+    background-color: rgba(228, 164, 245, 0.1);
 }
 
 path.stroke.tag-landuse-basin,
 path.stroke.tag-landuse-reservoir {
-    stroke: #77d3de;
+    stroke: rgb(119, 211, 222);
+}
+path.fill.tag-landuse-basin,
+path.fill.tag-landuse-reservoir {
+    fill: rgba(119, 211, 222, 0.3);
+}
+.preset-icon-fill-area.tag-landuse-basin,
+.preset-icon-fill-area.tag-landuse-reservoir {
+    border-color: rgb(119, 211, 222);
+    background-color: rgba(119, 211, 222, 0.3);
 }
 
 path.stroke.tag-landuse-quarry {
-    stroke: #a6957b;
+    stroke: rgb(166, 149, 123);
 }
-
-path.stroke.tag-landuse-landfill {
-    stroke: #ff9933;
+path.fill.tag-landuse-quarry {
+    fill: rgba(166, 149, 123, 0.2);
 }
-
-path.stroke.tag-landuse-residential,
-path.stroke.tag-landuse-construction {
-    stroke: #e06e5f;
+.preset-icon-fill-area.tag-landuse-quarry {
+    border-color: rgb(166, 149, 123);
+    background-color: rgba(166, 149, 123, 0.2);
 }
 
-path.stroke.tag-landuse-meadow,
-path.stroke.tag-natural-wetland {
-    stroke: #b6e199;
+path.stroke.tag-landuse-landfill {
+    stroke: rgb(255, 153, 51);
 }
-
-path.stroke.tag-natural-beach {
-    stroke: #ffff7e;
+path.fill.tag-landuse-landfill {
+    fill: rgba(255, 153, 51, 0.2);
 }
-
-path.stroke.tag-natural-scrub {
-    stroke: #dbf08b;
+.preset-icon-fill-area.tag-landuse-landfill {
+    border-color: rgb(255, 153, 51);
+    background-color: rgba(255, 153, 51, 0.2);
 }
 
-path.fill.tag-landuse,
-path.fill.tag-natural-wood,
-path.fill.tag-natural-tree,
-path.fill.tag-natural-grassland,
-path.fill.tag-natural-grass,
-path.fill.tag-leisure-pitch,
-path.fill.tag-leisure-park {
-    fill: #8cd05f;
-    fill-opacity: 0.2;
+path.stroke.tag-landuse-construction {
+    stroke: rgb(224, 110, 95);
 }
-
-path.fill.tag-landuse-retail,
-path.fill.tag-landuse-residential,
-path.fill.tag-landuse-commercial,
-path.fill.tag-landuse-industrial {
-    fill-opacity: 0.1;
-}
-
-path.fill.tag-natural-wetland,
-path.fill.tag-natural-beach,
-path.fill.tag-natural-scrub,
-path.fill.tag-landuse-cemetery,
-path.fill.tag-landuse-meadow,
-path.fill.tag-landuse-farm,
-path.fill.tag-landuse-farmland,
-path.fill.tag-landuse-construction,
-path.fill.tag-landuse-orchard {
-    /* background color is applied a further opacity later */
-    fill-opacity: 0.8;
-}
-
-.pattern-color-beach,
-.pattern-color-scrub,
-.pattern-color-meadow,
-.pattern-color-wetland,
-.pattern-color-cemetery,
-.pattern-color-farm,
-.pattern-color-farmland,
-.pattern-color-construction,
-.pattern-color-orchard {
-    fill-opacity: 0.2;
+.pattern-color-construction {
+    fill: rgba(224, 110, 95, 0.2);
 }
-
-path.fill.tag-landuse-basin,
-path.fill.tag-landuse-reservoir {
-    fill: #77d3de;
+.preset-icon-fill-area.tag-landuse-construction {
+    border-color: rgb(224, 110, 95);
+    background-color: rgba(224, 110, 95, 0.2);
 }
 
-path.fill.tag-landuse-quarry {
-    fill: #a6957b;
-    fill-opacity: 0.2;
+path.stroke.tag-landuse-military {
+    stroke: rgb(224, 110, 95);
 }
-
-path.fill.tag-landuse-landfill {
-    fill: #ff8800;
-    fill-opacity: 0.2;
+.preset-icon-fill-area.tag-landuse-military {
+    border-color: rgb(224, 110, 95);
+    background-color: rgba(224, 110, 95, 0.2);
 }
 
-path.fill.tag-landuse-residential {
-    fill: #e06e5f;
+path.stroke.tag-natural-wetland {
+    stroke: rgb(182, 225, 153);
 }
-
-path.fill.tag-landuse-farm,
-path.fill.tag-landuse-farmland {
-    fill: url(#pattern-farmland) #8cd05f;
+.pattern-color-wetland {
+    fill: rgba(182, 225, 153, 0.2);
 }
-
-.pattern-color-farm,
-.pattern-color-farmland {
-    fill: url(#pattern-farmland) #8cd05f;
+.preset-icon-fill-area.tag-natural-wetland {
+    border-color: rgb(182, 225, 153);
+    background-color: rgba(182, 225, 153, 0.2);
 }
 
-path.fill.tag-landuse-meadow {
-    fill: url(#pattern-meadow) #b6e199;
+path.stroke.tag-landuse-meadow {
+    stroke: rgb(182, 225, 153);
 }
 .pattern-color-meadow {
-    fill: #b6e199;
-}
-
-path.fill.tag-natural-wetland {
-    fill: url(#pattern-wetland) #b6e199;
+    fill: rgba(182, 225, 153, 0.2);
 }
-.pattern-color-wetland {
-    fill: #B6E199;
+.preset-icon-fill-area.tag-landuse-meadow {
+    border-color: rgb(182, 225, 153);
+    background-color: rgba(182, 225, 153, 0.2);
 }
 
-path.fill.tag-natural-beach {
-    fill: url(#pattern-beach) #ffff7e;
+path.stroke.tag-natural-beach {
+    stroke: rgb(255, 255, 126);
 }
 .pattern-color-beach {
-    fill: #ffff7e;
+    fill: rgba(255, 255, 126, 0.2);
+}
+.preset-icon-fill-area.tag-natural-beach {
+    border-color: rgb(255, 255, 126);
+    background-color: rgba(255, 255, 126, 0.2);
 }
 
-path.fill.tag-natural-scrub {
-    fill: url(#pattern-scrub) #dbf08b;
+path.stroke.tag-natural-scrub {
+    stroke: rgb(219, 240, 139);
 }
 .pattern-color-scrub {
-    fill: #dbf08b;
+    fill: rgba(219, 240, 139, 0.2);
 }
-
-path.fill.tag-landuse-cemetery {
-    fill: url(#pattern-cemetery) #8cd05f;
-}
-.pattern-color-cemetery {
-    fill: #8cd05f
+.preset-icon-fill-area.tag-natural-scrub {
+    border-color: rgb(219, 240, 139);
+    background-color: rgba(219, 240, 139, 0.2);
 }
 
-path.fill.tag-landuse-orchard {
-    fill: url(#pattern-orchard) #8cd05f;
+.pattern-color-farm,
+.pattern-color-farmland {
+    fill: rgba(140, 208, 95, 0.2);
 }
-.pattern-color-orchard {
-    fill: #8cd05f
+.preset-icon-fill-area.tag-landuse-farm,
+.preset-icon-fill-area.tag-landuse-farmland {
+    background-color: rgba(140, 208, 95, 0.2);
 }
 
-path.fill.tag-landuse-construction {
-    fill: url(#pattern-construction) #e06e5f;
+.pattern-color-cemetery {
+    fill: rgba(140, 208, 95, 0.2)
 }
-.pattern-color-construction {
-    fill: #e06e5f;
+.preset-icon-fill-area.tag-landuse-cemetery {
+    background-color: rgba(140, 208, 95, 0.2);
 }
 
-path.fill.tag-landuse-retail,
-path.fill.tag-landuse-commercial {
-    fill: #eab056;
+.pattern-color-orchard {
+    fill: rgba(140, 208, 95, 0.2)
 }
-
-path.fill.tag-landuse-industrial {
-    fill: #e4a4f5;
+.preset-icon-fill-area.tag-landuse-orchard {
+    background-color: rgba(140, 208, 95, 0.8);
 }
 
 path.stroke.tag-amenity-parking {
-    stroke: #aaa;
+    stroke: rgb(170, 170, 170);
 }
 path.fill.tag-amenity-parking {
-    fill: #aaa;
+    fill: rgba(170, 170, 170, 0.3);
+}
+.preset-icon-fill-area.tag-amenity-parking {
+    border-color: rgb(170, 170, 170);
+    background-color: rgba(170, 170, 170, 0.3);
 }
 
 path.fill.tag-place,
@@ -689,9 +707,6 @@ path.stroke.area.tag-highway-pedestrian {
     stroke:#fff;
     stroke-width: 2;
 }
-path.fill.area.tag-highway-pedestrian {
-    fill:#ccc;
-}
 
 path.stroke.tag-highway-service {
     stroke:#fff;
@@ -803,121 +818,66 @@ path.casing.tag-aeroway-runway {
     stroke-linecap: square;
 }
 path.fill.tag-aeroway-runway {
-    fill: #000;
-    fill-opacity: 0.6;
+    fill: rgba(0, 0, 0, 0.6);
 }
 path.stroke.tag-aeroway-apron {
     stroke: #805C80;
 }
 path.fill.tag-aeroway-apron {
-    fill: #805C80;
-    fill-opacity: 0.2;
-}
-
-
-/* bridges */
-
-path.casing.tag-bridge {
-    stroke-width: 14;
-    stroke-opacity: 0.5;
-    stroke: #000;
-}
-
-path.casing.tag-highway-living_street.tag-bridge,
-path.casing.tag-highway-path.tag-bridge {
-    stroke-width: 6;
+    fill: rgba(128, 92, 128, 0.2);
 }
 
-path.casing.line.tag-highway-pedestrian,
-path.casing.tag-highway-service.tag-bridge,
-path.casing.tag-highway-track.tag-bridge,
-path.casing.tag-highway-steps.tag-bridge,
-path.casing.tag-highway-footway.tag-bridge,
-path.casing.tag-highway-cycleway.tag-bridge,
-path.casing.tag-highway-bridleway.tag-bridge {
-    stroke-width: 8;
-}
-
-path.shadow.tag-highway-residential.tag-bridge {
-    stroke-width:22;
-}
-
-path.shadow.tag-highway-living_street.tag-bridge,
-path.shadow.tag-highway-path.tag-bridge,
-path.shadow.line.tag-highway-pedestrian,
-path.shadow.tag-highway-service.tag-bridge,
-path.shadow.tag-highway-track.tag-bridge,
-path.shadow.tag-highway-steps.tag-bridge,
-path.shadow.tag-highway-footway.tag-bridge,
-path.shadow.tag-highway-cycleway.tag-bridge,
-path.shadow.tag-highway-bridleway.tag-bridge {
-    stroke-width: 16;
-}
-
-/* tunnels */
-
-path.stroke.tag-highway.tag-tunnel {
-    stroke-opacity: 0.3;
-}
-
-path.casing.tag-highway.tag-tunnel {
-    stroke-opacity: 0.5;
-}
-
-path.stroke.tag-highway-construction,
-path.casing.tag-highway-construction {
-    stroke-linecap: butt;
-    stroke-dasharray: 7, 7;
-}
-
-/* construction */
-
-.low-zoom path.stroke.tag-highway-construction,
-.low-zoom path.casing.tag-highway-construction {
-    stroke-linecap: butt;
-    stroke-dasharray: 5, 5;
-}
 
 /* railways */
 
-.line.stroke.tag-railway {
+path.stroke.tag-railway {
     stroke: #eee;
     stroke-width: 2;
     stroke-linecap: butt;
     stroke-dasharray: 12,12;
 }
-.line.casing.tag-railway {
+
+path.casing.tag-railway {
     stroke: #555;
     stroke-width: 4;
 }
 
-.line.stroke.tag-railway-abandoned {
+path.stroke.tag-railway-abandoned {
     stroke: #eee;
 }
-.line.casing.tag-railway-abandoned {
+path.casing.tag-railway-abandoned {
     stroke: #999;
 }
 
-.line.stroke.tag-railway-subway {
+path.stroke.tag-railway-subway {
     stroke: #666;
 }
-.line.casing.tag-railway-subway {
+path.casing.tag-railway-subway {
     stroke: #222;
 }
 
-.line.stroke.tag-railway-platform {
+path.stroke.tag-railway-platform {
     stroke: #999;
     stroke-width: 4;
     stroke-dasharray: none;
 }
-.line.casing.tag-railway-platform {
+path.casing.tag-railway-platform {
+    stroke: none;
+}
+
+.area.stroke.tag-railway {
+    stroke: white;
+    stroke-width: 1;
+    stroke-dasharray: none;
+}
+.area.casing.tag-railway {
     stroke: none;
 }
 
 /* waterways */
 
 path.fill.tag-waterway {
-    fill: #77d3de;
+    fill: rgba(119, 211, 222, 0.3);
 }
 
 path.stroke.tag-waterway {
@@ -974,6 +934,96 @@ path.casing.tag-boundary-national_park {
 }
 
 
+/* bridges */
+
+path.casing.tag-bridge {
+    stroke-width: 14;
+    stroke-opacity: 0.5;
+    stroke: #000;
+}
+
+path.casing.tag-highway-living_street.tag-bridge,
+path.casing.tag-highway-path.tag-bridge {
+    stroke-width: 6;
+}
+
+path.casing.line.tag-highway-pedestrian,
+path.casing.tag-highway-service.tag-bridge,
+path.casing.tag-highway-track.tag-bridge,
+path.casing.tag-highway-steps.tag-bridge,
+path.casing.tag-highway-footway.tag-bridge,
+path.casing.tag-highway-cycleway.tag-bridge,
+path.casing.tag-highway-bridleway.tag-bridge {
+    stroke-width: 8;
+}
+
+path.shadow.tag-highway-residential.tag-bridge {
+    stroke-width:22;
+}
+
+path.shadow.tag-highway-living_street.tag-bridge,
+path.shadow.tag-highway-path.tag-bridge,
+path.shadow.line.tag-highway-pedestrian,
+path.shadow.tag-highway-service.tag-bridge,
+path.shadow.tag-highway-track.tag-bridge,
+path.shadow.tag-highway-steps.tag-bridge,
+path.shadow.tag-highway-footway.tag-bridge,
+path.shadow.tag-highway-cycleway.tag-bridge,
+path.shadow.tag-highway-bridleway.tag-bridge {
+    stroke-width: 16;
+}
+
+/* tunnels */
+
+path.stroke.tag-tunnel {
+    stroke-opacity: 0.3;
+}
+
+path.casing.tag-tunnel {
+    stroke-opacity: 0.5;
+}
+
+/* embankments / cuttings */
+
+path.casing.tag-embankment,
+path.casing.tag-cutting {
+    stroke-opacity: 0.5;
+    stroke: #000;
+    stroke-width: 22;
+    stroke-dasharray: 2, 4;
+    stroke-linecap: butt;
+}
+
+path.shadow.tag-embankment,
+path.shadow.tag-cutting {
+    stroke-width: 28;
+}
+
+.low-zoom path.casing.tag-embankment,
+.low-zoom path.casing.tag-cutting {
+    stroke-width: 10;
+}
+
+.low-zoom path.shadow.tag-embankment,
+.low-zoom path.shadow.tag-cutting {
+    stroke-width: 14;
+}
+
+
+/* construction */
+
+path.stroke.tag-highway-construction,
+path.casing.tag-highway-construction {
+    stroke-linecap: butt;
+    stroke-dasharray: 7, 7;
+}
+
+.low-zoom path.stroke.tag-highway-construction,
+.low-zoom path.casing.tag-highway-construction {
+    stroke-linecap: butt;
+    stroke-dasharray: 5, 5;
+}
+
 text {
     font-size:10px;
     pointer-events: none;
@@ -994,6 +1044,23 @@ path.oneway {
     stroke-width: 6px;
 }
 
+/* Buildings */
+
+path.stroke.tag-building,
+path.stroke.tag-amenity-shelter {
+    stroke: rgb(224, 110, 95);
+}
+path.fill.tag-building,
+path.fill.tag-amenity-shelter {
+    fill: rgba(224, 110, 95, 0.3);
+}
+.preset-icon-fill-area.tag-building,
+.preset-icon-fill-area.tag-amenity-shelter {
+    border-color: rgb(224, 110, 95);
+    background-color: rgba(224, 110, 95, 0.3);
+}
+
+
 /*
  * Labels
  */
@@ -2158,37 +2225,26 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
 
 /* Preset icon colors */
 
-.preset-icon-fill.icon-area {
+.preset-icon-fill-area {
     cursor: inherit;
-    height: 45px;
-    width: 45px;
+    height: 39px;
+    width: 39px;
     margin: auto;
     position: absolute;
-    left: 7px; top: 7px;
-    background:transparent url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat -240px -80px;
+    left: 10px;
+    top: 10px;
 }
 
-.preset-icon-fill.tag-shop,
-.preset-icon-fill.tag-building {
+.preset-icon-fill-area:after {
+    content: '';
+    left: -4px;
+    top: -4px;
+    height: 45px;
+    width: 45px;
+    position: absolute;
     background:transparent url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat 0 -80px;
 }
 
-.preset-icon-fill.tag-natural-water {
-    background:transparent url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat -60px -80px;
-}
-
-.preset-icon-fill.tag-landuse,
-.preset-icon-fill.tag-natural-wood,
-.preset-icon-fill.tag-natural-tree,
-.preset-icon-fill.tag-natural-grassland,
-.preset-icon-fill.tag-leisure-park {
-    background:transparent url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat -120px -80px;
-}
-
-.preset-icon-fill.tag-amenity-parking {
-    background:transparent url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat -180px -80px;
-}
-
 /* preset form basics */
 
 .inspector-preset {
@@ -4253,6 +4309,10 @@ img.wiki-image {
 .feature-laundry{background-position:-108px -504px;}
 .feature-car{background-position:-162px -504px;}
 .feature-suitcase{background-position:-216px -504px;}
+.feature-hairdresser{background-position:-0px -528px;}
+.feature-chemist{background-position:-54px -528px;}
+.feature-mobilephone{background-position:-108px -528px;}
+.feature-scooter{background-position:-162px -528px;}
 .preset-icon-line.feature-highway-motorway{background-position:-20px -25px;}
 .preset-icon-line.feature-highway-trunk{background-position:-80px -25px;}
 .preset-icon-line.feature-highway-primary{background-position:-140px -25px;}

diff --git a/vendor/assets/iD/iD.js b/vendor/assets/iD/iD.js
index 8ffa66d17e544cd416ab44ea22683a75800cfa90..e71d245835b0625f19eade0aaf4aaf9c7db91698 100644 (file)
--- a/vendor/assets/iD/iD.js
+++ b/vendor/assets/iD/iD.js
@@ -174,11 +174,13 @@
   }
 
 })(this);
-d3 = (function(){
-  var d3 = {version: "3.3.10"}; // semver
-d3.ascending = function(a, b) {
+!function(){
+  var d3 = {version: "3.4.6"}; // semver
+d3.ascending = d3_ascending;
+
+function d3_ascending(a, b) {
   return a < b ? -1 : a > b ? 1 : a >= b ? 0 : NaN;
-};
+}
 d3.descending = function(a, b) {
   return b < a ? -1 : b > a ? 1 : b >= a ? 0 : NaN;
 };
@@ -250,17 +252,17 @@ function d3_number(x) {
 }
 
 d3.mean = function(array, f) {
-  var n = array.length,
+  var s = 0,
+      n = array.length,
       a,
-      m = 0,
       i = -1,
-      j = 0;
+      j = n;
   if (arguments.length === 1) {
-    while (++i < n) if (d3_number(a = array[i])) m += (a - m) / ++j;
+    while (++i < n) if (d3_number(a = array[i])) s += a; else --j;
   } else {
-    while (++i < n) if (d3_number(a = f.call(array, array[i], i))) m += (a - m) / ++j;
+    while (++i < n) if (d3_number(a = f.call(array, array[i], i))) s += a; else --j;
   }
-  return j ? m : undefined;
+  return j ? s / j : undefined;
 };
 // R-7 per <http://en.wikipedia.org/wiki/Quantile>
 d3.quantile = function(values, p) {
@@ -274,16 +276,17 @@ d3.quantile = function(values, p) {
 d3.median = function(array, f) {
   if (arguments.length > 1) array = array.map(f);
   array = array.filter(d3_number);
-  return array.length ? d3.quantile(array.sort(d3.ascending), .5) : undefined;
+  return array.length ? d3.quantile(array.sort(d3_ascending), .5) : undefined;
 };
-d3.bisector = function(f) {
+
+function d3_bisector(compare) {
   return {
     left: function(a, x, lo, hi) {
       if (arguments.length < 3) lo = 0;
       if (arguments.length < 4) hi = a.length;
       while (lo < hi) {
         var mid = lo + hi >>> 1;
-        if (f.call(a, a[mid], mid) < x) lo = mid + 1;
+        if (compare(a[mid], x) < 0) lo = mid + 1;
         else hi = mid;
       }
       return lo;
@@ -293,17 +296,23 @@ d3.bisector = function(f) {
       if (arguments.length < 4) hi = a.length;
       while (lo < hi) {
         var mid = lo + hi >>> 1;
-        if (x < f.call(a, a[mid], mid)) hi = mid;
+        if (compare(a[mid], x) > 0) hi = mid;
         else lo = mid + 1;
       }
       return lo;
     }
   };
-};
+}
 
-var d3_bisector = d3.bisector(function(d) { return d; });
-d3.bisectLeft = d3_bisector.left;
-d3.bisect = d3.bisectRight = d3_bisector.right;
+var d3_bisect = d3_bisector(d3_ascending);
+d3.bisectLeft = d3_bisect.left;
+d3.bisect = d3.bisectRight = d3_bisect.right;
+
+d3.bisector = function(f) {
+  return d3_bisector(f.length === 1
+      ? function(d, x) { return d3_ascending(f(d), x); }
+      : f);
+};
 d3.shuffle = function(array) {
   var m = array.length, t, i;
   while (m) {
@@ -425,24 +434,15 @@ d3.map = function(object) {
 function d3_Map() {}
 
 d3_class(d3_Map, {
-  has: function(key) {
-    return d3_map_prefix + key in this;
-  },
+  has: d3_map_has,
   get: function(key) {
     return this[d3_map_prefix + key];
   },
   set: function(key, value) {
     return this[d3_map_prefix + key] = value;
   },
-  remove: function(key) {
-    key = d3_map_prefix + key;
-    return key in this && delete this[key];
-  },
-  keys: function() {
-    var keys = [];
-    this.forEach(function(key) { keys.push(key); });
-    return keys;
-  },
+  remove: d3_map_remove,
+  keys: d3_map_keys,
   values: function() {
     var values = [];
     this.forEach(function(key, value) { values.push(value); });
@@ -453,18 +453,42 @@ d3_class(d3_Map, {
     this.forEach(function(key, value) { entries.push({key: key, value: value}); });
     return entries;
   },
+  size: d3_map_size,
+  empty: d3_map_empty,
   forEach: function(f) {
-    for (var key in this) {
-      if (key.charCodeAt(0) === d3_map_prefixCode) {
-        f.call(this, key.substring(1), this[key]);
-      }
-    }
+    for (var key in this) if (key.charCodeAt(0) === d3_map_prefixCode) f.call(this, key.substring(1), this[key]);
   }
 });
 
 var d3_map_prefix = "\0", // prevent collision with built-ins
     d3_map_prefixCode = d3_map_prefix.charCodeAt(0);
 
+function d3_map_has(key) {
+  return d3_map_prefix + key in this;
+}
+
+function d3_map_remove(key) {
+  key = d3_map_prefix + key;
+  return key in this && delete this[key];
+}
+
+function d3_map_keys() {
+  var keys = [];
+  this.forEach(function(key) { keys.push(key); });
+  return keys;
+}
+
+function d3_map_size() {
+  var size = 0;
+  for (var key in this) if (key.charCodeAt(0) === d3_map_prefixCode) ++size;
+  return size;
+}
+
+function d3_map_empty() {
+  for (var key in this) if (key.charCodeAt(0) === d3_map_prefixCode) return false;
+  return true;
+}
+
 d3.nest = function() {
   var nest = {},
       keys = [],
@@ -570,9 +594,7 @@ d3.set = function(array) {
 function d3_Set() {}
 
 d3_class(d3_Set, {
-  has: function(value) {
-    return d3_map_prefix + value in this;
-  },
+  has: d3_map_has,
   add: function(value) {
     this[d3_map_prefix + value] = true;
     return value;
@@ -581,19 +603,11 @@ d3_class(d3_Set, {
     value = d3_map_prefix + value;
     return value in this && delete this[value];
   },
-  values: function() {
-    var values = [];
-    this.forEach(function(value) {
-      values.push(value);
-    });
-    return values;
-  },
+  values: d3_map_keys,
+  size: d3_map_size,
+  empty: d3_map_empty,
   forEach: function(f) {
-    for (var value in this) {
-      if (value.charCodeAt(0) === d3_map_prefixCode) {
-        f.call(this, value.substring(1));
-      }
-    }
+    for (var value in this) if (value.charCodeAt(0) === d3_map_prefixCode) f.call(this, value.substring(1));
   }
 });
 d3.behavior = {};
@@ -794,7 +808,7 @@ var d3_select = function(s, n) { return n.querySelector(s); },
 // Prefer Sizzle, if available.
 if (typeof Sizzle === "function") {
   d3_select = function(s, n) { return Sizzle(s, n)[0] || null; };
-  d3_selectAll = function(s, n) { return Sizzle.uniqueSort(Sizzle(s, n)); };
+  d3_selectAll = Sizzle;
   d3_selectMatches = Sizzle.matchesSelector;
 }
 
@@ -954,7 +968,7 @@ d3_selectionPrototype.classed = function(name, value) {
     // probably doesn't support it on SVG elements (which can be animated).
     if (typeof name === "string") {
       var node = this.node(),
-          n = (name = name.trim().split(/^|\s+/g)).length,
+          n = (name = d3_selection_classes(name)).length,
           i = -1;
       if (value = node.classList) {
         while (++i < n) if (!value.contains(name[i])) return false;
@@ -979,9 +993,13 @@ function d3_selection_classedRe(name) {
   return new RegExp("(?:^|\\s+)" + d3.requote(name) + "(?:\\s+|$)", "g");
 }
 
+function d3_selection_classes(name) {
+  return name.trim().split(/^|\s+/);
+}
+
 // Multiple class names are allowed (e.g., "foo bar").
 function d3_selection_classed(name, value) {
-  name = name.trim().split(/\s+/).map(d3_selection_classedName);
+  name = d3_selection_classes(name).map(d3_selection_classedName);
   var n = name.length;
 
   function classedConstant() {
@@ -1328,7 +1346,7 @@ d3_selectionPrototype.sort = function(comparator) {
 };
 
 function d3_selection_sortComparator(comparator) {
-  if (!arguments.length) comparator = d3.ascending;
+  if (!arguments.length) comparator = d3_ascending;
   return function(a, b) {
     return a && b ? comparator(a.__data__, b.__data__) : !a - !b;
   };
@@ -1608,29 +1626,12 @@ d3.mouse = function(container) {
   return d3_mousePoint(container, d3_eventSource());
 };
 
-// https://bugs.webkit.org/show_bug.cgi?id=44083
-var d3_mouse_bug44083 = /WebKit/.test(d3_window.navigator.userAgent) ? -1 : 0;
-
 function d3_mousePoint(container, e) {
   if (e.changedTouches) e = e.changedTouches[0];
   var svg = container.ownerSVGElement || container;
   if (svg.createSVGPoint) {
     var point = svg.createSVGPoint();
-    if (d3_mouse_bug44083 < 0 && (d3_window.scrollX || d3_window.scrollY)) {
-      svg = d3.select("body").append("svg").style({
-        position: "absolute",
-        top: 0,
-        left: 0,
-        margin: 0,
-        padding: 0,
-        border: "none"
-      }, "important");
-      var ctm = svg[0][0].getScreenCTM();
-      d3_mouse_bug44083 = !(ctm.f || ctm.e);
-      svg.remove();
-    }
-    if (d3_mouse_bug44083) point.x = e.pageX, point.y = e.pageY;
-    else point.x = e.clientX, point.y = e.clientY;
+    point.x = e.clientX, point.y = e.clientY;
     point = point.matrixTransform(container.getScreenCTM().inverse());
     return [point.x, point.y];
   }
@@ -1658,6 +1659,14 @@ function d3_sgn(x) {
   return x > 0 ? 1 : x < 0 ? -1 : 0;
 }
 
+// Returns the 2D cross product of AB and AC vectors, i.e., the z-component of
+// the 3D cross product in a quadrant I Cartesian coordinate system (+x is
+// right, +y is up). Returns a positive value if ABC is counter-clockwise,
+// negative if clockwise, and zero if the points are collinear.
+function d3_cross2d(a, b, c) {
+  return (b[0] - a[0]) * (c[1] - a[1]) - (b[1] - a[1]) * (c[0] - a[0]);
+}
+
 function d3_acos(x) {
   return x > 1 ? 0 : x < -1 ? π : Math.acos(x);
 }
@@ -1756,37 +1765,37 @@ d3.behavior.zoom = function() {
 
   zoom.event = function(g) {
     g.each(function() {
-      var event_ = event.of(this, arguments),
+      var dispatch = event.of(this, arguments),
           view1 = view;
       if (d3_transitionInheritId) {
-          d3.select(this).transition()
-              .each("start.zoom", function() {
-                view = this.__chart__ || {x: 0, y: 0, k: 1}; // pre-transition state
-                zoomstarted(event_);
-              })
-              .tween("zoom:zoom", function() {
-                var dx = size[0],
-                    dy = size[1],
-                    cx = dx / 2,
-                    cy = dy / 2,
-                    i = d3.interpolateZoom(
-                      [(cx - view.x) / view.k, (cy - view.y) / view.k, dx / view.k],
-                      [(cx - view1.x) / view1.k, (cy - view1.y) / view1.k, dx / view1.k]
-                    );
-                return function(t) {
-                  var l = i(t), k = dx / l[2];
-                  this.__chart__ = view = {x: cx - l[0] * k, y: cy - l[1] * k, k: k};
-                  zoomed(event_);
-                };
-              })
-              .each("end.zoom", function() {
-                zoomended(event_);
-              });
+        d3.select(this).transition()
+            .each("start.zoom", function() {
+              view = this.__chart__ || {x: 0, y: 0, k: 1}; // pre-transition state
+              zoomstarted(dispatch);
+            })
+            .tween("zoom:zoom", function() {
+              var dx = size[0],
+                  dy = size[1],
+                  cx = dx / 2,
+                  cy = dy / 2,
+                  i = d3.interpolateZoom(
+                    [(cx - view.x) / view.k, (cy - view.y) / view.k, dx / view.k],
+                    [(cx - view1.x) / view1.k, (cy - view1.y) / view1.k, dx / view1.k]
+                  );
+              return function(t) {
+                var l = i(t), k = dx / l[2];
+                this.__chart__ = view = {x: cx - l[0] * k, y: cy - l[1] * k, k: k};
+                zoomed(dispatch);
+              };
+            })
+            .each("end.zoom", function() {
+              zoomended(dispatch);
+            });
       } else {
         this.__chart__ = view;
-        zoomstarted(event_);
-        zoomed(event_);
-        zoomended(event_);
+        zoomstarted(dispatch);
+        zoomed(dispatch);
+        zoomended(dispatch);
       }
     });
   }
@@ -1862,65 +1871,65 @@ d3.behavior.zoom = function() {
     if (y1) y1.domain(y0.range().map(function(y) { return (y - view.y) / view.k; }).map(y0.invert));
   }
 
-  function zoomstarted(event) {
-    event({type: "zoomstart"});
+  function zoomstarted(dispatch) {
+    dispatch({type: "zoomstart"});
   }
 
-  function zoomed(event) {
+  function zoomed(dispatch) {
     rescale();
-    event({type: "zoom", scale: view.k, translate: [view.x, view.y]});
+    dispatch({type: "zoom", scale: view.k, translate: [view.x, view.y]});
   }
 
-  function zoomended(event) {
-    event({type: "zoomend"});
+  function zoomended(dispatch) {
+    dispatch({type: "zoomend"});
   }
 
   function mousedowned() {
-    var target = this,
-        event_ = event.of(target, arguments),
-        eventTarget = d3.event.target,
+    var that = this,
+        target = d3.event.target,
+        dispatch = event.of(that, arguments),
         dragged = 0,
-        w = d3.select(d3_window).on(mousemove, moved).on(mouseup, ended),
-        l = location(d3.mouse(target)),
+        subject = d3.select(d3_window).on(mousemove, moved).on(mouseup, ended),
+        location0 = location(d3.mouse(that)),
         dragRestore = d3_event_dragSuppress();
 
-    d3_selection_interrupt.call(target);
-    zoomstarted(event_);
+    d3_selection_interrupt.call(that);
+    zoomstarted(dispatch);
 
     function moved() {
       dragged = 1;
-      translateTo(d3.mouse(target), l);
-      zoomed(event_);
+      translateTo(d3.mouse(that), location0);
+      zoomed(dispatch);
     }
 
     function ended() {
-      w.on(mousemove, d3_window === target ? mousewheelreset : null).on(mouseup, null);
-      dragRestore(dragged && d3.event.target === eventTarget);
-      zoomended(event_);
+      subject.on(mousemove, d3_window === that ? mousewheelreset : null).on(mouseup, null);
+      dragRestore(dragged && d3.event.target === target);
+      zoomended(dispatch);
     }
   }
 
   // These closures persist for as long as at least one touch is active.
   function touchstarted() {
-    var target = this,
-        event_ = event.of(target, arguments),
+    var that = this,
+        dispatch = event.of(that, arguments),
         locations0 = {}, // touchstart locations
         distance0 = 0, // distance² between initial touches
         scale0, // scale when we started touching
-        eventId = d3.event.changedTouches[0].identifier,
-        touchmove = "touchmove.zoom-" + eventId,
-        touchend = "touchend.zoom-" + eventId,
-        w = d3.select(d3_window).on(touchmove, moved).on(touchend, ended),
-        t = d3.select(target).on(mousedown, null).on(touchstart, started), // prevent duplicate events
+        zoomName = ".zoom-" + d3.event.changedTouches[0].identifier,
+        touchmove = "touchmove" + zoomName,
+        touchend = "touchend" + zoomName,
+        target = d3.select(d3.event.target).on(touchmove, moved).on(touchend, ended),
+        subject = d3.select(that).on(mousedown, null).on(touchstart, started), // prevent duplicate events
         dragRestore = d3_event_dragSuppress();
 
-    d3_selection_interrupt.call(target);
+    d3_selection_interrupt.call(that);
     started();
-    zoomstarted(event_);
+    zoomstarted(dispatch);
 
     // Updates locations of any touches in locations0.
     function relocate() {
-      var touches = d3.touches(target);
+      var touches = d3.touches(that);
       scale0 = view.k;
       touches.forEach(function(t) {
         if (t.identifier in locations0) locations0[t.identifier] = location(t);
@@ -1945,7 +1954,7 @@ d3.behavior.zoom = function() {
           scaleTo(view.k * 2);
           translateTo(p, l);
           d3_eventPreventDefault();
-          zoomed(event_);
+          zoomed(dispatch);
         }
         touchtime = now;
       } else if (touches.length > 1) {
@@ -1956,7 +1965,7 @@ d3.behavior.zoom = function() {
     }
 
     function moved() {
-      var touches = d3.touches(target),
+      var touches = d3.touches(that),
           p0, l0,
           p1, l1;
       for (var i = 0, n = touches.length; i < n; ++i, l1 = null) {
@@ -1977,7 +1986,7 @@ d3.behavior.zoom = function() {
 
       touchtime = null;
       translateTo(p0, l0);
-      zoomed(event_);
+      zoomed(dispatch);
     }
 
     function ended() {
@@ -1995,24 +2004,24 @@ d3.behavior.zoom = function() {
         }
       }
       // Otherwise, remove touchmove and touchend listeners.
-      w.on(touchmove, null).on(touchend, null);
-      t.on(mousedown, mousedowned).on(touchstart, touchstarted);
+      target.on(zoomName, null);
+      subject.on(mousedown, mousedowned).on(touchstart, touchstarted);
       dragRestore();
-      zoomended(event_);
+      zoomended(dispatch);
     }
   }
 
   function mousewheeled() {
-    var event_ = event.of(this, arguments);
+    var dispatch = event.of(this, arguments);
     if (mousewheelTimer) clearTimeout(mousewheelTimer);
-    else d3_selection_interrupt.call(this), zoomstarted(event_);
-    mousewheelTimer = setTimeout(function() { mousewheelTimer = null; zoomended(event_); }, 50);
+    else d3_selection_interrupt.call(this), zoomstarted(dispatch);
+    mousewheelTimer = setTimeout(function() { mousewheelTimer = null; zoomended(dispatch); }, 50);
     d3_eventPreventDefault();
     var point = center || d3.mouse(this);
     if (!translate0) translate0 = location(point);
     scaleTo(Math.pow(2, d3_behavior_zoomDelta() * .002) * view.k);
     translateTo(point, translate0);
-    zoomed(event_);
+    zoomed(dispatch);
   }
 
   function mousewheelreset() {
@@ -2020,15 +2029,15 @@ d3.behavior.zoom = function() {
   }
 
   function dblclicked() {
-    var event_ = event.of(this, arguments),
+    var dispatch = event.of(this, arguments),
         p = d3.mouse(this),
         l = location(p),
         k = Math.log(view.k) / Math.LN2;
-    zoomstarted(event_);
+    zoomstarted(dispatch);
     scaleTo(Math.pow(2, d3.event.shiftKey ? Math.ceil(k) - 1 : Math.floor(k) + 1));
     translateTo(p, l);
-    zoomed(event_);
-    zoomended(event_);
+    zoomed(dispatch);
+    zoomended(dispatch);
   }
 
   return d3.rebind(zoom, event, "on");
@@ -2047,6 +2056,15 @@ function d3_functor(v) {
 
 d3.functor = d3_functor;
 
+d3.touch = function(container, touches, identifier) {
+  if (arguments.length < 3) identifier = touches, touches = d3_eventSource().changedTouches;
+  if (touches) for (var i = 0, n = touches.length, touch; i < n; ++i) {
+    if ((touch = touches[i]).identifier === identifier) {
+      return d3_mousePoint(container, touch);
+    }
+  }
+};
+
 var d3_timer_queueHead,
     d3_timer_queueTail,
     d3_timer_interval, // is an interval (or frame) active?
@@ -2257,7 +2275,6 @@ function d3_geo_clip(pointVisible, clipLine, interpolate, clipStart) {
         clip.lineEnd = ringEnd;
         segments = [];
         polygon = [];
-        listener.polygonStart();
       },
       polygonEnd: function() {
         clip.point = point;
@@ -2267,13 +2284,15 @@ function d3_geo_clip(pointVisible, clipLine, interpolate, clipStart) {
         segments = d3.merge(segments);
         var clipStartInside = d3_geo_pointInPolygon(rotatedClipStart, polygon);
         if (segments.length) {
+          if (!polygonStarted) listener.polygonStart(), polygonStarted = true;
           d3_geo_clipPolygon(segments, d3_geo_clipSort, clipStartInside, interpolate, listener);
         } else if (clipStartInside) {
+          if (!polygonStarted) listener.polygonStart(), polygonStarted = true;
           listener.lineStart();
           interpolate(null, null, 1, listener);
           listener.lineEnd();
         }
-        listener.polygonEnd();
+        if (polygonStarted) listener.polygonEnd(), polygonStarted = false;
         segments = polygon = null;
       },
       sphere: function() {
@@ -2300,6 +2319,7 @@ function d3_geo_clip(pointVisible, clipLine, interpolate, clipStart) {
 
     var buffer = d3_geo_clipBufferListener(),
         ringListener = clipLine(buffer),
+        polygonStarted = false,
         polygon,
         ring;
 
@@ -2335,9 +2355,12 @@ function d3_geo_clip(pointVisible, clipLine, interpolate, clipStart) {
         var n = segment.length - 1,
             i = -1,
             point;
-        listener.lineStart();
-        while (++i < n) listener.point((point = segment[i])[0], point[1]);
-        listener.lineEnd();
+        if (n > 0) {
+          if (!polygonStarted) listener.polygonStart(), polygonStarted = true;
+          listener.lineStart();
+          while (++i < n) listener.point((point = segment[i])[0], point[1]);
+          listener.lineEnd();
+        }
         return;
       }
 
@@ -2531,11 +2554,13 @@ function d3_geo_areaRingStart() {
     // previous point, current point.  Uses a formula derived from Cagnoli’s
     // theorem.  See Todhunter, Spherical Trig. (1871), Sec. 103, Eq. (2).
     var dλ = λ - λ0,
+        sdλ = dλ >= 0 ? 1 : -1,
+        adλ = sdλ * dλ,
         cosφ = Math.cos(φ),
         sinφ = Math.sin(φ),
         k = sinφ0 * sinφ,
-        u = cosφ0 * cosφ + k * Math.cos(dλ),
-        v = k * Math.sin(dλ);
+        u = cosφ0 * cosφ + k * Math.cos(adλ),
+        v = k * sdλ * Math.sin(adλ);
     d3_geo_areaRingSum.add(Math.atan2(v, u));
 
     // Advance the previous points.
@@ -2622,11 +2647,13 @@ function d3_geo_pointInPolygon(point, polygon) {
           sinφ = Math.sin(φ),
           cosφ = Math.cos(φ),
           dλ = λ - λ0,
-          antimeridian = abs(dλ) > π,
+          sdλ = dλ >= 0 ? 1 : -1,
+          adλ = sdλ * dλ,
+          antimeridian = adλ > π,
           k = sinφ0 * sinφ;
-      d3_geo_areaRingSum.add(Math.atan2(k * Math.sin(dλ), cosφ0 * cosφ + k * Math.cos(dλ)));
+      d3_geo_areaRingSum.add(Math.atan2(k * sdλ * Math.sin(adλ), cosφ0 * cosφ + k * Math.cos(adλ)));
 
-      polarAngle += antimeridian ? dλ + (dλ >= 0 ? τ : -τ): dλ;
+      polarAngle += antimeridian ? dλ + sdλ * τ : dλ;
 
       // Are the longitudes either side of the point's meridian, and are the
       // latitudes smaller than the parallel?
@@ -3218,9 +3245,9 @@ function d3_geo_clipExtent(x0, y0, x1, y1) {
         for (var j = 1, v = polygon[i], m = v.length, a = v[0], b; j < m; ++j) {
           b = v[j];
           if (a[1] <= y) {
-            if (b[1] >  y && isLeft(a, b, p) > 0) ++wn;
+            if (b[1] >  y && d3_cross2d(a, b, p) > 0) ++wn;
           } else {
-            if (b[1] <= y && isLeft(a, b, p) < 0) --wn;
+            if (b[1] <= y && d3_cross2d(a, b, p) < 0) --wn;
           }
           a = b;
         }
@@ -3228,10 +3255,6 @@ function d3_geo_clipExtent(x0, y0, x1, y1) {
       return wn !== 0;
     }
 
-    function isLeft(a, b, c) {
-      return (b[0] - a[0]) * (c[1] - a[1]) - (c[0] - a[0]) * (b[1] - a[1]);
-    }
-
     function interpolate(from, to, direction, listener) {
       var a = 0, a1 = 0;
       if (from == null ||
@@ -4546,6 +4569,131 @@ function d3_geom_polygonClosed(coordinates) {
       b = coordinates[coordinates.length - 1];
   return !(a[0] - b[0] || a[1] - b[1]);
 }
+function d3_geom_pointX(d) {
+  return d[0];
+}
+
+function d3_geom_pointY(d) {
+  return d[1];
+}
+
+/**
+ * Computes the 2D convex hull of a set of points using Graham's scanning
+ * algorithm. The algorithm has been implemented as described in Cormen,
+ * Leiserson, and Rivest's Introduction to Algorithms. The running time of
+ * this algorithm is O(n log n), where n is the number of input points.
+ *
+ * @param vertices [[x1, y1], [x2, y2], …]
+ * @returns polygon [[x1, y1], [x2, y2], …]
+ */
+d3.geom.hull = function(vertices) {
+  var x = d3_geom_pointX,
+      y = d3_geom_pointY;
+
+  if (arguments.length) return hull(vertices);
+
+  function hull(data) {
+    if (data.length < 3) return [];
+
+    var fx = d3_functor(x),
+        fy = d3_functor(y),
+        n = data.length,
+        vertices, // TODO use parallel arrays
+        plen = n - 1,
+        points = [],
+        stack = [],
+        d,
+        i, j, h = 0, x1, y1, x2, y2, u, v, a, sp;
+
+    if (fx === d3_geom_pointX && y === d3_geom_pointY) vertices = data;
+    else for (i = 0, vertices = []; i < n; ++i) {
+      vertices.push([+fx.call(this, d = data[i], i), +fy.call(this, d, i)]);
+    }
+
+    // find the starting ref point: leftmost point with the minimum y coord
+    for (i = 1; i < n; ++i) {
+      if (vertices[i][1] < vertices[h][1]
+          || vertices[i][1] == vertices[h][1]
+          && vertices[i][0] < vertices[h][0]) h = i;
+    }
+
+    // calculate polar angles from ref point and sort
+    for (i = 0; i < n; ++i) {
+      if (i === h) continue;
+      y1 = vertices[i][1] - vertices[h][1];
+      x1 = vertices[i][0] - vertices[h][0];
+      points.push({angle: Math.atan2(y1, x1), index: i});
+    }
+    points.sort(function(a, b) { return a.angle - b.angle; });
+
+    // toss out duplicate angles
+    a = points[0].angle;
+    v = points[0].index;
+    u = 0;
+    for (i = 1; i < plen; ++i) {
+      j = points[i].index;
+      if (a == points[i].angle) {
+        // keep angle for point most distant from the reference
+        x1 = vertices[v][0] - vertices[h][0];
+        y1 = vertices[v][1] - vertices[h][1];
+        x2 = vertices[j][0] - vertices[h][0];
+        y2 = vertices[j][1] - vertices[h][1];
+        if (x1 * x1 + y1 * y1 >= x2 * x2 + y2 * y2) {
+          points[i].index = -1;
+          continue;
+        } else {
+          points[u].index = -1;
+        }
+      }
+      a = points[i].angle;
+      u = i;
+      v = j;
+    }
+
+    // initialize the stack
+    stack.push(h);
+    for (i = 0, j = 0; i < 2; ++j) {
+      if (points[j].index > -1) {
+        stack.push(points[j].index);
+        i++;
+      }
+    }
+    sp = stack.length;
+
+    // do graham's scan
+    for (; j < plen; ++j) {
+      if (points[j].index < 0) continue; // skip tossed out points
+      while (!d3_geom_hullCCW(stack[sp - 2], stack[sp - 1], points[j].index, vertices)) {
+        --sp;
+      }
+      stack[sp++] = points[j].index;
+    }
+
+    // construct the hull
+    var poly = [];
+    for (i = sp - 1; i >= 0; --i) poly.push(data[stack[i]]);
+    return poly;
+  }
+
+  hull.x = function(_) {
+    return arguments.length ? (x = _, hull) : x;
+  };
+
+  hull.y = function(_) {
+    return arguments.length ? (y = _, hull) : y;
+  };
+
+  return hull;
+};
+
+// are three points in counter-clockwise order?
+function d3_geom_hullCCW(i1, i2, i3, v) {
+  var t, a, b, c, d, e, f;
+  t = v[i1]; a = t[0]; b = t[1];
+  t = v[i2]; c = t[0]; d = t[1];
+  t = v[i3]; e = t[0]; f = t[1];
+  return (f - b) * (c - a) - (d - b) * (e - a) > 0;
+}
 
 var d3_ease_default = function() { return d3_identity; };
 
@@ -4995,7 +5143,7 @@ function d3_rgb_parse(format, rgb, hsl) {
       b = 0, // blue channel; int in [0, 255]
       m1, // CSS color specification match
       m2, // CSS color specification type (e.g., rgb)
-      name;
+      color;
 
   /* Handle hsl, rgb. */
   m1 = /([a-z]+)\((.*)\)/i.exec(format);
@@ -5020,22 +5168,19 @@ function d3_rgb_parse(format, rgb, hsl) {
   }
 
   /* Named colors. */
-  if (name = d3_rgb_names.get(format)) return rgb(name.r, name.g, name.b);
+  if (color = d3_rgb_names.get(format)) return rgb(color.r, color.g, color.b);
 
   /* Hexadecimal colors: #rgb and #rrggbb. */
-  if (format != null && format.charAt(0) === "#") {
+  if (format != null && format.charAt(0) === "#" && !isNaN(color = parseInt(format.substring(1), 16))) {
     if (format.length === 4) {
-      r = format.charAt(1); r += r;
-      g = format.charAt(2); g += g;
-      b = format.charAt(3); b += b;
+      r = (color & 0xf00) >> 4; r = (r >> 4) | r;
+      g = (color & 0xf0); g = (g >> 4) | g;
+      b = (color & 0xf); b = (b << 4) | b;
     } else if (format.length === 7) {
-      r = format.substring(1, 3);
-      g = format.substring(3, 5);
-      b = format.substring(5, 7);
+      r = (color & 0xff0000) >> 16;
+      g = (color & 0xff00) >> 8;
+      b = (color & 0xff);
     }
-    r = parseInt(r, 16);
-    g = parseInt(g, 16);
-    b = parseInt(b, 16);
   }
 
   return rgb(r, g, b);
@@ -5304,89 +5449,55 @@ function d3_interpolateNumber(a, b) {
 d3.interpolateString = d3_interpolateString;
 
 function d3_interpolateString(a, b) {
-  var m, // current match
-      i, // current index
-      j, // current index (for coalescing)
-      s0 = 0, // start index of current string prefix
-      s1 = 0, // end index of current string prefix
+  var bi = d3_interpolate_numberA.lastIndex = d3_interpolate_numberB.lastIndex = 0, // scan index for next number in b
+      am, // current match in a
+      bm, // current match in b
+      bs, // string preceding current number in b, if any
+      i = -1, // index in s
       s = [], // string constants and placeholders
-      q = [], // number interpolators
-      n, // q.length
-      o;
+      q = []; // number interpolators
 
   // Coerce inputs to strings.
   a = a + "", b = b + "";
 
-  // Reset our regular expression!
-  d3_interpolate_number.lastIndex = 0;
-
-  // Find all numbers in b.
-  for (i = 0; m = d3_interpolate_number.exec(b); ++i) {
-    if (m.index) s.push(b.substring(s0, s1 = m.index));
-    q.push({i: s.length, x: m[0]});
-    s.push(null);
-    s0 = d3_interpolate_number.lastIndex;
-  }
-  if (s0 < b.length) s.push(b.substring(s0));
-
-  // Find all numbers in a.
-  for (i = 0, n = q.length; (m = d3_interpolate_number.exec(a)) && i < n; ++i) {
-    o = q[i];
-    if (o.x == m[0]) { // The numbers match, so coalesce.
-      if (o.i) {
-        if (s[o.i + 1] == null) { // This match is followed by another number.
-          s[o.i - 1] += o.x;
-          s.splice(o.i, 1);
-          for (j = i + 1; j < n; ++j) q[j].i--;
-        } else { // This match is followed by a string, so coalesce twice.
-          s[o.i - 1] += o.x + s[o.i + 1];
-          s.splice(o.i, 2);
-          for (j = i + 1; j < n; ++j) q[j].i -= 2;
-        }
-      } else {
-          if (s[o.i + 1] == null) { // This match is followed by another number.
-          s[o.i] = o.x;
-        } else { // This match is followed by a string, so coalesce twice.
-          s[o.i] = o.x + s[o.i + 1];
-          s.splice(o.i + 1, 1);
-          for (j = i + 1; j < n; ++j) q[j].i--;
-        }
-      }
-      q.splice(i, 1);
-      n--;
-      i--;
-    } else {
-      o.x = d3_interpolateNumber(parseFloat(m[0]), parseFloat(o.x));
-    }
+  // Interpolate pairs of numbers in a & b.
+  while ((am = d3_interpolate_numberA.exec(a))
+      && (bm = d3_interpolate_numberB.exec(b))) {
+    if ((bs = bm.index) > bi) { // a string precedes the next number in b
+      bs = b.substring(bi, bs);
+      if (s[i]) s[i] += bs; // coalesce with previous string
+      else s[++i] = bs;
+    }
+    if ((am = am[0]) === (bm = bm[0])) { // numbers in a & b match
+      if (s[i]) s[i] += bm; // coalesce with previous string
+      else s[++i] = bm;
+    } else { // interpolate non-matching numbers
+      s[++i] = null;
+      q.push({i: i, x: d3_interpolateNumber(am, bm)});
+    }
+    bi = d3_interpolate_numberB.lastIndex;
   }
 
-  // Remove any numbers in b not found in a.
-  while (i < n) {
-    o = q.pop();
-    if (s[o.i + 1] == null) { // This match is followed by another number.
-      s[o.i] = o.x;
-    } else { // This match is followed by a string, so coalesce twice.
-      s[o.i] = o.x + s[o.i + 1];
-      s.splice(o.i + 1, 1);
-    }
-    n--;
+  // Add remains of b.
+  if (bi < b.length) {
+    bs = b.substring(bi);
+    if (s[i]) s[i] += bs; // coalesce with previous string
+    else s[++i] = bs;
   }
 
   // Special optimization for only a single match.
-  if (s.length === 1) {
-    return s[0] == null
-        ? (o = q[0].x, function(t) { return o(t) + ""; })
-        : function() { return b; };
-  }
-
   // Otherwise, interpolate each of the numbers and rejoin the string.
-  return function(t) {
-    for (i = 0; i < n; ++i) s[(o = q[i]).i] = o.x(t);
-    return s.join("");
-  };
+  return s.length < 2
+      ? (q[0] ? (b = q[0].x, function(t) { return b(t) + ""; })
+      : function() { return b; })
+      : (b = q.length, function(t) {
+          for (var i = 0, o; i < b; ++i) s[(o = q[i]).i] = o.x(t);
+          return s.join("");
+        });
 }
 
-var d3_interpolate_number = /[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g;
+var d3_interpolate_numberA = /[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g,
+    d3_interpolate_numberB = new RegExp(d3_interpolate_numberA.source, "g");
 
 d3.interpolate = d3_interpolate;
 
@@ -5401,7 +5512,8 @@ d3.interpolators = [
     var t = typeof b;
     return (t === "string" ? (d3_rgb_names.has(b) || /^(#|rgb\(|hsl\()/.test(b) ? d3_interpolateRgb : d3_interpolateString)
         : b instanceof d3_Color ? d3_interpolateRgb
-        : t === "object" ? (Array.isArray(b) ? d3_interpolateArray : d3_interpolateObject)
+        : Array.isArray(b) ? d3_interpolateArray
+        : t === "object" && isNaN(b) ? d3_interpolateObject
         : d3_interpolateNumber)(a, b);
   }
 ];
@@ -5664,6 +5776,7 @@ d3_transitionPrototype.ease = function(value) {
 
 d3_transitionPrototype.delay = function(value) {
   var id = this.id;
+  if (arguments.length < 1) return this.node().__transition__[id].delay;
   return d3_selection_each(this, typeof value === "function"
       ? function(node, i, j) { node.__transition__[id].delay = +value.call(node, node.__data__, i, j); }
       : (value = +value, function(node) { node.__transition__[id].delay = value; }));
@@ -5671,6 +5784,7 @@ d3_transitionPrototype.delay = function(value) {
 
 d3_transitionPrototype.duration = function(value) {
   var id = this.id;
+  if (arguments.length < 1) return this.node().__transition__[id].duration;
   return d3_selection_each(this, typeof value === "function"
       ? function(node, i, j) { node.__transition__[id].duration = Math.max(1, value.call(node, node.__data__, i, j)); }
       : (value = Math.max(1, value), function(node) { node.__transition__[id].duration = value; }));
@@ -5932,8 +6046,14 @@ function d3_html(request) {
 d3.xml = d3_xhrType(function(request) {
   return request.responseXML;
 });
-  return d3;
-})();
+  if (typeof define === "function" && define.amd) {
+    define(d3);
+  } else if (typeof module === "object" && module.exports) {
+    module.exports = d3;
+  } else {
+    this.d3 = d3;
+  }
+}();
 d3.combobox = function() {
     var event = d3.dispatch('accept'),
         data = [],
@@ -16151,7 +16271,7 @@ window.iD = function () {
     return d3.rebind(context, dispatch, 'on');
 };
 
-iD.version = '1.3.9';
+iD.version = '1.3.10';
 
 (function() {
     var detected = {};
@@ -16622,6 +16742,13 @@ iD.geo.interp = function(p1, p2, t) {
             p1[1] + (p2[1] - p1[1]) * t];
 };
 
+// 2D cross product of OA and OB vectors, i.e. z-component of their 3D cross product.
+// Returns a positive value, if OAB makes a counter-clockwise turn,
+// negative for clockwise turn, and zero if the points are collinear.
+iD.geo.cross = function(o, a, b) {
+    return (a[0] - o[0]) * (b[1] - o[1]) - (a[1] - o[1]) * (b[0] - o[0]);
+};
+
 // http://jsperf.com/id-dist-optimization
 iD.geo.euclideanDistance = function(a, b) {
     var x = a[0] - b[0], y = a[1] - b[1];
@@ -17092,12 +17219,17 @@ iD.actions.Circularize = function(wayId, projection, maxAngle) {
     maxAngle = (maxAngle || 20) * Math.PI / 180;
 
     var action = function(graph) {
-        var way = graph.entity(wayId),
-            nodes = _.uniq(graph.childNodes(way)),
+        var way = graph.entity(wayId);
+
+        if (!way.isConvex(graph)) {
+            graph = action.makeConvex(graph);
+        }
+
+        var nodes = _.uniq(graph.childNodes(way)),
             keyNodes = nodes.filter(function(n) { return graph.parentWays(n).length !== 1; }),
             points = nodes.map(function(n) { return projection(n.loc); }),
             keyPoints = keyNodes.map(function(n) { return projection(n.loc); }),
-            centroid = d3.geom.polygon(points).centroid(),
+            centroid = (points.length === 2) ? iD.geo.interp(points[0], points[1], 0.5) : d3.geom.polygon(points).centroid(),
             radius = d3.median(points, function(p) { return iD.geo.euclideanDistance(centroid, p); }),
             sign = d3.geom.polygon(points).area() > 0 ? 1 : -1,
             ids;
@@ -17118,16 +17250,19 @@ iD.actions.Circularize = function(wayId, projection, maxAngle) {
 
         // key points and nodes are those connected to the ways,
         // they are projected onto the circle, inbetween nodes are moved
-        // to constant internals between key nodes, extra inbetween nodes are
+        // to constant intervals between key nodes, extra inbetween nodes are
         // added if necessary.
         for (var i = 0; i < keyPoints.length; i++) {
             var nextKeyNodeIndex = (i + 1) % keyNodes.length,
-                startNodeIndex = nodes.indexOf(keyNodes[i]),
-                endNodeIndex = nodes.indexOf(keyNodes[nextKeyNodeIndex]),
+                startNode = keyNodes[i],
+                endNode = keyNodes[nextKeyNodeIndex],
+                startNodeIndex = nodes.indexOf(startNode),
+                endNodeIndex = nodes.indexOf(endNode),
                 numberNewPoints = -1,
                 indexRange = endNodeIndex - startNodeIndex,
                 distance, totalAngle, eachAngle, startAngle, endAngle,
-                angle, loc, node, j;
+                angle, loc, node, j,
+                inBetweenNodes = [];
 
             if (indexRange < 0) {
                 indexRange += nodes.length;
@@ -17135,6 +17270,7 @@ iD.actions.Circularize = function(wayId, projection, maxAngle) {
 
             // position this key node
             distance = iD.geo.euclideanDistance(centroid, keyPoints[i]);
+            if (distance === 0) { distance = 1e-4; }
             keyPoints[i] = [
                 centroid[0] + (keyPoints[i][0] - centroid[0]) / distance * radius,
                 centroid[1] + (keyPoints[i][1] - centroid[1]) / distance * radius];
@@ -17146,7 +17282,7 @@ iD.actions.Circularize = function(wayId, projection, maxAngle) {
             totalAngle = endAngle - startAngle;
 
             // detects looping around -pi/pi
-            if (totalAngle*sign > 0) {
+            if (totalAngle * sign > 0) {
                 totalAngle = -sign * (2 * Math.PI - Math.abs(totalAngle));
             }
 
@@ -17177,7 +17313,40 @@ iD.actions.Circularize = function(wayId, projection, maxAngle) {
                 graph = graph.replace(node);
 
                 nodes.splice(endNodeIndex + j, 0, node);
+                inBetweenNodes.push(node.id);
             }
+
+            // Check for other ways that share these keyNodes..
+            // If keyNodes are adjacent in both ways,
+            // we can add inBetween nodes to that shared way too..
+            if (indexRange === 1 && inBetweenNodes.length) {
+                var startIndex1 = way.nodes.lastIndexOf(startNode.id),
+                    endIndex1 = way.nodes.lastIndexOf(endNode.id),
+                    wayDirection1 = (endIndex1 - startIndex1);
+                if (wayDirection1 < -1) { wayDirection1 = 1;}
+
+                /*jshint -W083 */
+                _.each(_.without(graph.parentWays(keyNodes[i]), way), function(sharedWay) {
+                    if (sharedWay.areAdjacent(startNode.id, endNode.id)) {
+                        var startIndex2 = sharedWay.nodes.lastIndexOf(startNode.id),
+                            endIndex2 = sharedWay.nodes.lastIndexOf(endNode.id),
+                            wayDirection2 = (endIndex2 - startIndex2),
+                            insertAt = endIndex2;
+                        if (wayDirection2 < -1) { wayDirection2 = 1;}
+
+                        if (wayDirection1 !== wayDirection2) {
+                            inBetweenNodes.reverse();
+                            insertAt = startIndex2;
+                        }
+                        for (j = 0; j < inBetweenNodes.length; j++) {
+                            sharedWay = sharedWay.addNode(inBetweenNodes[j], insertAt + j);
+                        }
+                        graph = graph.replace(sharedWay);
+                    }
+                });
+                /*jshint +W083 */
+            }
+
         }
 
         // update the way to have all the new nodes
@@ -17190,6 +17359,38 @@ iD.actions.Circularize = function(wayId, projection, maxAngle) {
         return graph;
     };
 
+    action.makeConvex = function(graph) {
+        var way = graph.entity(wayId),
+            nodes = _.uniq(graph.childNodes(way)),
+            points = nodes.map(function(n) { return projection(n.loc); }),
+            sign = d3.geom.polygon(points).area() > 0 ? 1 : -1,
+            hull = d3.geom.hull(points);
+
+        // D3 convex hulls go counterclockwise..
+        if (sign === -1) {
+            nodes.reverse();
+            points.reverse();
+        }
+
+        for (var i = 0; i < hull.length - 1; i++) {
+            var startIndex = points.indexOf(hull[i]),
+                endIndex = points.indexOf(hull[i+1]),
+                indexRange = (endIndex - startIndex);
+
+            if (indexRange < 0) {
+                indexRange += nodes.length;
+            }
+
+            // move interior nodes to the surface of the convex hull..
+            for (var j = 1; j < indexRange; j++) {
+                var point = iD.geo.interp(hull[i], hull[i+1], j / indexRange),
+                    node = nodes[(j + startIndex) % nodes.length].move(projection.invert(point));
+                graph = graph.replace(node);
+            }
+        }
+        return graph;
+    };
+
     action.disabled = function(graph) {
         if (!graph.entity(wayId).isClosed())
             return 'not_closed';
@@ -20371,8 +20572,10 @@ iD.operations.Circularize = function(selectedIDs, context) {
     };
 
     operation.available = function() {
+        var entity = context.entity(entityId);
         return selectedIDs.length === 1 &&
-            context.entity(entityId).type === 'way';
+            entity.type === 'way' &&
+            _.uniq(entity.nodes).length > 1;
     };
 
     operation.disabled = function() {
@@ -20850,6 +21053,7 @@ iD.areaKeys = {
         "bench": true,
         "clock": true,
         "drinking_water": true,
+        "parking_entrance": true,
         "post_box": true,
         "telephone": true,
         "vending_machine": true,
@@ -22677,11 +22881,15 @@ _.extend(iD.Way.prototype, {
     },
 
     isOneWay: function() {
-        return this.tags.oneway === 'yes' ||
-            this.tags.oneway === '1' ||
-            this.tags.oneway === '-1' ||
-            this.tags.waterway === 'river' ||
+        // explicit oneway tag..
+        if (['yes', '1', '-1'].indexOf(this.tags.oneway) !== -1) { return true; }
+        if (['no', '0'].indexOf(this.tags.oneway) !== -1) { return false; }
+
+        // implied oneway tag..
+        return this.tags.waterway === 'river' ||
             this.tags.waterway === 'stream' ||
+            this.tags.highway === 'motorway' ||
+            this.tags.highway === 'motorway_link' ||
             this.tags.junction === 'roundabout';
     },
 
@@ -22689,6 +22897,30 @@ _.extend(iD.Way.prototype, {
         return this.nodes.length > 0 && this.first() === this.last();
     },
 
+    isConvex: function(resolver) {
+        if (!this.isClosed() || this.isDegenerate()) return null;
+
+        var nodes = _.uniq(resolver.childNodes(this)),
+            coords = _.pluck(nodes, 'loc'),
+            curr = 0, prev = 0;
+
+        for (var i = 0; i < coords.length; i++) {
+            var o = coords[(i+1) % coords.length],
+                a = coords[i],
+                b = coords[(i+2) % coords.length],
+                res = iD.geo.cross(o, a, b);
+
+            curr = (res > 0) ? 1 : (res < 0) ? -1 : 0;
+            if (curr === 0) {
+                continue;
+            } else if (prev && curr !== prev) {
+                return false;
+            }
+            prev = curr;
+        }
+        return true;
+    },
+
     isArea: function() {
         if (this.tags.area === 'yes')
             return true;
@@ -24008,6 +24240,7 @@ iD.svg.Areas = function(projection) {
         beach: 'beach',
         scrub: 'scrub',
         construction: 'construction',
+        military: 'construction',
         cemetery: 'cemetery',
         grave_yard: 'cemetery',
         meadow: 'meadow',
@@ -24979,12 +25212,12 @@ iD.svg.Surface = function(context) {
 };
 iD.svg.TagClasses = function() {
     var primary = [
-            'highway', 'railway', 'waterway', 'aeroway', 'motorway',
-            'boundary', 'power', 'amenity', 'natural', 'landuse',
-            'building', 'leisure', 'place'
+            'building', 'highway', 'railway', 'waterway', 'aeroway',
+            'motorway', 'boundary', 'power', 'amenity', 'natural', 'landuse',
+            'leisure', 'place'
         ],
         secondary = [
-            'oneway', 'bridge', 'tunnel', 'construction'
+            'oneway', 'bridge', 'tunnel', 'construction', 'embankment', 'cutting'
         ],
         tagClassRe = /^tag-/,
         tags = function(entity) { return entity.tags; };
@@ -25511,7 +25744,7 @@ iD.ui.Background = function(context) {
             ['bottom', [0, 1]]],
         opacityDefault = (context.storage('background-opacity') !== null) ?
             (+context.storage('background-opacity')) : 0.5,
-        customTemplate;
+        customTemplate = '';
 
     // Can be 0 from <1.3.0 use or due to issue #1923.
     if (opacityDefault === 0) opacityDefault = 0.5;
@@ -27498,7 +27731,7 @@ iD.ui.preset = function(context) {
                 return field.present();
             })
             .each(function(field) {
-                var reference = iD.ui.TagReference({key: field.key});
+                var reference = iD.ui.TagReference(field.reference || {key: field.key});
 
                 if (state === 'hover') {
                     reference.showing(false);
@@ -27605,7 +27838,7 @@ iD.ui.PresetIcon = function() {
         $fill.enter().append('div');
 
         $fill.attr('class', function() {
-            var s = 'preset-icon-fill icon-' + geom;
+            var s = 'preset-icon-fill preset-icon-fill-' + geom;
             for (var i in p.tags) {
                 s += ' tag-' + i + ' tag-' + i + '-' + p.tags[i];
             }
@@ -28503,10 +28736,22 @@ iD.ui.RawTagEditor = function(context) {
         }
 
         function keyChange(d) {
-            var tag = {};
-            tag[d.key] = undefined;
-            tag[this.value] = d.value;
-            d.key = this.value; // Maintain DOM identity through the subsequent update.
+            var kOld = d.key,
+                kNew = this.value.trim(),
+                tag = {};
+
+            if (kNew && kNew !== kOld) {
+                var match = kNew.match(/^(.*?)(?:_(\d+))?$/),
+                    base = match[1],
+                    suffix = +(match[2] || 1);
+                while (tags[kNew]) {  // rename key if already in use
+                    kNew = base + '_' + suffix++;
+                }
+            }
+            tag[kOld] = undefined;
+            tag[kNew] = d.value;
+            d.key = kNew; // Maintain DOM identity through the subsequent update.
+            this.value = kNew;
             event.change(tag);
         }
 
@@ -29369,10 +29614,11 @@ iD.ui.preset.access = function(field) {
     }
 
     access.options = function(type) {
-        var options = ['no', 'permissive', 'private', 'designated', 'destination'];
+        var options = ['no', 'permissive', 'private', 'destination'];
 
         if (type !== 'access') {
             options.unshift('yes');
+            options.push('designated');
         }
 
         return options.map(function(option) {
@@ -29385,65 +29631,104 @@ iD.ui.preset.access = function(field) {
 
     var placeholders = {
         footway: {
-            foot: 'yes',
+            foot: 'designated',
             motor_vehicle: 'no'
         },
         steps: {
             foot: 'yes',
-            motor_vehicle: 'no'
+            motor_vehicle: 'no',
+            bicycle: 'no',
+            horse: 'no'
         },
         pedestrian: {
             foot: 'yes',
             motor_vehicle: 'no'
         },
         cycleway: {
-            bicycle: 'yes',
-            motor_vehicle: 'no'
+            motor_vehicle: 'no',
+            bicycle: 'designated'
         },
         bridleway: {
-            horse: 'yes'
+            motor_vehicle: 'no',
+            horse: 'designated'
         },
         path: {
-            motor_vehicle: 'no'
+            foot: 'yes',
+            motor_vehicle: 'no',
+            bicycle: 'yes',
+            horse: 'yes'
         },
         motorway: {
-            motor_vehicle: 'yes'
+            foot: 'no',
+            motor_vehicle: 'yes',
+            bicycle: 'no',
+            horse: 'no'
         },
         trunk: {
             motor_vehicle: 'yes'
         },
         primary: {
-            motor_vehicle: 'yes'
+            foot: 'yes',
+            motor_vehicle: 'yes',
+            bicycle: 'yes',
+            horse: 'yes'
         },
         secondary: {
-            motor_vehicle: 'yes'
+            foot: 'yes',
+            motor_vehicle: 'yes',
+            bicycle: 'yes',
+            horse: 'yes'
         },
         tertiary: {
-            motor_vehicle: 'yes'
+            foot: 'yes',
+            motor_vehicle: 'yes',
+            bicycle: 'yes',
+            horse: 'yes'
         },
         residential: {
-            motor_vehicle: 'yes'
+            foot: 'yes',
+            motor_vehicle: 'yes',
+            bicycle: 'yes',
+            horse: 'yes'
         },
         unclassified: {
-            motor_vehicle: 'yes'
+            foot: 'yes',
+            motor_vehicle: 'yes',
+            bicycle: 'yes',
+            horse: 'yes'
         },
         service: {
-            motor_vehicle: 'yes'
+            foot: 'yes',
+            motor_vehicle: 'yes',
+            bicycle: 'yes',
+            horse: 'yes'
         },
         motorway_link: {
-            motor_vehicle: 'yes'
+            foot: 'no',
+            motor_vehicle: 'yes',
+            bicycle: 'no',
+            horse: 'no'
         },
         trunk_link: {
             motor_vehicle: 'yes'
         },
         primary_link: {
-            motor_vehicle: 'yes'
+            foot: 'yes',
+            motor_vehicle: 'yes',
+            bicycle: 'yes',
+            horse: 'yes'
         },
         secondary_link: {
-            motor_vehicle: 'yes'
+            foot: 'yes',
+            motor_vehicle: 'yes',
+            bicycle: 'yes',
+            horse: 'yes'
         },
         tertiary_link: {
-            motor_vehicle: 'yes'
+            foot: 'yes',
+            motor_vehicle: 'yes',
+            bicycle: 'yes',
+            horse: 'yes'
         }
     };
 
@@ -29459,7 +29744,9 @@ iD.ui.preset.access = function(field) {
 
         _.forEach(placeholders[tags.highway], function(value, key) {
             items.selectAll('#preset-input-access-' + key)
-                .attr('placeholder', value);
+                .attr('placeholder', function() {
+                    return (tags.access && (value === 'yes' || value === 'designated')) ? tags.access : value;
+                });
         });
     };
 
@@ -29647,9 +29934,12 @@ iD.ui.preset.address = function(field, context) {
 
     return d3.rebind(address, event, 'on');
 };
-iD.ui.preset.check = function(field) {
+iD.ui.preset.check =
+iD.ui.preset.defaultcheck = function(field) {
     var event = d3.dispatch('change'),
-        values = [undefined, 'yes', 'no'],
+        values = field.type === 'check' ?
+            [undefined, 'yes', 'no'] :
+            [undefined, 'yes'],
         value,
         box,
         text,
@@ -29665,7 +29955,7 @@ iD.ui.preset.check = function(field) {
             .attr('class', 'preset-input-wrap');
 
         enter.append('input')
-            .property('indeterminate', true)
+            .property('indeterminate', field.type === 'check')
             .attr('type', 'checkbox')
             .attr('id', 'preset-input-' + field.id);
 
@@ -29676,7 +29966,7 @@ iD.ui.preset.check = function(field) {
         box = label.select('input')
             .on('click', function() {
                 var t = {};
-                t[field.key] = values[(values.indexOf(value) + 1) % 3];
+                t[field.key] = values[(values.indexOf(value) + 1) % values.length];
                 event.change(t);
                 d3.event.stopPropagation();
             });
@@ -29686,9 +29976,10 @@ iD.ui.preset.check = function(field) {
 
     check.tags = function(tags) {
         value = tags[field.key];
-        box.property('indeterminate', !value);
+        box.property('indeterminate', field.type === 'check' && !value);
         box.property('checked', value === 'yes');
-        text.text(value ? t('inspector.check.' + value, {default: value}) : t('inspector.unknown'));
+        text.text(value ? t('inspector.check.' + value, {default: value}) :
+            field.type === 'check' ? t('inspector.unknown') : t('inspector.check.no'));
         label.classed('set', !!value);
     };
 
@@ -29764,36 +30055,6 @@ iD.ui.preset.typeCombo = function(field) {
 
     return d3.rebind(combo, event, 'on');
 };
-iD.ui.preset.defaultcheck = function(field) {
-    var event = d3.dispatch('change'),
-        input;
-
-    function check(selection) {
-        input = selection.selectAll('input')
-            .data([0]);
-
-        input.enter().append('input')
-            .attr('type', 'checkbox')
-            .attr('id', 'preset-input-' + field.id);
-
-        input
-            .on('change', function() {
-                var t = {};
-                t[field.key] = input.property('checked') ? field.value || 'yes' : undefined;
-                event.change(t);
-            });
-    }
-
-    check.tags = function(tags) {
-        input.property('checked', !!tags[field.key] && tags[field.key] !== 'no');
-    };
-
-    check.focus = function() {
-        input.node().focus();
-    };
-
-    return d3.rebind(check, event, 'on');
-};
 iD.ui.preset.text =
 iD.ui.preset.number =
 iD.ui.preset.tel =
@@ -38283,6 +38544,42 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "terms_url": "http://geo.nls.uk/maps/",
             "terms_text": "National Library of Scotland Historic Maps"
         },
+        {
+            "name": "Ireland British War Office 1:25k GSGS 3906",
+            "type": "tms",
+            "template": "http://mapwarper.net/layers/tile/101/{zoom}/{x}/{y}.png",
+            "scaleExtent": [
+                0,
+                18
+            ],
+            "polygon": [
+                [
+                    [
+                        -10.71,
+                        51.32
+                    ],
+                    [
+                        -10.71,
+                        55.46
+                    ],
+                    [
+                        -5.37,
+                        55.46
+                    ],
+                    [
+                        -5.37,
+                        51.32
+                    ],
+                    [
+                        -10.71,
+                        51.32
+                    ]
+                ]
+            ],
+            "terms_url": "http://wiki.openstreetmap.org/wiki/WikiProject_Ireland#Trinity_College_Dublin",
+            "terms_text": "Glucksman Map Library, Trinity College Dublin",
+            "id": "GSGS3906"
+        },
         {
             "name": "Ireland British War Office One-Inch 1941-43 GSGS 4136",
             "type": "tms",
@@ -38512,7 +38809,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ]
             ],
             "terms_url": "http://geo.nls.uk/maps/",
-            "terms_text": "National Library of Scotland Historic Maps"
+            "terms_text": "National Library of Scotland Historic Maps",
+            "id": "GSGS4136"
         },
         {
             "name": "Ireland EEA CORINE 2006",
@@ -62978,7 +63276,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "ref",
-                    "surface"
+                    "surface",
+                    "length",
+                    "width"
                 ],
                 "tags": {
                     "aeroway": "runway"
@@ -63259,6 +63559,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "name": "Car Sharing"
             },
             "amenity/car_wash": {
+                "icon": "car",
                 "geometry": [
                     "point",
                     "area"
@@ -63271,6 +63572,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "name": "Car Wash"
             },
+            "amenity/charging_station": {
+                "icon": "car",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "amenity": "charging_station"
+                },
+                "fields": [
+                    "operator"
+                ],
+                "terms": [
+                    "EV",
+                    "Electric Vehicle",
+                    "Supercharger"
+                ],
+                "name": "Charging Station"
+            },
             "amenity/childcare": {
                 "icon": "school",
                 "fields": [
@@ -63373,6 +63693,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "terms": [],
                 "name": "College"
             },
+            "amenity/compressed_air": {
+                "icon": "car",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "amenity": "compressed_air"
+                },
+                "name": "Compressed Air"
+            },
             "amenity/courthouse": {
                 "fields": [
                     "operator",
@@ -63676,6 +64007,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "terms": [],
                 "name": "Car Parking"
             },
+            "amenity/parking_entrance": {
+                "icon": "entrance",
+                "geometry": [
+                    "vertex"
+                ],
+                "tags": {
+                    "amenity": "parking_entrance"
+                },
+                "fields": [
+                    "access_simple",
+                    "ref"
+                ],
+                "name": "Parking Garage Entrance/Exit"
+            },
             "amenity/pharmacy": {
                 "icon": "pharmacy",
                 "fields": [
@@ -64632,8 +64977,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "building",
                     "levels",
-                    "address",
-                    "smoking"
+                    "address"
                 ],
                 "geometry": [
                     "area"
@@ -64829,7 +65173,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "tags": {
                     "building": "entrance"
                 },
-                "name": "Entrance",
+                "name": "Entrance/Exit",
                 "searchable": false
             },
             "building/garage": {
@@ -66154,7 +66498,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "access_simple",
                     "address"
                 ],
-                "name": "Entrance"
+                "name": "Entrance/Exit"
             },
             "footway/crossing": {
                 "fields": [
@@ -66179,6 +66523,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "surface",
                     "lit",
+                    "width",
+                    "structure",
                     "access"
                 ],
                 "geometry": [
@@ -66191,6 +66537,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "terms": [],
                 "name": "Sidewalk"
             },
+            "ford": {
+                "geometry": [
+                    "vertex"
+                ],
+                "tags": {
+                    "ford": "yes"
+                },
+                "name": "Ford"
+            },
             "golf/bunker": {
                 "icon": "golf",
                 "geometry": [
@@ -66314,9 +66669,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "highway/bridleway": {
                 "fields": [
-                    "access",
                     "surface",
-                    "structure"
+                    "width",
+                    "structure",
+                    "access"
                 ],
                 "icon": "highway-bridleway",
                 "geometry": [
@@ -66352,7 +66708,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "highway/crossing": {
                 "fields": [
-                    "crossing"
+                    "crossing",
+                    "sloped_curb",
+                    "tactile_paving"
                 ],
                 "geometry": [
                     "vertex"
@@ -66371,9 +66729,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "surface",
                     "lit",
+                    "width",
+                    "oneway",
                     "structure",
-                    "access",
-                    "oneway"
+                    "access"
                 ],
                 "geometry": [
                     "line"
@@ -66387,9 +66746,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "highway/footway": {
                 "icon": "highway-footway",
                 "fields": [
+                    "surface",
+                    "lit",
+                    "width",
                     "structure",
-                    "access",
-                    "surface"
+                    "access"
                 ],
                 "geometry": [
                     "line",
@@ -66513,10 +66874,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "highway/path": {
                 "icon": "highway-path",
                 "fields": [
+                    "surface",
+                    "width",
                     "structure",
                     "access",
                     "sac_scale",
-                    "surface",
                     "incline",
                     "trail_visibility",
                     "ref"
@@ -66532,9 +66894,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "highway/pedestrian": {
                 "fields": [
-                    "access",
+                    "surface",
+                    "lit",
+                    "width",
                     "oneway",
-                    "surface"
+                    "structure",
+                    "access"
                 ],
                 "geometry": [
                     "line",
@@ -66801,8 +67166,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "highway/steps": {
                 "fields": [
-                    "access",
-                    "surface"
+                    "surface",
+                    "lit",
+                    "width",
+                    "access"
                 ],
                 "icon": "highway-steps",
                 "geometry": [
@@ -67133,7 +67500,22 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "terms": [],
                 "name": "Cemetery"
             },
+            "landuse/churchyard": {
+                "fields": [
+                    "religion",
+                    "denomination"
+                ],
+                "geometry": [
+                    "area"
+                ],
+                "tags": {
+                    "landuse": "churchyard"
+                },
+                "terms": [],
+                "name": "Churchyard"
+            },
             "landuse/commercial": {
+                "icon": "commercial",
                 "geometry": [
                     "point",
                     "area"
@@ -67266,6 +67648,16 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "terms": [],
                 "name": "Meadow"
             },
+            "landuse/military": {
+                "geometry": [
+                    "area"
+                ],
+                "tags": {
+                    "landuse": "military"
+                },
+                "terms": [],
+                "name": "Military"
+            },
             "landuse/orchard": {
                 "fields": [
                     "trees"
@@ -67293,6 +67685,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "name": "Quarry"
             },
             "landuse/residential": {
+                "icon": "building",
                 "geometry": [
                     "point",
                     "area"
@@ -67491,7 +67884,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pitch",
                 "fields": [
                     "sport",
-                    "surface"
+                    "surface",
+                    "lit"
                 ],
                 "geometry": [
                     "point",
@@ -67506,7 +67900,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "leisure/pitch/american_football": {
                 "icon": "america-football",
                 "fields": [
-                    "surface"
+                    "surface",
+                    "lit"
                 ],
                 "geometry": [
                     "point",
@@ -67521,6 +67916,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "leisure/pitch/baseball": {
                 "icon": "baseball",
+                "fields": [
+                    "lit"
+                ],
                 "geometry": [
                     "point",
                     "area"
@@ -67536,7 +67934,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "basketball",
                 "fields": [
                     "surface",
-                    "hoops"
+                    "hoops",
+                    "lit"
                 ],
                 "geometry": [
                     "point",
@@ -67552,7 +67951,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "leisure/pitch/skateboard": {
                 "icon": "pitch",
                 "fields": [
-                    "surface"
+                    "surface",
+                    "lit"
                 ],
                 "geometry": [
                     "point",
@@ -67568,7 +67968,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "leisure/pitch/soccer": {
                 "icon": "soccer",
                 "fields": [
-                    "surface"
+                    "surface",
+                    "lit"
                 ],
                 "geometry": [
                     "point",
@@ -67584,7 +67985,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "leisure/pitch/tennis": {
                 "icon": "tennis",
                 "fields": [
-                    "surface"
+                    "surface",
+                    "lit"
                 ],
                 "geometry": [
                     "point",
@@ -67600,7 +68002,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "leisure/pitch/volleyball": {
                 "icon": "pitch",
                 "fields": [
-                    "surface"
+                    "surface",
+                    "lit"
                 ],
                 "geometry": [
                     "point",
@@ -67683,7 +68086,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "leisure/track": {
                 "icon": "pitch",
                 "fields": [
-                    "surface"
+                    "surface",
+                    "lit",
+                    "width"
                 ],
                 "geometry": [
                     "point",
@@ -68609,6 +69014,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "place/city": {
                 "icon": "city",
+                "fields": [
+                    "population"
+                ],
                 "geometry": [
                     "point",
                     "area"
@@ -68620,6 +69028,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "place/hamlet": {
                 "icon": "triangle-stroked",
+                "fields": [
+                    "population"
+                ],
                 "geometry": [
                     "point",
                     "area"
@@ -68661,6 +69072,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "place/locality": {
                 "icon": "marker",
+                "fields": [
+                    "population"
+                ],
                 "geometry": [
                     "point",
                     "area"
@@ -68672,6 +69086,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "place/neighbourhood": {
                 "icon": "triangle-stroked",
+                "fields": [
+                    "population"
+                ],
                 "geometry": [
                     "point",
                     "area"
@@ -68686,6 +69103,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "place/suburb": {
                 "icon": "triangle-stroked",
+                "fields": [
+                    "population"
+                ],
                 "geometry": [
                     "point",
                     "area"
@@ -68701,6 +69121,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "place/town": {
                 "icon": "town",
+                "fields": [
+                    "population"
+                ],
                 "geometry": [
                     "point",
                     "area"
@@ -68712,6 +69135,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "place/village": {
                 "icon": "village",
+                "fields": [
+                    "population"
+                ],
                 "geometry": [
                     "point",
                     "area"
@@ -69321,7 +69747,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "name": "Car Dealership"
             },
             "shop/car_parts": {
-                "icon": "shop",
+                "icon": "car",
                 "fields": [
                     "address",
                     "building_area",
@@ -69338,7 +69764,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "name": "Car Parts Store"
             },
             "shop/car_repair": {
-                "icon": "shop",
+                "icon": "car",
                 "fields": [
                     "address",
                     "building_area",
@@ -69355,7 +69781,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "name": "Car Repair Shop"
             },
             "shop/chemist": {
-                "icon": "shop",
+                "icon": "chemist",
                 "fields": [
                     "address",
                     "building_area",
@@ -69676,7 +70102,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "name": "Greengrocer"
             },
             "shop/hairdresser": {
-                "icon": "shop",
+                "icon": "hairdresser",
                 "fields": [
                     "address",
                     "building_area",
@@ -69832,7 +70258,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "name": "Mall"
             },
             "shop/mobile_phone": {
-                "icon": "shop",
+                "icon": "mobilephone",
                 "fields": [
                     "address",
                     "building_area",
@@ -69849,7 +70275,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "name": "Mobile Phone Store"
             },
             "shop/motorcycle": {
-                "icon": "shop",
+                "icon": "scooter",
                 "fields": [
                     "address",
                     "building_area",
@@ -70181,6 +70607,26 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "name": "Video Store"
             },
+            "shop/wine": {
+                "icon": "alcohol-shop",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "shop": "wine"
+                },
+                "terms": [
+                    "winery"
+                ],
+                "name": "Wine Shop"
+            },
             "tourism": {
                 "fields": [
                     "tourism"
@@ -70763,6 +71209,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "waterway/canal": {
                 "icon": "waterway-canal",
+                "fields": [
+                    "width"
+                ],
                 "geometry": [
                     "line"
                 ],
@@ -70813,7 +71262,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "waterway/river": {
                 "icon": "waterway-river",
                 "fields": [
-                    "tunnel"
+                    "tunnel",
+                    "width"
                 ],
                 "geometry": [
                     "line"
@@ -70851,7 +71301,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "waterway/stream": {
                 "icon": "waterway-stream",
                 "fields": [
-                    "tunnel"
+                    "tunnel",
+                    "width"
                 ],
                 "geometry": [
                     "line"
@@ -93360,7 +93811,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "chemist"
                 },
                 "name": "Müller",
-                "icon": "shop",
+                "icon": "chemist",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93379,7 +93830,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "chemist"
                 },
                 "name": "Schlecker",
-                "icon": "shop",
+                "icon": "chemist",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93398,7 +93849,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "chemist"
                 },
                 "name": "Etos",
-                "icon": "shop",
+                "icon": "chemist",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93417,7 +93868,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "chemist"
                 },
                 "name": "Bipa",
-                "icon": "shop",
+                "icon": "chemist",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93436,7 +93887,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "chemist"
                 },
                 "name": "Rossmann",
-                "icon": "shop",
+                "icon": "chemist",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93455,7 +93906,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "chemist"
                 },
                 "name": "DM Drogeriemarkt",
-                "icon": "shop",
+                "icon": "chemist",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93474,7 +93925,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "chemist"
                 },
                 "name": "Ihr Platz",
-                "icon": "shop",
+                "icon": "chemist",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93493,7 +93944,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "chemist"
                 },
                 "name": "Douglas",
-                "icon": "shop",
+                "icon": "chemist",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93512,7 +93963,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "chemist"
                 },
                 "name": "Kruidvat",
-                "icon": "shop",
+                "icon": "chemist",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93531,7 +93982,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Peugeot",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93550,7 +94001,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Kwik Fit",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93569,7 +94020,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "ATU",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93588,7 +94039,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Kwik-Fit",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93607,7 +94058,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Midas",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93626,7 +94077,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Feu Vert",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93645,7 +94096,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Norauto",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93664,7 +94115,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Speedy",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93683,7 +94134,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Автозапчасти",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93702,7 +94153,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Renault",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93721,7 +94172,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Pit Stop",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93740,7 +94191,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Jiffy Lube",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93759,7 +94210,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Шиномонтаж",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93778,7 +94229,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "СТО",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93797,7 +94248,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "O'Reilly Auto Parts",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93816,7 +94267,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Carglass",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93835,7 +94286,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "шиномонтаж",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93854,7 +94305,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Citroen",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93873,7 +94324,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Euromaster",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93892,7 +94343,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Firestone",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93911,7 +94362,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "AutoZone",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93930,7 +94381,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Автосервис",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93949,7 +94400,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Advance Auto Parts",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93968,7 +94419,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Roady",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -94927,24 +95378,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/car/Ford": {
-                "tags": {
-                    "name": "Ford",
-                    "shop": "car"
-                },
-                "name": "Ford",
-                "icon": "car",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "address",
-                    "opening_hours"
-                ],
-                "suggestion": true
-            },
             "shop/car/Volkswagen": {
                 "tags": {
                     "name": "Volkswagen",
@@ -98756,7 +99189,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Билайн",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -98775,7 +99208,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "ソフトバンクショップ (SoftBank shop)",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -98794,7 +99227,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Vodafone",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -98813,7 +99246,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "O2",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -98832,7 +99265,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Carphone Warehouse",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -98851,7 +99284,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Orange",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -98870,7 +99303,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Verizon Wireless",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -98889,7 +99322,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Sprint",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -98908,7 +99341,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "T-Mobile",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -98927,7 +99360,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "МТС",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -98946,7 +99379,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Евросеть",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -98965,7 +99398,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Bell",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -98984,7 +99417,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "The Phone House",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99003,7 +99436,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "SFR",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99022,7 +99455,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Связной",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99041,7 +99474,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Мегафон",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99060,7 +99493,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "AT&T",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99079,7 +99512,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "ドコモショップ (docomo shop)",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99098,7 +99531,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "au",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99117,7 +99550,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Movistar",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99136,7 +99569,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Bitė",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99193,7 +99626,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "hairdresser"
                 },
                 "name": "Klier",
-                "icon": "shop",
+                "icon": "hairdresser",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99212,7 +99645,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "hairdresser"
                 },
                 "name": "Supercuts",
-                "icon": "shop",
+                "icon": "hairdresser",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99231,7 +99664,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "hairdresser"
                 },
                 "name": "Hairkiller",
-                "icon": "shop",
+                "icon": "hairdresser",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99250,7 +99683,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "hairdresser"
                 },
                 "name": "Great Clips",
-                "icon": "shop",
+                "icon": "hairdresser",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99269,7 +99702,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "hairdresser"
                 },
                 "name": "Парикмахерская",
-                "icon": "shop",
+                "icon": "hairdresser",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99288,7 +99721,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "hairdresser"
                 },
                 "name": "Стиль",
-                "icon": "shop",
+                "icon": "hairdresser",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99307,7 +99740,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "hairdresser"
                 },
                 "name": "Fryzjer",
-                "icon": "shop",
+                "icon": "hairdresser",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99326,7 +99759,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "hairdresser"
                 },
                 "name": "Franck Provost",
-                "icon": "shop",
+                "icon": "hairdresser",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99345,7 +99778,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "hairdresser"
                 },
                 "name": "Салон красоты",
-                "icon": "shop",
+                "icon": "hairdresser",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99383,7 +99816,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "motorcycle"
                 },
                 "name": "Yamaha",
-                "icon": "shop",
+                "icon": "scooter",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99486,7 +99919,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "landuse/farmyard",
                     "landuse/forest",
                     "landuse/meadow",
-                    "landuse/cemetery"
+                    "landuse/cemetery",
+                    "landuse/military"
                 ]
             },
             "category-path": {
@@ -99589,6 +100023,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "bicycle",
                     "horse"
                 ],
+                "reference": {
+                    "key": "access"
+                },
                 "type": "access",
                 "label": "Access",
                 "placeholder": "Unknown",
@@ -99647,6 +100084,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "addr:city",
                     "addr:postcode"
                 ],
+                "reference": {
+                    "key": "addr"
+                },
                 "icon": "address",
                 "universal": true,
                 "label": "Address",
@@ -99769,7 +100209,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "building_area": {
                 "key": "building",
-                "type": "check",
+                "type": "defaultcheck",
                 "default": "yes",
                 "geometry": "area",
                 "label": "Building"
@@ -99928,6 +100368,51 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "type": "combo",
                 "label": "Fuel"
             },
+            "fuel/biodiesel": {
+                "key": "fuel:biodiesel",
+                "type": "check",
+                "label": "Sells Biodiesel"
+            },
+            "fuel/diesel": {
+                "key": "fuel:diesel",
+                "type": "check",
+                "label": "Sells Diesel"
+            },
+            "fuel/e10": {
+                "key": "fuel:e10",
+                "type": "check",
+                "label": "Sells E10"
+            },
+            "fuel/e85": {
+                "key": "fuel:e85",
+                "type": "check",
+                "label": "Sells E85"
+            },
+            "fuel/lpg": {
+                "key": "fuel:lpg",
+                "type": "check",
+                "label": "Sells Propane"
+            },
+            "fuel/octane_100": {
+                "key": "fuel:octane_100",
+                "type": "check",
+                "label": "Sells Racing Gasoline"
+            },
+            "fuel/octane_91": {
+                "key": "fuel:octane_91",
+                "type": "check",
+                "label": "Sells Regular Gasoline"
+            },
+            "fuel/octane_95": {
+                "key": "fuel:octane_95",
+                "type": "check",
+                "label": "Sells Midgrade Gasoline"
+            },
+            "fuel/octane_98": {
+                "key": "fuel:octane_98",
+                "type": "check",
+                "label": "Sells Premium Gasoline"
+            },
             "gauge": {
                 "key": "gauge",
                 "type": "combo",
@@ -100038,6 +100523,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "type": "typeCombo",
                 "label": "Type"
             },
+            "length": {
+                "key": "length",
+                "type": "number",
+                "label": "Length (Meters)"
+            },
             "levels": {
                 "key": "building:levels",
                 "type": "number",
@@ -100167,6 +100657,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "type": "typeCombo",
                 "label": "Type"
             },
+            "population": {
+                "key": "population",
+                "type": "text",
+                "label": "Population"
+            },
             "power": {
                 "key": "power",
                 "type": "typeCombo",
@@ -100293,6 +100788,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "type": "typeCombo",
                 "label": "Type"
             },
+            "sloped_curb": {
+                "key": "sloped_curb",
+                "type": "combo",
+                "label": "Sloped Curb"
+            },
             "smoking": {
                 "key": "smoking",
                 "type": "combo",
@@ -100356,7 +100856,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "bridge",
                     "tunnel",
                     "embankment",
-                    "cutting"
+                    "cutting",
+                    "ford"
                 ],
                 "label": "Structure",
                 "placeholder": "Unknown",
@@ -100365,7 +100866,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                         "bridge": "Bridge",
                         "tunnel": "Tunnel",
                         "embankment": "Embankment",
-                        "cutting": "Cutting"
+                        "cutting": "Cutting",
+                        "ford": "Ford"
                     }
                 }
             },
@@ -100388,6 +100890,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "type": "combo",
                 "label": "Surface"
             },
+            "tactile_paving": {
+                "key": "tactile_paving",
+                "type": "check",
+                "label": "Tactile Paving"
+            },
             "toilets/disposal": {
                 "key": "toilets:disposal",
                 "type": "combo",
@@ -100473,6 +100980,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "universal": true,
                 "label": "Wheelchair Access"
             },
+            "width": {
+                "key": "width",
+                "type": "number",
+                "label": "Width (Meters)"
+            },
             "wikipedia": {
                 "key": "wikipedia",
                 "type": "wikipedia",
@@ -111903,6 +112415,62 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 504
             ]
         },
+        "hairdresser": {
+            "12": [
+                42,
+                528
+            ],
+            "18": [
+                24,
+                528
+            ],
+            "24": [
+                0,
+                528
+            ]
+        },
+        "chemist": {
+            "12": [
+                96,
+                528
+            ],
+            "18": [
+                78,
+                528
+            ],
+            "24": [
+                54,
+                528
+            ]
+        },
+        "mobilephone": {
+            "12": [
+                150,
+                528
+            ],
+            "18": [
+                132,
+                528
+            ],
+            "24": [
+                108,
+                528
+            ]
+        },
+        "scooter": {
+            "12": [
+                204,
+                528
+            ],
+            "18": [
+                186,
+                528
+            ],
+            "24": [
+                162,
+                528
+            ]
+        },
         "highway-motorway": {
             "line": [
                 20,
@@ -112350,7 +112918,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
         "nl",
         "en-GB",
         "et",
-        "fil",
         "fi",
         "fr",
         "gl",
@@ -112382,6 +112949,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
         "sl",
         "es",
         "sv",
+        "tl",
         "ta",
         "te",
         "tr",
@@ -113004,6 +113572,33 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fuel": {
                     "label": "Fuel"
                 },
+                "fuel/biodiesel": {
+                    "label": "Sells Biodiesel"
+                },
+                "fuel/diesel": {
+                    "label": "Sells Diesel"
+                },
+                "fuel/e10": {
+                    "label": "Sells E10"
+                },
+                "fuel/e85": {
+                    "label": "Sells E85"
+                },
+                "fuel/lpg": {
+                    "label": "Sells Propane"
+                },
+                "fuel/octane_100": {
+                    "label": "Sells Racing Gasoline"
+                },
+                "fuel/octane_91": {
+                    "label": "Sells Regular Gasoline"
+                },
+                "fuel/octane_95": {
+                    "label": "Sells Midgrade Gasoline"
+                },
+                "fuel/octane_98": {
+                    "label": "Sells Premium Gasoline"
+                },
                 "gauge": {
                     "label": "Gauge"
                 },
@@ -113069,6 +113664,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "leisure": {
                     "label": "Type"
                 },
+                "length": {
+                    "label": "Length (Meters)"
+                },
                 "levels": {
                     "label": "Levels",
                     "placeholder": "2, 4, 6..."
@@ -113140,6 +113738,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "place": {
                     "label": "Type"
                 },
+                "population": {
+                    "label": "Population"
+                },
                 "power": {
                     "label": "Type"
                 },
@@ -113203,6 +113804,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "shop": {
                     "label": "Type"
                 },
+                "sloped_curb": {
+                    "label": "Sloped Curb"
+                },
                 "smoking": {
                     "label": "Smoking"
                 },
@@ -113226,7 +113830,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                         "bridge": "Bridge",
                         "tunnel": "Tunnel",
                         "embankment": "Embankment",
-                        "cutting": "Cutting"
+                        "cutting": "Cutting",
+                        "ford": "Ford"
                     }
                 },
                 "studio_type": {
@@ -113238,6 +113843,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "surface": {
                     "label": "Surface"
                 },
+                "tactile_paving": {
+                    "label": "Tactile Paving"
+                },
                 "toilets/disposal": {
                     "label": "Disposal"
                 },
@@ -113281,6 +113889,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "wheelchair": {
                     "label": "Wheelchair Access"
                 },
+                "width": {
+                    "label": "Width (Meters)"
+                },
                 "wikipedia": {
                     "label": "Wikipedia"
                 },
@@ -113425,6 +114036,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Car Wash",
                     "terms": ""
                 },
+                "amenity/charging_station": {
+                    "name": "Charging Station",
+                    "terms": "EV,Electric Vehicle,Supercharger"
+                },
                 "amenity/childcare": {
                     "name": "Childcare",
                     "terms": "nursery,orphanage,playgroup"
@@ -113445,6 +114060,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "College",
                     "terms": ""
                 },
+                "amenity/compressed_air": {
+                    "name": "Compressed Air",
+                    "terms": ""
+                },
                 "amenity/courthouse": {
                     "name": "Courthouse",
                     "terms": ""
@@ -113509,6 +114128,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Car Parking",
                     "terms": ""
                 },
+                "amenity/parking_entrance": {
+                    "name": "Parking Garage Entrance/Exit",
+                    "terms": ""
+                },
                 "amenity/pharmacy": {
                     "name": "Pharmacy",
                     "terms": ""
@@ -113754,7 +114377,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "terms": ""
                 },
                 "building/entrance": {
-                    "name": "Entrance",
+                    "name": "Entrance/Exit",
                     "terms": ""
                 },
                 "building/garage": {
@@ -114034,7 +114657,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "terms": ""
                 },
                 "entrance": {
-                    "name": "Entrance",
+                    "name": "Entrance/Exit",
                     "terms": ""
                 },
                 "footway/crossing": {
@@ -114045,6 +114668,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Sidewalk",
                     "terms": ""
                 },
+                "ford": {
+                    "name": "Ford",
+                    "terms": ""
+                },
                 "golf/bunker": {
                     "name": "Sand Trap",
                     "terms": "hazard,bunker"
@@ -114277,6 +114904,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Cemetery",
                     "terms": ""
                 },
+                "landuse/churchyard": {
+                    "name": "Churchyard",
+                    "terms": ""
+                },
                 "landuse/commercial": {
                     "name": "Commercial",
                     "terms": ""
@@ -114317,6 +114948,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Meadow",
                     "terms": ""
                 },
+                "landuse/military": {
+                    "name": "Military",
+                    "terms": ""
+                },
                 "landuse/orchard": {
                     "name": "Orchard",
                     "terms": ""
@@ -115069,6 +115704,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Video Store",
                     "terms": ""
                 },
+                "shop/wine": {
+                    "name": "Wine Shop",
+                    "terms": "winery"
+                },
                 "tourism": {
                     "name": "Tourism",
                     "terms": ""

diff --git a/vendor/assets/iD/iD/img/maki-sprite.png b/vendor/assets/iD/iD/img/maki-sprite.png
index af7b5322cc8f4e499846629b22ab7e4d71ffba51..e4028833d114b4327157bbc9a5c7bd648e43fc96 100644 (file)
Binary files a/vendor/assets/iD/iD/img/maki-sprite.png and b/vendor/assets/iD/iD/img/maki-sprite.png differ

diff --git a/vendor/assets/iD/iD/img/sprite.svg b/vendor/assets/iD/iD/img/sprite.svg
index fc0bbdde5c11f55b598d3f9dae960fa40e9be8a9..f9394841434046d44207e6571dbc1af9a328806d 100644 (file)
--- a/vendor/assets/iD/iD/img/sprite.svg
+++ b/vendor/assets/iD/iD/img/sprite.svg
@@ -13,7 +13,7 @@
    width="800"
    height="560"
    id="svg12393"
-   inkscape:version="0.48.2 r9819"
+   inkscape:version="0.48.4 r"
    sodipodi:docname="sprite.svg">
   <sodipodi:namedview
      pagecolor="#ffffff"
@@ -27,14 +27,14 @@
      inkscape:window-width="1440"
      inkscape:window-height="856"
      id="namedview392"
-     showgrid="true"
-     inkscape:zoom="5.656854"
-     inkscape:cx="331.17588"
-     inkscape:cy="469.35572"
-     inkscape:window-x="2"
-     inkscape:window-y="0"
+     showgrid="false"
+     inkscape:zoom="11.313708"
+     inkscape:cx="19.712517"
+     inkscape:cy="454.54715"
+     inkscape:window-x="298"
+     inkscape:window-y="6"
      inkscape:window-maximized="0"
-     inkscape:current-layer="layer12"
+     inkscape:current-layer="svg12393"
      showguides="false"
      inkscape:guide-bbox="true"
      inkscape:snap-global="true"
@@ -72,2150 +72,1813 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4677"
+     d="m 309.5,3 -6.5,3 0,1 6.5,3 1,0 6.5,-3 0,-1 -6.5,-3 -1,0 z M 304.09375,9.5 303,10 l 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z m 0,4 L 303,14 l 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z" />
+  <rect
+     style="color:#000000;fill:none;stroke:none;stroke-width:14;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect4259"
+     y="1.0262482e-16"
+     x="0"
+     height="320"
+     width="700" />
   <g
-     transform="translate(-25,3.0624999e-6)"
-     id="layer12"
-     style="display:inline">
-    <path
-       d="m 309.5,3 -6.5,3 0,1 6.5,3 1,0 6.5,-3 0,-1 -6.5,-3 -1,0 z M 304.09375,9.5 303,10 l 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z m 0,4 L 303,14 l 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z"
-       transform="translate(25,-3.0624999e-6)"
-       id="path4677"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <rect
-       width="700"
-       height="320"
-       x="25"
-       y="-3.0624999e-06"
-       id="rect4259"
-       style="color:#000000;fill:none;stroke:none;stroke-width:14;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+     style="fill:#ffffff;fill-opacity:1"
+     id="g58869"
+     transform="translate(80.03464,-25.104236)">
     <g
-       transform="translate(105.03464,-25.104239)"
-       id="g58869"
-       style="fill:#ffffff;fill-opacity:1">
-      <g
-         id="g58871"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" />
-      <g
-         id="g58873"
-         style="fill:#ffffff;fill-opacity:1" />
-    </g>
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
+       id="g58871" />
     <g
-       transform="translate(-321,-101.36218)"
-       id="g5460"
-       style="fill:#6bc641;fill-opacity:1;display:inline" />
+       style="fill:#ffffff;fill-opacity:1"
+       id="g58873" />
+  </g>
+  <g
+     style="fill:#6bc641;fill-opacity:1;display:inline"
+     id="g5460"
+     transform="translate(-346,-101.36218)" />
+  <g
+     style="opacity:0.25;fill:#000000;fill-opacity:1;display:inline"
+     id="g16215"
+     transform="translate(-346,-62.362177)" />
+  <g
+     style="display:inline"
+     id="g16306-5"
+     transform="matrix(-0.70710678,0.70710679,0.70710679,0.70710678,852.1436,-601.56033)" />
+  <g
+     id="g58885"
+     transform="translate(80.03464,-6.1042359)">
     <g
-       transform="translate(-321,-62.36218)"
-       id="g16215"
-       style="opacity:0.25;fill:#000000;fill-opacity:1;display:inline" />
+       style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
+       id="g58887" />
     <g
-       transform="matrix(-0.70710678,0.70710679,0.70710679,0.70710678,877.1436,-601.56033)"
-       id="g16306-5"
-       style="display:inline" />
+       id="g58889" />
+  </g>
+  <g
+     style="fill:#ffffff;fill-opacity:1;display:inline"
+     id="g11035"
+     transform="translate(-379,-135)">
     <g
-       transform="translate(105.03464,-6.104239)"
-       id="g58885">
-      <g
-         id="g58887"
-         style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" />
-      <g
-         id="g58889" />
-    </g>
+       style="fill:#ffffff;fill-opacity:1;display:inline"
+       id="g11037"
+       transform="matrix(0.70710678,0.70710679,-0.70710679,0.70710678,-113.14357,-447.56033)" />
     <g
-       transform="translate(-354,-135)"
-       id="g11035"
-       style="fill:#ffffff;fill-opacity:1;display:inline">
-      <g
-         transform="matrix(0.70710678,0.70710679,-0.70710679,0.70710678,-113.14357,-447.56033)"
-         id="g11037"
-         style="fill:#ffffff;fill-opacity:1;display:inline" />
-      <g
-         transform="matrix(-0.70710678,0.70710679,0.70710679,0.70710678,1293.1436,-447.56033)"
-         id="g11041"
-         style="fill:#ffffff;fill-opacity:1;display:inline" />
-    </g>
+       style="fill:#ffffff;fill-opacity:1;display:inline"
+       id="g11041"
+       transform="matrix(-0.70710678,0.70710679,0.70710679,0.70710678,1293.1436,-447.56033)" />
+  </g>
+  <g
+     style="fill:#1a1a1a;fill-opacity:1;display:inline"
+     id="g9591"
+     transform="translate(480,-653.36218)">
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path9593"
+       transform="translate(0,52.362183)"
+       d="m -130.5,603 c -4.14213,0 -7.5,3.35787 -7.5,7.5 0,4.14214 3.35787,7.5 7.5,7.5 4.14213,0 7.5,-3.35786 7.5,-7.5 0,-4.14213 -3.35787,-7.5 -7.5,-7.5 z m 0,1 c 3.58393,0 6.5,2.91607 6.5,6.5 0,3.58393 -2.91607,6.5 -6.5,6.5 -3.58393,0 -6.5,-2.91607 -6.5,-6.5 0,-3.58393 2.91607,-6.5 6.5,-6.5 z" />
     <g
-       transform="translate(505,-653.36218)"
-       id="g9591"
-       style="fill:#1a1a1a;fill-opacity:1;display:inline">
-      <path
-         d="m -130.5,603 c -4.14213,0 -7.5,3.35787 -7.5,7.5 0,4.14214 3.35787,7.5 7.5,7.5 4.14213,0 7.5,-3.35786 7.5,-7.5 0,-4.14213 -3.35787,-7.5 -7.5,-7.5 z m 0,1 c 3.58393,0 6.5,2.91607 6.5,6.5 0,3.58393 -2.91607,6.5 -6.5,6.5 -3.58393,0 -6.5,-2.91607 -6.5,-6.5 0,-3.58393 2.91607,-6.5 6.5,-6.5 z"
-         transform="translate(0,52.362183)"
-         id="path9593"
+       style="fill:#1a1a1a;fill-opacity:1"
+       id="g9595"
+       clip-path="url(#clipPath9141-6)">
+      <rect
          style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
+         id="rect9597"
+         y="657.36218"
+         x="-131"
+         height="6"
+         width="1" />
       <g
-         clip-path="url(#clipPath9141-6)"
-         id="g9595"
-         style="fill:#1a1a1a;fill-opacity:1">
-        <rect
-           width="1"
-           height="6"
-           x="-131"
-           y="657.36218"
-           id="rect9597"
-           style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <g
-           id="g9599"
-           style="fill:#1a1a1a;fill-opacity:1">
-          <path
-             d="m -126,609.5 c 0,1.933 -1.567,3.5 -3.5,3.5 l 0,-3.5 z"
-             transform="matrix(1.5714241,0,0,1.5714241,72.999423,-294.92081)"
-             id="path9601"
-             style="opacity:0.2;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -126,615 -4.5,-4.5 0,6.5 z"
-             transform="translate(0,52.362183)"
-             id="path9603"
-             style="opacity:0.1;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -135.99999,662.86218 c 0,3.03756 2.46242,5.49998 5.49999,5.49998 l 0,-5.49998 z"
-             id="path9605"
-             style="opacity:0.4;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -135.99999,662.86216 c 0,-3.03756 2.46242,-5.49998 5.49999,-5.49998 l 0,5.49998 z"
-             id="path9607"
-             style="opacity:0.6;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -130.5,662.86216 -4,4.50002 -2.68804,-4.50002 z"
-             id="path9609"
-             style="opacity:0.1;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -135,658.36218 4.5,4.5 0,-6.5 z"
-             id="path9611"
-             style="opacity:0.1;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-        </g>
+         style="fill:#1a1a1a;fill-opacity:1"
+         id="g9599">
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.2;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path9601"
+           transform="matrix(1.5714241,0,0,1.5714241,72.999423,-294.92081)"
+           d="m -126,609.5 c 0,1.933 -1.567,3.5 -3.5,3.5 l 0,-3.5 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.1;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path9603"
+           transform="translate(0,52.362183)"
+           d="m -126,615 -4.5,-4.5 0,6.5 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.4;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path9605"
+           d="m -135.99999,662.86218 c 0,3.03756 2.46242,5.49998 5.49999,5.49998 l 0,-5.49998 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.6;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path9607"
+           d="m -135.99999,662.86216 c 0,-3.03756 2.46242,-5.49998 5.49999,-5.49998 l 0,5.49998 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.1;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path9609"
+           d="m -130.5,662.86216 -4,4.50002 -2.68804,-4.50002 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.1;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path9611"
+           d="m -135,658.36218 4.5,4.5 0,-6.5 z" />
       </g>
     </g>
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path15565"
+     d="m 363,10 0,-2 10,-4 2,0 0,2 -4,10 -2,0 0,-6 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3767"
+     d="m 363,30 0,-2 10,-4 2,0 0,2 -4,10 -2,0 0,-6 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3769"
+     d="m 363,49.999997 0,-2 10,-4 2,0 0,2 -4,10 -2,0 0,-6 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path2997"
+     d="m 89,2 -5,4.5 5,4.5 0,-3 3,0 1,1 0,3 -1,1 -5,0 -1,1 0,1 1,1 5,0 2,-1 1,-1 1,-2 L 96,9 95,7 94,6 92,5 89,5 z m 22,0 0,3 -3,0 -2,1 -1,1 -1,2 0,3 1,2 1,1 2,1 5,0 1,-1 0,-1 -1,-1 -5,0 -1,-1 0,-3 1,-1 3,0 0,3 5,-4.5 z M 54,3 53,4 53,5.59375 46.59375,12 45,12 l -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 L 54.40625,7 56,7 57,6 57,4 56,3 z m 96,0 -6,6 1,1 3,0 0,6 1,1 2,0 1,-1 0,-6 3,0 1,-1 z M 32,4 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 23,0 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 C 54.74848,6 54.51948,5.9033 54.34375,5.75 54.30935,5.71998 54.28,5.69066 54.25,5.65625 54.09665,5.480519 54,5.251521 54,5 54,4.44772 54.44772,4 55,4 z m 10,0 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 z m 69.5,0 -4.9375,8.5625 L 126,9 l -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 z m 30.5,0 -1,1 0,1 4,4 -4,4 0,1 1,1 1,0 4,-4 4,4 1,0 1,-1 0,-1 -4,-4 4,-4 0,-1 -1,-1 -1,0 -4,4 -4,-4 z m 21,0 -1,1 0,1 1,1 8,0 1,-1 0,-1 -1,-1 z M 66,5 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 C 73.44772,7 73,6.552285 73,6 73,5.447715 73.44772,5 74,5 z M 32.15625,7 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 z M 68,7 l 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 z m 118,1 0,7 1,1 6,0 1,-1 0,-7 z m 2,2 1,0 0,4 -1,0 0,-1 z m 3,0 1,0 0,3 0,1 -1,0 z M 46,13 c 0.25152,0 0.48052,0.0967 0.65625,0.25 L 46.75,13.34375 C 46.90335,13.519481 47,13.748484 47,14 c 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 20,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z" />
+  <g
+     style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="g44379"
+     transform="translate(-536.00001,-43.999997)">
+    <g
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.55555558;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="g44381"
+       transform="matrix(0.64285714,0,0,0.64285714,332.85714,42.142857)">
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.55555558;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path44383"
+         d="m 925.00003,71.333338 c -3.86599,0 -7,3.13401 -7,7 0,1.12542 0.30585,2.16901 0.77778,3.11111 l -5.44445,5.444436 0,3.11111 3.11112,0 5.44444,-5.44444 c 0.94211,0.47192 1.98568,0.77778 3.11111,0.77778 3.86599,0 7,-3.134006 7,-6.999996 0,-3.86599 -3.13401,-7 -7,-7 z m 0,3.11111 c 2.14777,0 3.88889,1.74112 3.88889,3.88889 0,2.14777 -1.74112,3.88889 -3.88889,3.88889 -2.14777,0 -3.88889,-1.74112 -3.88889,-3.88889 0,-2.14777 1.74112,-3.88889 3.88889,-3.88889 z" />
+    </g>
+    <g
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="g44387"
+       transform="matrix(0.35714364,0,0,0.35714364,597.14212,77.857044)" />
+  </g>
+  <g
+     style="fill:#ffffff;fill-opacity:1;display:inline"
+     id="g9588-4"
+     transform="translate(-681,73.63782)">
     <path
-       d="m 388,72.362183 0,-2 10,-4 2,0 0,2 -4,10 -2,0 0,-6 z"
-       transform="translate(0,-62.362186)"
-       id="path15565"
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path9584-2"
+       transform="translate(756,-73.637817)"
+       d="m 174,3 -1,1 0,4 -4,0 -1,1 0,1 1,1 4,0 0,4 1,1 1,0 1,-1 0,-4 4,0 1,-1 0,-1 -1,-1 -4,0 0,-4 -1,-1 -1,0 z" />
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path9631"
+     d="m 265,8.0000031 11,0 1,1.00002 0,0.9999999 -1,0.99998 -11,0 -1,-1 0,-0.9999999 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3048-0-7-5-6"
+     d="m 288.5,3.0000131 c -3.03757,0 -5.5,2.46243 -5.5,5.5 0,3.0375699 2.46243,5.4999999 5.5,5.4999999 1.00612,0 1.93866,-0.27827 2.75,-0.75 l 3.75,3.75 1,0 1,-1 0,-1 -3.75,-3.75 c 0.47173,-0.81134 0.75,-1.7438699 0.75,-2.7499999 0,-3.03757 -2.46243,-5.5 -5.5,-5.5 z m -0.5,2 1,0 2,1 1,2 0,1 -1,1.9999999 -2,1 -1,0 -2,-1 -1,-1.9999999 0,-1 1,-2 2,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path54704-4"
+     d="m 329.5,3.0000003 c -1.5,0 -2.5,2 -2.5,3 0,0.666667 0,1.333333 0,2 0,1 1,2.1538467 1,2.1538467 L 328,11 l -1.69231,0.384617 c -1.45419,0.330499 -2.02608,1.236079 -2.15384,2.76923 L 324,16.000001 l 12,0 -0.15385,-1.846154 c -0.12776,-1.533151 -0.69965,-2.438731 -2.15384,-2.76923 L 332,11 l 0,-0.846153 c 0,0 1,-1.1538467 1,-2.1538467 0,-0.666667 0,-1.333333 0,-2 0,-1 -1,-3 -2.5,-3 z" />
+  <g
+     style="opacity:0.5;fill:#000000;fill-opacity:1;display:inline"
+     id="g9693"
+     transform="translate(480,-613.36218)">
+    <path
+       inkscape:connector-curvature="0"
        style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       id="path9695"
+       transform="translate(0,52.362183)"
+       d="m -130.5,603 c -4.14213,0 -7.5,3.35787 -7.5,7.5 0,4.14214 3.35787,7.5 7.5,7.5 4.14213,0 7.5,-3.35786 7.5,-7.5 0,-4.14213 -3.35787,-7.5 -7.5,-7.5 z m 0,1 c 3.58393,0 6.5,2.91607 6.5,6.5 0,3.58393 -2.91607,6.5 -6.5,6.5 -3.58393,0 -6.5,-2.91607 -6.5,-6.5 0,-3.58393 2.91607,-6.5 6.5,-6.5 z" />
+    <g
+       style="fill:#000000;fill-opacity:1"
+       id="g9697"
+       clip-path="url(#clipPath9141-6)">
+      <rect
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect9699"
+         y="657.36218"
+         x="-131"
+         height="6"
+         width="1" />
+      <g
+         style="fill:#000000;fill-opacity:1"
+         id="g9701">
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path9703"
+           transform="matrix(1.5714241,0,0,1.5714241,72.999423,-294.92081)"
+           d="m -126,609.5 c 0,1.933 -1.567,3.5 -3.5,3.5 l 0,-3.5 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path9705"
+           transform="translate(0,52.362183)"
+           d="m -126,615 -4.5,-4.5 0,6.5 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.4;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path9707"
+           d="m -135.99999,662.86218 c 0,3.03756 2.46242,5.49998 5.49999,5.49998 l 0,-5.49998 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path9709"
+           d="m -135.99999,662.86216 c 0,-3.03756 2.46242,-5.49998 5.49999,-5.49998 l 0,5.49998 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path9711"
+           d="m -130.5,662.86216 -4,4.50002 -2.68804,-4.50002 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path9713"
+           d="m -135,658.36218 4.5,4.5 0,-6.5 z" />
+      </g>
+    </g>
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#1c1c1c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path47528"
+     d="m 391.5,3.9999978 c -2.48528,0 -4.5,2.0147207 -4.5,4.5 0,0.7234907 0.19662,1.3943635 0.50001,2.0000052 L 384,13.999998 l 0,1.999999 2.00001,0 L 389.5,12.5 c 0.60565,0.303377 1.27651,0.499995 2,0.499995 2.48528,0 4.5,-2.014712 4.5,-4.4999972 0,-2.4852793 -2.01472,-4.5 -4.5,-4.5 z m 0,1.9999993 c 1.38071,0 2.5,1.1192914 2.5,2.5000007 0,1.3807157 -1.11929,2.5000002 -2.5,2.5000002 -1.38071,0 -2.5,-1.1192845 -2.5,-2.5000002 0,-1.3807093 1.11929,-2.5000007 2.5,-2.5000007 z" />
+  <g
+     style="opacity:0.5;fill:#000000;fill-opacity:1;display:inline"
+     id="g47761"
+     transform="translate(-681,113.63782)">
     <path
-       d="m 388,92.362183 0,-2 10,-4 2,0 0,2 -4,10 -2,0 0,-6 z"
-       transform="translate(0,-62.362186)"
-       id="path3767"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path47763"
+       transform="translate(756,-73.637817)"
+       d="m 174,3 -1,1 0,4 -4,0 -1,1 0,1 1,1 4,0 0,4 1,1 1,0 1,-1 0,-4 4,0 1,-1 0,-1 -1,-1 -4,0 0,-4 -1,-1 -1,0 z" />
+  </g>
+  <g
+     style="opacity:0.5;fill:#000000;fill-opacity:1;display:inline"
+     id="g47765"
+     transform="translate(-660,113.63782)">
     <path
-       d="m 388,112.36218 0,-2 10,-4 2,0 0,2 -4,10 -2,0 0,-6 z"
-       transform="translate(0,-62.362186)"
-       id="path3769"
-       style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path47767"
+       d="m 925,-65.637817 11,0 1,1.00002 0,1 -1,0.99998 -11,0 -1,-1 0,-1 z" />
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path47777"
+     d="m 288.5,43.000013 c -3.03757,0 -5.5,2.46243 -5.5,5.5 0,3.03757 2.46243,5.5 5.5,5.5 1.00612,0 1.93866,-0.27827 2.75,-0.75 l 3.75,3.75 1,0 1,-1 0,-1 -3.75,-3.75 c 0.47173,-0.81134 0.75,-1.74387 0.75,-2.75 0,-3.03757 -2.46243,-5.5 -5.5,-5.5 z m -0.5,2 1,0 2,1 1,2 0,1 -1,2 -2,1 -1,0 -2,-1 -1,-2 0,-1 1,-2 2,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path14143"
+     d="m 329.5,43 c -1.5,0 -2.5,2 -2.5,3 0,0.666667 0,1.333333 0,2 0,1 1,2.153847 1,2.153847 L 328,51 l -1.69231,0.384617 c -1.45419,0.330499 -2.02608,1.236079 -2.15384,2.76923 L 324,56.000001 l 12,0 -0.15385,-1.846154 c -0.12776,-1.533151 -0.69965,-2.438731 -2.15384,-2.76923 L 332,51 l 0,-0.846153 c 0,0 1,-1.153847 1,-2.153847 0,-0.666667 0,-1.333333 0,-2 0,-1 -1,-3 -2.5,-3 z" />
+  <g
+     style="fill:#ffffff;fill-opacity:1;display:inline"
+     id="g33295"
+     transform="translate(480,-633.36218)">
     <path
-       d="m 89,2 -5,4.5 5,4.5 0,-3 3,0 1,1 0,3 -1,1 -5,0 -1,1 0,1 1,1 5,0 2,-1 1,-1 1,-2 L 96,9 95,7 94,6 92,5 89,5 z m 22,0 0,3 -3,0 -2,1 -1,1 -1,2 0,3 1,2 1,1 2,1 5,0 1,-1 0,-1 -1,-1 -5,0 -1,-1 0,-3 1,-1 3,0 0,3 5,-4.5 z M 54,3 53,4 53,5.59375 46.59375,12 45,12 l -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 L 54.40625,7 56,7 57,6 57,4 56,3 z m 96,0 -6,6 1,1 3,0 0,6 1,1 2,0 1,-1 0,-6 3,0 1,-1 z M 32,4 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 23,0 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 C 54.74848,6 54.51948,5.9033 54.34375,5.75 54.30935,5.71998 54.28,5.69066 54.25,5.65625 54.09665,5.480519 54,5.251521 54,5 54,4.44772 54.44772,4 55,4 z m 10,0 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 z m 69.5,0 -4.9375,8.5625 L 126,9 l -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 z m 30.5,0 -1,1 0,1 4,4 -4,4 0,1 1,1 1,0 4,-4 4,4 1,0 1,-1 0,-1 -4,-4 4,-4 0,-1 -1,-1 -1,0 -4,4 -4,-4 z m 21,0 -1,1 0,1 1,1 8,0 1,-1 0,-1 -1,-1 z M 66,5 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 C 73.44772,7 73,6.552285 73,6 73,5.447715 73.44772,5 74,5 z M 32.15625,7 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 z M 68,7 l 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 z m 118,1 0,7 1,1 6,0 1,-1 0,-7 z m 2,2 1,0 0,4 -1,0 0,-1 z m 3,0 1,0 0,3 0,1 -1,0 z M 46,13 c 0.25152,0 0.48052,0.0967 0.65625,0.25 L 46.75,13.34375 C 46.90335,13.519481 47,13.748484 47,14 c 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 20,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z"
-       transform="translate(25,-3.0624999e-6)"
-       id="path2997"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path33297"
+       transform="translate(0,52.362183)"
+       d="m -130.5,603 c -4.14213,0 -7.5,3.35787 -7.5,7.5 0,4.14214 3.35787,7.5 7.5,7.5 4.14213,0 7.5,-3.35786 7.5,-7.5 0,-4.14213 -3.35787,-7.5 -7.5,-7.5 z m 0,1 c 3.58393,0 6.5,2.91607 6.5,6.5 0,3.58393 -2.91607,6.5 -6.5,6.5 -3.58393,0 -6.5,-2.91607 -6.5,-6.5 0,-3.58393 2.91607,-6.5 6.5,-6.5 z" />
     <g
-       transform="translate(-511.00001,-44)"
-       id="g44379"
-       style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
+       style="fill:#ffffff;fill-opacity:1"
+       id="g33299"
+       clip-path="url(#clipPath9141-6)">
+      <rect
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect33301"
+         y="657.36218"
+         x="-131"
+         height="6"
+         width="1" />
       <g
-         transform="matrix(0.64285714,0,0,0.64285714,332.85714,42.142857)"
-         id="g44381"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.55555558;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
+         style="fill:#ffffff;fill-opacity:1"
+         id="g33303">
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.2;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path33305"
+           transform="matrix(1.5714241,0,0,1.5714241,72.999423,-294.92081)"
+           d="m -126,609.5 c 0,1.933 -1.567,3.5 -3.5,3.5 l 0,-3.5 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path33307"
+           transform="translate(0,52.362183)"
+           d="m -126,615 -4.5,-4.5 0,6.5 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.4;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path33309"
+           d="m -135.99999,662.86218 c 0,3.03756 2.46242,5.49998 5.49999,5.49998 l 0,-5.49998 z" />
         <path
-           d="m 925.00003,71.333338 c -3.86599,0 -7,3.13401 -7,7 0,1.12542 0.30585,2.16901 0.77778,3.11111 l -5.44445,5.444436 0,3.11111 3.11112,0 5.44444,-5.44444 c 0.94211,0.47192 1.98568,0.77778 3.11111,0.77778 3.86599,0 7,-3.134006 7,-6.999996 0,-3.86599 -3.13401,-7 -7,-7 z m 0,3.11111 c 2.14777,0 3.88889,1.74112 3.88889,3.88889 0,2.14777 -1.74112,3.88889 -3.88889,3.88889 -2.14777,0 -3.88889,-1.74112 -3.88889,-3.88889 0,-2.14777 1.74112,-3.88889 3.88889,-3.88889 z"
-           id="path44383"
-           style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.55555558;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
+           inkscape:connector-curvature="0"
+           style="opacity:0.6;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path33311"
+           d="m -135.99999,662.86216 c 0,-3.03756 2.46242,-5.49998 5.49999,-5.49998 l 0,5.49998 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path33313"
+           d="m -130.5,662.86216 -4,4.50002 -2.68804,-4.50002 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path33315"
+           d="m -135,658.36218 4.5,4.5 0,-6.5 z" />
       </g>
-      <g
-         transform="matrix(0.35714364,0,0,0.35714364,597.14212,77.857044)"
-         id="g44387"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     </g>
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.55555558;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path33341"
+     d="m 391.5,23.999999 c -2.48528,0 -4.5,2.01472 -4.5,4.499999 0,0.723491 0.19662,1.394364 0.50001,2.000006 L 384,33.999999 l 0,1.999999 2.00001,0 3.49999,-3.499997 c 0.60565,0.303377 1.27651,0.499995 2,0.499995 2.48528,0 4.5,-2.014712 4.5,-4.499998 0,-2.485279 -2.01472,-4.499999 -4.5,-4.499999 z m 0,1.999999 c 1.38071,0 2.5,1.119291 2.5,2.5 0,1.380716 -1.11929,2.500001 -2.5,2.500001 -1.38071,0 -2.5,-1.119285 -2.5,-2.500001 0,-1.380709 1.11929,-2.5 2.5,-2.5 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path9820"
+     d="m 6,144 -1,1 0,1 1,1 8,0 1,-1 0,-1 -1,-1 z m 0,4 0,7 1,1 6,0 1,-1 0,-7 z m 2,2 1,0 0,4 -1,0 0,-1 z m 3,0 1,0 0,3 0,1 -1,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path9826"
+     d="m 64,145.01282 c -1,0 -2,1 -2,2 l 0,2 3,0 2,1 -2,1 -3,0 0,2 c 0,1 1,2 2,2 l 1,0 c 2,0 2.48722,-0.97443 3,-2 l 1,-2 9,-5 c 0,0 0,-1 -2,-1 L 68.96875,148.91907 68,147.01282 c -0.49406,-0.98812 -1,-2 -3,-2 z m 0,1 2,0 1,2 -4,0 c 0,0 0,-0.66667 0,-1 0,-1.01282 1,-1 1,-1 z m 8.09375,4.71875 -2,1 L 76,155.01282 c 2,0 2,-1 2,-1 z M 63,152.01282 l 4,0 -1,2 -2,0 c 0,0 -1,0 -1,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4824"
+     d="m 30,141 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4822"
+     d="m 164,142 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4820"
+     d="m 108,145 -4,5 4,5 2,0 0,-1 -3.5,-4 3.5,-4 0,-1 -2,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4818"
+     d="m 114,145 -4,5 4,5 2,0 0,-1 -3.5,-4 3.5,-4 0,-1 -2,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4816"
+     d="m 22.84375,146 c -0.77652,0.0669 -1.494002,0.58712 -1.75,1.375 -0.341331,1.05051 0.230742,2.18992 1.28125,2.53125 1.050508,0.34133 2.189919,-0.23074 2.53125,-1.28125 0.341331,-1.05051 -0.230742,-2.18992 -1.28125,-2.53125 -0.262627,-0.0853 -0.52241,-0.11611 -0.78125,-0.0937 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4814"
+     d="m 36.78125,146 c -0.132056,0.0149 -0.274936,0.0512 -0.40625,0.0937 -1.050508,0.34133 -1.622581,1.48074 -1.28125,2.53125 0.341331,1.05051 1.480742,1.62258 2.53125,1.28125 1.050508,-0.34133 1.622581,-1.48074 1.28125,-2.53125 -0.298664,-0.91919 -1.20061,-1.47926 -2.125,-1.375 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4812"
+     d="m 42,148 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4810"
+     d="m 50,148 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4808"
+     d="m 58,148 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4806"
+     d="m 90,148 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4861"
+     d="m 130,141 -3,3 1,1 1,0 0,2 2,0 0,-2 1,0 1,-1 -3,-3 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4859"
+     d="m 124,147 -3,3 3,3 1,-1 0,-1 2,0 0,-2 -2,0 0,-1 -1,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4857"
+     d="m 136,147 -1,1 0,1 -2,0 0,2 2,0 0,1 1,1 3,-3 -3,-3 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4855"
+     d="m 130,148 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4804"
+     d="m 129,153 0,2 -1,0 -1,1 3,3 3,-3 -1,-1 -1,0 0,-2 -2,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4802"
+     d="m 190,148 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4800"
+     d="m 164,154 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4798"
+     d="m 176,154 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4796"
+     d="m 26.0625,154 c -0.641658,-0.0219 -1.281719,0.25399 -1.6875,0.8125 -0.64925,0.89362 -0.456116,2.16325 0.4375,2.8125 0.893616,0.64925 2.16325,0.45612 2.8125,-0.4375 0.64925,-0.89362 0.456116,-2.16325 -0.4375,-2.8125 -0.335106,-0.24347 -0.740005,-0.36184 -1.125,-0.375 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path9830"
+     d="m 33.9375,154 c -0.384995,0.0132 -0.789894,0.13153 -1.125,0.375 -0.893615,0.64925 -1.08675,1.91888 -0.4375,2.8125 0.64925,0.89362 1.918885,1.08675 2.8125,0.4375 0.893615,-0.64925 1.08675,-1.91888 0.4375,-2.8125 -0.405781,-0.55851 -1.045842,-0.83443 -1.6875,-0.8125 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#7092ff;fill-opacity:1;stroke:none;stroke-width:0.50000125;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     id="path9840"
+     d="m 27.03125,142.60657 c -1.32908,0.53118 -2.444369,1.41916 -3.3125,2.53125 0.07092,0.0184 0.149734,0.009 0.21875,0.0312 0.520689,0.16918 0.941853,0.48986 1.28125,0.875 0.583365,-0.69731 1.320919,-1.23792 2.15625,-1.625 -0.228003,-0.42194 -0.375,-0.89709 -0.375,-1.4062 0,-0.14028 0.0122,-0.27085 0.03125,-0.40625 z m 5.9375,0 C 32.9878,142.74197 33,142.87254 33,143.01282 c 0,0.50911 -0.146997,0.98426 -0.375,1.40625 0.835331,0.38708 1.572885,0.92769 2.15625,1.625 0.339397,-0.38514 0.760561,-0.70582 1.28125,-0.875 0.06748,-0.0219 0.146303,-0.0395 0.21875,-0.0625 -0.866395,-1.10291 -1.991152,-1.97191 -3.3125,-2.5 z m -10.9375,8.21875 c 0.132811,1.35398 0.618313,2.61506 1.34375,3.6875 0.05422,-0.0956 0.121594,-0.19054 0.1875,-0.28125 0.298579,-0.41096 0.689964,-0.72255 1.125,-0.9375 -0.439267,-0.72096 -0.728373,-1.5606 -0.84375,-2.4375 -0.563589,0.16464 -1.184566,0.16262 -1.78125,-0.0312 -0.009,-0.003 -0.02228,0.003 -0.03125,0 z m 15.90625,0 c -0.596684,0.19387 -1.217661,0.19589 -1.78125,0.0312 -0.115377,0.8769 -0.404483,1.71654 -0.84375,2.4375 0.438042,0.20421 0.821177,0.51932 1.125,0.9375 0.06591,0.0907 0.133279,0.18566 0.1875,0.28125 0.725438,-1.07244 1.210939,-2.33352 1.34375,-3.6875 -0.009,0.003 -0.02224,-0.003 -0.03125,0 z M 29,156.16907 c -0.03014,0.55835 -0.21394,1.114 -0.5625,1.59375 -0.027,0.0372 -0.06534,0.0582 -0.09375,0.0937 0.540476,0.11583 1.081942,0.1875 1.65625,0.1875 0.574308,0 1.115774,-0.0717 1.65625,-0.1875 -0.02841,-0.0355 -0.06675,-0.0566 -0.09375,-0.0937 -0.34856,-0.47975 -0.532362,-1.0354 -0.5625,-1.59375 -0.329444,0.0535 -0.654988,0.0937 -1,0.0937 -0.345012,0 -0.670556,-0.0403 -1,-0.0937 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path9854"
+     d="m 84,146.01282 -4,4 4,4 1,-1 0,-2 2.1875,0 c -0.11352,-0.31647 -0.1875,-0.64447 -0.1875,-1 0,-0.34518 0.0802,-0.69136 0.1875,-1 l -2.1875,0 0,-2 -1,-1 z m 12,0 -1,1 0,2 -2.1875,0 c 0.10728,0.30864 0.1875,0.65482 0.1875,1 0,0.35553 -0.074,0.68353 -0.1875,1 l 2.1875,0 0,2 1,1 4,-4 -4,-4 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path5624-8"
+     d="m 149,143 -1,1 0,4 -4,0 -1,1 0,2 1,1 4,0 0,4 1,1 2,0 1,-1 0,-4 4,0 1,-1 0,-2 -1,-1 -4,0 0,-4 -1,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path11047"
+     d="m 206,45.000002 -1,1 0,1 3,3 -3,3 0,1 1,1 1,0 3,-3 3,3 1,0 1,-1 0,-1 -3,-3 3,-3 0,-1 -1,-1 -1,0 -3,3 -3,-3 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path6502"
+     d="m 190,140 -1,1 0,1.0625 c -3.94444,0.49381 -7,3.85922 -7,7.9375 0,4.41827 3.58173,8 8,8 4.41827,0 8,-3.58173 8,-8 0,-2.46731 -1.11852,-4.65856 -2.875,-6.125 l -1.40625,1.40625 C 195.11409,146.37996 196,148.08592 196,150 c 0,3.3137 -2.6863,6 -6,6 -3.3137,0 -6,-2.6863 -6,-6 0,-2.97561 2.15859,-5.43327 5,-5.90625 l 0,0.90625 1,1 3,-3 -3,-3 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#222222;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     id="path6699"
+     d="m 208,142 c -1.33333,0 -2.21875,0.78125 -2.71875,1.28125 -0.5,0.5 -0.61458,0.71875 -1.28125,0.71875 l -1,0 0,2 1,0 c 1.33333,0 2.21875,-0.78125 2.71875,-1.28125 0.5,-0.5 0.61458,-0.71875 1.28125,-0.71875 0.16667,0 0.20569,0.009 0.40625,0.25 0.20056,0.24067 0.4375,0.6875 0.6875,1.1875 0.25,0.5 0.51306,1.05317 0.9375,1.5625 0.42444,0.50933 1.13542,1 1.96875,1 1.33333,0 2.21875,-0.78125 2.71875,-1.28125 0.5,-0.5 0.61458,-0.71875 1.28125,-0.71875 l 1,0 0,-2 -1,0 c -1.33333,0 -2.21875,0.78125 -2.71875,1.28125 -0.5,0.5 -0.61458,0.71875 -1.28125,0.71875 -0.16667,0 -0.20569,-0.009 -0.40625,-0.25 -0.20056,-0.24067 -0.4375,-0.6875 -0.6875,-1.1875 -0.25,-0.5 -0.51306,-1.05317 -0.9375,-1.5625 -0.42444,-0.50933 -1.13542,-1 -1.96875,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#222222;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     id="path7209"
+     d="m 203,156 0,2 14,0 0,-2 -14,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path25361-5"
+     d="m 425,10 8,7 1,-1 0,-12 -1,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect6778"
+     d="m 24,205 -1,1 0,9 1,1 12,0 1,-1 0,-9 -1,-1 z m 1,3 5,2.8125 5,-2.8125 0,1.5 -5,3 -5,-3 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect6788"
+     d="m 46,203 -1,1 0,12 1,1 8,0 1,-1 0,-12 -1,-1 -8,0 z m 1,2 6,0 0,5 -6,0 0,-5 z m 0,7 6,0 0,1 -6,0 0,-1 z m 0,2 6,0 0,1 -6,0 0,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect6808"
+     d="m 65,204 -1,1 0,8 -2,2 1,1 14,0 1,-1 -2,-2 0,-8 -1,-1 -10,0 z m 1,2 8,0 0,5 -8,0 0,-5 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path16625-6"
+     d="m 90,202 -5,4 1,1 2,0 0,2 4,0 0,-2 2,0 1,-1 z m -2,9 0,2 -2,0 -1,1 5,4 5,-4 -1,-1 -2,0 0,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path6899"
+     d="m 102.5,205 -1,1 5,10 1.21875,0 2.28125,-3.9375 2.28125,3.9375 1.21875,0 5,-10 -1,-1 -1,0 -3.5,7.5 -1.5,-2.5 2,-4 -0.5,-1 -1.5,0 -1.5,3.5 -1.5,-3.5 -1.5,0 -0.5,1 2,4 -1.5,2.5 -3.5,-7.5 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path6918"
+     d="m 10,202 c -4.418278,0 -8,3.58172 -8,8 0,4.41828 3.581722,8 8,8 4.418278,0 8,-3.58172 8,-8 0,-4.41828 -3.581722,-8 -8,-8 z m 0,2 c 3.313708,0 6,2.68629 6,6 0,3.31371 -2.686292,6 -6,6 -3.3137085,0 -6,-2.68629 -6,-6 0,-3.31371 2.6862915,-6 6,-6 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path6922"
+     d="m 12,207 a 2,2 0 0 1 -4,0 2,2 0 1 1 4,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect6926"
+     d="m 8,211 1,-1 2,0 1,1 0,3 -4,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect4678"
+     d="m 125,204 -1,1 0,11 1,1 8,0 3,-3 0,-9 -1,-1 -10,0 z m 5,2 c 0.55228,0 1,0.44772 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m -4,4 8,0 0,1 -8,0 0,-1 z m 0,2 8,0 0,1 -8,0 0,-1 z m 0,2 5,0 0,1 -5,0 0,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3226"
+     d="M 146.0625,208.40625 C 144.26792,209.16529 143,210.92893 143,213 c 0,2.76142 2.23858,5 5,5 1.99494,0 3.69772,-1.18524 4.5,-2.875 l -0.65625,-1.125 -1.03125,0 c -0.41551,1.15835 -1.51118,2 -2.8125,2 -1.65685,0 -3,-1.34315 -3,-3 0,-0.88447 0.39109,-1.66968 1,-2.21875 L 146,209 c 0,-0.20559 0.0222,-0.39929 0.0625,-0.59375 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4691-9"
+     d="m 149,202 c -1.10456,0 -2,0.89544 -2,2 0,1.10456 0.89544,2 2,2 1.10456,0 2,-0.89544 2,-2 0,-1.10456 -0.89544,-2 -2,-2 z m 0,5 c -1.108,0 -2,0.892 -2,2 l 0,2 c 0,1.108 0.892,2 2,2 l 3.5,0 1.6875,2.90625 c 0.26893,0.4628 0.8482,0.64134 1.3125,0.375 l 0.0312,0 c 0.4643,-0.26634 0.61268,-0.88095 0.34375,-1.34375 l -2.03125,-3.46875 c -0.0158,-0.0271 -0.0446,-0.0375 -0.0625,-0.0625 -0.0468,-0.0617 -0.0966,-0.10697 -0.15625,-0.15625 -0.0773,-0.0673 -0.15761,-0.11687 -0.25,-0.15625 -0.1049,-0.0447 -0.19835,-0.0878 -0.3125,-0.0937 -0.0224,-10e-4 -0.04,-4e-4 -0.0625,0 l -0.0937,0 -1.90625,0 0,-2 c 0,-1.108 -0.892,-2 -2,-2 z" />
+  <g
+     id="g20251-9"
+     transform="translate(301,239.63781)">
     <g
-       transform="translate(-656,73.637817)"
-       id="g9588-4"
-       style="fill:#ffffff;fill-opacity:1;display:inline">
+       id="g20247-4"
+       transform="translate(10.000004,-1.9999957)">
       <path
-         d="m 174,3 -1,1 0,4 -4,0 -1,1 0,1 1,1 4,0 0,4 1,1 1,0 1,-1 0,-4 4,0 1,-1 0,-1 -1,-1 -4,0 0,-4 -1,-1 -1,0 z"
-         transform="translate(756,-73.637817)"
-         id="path9584-2"
-         style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
+         inkscape:connector-curvature="0"
+         style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path20243-7"
+         transform="matrix(1.009009,0,0,1.009009,-410.98649,14.371188)"
+         d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path20245-0"
+         transform="matrix(0.72072059,0,0,0.72072059,-381.41891,-22.917117)"
+         d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z" />
     </g>
-    <path
-       d="m 290,8 11,0 1,1.00002 0,1 -1,0.99998 -11,0 -1,-1 0,-1 z"
-       id="path9631"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 313.5,3.00001 c -3.03757,0 -5.5,2.46243 -5.5,5.5 0,3.03757 2.46243,5.5 5.5,5.5 1.00612,0 1.93866,-0.27827 2.75,-0.75 l 3.75,3.75 1,0 1,-1 0,-1 -3.75,-3.75 c 0.47173,-0.81134 0.75,-1.74387 0.75,-2.75 0,-3.03757 -2.46243,-5.5 -5.5,-5.5 z m -0.5,2 1,0 2,1 1,2 0,1 -1,2 -2,1 -1,0 -2,-1 -1,-2 0,-1 1,-2 2,-1 z"
-       id="path3048-0-7-5-6"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 354.5,2.9999972 c -1.5,0 -2.5,2 -2.5,3 0,0.666667 0,1.333333 0,2 0,1 1,2.1538468 1,2.1538468 l 0,0.846153 -1.69231,0.384617 c -1.45419,0.330499 -2.02608,1.236079 -2.15384,2.76923 L 349,15.999998 l 12,0 -0.15385,-1.846154 c -0.12776,-1.533151 -0.69965,-2.438731 -2.15384,-2.76923 L 357,10.999997 l 0,-0.846153 c 0,0 1,-1.1538468 1,-2.1538468 0,-0.666667 0,-1.333333 0,-2 0,-1 -1,-3 -2.5,-3 z"
-       id="path54704-4"
-       style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g20283"
+     transform="translate(301,200.63781)">
     <g
-       transform="translate(505,-613.36218)"
-       id="g9693"
-       style="opacity:0.5;fill:#000000;fill-opacity:1;display:inline">
+       id="g20285"
+       transform="translate(10.000004,-1.9999957)">
       <path
-         d="m -130.5,603 c -4.14213,0 -7.5,3.35787 -7.5,7.5 0,4.14214 3.35787,7.5 7.5,7.5 4.14213,0 7.5,-3.35786 7.5,-7.5 0,-4.14213 -3.35787,-7.5 -7.5,-7.5 z m 0,1 c 3.58393,0 6.5,2.91607 6.5,6.5 0,3.58393 -2.91607,6.5 -6.5,6.5 -3.58393,0 -6.5,-2.91607 -6.5,-6.5 0,-3.58393 2.91607,-6.5 6.5,-6.5 z"
-         transform="translate(0,52.362183)"
-         id="path9695"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <g
-         clip-path="url(#clipPath9141-6)"
-         id="g9697"
-         style="fill:#000000;fill-opacity:1">
-        <rect
-           width="1"
-           height="6"
-           x="-131"
-           y="657.36218"
-           id="rect9699"
-           style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <g
-           id="g9701"
-           style="fill:#000000;fill-opacity:1">
-          <path
-             d="m -126,609.5 c 0,1.933 -1.567,3.5 -3.5,3.5 l 0,-3.5 z"
-             transform="matrix(1.5714241,0,0,1.5714241,72.999423,-294.92081)"
-             id="path9703"
-             style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -126,615 -4.5,-4.5 0,6.5 z"
-             transform="translate(0,52.362183)"
-             id="path9705"
-             style="opacity:0.1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -135.99999,662.86218 c 0,3.03756 2.46242,5.49998 5.49999,5.49998 l 0,-5.49998 z"
-             id="path9707"
-             style="opacity:0.4;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -135.99999,662.86216 c 0,-3.03756 2.46242,-5.49998 5.49999,-5.49998 l 0,5.49998 z"
-             id="path9709"
-             style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -130.5,662.86216 -4,4.50002 -2.68804,-4.50002 z"
-             id="path9711"
-             style="opacity:0.1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -135,658.36218 4.5,4.5 0,-6.5 z"
-             id="path9713"
-             style="opacity:0.1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
+         inkscape:connector-curvature="0"
+         style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path20287"
+         transform="matrix(1.009009,0,0,1.009009,-410.98649,15.371188)"
+         d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path20289"
+         transform="matrix(0.72072059,0,0,0.72072059,-381.41891,-21.917117)"
+         d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z" />
     </g>
-    <path
-       d="m 416.5,3.9999947 c -2.48528,0 -4.5,2.0147207 -4.5,4.5 0,0.7234907 0.19662,1.3943635 0.50001,2.0000053 L 409,13.999995 l 0,1.999999 2.00001,0 3.49999,-3.499997 c 0.60565,0.303377 1.27651,0.499995 2,0.499995 2.48528,0 4.5,-2.014712 4.5,-4.4999973 0,-2.4852793 -2.01472,-4.5 -4.5,-4.5 z m 0,1.9999993 c 1.38071,0 2.5,1.1192914 2.5,2.5000007 0,1.3807157 -1.11929,2.5000003 -2.5,2.5000003 -1.38071,0 -2.5,-1.1192846 -2.5,-2.5000003 0,-1.3807093 1.11929,-2.5000007 2.5,-2.5000007 z"
-       id="path47528"
-       style="color:#000000;fill:#1c1c1c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g20299"
+     transform="translate(340,239.63781)">
     <g
-       transform="translate(-656,113.63782)"
-       id="g47761"
-       style="opacity:0.5;fill:#000000;fill-opacity:1;display:inline">
+       id="g20301"
+       transform="translate(10.000004,-1.9999957)">
       <path
-         d="m 174,3 -1,1 0,4 -4,0 -1,1 0,1 1,1 4,0 0,4 1,1 1,0 1,-1 0,-4 4,0 1,-1 0,-1 -1,-1 -4,0 0,-4 -1,-1 -1,0 z"
-         transform="translate(756,-73.637817)"
-         id="path47763"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
+         inkscape:connector-curvature="0"
+         style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path20303"
+         transform="matrix(1.009009,0,0,1.009009,-411.98649,14.371188)"
+         d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path20305"
+         transform="matrix(0.72072059,0,0,0.72072059,-382.41891,-22.917117)"
+         d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z" />
     </g>
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path20311"
+     d="m 44.999996,83.499995 a 3.5,3.5 0 0 1 -7,0 3.5,3.5 0 1 1 7,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path20313"
+     d="m 43.999995,83.499989 a 2.4999995,2.4999995 0 0 1 -4.999999,0 2.4999995,2.4999995 0 1 1 4.999999,0 z" />
+  <path
+     d="m 24,83.499993 a 1.5,1.5 0 0 1 -3,0 1.5,1.5 0 1 1 3,0 z"
+     id="path15602"
+     style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.009009;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     inkscape:connector-curvature="0" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4065"
+     d="m 454,10 -8,7 -1,-1 0,-12 1,-1 z" />
+  <g
+     id="g4611"
+     transform="matrix(0.390625,0,0,0.390625,842.1875,238.60852)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:34;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4565"
+       y="-47.637821"
+       x="-2156"
+       height="256"
+       width="256" />
     <g
-       transform="translate(-635,113.63782)"
-       id="g47765"
-       style="opacity:0.5;fill:#000000;fill-opacity:1;display:inline">
+       id="g4494"
+       transform="translate(-781,47)">
       <path
-         d="m 925,-65.637817 11,0 1,1.00002 0,1 -1,0.99998 -11,0 -1,-1 0,-1 z"
-         id="path47767"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path6718"
+         transform="matrix(2.56,0,0,2.56,-1375,-657.83782)"
+         d="m 3.90625,224.6875 7.8125,20.5 -7.8125,20.5 7.8125,20.53125 -7.8125,20.5 4.8125,1.84375 L 34.75,282.5 l 4.6875,0.71875 5.6875,-5.6875 c -3.349219,-3.88012 -5.88,-8.51217 -7.25,-13.625 L 40.5625,261.75 c -0.457539,-2.1233 -0.71875,-4.33618 -0.71875,-6.59375 0,-11.27802 6.012891,-21.19153 15,-26.6875 L 44.9375,224.6875 24.40625,232.5 l -20.5,-7.8125 z M 71,229 c -14.359404,0 -26,11.6406 -26,26 0,14.3594 11.640596,26 26,26 14.359404,0 26,-11.6406 26,-26 0,-14.3594 -11.640596,-26 -26,-26 z m 20.0625,50.15625 c -5.42082,4.51861 -12.380625,7.25 -19.96875,7.25 -2.257578,0 -4.47043,-0.26122 -6.59375,-0.71875 l -2.15625,2.65625 c -4.855312,-1.30096 -9.306172,-3.58895 -13.0625,-6.6875 l -5.875,5.875 0.71875,4.34375 -21.8125,21.84375 2.09375,0.8125 20.53125,-7.8125 20.5,7.8125 20.5,-7.8125 7.8125,-20.5 -2.6875,-7.0625 z" />
     </g>
+  </g>
+  <g
+     id="g8629"
+     transform="matrix(0.5,0,0,0.5,-342.5001,125.49999)">
+    <rect
+       style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect8627"
+       y="238.99998"
+       x="935"
+       height="100.00001"
+       width="100.00001" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path5047-4-7"
+       d="m 1035,259.46976 c -3.679,1.6066 -7.6336,2.69227 -11.7831,3.18013 4.2351,-2.49939 7.4885,-6.45736 9.0205,-11.17402 -3.9645,2.31516 -8.3552,3.99577 -13.0286,4.90089 -3.7418,-3.92491 -9.0738,-6.37759 -14.9751,-6.37759 -11.33021,0 -20.51679,9.04283 -20.51679,20.19639 0,1.58324 0.18008,3.12476 0.53217,4.60303 -17.05108,-0.8424 -32.16868,-8.88327 -42.28747,-21.10256 -1.76581,2.98278 -2.77795,6.45238 -2.77795,10.15396 0,7.00715 3.62183,13.1887 9.12688,16.81077 -3.36304,-0.1076 -6.52651,-1.01351 -9.29247,-2.52616 -0.002,0.084 -0.002,0.16796 -0.002,0.25194 0,9.78524 7.07195,17.94866 16.45764,19.80431 -1.72156,0.46135 -3.53416,0.70856 -5.40515,0.70856 -1.32202,0 -2.60724,-0.12596 -3.85969,-0.36215 2.61039,8.02355 10.18701,13.86315 19.16488,14.02559 -7.02158,5.41762 -15.8675,8.64629 -25.48033,8.64629 -1.65593,0 -3.28903,-0.0945 -4.89377,-0.28289 9.07933,5.73043 19.86348,9.07458 31.44972,9.07458 37.73703,0 58.37353,-30.77522 58.37353,-57.46492 0,-0.87573 -0.037,-1.74674 -0.063,-2.61276 4.0095,-2.84789 7.4872,-6.40461 10.238,-10.45497" />
+  </g>
+  <g
+     style="fill:#1a1a1a;fill-opacity:1"
+     id="g3815"
+     transform="translate(-25,50.000003)">
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path3648"
+       transform="translate(25,-50.000003)"
+       d="m 464,2 -1,1 0,13 1,1 11,0 1,-1 0,-10 -4,0 0,6 -2.5,-1.5 -2.5,1.5 0,-6 -2,0 0,-1 0,-1 11,0 0,-1 0,-1 -12,0 z" />
+  </g>
+  <g
+     id="g3822"
+     transform="translate(-25,70.000003)">
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path3824"
+       transform="translate(25,-50.000003)"
+       d="m 464,2 -1,1 0,13 1,1 11,0 1,-1 0,-10 -4,0 0,6 -2.5,-1.5 -2.5,1.5 0,-6 -2,0 0,-1 0,-1 11,0 0,-1 0,-1 -12,0 z" />
+  </g>
+  <g
+     id="g3837"
+     transform="translate(-26,3.0624999e-6)" />
+  <g
+     style="fill:#ffffff"
+     id="g3842"
+     transform="translate(-25,20.000003)" />
+  <rect
+     style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect6623-9"
+     y="220"
+     x="200"
+     height="100"
+     width="100" />
+  <g
+     style="display:inline"
+     id="g7459-3"
+     transform="translate(550,-25)">
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path6625-8"
+       d="m -145,255 c 0,24.88542 0,49.77083 0,74.65625 7.5,3.44792 15,6.89583 22.5,10.34375 7.5,-3.33333 15,-6.66667 22.5,-10 7.5,3.33333 15,6.66667 22.5,10 7.5,-3.44792 15,-6.89583 22.5,-10.34375 0,-24.88542 0,-49.77083 0,-74.65625 -7.5,3.33333 -15,6.66667 -22.5,10 -7.5,-3.33333 -15,-6.66667 -22.5,-10 -7.5,3.33333 -15,6.66667 -22.5,10 -7.5,-3.33333 -15,-6.66667 -22.5,-10 z m 57.40625,23.59375 5.59375,5.59375 5.59375,-5.59375 2.46236,3.16264 -5.24361,5.24361 5.59375,5.59375 -3.16264,2.46236 L -82,289.8125 l -5.59375,5.59375 -3.08736,-2.97514 5.86861,-5.43111 -5.59375,-5.59375 z m -25.1875,12.3125 c 3.02949,0.26492 6.03959,1.32487 8.375,3.31225 l -2.90625,2.78125 c -1.69778,-1.26665 -3.7758,-1.93771 -5.87485,-2.1247 0.13531,-1.3229 0.27106,-2.64608 0.4061,-3.9688 z m -4.84375,0.375 c 0.23428,1.25604 1.33288,2.86593 1.28125,3.81245 -1.9797,1.00126 -3.28203,2.99612 -4.4062,4.74985 l -3.14878,-2.51673 c 1.59525,-2.42637 3.50946,-4.89188 6.27373,-6.04557 z m 33.46875,6.28125 3.6875,1.59375 c -0.85495,2.6344 -2.05943,5.19957 -3.8749,7.3124 l -2.78125,-2.90625 c 1.37974,-1.77526 2.31524,-3.85778 2.96865,-5.9999 z m -17.21875,0.0937 c 1.52998,2.21288 2.46049,4.7627 3.84365,7.06245 l -3.59375,1.78125 c -1.26185,-2.16828 -2.15272,-4.55761 -3.5936,-6.6249 1.11453,-0.7396 2.22935,-1.47918 3.3437,-2.2188 z m -24.75,3.8125 3.4375,2.03125 c -0.94627,2.15394 -1.82847,4.38347 -2.53105,6.59365 l -3.66832,-1.66122 c 0.79087,-2.367 1.68957,-4.70832 2.76187,-6.96368 z m 36.25,4.625 1.60017,3.68116 c -2.71921,1.52252 -6.25719,2.08348 -9.13142,0.66264 l 2.16859,-3.41112 c 1.76867,0.54341 3.84526,0.007 5.36266,-0.93268 z" />
+  </g>
+  <rect
+     style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect6623-9-2"
+     y="220"
+     x="300"
+     height="100"
+     width="100" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path8139-4-6-3"
+     d="m 567.5314,229 c -8.2842,0 -15,6.71574 -15,15 0,8.28429 15,21 15,21 0,0 15,-12.71571 15,-21 0,-8.28426 -6.7158,-15 -15,-15 z M 568,238 c 3.3138,0 6,2.68629 6,6 0,3.31371 -2.6862,6 -6,6 -3.3135,0 -6,-2.68629 -6,-6 0,-3.31371 2.6865,-6 6,-6 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path5387-6-5"
+     d="m 583.5,266 c -4.14214,0 -7.5,3.35786 -7.5,7.5 0,0.75557 0.13591,1.46849 0.34375,2.15625 l -18.6875,18.6875 C 556.96849,294.13591 556.25557,294 555.5,294 c -4.14214,0 -7.5,3.35786 -7.5,7.5 0,4.14214 3.35786,7.5 7.5,7.5 4.14214,0 7.5,-3.35786 7.5,-7.5 0,-0.75557 -0.13591,-1.46849 -0.34375,-2.15625 l 18.6875,-18.6875 C 582.03151,280.86409 582.74443,281 583.5,281 c 4.14214,0 7.5,-3.35786 7.5,-7.5 0,-4.14214 -3.35786,-7.5 -7.5,-7.5 z m 0,4.5 c 1.65685,0 3,1.34315 3,3 0,1.65685 -1.34315,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65685 1.34315,-3 3,-3 z m -28,28 c 1.65685,0 3,1.34315 3,3 0,1.65685 -1.34315,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65685 1.34315,-3 3,-3 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path5288-4-8-0"
+     d="m 516.5,251 c -4.14214,0 -7.5,3.35786 -7.5,7.5 0,2.8726 1.62846,5.3652 4,6.625 l 0,13.75 c -2.37154,1.2598 -4,3.7524 -4,6.625 0,4.14214 3.35786,7.5 7.5,7.5 2.8726,0 5.3652,-1.62846 6.625,-4 l 13.75,0 c 1.2598,2.37154 3.7524,4 6.625,4 4.14214,0 7.5,-3.35786 7.5,-7.5 0,-2.8726 -1.62846,-5.3652 -4,-6.625 l 0,-13.75 c 2.37154,-1.2598 4,-3.7524 4,-6.625 0,-4.14214 -3.35786,-7.5 -7.5,-7.5 -2.90753,0 -5.41167,1.67488 -6.65625,4.09375 L 536.65625,255 523.125,255 c -1.2598,-2.37154 -3.7524,-4 -6.625,-4 z m 0,4.5 c 1.65685,0 3,1.34315 3,3 0,1.65685 -1.34315,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65685 1.34315,-3 3,-3 z m 27,0 c 1.65685,0 3,1.34315 3,3 0,1.65685 -1.34315,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65685 1.34315,-3 3,-3 z m -20.375,6.5 13.75,0 c 0.70304,1.32345 1.80155,2.42196 3.125,3.125 l 0,13.75 c -1.32345,0.70304 -2.42196,1.80155 -3.125,3.125 l -13.75,0 c -0.70304,-1.32345 -1.80155,-2.42196 -3.125,-3.125 l 0,-13.75 c 1.32345,-0.70304 2.42196,-1.80155 3.125,-3.125 z m -6.625,20.5 c 1.65685,0 3,1.34315 3,3 0,1.65685 -1.34315,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65685 1.34315,-3 3,-3 z m 27,0 c 1.65685,0 3,1.34315 3,3 0,1.65685 -1.34315,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65685 1.34315,-3 3,-3 z" />
+  <g
+     id="g7659"
+     transform="translate(-25,3.0624999e-6)" />
+  <g
+     id="g7663"
+     transform="translate(-53,28.000003)" />
+  <g
+     id="g7690"
+     transform="translate(-23.375,1.375)" />
+  <g
+     id="g7694"
+     transform="translate(-50.375,1.375)" />
+  <g
+     id="g7700"
+     transform="translate(-23.375,-25.625)" />
+  <g
+     id="g7706"
+     transform="translate(-50.375,-25.625)" />
+  <rect
+     style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect6623-9-2-3"
+     y="220"
+     x="400"
+     height="100"
+     width="100" />
+  <rect
+     style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect4211"
+     y="220"
+     x="500"
+     height="100"
+     width="100" />
+  <rect
+     style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect4219"
+     y="220"
+     x="500"
+     height="100"
+     width="100" />
+  <g
+     id="g4221"
+     transform="translate(270,5.0000031)">
     <path
-       d="m 313.5,43.00001 c -3.03757,0 -5.5,2.46243 -5.5,5.5 0,3.03757 2.46243,5.5 5.5,5.5 1.00612,0 1.93866,-0.27827 2.75,-0.75 l 3.75,3.75 1,0 1,-1 0,-1 -3.75,-3.75 c 0.47173,-0.81134 0.75,-1.74387 0.75,-2.75 0,-3.03757 -2.46243,-5.5 -5.5,-5.5 z m -0.5,2 1,0 2,1 1,2 0,1 -1,2 -2,1 -1,0 -2,-1 -1,-2 0,-1 1,-2 2,-1 z"
-       id="path47777"
-       style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#e06d5f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path4223"
+       d="m 455,232 -5,0 -3,3 0,5 58,58 5,0 3,-3 0,-5 z" />
     <path
-       d="m 354.5,42.999997 c -1.5,0 -2.5,2 -2.5,3 0,0.666667 0,1.333333 0,2 0,1 1,2.153847 1,2.153847 l 0,0.846153 -1.69231,0.384617 c -1.45419,0.330499 -2.02608,1.236079 -2.15384,2.76923 L 349,55.999998 l 12,0 -0.15385,-1.846154 c -0.12776,-1.533151 -0.69965,-2.438731 -2.15384,-2.76923 L 357,50.999997 l 0,-0.846153 c 0,0 1,-1.153847 1,-2.153847 0,-0.666667 0,-1.333333 0,-2 0,-1 -1,-3 -2.5,-3 z"
-       id="path14143"
-       style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#e06d5f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path4255"
+       d="m 505,232 5,0 3,3 0,5 -58,58 -5,0 -3,-3 0,-5 z" />
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#7092ff;fill-opacity:1;stroke:none;stroke-width:11.66666508;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     id="path4227"
+     d="m 650,228 -2,2 0,5.0625 c -18.3398,1.05112 -33,16.34328 -33,34.9375 0,19.27074 15.72926,35 35,35 19.27075,0 35,-15.72926 35,-35 0,-11.66567 -5.76668,-22.0373 -14.59375,-28.40625 l -7.1875,7.1875 C 670.3012,253.17882 675,260.99881 675,270 c 0,13.86634 -11.13365,25 -25,25 -13.86634,0 -25,-11.13366 -25,-25 0,-13.18969 10.08302,-23.8917 23,-24.90625 l 0,4.90625 2,2 3,0 12,-12 -12,-12 -3,0 z" />
+  <rect
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect8373"
+     y="320"
+     x="0"
+     height="80"
+     width="200" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path8377"
+     d="M 170.00001,351 C 161.7158,351 155,357.71573 155,366.00001 155,374.28428 170.00001,387 170.00001,387 170.00001,387 185,374.28428 185,366.00001 185,357.71573 178.2842,351 170.00001,351 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.055;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path8379"
+     d="m 162,358 c -0.4714,0 -1,0.5 -1,1 l 0,7 c 0,2.216 1,5 5,5 0.35868,0 0.68618,-0.017 1,-0.062 l 0,-2.9375 -4,0 c 0,0 0.5,-2 3,-2 0.5,0 0.69653,0.074 1,0.1875 l 0,-2.1875 c 0,-0.9167 0.36529,-1.6826 1,-2 1,-0.5 1.40372,-0.2981 2,0 1,0.5 1,0.5 1,0.5 l 0,-3.5 c 0,-0.5 -0.5286,-1 -1,-1 -1,0 -2,1 -4,1 -2,0 -3,-1 -4,-1 z m 1.75,3.5 c 0.69036,0 1.25,0.5596 1.25,1.25 0,0.6904 -0.55964,1.25 -1.25,1.25 -0.69036,0 -1.25,-0.5596 -1.25,-1.25 0,-0.6904 0.55964,-1.25 1.25,-1.25 z M 169,363 c -0.4714,0 -1,0.5 -1,1 l 0,7 c 0,2.216 1,5 5,5 4,0 5,-2.784 5,-5 l 0,-7 c 0,-0.5 -0.5286,-1 -1,-1 -1,0 -2,1 -4,1 -2,0 -3,-1 -4,-1 z m 1.75,3.5 c 0.69036,0 1.25,0.5596 1.25,1.25 0,0.6904 -0.55964,1.25 -1.25,1.25 -0.69036,0 -1.25,-0.5596 -1.25,-1.25 0,-0.6904 0.55964,-1.25 1.25,-1.25 z m 4.5,0 c 0.69036,0 1.25,0.5596 1.25,1.25 0,0.6904 -0.55964,1.25 -1.25,1.25 -0.69036,0 -1.25,-0.5596 -1.25,-1.25 0,-0.6904 0.55964,-1.25 1.25,-1.25 z m -5.25,5.5 6,0 c 0,0 -0.5,2 -3,2 -2.5,0 -3,-2 -3,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path8381"
+     d="M 30.00001,351 C 21.7158,351 15,357.71573 15,366.00001 15,374.28428 30.00001,387 30.00001,387 30.00001,387 45,374.28428 45,366.00001 45,357.71573 38.2842,351 30.00001,351 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path8383"
+     d="m 24,356 c -0.55401,0 -1,0.446 -1,1 l 0,16 c 0,0.5 0.5,1 1,1 l 9,0 c 0.5,0 1,-0.5 1,-1 l 0,-5 0.5,0 c 0.5,0 0.5,0.5 0.5,0.5 l 0,2 c 0,1 0.5,1.5 1.5,1.5 1,0 1.5,-0.5 1.5,-1.5 0,-1.1667 0,-4.5 0,-5.5 0,-1 -2,-2 -2,-3 l 0,-3 -1,0 -1,-1 0,-1 c 0,-0.554 -0.44599,-1 -1,-1 z m 1,2 7,0 0,4 -7,0 z m 9,3 1,0 c 0,0 0,0.8333 0,1.5 0,1 2,2 2,3 l 0,5 c 0,0.5 -0.5,0.5 -0.5,0.5 0,0 -0.5,0 -0.5,-0.5 0,0 0,-2 0,-2.5 0,-0.5 -0.5,-1 -1,-1 -0.33333,0 -1,0 -1,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path8385"
+     d="M 100.00001,351 C 91.7158,351 85,357.71573 85,366.00001 85,374.28428 100.00001,387 100.00001,387 100.00001,387 115,374.28428 115,366.00001 115,357.71573 108.2842,351 100.00001,351 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path8387"
+     d="m 98,358 c -3,0 -6,1.5 -6,4 l 0,2 17,0 0,-2 c -2e-5,-2.5 -3,-4 -6,-4 z m 0.5,1 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m -6,2 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z M 92,365 c -0.50003,0 -1.00001,0.5 -1,1 1e-5,0.5 0.49997,1 1,1 l 17,0 c 0.50001,0 0.99999,-0.5 1,-1 0,-0.5 -0.5,-1 -1,-1 z m 0,3 0,1 c 0,1 1,2 2,2 l 13,0 c 1,0 2,-1 2,-2 l 0,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path10172"
+     d="M 135.00001,331 C 126.7158,331 120,337.71573 120,346.00001 120,354.28428 135.00001,367 135.00001,367 135.00001,367 150,354.28428 150,346.00001 150,337.71573 143.2842,331 135.00001,331 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path10174"
+     d="M 65.00001,331 C 56.7158,331 50,337.71573 50,346.00001 50,354.28428 65.00001,367 65.00001,367 65.00001,367 80,354.28428 80,346.00001 80,337.71573 73.2842,331 65.00001,331 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect9826-2-1"
+     d="m 59,338 c -0.55401,0 -1,0.446 -1,1 l 0,9 c 0,0.554 0.44599,1 1,1 l 11,0 c 0.55401,0 1,-0.446 1,-1 l 0,-1 0.5,0 c 0.5,0 0.5,-0.5 0.5,-0.5 l 0,-0.5 1,0 c 1,0 2,-1 2,-2 l 0,-1 0,-2 c 0,-0.5 -0.5,-1 -1,-1 l -3,0 0,-1 c 0,-0.554 -0.44599,-1 -1,-1 z m 12,3 2.5,0 c 0.5,0 0.5,0.5 0.5,0.5 l 0,2.5 c 0,0.5 -0.5,1 -1,1 l -1,0 -1,0 z m -15,9 1,1 1,1 13,0 1,-1 1,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect8206-4"
+     d="m 134,338 c -0.554,0 -1,0.446 -1,1 l 0,4 -4,0 c -0.554,0 -1,0.446 -1,1 l 0,3 c 0,0.554 0.446,1 1,1 l 4,0 0,4 c 0,0.554 0.446,1 1,1 l 3,0 c 0.554,0 1,-0.446 1,-1 l 0,-4 4,0 c 0.554,0 1,-0.446 1,-1 l 0,-3 c 0,-0.554 -0.446,-1 -1,-1 l -4,0 0,-4 c 0,-0.554 -0.446,-1 -1,-1 z" />
+  <g
+     id="g10113"
+     transform="translate(350,15.000003)">
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect8477"
+       y="465"
+       x="-350"
+       height="80"
+       width="200" />
     <g
-       transform="translate(505,-633.36218)"
-       id="g33295"
-       style="fill:#ffffff;fill-opacity:1;display:inline">
+       style="fill:#7092ff;fill-opacity:1"
+       id="railway-rail"
+       transform="translate(-1110,437.63781)">
       <path
-         d="m -130.5,603 c -4.14213,0 -7.5,3.35787 -7.5,7.5 0,4.14214 3.35787,7.5 7.5,7.5 4.14213,0 7.5,-3.35786 7.5,-7.5 0,-4.14213 -3.35787,-7.5 -7.5,-7.5 z m 0,1 c 3.58393,0 6.5,2.91607 6.5,6.5 0,3.58393 -2.91607,6.5 -6.5,6.5 -3.58393,0 -6.5,-2.91607 -6.5,-6.5 0,-3.58393 2.91607,-6.5 6.5,-6.5 z"
-         transform="translate(0,52.362183)"
-         id="path33297"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect17528-7"
+         d="m 853.5,50.362183 -1.5,1 -0.4688,2 -3.2812,0 c -0.554,0 -0.8656,0.462541 -1,1 l -0.25,1 c -0.1344,0.537459 0.446,1 1,1 l 24,0 c 0.554,0 1.1344,-0.462541 1,-1 l -0.25,-1 c -0.1344,-0.537459 -0.446,-1 -1,-1 l -2.7812,0 -0.4688,-2 -1.5,-1 -1,1 0.4688,2 -12.4376,0 0.4688,-2 -1,-1 z m -2,4 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m 17,0 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m -17.9375,3 -0.4687,2 -2.8438,0 c -0.554,0 -0.8656,0.462541 -1,1 l -0.25,1 c -0.1344,0.537459 0.446,1 1,1 l 26,0 c 0.554,0 1.1344,-0.462541 1,-1 l -0.25,-1 c -0.1344,-0.537459 -0.446,-1 -1,-1 l -2.3438,0 -0.4687,-2 -2.5,0 0.4687,2 -15.3124,0 0.4687,-2 -2.5,0 z m -0.0625,3 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m 19,0 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m -20.3438,3 -0.4687,2 -2.4375,0 c -0.554,0 -0.8656,0.462541 -1,1 l -0.25,1 c -0.1344,0.537459 0.446,1 1,1 l 28,0 c 0.554,0 1.1344,-0.462541 1,-1 l -0.25,-1 c -0.1344,-0.537459 -0.446,-1 -1,-1 l -1.9375,0 -0.4687,-2 -2.5,0 0.4687,2 -18.125,0 0.4687,-2 -2.5,0 z m 0.3438,3 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m 21,0 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m -22.7812,3 -0.7188,3 1.5,1 1,-1 0.7188,-3 -2.5,0 z m 22.5624,0 0.7188,3 1,1 1.5,-1 -0.7188,-3 -2.5,0 z" />
       <g
-         clip-path="url(#clipPath9141-6)"
-         id="g33299"
-         style="fill:#ffffff;fill-opacity:1">
+         style="fill:#7092ff;fill-opacity:1"
+         id="g22103"
+         transform="translate(110,0)">
+        <rect
+           style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect22091"
+           y="77.362183"
+           x="730"
+           height="3"
+           width="40" />
+        <rect
+           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect22093"
+           y="78.362183"
+           x="764"
+           height="1.0000004"
+           width="5" />
+        <rect
+           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect22095"
+           y="78.362183"
+           x="753"
+           height="1.0000004"
+           width="5" />
+        <rect
+           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect22097"
+           y="78.362183"
+           x="742"
+           height="1.0000004"
+           width="5" />
         <rect
-           width="1"
-           height="6"
-           x="-131"
-           y="657.36218"
-           id="rect33301"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <g
-           id="g33303"
-           style="fill:#ffffff;fill-opacity:1">
-          <path
-             d="m -126,609.5 c 0,1.933 -1.567,3.5 -3.5,3.5 l 0,-3.5 z"
-             transform="matrix(1.5714241,0,0,1.5714241,72.999423,-294.92081)"
-             id="path33305"
-             style="opacity:0.2;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -126,615 -4.5,-4.5 0,6.5 z"
-             transform="translate(0,52.362183)"
-             id="path33307"
-             style="opacity:0.1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -135.99999,662.86218 c 0,3.03756 2.46242,5.49998 5.49999,5.49998 l 0,-5.49998 z"
-             id="path33309"
-             style="opacity:0.4;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -135.99999,662.86216 c 0,-3.03756 2.46242,-5.49998 5.49999,-5.49998 l 0,5.49998 z"
-             id="path33311"
-             style="opacity:0.6;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -130.5,662.86216 -4,4.50002 -2.68804,-4.50002 z"
-             id="path33313"
-             style="opacity:0.1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -135,658.36218 4.5,4.5 0,-6.5 z"
-             id="path33315"
-             style="opacity:0.1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-        </g>
+           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect22099"
+           y="78.362183"
+           x="731"
+           height="1.0000004"
+           width="5" />
       </g>
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path26156"
+         transform="matrix(1.6666667,0,0,1.6666667,828.66667,-31.97115)"
+         d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path26158"
+         transform="translate(849,12.362188)"
+         d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path26160"
+         transform="matrix(1.6666667,0,0,1.6666667,789.66667,-31.97115)"
+         d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path26162"
+         transform="translate(810,12.362188)"
+         d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" />
     </g>
+    <g
+       style="fill:#7092ff;fill-opacity:1"
+       id="highway-unclassified"
+       transform="translate(-510,437.63781)">
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path7143"
+         d="m 192.5,52.36218 -2.875,6 -1.625,0 -1,1 0,2 1.40625,0 -0.40625,1 0,5 0,1 0,0 c 0,0 0.60826,0.60826 1,1 l 1,0 4,0 2,1 8,0 2,-1 4,0 1,0 1,-1 0,0 0,-1 0,-5 -0.40625,-1 1.40625,0 0,-2 -1,-1 -1.625,0 -2.875,-6 z m 1,3 13,0 1.5,4 -1,1 -14,0 -1,-1 z m -2.5,8 3,0 1,2 0,1 -4,0 -1,-1 0,-1 z m 15,0 3,0 1,1 0,1 -1,1 -4,0 0,-1 z m -17,7 0,2 1,1 3,0 1,-1 0,-2 z m 17,0 0,2 1,1 3,0 1,-1 0,-2 z" />
+      <rect
+         style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect7157"
+         y="78.362183"
+         x="181"
+         height="0.9999997"
+         width="38" />
+      <g
+         style="fill:#7092ff;fill-opacity:1"
+         id="g7159"
+         transform="translate(551,1)">
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path7161"
+           transform="translate(-510,12.362183)"
+           d="m 139.5,64 c -1.38071,0 -2.5,1.119288 -2.5,2.5 0,1.380712 1.11929,2.5 2.5,2.5 l 39,0 c 1.38071,0 2.5,-1.119288 2.5,-2.5 0,-1.380712 -1.11929,-2.5 -2.5,-2.5 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path7163"
+           transform="translate(-730.5,7.362183)"
+           d="m 362,70 c 0.31019,0.41644 0.5,0.940812 0.5,1.5 0,0.559188 -0.18981,1.08356 -0.5,1.5 l 35,0 c -0.31019,-0.41644 -0.5,-0.940812 -0.5,-1.5 0,-0.559188 0.18981,-1.08356 0.5,-1.5 l -35,0 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path7165"
+           transform="translate(-401,12.362183)"
+           d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path7169"
+           transform="translate(-362,12.362183)"
+           d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" />
+      </g>
+    </g>
+  </g>
+  <rect
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect9903"
+     y="400"
+     x="0"
+     height="80"
+     width="200" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path10275"
+     d="m 128.9551,427.41503 a 27.453954,11.521752 2.2978319 1 1 -54.160208,-5.49081 27.453954,11.521752 2.2978319 0 1 54.160208,5.49081 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path9990"
+     d="m 53,436 -35,10 0,-6 35,-10 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path9986"
+     d="m 54,430.5 0,6 29,14.5 0,-6 -29,-14.5 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#8cd05f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path10000"
+     d="m 173.5,428 c -1.22936,2e-4 -2.22819,0.8933 -2.4375,2.0625 C 170.87885,430.0195 170.69675,430 170.5,430 c -1.38071,0 -2.5,1.1193 -2.5,2.5 0,0.6391 0.23046,1.21425 0.625,1.65625 -0.94522,0.3566 -1.625,1.27365 -1.625,2.34375 0,1.3807 1,2.5 2.5,2.5 l 0.5,0 2,3.5 0,1.4375 c -1.47915,-0.43159 -2.8857,-0.88035 -4,-1.4375 -5,-2.5 -9.43382,-6.98268 -15,-7.5 -6.04072,-0.56143 -11.66667,3.33333 -17.5,5 -5.83333,1.66667 -16.93857,1.9593 -17.5,8 L 148,462.99997 183,453 c 0.32572,-3.50467 -3.70814,-6.98659 -8,-8.21875 l 0,-2.28125 2,-3.5 0.71875,0 C 179,439.0145 180,437.805 180,436.5 c 0,-1.0701 -0.67978,-1.98715 -1.625,-2.34375 0.39454,-0.442 0.625,-1.01715 0.625,-1.65625 0,-1.3807 -1.11929,-2.5 -2.5,-2.5 -0.19675,0 -0.37885,0.0195 -0.5625,0.0625 -0.20931,-1.1692 -1.20813,-2.0628 -2.4375,-2.0625 z m -1.5,11 3,0 -1,2 -1,0 z" />
+  <g
+     id="g10052"
+     transform="translate(340,-200)">
     <path
-       d="m 416.5,23.999996 c -2.48528,0 -4.5,2.01472 -4.5,4.499999 0,0.723491 0.19662,1.394364 0.50001,2.000006 L 409,33.999996 l 0,1.999999 2.00001,0 3.49999,-3.499997 c 0.60565,0.303377 1.27651,0.499995 2,0.499995 2.48528,0 4.5,-2.014712 4.5,-4.499998 0,-2.485279 -2.01472,-4.499999 -4.5,-4.499999 z m 0,1.999999 c 1.38071,0 2.5,1.119291 2.5,2.5 0,1.380716 -1.11929,2.500001 -2.5,2.500001 -1.38071,0 -2.5,-1.119285 -2.5,-2.500001 0,-1.380709 1.11929,-2.5 2.5,-2.5 z"
-       id="path33341"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.55555558;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 31,144 -1,1 0,1 1,1 8,0 1,-1 0,-1 -1,-1 z m 0,4 0,7 1,1 6,0 1,-1 0,-7 z m 2,2 1,0 0,4 -1,0 0,-1 z m 3,0 1,0 0,3 0,1 -1,0 z"
-       id="path9820"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#c1c1c1;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path10048"
+       d="m -322,646 30,15 0,-6 -30,-15 z" />
     <path
-       d="m 89,145.01282 c -1,0 -2,1 -2,2 l 0,2 3,0 2,1 -2,1 -3,0 0,2 c 0,1 1,2 2,2 l 1,0 c 2,0 2.48722,-0.97443 3,-2 l 1,-2 9,-5 c 0,0 0,-1 -2,-1 L 93.96875,148.91907 93,147.01282 c -0.49406,-0.98812 -1,-2 -3,-2 z m 0,1 2,0 1,2 -4,0 c 0,0 0,-0.66667 0,-1 0,-1.01282 1,-1 1,-1 z m 8.09375,4.71875 -2,1 5.90625,3.28125 c 2,0 2,-1 2,-1 z M 88,152.01282 l 4,0 -1,2 -2,0 c 0,0 -1,0 -1,-1 z"
-       id="path9826"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#c1c1c1;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path10050"
+       d="m -257,651 -35,10 0,-6 35,-10 z" />
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path9980"
+     d="m 18,446 30,15 0,-6 -30,-15 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path9982"
+     d="m 83,451 -35,10 0,-6 35,-10 z" />
+  <rect
+     style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect10169"
+     transform="scale(-1,1)"
+     y="1.0262482e-16"
+     x="-699.86035"
+     height="560"
+     width="699.86035" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path10271"
+     d="m 107,417 c 0,0 2.63599,3.5293 5.4375,3.96875 C 107.96029,420.81568 107,419 107,419 c 0,0 -0.96029,1.81568 -5.4375,1.96875 C 104.36401,420.5293 107,417 107,417 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path10269"
+     d="m 93,419 c 0,0 2.63599,3.5293 5.4375,3.96875 C 93.96029,422.81568 93,421 93,421 c 0,0 -0.96029,1.81568 -5.4375,1.96875 C 90.36401,422.5293 93,419 93,419 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path10253"
+     d="m 103,424 c 0,0 2.63599,3.5293 5.4375,3.96875 C 103.96029,427.81568 103,426 103,426 c 0,0 -0.96029,1.81568 -5.4375,1.96875 C 100.36401,427.5293 103,424 103,424 z" />
+  <g
+     id="waterway-river"
+     transform="translate(-260,452.63781)">
+    <rect
+       style="color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect24309"
+       y="77.362183"
+       x="400"
+       height="3.0000014"
+       width="40" />
     <path
-       d="m 55,141 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z"
-       id="path4824"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="245"
+       d="m 406.76193,73.362183 c 0,0 -0.53638,-1.846128 -0.34524,-2.75 0.22134,-1.046677 1.65476,-2.75 1.65476,-2.75 0,0 1.43342,-1.703323 1.65476,-2.75 0.19114,-0.903872 -0.34524,-2.75 -0.34524,-2.75 0,0 -0.53639,-1.846127 -0.34525,-2.75 0.22134,-1.046678 1.65476,-2.75 1.65476,-2.75 0,0 1.43342,-1.703323 1.65476,-2.75 0.19114,-0.903872 -0.34524,-2.75 -0.34524,-2.75 l 16.5,0 c 0,0 1.43342,1.703323 1.65476,2.75 0.19115,0.903872 -0.34523,2.75 -0.34523,2.75 0,0 -0.53638,1.846128 -0.34524,2.75 0.22134,1.046679 1.65477,2.75 1.65477,2.75 0,0 1.43342,1.703323 1.65476,2.75 0.19115,0.903872 -0.34523,2.75 -0.34523,2.75 0,0 -0.53638,1.846128 -0.34524,2.75 0.22134,1.046679 1.65477,2.75 1.65477,2.75 z" />
     <path
-       d="m 189,142 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
-       id="path4822"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="opacity:0.5;color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path25543"
+       transform="matrix(0.48296291,0.12940952,-0.19411409,0.72444365,27.631711,-76.388519)"
+       d="m 808,51 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z" />
     <path
-       d="m 133,145 -4,5 4,5 2,0 0,-1 -3.5,-4 3.5,-4 0,-1 -2,0 z"
-       id="path4820"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="opacity:0.5;color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path25545"
+       transform="matrix(0.64951905,0.375,-0.50000001,0.86602541,-89.512357,-292.05512)"
+       d="m 808,51 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z" />
     <path
-       d="m 139,145 -4,5 4,5 2,0 0,-1 -3.5,-4 3.5,-4 0,-1 -2,0 z"
-       id="path4818"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="opacity:0.5;color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path25547"
+       transform="matrix(-0.48296291,0.12940952,0.19411409,0.72444365,811.75652,-82.439629)"
+       d="m 808,51 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z" />
     <path
-       d="m 47.84375,146 c -0.77652,0.0669 -1.494002,0.58712 -1.75,1.375 -0.341331,1.05051 0.230742,2.18992 1.28125,2.53125 1.050508,0.34133 2.189919,-0.23074 2.53125,-1.28125 0.341331,-1.05051 -0.230742,-2.18992 -1.28125,-2.53125 -0.262627,-0.0853 -0.52241,-0.11611 -0.78125,-0.0937 z"
-       id="path4816"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="opacity:0.5;color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path25549"
+       transform="matrix(-0.64951905,0.375,0.50000001,0.86602541,933.61049,-277.05512)"
+       d="m 808,51 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z" />
     <path
-       d="m 61.78125,146 c -0.132056,0.0149 -0.274936,0.0512 -0.40625,0.0937 -1.050508,0.34133 -1.622581,1.48074 -1.28125,2.53125 0.341331,1.05051 1.480742,1.62258 2.53125,1.28125 1.050508,-0.34133 1.622581,-1.48074 1.28125,-2.53125 -0.298664,-0.91919 -1.20061,-1.47926 -2.125,-1.375 z"
-       id="path4814"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path26103"
+       transform="matrix(1.6666667,0,0,1.6666667,388.66667,-31.97115)"
+       d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" />
     <path
-       d="m 67,148 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z"
-       id="path4812"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path26105"
+       transform="translate(409,12.362188)"
+       d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" />
     <path
-       d="m 75,148 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z"
-       id="path4810"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path26107"
+       transform="matrix(1.6666667,0,0,1.6666667,349.66667,-31.97115)"
+       d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" />
     <path
-       d="m 83,148 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z"
-       id="path4808"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path26109"
+       transform="translate(370,12.362188)"
+       d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" />
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path10391"
+     d="m 425,30 8,7 1,-1 0,-12 -1,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path10393"
+     d="m 454,30 -8,7 -1,-1 0,-12 1,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3399"
+     d="m 6,164 -1,1 0,1 1,1 8,0 1,-1 0,-1 -1,-1 z m 0,4 0,7 1,1 6,0 1,-1 0,-7 z m 2,2 1,0 0,4 -1,0 0,-1 z m 3,0 1,0 0,3 0,1 -1,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3403"
+     d="m 64,165.01282 c -1,0 -2,1 -2,2 l 0,2 3,0 2,1 -2,1 -3,0 0,2 c 0,1 1,2 2,2 l 1,0 c 2,0 2.48722,-0.97443 3,-2 l 1,-2 9,-5 c 0,0 0,-1 -2,-1 L 68.96875,168.91907 68,167.01282 c -0.49406,-0.98812 -1,-2 -3,-2 z m 0,1 2,0 1,2 -4,0 c 0,0 0,-0.66667 0,-1 0,-1.01282 1,-1 1,-1 z m 8.09375,4.71875 -2,1 L 76,175.01282 c 2,0 2,-1 2,-1 z M 63,172.01282 l 4,0 -1,2 -2,0 c 0,0 -1,0 -1,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3407"
+     d="m 44.8125,169.01282 c 0.11352,0.31647 0.1875,0.64447 0.1875,1 0,0.35553 -0.074,0.68353 -0.1875,1 l 2.375,0 c -0.11352,-0.31647 -0.1875,-0.64447 -0.1875,-1 0,-0.35553 0.074,-0.68353 0.1875,-1 l -2.375,0 z m 8,0 c 0.11352,0.31647 0.1875,0.64447 0.1875,1 0,0.35553 -0.074,0.68353 -0.1875,1 l 2.375,0 c -0.11352,-0.31647 -0.1875,-0.64447 -0.1875,-1 0,-0.35553 0.074,-0.68353 0.1875,-1 l -2.375,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3409"
+     d="m 42,168 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z m 8,0 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z m 8,0 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
+     id="path3415"
+     d="m 130,168 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.50000125;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     id="path3419"
+     d="m 27.03125,162.60657 c -1.32908,0.53118 -2.444369,1.41916 -3.3125,2.53125 0.07092,0.0184 0.149734,0.009 0.21875,0.0312 0.520689,0.16918 0.941853,0.48986 1.28125,0.875 0.583365,-0.69731 1.320919,-1.23792 2.15625,-1.625 -0.228003,-0.42194 -0.375,-0.89709 -0.375,-1.4062 0,-0.14028 0.0122,-0.27085 0.03125,-0.40625 z m 5.9375,0 C 32.9878,162.74197 33,162.87254 33,163.01282 c 0,0.50911 -0.146997,0.98426 -0.375,1.40625 0.835331,0.38708 1.572885,0.92769 2.15625,1.625 0.339397,-0.38514 0.760561,-0.70582 1.28125,-0.875 0.06748,-0.0219 0.146303,-0.0395 0.21875,-0.0625 -0.866395,-1.10291 -1.991152,-1.97191 -3.3125,-2.5 z m -10.9375,8.21875 c 0.132811,1.35398 0.618313,2.61506 1.34375,3.6875 0.05422,-0.0956 0.121594,-0.19054 0.1875,-0.28125 0.298579,-0.41096 0.689964,-0.72255 1.125,-0.9375 -0.439267,-0.72096 -0.728373,-1.5606 -0.84375,-2.4375 -0.563589,0.16464 -1.184566,0.16262 -1.78125,-0.0312 -0.009,-0.003 -0.02228,0.003 -0.03125,0 z m 15.90625,0 c -0.596684,0.19387 -1.217661,0.19589 -1.78125,0.0312 -0.115377,0.8769 -0.404483,1.71654 -0.84375,2.4375 0.438042,0.20421 0.821177,0.51932 1.125,0.9375 0.06591,0.0907 0.133279,0.18566 0.1875,0.28125 0.725438,-1.07244 1.210939,-2.33352 1.34375,-3.6875 -0.009,0.003 -0.02224,-0.003 -0.03125,0 z M 29,176.16907 c -0.03014,0.55835 -0.21394,1.114 -0.5625,1.59375 -0.027,0.0372 -0.06534,0.0582 -0.09375,0.0937 0.540476,0.11583 1.081942,0.1875 1.65625,0.1875 0.574308,0 1.115774,-0.0717 1.65625,-0.1875 -0.02841,-0.0355 -0.06675,-0.0566 -0.09375,-0.0937 -0.34856,-0.47975 -0.532362,-1.0354 -0.5625,-1.59375 -0.329444,0.0535 -0.654988,0.0937 -1,0.0937 -0.345012,0 -0.670556,-0.0403 -1,-0.0937 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3423"
+     d="m 30,161 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z m -7.15625,5 c -0.77652,0.0669 -1.494002,0.58712 -1.75,1.375 -0.341331,1.05051 0.230742,2.18992 1.28125,2.53125 1.050508,0.34133 2.189919,-0.23074 2.53125,-1.28125 0.341331,-1.05051 -0.230742,-2.18992 -1.28125,-2.53125 -0.262627,-0.0853 -0.52241,-0.11606 -0.78125,-0.0937 z m 13.9375,0 c -0.132056,0.0149 -0.274936,0.0511 -0.40625,0.0937 -1.050508,0.34133 -1.622581,1.48074 -1.28125,2.53125 0.341331,1.05051 1.480742,1.62258 2.53125,1.28125 1.050508,-0.34133 1.622581,-1.48074 1.28125,-2.53125 -0.298664,-0.91919 -1.20061,-1.47926 -2.125,-1.375 z m -10.71875,8 c -0.641658,-0.0219 -1.281719,0.25399 -1.6875,0.8125 -0.64925,0.89362 -0.456116,2.16325 0.4375,2.8125 0.893616,0.64925 2.16325,0.45612 2.8125,-0.4375 0.64925,-0.89362 0.456116,-2.16325 -0.4375,-2.8125 -0.335106,-0.24347 -0.740005,-0.36184 -1.125,-0.375 z m 7.875,0 c -0.384995,0.0132 -0.789894,0.13153 -1.125,0.375 -0.893615,0.64925 -1.08675,1.91888 -0.4375,2.8125 0.64925,0.89362 1.918885,1.08675 2.8125,0.4375 0.893615,-0.64925 1.08675,-1.91888 0.4375,-2.8125 -0.405781,-0.55851 -1.045842,-0.83443 -1.6875,-0.8125 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3427"
+     d="m 84,166.01282 -4,4 4,4 1,-1 0,-2 2.1875,0 c -0.11352,-0.31647 -0.1875,-0.64447 -0.1875,-1 0,-0.34518 0.0802,-0.69136 0.1875,-1 l -2.1875,0 0,-2 -1,-1 z m 12,0 -1,1 0,2 -2.1875,0 c 0.10728,0.30864 0.1875,0.65482 0.1875,1 0,0.35553 -0.074,0.68353 -0.1875,1 l 2.1875,0 0,2 1,1 4,-4 -4,-4 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3429"
+     d="m 91.999998,169.99998 a 2.0000003,2.0000003 0 0 1 -4.000001,0 2.0000003,2.0000003 0 1 1 4.000001,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3433"
+     d="m 108,165 -4,5 4,5 2,0 0,-1 -3.5,-4 3.5,-4 0,-1 -2,0 z m 6,0 -4,5 4,5 2,0 0,-1 -3.5,-4 3.5,-4 0,-1 -2,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3437"
+     d="m 149,163 -1,1 0,4 -4,0 -1,1 0,2 1,1 4,0 0,4 1,1 2,0 1,-1 0,-4 4,0 1,-1 0,-2 -1,-1 -4,0 0,-4 -1,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path3412"
+     d="m 164,162 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path3410"
+     d="m 164,174 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path3443"
+     d="m 176,174 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3445"
+     d="m 190,160 -1,1 0,1.0625 c -3.94444,0.49381 -7,3.85922 -7,7.9375 0,4.41827 3.58173,8 8,8 4.41827,0 8,-3.58173 8,-8 0,-2.46731 -1.11852,-4.65856 -2.875,-6.125 l -1.40625,1.40625 C 195.11409,166.37996 196,168.08592 196,170 c 0,3.3137 -2.6863,6 -6,6 -3.3137,0 -6,-2.6863 -6,-6 0,-2.97561 2.15859,-5.43327 5,-5.90625 l 0,0.90625 1,1 3,-3 -3,-3 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     id="path3451"
+     d="m 208,162 c -1.33333,0 -2.21875,0.78125 -2.71875,1.28125 -0.5,0.5 -0.61458,0.71875 -1.28125,0.71875 l -1,0 0,2 1,0 c 1.33333,0 2.21875,-0.78125 2.71875,-1.28125 0.5,-0.5 0.61458,-0.71875 1.28125,-0.71875 0.16667,0 0.20569,0.009 0.40625,0.25 0.20056,0.24067 0.4375,0.6875 0.6875,1.1875 0.25,0.5 0.51306,1.05317 0.9375,1.5625 0.42444,0.50933 1.13542,1 1.96875,1 1.33333,0 2.21875,-0.78125 2.71875,-1.28125 0.5,-0.5 0.61458,-0.71875 1.28125,-0.71875 l 1,0 0,-2 -1,0 c -1.33333,0 -2.21875,0.78125 -2.71875,1.28125 -0.5,0.5 -0.61458,0.71875 -1.28125,0.71875 -0.16667,0 -0.20569,-0.009 -0.40625,-0.25 -0.20056,-0.24067 -0.4375,-0.6875 -0.6875,-1.1875 -0.25,-0.5 -0.51306,-1.05317 -0.9375,-1.5625 -0.42444,-0.50933 -1.13542,-1 -1.96875,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     id="path3453"
+     d="m 203,176 0,2 14,0 0,-2 -14,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3404-8"
+     d="m 507.5,2 0,1 1,1 -4.5,4.5000001 0,0.5 L 504,10 l 1.5,0 4.5,-4.5 1,1 1,0 0,-3.5 0,-1 -1,0 z m -6.5,1 -1,1 0,9 1,1 9,0 1,-1 0,-4.9999999 L 509,10 l 0,2 -1,0 -1,0 -4,0 -1,0 0,-5 0,-2 1,0 1,0 2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#597be7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path5520"
+     d="m 507.5,16 0,1 1,1 -4.5,4.5 0,0.5 0,1 1.5,0 4.5,-4.5 1,1 1,0 0,-3.5 0,-1 -1,0 z m -6.5,1 -1,1 0,9 1,1 9,0 1,-1 0,-5 -2,2 0,2 -1,0 -1,0 -4,0 -1,0 0,-5 0,-2 1,0 1,0 2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4657"
+     d="m 89,22 -5,4.5 5,4.5 0,-3 3,0 1,1 0,3 -1,1 -5,0 -1,1 0,1 1,1 5,0 2,-1 1,-1 1,-2 0,-3 -1,-2 -1,-1 -2,-1 -3,0 z m 22,0 0,3 -3,0 -2,1 -1,1 -1,2 0,3 1,2 1,1 2,1 5,0 1,-1 0,-1 -1,-1 -5,0 -1,-1 0,-3 1,-1 3,0 0,3 5,-4.5 z m -57,1 -1,1 0,1.59375 L 46.59375,32 45,32 l -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 L 54.40625,27 56,27 l 1,-1 0,-2 -1,-1 z m 96,0 -6,6 1,1 3,0 0,6 1,1 2,0 1,-1 0,-6 3,0 1,-1 z M 32,24 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 23,0 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 C 54.30935,25.71998 54.28,25.69066 54.25,25.65625 54.09665,25.480519 54,25.251521 54,25 c 0,-0.55228 0.44772,-1 1,-1 z m 10,0 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 z m 69.5,0 -4.9375,8.5625 L 126,29 l -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 z m 30.5,0 -1,1 0,1 4,4 -4,4 0,1 1,1 1,0 4,-4 4,4 1,0 1,-1 0,-1 -4,-4 4,-4 0,-1 -1,-1 -1,0 -4,4 -4,-4 z m 21,0 -1,1 0,1 1,1 8,0 1,-1 0,-1 -1,-1 z M 66,25 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 132,0 -1,1 0,1 3,3 -3,3 0,1 1,1 1,0 3,-3 3,3 1,0 1,-1 0,-1 -3,-3 3,-3 0,-1 -1,-1 -1,0 -3,3 -3,-3 z M 32.15625,27 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 z M 68,27 l 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 z m 118,1 0,7 1,1 6,0 1,-1 0,-7 z m 2,2 1,0 0,4 -1,0 0,-1 z m 3,0 1,0 0,3 0,1 -1,0 z M 46,33 c 0.25152,0 0.48052,0.0967 0.65625,0.25 L 46.75,33.34375 C 46.90335,33.519481 47,33.748484 47,34 c 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 20,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z" />
+  <g
+     style="fill:#ffffff;fill-opacity:1;display:inline"
+     id="g4659"
+     transform="translate(-681,93.63782)">
     <path
-       d="m 115,148 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
-       id="path4806"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4661"
+       transform="translate(756,-73.637817)"
+       d="m 174,3 -1,1 0,4 -4,0 -1,1 0,1 1,1 4,0 0,4 1,1 1,0 1,-1 0,-4 4,0 1,-1 0,-1 -1,-1 -4,0 0,-4 -1,-1 -1,0 z" />
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4663"
+     d="m 265,28.000003 11,0 1,1.00002 0,1 -1,0.99998 -11,0 -1,-1 0,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4665"
+     d="m 288.5,23.000013 c -3.03757,0 -5.5,2.46243 -5.5,5.5 0,3.03757 2.46243,5.5 5.5,5.5 1.00612,0 1.93866,-0.27827 2.75,-0.75 l 3.75,3.75 1,0 1,-1 0,-1 -3.75,-3.75 c 0.47173,-0.81134 0.75,-1.74387 0.75,-2.75 0,-3.03757 -2.46243,-5.5 -5.5,-5.5 z m -0.5,2 1,0 2,1 1,2 0,1 -1,2 -2,1 -1,0 -2,-1 -1,-2 0,-1 1,-2 2,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4667"
+     d="m 329.5,23 c -1.5,0 -2.5,2 -2.5,3 0,0.666667 0,1.333333 0,2 0,1 1,2.153847 1,2.153847 L 328,31 l -1.69231,0.384617 c -1.45419,0.330499 -2.02608,1.236079 -2.15384,2.76923 L 324,36.000001 l 12,0 -0.15385,-1.846154 c -0.12776,-1.533151 -0.69965,-2.438731 -2.15384,-2.76923 L 332,31 l 0,-0.846153 c 0,0 1,-1.153847 1,-2.153847 0,-0.666667 0,-1.333333 0,-2 0,-1 -1,-3 -2.5,-3 z" />
+  <rect
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect4769"
+     y="155"
+     x="167"
+     height="2"
+     width="6" />
+  <rect
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect4769-6"
+     y="147"
+     x="163"
+     height="5.9999971"
+     width="2" />
+  <rect
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect4789"
+     y="149"
+     x="45"
+     height="2"
+     width="2" />
+  <rect
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect4791"
+     y="149"
+     x="53"
+     height="2"
+     width="2" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4863"
+     d="m 163,167 2,0 c 0,2.00001 0,4 0,6 l -2,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4863-8"
+     d="m 167,175 6,0 c 0,0.66667 0,1.33333 0,2 l -6,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3848"
+     d="m 206,5 -1,1 0,1 3,3 -3,3 0,1 1,1 1,0 3,-3 3,3 1,0 1,-1 0,-1 -3,-3 3,-3 0,-1 -1,-1 -1,0 -3,3 -3,-3 -1,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path2997-6"
+     d="m 89,42 -5,4.5 5,4.5 0,-3 3,0 1,1 0,3 -1,1 -5,0 -1,1 0,1 1,1 5,0 2,-1 1,-1 1,-2 0,-3 -1,-2 -1,-1 -2,-1 -3,0 z m 22,0 0,3 -3,0 -2,1 -1,1 -1,2 0,3 1,2 1,1 2,1 5,0 1,-1 0,-1 -1,-1 -5,0 -1,-1 0,-3 1,-1 3,0 0,3 5,-4.5 z m -57,1 -1,1 0,1.59375 L 46.59375,52 45,52 l -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 L 54.40625,47 56,47 l 1,-1 0,-2 -1,-1 z m 96,0 -6,6 1,1 3,0 0,6 1,1 2,0 1,-1 0,-6 3,0 1,-1 z M 32,44 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 23,0 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 C 54.30935,45.71998 54.28,45.69066 54.25,45.65625 54.09665,45.480519 54,45.251521 54,45 c 0,-0.55228 0.44772,-1 1,-1 z m 10,0 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 z m 69.5,0 -4.9375,8.5625 L 126,49 l -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 z m 30.5,0 -1,1 0,1 4,4 -4,4 0,1 1,1 1,0 4,-4 4,4 1,0 1,-1 0,-1 -4,-4 4,-4 0,-1 -1,-1 -1,0 -4,4 -4,-4 z m 21,0 -1,1 0,1 1,1 8,0 1,-1 0,-1 -1,-1 z M 66,45 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m -41.84375,2 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 z M 68,47 l 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 z m 118,1 0,7 1,1 6,0 1,-1 0,-7 z m 2,2 1,0 0,4 -1,0 0,-1 z m 3,0 1,0 0,3 0,1 -1,0 z M 46,53 c 0.25152,0 0.48052,0.0967 0.65625,0.25 L 46.75,53.34375 C 46.90335,53.519481 47,53.748484 47,54 c 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 20,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4802-1"
+     d="m 190,168 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#bfbfbf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4861-8"
+     d="m 130,161 -3,3 1,1 1,0 0,2 2,0 0,-2 1,0 1,-1 -3,-3 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#bfbfbf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4859-2"
+     d="m 124,167 -3,3 3,3 1,-1 0,-1 2,0 0,-2 -2,0 0,-1 -1,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#bfbfbf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4857-6"
+     d="m 136,167 -1,1 0,1 -2,0 0,2 2,0 0,1 1,1 3,-3 -3,-3 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#bfbfbf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4855-0"
+     d="m 130,168 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#bfbfbf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4804-3"
+     d="m 129,173 0,2 -1,0 -1,1 3,3 3,-3 -1,-1 -1,0 0,-2 -2,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path5237"
+     d="m 209,147.5 0,3.5 -1,0 -1,1 3,3 3,-3 -1,-1 -1,0 0,-1.5 c -1.70008,-0.85011 -2,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path5239-7"
+     d="m 207,172 1,-1 1,0 0,-3.5 c 0,0 0.29992,1.14989 2,2 0,0.591 0,1.5 0,1.5 l 1,0 1,1 -3,3 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect3843"
+     d="m 232.5,251.25 c -1.385,0 -2.5,1.115 -2.5,2.5 l 0,37.5 c 0,1.385 1.115,2.5 2.5,2.5 l 20,0 0.10937,-20 -5.10937,0 0,-5 5,0 0,-1.5 c 0,-1.82822 0.17535,-3.11147 0.5,-4 0.44424,-1.19602 1.38937,-2.26525 2.5,-3 1.1277,-0.75177 2.48379,-1.49996 4.5,-1.5 2.5,0 4.1947,0.87241 5.45976,2.03147 l -1.63603,3.63589 c -0.95686,-0.17083 -2.46942,-0.66733 -3.32373,-0.66736 -1.4011,3e-5 -1.78946,0.016 -2.37039,0.61398 -0.58094,0.59806 -0.62961,0.74575 -0.62961,2.38602 l 0,2 6.5,0 0,5 -6.5,0 0,20 10,0 c 1.385,0 2.5,-1.115 2.5,-2.5 l 0,-37.5 c 0,-1.385 -1.115,-2.5 -2.5,-2.5 z" />
+  <rect
+     style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect4219-0"
+     y="220"
+     x="600"
+     height="100"
+     width="100" />
+  <g
+     style="font-size:17.49651146px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:120.00000477%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#e4a4be;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Avenir;-inkscape-font-specification:Avenir"
+     id="text3863"
+     transform="translate(-25,3.0624999e-6)" />
+  <path
+     inkscape:connector-curvature="0"
+     style="font-size:16.71258354px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#222222;fill-rule:nonzero;enable-background:accumulate;font-family:Helvetica Neue"
+     id="path10613"
+     d="m 228.78571,5.07143 -1,1 v 1 l 1,1 h 1 l 1,-1 v -1 l -1,-1 h -1 z m 0,4 -1,1 v 5 l 1,1 h 1 l 1,-1 v -5 l -1,-1 h -1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="font-size:16.71258354px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#000000;fill-rule:nonzero;enable-background:accumulate;font-family:Helvetica Neue"
+     id="path10620"
+     d="m 228.78571,45.07143 -1,1 0,1 1,1 1,0 1,-1 0,-1 -1,-1 -1,0 z m 0,4 -1,1 0,5 1,1 1,0 1,-1 0,-5 -1,-1 -1,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="font-size:16.71258354px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-rule:nonzero;enable-background:accumulate;font-family:Helvetica Neue"
+     id="path5293"
+     d="m 228.78571,25.07143 -1,1 0,1 1,1 1,0 1,-1 0,-1 -1,-1 -1,0 z m 0,4 -1,1 0,5 1,1 1,0 1,-1 0,-5 -1,-1 -1,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect14284"
+     d="m 406,3 0,1 2,2.40625 L 408,8 412,8 412,6.40625 414,4 l 0,-1 -1,0 -2,2 -2,0 -2,-2 -1,0 z m 1,6 -1,1 -3,0 -1,1 1,1 3,0 0,1 -2,1 -1,1 0,1 1,0 2,-1 2,2 4,0 2,-2 2,1 1,0 0,-1 -1,-1 -2,-1 0,-1 3,0 1,-1 -1,-1 -3,0 -1,-1 -6,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path14358"
+     d="m 406,23 0,1 2,2.40625 0,1.59375 4,0 0,-1.59375 2,-2.40625 0,-1 -1,0 -2,2 -2,0 -2,-2 -1,0 z m 1,6 -1,1 -3,0 -1,1 1,1 3,0 0,1 -2,1 -1,1 0,1 1,0 2,-1 2,2 4,0 2,-2 2,1 1,0 0,-1 -1,-1 -2,-1 0,-1 3,0 1,-1 -1,-1 -3,0 -1,-1 -6,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path14360"
+     d="m 406,43 0,1 2,2.40625 0,1.59375 4,0 0,-1.59375 2,-2.40625 0,-1 -1,0 -2,2 -2,0 -2,-2 -1,0 z m 1,6 -1,1 -3,0 -1,1 1,1 3,0 0,1 -2,1 -1,1 0,1 1,0 2,-1 2,2 4,0 2,-2 2,1 1,0 0,-1 -1,-1 -2,-1 0,-1 3,0 1,-1 -1,-1 -3,0 -1,-1 -6,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3361"
+     d="m 482,27 2,0 3,3 4.7735,-6 2.2265,0 0,2 -5,6 -1,1 -2,0 -1,-1 -3,-3 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7f7f7f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3365"
+     d="m 482,7.0000001 2,0 L 487,10 l 4.7735,-5.9999999 2.2265,0 0,2 L 489,12 l -1,1 -2,0 -1,-1 -3,-2.9999999 z" />
+  <g
+     id="g16825"
+     transform="translate(-5,3.0624999e-6)">
     <path
-       d="m 155,141 -3,3 1,1 1,0 0,2 2,0 0,-2 1,0 1,-1 -3,-3 z"
-       id="path4861"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path17679"
+       transform="translate(25,-3.0624999e-6)"
+       d="m 524,5 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 10,0 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m -9,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m -6,6 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
     <path
-       d="m 149,147 -3,3 3,3 1,-1 0,-1 2,0 0,-2 -2,0 0,-1 -1,-1 z"
-       id="path4859"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path17685"
+       d="m 558.0625,9.21875 -1.5,2.5 0.875,0.53125 1.5,-2.5 -0.875,-0.53125 z" />
     <path
-       d="m 161,147 -1,1 0,1 -2,0 0,2 2,0 0,1 1,1 3,-3 -3,-3 z"
-       id="path4857"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path17687"
+       d="m 551.9375,9.21875 -0.875,0.53125 1.5,2.5 0.875,-0.53125 -1.5,-2.5 z" />
+  </g>
+  <g
+     id="g17870"
+     transform="translate(5432.5,-1245.375)">
     <path
-       d="m 155,148 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
-       id="path4855"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path2997-7-7"
+       d="m -4868.5,1248.3622 -1,1 0,2 1,1 0,6 -1,1 0,2 1,1 2,0 1,-1 6,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-6 1,-1 0,-2 -1,-1 -2,0 -1,1 -6,0 -1,-1 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m -8,2 6,0 1,1 0,6 -1,1 -6,0 -1,-1 0,-6 z m -2,8 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
     <path
-       d="m 154,153 0,2 -1,0 -1,1 3,3 3,-3 -1,-1 -1,0 0,-2 -2,0 z"
-       id="path4804"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path17497-7-3"
+       d="m -4863.5,1253.3622 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
+  </g>
+  <g
+     id="g16816"
+     transform="translate(-74,-0.99999694)">
     <path
-       d="m 215,148 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
-       id="path4802"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path17900"
+       d="m 598,4.9872 0,0 -1,1 0,1 0,1 0,1 1,1 0,0 1,1 1,0 1,0 1,0 1,-1 0,0 1,-1 0,-1 0,-1 0,-1 -1,-1 0,0 -1,-1 -1,0 -1,0 -1,0 z m 2,1 1,0 1,1 0,1 -1,1 -1,0 -1,-1 0,-1 z" />
     <path
-       d="m 189,154 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
-       id="path4800"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path17902"
+       d="m 608,5.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
     <path
-       d="m 201,154 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
-       id="path4798"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path17942"
+       d="m 606,11.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
     <path
-       d="m 51.0625,154 c -0.641658,-0.0219 -1.281719,0.25399 -1.6875,0.8125 -0.64925,0.89362 -0.456116,2.16325 0.4375,2.8125 0.893616,0.64925 2.16325,0.45612 2.8125,-0.4375 0.64925,-0.89362 0.456116,-2.16325 -0.4375,-2.8125 -0.335106,-0.24347 -0.740005,-0.36184 -1.125,-0.375 z"
-       id="path4796"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path17944"
+       d="m 600,13.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
     <path
-       d="m 58.9375,154 c -0.384995,0.0132 -0.789894,0.13153 -1.125,0.375 -0.893615,0.64925 -1.08675,1.91888 -0.4375,2.8125 0.64925,0.89362 1.918885,1.08675 2.8125,0.4375 0.893615,-0.64925 1.08675,-1.91888 0.4375,-2.8125 -0.405781,-0.55851 -1.045842,-0.83443 -1.6875,-0.8125 z"
-       id="path9830"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path17687-1"
+       d="m 604.34375,10.625 -0.6875,0.71875 1,1 0.6875,-0.71875 -1,-1 z" />
     <path
-       d="m 52.03125,142.60657 c -1.32908,0.53118 -2.444369,1.41916 -3.3125,2.53125 0.07092,0.0184 0.149734,0.009 0.21875,0.0312 0.520689,0.16918 0.941853,0.48986 1.28125,0.875 0.583365,-0.69731 1.320919,-1.23792 2.15625,-1.625 -0.228003,-0.42194 -0.375,-0.89709 -0.375,-1.4062 0,-0.14028 0.0122,-0.27085 0.03125,-0.40625 z m 5.9375,0 C 57.9878,142.74197 58,142.87254 58,143.01282 c 0,0.50911 -0.146997,0.98426 -0.375,1.40625 0.835331,0.38708 1.572885,0.92769 2.15625,1.625 0.339397,-0.38514 0.760561,-0.70582 1.28125,-0.875 0.06748,-0.0219 0.146303,-0.0395 0.21875,-0.0625 -0.866395,-1.10291 -1.991152,-1.97191 -3.3125,-2.5 z m -10.9375,8.21875 c 0.132811,1.35398 0.618313,2.61506 1.34375,3.6875 0.05422,-0.0956 0.121594,-0.19054 0.1875,-0.28125 0.298579,-0.41096 0.689964,-0.72255 1.125,-0.9375 -0.439267,-0.72096 -0.728373,-1.5606 -0.84375,-2.4375 -0.563589,0.16464 -1.184566,0.16262 -1.78125,-0.0312 -0.009,-0.003 -0.02228,0.003 -0.03125,0 z m 15.90625,0 c -0.596684,0.19387 -1.217661,0.19589 -1.78125,0.0312 -0.115377,0.8769 -0.404483,1.71654 -0.84375,2.4375 0.438042,0.20421 0.821177,0.51932 1.125,0.9375 0.06591,0.0907 0.133279,0.18566 0.1875,0.28125 0.725438,-1.07244 1.210939,-2.33352 1.34375,-3.6875 -0.009,0.003 -0.02224,-0.003 -0.03125,0 z M 54,156.16907 c -0.03014,0.55835 -0.21394,1.114 -0.5625,1.59375 -0.027,0.0372 -0.06534,0.0582 -0.09375,0.0937 0.540476,0.11583 1.081942,0.1875 1.65625,0.1875 0.574308,0 1.115774,-0.0717 1.65625,-0.1875 -0.02841,-0.0355 -0.06675,-0.0566 -0.09375,-0.0937 -0.34856,-0.47975 -0.532362,-1.0354 -0.5625,-1.59375 -0.329444,0.0535 -0.654988,0.0937 -1,0.0937 -0.345012,0 -0.670556,-0.0403 -1,-0.0937 z"
-       id="path9840"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#7092ff;fill-opacity:1;stroke:none;stroke-width:0.50000125;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path17964"
+       d="m 605,7 0,1 1,0 0,-1 -1,0 z" />
     <path
-       d="m 109,146.01282 -4,4 4,4 1,-1 0,-2 2.1875,0 c -0.11352,-0.31647 -0.1875,-0.64447 -0.1875,-1 0,-0.34518 0.0802,-0.69136 0.1875,-1 l -2.1875,0 0,-2 -1,-1 z m 12,0 -1,1 0,2 -2.1875,0 c 0.10728,0.30864 0.1875,0.65482 0.1875,1 0,0.35553 -0.074,0.68353 -0.1875,1 l 2.1875,0 0,2 1,1 4,-4 -4,-4 z"
-       id="path9854"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 174,143 -1,1 0,4 -4,0 -1,1 0,2 1,1 4,0 0,4 1,1 2,0 1,-1 0,-4 4,0 1,-1 0,-2 -1,-1 -4,0 0,-4 -1,-1 z"
-       id="path5624-8"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 231,44.999999 -1,1 0,1 3,3 -3,3 0,1 1,1 1,0 3,-3 3,3 1,0 1,-1 0,-1 -3,-3 3,-3 0,-1 -1,-1 -1,0 -3,3 -3,-3 z"
-       id="path11047"
-       style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 190,140 -1,1 0,1.0625 c -3.94444,0.49381 -7,3.85922 -7,7.9375 0,4.41827 3.58173,8 8,8 4.41827,0 8,-3.58173 8,-8 0,-2.46731 -1.11852,-4.65856 -2.875,-6.125 l -1.40625,1.40625 C 195.11409,146.37996 196,148.08592 196,150 c 0,3.3137 -2.6863,6 -6,6 -3.3137,0 -6,-2.6863 -6,-6 0,-2.97561 2.15859,-5.43327 5,-5.90625 l 0,0.90625 1,1 3,-3 -3,-3 z"
-       transform="translate(25,-3.0625001e-6)"
-       id="path6502"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 233,142 c -1.33333,0 -2.21875,0.78125 -2.71875,1.28125 -0.5,0.5 -0.61458,0.71875 -1.28125,0.71875 l -1,0 0,2 1,0 c 1.33333,0 2.21875,-0.78125 2.71875,-1.28125 0.5,-0.5 0.61458,-0.71875 1.28125,-0.71875 0.16667,0 0.20569,0.009 0.40625,0.25 0.20056,0.24067 0.4375,0.6875 0.6875,1.1875 0.25,0.5 0.51306,1.05317 0.9375,1.5625 0.42444,0.50933 1.13542,1 1.96875,1 1.33333,0 2.21875,-0.78125 2.71875,-1.28125 0.5,-0.5 0.61458,-0.71875 1.28125,-0.71875 l 1,0 0,-2 -1,0 c -1.33333,0 -2.21875,0.78125 -2.71875,1.28125 -0.5,0.5 -0.61458,0.71875 -1.28125,0.71875 -0.16667,0 -0.20569,-0.009 -0.40625,-0.25 -0.20056,-0.24067 -0.4375,-0.6875 -0.6875,-1.1875 -0.25,-0.5 -0.51306,-1.05317 -0.9375,-1.5625 -0.42444,-0.50933 -1.13542,-1 -1.96875,-1 z"
-       id="path6699"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#222222;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 228,156 0,2 14,0 0,-2 -14,0 z"
-       id="path7209"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#222222;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 450,9.999997 8,7 1,-1 0,-12.0000001 -1,-1 z"
-       id="path25361-5"
-       style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 49,205 -1,1 0,9 1,1 12,0 1,-1 0,-9 -1,-1 z m 1,3 5,2.8125 5,-2.8125 0,1.5 -5,3 -5,-3 z"
-       id="rect6778"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 71,203 -1,1 0,12 1,1 8,0 1,-1 0,-12 -1,-1 -8,0 z m 1,2 6,0 0,5 -6,0 0,-5 z m 0,7 6,0 0,1 -6,0 0,-1 z m 0,2 6,0 0,1 -6,0 0,-1 z"
-       id="rect6788"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 65,204 -1,1 0,8 -2,2 1,1 14,0 1,-1 -2,-2 0,-8 -1,-1 -10,0 z m 1,2 8,0 0,5 -8,0 0,-5 z"
-       transform="translate(25,-3.4453126e-6)"
-       id="rect6808"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 90,202 -5,4 1,1 2,0 0,2 4,0 0,-2 2,0 1,-1 z m -2,9 0,2 -2,0 -1,1 5,4 5,-4 -1,-1 -2,0 0,-2 z"
-       transform="translate(25,-3.4453126e-6)"
-       id="path16625-6"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 127.5,205 -1,1 5,10 1.21875,0 2.28125,-3.9375 2.28125,3.9375 1.21875,0 5,-10 -1,-1 -1,0 -3.5,7.5 -1.5,-2.5 2,-4 -0.5,-1 -1.5,0 -1.5,3.5 -1.5,-3.5 -1.5,0 -0.5,1 2,4 -1.5,2.5 -3.5,-7.5 z"
-       id="path6899"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 10,202 c -4.418278,0 -8,3.58172 -8,8 0,4.41828 3.581722,8 8,8 4.418278,0 8,-3.58172 8,-8 0,-4.41828 -3.581722,-8 -8,-8 z m 0,2 c 3.313708,0 6,2.68629 6,6 0,3.31371 -2.686292,6 -6,6 -3.3137085,0 -6,-2.68629 -6,-6 0,-3.31371 2.6862915,-6 6,-6 z"
-       transform="translate(25,-3.4453126e-6)"
-       id="path6918"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 11,207 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
-       transform="matrix(2,0,0,2,15,-207)"
-       id="path6922"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 8,211 1,-1 2,0 1,1 0,3 -4,0 z"
-       transform="translate(25,-3.4453126e-6)"
-       id="rect6926"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 125,204 -1,1 0,11 1,1 8,0 3,-3 0,-9 -1,-1 -10,0 z m 5,2 c 0.55228,0 1,0.44772 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m -4,4 8,0 0,1 -8,0 0,-1 z m 0,2 8,0 0,1 -8,0 0,-1 z m 0,2 5,0 0,1 -5,0 0,-1 z"
-       transform="translate(25,-3.4453126e-6)"
-       id="rect4678"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="M 171.0625,208.40625 C 169.26792,209.16529 168,210.92893 168,213 c 0,2.76142 2.23858,5 5,5 1.99494,0 3.69772,-1.18524 4.5,-2.875 l -0.65625,-1.125 -1.03125,0 c -0.41551,1.15835 -1.51118,2 -2.8125,2 -1.65685,0 -3,-1.34315 -3,-3 0,-0.88447 0.39109,-1.66968 1,-2.21875 L 171,209 c 0,-0.20559 0.0222,-0.39929 0.0625,-0.59375 z"
-       id="path3226"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 174,202 c -1.10456,0 -2,0.89544 -2,2 0,1.10456 0.89544,2 2,2 1.10456,0 2,-0.89544 2,-2 0,-1.10456 -0.89544,-2 -2,-2 z m 0,5 c -1.108,0 -2,0.892 -2,2 l 0,2 c 0,1.108 0.892,2 2,2 l 3.5,0 1.6875,2.90625 c 0.26893,0.4628 0.8482,0.64134 1.3125,0.375 l 0.0312,0 c 0.4643,-0.26634 0.61268,-0.88095 0.34375,-1.34375 l -2.03125,-3.46875 c -0.0158,-0.0271 -0.0446,-0.0375 -0.0625,-0.0625 -0.0468,-0.0617 -0.0966,-0.10697 -0.15625,-0.15625 -0.0773,-0.0673 -0.15761,-0.11687 -0.25,-0.15625 -0.1049,-0.0447 -0.19835,-0.0878 -0.3125,-0.0937 -0.0224,-10e-4 -0.04,-4e-4 -0.0625,0 l -0.0937,0 -1.90625,0 0,-2 c 0,-1.108 -0.892,-2 -2,-2 z"
-       id="path4691-9"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <rect
-       width="38"
-       height="38"
-       rx="0"
-       ry="0"
-       x="28.5"
-       y="83.499992"
-       id="rect19454"
-       style="color:#000000;fill:#e06d5f;fill-opacity:0.15686275;stroke:#e06d5f;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       width="38.000004"
-       height="38.000004"
-       rx="0"
-       ry="0"
-       x="88.5"
-       y="83.499992"
-       id="rect20224"
-       style="color:#000000;fill:#77d3de;fill-opacity:0.19215686;stroke:#77d3de;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       width="38.000004"
-       height="38.000004"
-       rx="0"
-       ry="0"
-       x="148.5"
-       y="83.499992"
-       id="rect20237"
-       style="color:#000000;fill:#8cd05f;fill-opacity:0.15686275;stroke:#8cd05f;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       width="38.000004"
-       height="38.000004"
-       rx="0"
-       ry="0"
-       x="208.5"
-       y="83.499992"
-       id="rect20239"
-       style="color:#000000;fill:#aaaaaa;fill-opacity:0.15686275;stroke:#aaaaaa;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <g
-       transform="translate(326,239.63781)"
-       id="g20251-9">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20247-4">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-410.98649,14.371188)"
-           id="path20243-7"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-381.41891,-22.917117)"
-           id="path20245-0"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(326,200.63781)"
-       id="g20283">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20285">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-410.98649,15.371188)"
-           id="path20287"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-381.41891,-21.917117)"
-           id="path20289"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(365,239.63781)"
-       id="g20299">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20301">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-411.98649,14.371188)"
-           id="path20303"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-382.41891,-22.917117)"
-           id="path20305"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(365,200.63781)"
-       id="g20307">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20309">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-411.98649,15.371188)"
-           id="path20311"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-382.41891,-21.917117)"
-           id="path20313"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(386,239.63781)"
-       id="g20315">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20317">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-410.98649,14.371188)"
-           id="path20319"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-381.41891,-22.917117)"
-           id="path20321"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(386,200.63781)"
-       id="g20323">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20325">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-410.98649,15.371188)"
-           id="path20327"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-381.41891,-21.917117)"
-           id="path20329"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(425,239.63781)"
-       id="g20331">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20333">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-411.98649,14.371188)"
-           id="path20335"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-382.41891,-22.917117)"
-           id="path20337"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(425,200.63781)"
-       id="g20339">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20341">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-411.98649,15.371188)"
-           id="path20343"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-382.41891,-21.917117)"
-           id="path20345"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(446,239.63781)"
-       id="g20347">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20349">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-410.98649,14.371188)"
-           id="path20351"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-381.41891,-22.917117)"
-           id="path20353"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(446,200.63781)"
-       id="g20355">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20357">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-410.98649,15.371188)"
-           id="path20359"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-381.41891,-21.917117)"
-           id="path20361"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(485,239.63781)"
-       id="g20363">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20365">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-411.98649,14.371188)"
-           id="path20367"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-382.41891,-22.917117)"
-           id="path20369"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(485,200.63781)"
-       id="g20371">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20373">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-411.98649,15.371188)"
-           id="path20375"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-382.41891,-21.917117)"
-           id="path20377"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(506,239.63781)"
-       id="g20379">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20381">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-410.98649,14.371188)"
-           id="path20383"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-381.41891,-22.917117)"
-           id="path20385"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(506,200.63781)"
-       id="g20387">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20389">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-410.98649,15.371188)"
-           id="path20391"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-381.41891,-21.917117)"
-           id="path20393"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(545,239.63781)"
-       id="g20395">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20397">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-411.98649,14.371188)"
-           id="path20399"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-382.41891,-22.917117)"
-           id="path20401"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(545,200.63781)"
-       id="g20403">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20405">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-411.98649,15.371188)"
-           id="path20407"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-382.41891,-21.917117)"
-           id="path20409"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <path
-       d="m 479,9.999997 -8,7 -1,-1 0,-12.0000001 1,-1 z"
-       id="path4065"
-       style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <rect
-       width="38.000004"
-       height="38.000004"
-       rx="0"
-       ry="0"
-       x="268.5"
-       y="83.499992"
-       id="rect7068"
-       style="opacity:0.15;color:#000000;fill:#000000;fill-opacity:0.15686275;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <g
-       transform="translate(566,239.63781)"
-       id="g7070">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g7072">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-410.98649,14.371188)"
-           id="path7074"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-381.41891,-22.917117)"
-           id="path7076"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(566,200.63781)"
-       id="g7078">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g7080">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-410.98649,15.371188)"
-           id="path7082"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-381.41891,-21.917117)"
-           id="path7084"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(605,239.63781)"
-       id="g7086">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g7088">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-411.98649,14.371188)"
-           id="path7090"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-382.41891,-22.917117)"
-           id="path7092"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(605,200.63781)"
-       id="g7094">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g7096">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-411.98649,15.371188)"
-           id="path7098"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-382.41891,-21.917117)"
-           id="path7100"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="matrix(0.390625,0,0,0.390625,867.1875,238.60852)"
-       id="g4611">
-      <rect
-         width="256"
-         height="256"
-         x="-2156"
-         y="-47.637821"
-         id="rect4565"
-         style="color:#000000;fill:none;stroke:none;stroke-width:34;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <g
-         transform="translate(-781,47)"
-         id="g4494">
-        <path
-           d="m 3.90625,224.6875 7.8125,20.5 -7.8125,20.5 7.8125,20.53125 -7.8125,20.5 4.8125,1.84375 L 34.75,282.5 l 4.6875,0.71875 5.6875,-5.6875 c -3.349219,-3.88012 -5.88,-8.51217 -7.25,-13.625 L 40.5625,261.75 c -0.457539,-2.1233 -0.71875,-4.33618 -0.71875,-6.59375 0,-11.27802 6.012891,-21.19153 15,-26.6875 L 44.9375,224.6875 24.40625,232.5 l -20.5,-7.8125 z M 71,229 c -14.359404,0 -26,11.6406 -26,26 0,14.3594 11.640596,26 26,26 14.359404,0 26,-11.6406 26,-26 0,-14.3594 -11.640596,-26 -26,-26 z m 20.0625,50.15625 c -5.42082,4.51861 -12.380625,7.25 -19.96875,7.25 -2.257578,0 -4.47043,-0.26122 -6.59375,-0.71875 l -2.15625,2.65625 c -4.855312,-1.30096 -9.306172,-3.58895 -13.0625,-6.6875 l -5.875,5.875 0.71875,4.34375 -21.8125,21.84375 2.09375,0.8125 20.53125,-7.8125 20.5,7.8125 20.5,-7.8125 7.8125,-20.5 -2.6875,-7.0625 z"
-           transform="matrix(2.56,0,0,2.56,-1375,-657.83782)"
-           id="path6718"
-           style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="matrix(0.5,0,0,0.5,-317.5001,125.49999)"
-       id="g8629">
-      <rect
-         width="100.00001"
-         height="100.00001"
-         x="935"
-         y="238.99998"
-         id="rect8627"
-         style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         d="m 1035,259.46976 c -3.679,1.6066 -7.6336,2.69227 -11.7831,3.18013 4.2351,-2.49939 7.4885,-6.45736 9.0205,-11.17402 -3.9645,2.31516 -8.3552,3.99577 -13.0286,4.90089 -3.7418,-3.92491 -9.0738,-6.37759 -14.9751,-6.37759 -11.33021,0 -20.51679,9.04283 -20.51679,20.19639 0,1.58324 0.18008,3.12476 0.53217,4.60303 -17.05108,-0.8424 -32.16868,-8.88327 -42.28747,-21.10256 -1.76581,2.98278 -2.77795,6.45238 -2.77795,10.15396 0,7.00715 3.62183,13.1887 9.12688,16.81077 -3.36304,-0.1076 -6.52651,-1.01351 -9.29247,-2.52616 -0.002,0.084 -0.002,0.16796 -0.002,0.25194 0,9.78524 7.07195,17.94866 16.45764,19.80431 -1.72156,0.46135 -3.53416,0.70856 -5.40515,0.70856 -1.32202,0 -2.60724,-0.12596 -3.85969,-0.36215 2.61039,8.02355 10.18701,13.86315 19.16488,14.02559 -7.02158,5.41762 -15.8675,8.64629 -25.48033,8.64629 -1.65593,0 -3.28903,-0.0945 -4.89377,-0.28289 9.07933,5.73043 19.86348,9.07458 31.44972,9.07458 37.73703,0 58.37353,-30.77522 58.37353,-57.46492 0,-0.87573 -0.037,-1.74674 -0.063,-2.61276 4.0095,-2.84789 7.4872,-6.40461 10.238,-10.45497"
-         id="path5047-4-7"
-         style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="translate(0,50)"
-       id="g3815"
-       style="fill:#1a1a1a;fill-opacity:1">
-      <path
-         d="m 464,2 -1,1 0,13 1,1 11,0 1,-1 0,-10 -4,0 0,6 -2.5,-1.5 -2.5,1.5 0,-6 -2,0 0,-1 0,-1 11,0 0,-1 0,-1 -12,0 z"
-         transform="translate(25,-50.000003)"
-         id="path3648"
-         style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="translate(0,70)"
-       id="g3822">
-      <path
-         d="m 464,2 -1,1 0,13 1,1 11,0 1,-1 0,-10 -4,0 0,6 -2.5,-1.5 -2.5,1.5 0,-6 -2,0 0,-1 0,-1 11,0 0,-1 0,-1 -12,0 z"
-         transform="translate(25,-50.000003)"
-         id="path3824"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="translate(-1,0)"
-       id="g3837" />
-    <g
-       transform="translate(0,20)"
-       id="g3842"
-       style="fill:#ffffff" />
-    <rect
-       width="100"
-       height="100"
-       x="225"
-       y="220"
-       id="rect6623-9"
-       style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <g
-       transform="translate(575,-25.000003)"
-       id="g7459-3"
-       style="display:inline">
-      <path
-         d="m -145,255 c 0,24.88542 0,49.77083 0,74.65625 7.5,3.44792 15,6.89583 22.5,10.34375 7.5,-3.33333 15,-6.66667 22.5,-10 7.5,3.33333 15,6.66667 22.5,10 7.5,-3.44792 15,-6.89583 22.5,-10.34375 0,-24.88542 0,-49.77083 0,-74.65625 -7.5,3.33333 -15,6.66667 -22.5,10 -7.5,-3.33333 -15,-6.66667 -22.5,-10 -7.5,3.33333 -15,6.66667 -22.5,10 -7.5,-3.33333 -15,-6.66667 -22.5,-10 z m 57.40625,23.59375 5.59375,5.59375 5.59375,-5.59375 2.46236,3.16264 -5.24361,5.24361 5.59375,5.59375 -3.16264,2.46236 L -82,289.8125 l -5.59375,5.59375 -3.08736,-2.97514 5.86861,-5.43111 -5.59375,-5.59375 z m -25.1875,12.3125 c 3.02949,0.26492 6.03959,1.32487 8.375,3.31225 l -2.90625,2.78125 c -1.69778,-1.26665 -3.7758,-1.93771 -5.87485,-2.1247 0.13531,-1.3229 0.27106,-2.64608 0.4061,-3.9688 z m -4.84375,0.375 c 0.23428,1.25604 1.33288,2.86593 1.28125,3.81245 -1.9797,1.00126 -3.28203,2.99612 -4.4062,4.74985 l -3.14878,-2.51673 c 1.59525,-2.42637 3.50946,-4.89188 6.27373,-6.04557 z m 33.46875,6.28125 3.6875,1.59375 c -0.85495,2.6344 -2.05943,5.19957 -3.8749,7.3124 l -2.78125,-2.90625 c 1.37974,-1.77526 2.31524,-3.85778 2.96865,-5.9999 z m -17.21875,0.0937 c 1.52998,2.21288 2.46049,4.7627 3.84365,7.06245 l -3.59375,1.78125 c -1.26185,-2.16828 -2.15272,-4.55761 -3.5936,-6.6249 1.11453,-0.7396 2.22935,-1.47918 3.3437,-2.2188 z m -24.75,3.8125 3.4375,2.03125 c -0.94627,2.15394 -1.82847,4.38347 -2.53105,6.59365 l -3.66832,-1.66122 c 0.79087,-2.367 1.68957,-4.70832 2.76187,-6.96368 z m 36.25,4.625 1.60017,3.68116 c -2.71921,1.52252 -6.25719,2.08348 -9.13142,0.66264 l 2.16859,-3.41112 c 1.76867,0.54341 3.84526,0.007 5.36266,-0.93268 z"
-         id="path6625-8"
-         style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <rect
-       width="100"
-       height="100"
-       x="325"
-       y="220"
-       id="rect6623-9-2"
-       style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="m 592.5314,229 c -8.2842,0 -15,6.71574 -15,15 0,8.28429 15,21 15,21 0,0 15,-12.71571 15,-21 0,-8.28426 -6.7158,-15 -15,-15 z M 593,238 c 3.3138,0 6,2.68629 6,6 0,3.31371 -2.6862,6 -6,6 -3.3135,0 -6,-2.68629 -6,-6 0,-3.31371 2.6865,-6 6,-6 z"
-       id="path8139-4-6-3"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 608.5,266 c -4.14214,0 -7.5,3.35786 -7.5,7.5 0,0.75557 0.13591,1.46849 0.34375,2.15625 l -18.6875,18.6875 C 581.96849,294.13591 581.25557,294 580.5,294 c -4.14214,0 -7.5,3.35786 -7.5,7.5 0,4.14214 3.35786,7.5 7.5,7.5 4.14214,0 7.5,-3.35786 7.5,-7.5 0,-0.75557 -0.13591,-1.46849 -0.34375,-2.15625 l 18.6875,-18.6875 C 607.03151,280.86409 607.74443,281 608.5,281 c 4.14214,0 7.5,-3.35786 7.5,-7.5 0,-4.14214 -3.35786,-7.5 -7.5,-7.5 z m 0,4.5 c 1.65685,0 3,1.34315 3,3 0,1.65685 -1.34315,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65685 1.34315,-3 3,-3 z m -28,28 c 1.65685,0 3,1.34315 3,3 0,1.65685 -1.34315,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65685 1.34315,-3 3,-3 z"
-       id="path5387-6-5"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 541.5,251 c -4.14214,0 -7.5,3.35786 -7.5,7.5 0,2.8726 1.62846,5.3652 4,6.625 l 0,13.75 c -2.37154,1.2598 -4,3.7524 -4,6.625 0,4.14214 3.35786,7.5 7.5,7.5 2.8726,0 5.3652,-1.62846 6.625,-4 l 13.75,0 c 1.2598,2.37154 3.7524,4 6.625,4 4.14214,0 7.5,-3.35786 7.5,-7.5 0,-2.8726 -1.62846,-5.3652 -4,-6.625 l 0,-13.75 c 2.37154,-1.2598 4,-3.7524 4,-6.625 0,-4.14214 -3.35786,-7.5 -7.5,-7.5 -2.90753,0 -5.41167,1.67488 -6.65625,4.09375 L 561.65625,255 548.125,255 c -1.2598,-2.37154 -3.7524,-4 -6.625,-4 z m 0,4.5 c 1.65685,0 3,1.34315 3,3 0,1.65685 -1.34315,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65685 1.34315,-3 3,-3 z m 27,0 c 1.65685,0 3,1.34315 3,3 0,1.65685 -1.34315,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65685 1.34315,-3 3,-3 z m -20.375,6.5 13.75,0 c 0.70304,1.32345 1.80155,2.42196 3.125,3.125 l 0,13.75 c -1.32345,0.70304 -2.42196,1.80155 -3.125,3.125 l -13.75,0 c -0.70304,-1.32345 -1.80155,-2.42196 -3.125,-3.125 l 0,-13.75 c 1.32345,-0.70304 2.42196,-1.80155 3.125,-3.125 z m -6.625,20.5 c 1.65685,0 3,1.34315 3,3 0,1.65685 -1.34315,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65685 1.34315,-3 3,-3 z m 27,0 c 1.65685,0 3,1.34315 3,3 0,1.65685 -1.34315,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65685 1.34315,-3 3,-3 z"
-       id="path5288-4-8-0"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <g
-       id="g7659" />
-    <g
-       transform="translate(-28,28)"
-       id="g7663" />
-    <g
-       transform="translate(1.625,1.3749969)"
-       id="g7690" />
-    <g
-       transform="translate(-25.375,1.3749969)"
-       id="g7694" />
-    <g
-       transform="translate(1.625,-25.625003)"
-       id="g7700" />
-    <g
-       transform="translate(-25.375,-25.625003)"
-       id="g7706" />
-    <rect
-       width="100"
-       height="100"
-       x="425"
-       y="220"
-       id="rect6623-9-2-3"
-       style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       width="100"
-       height="100"
-       x="525"
-       y="220"
-       id="rect4211"
-       style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       width="100"
-       height="100"
-       x="525"
-       y="220"
-       id="rect4219"
-       style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <g
-       transform="translate(295,5)"
-       id="g4221">
-      <path
-         d="m 455,232 -5,0 -3,3 0,5 58,58 5,0 3,-3 0,-5 z"
-         id="path4223"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#e06d5f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 505,232 5,0 3,3 0,5 -58,58 -5,0 -3,-3 0,-5 z"
-         id="path4255"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#e06d5f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-    </g>
-    <path
-       d="m 675,228 -2,2 0,5.0625 c -18.3398,1.05112 -33,16.34328 -33,34.9375 0,19.27074 15.72926,35 35,35 19.27075,0 35,-15.72926 35,-35 0,-11.66567 -5.76668,-22.0373 -14.59375,-28.40625 l -7.1875,7.1875 C 695.3012,253.17882 700,260.99881 700,270 c 0,13.86634 -11.13365,25 -25,25 -13.86634,0 -25,-11.13366 -25,-25 0,-13.18969 10.08302,-23.8917 23,-24.90625 l 0,4.90625 2,2 3,0 12,-12 -12,-12 -3,0 z"
-       id="path4227"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#7092ff;fill-opacity:1;stroke:none;stroke-width:11.66666508;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       inkscape:connector-curvature="0" />
-    <rect
-       width="200"
-       height="80"
-       x="25"
-       y="320"
-       id="rect8373"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="M 195.00001,351 C 186.7158,351 180,357.71573 180,366.00001 180,374.28428 195.00001,387 195.00001,387 195.00001,387 210,374.28428 210,366.00001 210,357.71573 203.2842,351 195.00001,351 z"
-       id="path8377"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 187,358 c -0.4714,0 -1,0.5 -1,1 l 0,7 c 0,2.216 1,5 5,5 0.35868,0 0.68618,-0.017 1,-0.062 l 0,-2.9375 -4,0 c 0,0 0.5,-2 3,-2 0.5,0 0.69653,0.074 1,0.1875 l 0,-2.1875 c 0,-0.9167 0.36529,-1.6826 1,-2 1,-0.5 1.40372,-0.2981 2,0 1,0.5 1,0.5 1,0.5 l 0,-3.5 c 0,-0.5 -0.5286,-1 -1,-1 -1,0 -2,1 -4,1 -2,0 -3,-1 -4,-1 z m 1.75,3.5 c 0.69036,0 1.25,0.5596 1.25,1.25 0,0.6904 -0.55964,1.25 -1.25,1.25 -0.69036,0 -1.25,-0.5596 -1.25,-1.25 0,-0.6904 0.55964,-1.25 1.25,-1.25 z M 194,363 c -0.4714,0 -1,0.5 -1,1 l 0,7 c 0,2.216 1,5 5,5 4,0 5,-2.784 5,-5 l 0,-7 c 0,-0.5 -0.5286,-1 -1,-1 -1,0 -2,1 -4,1 -2,0 -3,-1 -4,-1 z m 1.75,3.5 c 0.69036,0 1.25,0.5596 1.25,1.25 0,0.6904 -0.55964,1.25 -1.25,1.25 -0.69036,0 -1.25,-0.5596 -1.25,-1.25 0,-0.6904 0.55964,-1.25 1.25,-1.25 z m 4.5,0 c 0.69036,0 1.25,0.5596 1.25,1.25 0,0.6904 -0.55964,1.25 -1.25,1.25 -0.69036,0 -1.25,-0.5596 -1.25,-1.25 0,-0.6904 0.55964,-1.25 1.25,-1.25 z m -5.25,5.5 6,0 c 0,0 -0.5,2 -3,2 -2.5,0 -3,-2 -3,-2 z"
-       id="path8379"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.055;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="M 55.00001,351 C 46.7158,351 40,357.71573 40,366.00001 40,374.28428 55.00001,387 55.00001,387 55.00001,387 70,374.28428 70,366.00001 70,357.71573 63.2842,351 55.00001,351 z"
-       id="path8381"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 49,356 c -0.55401,0 -1,0.446 -1,1 l 0,16 c 0,0.5 0.5,1 1,1 l 9,0 c 0.5,0 1,-0.5 1,-1 l 0,-5 0.5,0 c 0.5,0 0.5,0.5 0.5,0.5 l 0,2 c 0,1 0.5,1.5 1.5,1.5 1,0 1.5,-0.5 1.5,-1.5 0,-1.1667 0,-4.5 0,-5.5 0,-1 -2,-2 -2,-3 l 0,-3 -1,0 -1,-1 0,-1 c 0,-0.554 -0.44599,-1 -1,-1 z m 1,2 7,0 0,4 -7,0 z m 9,3 1,0 c 0,0 0,0.8333 0,1.5 0,1 2,2 2,3 l 0,5 c 0,0.5 -0.5,0.5 -0.5,0.5 0,0 -0.5,0 -0.5,-0.5 0,0 0,-2 0,-2.5 0,-0.5 -0.5,-1 -1,-1 -0.33333,0 -1,0 -1,0 z"
-       id="path8383"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="M 125.00001,351 C 116.7158,351 110,357.71573 110,366.00001 110,374.28428 125.00001,387 125.00001,387 125.00001,387 140,374.28428 140,366.00001 140,357.71573 133.2842,351 125.00001,351 z"
-       id="path8385"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 123,358 c -3,0 -6,1.5 -6,4 l 0,2 17,0 0,-2 c -2e-5,-2.5 -3,-4 -6,-4 z m 0.5,1 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m -6,2 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m -12.5,4 c -0.50003,0 -1.00001,0.5 -1,1 1e-5,0.5 0.49997,1 1,1 l 17,0 c 0.50001,0 0.99999,-0.5 1,-1 0,-0.5 -0.5,-1 -1,-1 z m 0,3 0,1 c 0,1 1,2 2,2 l 13,0 c 1,0 2,-1 2,-2 l 0,-1 z"
-       id="path8387"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="M 160.00001,331 C 151.7158,331 145,337.71573 145,346.00001 145,354.28428 160.00001,367 160.00001,367 160.00001,367 175,354.28428 175,346.00001 175,337.71573 168.2842,331 160.00001,331 z"
-       id="path10172"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="M 90.00001,331 C 81.7158,331 75,337.71573 75,346.00001 75,354.28428 90.00001,367 90.00001,367 90.00001,367 105,354.28428 105,346.00001 105,337.71573 98.2842,331 90.00001,331 z"
-       id="path10174"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 84,338 c -0.55401,0 -1,0.446 -1,1 l 0,9 c 0,0.554 0.44599,1 1,1 l 11,0 c 0.55401,0 1,-0.446 1,-1 l 0,-1 0.5,0 c 0.5,0 0.5,-0.5 0.5,-0.5 l 0,-0.5 1,0 c 1,0 2,-1 2,-2 l 0,-1 0,-2 c 0,-0.5 -0.5,-1 -1,-1 l -3,0 0,-1 c 0,-0.554 -0.44599,-1 -1,-1 z m 12,3 2.5,0 c 0.5,0 0.5,0.5 0.5,0.5 l 0,2.5 c 0,0.5 -0.5,1 -1,1 l -1,0 -1,0 z m -15,9 1,1 1,1 13,0 1,-1 1,-1 z"
-       id="rect9826-2-1"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 159,338 c -0.554,0 -1,0.446 -1,1 l 0,4 -4,0 c -0.554,0 -1,0.446 -1,1 l 0,3 c 0,0.554 0.446,1 1,1 l 4,0 0,4 c 0,0.554 0.446,1 1,1 l 3,0 c 0.554,0 1,-0.446 1,-1 l 0,-4 4,0 c 0.554,0 1,-0.446 1,-1 l 0,-3 c 0,-0.554 -0.446,-1 -1,-1 l -4,0 0,-4 c 0,-0.554 -0.446,-1 -1,-1 z"
-       id="rect8206-4"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <g
-       transform="translate(375,15)"
-       id="g10113">
-      <rect
-         width="200"
-         height="80"
-         x="-350"
-         y="465"
-         id="rect8477"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <g
-         transform="translate(-1110,437.63781)"
-         id="railway-rail"
-         style="fill:#7092ff;fill-opacity:1">
-        <path
-           d="m 853.5,50.362183 -1.5,1 -0.4688,2 -3.2812,0 c -0.554,0 -0.8656,0.462541 -1,1 l -0.25,1 c -0.1344,0.537459 0.446,1 1,1 l 24,0 c 0.554,0 1.1344,-0.462541 1,-1 l -0.25,-1 c -0.1344,-0.537459 -0.446,-1 -1,-1 l -2.7812,0 -0.4688,-2 -1.5,-1 -1,1 0.4688,2 -12.4376,0 0.4688,-2 -1,-1 z m -2,4 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m 17,0 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m -17.9375,3 -0.4687,2 -2.8438,0 c -0.554,0 -0.8656,0.462541 -1,1 l -0.25,1 c -0.1344,0.537459 0.446,1 1,1 l 26,0 c 0.554,0 1.1344,-0.462541 1,-1 l -0.25,-1 c -0.1344,-0.537459 -0.446,-1 -1,-1 l -2.3438,0 -0.4687,-2 -2.5,0 0.4687,2 -15.3124,0 0.4687,-2 -2.5,0 z m -0.0625,3 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m 19,0 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m -20.3438,3 -0.4687,2 -2.4375,0 c -0.554,0 -0.8656,0.462541 -1,1 l -0.25,1 c -0.1344,0.537459 0.446,1 1,1 l 28,0 c 0.554,0 1.1344,-0.462541 1,-1 l -0.25,-1 c -0.1344,-0.537459 -0.446,-1 -1,-1 l -1.9375,0 -0.4687,-2 -2.5,0 0.4687,2 -18.125,0 0.4687,-2 -2.5,0 z m 0.3438,3 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m 21,0 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m -22.7812,3 -0.7188,3 1.5,1 1,-1 0.7188,-3 -2.5,0 z m 22.5624,0 0.7188,3 1,1 1.5,-1 -0.7188,-3 -2.5,0 z"
-           id="rect17528-7"
-           style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <g
-           transform="translate(110,0)"
-           id="g22103"
-           style="fill:#7092ff;fill-opacity:1">
-          <rect
-             width="40"
-             height="3"
-             x="730"
-             y="77.362183"
-             id="rect22091"
-             style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-          <rect
-             width="5"
-             height="1.0000004"
-             x="764"
-             y="78.362183"
-             id="rect22093"
-             style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-          <rect
-             width="5"
-             height="1.0000004"
-             x="753"
-             y="78.362183"
-             id="rect22095"
-             style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-          <rect
-             width="5"
-             height="1.0000004"
-             x="742"
-             y="78.362183"
-             id="rect22097"
-             style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-          <rect
-             width="5"
-             height="1.0000004"
-             x="731"
-             y="78.362183"
-             id="rect22099"
-             style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        </g>
-        <path
-           d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
-           transform="matrix(1.6666667,0,0,1.6666667,828.66667,-31.97115)"
-           id="path26156"
-           style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
-           transform="translate(849,12.362188)"
-           id="path26158"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
-           transform="matrix(1.6666667,0,0,1.6666667,789.66667,-31.97115)"
-           id="path26160"
-           style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
-           transform="translate(810,12.362188)"
-           id="path26162"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-      <g
-         transform="translate(-510,437.63781)"
-         id="highway-unclassified"
-         style="fill:#7092ff;fill-opacity:1">
-        <path
-           d="m 192.5,52.36218 -2.875,6 -1.625,0 -1,1 0,2 1.40625,0 -0.40625,1 0,5 0,1 0,0 c 0,0 0.60826,0.60826 1,1 l 1,0 4,0 2,1 8,0 2,-1 4,0 1,0 1,-1 0,0 0,-1 0,-5 -0.40625,-1 1.40625,0 0,-2 -1,-1 -1.625,0 -2.875,-6 z m 1,3 13,0 1.5,4 -1,1 -14,0 -1,-1 z m -2.5,8 3,0 1,2 0,1 -4,0 -1,-1 0,-1 z m 15,0 3,0 1,1 0,1 -1,1 -4,0 0,-1 z m -17,7 0,2 1,1 3,0 1,-1 0,-2 z m 17,0 0,2 1,1 3,0 1,-1 0,-2 z"
-           id="path7143"
-           style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <rect
-           width="38"
-           height="0.9999997"
-           x="181"
-           y="78.362183"
-           id="rect7157"
-           style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <g
-           transform="translate(551,1)"
-           id="g7159"
-           style="fill:#7092ff;fill-opacity:1">
-          <path
-             d="m 139.5,64 c -1.38071,0 -2.5,1.119288 -2.5,2.5 0,1.380712 1.11929,2.5 2.5,2.5 l 39,0 c 1.38071,0 2.5,-1.119288 2.5,-2.5 0,-1.380712 -1.11929,-2.5 -2.5,-2.5 z"
-             transform="translate(-510,12.362183)"
-             id="path7161"
-             style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m 362,70 c 0.31019,0.41644 0.5,0.940812 0.5,1.5 0,0.559188 -0.18981,1.08356 -0.5,1.5 l 35,0 c -0.31019,-0.41644 -0.5,-0.940812 -0.5,-1.5 0,-0.559188 0.18981,-1.08356 0.5,-1.5 l -35,0 z"
-             transform="translate(-730.5,7.362183)"
-             id="path7163"
-             style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
-             transform="translate(-401,12.362183)"
-             id="path7165"
-             style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
-             transform="translate(-362,12.362183)"
-             id="path7169"
-             style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-    </g>
-    <rect
-       width="200"
-       height="80"
-       x="25"
-       y="400"
-       id="rect9903"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="m 67.183962,443.57193 a 14.904482,5.9469357 0 1 1 -29.808964,0 14.904482,5.9469357 0 1 1 29.808964,0 z"
-       transform="matrix(1.8169101,0.18420004,-0.74043709,1.8891074,360.32499,-422.91527)"
-       id="path10275"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 78,436 -35,10 0,-6 35,-10 z"
-       id="path9990"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 79,430.5 0,6 29,14.5 0,-6 -29,-14.5 z"
-       id="path9986"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 198.5,428 c -1.22936,2e-4 -2.22819,0.8933 -2.4375,2.0625 C 195.87885,430.0195 195.69675,430 195.5,430 c -1.38071,0 -2.5,1.1193 -2.5,2.5 0,0.6391 0.23046,1.21425 0.625,1.65625 -0.94522,0.3566 -1.625,1.27365 -1.625,2.34375 0,1.3807 1,2.5 2.5,2.5 l 0.5,0 2,3.5 0,1.4375 c -1.47915,-0.43159 -2.8857,-0.88035 -4,-1.4375 -5,-2.5 -9.43382,-6.98268 -15,-7.5 -6.04072,-0.56143 -11.66667,3.33333 -17.5,5 -5.83333,1.66667 -16.93857,1.9593 -17.5,8 L 173,462.99997 208,453 c 0.32572,-3.50467 -3.70814,-6.98659 -8,-8.21875 l 0,-2.28125 2,-3.5 0.71875,0 C 204,439.0145 205,437.805 205,436.5 c 0,-1.0701 -0.67978,-1.98715 -1.625,-2.34375 0.39454,-0.442 0.625,-1.01715 0.625,-1.65625 0,-1.3807 -1.11929,-2.5 -2.5,-2.5 -0.19675,0 -0.37885,0.0195 -0.5625,0.0625 -0.20931,-1.1692 -1.20813,-2.0628 -2.4375,-2.0625 z m -1.5,11 3,0 -1,2 -1,0 z"
-       id="path10000"
-       style="color:#000000;fill:#8cd05f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <g
-       transform="translate(365,-200)"
-       id="g10052">
-      <path
-         d="m -322,646 30,15 0,-6 -30,-15 z"
-         id="path10048"
-         style="color:#000000;fill:#c1c1c1;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m -257,651 -35,10 0,-6 35,-10 z"
-         id="path10050"
-         style="color:#000000;fill:#c1c1c1;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <path
-       d="m 43,446 30,15 0,-6 -30,-15 z"
-       id="path9980"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 108,451 -35,10 0,-6 35,-10 z"
-       id="path9982"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <rect
-       width="699.86035"
-       height="560"
-       x="-724.86035"
-       y="-3.0624999e-06"
-       transform="scale(-1,1)"
-       id="rect10169"
-       style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="m 132,417 c 0,0 2.63599,3.5293 5.4375,3.96875 C 132.96029,420.81568 132,419 132,419 c 0,0 -0.96029,1.81568 -5.4375,1.96875 C 129.36401,420.5293 132,417 132,417 z"
-       id="path10271"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 118,419 c 0,0 2.63599,3.5293 5.4375,3.96875 C 118.96029,422.81568 118,421 118,421 c 0,0 -0.96029,1.81568 -5.4375,1.96875 C 115.36401,422.5293 118,419 118,419 z"
-       id="path10269"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 128,424 c 0,0 2.63599,3.5293 5.4375,3.96875 C 128.96029,427.81568 128,426 128,426 c 0,0 -0.96029,1.81568 -5.4375,1.96875 C 125.36401,427.5293 128,424 128,424 z"
-       id="path10253"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <g
-       transform="translate(-235,452.63781)"
-       id="waterway-river">
-      <rect
-         width="40"
-         height="3.0000014"
-         x="400"
-         y="77.362183"
-         id="rect24309"
-         style="color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         d="m 406.76193,73.362183 c 0,0 -0.53638,-1.846128 -0.34524,-2.75 0.22134,-1.046677 1.65476,-2.75 1.65476,-2.75 0,0 1.43342,-1.703323 1.65476,-2.75 0.19114,-0.903872 -0.34524,-2.75 -0.34524,-2.75 0,0 -0.53639,-1.846127 -0.34525,-2.75 0.22134,-1.046678 1.65476,-2.75 1.65476,-2.75 0,0 1.43342,-1.703323 1.65476,-2.75 0.19114,-0.903872 -0.34524,-2.75 -0.34524,-2.75 l 16.5,0 c 0,0 1.43342,1.703323 1.65476,2.75 0.19115,0.903872 -0.34523,2.75 -0.34523,2.75 0,0 -0.53638,1.846128 -0.34524,2.75 0.22134,1.046679 1.65477,2.75 1.65477,2.75 0,0 1.43342,1.703323 1.65476,2.75 0.19115,0.903872 -0.34523,2.75 -0.34523,2.75 0,0 -0.53638,1.846128 -0.34524,2.75 0.22134,1.046679 1.65477,2.75 1.65477,2.75 z"
-         id="245"
-         style="color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 808,51 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z"
-         transform="matrix(0.48296291,0.12940952,-0.19411409,0.72444365,27.631711,-76.388519)"
-         id="path25543"
-         style="opacity:0.5;color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 808,51 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z"
-         transform="matrix(0.64951905,0.375,-0.50000001,0.86602541,-89.512357,-292.05512)"
-         id="path25545"
-         style="opacity:0.5;color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 808,51 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z"
-         transform="matrix(-0.48296291,0.12940952,0.19411409,0.72444365,811.75652,-82.439629)"
-         id="path25547"
-         style="opacity:0.5;color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 808,51 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z"
-         transform="matrix(-0.64951905,0.375,0.50000001,0.86602541,933.61049,-277.05512)"
-         id="path25549"
-         style="opacity:0.5;color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
-         transform="matrix(1.6666667,0,0,1.6666667,388.66667,-31.97115)"
-         id="path26103"
-         style="color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
-         transform="translate(409,12.362188)"
-         id="path26105"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
-         transform="matrix(1.6666667,0,0,1.6666667,349.66667,-31.97115)"
-         id="path26107"
-         style="color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
-         transform="translate(370,12.362188)"
-         id="path26109"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <path
-       d="m 450,29.999997 8,7 1,-1 0,-12 -1,-1 z"
-       id="path10391"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 479,29.999997 -8,7 -1,-1 0,-12 1,-1 z"
-       id="path10393"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 31,164 -1,1 0,1 1,1 8,0 1,-1 0,-1 -1,-1 z m 0,4 0,7 1,1 6,0 1,-1 0,-7 z m 2,2 1,0 0,4 -1,0 0,-1 z m 3,0 1,0 0,3 0,1 -1,0 z"
-       id="path3399"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 89,165.01282 c -1,0 -2,1 -2,2 l 0,2 3,0 2,1 -2,1 -3,0 0,2 c 0,1 1,2 2,2 l 1,0 c 2,0 2.48722,-0.97443 3,-2 l 1,-2 9,-5 c 0,0 0,-1 -2,-1 L 93.96875,168.91907 93,167.01282 c -0.49406,-0.98812 -1,-2 -3,-2 z m 0,1 2,0 1,2 -4,0 c 0,0 0,-0.66667 0,-1 0,-1.01282 1,-1 1,-1 z m 8.09375,4.71875 -2,1 5.90625,3.28125 c 2,0 2,-1 2,-1 z M 88,172.01282 l 4,0 -1,2 -2,0 c 0,0 -1,0 -1,-1 z"
-       id="path3403"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 69.8125,169.01282 c 0.11352,0.31647 0.1875,0.64447 0.1875,1 0,0.35553 -0.074,0.68353 -0.1875,1 l 2.375,0 c -0.11352,-0.31647 -0.1875,-0.64447 -0.1875,-1 0,-0.35553 0.074,-0.68353 0.1875,-1 l -2.375,0 z m 8,0 c 0.11352,0.31647 0.1875,0.64447 0.1875,1 0,0.35553 -0.074,0.68353 -0.1875,1 l 2.375,0 c -0.11352,-0.31647 -0.1875,-0.64447 -0.1875,-1 0,-0.35553 0.074,-0.68353 0.1875,-1 l -2.375,0 z"
-       id="path3407"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 67,168 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z m 8,0 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z m 8,0 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z"
-       id="path3409"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 155,168 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
-       id="path3415"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 52.03125,162.60657 c -1.32908,0.53118 -2.444369,1.41916 -3.3125,2.53125 0.07092,0.0184 0.149734,0.009 0.21875,0.0312 0.520689,0.16918 0.941853,0.48986 1.28125,0.875 0.583365,-0.69731 1.320919,-1.23792 2.15625,-1.625 -0.228003,-0.42194 -0.375,-0.89709 -0.375,-1.4062 0,-0.14028 0.0122,-0.27085 0.03125,-0.40625 z m 5.9375,0 C 57.9878,162.74197 58,162.87254 58,163.01282 c 0,0.50911 -0.146997,0.98426 -0.375,1.40625 0.835331,0.38708 1.572885,0.92769 2.15625,1.625 0.339397,-0.38514 0.760561,-0.70582 1.28125,-0.875 0.06748,-0.0219 0.146303,-0.0395 0.21875,-0.0625 -0.866395,-1.10291 -1.991152,-1.97191 -3.3125,-2.5 z m -10.9375,8.21875 c 0.132811,1.35398 0.618313,2.61506 1.34375,3.6875 0.05422,-0.0956 0.121594,-0.19054 0.1875,-0.28125 0.298579,-0.41096 0.689964,-0.72255 1.125,-0.9375 -0.439267,-0.72096 -0.728373,-1.5606 -0.84375,-2.4375 -0.563589,0.16464 -1.184566,0.16262 -1.78125,-0.0312 -0.009,-0.003 -0.02228,0.003 -0.03125,0 z m 15.90625,0 c -0.596684,0.19387 -1.217661,0.19589 -1.78125,0.0312 -0.115377,0.8769 -0.404483,1.71654 -0.84375,2.4375 0.438042,0.20421 0.821177,0.51932 1.125,0.9375 0.06591,0.0907 0.133279,0.18566 0.1875,0.28125 0.725438,-1.07244 1.210939,-2.33352 1.34375,-3.6875 -0.009,0.003 -0.02224,-0.003 -0.03125,0 z M 54,176.16907 c -0.03014,0.55835 -0.21394,1.114 -0.5625,1.59375 -0.027,0.0372 -0.06534,0.0582 -0.09375,0.0937 0.540476,0.11583 1.081942,0.1875 1.65625,0.1875 0.574308,0 1.115774,-0.0717 1.65625,-0.1875 -0.02841,-0.0355 -0.06675,-0.0566 -0.09375,-0.0937 -0.34856,-0.47975 -0.532362,-1.0354 -0.5625,-1.59375 -0.329444,0.0535 -0.654988,0.0937 -1,0.0937 -0.345012,0 -0.670556,-0.0403 -1,-0.0937 z"
-       id="path3419"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.50000125;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 55,161 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z m -7.15625,5 c -0.77652,0.0669 -1.494002,0.58712 -1.75,1.375 -0.341331,1.05051 0.230742,2.18992 1.28125,2.53125 1.050508,0.34133 2.189919,-0.23074 2.53125,-1.28125 0.341331,-1.05051 -0.230742,-2.18992 -1.28125,-2.53125 -0.262627,-0.0853 -0.52241,-0.11606 -0.78125,-0.0937 z m 13.9375,0 c -0.132056,0.0149 -0.274936,0.0511 -0.40625,0.0937 -1.050508,0.34133 -1.622581,1.48074 -1.28125,2.53125 0.341331,1.05051 1.480742,1.62258 2.53125,1.28125 1.050508,-0.34133 1.622581,-1.48074 1.28125,-2.53125 -0.298664,-0.91919 -1.20061,-1.47926 -2.125,-1.375 z m -10.71875,8 c -0.641658,-0.0219 -1.281719,0.25399 -1.6875,0.8125 -0.64925,0.89362 -0.456116,2.16325 0.4375,2.8125 0.893616,0.64925 2.16325,0.45612 2.8125,-0.4375 0.64925,-0.89362 0.456116,-2.16325 -0.4375,-2.8125 -0.335106,-0.24347 -0.740005,-0.36184 -1.125,-0.375 z m 7.875,0 c -0.384995,0.0132 -0.789894,0.13153 -1.125,0.375 -0.893615,0.64925 -1.08675,1.91888 -0.4375,2.8125 0.64925,0.89362 1.918885,1.08675 2.8125,0.4375 0.893615,-0.64925 1.08675,-1.91888 0.4375,-2.8125 -0.405781,-0.55851 -1.045842,-0.83443 -1.6875,-0.8125 z"
-       id="path3423"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 109,166.01282 -4,4 4,4 1,-1 0,-2 2.1875,0 c -0.11352,-0.31647 -0.1875,-0.64447 -0.1875,-1 0,-0.34518 0.0802,-0.69136 0.1875,-1 l -2.1875,0 0,-2 -1,-1 z m 12,0 -1,1 0,2 -2.1875,0 c 0.10728,0.30864 0.1875,0.65482 0.1875,1 0,0.35553 -0.074,0.68353 -0.1875,1 l 2.1875,0 0,2 1,1 4,-4 -4,-4 z"
-       id="path3427"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 226,732.36218 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
-       transform="matrix(2.0000003,0,0,2.0000003,-335.00007,-1294.7246)"
-       id="path3429"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 133,165 -4,5 4,5 2,0 0,-1 -3.5,-4 3.5,-4 0,-1 -2,0 z m 6,0 -4,5 4,5 2,0 0,-1 -3.5,-4 3.5,-4 0,-1 -2,0 z"
-       id="path3433"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 174,163 -1,1 0,4 -4,0 -1,1 0,2 1,1 4,0 0,4 1,1 2,0 1,-1 0,-4 4,0 1,-1 0,-2 -1,-1 -4,0 0,-4 -1,-1 z"
-       id="path3437"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 189,162 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
-       id="path3412"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 189,174 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
-       id="path3410"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 201,174 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
-       id="path3443"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 215,160 -1,1 0,1.0625 c -3.94444,0.49381 -7,3.85922 -7,7.9375 0,4.41827 3.58173,8 8,8 4.41827,0 8,-3.58173 8,-8 0,-2.46731 -1.11852,-4.65856 -2.875,-6.125 l -1.40625,1.40625 C 220.11409,166.37996 221,168.08592 221,170 c 0,3.3137 -2.6863,6 -6,6 -3.3137,0 -6,-2.6863 -6,-6 0,-2.97561 2.15859,-5.43327 5,-5.90625 l 0,0.90625 1,1 3,-3 -3,-3 z"
-       id="path3445"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 233,162 c -1.33333,0 -2.21875,0.78125 -2.71875,1.28125 -0.5,0.5 -0.61458,0.71875 -1.28125,0.71875 l -1,0 0,2 1,0 c 1.33333,0 2.21875,-0.78125 2.71875,-1.28125 0.5,-0.5 0.61458,-0.71875 1.28125,-0.71875 0.16667,0 0.20569,0.009 0.40625,0.25 0.20056,0.24067 0.4375,0.6875 0.6875,1.1875 0.25,0.5 0.51306,1.05317 0.9375,1.5625 0.42444,0.50933 1.13542,1 1.96875,1 1.33333,0 2.21875,-0.78125 2.71875,-1.28125 0.5,-0.5 0.61458,-0.71875 1.28125,-0.71875 l 1,0 0,-2 -1,0 c -1.33333,0 -2.21875,0.78125 -2.71875,1.28125 -0.5,0.5 -0.61458,0.71875 -1.28125,0.71875 -0.16667,0 -0.20569,-0.009 -0.40625,-0.25 -0.20056,-0.24067 -0.4375,-0.6875 -0.6875,-1.1875 -0.25,-0.5 -0.51306,-1.05317 -0.9375,-1.5625 -0.42444,-0.50933 -1.13542,-1 -1.96875,-1 z"
-       id="path3451"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 228,176 0,2 14,0 0,-2 -14,0 z"
-       id="path3453"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 532.5,1.9999969 0,1 1,1 -4.5,4.5000001 0,0.5 0,1 1.5,0 4.5,-4.5000001 1,1 1,0 0,-3.5 0,-1 -1,0 z m -6.5,1 -1,1 0,9.0000001 1,1 9,0 1,-1 0,-5 -2,2 0,2 -1,0 -1,0 -4,0 -1,0 0,-5.0000001 0,-2 1,0 1,0 2,-2 z"
-       id="path3404-8"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 532.5,15.999997 0,1 1,1 -4.5,4.5 0,0.5 0,1 1.5,0 4.5,-4.5 1,1 1,0 0,-3.5 0,-1 -1,0 z m -6.5,1 -1,1 0,9 1,1 9,0 1,-1 0,-5 -2,2 0,2 -1,0 -1,0 -4,0 -1,0 0,-5 0,-2 1,0 1,0 2,-2 z"
-       id="path5520"
-       style="color:#000000;fill:#597be7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 114,21.999997 -5,4.5 5,4.5 0,-3 3,0 1,1 0,3 -1,1 -5,0 -1,1 0,1 1,1 5,0 2,-1 1,-1 1,-2 0,-3 -1,-2 -1,-1 -2,-1 -3,0 z m 22,0 0,3 -3,0 -2,1 -1,1 -1,2 0,3 1,2 1,1 2,1 5,0 1,-1 0,-1 -1,-1 -5,0 -1,-1 0,-3 1,-1 3,0 0,3 5,-4.5 z m -57,1 -1,1 0,1.59375 -6.40625,6.40625 -1.59375,0 -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 6.40625,-6.40625 1.59375,0 1,-1 0,-2 -1,-1 z m 96,0 -6,6 1,1 3,0 0,6 1,1 2,0 1,-1 0,-6 3,0 1,-1 z m -118,1 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 23,0 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 C 79.30935,25.719977 79.28,25.690657 79.25,25.656247 79.09665,25.480516 79,25.251518 79,24.999997 c 0,-0.55228 0.44772,-1 1,-1 z m 10,0 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 z m 69.5,0 -4.9375,8.5625 -3.5625,-3.5625 -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 z m 30.5,0 -1,1 0,1 4,4 -4,4 0,1 1,1 1,0 4,-4 4,4 1,0 1,-1 0,-1 -4,-4 4,-4 0,-1 -1,-1 -1,0 -4,4 -4,-4 z m 21,0 -1,1 0,1 1,1 8,0 1,-1 0,-1 -1,-1 z m -120,1 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 132,0 -1,1 0,1 3,3 -3,3 0,1 1,1 1,0 3,-3 3,3 1,0 1,-1 0,-1 -3,-3 3,-3 0,-1 -1,-1 -1,0 -3,3 -3,-3 z m -173.84375,2 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 z m 35.84375,0 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 z m 118,1 0,7 1,1 6,0 1,-1 0,-7 z m 2,2 1,0 0,4 -1,0 0,-1 z m 3,0 1,0 0,3 0,1 -1,0 z m -145,3 c 0.25152,0 0.48052,0.0967 0.65625,0.25 l 0.09375,0.09375 c 0.15335,0.175731 0.25,0.404734 0.25,0.65625 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 20,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z"
-       id="path4657"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <g
-       transform="translate(-656,93.637817)"
-       id="g4659"
-       style="fill:#ffffff;fill-opacity:1;display:inline">
-      <path
-         d="m 174,3 -1,1 0,4 -4,0 -1,1 0,1 1,1 4,0 0,4 1,1 1,0 1,-1 0,-4 4,0 1,-1 0,-1 -1,-1 -4,0 0,-4 -1,-1 -1,0 z"
-         transform="translate(756,-73.637817)"
-         id="path4661"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <path
-       d="m 290,28 11,0 1,1.00002 0,1 -1,0.99998 -11,0 -1,-1 0,-1 z"
-       id="path4663"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 313.5,23.00001 c -3.03757,0 -5.5,2.46243 -5.5,5.5 0,3.03757 2.46243,5.5 5.5,5.5 1.00612,0 1.93866,-0.27827 2.75,-0.75 l 3.75,3.75 1,0 1,-1 0,-1 -3.75,-3.75 c 0.47173,-0.81134 0.75,-1.74387 0.75,-2.75 0,-3.03757 -2.46243,-5.5 -5.5,-5.5 z m -0.5,2 1,0 2,1 1,2 0,1 -1,2 -2,1 -1,0 -2,-1 -1,-2 0,-1 1,-2 2,-1 z"
-       id="path4665"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path17966"
+       d="m 600,12 0,1 1,0 0,-1 -1,0 z" />
+  </g>
+  <g
+     style="fill:#ffffff"
+     id="g16830"
+     transform="translate(-5,20.000003)">
     <path
-       d="m 354.5,22.999997 c -1.5,0 -2.5,2 -2.5,3 0,0.666667 0,1.333333 0,2 0,1 1,2.153847 1,2.153847 l 0,0.846153 -1.69231,0.384617 c -1.45419,0.330499 -2.02608,1.236079 -2.15384,2.76923 L 349,35.999998 l 12,0 -0.15385,-1.846154 c -0.12776,-1.533151 -0.69965,-2.438731 -2.15384,-2.76923 L 357,30.999997 l 0,-0.846153 c 0,0 1,-1.153847 1,-2.153847 0,-0.666667 0,-1.333333 0,-2 0,-1 -1,-3 -2.5,-3 z"
-       id="path4667"
+       inkscape:connector-curvature="0"
        style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <rect
-       width="6"
-       height="2"
-       x="192"
-       y="155"
-       id="rect4769"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       width="2"
-       height="5.9999971"
-       x="188"
-       y="147"
-       id="rect4769-6"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       width="2"
-       height="2"
-       x="45"
-       y="149"
-       transform="translate(25,-3.0624999e-6)"
-       id="rect4789"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       width="2"
-       height="2"
-       x="78"
-       y="149"
-       id="rect4791"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="m 188,167 2,0 c 0,2.00001 0,4 0,6 l -2,0 z"
-       id="path4863"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 192,175 6,0 c 0,0.66667 0,1.33333 0,2 l -6,0 z"
-       id="path4863-8"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 231,4.9999969 -1,1 0,1 3,3 -3,3.0000001 0,1 1,1 1,0 3,-3 3,3 1,0 1,-1 0,-1 -3,-3.0000001 3,-3 0,-1 -1,-1 -1,0 -3,3 -3,-3 -1,0 z"
-       id="path3848"
-       style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 114,41.999997 -5,4.5 5,4.5 0,-3 3,0 1,1 0,3 -1,1 -5,0 -1,1 0,1 1,1 5,0 2,-1 1,-1 1,-2 0,-3 -1,-2 -1,-1 -2,-1 -3,0 z m 22,0 0,3 -3,0 -2,1 -1,1 -1,2 0,3 1,2 1,1 2,1 5,0 1,-1 0,-1 -1,-1 -5,0 -1,-1 0,-3 1,-1 3,0 0,3 5,-4.5 z m -57,1 -1,1 0,1.59375 -6.40625,6.40625 -1.59375,0 -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 6.40625,-6.40625 1.59375,0 1,-1 0,-2 -1,-1 z m 96,0 -6,6 1,1 3,0 0,6 1,1 2,0 1,-1 0,-6 3,0 1,-1 z m -118,1 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 23,0 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 C 79.30935,45.719977 79.28,45.690657 79.25,45.656247 79.09665,45.480516 79,45.251518 79,44.999997 c 0,-0.55228 0.44772,-1 1,-1 z m 10,0 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 z m 69.5,0 -4.9375,8.5625 -3.5625,-3.5625 -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 z m 30.5,0 -1,1 0,1 4,4 -4,4 0,1 1,1 1,0 4,-4 4,4 1,0 1,-1 0,-1 -4,-4 4,-4 0,-1 -1,-1 -1,0 -4,4 -4,-4 z m 21,0 -1,1 0,1 1,1 8,0 1,-1 0,-1 -1,-1 z m -120,1 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m -41.84375,2 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 z m 35.84375,0 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 z m 118,1 0,7 1,1 6,0 1,-1 0,-7 z m 2,2 1,0 0,4 -1,0 0,-1 z m 3,0 1,0 0,3 0,1 -1,0 z m -145,3 c 0.25152,0 0.48052,0.0967 0.65625,0.25 l 0.09375,0.09375 c 0.15335,0.175731 0.25,0.404734 0.25,0.65625 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 20,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z"
-       id="path2997-6"
-       style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 215,168 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
-       id="path4802-1"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 155,161 -3,3 1,1 1,0 0,2 2,0 0,-2 1,0 1,-1 -3,-3 z"
-       id="path4861-8"
-       style="color:#000000;fill:#bfbfbf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 149,167 -3,3 3,3 1,-1 0,-1 2,0 0,-2 -2,0 0,-1 -1,-1 z"
-       id="path4859-2"
-       style="color:#000000;fill:#bfbfbf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 161,167 -1,1 0,1 -2,0 0,2 2,0 0,1 1,1 3,-3 -3,-3 z"
-       id="path4857-6"
-       style="color:#000000;fill:#bfbfbf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 155,168 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
-       id="path4855-0"
-       style="color:#000000;fill:#bfbfbf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 154,173 0,2 -1,0 -1,1 3,3 3,-3 -1,-1 -1,0 0,-2 -2,0 z"
-       id="path4804-3"
-       style="color:#000000;fill:#bfbfbf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 209,147.5 0,3.5 -1,0 -1,1 3,3 3,-3 -1,-1 -1,0 0,-1.5 c -1.70008,-0.85011 -2,-2 -2,-2 z"
+       id="path16832"
        transform="translate(25,-3.0624999e-6)"
-       id="path5237"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       d="m 524,5 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 10,0 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m -9,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m -6,6 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
     <path
-       d="m 232,172 1,-1 1,0 0,-3.5 c 0,0 0.29992,1.14989 2,2 0,0.591 0,1.5 0,1.5 l 1,0 1,1 -3,3 z"
-       id="path5239-7"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path16834"
+       d="m 558.0625,9.21875 -1.5,2.5 0.875,0.53125 1.5,-2.5 -0.875,-0.53125 z" />
     <path
-       d="m 257.5,251.25 c -1.385,0 -2.5,1.115 -2.5,2.5 l 0,37.5 c 0,1.385 1.115,2.5 2.5,2.5 l 20,0 0.10937,-20 -5.10937,0 0,-5 5,0 0,-1.5 c 0,-1.82822 0.17535,-3.11147 0.5,-4 0.44424,-1.19602 1.38937,-2.26525 2.5,-3 1.1277,-0.75177 2.48379,-1.49996 4.5,-1.5 2.5,0 4.1947,0.87241 5.45976,2.03147 l -1.63603,3.63589 c -0.95686,-0.17083 -2.46942,-0.66733 -3.32373,-0.66736 -1.4011,3e-5 -1.78946,0.016 -2.37039,0.61398 -0.58094,0.59806 -0.62961,0.74575 -0.62961,2.38602 l 0,2 6.5,0 0,5 -6.5,0 0,20 10,0 c 1.385,0 2.5,-1.115 2.5,-2.5 l 0,-37.5 c 0,-1.385 -1.115,-2.5 -2.5,-2.5 z"
-       id="rect3843"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <rect
-       width="100"
-       height="100"
-       x="625"
-       y="220"
-       id="rect4219-0"
-       style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <g
-       id="text3863"
-       style="font-size:17.49651146px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:120.00000477%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#e4a4be;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Avenir;-inkscape-font-specification:Avenir" />
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path16836"
+       d="m 551.9375,9.21875 -0.875,0.53125 1.5,2.5 0.875,-0.53125 -1.5,-2.5 z" />
+  </g>
+  <g
+     style="fill:#ffffff"
+     id="g16838"
+     transform="translate(5432.5,-1225.375)">
     <path
-       d="m 253.78571,5.0714269 -1,1 v 1 l 1,1 h 1 l 1,-1 v -1 l -1,-1 h -1 z m 0,4 -1,1.0000001 v 5 l 1,1 h 1 l 1,-1 v -5 l -1,-1.0000001 h -1 z"
-       id="path10613"
-       style="font-size:16.71258354px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#222222;fill-rule:nonzero;enable-background:accumulate;font-family:Helvetica Neue"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path16840"
+       d="m -4868.5,1248.3622 -1,1 0,2 1,1 0,6 -1,1 0,2 1,1 2,0 1,-1 6,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-6 1,-1 0,-2 -1,-1 -2,0 -1,1 -6,0 -1,-1 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m -8,2 6,0 1,1 0,6 -1,1 -6,0 -1,-1 0,-6 z m -2,8 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
     <path
-       d="m 253.78571,45.071427 -1,1 0,1 1,1 1,0 1,-1 0,-1 -1,-1 -1,0 z m 0,4 -1,1 0,5 1,1 1,0 1,-1 0,-5 -1,-1 -1,0 z"
-       id="path10620"
-       style="font-size:16.71258354px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#000000;fill-rule:nonzero;enable-background:accumulate;font-family:Helvetica Neue"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path16842"
+       d="m -4863.5,1253.3622 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
+  </g>
+  <g
+     style="fill:#ffffff"
+     id="g16844"
+     transform="translate(-74,19.000003)">
     <path
-       d="m 253.78571,25.071427 -1,1 0,1 1,1 1,0 1,-1 0,-1 -1,-1 -1,0 z m 0,4 -1,1 0,5 1,1 1,0 1,-1 0,-5 -1,-1 -1,0 z"
-       id="path5293"
-       style="font-size:16.71258354px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-rule:nonzero;enable-background:accumulate;font-family:Helvetica Neue"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path16846"
+       d="m 598,4.9872 0,0 -1,1 0,1 0,1 0,1 1,1 0,0 1,1 1,0 1,0 1,0 1,-1 0,0 1,-1 0,-1 0,-1 0,-1 -1,-1 0,0 -1,-1 -1,0 -1,0 -1,0 z m 2,1 1,0 1,1 0,1 -1,1 -1,0 -1,-1 0,-1 z" />
     <path
-       d="m 431,2.9999969 0,1 2,2.40625 0,1.59375 4,0 0,-1.59375 2,-2.40625 0,-1 -1,0 -2,2 -2,0 -2,-2 -1,0 z m 1,6 -1,1 -3,0 -1,1.0000001 1,1 3,0 0,1 -2,1 -1,1 0,1 1,0 2,-1 2,2 4,0 2,-2 2,1 1,0 0,-1 -1,-1 -2,-1 0,-1 3,0 1,-1 -1,-1.0000001 -3,0 -1,-1 -6,0 z"
-       id="rect14284"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path16848"
+       d="m 608,5.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
     <path
-       d="m 431,22.999997 0,1 2,2.40625 0,1.59375 4,0 0,-1.59375 2,-2.40625 0,-1 -1,0 -2,2 -2,0 -2,-2 -1,0 z m 1,6 -1,1 -3,0 -1,1 1,1 3,0 0,1 -2,1 -1,1 0,1 1,0 2,-1 2,2 4,0 2,-2 2,1 1,0 0,-1 -1,-1 -2,-1 0,-1 3,0 1,-1 -1,-1 -3,0 -1,-1 -6,0 z"
-       id="path14358"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path16850"
+       d="m 606,11.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
     <path
-       d="m 431,42.999997 0,1 2,2.40625 0,1.59375 4,0 0,-1.59375 2,-2.40625 0,-1 -1,0 -2,2 -2,0 -2,-2 -1,0 z m 1,6 -1,1 -3,0 -1,1 1,1 3,0 0,1 -2,1 -1,1 0,1 1,0 2,-1 2,2 4,0 2,-2 2,1 1,0 0,-1 -1,-1 -2,-1 0,-1 3,0 1,-1 -1,-1 -3,0 -1,-1 -6,0 z"
-       id="path14360"
-       style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path16852"
+       d="m 600,13.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
     <path
-       d="m 507,26.999997 2,0 3,3 4.7735,-6 2.2265,0 0,2 -5,6 -1,1 -2,0 -1,-1 -3,-3 z"
-       id="path3361"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path16854"
+       d="m 604.34375,10.625 -0.6875,0.71875 1,1 0.6875,-0.71875 -1,-1 z" />
     <path
-       d="m 507,6.999997 2,0 3,3 4.7735,-6 2.2265,0 0,2 -5,6 -1,1 -2,0 -1,-1 -3,-3 z"
-       id="path3365"
-       style="color:#000000;fill:#7f7f7f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <g
-       transform="translate(20,0)"
-       id="g16825">
-      <path
-         d="m 524,5 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 10,0 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m -9,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m -6,6 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         transform="translate(25,-3.0624999e-6)"
-         id="path17679"
-         style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 558.0625,9.21875 -1.5,2.5 0.875,0.53125 1.5,-2.5 -0.875,-0.53125 z"
-         id="path17685"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 551.9375,9.21875 -0.875,0.53125 1.5,2.5 0.875,-0.53125 -1.5,-2.5 z"
-         id="path17687"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="translate(5457.5,-1245.375)"
-       id="g17870">
-      <path
-         d="m -4868.5,1248.3622 -1,1 0,2 1,1 0,6 -1,1 0,2 1,1 2,0 1,-1 6,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-6 1,-1 0,-2 -1,-1 -2,0 -1,1 -6,0 -1,-1 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m -8,2 6,0 1,1 0,6 -1,1 -6,0 -1,-1 0,-6 z m -2,8 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path2997-7-7"
-         style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m -4863.5,1253.3622 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path17497-7-3"
-         style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="translate(-49,-1)"
-       id="g16816">
-      <path
-         d="m 598,4.9872 0,0 -1,1 0,1 0,1 0,1 1,1 0,0 1,1 1,0 1,0 1,0 1,-1 0,0 1,-1 0,-1 0,-1 0,-1 -1,-1 0,0 -1,-1 -1,0 -1,0 -1,0 z m 2,1 1,0 1,1 0,1 -1,1 -1,0 -1,-1 0,-1 z"
-         id="path17900"
-         style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 608,5.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path17902"
-         style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 606,11.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path17942"
-         style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 600,13.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path17944"
-         style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 604.34375,10.625 -0.6875,0.71875 1,1 0.6875,-0.71875 -1,-1 z"
-         id="path17687-1"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 605,7 0,1 1,0 0,-1 -1,0 z"
-         id="path17964"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 600,12 0,1 1,0 0,-1 -1,0 z"
-         id="path17966"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="translate(20,20)"
-       id="g16830"
-       style="fill:#ffffff">
-      <path
-         d="m 524,5 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 10,0 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m -9,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m -6,6 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         transform="translate(25,-3.0624999e-6)"
-         id="path16832"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 558.0625,9.21875 -1.5,2.5 0.875,0.53125 1.5,-2.5 -0.875,-0.53125 z"
-         id="path16834"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 551.9375,9.21875 -0.875,0.53125 1.5,2.5 0.875,-0.53125 -1.5,-2.5 z"
-         id="path16836"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="translate(5457.5,-1225.375)"
-       id="g16838"
-       style="fill:#ffffff">
-      <path
-         d="m -4868.5,1248.3622 -1,1 0,2 1,1 0,6 -1,1 0,2 1,1 2,0 1,-1 6,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-6 1,-1 0,-2 -1,-1 -2,0 -1,1 -6,0 -1,-1 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m -8,2 6,0 1,1 0,6 -1,1 -6,0 -1,-1 0,-6 z m -2,8 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path16840"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m -4863.5,1253.3622 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path16842"
-         style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="translate(-49,19)"
-       id="g16844"
-       style="fill:#ffffff">
-      <path
-         d="m 598,4.9872 0,0 -1,1 0,1 0,1 0,1 1,1 0,0 1,1 1,0 1,0 1,0 1,-1 0,0 1,-1 0,-1 0,-1 0,-1 -1,-1 0,0 -1,-1 -1,0 -1,0 -1,0 z m 2,1 1,0 1,1 0,1 -1,1 -1,0 -1,-1 0,-1 z"
-         id="path16846"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 608,5.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path16848"
-         style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 606,11.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path16850"
-         style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 600,13.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path16852"
-         style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 604.34375,10.625 -0.6875,0.71875 1,1 0.6875,-0.71875 -1,-1 z"
-         id="path16854"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 605,7 0,1 1,0 0,-1 -1,0 z"
-         id="path16856"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 600,12 0,1 1,0 0,-1 -1,0 z"
-         id="path16858"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="translate(20,40)"
-       id="g16860"
-       style="opacity:0.5">
-      <path
-         d="m 524,5 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 10,0 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m -9,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m -6,6 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         transform="translate(25,-3.0624999e-6)"
-         id="path16862"
-         style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 558.0625,9.21875 -1.5,2.5 0.875,0.53125 1.5,-2.5 -0.875,-0.53125 z"
-         id="path16864"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 551.9375,9.21875 -0.875,0.53125 1.5,2.5 0.875,-0.53125 -1.5,-2.5 z"
-         id="path16866"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="translate(5457.5,-1205.375)"
-       id="g16868"
-       style="opacity:0.5">
-      <path
-         d="m -4868.5,1248.3622 -1,1 0,2 1,1 0,6 -1,1 0,2 1,1 2,0 1,-1 6,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-6 1,-1 0,-2 -1,-1 -2,0 -1,1 -6,0 -1,-1 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m -8,2 6,0 1,1 0,6 -1,1 -6,0 -1,-1 0,-6 z m -2,8 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path16870"
-         style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m -4863.5,1253.3622 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path16872"
-         style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="translate(-49,39)"
-       id="g16874"
-       style="opacity:0.5">
-      <path
-         d="m 598,4.9872 0,0 -1,1 0,1 0,1 0,1 1,1 0,0 1,1 1,0 1,0 1,0 1,-1 0,0 1,-1 0,-1 0,-1 0,-1 -1,-1 0,0 -1,-1 -1,0 -1,0 -1,0 z m 2,1 1,0 1,1 0,1 -1,1 -1,0 -1,-1 0,-1 z"
-         id="path16876"
-         style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 608,5.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path16878"
-         style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 606,11.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path16880"
-         style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 600,13.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path16882"
-         style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 604.34375,10.625 -0.6875,0.71875 1,1 0.6875,-0.71875 -1,-1 z"
-         id="path16884"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 605,7 0,1 1,0 0,-1 -1,0 z"
-         id="path16886"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 600,12 0,1 1,0 0,-1 -1,0 z"
-         id="path16888"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-    </g>
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path16856"
+       d="m 605,7 0,1 1,0 0,-1 -1,0 z" />
     <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3805"
-       d="m 334.5,22.999997 -6.5,3 0,1 6.5,3 1,0 6.5,-3 0,-1 -6.5,-3 -1,0 z m -5.40625,6.5 -1.09375,0.5 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z m 0,4 -1.09375,0.5 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path16858"
+       d="m 600,12 0,1 1,0 0,-1 -1,0 z" />
+  </g>
+  <g
+     style="opacity:0.5"
+     id="g16860"
+     transform="translate(-5,40.000003)">
     <path
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 9,4 -6,11 1,1 12,0 1,-1 -6,-11 z m 1,3 1,1 0,2 -1,1 -1,-1 0,-2 z m 0,5 1,1 -1,1 -1,-1 z"
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path16862"
        transform="translate(25,-3.0624999e-6)"
-       id="path4065-7"
+       d="m 524,5 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 10,0 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m -9,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m -6,6 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
+    <path
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccccccccc" />
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path16864"
+       d="m 558.0625,9.21875 -1.5,2.5 0.875,0.53125 1.5,-2.5 -0.875,-0.53125 z" />
     <path
-       id="path6484"
-       d="m 34,23.999997 -7,11 1,1 14,0 1,-1 -7,-11 z m 1,3 1,1 0,2 -1,1 -1,-1 0,-2 z m 0,5 1,1 -1,1 -1,-1 z"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccccccccc" />
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path16866"
+       d="m 551.9375,9.21875 -0.875,0.53125 1.5,2.5 0.875,-0.53125 -1.5,-2.5 z" />
+  </g>
+  <g
+     style="opacity:0.5"
+     id="g16868"
+     transform="translate(5432.5,-1205.375)">
     <path
        inkscape:connector-curvature="0"
-       style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 34,43.999997 -7,11 1,1 14,0 1,-1 -7,-11 z m 1,3 1,1 0,2 -1,1 -1,-1 0,-2 z m 0,5 1,1 -1,1 -1,-1 z"
-       id="path6503"
-       sodipodi:nodetypes="ccccccccccccccccccc" />
+       style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path16870"
+       d="m -4868.5,1248.3622 -1,1 0,2 1,1 0,6 -1,1 0,2 1,1 2,0 1,-1 6,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-6 1,-1 0,-2 -1,-1 -2,0 -1,1 -6,0 -1,-1 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m -8,2 6,0 1,1 0,6 -1,1 -6,0 -1,-1 0,-6 z m -2,8 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
     <path
        inkscape:connector-curvature="0"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 357.5,251.25 c -1.385,0 -2.5,1.115 -2.5,2.5 l 0,37.5 c 0,1.385 1.115,2.5 2.5,2.5 l 35,0 c 1.385,0 2.5,-1.115 2.5,-2.5 l 0,-37.5 c 0,-1.385 -1.115,-2.5 -2.5,-2.5 l -35,0 z m 12.42187,8.95312 7.73438,0 -1.73438,1.26563 -2.45312,0 c 1.62608,0.62541 2.48437,2.50808 2.48437,4.45312 0,1.6339 -0.8932,3.04778 -2.17187,4.04688 -1.2477,0.97471 -1.48438,1.37445 -1.48438,2.20312 0,0.70735 1.33236,1.91155 2.03125,2.40625 2.04292,1.44503 2.70313,2.79195 2.70313,5.03125 0,2.79312 -2.69863,5.5625 -7.59375,5.5625 -4.29379,0 -7.92188,-1.73845 -7.92188,-4.53125 0,-2.83563 3.30028,-5.57812 7.59375,-5.57812 l 1.34375,0 c -0.58757,-0.57164 -1.04687,-1.27693 -1.04687,-2.14063 0,-0.51252 0.16172,-1.01502 0.39062,-1.45312 -0.23328,0.0169 -0.47328,0.0312 -0.71875,0.0312 -3.52671,0 -5.89062,-2.51638 -5.89062,-5.625 0,-3.04233 3.2677,-5.67188 6.73437,-5.67188 z M 384.5,260.75 l 1.5,0 0,4.5 4.5,0 0,1.5 -4.5,0 0,4.5 -1.5,0 0,-4.5 -4.5,0 0,-1.5 4.5,0 0,-4.5 z m -15.90625,0.5625 c -1.78652,0.18034 -2.94719,2.09397 -2.625,4.54687 0.34366,2.61549 2.24211,4.78433 4.23437,4.84375 0.0279,10e-4 0.0503,0 0.0781,0 1.94503,0 3.24491,-2.04547 2.90625,-4.625 -0.34398,-2.6158 -2.24274,-4.70589 -4.23438,-4.76562 -0.12447,-0.004 -0.24027,-0.012 -0.35937,0 z m 1.34375,14.46875 c -2.96791,-0.0322 -5.625,1.81947 -5.625,4.03125 0,2.2565 2.14147,4.125 5.10937,4.125 4.17246,0 5.625,-1.75882 5.625,-4.01563 0,-0.27206 -0.0325,-0.53796 -0.0937,-0.79687 -0.32583,-1.2771 -1.48237,-1.91083 -3.09375,-3.03125 -0.58601,-0.18951 -1.22922,-0.30529 -1.92187,-0.3125 z"
-       id="path6774"
-       inkscape:export-filename="/Users/saman/Desktop/id-google-plus.svg.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <g
-       transform="translate(301,-5.0000027)"
-       style="display:inline"
-       id="g7018">
-      <rect
-         style="opacity:0.5;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect6728-7"
-         width="20"
-         height="20"
-         x="-56"
-         y="145" />
-      <g
-         id="g6893-0"
-         style="display:inline"
-         transform="translate(-21,0.2499569)">
-        <path
-           style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="path4812-0-2"
-           d="m -33,152.75004 c -1.10457,0 -2.000003,0.89543 -2.000003,2 0,1.10457 0.895433,2 2.000003,2 1.104562,0 1.999996,-0.89543 1.999996,-2 0,-1.10457 -0.895434,-2 -1.999996,-2 z"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path4808-3-3"
-           transform="translate(46,-0.24995996)"
-           d="m -67,149 c -3.313744,0 -6,2.68627 -6,6 0,3.31375 2.686256,6 6,6 3.313731,0 6,-2.68625 6,-6 0,-3.31373 -2.686269,-6 -6,-6 z m -1,2 2,0 0,3 3,0 0,2 -3,0 0,3 -2,0 0,-3 -3,0 0,-2 3,0 0,-3 z m -8,3 0,2 2,0 0,-2 -2,0 z"
-           style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      </g>
-    </g>
-    <g
-       id="g7098"
-       style="fill:#222222;fill-opacity:1;display:inline"
-       transform="translate(301,14.999997)">
-      <rect
-         y="145"
-         x="-56"
-         height="20"
-         width="20"
-         id="rect7100"
-         style="opacity:0.5;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <g
-         transform="translate(-21,0.2499569)"
-         style="fill:#222222;fill-opacity:1;display:inline"
-         id="g7102">
-        <path
-           style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="m 14,24 c -3.313744,0 -6,2.68627 -6,6 0,3.31375 2.686256,6 6,6 3.313731,0 6,-2.68625 6,-6 0,-3.31373 -2.686269,-6 -6,-6 z m -1,2 2,0 0,3 3,0 0,2 -3,0 0,3 -2,0 0,-3 -3,0 0,-2 3,0 0,-3 z M 2,28 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.104562,0 2,-0.89543 2,-2 0,-1.10457 -0.895438,-2 -2,-2 z m 3,1 0,2 2,0 0,-2 -2,0 z"
-           transform="translate(-35,124.75004)"
-           id="path7104"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
+       style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path16872"
+       d="m -4863.5,1253.3622 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
+  </g>
+  <g
+     style="opacity:0.5"
+     id="g16874"
+     transform="translate(-74,39.000003)">
     <path
        inkscape:connector-curvature="0"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path17942-7"
-       d="m 614,7.9999969 -1,1.0000001 0,2 1,1 2,0 1,-1 0,-2 -1,-1.0000001 -2,0 z m 1,1.0000001 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
+       style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path16876"
+       d="m 598,4.9872 0,0 -1,1 0,1 0,1 0,1 1,1 0,0 1,1 1,0 1,0 1,0 1,-1 0,0 1,-1 0,-1 0,-1 0,-1 -1,-1 0,0 -1,-1 -1,0 -1,0 -1,0 z m 2,1 1,0 1,1 0,1 -1,1 -1,0 -1,-1 0,-1 z" />
     <path
        inkscape:connector-curvature="0"
        style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path17944-2"
-       d="m 614,47.999997 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
+       id="path16878"
+       d="m 608,5.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
     <path
-       d="m 359,83.999997 -1,1 0,1.59375 -6.40625,6.40625 -1.59375,0 -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 6.40625,-6.40625 1.59375,0 1,-1 0,-2 -1,-1 z m -22,1 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 23,0 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 -0.0344,-0.03002 -0.0638,-0.05934 -0.0937,-0.09375 -0.15335,-0.175731 -0.25,-0.404729 -0.25,-0.65625 0,-0.55228 0.44772,-1 1,-1 z m 10,0 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 z m 1,1 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m -41.84375,2 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 z m 35.84375,0 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 z m -22,6 c 0.25152,0 0.48052,0.0967 0.65625,0.25 l 0.0937,0.09375 c 0.15335,0.175731 0.25,0.404734 0.25,0.65625 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 20,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z"
-       id="path2997-7"
-       style="color:#000000;fill:#e06d5f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccsscsscssccscccccccccccccccccccccccccccssssssssssssssscccccccccsccsssssssssssssss" />
+       style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path16880"
+       d="m 606,11.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
     <path
-       sodipodi:nodetypes="cccccccccccccccccsscsscssccscccccccccccccccccccccccccccssssssssssssssscccccccccsccsssssssssssssss"
        inkscape:connector-curvature="0"
-       style="color:#000000;fill:#8cd05f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3444"
-       d="m 359,104 -1,1 0,1.59375 L 351.59375,113 350,113 l -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 L 359.40625,108 361,108 l 1,-1 0,-2 -1,-1 z m -22,1 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 23,0 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 -0.0344,-0.03 -0.0638,-0.0593 -0.0937,-0.0937 -0.15335,-0.17573 -0.25,-0.40473 -0.25,-0.65625 0,-0.55228 0.44772,-1 1,-1 z m 10,0 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 z m 1,1 c 0.55228,0 1,0.44771 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55229 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.44771 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55229 0.44772,-1 1,-1 z m -41.84375,2 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 z M 373,108 l 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 z m -22,6 c 0.25152,0 0.48052,0.0967 0.65625,0.25 l 0.0937,0.0937 c 0.15335,0.17573 0.25,0.40473 0.25,0.65625 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 20,0 c 0.55228,0 1,0.44771 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55229 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.44771 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55229 0.44772,-1 1,-1 z" />
-    <rect
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3397"
-       y="147"
-       x="200"
-       height="5.9999971"
-       width="2" />
+       style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path16882"
+       d="m 600,13.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
     <path
        inkscape:connector-curvature="0"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3400"
-       d="m 201,142 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z" />
-    <rect
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3402"
-       y="143"
-       x="192"
-       height="2"
-       width="6" />
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path16884"
+       d="m 604.34375,10.625 -0.6875,0.71875 1,1 0.6875,-0.71875 -1,-1 z" />
     <path
        inkscape:connector-curvature="0"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3404"
-       d="m 192,163 6,0 c 0,0.66667 0,1.33333 0,2 l -6,0 z" />
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path16886"
+       d="m 605,7 0,1 1,0 0,-1 -1,0 z" />
     <path
        inkscape:connector-curvature="0"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3406"
-       d="m 200,167 2,0 c 0,2 0,3.99998 0,6 l -2,0 z" />
-    <path
-       id="path3414"
-       d="m 201,162 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path16888"
+       d="m 600,12 0,1 1,0 0,-1 -1,0 z" />
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     d="m 309.5,23 -6.5,3 0,1 6.5,3 1,0 6.5,-3 0,-1 -6.5,-3 -1,0 z M 304.09375,29.5 303,30 l 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z m 0,4 L 303,34 l 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z"
+     id="path3805"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     sodipodi:nodetypes="ccccccccccccccccccc"
+     inkscape:connector-curvature="0"
+     id="path4065-7"
+     d="m 9,4 -6,11 1,1 12,0 1,-1 -6,-11 z m 1,3 1,1 0,2 -1,1 -1,-1 0,-2 z m 0,5 1,1 -1,1 -1,-1 z"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     sodipodi:nodetypes="ccccccccccccccccccc"
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     d="m 9,24 -7,11 1,1 14,0 1,-1 -7,-11 z m 1,3 1,1 0,2 -1,1 -1,-1 0,-2 z m 0,5 1,1 -1,1 -1,-1 z"
+     id="path6484" />
+  <path
+     sodipodi:nodetypes="ccccccccccccccccccc"
+     id="path6503"
+     d="m 9,44 -7,11 1,1 14,0 1,-1 -7,-11 z m 1,3 1,1 0,2 -1,1 -1,-1 0,-2 z m 0,5 1,1 -1,1 -1,-1 z"
+     style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     inkscape:connector-curvature="0" />
+  <path
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/Users/saman/Desktop/id-google-plus.svg.png"
+     id="path6774"
+     d="m 332.5,251.25 c -1.385,0 -2.5,1.115 -2.5,2.5 l 0,37.5 c 0,1.385 1.115,2.5 2.5,2.5 l 35,0 c 1.385,0 2.5,-1.115 2.5,-2.5 l 0,-37.5 c 0,-1.385 -1.115,-2.5 -2.5,-2.5 l -35,0 z m 12.42187,8.95312 7.73438,0 -1.73438,1.26563 -2.45312,0 c 1.62608,0.62541 2.48437,2.50808 2.48437,4.45312 0,1.6339 -0.8932,3.04778 -2.17187,4.04688 -1.2477,0.97471 -1.48438,1.37445 -1.48438,2.20312 0,0.70735 1.33236,1.91155 2.03125,2.40625 2.04292,1.44503 2.70313,2.79195 2.70313,5.03125 0,2.79312 -2.69863,5.5625 -7.59375,5.5625 -4.29379,0 -7.92188,-1.73845 -7.92188,-4.53125 0,-2.83563 3.30028,-5.57812 7.59375,-5.57812 l 1.34375,0 c -0.58757,-0.57164 -1.04687,-1.27693 -1.04687,-2.14063 0,-0.51252 0.16172,-1.01502 0.39062,-1.45312 -0.23328,0.0169 -0.47328,0.0312 -0.71875,0.0312 -3.52671,0 -5.89062,-2.51638 -5.89062,-5.625 0,-3.04233 3.2677,-5.67188 6.73437,-5.67188 z M 359.5,260.75 l 1.5,0 0,4.5 4.5,0 0,1.5 -4.5,0 0,4.5 -1.5,0 0,-4.5 -4.5,0 0,-1.5 4.5,0 0,-4.5 z m -15.90625,0.5625 c -1.78652,0.18034 -2.94719,2.09397 -2.625,4.54687 0.34366,2.61549 2.24211,4.78433 4.23437,4.84375 0.0279,10e-4 0.0503,0 0.0781,0 1.94503,0 3.24491,-2.04547 2.90625,-4.625 -0.34398,-2.6158 -2.24274,-4.70589 -4.23438,-4.76562 -0.12447,-0.004 -0.24027,-0.012 -0.35937,0 z m 1.34375,14.46875 c -2.96791,-0.0322 -5.625,1.81947 -5.625,4.03125 0,2.2565 2.14147,4.125 5.10937,4.125 4.17246,0 5.625,-1.75882 5.625,-4.01563 0,-0.27206 -0.0325,-0.53796 -0.0937,-0.79687 -0.32583,-1.2771 -1.48237,-1.91083 -3.09375,-3.03125 -0.58601,-0.18951 -1.22922,-0.30529 -1.92187,-0.3125 z"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     inkscape:connector-curvature="0" />
+  <g
+     id="g7018"
+     style="display:inline"
+     transform="translate(276,-4.9999996)">
+    <rect
+       y="145"
+       x="-56"
+       height="20"
+       width="20"
+       id="rect6728-7"
+       style="opacity:0.5;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       transform="translate(-21,0.2499569)"
+       style="display:inline"
+       id="g6893-0">
+      <path
+         inkscape:connector-curvature="0"
+         d="m -33,152.75004 c -1.10457,0 -2.000003,0.89543 -2.000003,2 0,1.10457 0.895433,2 2.000003,2 1.104562,0 1.999996,-0.89543 1.999996,-2 0,-1.10457 -0.895434,-2 -1.999996,-2 z"
+         id="path4812-0-2"
+         style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m -67,149 c -3.313744,0 -6,2.68627 -6,6 0,3.31375 2.686256,6 6,6 3.313731,0 6,-2.68625 6,-6 0,-3.31373 -2.686269,-6 -6,-6 z m -1,2 2,0 0,3 3,0 0,2 -3,0 0,3 -2,0 0,-3 -3,0 0,-2 3,0 0,-3 z m -8,3 0,2 2,0 0,-2 -2,0 z"
+         transform="translate(46,-0.24995996)"
+         id="path4808-3-3"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+  <g
+     transform="translate(276,15)"
+     style="fill:#222222;fill-opacity:1;display:inline"
+     id="g7098">
+    <rect
+       style="opacity:0.5;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect7100"
+       width="20"
+       height="20"
+       x="-56"
+       y="145" />
+    <g
+       id="g7102"
+       style="fill:#222222;fill-opacity:1;display:inline"
+       transform="translate(-21,0.2499569)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path7104"
+         transform="translate(-35,124.75004)"
+         d="m 14,24 c -3.313744,0 -6,2.68627 -6,6 0,3.31375 2.686256,6 6,6 3.313731,0 6,-2.68625 6,-6 0,-3.31373 -2.686269,-6 -6,-6 z m -1,2 2,0 0,3 3,0 0,2 -3,0 0,3 -2,0 0,-3 -3,0 0,-2 3,0 0,-3 z M 2,28 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.104562,0 2,-0.89543 2,-2 0,-1.10457 -0.895438,-2 -2,-2 z m 3,1 0,2 2,0 0,-2 -2,0 z"
+         style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
   </g>
+  <path
+     d="M 589,8 588,9.0000001 588,11 l 1,1 2,0 1,-1 0,-1.9999999 L 591,8 589,8 z m 1,1.0000001 c 0.5523,0 1,0.4477 1,0.9999999 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5522999 0.4477,-0.9999999 1,-0.9999999 z"
+     id="path17942-7"
+     style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     inkscape:connector-curvature="0" />
+  <path
+     d="m 589,48 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
+     id="path17944-2"
+     style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     inkscape:connector-curvature="0" />
+  <path
+     sodipodi:nodetypes="cccccccccccccccccsscsscssccscccccccccccccccccccccccccccssssssssssssssscccccccccsccsssssssssssssss"
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#e06d5f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path2997-7"
+     d="m 514,84 -1,1 0,1.59375 L 506.59375,93 505,93 l -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 L 514.40625,88 516,88 l 1,-1 0,-2 -1,-1 z m -22,1 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 23,0 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 -0.0344,-0.03002 -0.0638,-0.05934 -0.0937,-0.09375 -0.15335,-0.175731 -0.25,-0.404729 -0.25,-0.65625 0,-0.55228 0.44772,-1 1,-1 z m 10,0 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 z m 1,1 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m -41.84375,2 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 z M 528,88 l 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 z m -22,6 c 0.25152,0 0.48052,0.0967 0.65625,0.25 l 0.0937,0.09375 c 0.15335,0.175731 0.25,0.404734 0.25,0.65625 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 20,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z" />
+  <path
+     d="m 514,104 -1,1 0,1.59375 L 506.59375,113 505,113 l -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 L 514.40625,108 516,108 l 1,-1 0,-2 -1,-1 z m -22,1 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 23,0 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 -0.0344,-0.03 -0.0638,-0.0593 -0.0937,-0.0937 -0.15335,-0.17573 -0.25,-0.40473 -0.25,-0.65625 0,-0.55228 0.44772,-1 1,-1 z m 10,0 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 z m 1,1 c 0.55228,0 1,0.44771 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55229 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.44771 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55229 0.44772,-1 1,-1 z m -41.84375,2 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 z M 528,108 l 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 z m -22,6 c 0.25152,0 0.48052,0.0967 0.65625,0.25 l 0.0937,0.0937 c 0.15335,0.17573 0.25,0.40473 0.25,0.65625 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 20,0 c 0.55228,0 1,0.44771 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55229 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.44771 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55229 0.44772,-1 1,-1 z"
+     id="path3444"
+     style="color:#000000;fill:#8cd05f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccccccccccccsscsscssccscccccccccccccccccccccccccccssssssssssssssscccccccccsccsssssssssssssss" />
+  <rect
+     width="2"
+     height="5.9999971"
+     x="175"
+     y="147"
+     id="rect3397"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 176,142 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
+     id="path3400"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     inkscape:connector-curvature="0" />
+  <rect
+     width="6"
+     height="2"
+     x="167"
+     y="143"
+     id="rect3402"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 167,163 6,0 c 0,0.66667 0,1.33333 0,2 l -6,0 z"
+     id="path3404"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     inkscape:connector-curvature="0" />
+  <path
+     d="m 175,167 2,0 c 0,2 0,3.99998 0,6 l -2,0 z"
+     id="path3406"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     inkscape:connector-curvature="0" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     d="m 176,162 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
+     id="path3414" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.009009;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path15680"
+     d="m 41.499631,103.99936 a 1.5000005,1.5000005 0 0 1 10e-7,-3 1.5000005,1.5000005 0 1 1 -10e-7,3 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.20000000000000001;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00900900000000004;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path15600-8"
+     d="m 24.000004,121.5 a 1.5,1.5 0 0 1 -3,0 1.5,1.5 0 1 1 3,0 z" />
+  <path
+     d="m 3.4996283,103.99936 a 1.5000015,1.5000015 0 1 1 2.1e-6,-3 1.5000015,1.5000015 0 0 1 -2.1e-6,3 z"
+     id="path15684"
+     style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00900900000000004;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.20000000000000001"
+     inkscape:connector-curvature="0" />
+  <rect
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00900900000000004;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.5"
+     id="rect15727"
+     width="1"
+     height="1.0000076"
+     x="3"
+     y="102"
+     rx="0.5"
+     ry="0.5" />
+  <rect
+     y="102"
+     x="41"
+     height="1.0000076"
+     width="1"
+     id="rect15729"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00900900000000004;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.5"
+     rx="0.5"
+     ry="0.5" />
+  <rect
+     y="-23.000008"
+     x="83.000008"
+     height="1.0000076"
+     width="1"
+     id="rect15731"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00900900000000004;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.5"
+     transform="matrix(0,1,-1,0,0,0)"
+     rx="0.5"
+     ry="0.5" />
+  <rect
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00900900000000004;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.5"
+     id="rect15733"
+     width="1"
+     height="1.0000076"
+     x="121.00001"
+     y="-23.000008"
+     transform="matrix(0,1,-1,0,0,0)"
+     rx="0.5"
+     ry="0.5" />
 </svg>

diff --git a/vendor/assets/iD/iD/locales/af.json b/vendor/assets/iD/iD/locales/af.json
index 8f86516f0ce5350d965a9b83769a22d2831d55de..bc998f146ade35b0bc55d9e33a641f485d0ee65f 100644 (file)
--- a/vendor/assets/iD/iD/locales/af.json
+++ b/vendor/assets/iD/iD/locales/af.json
@@ -830,18 +830,12 @@
             "building/apartments": {
                 "name": "Woonstelle"
             },
-            "building/entrance": {
-                "name": "Ingang"
-            },
             "building/house": {
                 "name": "Huis"
             },
             "emergency/phone": {
                 "name": "Noodtelefoon"
             },
-            "entrance": {
-                "name": "Ingang"
-            },
             "highway": {
                 "name": "Snelweg"
             },

diff --git a/vendor/assets/iD/iD/locales/ar.json b/vendor/assets/iD/iD/locales/ar.json
index ead07a29518a8fd721cdc6586408e6277692bfe0..d033b5045bc5d3d239c46dabaa07c193b8e75436 100644 (file)
--- a/vendor/assets/iD/iD/locales/ar.json
+++ b/vendor/assets/iD/iD/locales/ar.json
@@ -1052,10 +1052,6 @@
                 "name": "مبني تجاري",
                 "terms": "مبنى تجاري"
             },
-            "building/entrance": {
-                "name": "مدخل",
-                "terms": "مدخل"
-            },
             "building/garage": {
                 "name": "جراج",
                 "terms": "مَرْأب , كراج, تصليح سيارات"
@@ -1088,10 +1084,6 @@
                 "name": "هاتف طوارئ",
                 "terms": "هاتف طوارئ"
             },
-            "entrance": {
-                "name": "مدخل",
-                "terms": "مدخل"
-            },
             "footway/crossing": {
                 "name": "تقاطع",
                 "terms": "تقاطع, معبر"

diff --git a/vendor/assets/iD/iD/locales/ast.json b/vendor/assets/iD/iD/locales/ast.json
index 3610e443b2b0c0cd977e0f51ed316e6efb7525de..95d79368c79883b3ba0759c6a32e6ee67708ad36 100644 (file)
--- a/vendor/assets/iD/iD/locales/ast.json
+++ b/vendor/assets/iD/iD/locales/ast.json
@@ -18,6 +18,12 @@
         "browse": {
             "title": "Navegar",
             "description": "Mover y ampliar el mapa."
+        },
+        "draw_area": {
+            "tail": "Calca p'amestar noyos al área. Calca nel primeru p'acabar el área."
+        },
+        "draw_line": {
+            "tail": "Calca p'amestar más noyos a la llinia. Calca n'otres llinies pa coneutar con elles, y fai doble clic p'acabar la llinia."
         }
     },
     "operations": {
@@ -42,22 +48,45 @@
         "cancel_draw": {
             "annotation": "Dibuxu encaboxáu."
         },
+        "change_role": {
+            "annotation": "Camudó'l rol d'un miembru de la rellación."
+        },
         "change_tags": {
             "annotation": "Etiquetes camudaes."
         },
         "circularize": {
             "title": "Poner en círculu",
+            "description": {
+                "line": "Facer esta llinia circular.",
+                "area": "Facer esti área circular."
+            },
             "key": "O",
             "annotation": {
                 "line": "Facer una llinia circular.",
                 "area": "Facer un área circular."
-            }
+            },
+            "too_large": "Esto nun pue facese circular porque anguaño nun ye visible bastante."
         },
         "orthogonalize": {
+            "title": "Escuadrar",
+            "description": {
+                "line": "Escuadrar les esquines d'esta llinia.",
+                "area": "Escuadrar les esquines d'esti área."
+            },
+            "key": "S",
             "annotation": {
                 "line": "Escuadraes les esquines d'una llinia.",
                 "area": "Escuadraes les esquines d'un área."
-            }
+            },
+            "not_squarish": "Nun pue escuadrase porque nun ye cuadrada",
+            "too_large": "Esto nun pue escuadrase porque anguaño nun ye visible bastante."
+        },
+        "straighten": {
+            "title": "Enderechar",
+            "description": "Enderechar esta llinia.",
+            "key": "S",
+            "annotation": "Enderechada una llinia.",
+            "too_bendy": "Nun pue enderechase porque ta doblada enforma."
         },
         "delete": {
             "title": "Desaniciar",
@@ -90,7 +119,8 @@
             "title": "Entemecer",
             "description": "Entemecer eses llinies.",
             "key": "C",
-            "annotation": "Entemecies {n} llinies."
+            "annotation": "Entemecies {n} llinies.",
+            "incomplete_relation": "Estes carauterístiques nun puen entemecese porque polo menos una nun se descargó completamente."
         },
         "move": {
             "title": "Mover",
@@ -106,6 +136,7 @@
         },
         "rotate": {
             "title": "Xirar",
+            "description": "Xirar esti oxetu alredor del puntu central.",
             "key": "R",
             "annotation": {
                 "line": "Xirada una llinia.",
@@ -132,16 +163,25 @@
     "tooltip_keyhint": "Atayu:",
     "browser_notice": "Esti editor tien sofitu en Firefox, Chrome, Safari, Opera, ya Internet Explorer 9 y superior. Anueve'l so navegador o use Potlatch 2 pa editar el mapa.",
     "translate": {
+        "translate": "Traducir",
+        "localized_translation_label": "Nome multillingüe",
         "localized_translation_language": "Escoyer idioma",
         "localized_translation_name": "Nome"
     },
+    "zoom_in_edit": "Averar pa editar",
     "logout": "zarrar sesión",
     "loading_auth": "Coneutando con OpenStreetMap...",
     "report_a_bug": "informar d'un fallu",
+    "status": {
+        "error": "Nun se pue coneutar cola API.",
+        "offline": "La API ta desconeutada. Intente la edición más sero.",
+        "readonly": "La API ta en mou de sólo llectura. Tendrá d'esperar pa guardar los cambios."
+    },
     "commit": {
         "title": "Guardar cambios",
         "description_placeholder": "Descripción curtia de les collaboraciones",
         "message_label": "Mensaxe d'unviu",
+        "upload_explanation": "Los cambios que xuba tarán visibles en tolos mapes qu'usen los datos d'OpenStreetMap.",
         "save": "Guardar",
         "cancel": "Encaboxar",
         "warnings": "Avisos",
@@ -149,6 +189,10 @@
         "deleted": "Desaniciáu",
         "created": "Creáu"
     },
+    "contributors": {
+        "list": "Ediciones de {users}",
+        "truncated_list": "Ediciones de {users} y otros {count}"
+    },
     "geolocate": {
         "title": "Amosar el mio allugamientu"
     },
@@ -156,13 +200,33 @@
         "no_documentation_combination": "Nun hai documentación disponible pa esta combinación d'etiquetes",
         "no_documentation_key": "Nun hai documentación disponible pa esta clave",
         "show_more": "Ver más",
+        "view_on_osm": "Ver en openstreetmap.org",
+        "all_tags": "Toles etiquetes",
+        "all_members": "Tolos miembros",
+        "all_relations": "Toles rellaciones",
+        "role": "Rol",
         "choose": "Seleicione un tipu de carauterística",
-        "results": "{n} resultaos pa {search}"
+        "results": "{n} resultaos pa {search}",
+        "reference": "Ver na Wiki d'OpenStreetMap",
+        "back_tooltip": "Camudar carauterística",
+        "remove": "Desaniciar",
+        "search": "Guetar",
+        "multiselect": "Elementos seleicionaos",
+        "unknown": "Desconocíu",
+        "none": "Dengún",
+        "node": "Nuedu",
+        "way": "Vía",
+        "relation": "Rellación",
+        "location": "Allugamientu"
     },
     "background": {
         "title": "Fondu",
         "description": "Configuración del fondu",
         "percent_brightness": "{opacity}% brillu",
+        "none": "Dengún",
+        "custom": "Personalizáu",
+        "custom_button": "Editar fondu personalizáu",
+        "fix_misalignment": "Iguar l'alliniamientu",
         "reset": "reaniciar"
     },
     "restore": {
@@ -183,7 +247,9 @@
         "edited_osm": "¡Editáu OSM!",
         "just_edited": "¡Acaba d'editar OpenStreetMap!",
         "view_on_osm": "Ver en OSM",
-        "facebook": "Compartir en Facebook"
+        "facebook": "Compartir en Facebook",
+        "twitter": "Compartir en Twitter",
+        "google": "Compartir en Google+"
     },
     "confirm": {
         "okay": "Aceutar"
@@ -205,10 +271,12 @@
         "used_with": "usada con {type}"
     },
     "validations": {
+        "untagged_point": "Puntu ensin etiquetar",
         "untagged_line": "Llinia ensin etiquetar",
         "untagged_area": "Área ensin etiquetar",
         "many_deletions": "Va desaniciar {n} oxetos. ¿Ta seguru de que ye esto lo que quier facer? Esto desaniciarálos del mapa que ve tol mundu en openstreetmap.org.",
         "tag_suggests_area": "La etiqueta {tag} suxer que la llinia tendría de ser un área, pero nun ye un area",
+        "untagged_tooltip": "Seleicione un tipu de carauterística que describe qué tipu de {geometry} ye.",
         "deprecated_tags": "Etiquetes anticuaes: {tags}"
     },
     "zoom": {
@@ -216,7 +284,10 @@
         "out": "Alloñar"
     },
     "gpx": {
-        "local_layer": "Ficheru GPX llocal"
+        "local_layer": "Ficheru GPX llocal",
+        "drag_drop": "Abasne y suelte un ficheru .gpx na páxina, o faiga clic nel botón de la drecha pa restolar",
+        "zoom": "Ampliar a la traza GPX",
+        "browse": "Restolar por un ficheru .gpx"
     },
     "help": {
         "title": "Ayuda"
@@ -231,7 +302,12 @@
         },
         "points": {
             "title": "Puntos",
-            "add": "Los puntos puen usase pa representar carauterístiques como tiendes, restaurantes y monumentos. Marquen un llugar específicu, y describen lo qu'hai ellí. **Calque nel botón Puntu p'amestar un puntu nuevu.**"
+            "add": "Los puntos puen usase pa representar carauterístiques como tiendes, restaurantes y monumentos. Marquen un llugar específicu, y describen lo qu'hai ellí. **Calque nel botón Puntu p'amestar un puntu nuevu.**",
+            "place": "El puntu pue ponese faciendo clic nel mapa. **Pon el puntu enriba del edificiu.**",
+            "search": "Hai munches carauterístiques distintes que puen representase con puntos. El puntu que vienes d'amestar ye un Café. **Busca '{name}'**",
+            "choose": "**Escueyi Café la llista.**",
+            "describe": "Agora ta marcáu el puntu como un café. Usando'l editor de carauterístiques, podemos amestar más información de la carauterística. **Amiesta un nome**",
+            "close": "L'editor de carauterístiques pue zarrase calcando nel botón zarrar. **Zarra l'editor de carauterístiques**"
         },
         "areas": {
             "title": "Árees",
@@ -241,7 +317,9 @@
             "title": "Llinies"
         },
         "startediting": {
-            "title": "Principiar la edición"
+            "title": "Principiar la edición",
+            "save": "¡Nun escaeza guardar los cambios de mou regular!",
+            "start": "¡Principie a facer mapes!"
         }
     },
     "presets": {
@@ -447,6 +525,36 @@
             "fixme": {
                 "label": "Arréglame"
             },
+            "fuel": {
+                "label": "Combustible"
+            },
+            "fuel/biodiesel": {
+                "label": "Biodiesel"
+            },
+            "fuel/diesel": {
+                "label": "Diesel"
+            },
+            "fuel/e10": {
+                "label": "E10"
+            },
+            "fuel/e85": {
+                "label": "E85"
+            },
+            "fuel/lpg": {
+                "label": "Propanu"
+            },
+            "fuel/octane_100": {
+                "label": "Gasolina de competición"
+            },
+            "fuel/octane_91": {
+                "label": "Gasolina normal"
+            },
+            "fuel/octane_95": {
+                "label": "Gasolina media"
+            },
+            "fuel/octane_98": {
+                "label": "Gasolina súper"
+            },
             "gauge": {
                 "label": "Anchu de vía"
             },
@@ -473,6 +581,9 @@
             "historic": {
                 "label": "Tipu"
             },
+            "hoops": {
+                "placeholder": "1, 2, 4..."
+            },
             "iata": {
                 "label": "IATA"
             },
@@ -506,6 +617,9 @@
             "leisure": {
                 "label": "Tipu"
             },
+            "length": {
+                "label": "Llonxitú (Metros)"
+            },
             "levels": {
                 "label": "Niveles",
                 "placeholder": "2, 4, 6..."
@@ -555,6 +669,9 @@
                 "label": "Par",
                 "placeholder": "3, 4, 5..."
             },
+            "park_ride": {
+                "label": "Aparcamientu con tresporte públicu"
+            },
             "parking": {
                 "label": "Tipu"
             },
@@ -571,6 +688,9 @@
             "place": {
                 "label": "Tipu"
             },
+            "population": {
+                "label": "Población"
+            },
             "power": {
                 "label": "Tipu"
             },
@@ -619,6 +739,9 @@
             "sac_scale": {
                 "label": "Dificultá del camín"
             },
+            "seasonal": {
+                "label": "Estacional"
+            },
             "service": {
                 "label": "Tipu"
             },
@@ -641,6 +764,9 @@
             "sport": {
                 "label": "Deporte"
             },
+            "sport_ice": {
+                "label": "Deporte"
+            },
             "structure": {
                 "label": "Estructura",
                 "placeholder": "Desconocíu",
@@ -648,7 +774,8 @@
                     "bridge": "Ponte",
                     "tunnel": "Túnel",
                     "embankment": "Rellenu",
-                    "cutting": "Trinchera"
+                    "cutting": "Trinchera",
+                    "ford": "Vau"
                 }
             },
             "studio_type": {
@@ -660,6 +787,9 @@
             "surface": {
                 "label": "Superficie"
             },
+            "tactile_paving": {
+                "label": "Baldosa táctil"
+            },
             "tourism": {
                 "label": "Tipu"
             },
@@ -675,6 +805,9 @@
             "tree_type": {
                 "label": "Tipu"
             },
+            "trees": {
+                "label": "Árboles"
+            },
             "tunnel": {
                 "label": "Túnel"
             },
@@ -697,6 +830,9 @@
             "wheelchair": {
                 "label": "Accesu pa siella de ruedes"
             },
+            "width": {
+                "label": "Anchura (Metros)"
+            },
             "wikipedia": {
                 "label": "Wikipedia"
             },
@@ -709,6 +845,9 @@
                 "name": "Direición",
                 "terms": "Señes,Allugamientu"
             },
+            "aerialway/pylon": {
+                "name": "Poste de tresporte per cable"
+            },
             "aeroway": {
                 "name": "Via d'aviación"
             },
@@ -756,6 +895,9 @@
                 "name": "Bar",
                 "terms": "Chigre,Tasca"
             },
+            "amenity/bbq": {
+                "name": "Barbacoa/Asador"
+            },
             "amenity/bench": {
                 "name": "Asientu",
                 "terms": "Asientu"
@@ -783,6 +925,9 @@
             "amenity/car_wash": {
                 "name": "Llaváu de coches"
             },
+            "amenity/charging_station": {
+                "name": "Estación de recarga"
+            },
             "amenity/cinema": {
                 "name": "Cine",
                 "terms": "Cinematógrafu,Multicine"
@@ -794,6 +939,9 @@
             "amenity/clock": {
                 "name": "Reló"
             },
+            "amenity/compressed_air": {
+                "name": "Aire comprimíu"
+            },
             "amenity/courthouse": {
                 "name": "Xulgáu"
             },
@@ -830,6 +978,13 @@
             "amenity/grave_yard": {
                 "name": "Enterramientos"
             },
+            "amenity/hospital": {
+                "name": "Antoxana d'hospital",
+                "terms": "Zona hospitalaria, terrenu d'hospital"
+            },
+            "amenity/kindergarten": {
+                "name": "Antoxana de guardería"
+            },
             "amenity/library": {
                 "name": "Biblioteca",
                 "terms": "Llibros,Centru de llectura"
@@ -840,6 +995,9 @@
             "amenity/parking": {
                 "name": "Aparcamientu"
             },
+            "amenity/parking_entrance": {
+                "name": "Entrada/Salida de garaxe"
+            },
             "amenity/pharmacy": {
                 "name": "Farmacia",
                 "terms": "Botica,Parafarmacia"
@@ -853,13 +1011,16 @@
                 "terms": "Pagoda"
             },
             "amenity/place_of_worship/christian": {
-                "name": "Ilesia"
+                "name": "Ilesia",
+                "terms": "Cultu cristianu, templu"
             },
             "amenity/place_of_worship/jewish": {
-                "name": "Synagoga"
+                "name": "Synagoga",
+                "terms": "Xudería, xudaísmu"
             },
             "amenity/place_of_worship/muslim": {
-                "name": "Mezquita"
+                "name": "Mezquita",
+                "terms": "Islam, cultu islámicu"
             },
             "amenity/police": {
                 "name": "Policía",
@@ -882,7 +1043,12 @@
                 "terms": "Llimpieza,Reutilización,Escombru"
             },
             "amenity/restaurant": {
-                "name": "Restaurante"
+                "name": "Restaurante",
+                "terms": "Chigre, llagar"
+            },
+            "amenity/school": {
+                "name": "Antoxana d'escuela",
+                "terms": "Terrén d'escuela, zona escolar"
             },
             "amenity/social_facility": {
                 "name": "Serviciu social"
@@ -890,6 +1056,12 @@
             "amenity/social_facility/food_bank": {
                 "name": "Bancu d'alimentos"
             },
+            "amenity/social_facility/group_home": {
+                "name": "Albergue pa grupos"
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Albergue de probes"
+            },
             "amenity/studio": {
                 "name": "Estudiu",
                 "terms": "Música,Radio,Televisión"
@@ -905,13 +1077,15 @@
                 "terms": "Cabina"
             },
             "amenity/theatre": {
-                "name": "Teatru"
+                "name": "Teatru",
+                "terms": "comedia, corral"
             },
             "amenity/toilets": {
                 "name": "Aseos"
             },
             "amenity/townhall": {
-                "name": "Edificiu municipal"
+                "name": "Edificiu municipal",
+                "terms": "Casa del Conceyu, Ayuntamientu"
             },
             "amenity/university": {
                 "name": "Universidá"
@@ -925,7 +1099,8 @@
                 "terms": "Clínica veterinaria"
             },
             "amenity/waste_basket": {
-                "name": "Papelera"
+                "name": "Papelera",
+                "terms": "Papelera, basoria"
             },
             "area": {
                 "name": "Área"
@@ -933,15 +1108,24 @@
             "barrier": {
                 "name": "Barrera"
             },
+            "barrier/block": {
+                "name": "Bloque"
+            },
             "barrier/bollard": {
                 "name": "Bolardu"
             },
+            "barrier/cattle_grid": {
+                "name": "Rexa pa ganáu"
+            },
             "barrier/city_wall": {
                 "name": "Muralla de ciudá"
             },
             "barrier/cycle_barrier": {
                 "name": "Barrera pa bicicletes"
             },
+            "barrier/ditch": {
+                "name": "Riega"
+            },
             "barrier/entrance": {
                 "name": "Entrada"
             },
@@ -954,12 +1138,18 @@
             "barrier/hedge": {
                 "name": "Sebe"
             },
+            "barrier/kissing_gate": {
+                "name": "Puerta ganadera"
+            },
             "barrier/lift_gate": {
                 "name": "Barrera"
             },
             "barrier/retaining_wall": {
                 "name": "Muru de contención"
             },
+            "barrier/stile": {
+                "name": "Pasera pa reblagu"
+            },
             "barrier/toll_booth": {
                 "name": "Cabina de peaxe"
             },
@@ -975,9 +1165,15 @@
             "building/apartments": {
                 "name": "Pisos"
             },
+            "building/barn": {
+                "name": "Graneru"
+            },
             "building/bunker": {
                 "name": "Bunker"
             },
+            "building/cabin": {
+                "name": "Cabaña"
+            },
             "building/cathedral": {
                 "name": "Catedral"
             },
@@ -994,8 +1190,14 @@
                 "name": "Edificiu en construcción",
                 "terms": "Obra, Arreglu"
             },
+            "building/detached": {
+                "name": "Vivienda aisllada"
+            },
+            "building/dormitory": {
+                "name": "Residencia"
+            },
             "building/entrance": {
-                "name": "Entrada"
+                "name": "Entrada/Salida"
             },
             "building/garage": {
                 "name": "Garaxe",
@@ -1037,6 +1239,15 @@
             "building/school": {
                 "name": "Edificiu escolar"
             },
+            "building/shed": {
+                "name": "Caseta de xardín"
+            },
+            "building/stable": {
+                "name": "Establu"
+            },
+            "building/static_caravan": {
+                "name": "Casa portátil"
+            },
             "building/train_station": {
                 "name": "Estación de tren",
                 "terms": "Terminal ferroviaria"
@@ -1044,6 +1255,9 @@
             "building/university": {
                 "name": "Edificiu universitariu"
             },
+            "building/warehouse": {
+                "terms": "Nave d'almacenamientu"
+            },
             "craft/basket_maker": {
                 "name": "Cesteru",
                 "terms": "Goxeru,Paxos,Macones"
@@ -1076,12 +1290,27 @@
                 "name": "Confitería",
                 "terms": "Pastelería, Bollería"
             },
+            "craft/dressmaker": {
+                "name": "Modista"
+            },
             "craft/electrician": {
                 "name": "Electricista"
             },
             "craft/gardener": {
                 "name": "Xardineru"
             },
+            "craft/glaziery": {
+                "name": "Cristalería"
+            },
+            "craft/handicraft": {
+                "name": "Manualidaes"
+            },
+            "craft/hvac": {
+                "name": "Calefactor"
+            },
+            "craft/insulator": {
+                "name": "Aislamientos"
+            },
             "craft/jeweler": {
                 "name": "Xoyería"
             },
@@ -1107,13 +1336,35 @@
                 "name": "Fotografía",
                 "terms": "Fotógrafu,Reveláu"
             },
+            "craft/photographic_laboratory": {
+                "name": "Llaboratoriu fotográficu",
+                "terms": "Fotografía, Reveláu, Ampliaciones"
+            },
+            "craft/plasterer": {
+                "name": "Revocador"
+            },
             "craft/plumber": {
                 "name": "Fontaneru"
             },
+            "craft/pottery": {
+                "name": "Alfarería"
+            },
+            "craft/rigger": {
+                "name": "Montaxes"
+            },
             "craft/roofer": {
                 "name": "Reteyador",
                 "terms": "Reparación de teyaos, Cubiertes"
             },
+            "craft/saddler": {
+                "name": "Guarnicioneru"
+            },
+            "craft/sailmaker": {
+                "name": "Fabricante de veles"
+            },
+            "craft/sawmill": {
+                "name": "Serraderu"
+            },
             "craft/scaffolder": {
                 "name": "Montaxe d'andamios"
             },
@@ -1126,12 +1377,31 @@
             "craft/stonemason": {
                 "name": "Canteru"
             },
+            "craft/sweep": {
+                "name": "Llimpieza de chimenees"
+            },
             "craft/tailor": {
                 "name": "Sastre"
             },
+            "craft/tiler": {
+                "name": "Azulexista"
+            },
+            "craft/tinsmith": {
+                "name": "Caldereru"
+            },
+            "craft/upholsterer": {
+                "name": "Tapicería"
+            },
+            "craft/watchmaker": {
+                "name": "Reloxeru"
+            },
             "craft/window_construction": {
                 "name": "Construcción de ventanes"
             },
+            "embankment": {
+                "name": "Terremplén",
+                "terms": "rellenu"
+            },
             "emergency/ambulance_station": {
                 "name": "Parque d'ambulancies",
                 "terms": "Centru d'emerxencies"
@@ -1145,12 +1415,15 @@
                 "terms": "S.O.S.,Teléfonu d'ayuda,Teléfonu de socorru"
             },
             "entrance": {
-                "name": "Entrada"
+                "name": "Entrada/Salida"
             },
             "footway/crossing": {
                 "name": "Pasu de peatones",
                 "terms": "Cruce"
             },
+            "ford": {
+                "name": "Vau"
+            },
             "golf/hole": {
                 "name": "Furacu de golf"
             },
@@ -1165,13 +1438,15 @@
                 "name": "Parada d'autobús"
             },
             "highway/crossing": {
-                "name": "Pasu de peatones"
+                "name": "Pasu de peatones",
+                "terms": "Cruce de víes, pasu"
             },
             "highway/cycleway": {
                 "name": "Camín ciclista"
             },
             "highway/footway": {
-                "name": "Camín peatonal"
+                "name": "Camín peatonal",
+                "terms": "Camín, senderu, sienda"
             },
             "highway/living_street": {
                 "name": "Cai residencial",
@@ -1187,7 +1462,8 @@
                 "name": "Xunión d'autopista"
             },
             "highway/motorway_link": {
-                "name": "Enllaz d'autopista"
+                "name": "Enllaz d'autopista",
+                "terms": "Salida, accesu, enllaz, autopista"
             },
             "highway/path": {
                 "name": "Camín"
@@ -1199,7 +1475,8 @@
                 "name": "Carretera autonómica"
             },
             "highway/primary_link": {
-                "name": "Enllaz de carretera autonómica I"
+                "name": "Enllaz de carretera autonómica I",
+                "terms": "Salida, accesu, enllaz, autonómica primaria, autonómica naranxa"
             },
             "highway/residential": {
                 "name": "Cai urbana"
@@ -1214,11 +1491,15 @@
                 "name": "Carretera secundaria"
             },
             "highway/secondary_link": {
-                "name": "Enllaz de carretera autonómica II"
+                "name": "Enllaz de carretera autonómica II",
+                "terms": "Salida, accesu, enllaz, autonómica secundaria, autonómica verde"
             },
             "highway/service": {
                 "name": "Vía de serviciu"
             },
+            "highway/service/alley": {
+                "name": "Pasaxe"
+            },
             "highway/service/emergency_access": {
                 "name": "Accesu d'emerxencia"
             },
@@ -1237,19 +1518,22 @@
                 "name": "Carretera terciaria"
             },
             "highway/tertiary_link": {
-                "name": "Enllaz de carretera autonómica III"
+                "name": "Enllaz de carretera autonómica III",
+                "terms": "Salida, accesu, enllaz, autonómica terciaria, autonómica mariella"
             },
             "highway/track": {
                 "name": "Caleya"
             },
             "highway/traffic_signals": {
-                "name": "Semáforu"
+                "name": "Semáforu",
+                "terms": "Semáforu, pasu peatonal"
             },
             "highway/trunk": {
                 "name": "Carretera nacional"
             },
             "highway/trunk_link": {
-                "name": "Enllaz de carretera nacional"
+                "name": "Enllaz de carretera nacional",
+                "terms": "Salida, accesu, enllaz, nacional"
             },
             "highway/turning_circle": {
                 "name": "Vuelta en cai ensin salida"
@@ -1269,6 +1553,9 @@
             "historic/castle": {
                 "name": "Castiellu"
             },
+            "historic/memorial": {
+                "name": "Obra d'alcordanza"
+            },
             "historic/monument": {
                 "name": "Monumentu"
             },
@@ -1294,6 +1581,9 @@
             "landuse/cemetery": {
                 "name": "Cementeriu"
             },
+            "landuse/churchyard": {
+                "name": "Antoxana d'ilesia"
+            },
             "landuse/commercial": {
                 "name": "Comercial"
             },
@@ -1315,6 +1605,15 @@
             "landuse/industrial": {
                 "name": "Industrial"
             },
+            "landuse/landfill": {
+                "name": "Escombrera"
+            },
+            "landuse/meadow": {
+                "name": "Prau"
+            },
+            "landuse/military": {
+                "name": "Militar"
+            },
             "landuse/orchard": {
                 "name": "Plantación"
             },
@@ -1339,11 +1638,18 @@
             "leisure/golf_course": {
                 "name": "Campu de golf"
             },
+            "leisure/ice_rink": {
+                "name": "Pista de xelu"
+            },
             "leisure/marina": {
                 "name": "Puertu deportivu"
             },
             "leisure/park": {
-                "name": "Parque"
+                "name": "Parque",
+                "terms": "Parque, campu, xardín"
+            },
+            "leisure/picnic_table": {
+                "name": "Mesa pa escursión"
             },
             "leisure/pitch": {
                 "name": "Campu deportivu"
@@ -1396,6 +1702,10 @@
             "man_made": {
                 "name": "Construcciones"
             },
+            "man_made/embankment": {
+                "name": "Terremplén",
+                "terms": "rellenu"
+            },
             "man_made/flagpole": {
                 "name": "Mástil",
                 "terms": "Palu, Bandera"
@@ -1420,7 +1730,8 @@
                 "name": "Torre"
             },
             "man_made/wastewater_plant": {
-                "name": "Planta depuradora"
+                "name": "Planta depuradora",
+                "terms": "Depuradora, tratamientu, agua, pretratamientu"
             },
             "man_made/water_tower": {
                 "name": "Torre de depósitu"
@@ -1428,6 +1739,9 @@
             "man_made/water_well": {
                 "name": "Pozu d'agua"
             },
+            "man_made/water_works": {
+                "name": "Captación d'agua"
+            },
             "military/barracks": {
                 "name": "Cuartel",
                 "terms": "Campamentu militar"
@@ -1452,7 +1766,8 @@
                 "name": "Cantil"
             },
             "natural/coastline": {
-                "name": "Llinia costera"
+                "name": "Llinia costera",
+                "terms": "Costa, ribera"
             },
             "natural/glacier": {
                 "name": "Glacier"
@@ -1460,8 +1775,15 @@
             "natural/grassland": {
                 "name": "Pradera"
             },
+            "natural/heath": {
+                "name": "Escobal"
+            },
             "natural/peak": {
-                "name": "Picu"
+                "name": "Picu",
+                "terms": "Picu, monte, vértiz"
+            },
+            "natural/scrub": {
+                "name": "Fuérfagu"
             },
             "natural/spring": {
                 "name": "Fonte natural"
@@ -1481,6 +1803,9 @@
             "natural/water/reservoir": {
                 "name": "Embalse"
             },
+            "natural/wetland": {
+                "name": "Llamorgal"
+            },
             "natural/wood": {
                 "name": "Viesca"
             },
@@ -1541,12 +1866,25 @@
             "place/city": {
                 "name": "Ciudá"
             },
+            "place/hamlet": {
+                "name": "Aldea"
+            },
             "place/island": {
-                "name": "Islla"
+                "name": "Islla",
+                "terms": "Islla, castru"
             },
             "place/isolated_dwelling": {
                 "name": "Vivienda aisllada"
             },
+            "place/locality": {
+                "name": "Llugar despobláu"
+            },
+            "place/town": {
+                "name": "Villa"
+            },
+            "place/village": {
+                "name": "Pueblu"
+            },
             "point": {
                 "name": "Puntu"
             },
@@ -1600,7 +1938,8 @@
                 "terms": "Parada"
             },
             "railway/level_crossing": {
-                "name": "Pasu a nivel"
+                "name": "Pasu a nivel",
+                "terms": "Pasu a nivel, barrera"
             },
             "railway/monorail": {
                 "name": "Monocarril"
@@ -1625,7 +1964,8 @@
                 "name": "Boca del metro"
             },
             "railway/tram": {
-                "name": "Tranvía"
+                "name": "Tranvía",
+                "terms": "Tranvía, tresporte, trole"
             },
             "relation": {
                 "name": "Rellación"
@@ -1636,9 +1976,19 @@
             "shop": {
                 "name": "Tienda"
             },
+            "shop/alcohol": {
+                "name": "Llicorería",
+                "terms": "Bodega"
+            },
             "shop/bakery": {
                 "name": "Panadería"
             },
+            "shop/beauty": {
+                "name": "Cosmética"
+            },
+            "shop/beverages": {
+                "name": "Venta de bebíes"
+            },
             "shop/bicycle": {
                 "name": "Tienda de ciclismu"
             },
@@ -1660,6 +2010,9 @@
             "shop/car_repair": {
                 "name": "Taller d'automóviles"
             },
+            "shop/chemist": {
+                "name": "Droguería"
+            },
             "shop/clothes": {
                 "name": "Tienda de ropa"
             },
@@ -1669,6 +2022,12 @@
             "shop/confectionery": {
                 "name": "Confitería"
             },
+            "shop/convenience": {
+                "name": "Tienda d'ultramarinos"
+            },
+            "shop/deli": {
+                "name": "Gourmet"
+            },
             "shop/department_store": {
                 "name": "Grandes almacenes"
             },
@@ -1687,6 +2046,10 @@
             "shop/florist": {
                 "name": "Floristería"
             },
+            "shop/funeral_directors": {
+                "name": "Velatoriu",
+                "terms": "Tanatoriu, Funeraria"
+            },
             "shop/furniture": {
                 "name": "Mueblería"
             },
@@ -1749,14 +2112,22 @@
                 "name": "Fotografía",
                 "terms": "Fotógrafu,Reveláu,Material fotográficu"
             },
+            "shop/seafood": {
+                "name": "Mariscos",
+                "terms": "Pescadería"
+            },
             "shop/shoes": {
                 "name": "Zapatería"
             },
             "shop/sports": {
                 "name": "Material deportivu"
             },
+            "shop/stationery": {
+                "name": "Papelería"
+            },
             "shop/supermarket": {
-                "name": "Supermercáu"
+                "name": "Supermercáu",
+                "terms": "Supermercáu, super"
             },
             "shop/toys": {
                 "name": "Xuguetería"
@@ -1770,12 +2141,21 @@
             "shop/vacant": {
                 "name": "Tienda balera"
             },
+            "shop/variety_store": {
+                "name": "Bazar"
+            },
             "shop/video": {
                 "name": "Tienda de videos"
             },
+            "shop/wine": {
+                "name": "Bodega"
+            },
             "tourism": {
                 "name": "Turismu"
             },
+            "tourism/alpine_hut": {
+                "name": "Refuxu d'alpinismu"
+            },
             "tourism/artwork": {
                 "name": "Obra d'arte"
             },
@@ -1785,6 +2165,16 @@
             "tourism/camp_site": {
                 "name": "Llugar d'acampada"
             },
+            "tourism/caravan_site": {
+                "name": "Aparcaderu d'autocaravanes"
+            },
+            "tourism/chalet": {
+                "name": "Casa d'aldea"
+            },
+            "tourism/guest_house": {
+                "name": "Pensión",
+                "terms": "Pensión, agospiamientu, güespes"
+            },
             "tourism/hostel": {
                 "name": "Albergue"
             },
@@ -1798,11 +2188,18 @@
                 "name": "Motel"
             },
             "tourism/museum": {
-                "name": "Muséu"
+                "name": "Muséu",
+                "terms": "Muséu, esposición, galería"
+            },
+            "tourism/picnic_site": {
+                "name": "Área recreativa"
             },
             "tourism/theme_park": {
                 "name": "Parque temáticu"
             },
+            "tourism/viewpoint": {
+                "name": "Mirador"
+            },
             "tourism/zoo": {
                 "name": "Zoo"
             },
@@ -1861,14 +2258,34 @@
             "vertex": {
                 "name": "Otru"
             },
+            "waterway": {
+                "name": "Vía d'agua"
+            },
             "waterway/canal": {
                 "name": "Canal"
             },
+            "waterway/dam": {
+                "name": "Banzáu"
+            },
+            "waterway/ditch": {
+                "name": "Riega"
+            },
+            "waterway/drain": {
+                "name": "Drenaxe"
+            },
             "waterway/river": {
-                "name": "Ríu"
+                "name": "Ríu",
+                "terms": "Ríu, regatu"
             },
             "waterway/riverbank": {
                 "name": "Ribera"
+            },
+            "waterway/stream": {
+                "name": "Regueru",
+                "terms": "Regatu, regueru"
+            },
+            "waterway/weir": {
+                "name": "Ñora"
             }
         }
     }

diff --git a/vendor/assets/iD/iD/locales/bg-BG.json b/vendor/assets/iD/iD/locales/bg-BG.json
index aa6bde43c902e04c910a7518b8c0c266197fe822..1a443427d494e01bbff40e31613eafa2a5f97c5a 100644 (file)
--- a/vendor/assets/iD/iD/locales/bg-BG.json
+++ b/vendor/assets/iD/iD/locales/bg-BG.json
@@ -898,18 +898,12 @@
             "building/apartments": {
                 "name": "Жилищен блок"
             },
-            "building/entrance": {
-                "name": "Вход"
-            },
             "building/house": {
                 "name": "Къща"
             },
             "emergency/phone": {
                 "name": "Телефон за спешна помощ"
             },
-            "entrance": {
-                "name": "Вход"
-            },
             "highway": {
                 "name": "Път"
             },

diff --git a/vendor/assets/iD/iD/locales/bn.json b/vendor/assets/iD/iD/locales/bn.json
index 408ae396e5318dcc375964d8be2add41d7ee8b71..2379c813f6a440e5681b81dd4cc39164922d8d81 100644 (file)
--- a/vendor/assets/iD/iD/locales/bn.json
+++ b/vendor/assets/iD/iD/locales/bn.json
@@ -809,9 +809,6 @@
             "building/commercial": {
                 "name": "বানিজ্যিক ভবন"
             },
-            "building/entrance": {
-                "name": "দ্বার"
-            },
             "building/garage": {
                 "name": "গ্যারেজ"
             },
@@ -830,9 +827,6 @@
             "emergency/phone": {
                 "name": "অাপদকালীন দুরভাষ"
             },
-            "entrance": {
-                "name": "প্রবেশপথ"
-            },
             "footway/crossing": {
                 "name": "ক্রসিং"
             },

diff --git a/vendor/assets/iD/iD/locales/bs.json b/vendor/assets/iD/iD/locales/bs.json
index a175b3cbadee4e3f99fe9b10ac33268a25204e26..f8938d9e47294e9c1360f506e70737665e49b8ec 100644 (file)
--- a/vendor/assets/iD/iD/locales/bs.json
+++ b/vendor/assets/iD/iD/locales/bs.json
@@ -1183,10 +1183,6 @@
                 "name": "Poslovna zgrada",
                 "terms": "poslovna zgrada,zgrada firme"
             },
-            "building/entrance": {
-                "name": "Ulaz",
-                "terms": "ulaz,vrata"
-            },
             "building/garage": {
                 "name": "Garaža",
                 "terms": "garaža"
@@ -1308,10 +1304,6 @@
                 "name": "Telefon za hitne slučajeve",
                 "terms": "telefon za hitne slučajeve,hitna telefonska linija"
             },
-            "entrance": {
-                "name": "Ulaz",
-                "terms": "ulaz,vrata"
-            },
             "footway/crossing": {
                 "name": "Prelaz",
                 "terms": "prelaz,pješački prelaz"

diff --git a/vendor/assets/iD/iD/locales/ca.json b/vendor/assets/iD/iD/locales/ca.json
index 0498c69743a149a1c87325634a07f1df0cb7098f..5d279934dd01f0063d0e0df29030f7104a43b9ce 100644 (file)
--- a/vendor/assets/iD/iD/locales/ca.json
+++ b/vendor/assets/iD/iD/locales/ca.json
@@ -610,6 +610,33 @@
             "fuel": {
                 "label": "Carburant"
             },
+            "fuel/biodiesel": {
+                "label": "Ven Biodièsel"
+            },
+            "fuel/diesel": {
+                "label": "Ven dièsel"
+            },
+            "fuel/e10": {
+                "label": "Ven E10"
+            },
+            "fuel/e85": {
+                "label": "Ven E85"
+            },
+            "fuel/lpg": {
+                "label": "Ven propà"
+            },
+            "fuel/octane_100": {
+                "label": "Ven benzina de competició"
+            },
+            "fuel/octane_91": {
+                "label": "Ven benzina regular"
+            },
+            "fuel/octane_95": {
+                "label": "Ven benzina de mig grau"
+            },
+            "fuel/octane_98": {
+                "label": "Ven benzina premium"
+            },
             "gauge": {
                 "label": "Ample"
             },
@@ -673,6 +700,9 @@
             "leisure": {
                 "label": "Tipus"
             },
+            "length": {
+                "label": "Llargada (metres)"
+            },
             "levels": {
                 "label": "Nivells",
                 "placeholder": "2, 4, 6..."
@@ -744,6 +774,9 @@
             "place": {
                 "label": "Tipus"
             },
+            "population": {
+                "label": "Població"
+            },
             "power": {
                 "label": "Tipus"
             },
@@ -807,6 +840,9 @@
             "shop": {
                 "label": "Tipus"
             },
+            "sloped_curb": {
+                "label": "Corba peraltada"
+            },
             "smoking": {
                 "label": "Apte per a fumadors"
             },
@@ -830,7 +866,8 @@
                     "bridge": "Pont",
                     "tunnel": "Túnel",
                     "embankment": "Terraplè ",
-                    "cutting": "Trinxera"
+                    "cutting": "Trinxera",
+                    "ford": "Ford"
                 }
             },
             "studio_type": {
@@ -842,6 +879,9 @@
             "surface": {
                 "label": "Superfície"
             },
+            "tactile_paving": {
+                "label": "Paviment rugós"
+            },
             "toilets/disposal": {
                 "label": "Contenidor"
             },
@@ -885,6 +925,9 @@
             "wheelchair": {
                 "label": "Accés per a cadires de rodes"
             },
+            "width": {
+                "label": "Amplada (metres)"
+            },
             "wikipedia": {
                 "label": "Viquipèdia"
             },
@@ -1016,6 +1059,9 @@
                 "name": "Rentat de cotxes",
                 "terms": "Servei de neteja de cotxes, Tren de rentat de cotxes, Estació d'autorentat de cotxes"
             },
+            "amenity/charging_station": {
+                "name": "Estació de càrrega"
+            },
             "amenity/childcare": {
                 "name": "Servei de guarderia",
                 "terms": "Servei de guarderia, Servei de cangur, Servei de cura de la infància"
@@ -1034,6 +1080,9 @@
                 "name": "Campus universitari",
                 "terms": "Col·legi, Campus universitàri, universitat, facultat"
             },
+            "amenity/compressed_air": {
+                "name": "Aire comprimit"
+            },
             "amenity/courthouse": {
                 "name": "Jutjat",
                 "terms": "Jutjats, Palau de justícia"
@@ -1073,7 +1122,8 @@
                 "terms": "Cementiri, Camp de tombes, necròpoli, ciutat dels difunts"
             },
             "amenity/hospital": {
-                "name": "Terrenys hospitalaris"
+                "name": "Terrenys hospitalaris",
+                "terms": "Hospital, centre hospitalari, policlínica, clínica. "
             },
             "amenity/kindergarten": {
                 "name": "Terrenys de Jardí d'infància"
@@ -1093,6 +1143,9 @@
                 "name": "Aparcament",
                 "terms": "Aparcament, Pàrquing, Garatge"
             },
+            "amenity/parking_entrance": {
+                "name": "Entrada de Garatge/Sortida"
+            },
             "amenity/pharmacy": {
                 "name": "Farmàcia",
                 "terms": "Farmàcia, establiment de venda de medicaments,"
@@ -1144,7 +1197,8 @@
                 "terms": "Restaurant, Lloc per menjar, Bistro, Wok, Trattoria, Pizzeria"
             },
             "amenity/school": {
-                "name": "Terrenys d'escola"
+                "name": "Terrenys d'escola",
+                "terms": "Escola, CEIP, IES, Col·legi, Institut, Centre educatiu, Guarderia"
             },
             "amenity/shelter": {
                 "name": "Refugi"
@@ -1316,8 +1370,7 @@
                 "name": "Edifici d'habitacions"
             },
             "building/entrance": {
-                "name": "Entrada",
-                "terms": "Entrada, Porta, Portes, Portalada, Accés"
+                "name": "Entrada/Sortida"
             },
             "building/garage": {
                 "name": "garatge "
@@ -1530,15 +1583,18 @@
                 "terms": "Telèfon d'emergències, SOS, S.O.S"
             },
             "entrance": {
-                "name": "Entrada",
-                "terms": "Entrada, Porta, Portes, Portalada, Accés"
+                "name": "Entrada/Sortida"
             },
             "footway/crossing": {
-                "name": "Cruïlla"
+                "name": "Pas de vianants",
+                "terms": "Travessera, Cruïlla, Pas de Vianants, Pas Zebra, Pas de peatons, pas de transeünts"
             },
             "footway/sidewalk": {
                 "name": "Vorera"
             },
+            "ford": {
+                "name": "Ford"
+            },
             "golf/bunker": {
                 "name": "Bunker"
             },
@@ -1567,20 +1623,23 @@
                 "name": "Via"
             },
             "highway/bridleway": {
-                "name": "Camí de ferradura"
+                "name": "Camí de ferradura",
+                "terms": "Camí de ferradura, cavall, camí eqüestre, via eqüestre, ferradura, via de ferradura"
             },
             "highway/bus_stop": {
                 "name": "Parada d'autobús",
                 "terms": "Parada de bus, Parada"
             },
             "highway/crossing": {
-                "name": "Cruïlla"
+                "name": "Pas de vianants",
+                "terms": "Travessera, Cruïlla, Pas de Vianants, Pas Zebra, Pas de peatons, pas de transeünts"
             },
             "highway/cycleway": {
                 "name": "Carril bici"
             },
             "highway/footway": {
-                "name": "Camí per a vianants"
+                "name": "Camí per a vianants",
+                "terms": "Camí per a vianants, carrer peatonal, camí per a peatons, a peu, camí per caminar, vianant, vianants, peató, peatons, transeünt, transeünts, peatonal"
             },
             "highway/living_street": {
                 "name": "Carrer residencial"
@@ -1596,7 +1655,8 @@
                 "name": "sortida d'autopista"
             },
             "highway/motorway_link": {
-                "name": "Enllaç d'autopista"
+                "name": "Enllaç d'autopista",
+                "terms": "Rampa, entrada, incorporació, baixada, addició, autopista, autovia, eix"
             },
             "highway/path": {
                 "name": "Camí"
@@ -1650,7 +1710,8 @@
                 "name": "Àrea de servei"
             },
             "highway/steps": {
-                "name": "Escales"
+                "name": "Escales",
+                "terms": "esgraons, graons, escalinata, escala, escalons"
             },
             "highway/stop": {
                 "name": "Senyal de stop"
@@ -1727,6 +1788,9 @@
                 "name": "Cementiri",
                 "terms": "Cementiri, Camp Sant"
             },
+            "landuse/churchyard": {
+                "name": "Terrenys d'església"
+            },
             "landuse/commercial": {
                 "name": "Zona comercial"
             },
@@ -1758,6 +1822,9 @@
             "landuse/meadow": {
                 "name": "Prat"
             },
+            "landuse/military": {
+                "name": "Militar"
+            },
             "landuse/orchard": {
                 "name": "Verger"
             },
@@ -1800,7 +1867,8 @@
                 "terms": "Port esportiu, Marina"
             },
             "leisure/park": {
-                "name": "Parc"
+                "name": "Parc",
+                "terms": "parc, àrea verda, àrea enjardinada, jardí, verger, gespa, arbres, flors"
             },
             "leisure/picnic_table": {
                 "name": "Taula de picnic"
@@ -1924,7 +1992,8 @@
                 "name": "Penya-segat"
             },
             "natural/coastline": {
-                "name": "Línia costanera"
+                "name": "Línia costanera",
+                "terms": "Línia costera, costa, litoral, línia de platja, costa, platja, mar"
             },
             "natural/fell": {
                 "name": "Prat d'alta muntanya"
@@ -1939,7 +2008,8 @@
                 "name": "Landa"
             },
             "natural/peak": {
-                "name": "Pic"
+                "name": "Pic",
+                "terms": "Pic, cim, cimadal, pollegó, agulla."
             },
             "natural/scree": {
                 "name": "Tartera"
@@ -1963,7 +2033,8 @@
                 "terms": "Llac, Estany"
             },
             "natural/water/pond": {
-                "name": "Estany"
+                "name": "Estany",
+                "terms": "estany, bassa, bassal, llac, reserva"
             },
             "natural/water/reservoir": {
                 "name": "Embassament"
@@ -2130,7 +2201,8 @@
                 "name": "Parada de Ferrocarril"
             },
             "railway/level_crossing": {
-                "name": "Pas a nivell"
+                "name": "Pas a nivell",
+                "terms": "Pas a nivell, Pas de ferrocarril, guardaagulles, pas de ferrocarril, barreres, semàfors, tren, cotxe"
             },
             "railway/monorail": {
                 "name": "Monocarril",
@@ -2157,7 +2229,8 @@
                 "terms": "Boca de metro, Entrada de metro"
             },
             "railway/tram": {
-                "name": "Tramvia "
+                "name": "Tramvia ",
+                "terms": "Tranvia, Tram"
             },
             "relation": {
                 "name": "Relació",
@@ -2364,6 +2437,9 @@
             "shop/video": {
                 "name": "Botiga de vídeos"
             },
+            "shop/wine": {
+                "name": "Botiga de vins"
+            },
             "tourism": {
                 "name": "Turisme"
             },
@@ -2386,7 +2462,8 @@
                 "name": "Xalet"
             },
             "tourism/guest_house": {
-                "name": "Habitacions de lloguer"
+                "name": "Habitacions de lloguer",
+                "terms": "Casa de convidats, convidats, hostes, invitats"
             },
             "tourism/hostel": {
                 "name": "Alberg",
@@ -2506,7 +2583,8 @@
                 "name": "Banc fluvial"
             },
             "waterway/stream": {
-                "name": "Rierol"
+                "name": "Rierol",
+                "terms": "Sèquia, rierol, fil d'aigua, rajolí, riuet, riachuelu, ramal, reguer, segla, canal, rec, regueró, sequiola, sequió, cavim."
             },
             "waterway/weir": {
                 "name": "Assut"

diff --git a/vendor/assets/iD/iD/locales/cs.json b/vendor/assets/iD/iD/locales/cs.json
index a9935c76f992fdbf479eb381dde653bb5bd19612..1e43feaf3957d55eb9e4e11a377d173de8c8fea1 100644 (file)
--- a/vendor/assets/iD/iD/locales/cs.json
+++ b/vendor/assets/iD/iD/locales/cs.json
@@ -1242,10 +1242,6 @@
                 "name": "Obchodní budova",
                 "terms": "obchody,firmy,firma,prodej,podnik,podniky,kanceláře"
             },
-            "building/entrance": {
-                "name": "Vchod",
-                "terms": "vchod"
-            },
             "building/garage": {
                 "name": "Garáž",
                 "terms": "garáž,garáže,parkování,kryté parkování"
@@ -1458,10 +1454,6 @@
                 "name": "Tísňový telefon",
                 "terms": "nouzový telefon,SOS,tísňová linka"
             },
-            "entrance": {
-                "name": "Vchod",
-                "terms": "vchod,východ,únikový východ,brána,dveře,vrata"
-            },
             "footway/crossing": {
                 "name": "Přechod pro chodce",
                 "terms": "přechod pro chodce,zebra,přechod,přechod pro pěší"

diff --git a/vendor/assets/iD/iD/locales/da.json b/vendor/assets/iD/iD/locales/da.json
index 785f6946c42664a37bddd23d7ca719312dd01b54..9f852a6cb45389986f8a874d92885b0bc44fb193 100644 (file)
--- a/vendor/assets/iD/iD/locales/da.json
+++ b/vendor/assets/iD/iD/locales/da.json
@@ -610,6 +610,33 @@
             "fuel": {
                 "label": "Brændstof"
             },
+            "fuel/biodiesel": {
+                "label": "Sælger biodiesel"
+            },
+            "fuel/diesel": {
+                "label": "Sælger diesel"
+            },
+            "fuel/e10": {
+                "label": "Sælger E10"
+            },
+            "fuel/e85": {
+                "label": "Sælger E85"
+            },
+            "fuel/lpg": {
+                "label": "Sælger gas"
+            },
+            "fuel/octane_100": {
+                "label": "Sælger høj oktan benzin"
+            },
+            "fuel/octane_91": {
+                "label": "Sælger almindelig benzin"
+            },
+            "fuel/octane_95": {
+                "label": "Sælger medium benzin"
+            },
+            "fuel/octane_98": {
+                "label": "Sælger premium benzin"
+            },
             "gauge": {
                 "label": "Sporvidde"
             },
@@ -673,6 +700,9 @@
             "leisure": {
                 "label": "Type"
             },
+            "length": {
+                "label": "Længde(Meter)"
+            },
             "levels": {
                 "label": "Etager",
                 "placeholder": "2, 4, 6..."
@@ -744,6 +774,9 @@
             "place": {
                 "label": "Type"
             },
+            "population": {
+                "label": "Befolkning"
+            },
             "power": {
                 "label": "Type"
             },
@@ -807,6 +840,9 @@
             "shop": {
                 "label": "Type"
             },
+            "sloped_curb": {
+                "label": "Sløfekurve"
+            },
             "smoking": {
                 "label": "Rygning"
             },
@@ -830,7 +866,8 @@
                     "bridge": "Bro",
                     "tunnel": "Tunnel",
                     "embankment": "Forhøjning til tog, vej",
-                    "cutting": "Forsænkning"
+                    "cutting": "Forsænkning",
+                    "ford": "Vadested"
                 }
             },
             "studio_type": {
@@ -842,6 +879,9 @@
             "surface": {
                 "label": "Overflade"
             },
+            "tactile_paving": {
+                "label": "Tactile Paving"
+            },
             "toilets/disposal": {
                 "label": "Bortskaffelse affald"
             },
@@ -885,6 +925,9 @@
             "wheelchair": {
                 "label": "Kørestolsadgang"
             },
+            "width": {
+                "label": "Bredde(Meter)"
+            },
             "wikipedia": {
                 "label": "Wikipedia"
             },
@@ -1029,6 +1072,10 @@
                 "name": "Bilvask",
                 "terms": "Bilvask, Automobilvask"
             },
+            "amenity/charging_station": {
+                "name": "Opladerstation",
+                "terms": "Opladerstation, elbilopladerstation"
+            },
             "amenity/childcare": {
                 "name": "Børnepasning",
                 "terms": "Børnehave, Børnepasning, Vuggestue, Dagpleje, Fritidshjem"
@@ -1049,6 +1096,10 @@
                 "name": "Gymnasie",
                 "terms": "Gymnasie, Handelsgymnasie"
             },
+            "amenity/compressed_air": {
+                "name": "Luftpumpe",
+                "terms": "Luftpumpe, Billuftpumpe"
+            },
             "amenity/courthouse": {
                 "name": "Domstolsbygning",
                 "terms": "Domstolsbygning, Domstol"
@@ -1113,6 +1164,10 @@
                 "name": "Bilparkering",
                 "terms": "Bilparkering"
             },
+            "amenity/parking_entrance": {
+                "name": "Parkeringsgarage Indgang/Udgang",
+                "terms": "Parkeringsgarage Indgang/Udgang, Parkeringskælder Indgang/Udgang"
+            },
             "amenity/pharmacy": {
                 "name": "Apotek",
                 "terms": "Apotek"
@@ -1358,8 +1413,8 @@
                 "terms": " Kollegie, Klubværelse, Kollegium"
             },
             "building/entrance": {
-                "name": "Indgang",
-                "terms": "Indgang"
+                "name": "Indgang/Udgang",
+                "terms": "Indgang/Udgang"
             },
             "building/garage": {
                 "name": "Garage",
@@ -1541,6 +1596,10 @@
                 "name": "Fotograf",
                 "terms": "Fotograf"
             },
+            "craft/photographic_laboratory": {
+                "name": "Fotolaboratorium",
+                "terms": "Fotolaboratorium, Fotoforhandler"
+            },
             "craft/plasterer": {
                 "name": "Oppudser",
                 "terms": "Oppudser"
@@ -1634,8 +1693,8 @@
                 "terms": "Nødtelefon, Nødopkaldstelefon"
             },
             "entrance": {
-                "name": "Indgang",
-                "terms": "Indgang, Indgangsparti"
+                "name": "Indgang/Udgang",
+                "terms": "Indgang/Udgang"
             },
             "footway/crossing": {
                 "name": "Kryds",
@@ -1645,6 +1704,10 @@
                 "name": "Fortov",
                 "terms": "Fortov"
             },
+            "ford": {
+                "name": "Vadested",
+                "terms": "Vadested"
+            },
             "golf/bunker": {
                 "name": "Sandbunker",
                 "terms": "Sandbunker"
@@ -1877,6 +1940,10 @@
                 "name": "Gravplads ",
                 "terms": "Gravplads "
             },
+            "landuse/churchyard": {
+                "name": "Kirkegård",
+                "terms": "Kirkegårde"
+            },
             "landuse/commercial": {
                 "name": "Kommercielt område",
                 "terms": "Kommercielt område"
@@ -1917,6 +1984,10 @@
                 "name": "Eng",
                 "terms": "Eng"
             },
+            "landuse/military": {
+                "name": "Militær",
+                "terms": "Militær"
+            },
             "landuse/orchard": {
                 "name": "Frugtplantage",
                 "terms": "Frugtplantage, Æbleplantage"
@@ -2625,6 +2696,10 @@
                 "name": "Fotoforretning",
                 "terms": "<Oversæt med synonymer eller relaterede termer for \"Fotoforretning\", adskilt af kommaer>"
             },
+            "shop/seafood": {
+                "name": "Fiskehandler",
+                "terms": "Fiskehandler, Fiskebutik"
+            },
             "shop/shoes": {
                 "name": "Skobutik",
                 "terms": "Skobutik, Skoforretning"
@@ -2665,6 +2740,10 @@
                 "name": "Videobutik",
                 "terms": "Videobutik, Videoforretning, Videoudlejning"
             },
+            "shop/wine": {
+                "name": "Vinforretning",
+                "terms": "Vinforretning, Vinbutik"
+            },
             "tourism": {
                 "name": "Turisme",
                 "terms": "Turisme"

diff --git a/vendor/assets/iD/iD/locales/de.json b/vendor/assets/iD/iD/locales/de.json
index 38aa2e0e7132be6be4f6d683d526f4a3162503e2..bfc75032c5259abbdb4c8756c37be41e8cad19d7 100644 (file)
--- a/vendor/assets/iD/iD/locales/de.json
+++ b/vendor/assets/iD/iD/locales/de.json
@@ -267,6 +267,8 @@
         "percent_brightness": "{opacity}% Helligkeit",
         "none": "Kein Hintergrund",
         "custom": "Benutzerdefiniert",
+        "custom_button": "Benutzerdefinierten Hintergrund editieren",
+        "custom_prompt": "Gib ein tile URL template ein. Gültige Platzhalter sind {z}, {x}, {y} für das Z/X/Y Schema und {u} für das quadtile Schema.",
         "fix_misalignment": "Ausrichtung korrigieren",
         "reset": "Zurücksetzen"
     },
@@ -425,7 +427,7 @@
         },
         "fields": {
             "access": {
-                "label": "Zugangsbeschränkung",
+                "label": "Zugangsberechtigung",
                 "placeholder": "Unbekannt",
                 "types": {
                     "access": "Allgemein",
@@ -608,6 +610,33 @@
             "fuel": {
                 "label": "Treibstogg"
             },
+            "fuel/biodiesel": {
+                "label": "Verkauft Biodiesel"
+            },
+            "fuel/diesel": {
+                "label": "Verkauft Diesel"
+            },
+            "fuel/e10": {
+                "label": "Verkauft E10"
+            },
+            "fuel/e85": {
+                "label": "Verkauft E85"
+            },
+            "fuel/lpg": {
+                "label": "Verkauft Propan"
+            },
+            "fuel/octane_100": {
+                "label": "Verkauft Rennkraftstoffe"
+            },
+            "fuel/octane_91": {
+                "label": "Verkauft Kraftstoffe"
+            },
+            "fuel/octane_95": {
+                "label": "Verkauft Mittelklassekraftstoffe"
+            },
+            "fuel/octane_98": {
+                "label": "Verkauft Premiumkraftstoffe"
+            },
             "gauge": {
                 "label": "Spurbreite"
             },
@@ -671,6 +700,9 @@
             "leisure": {
                 "label": "Art"
             },
+            "length": {
+                "label": "Länge (Meter)"
+            },
             "levels": {
                 "label": "Etagen",
                 "placeholder": "2, 4, 6..."
@@ -742,6 +774,9 @@
             "place": {
                 "label": "Art"
             },
+            "population": {
+                "label": "Bevölkerung"
+            },
             "power": {
                 "label": "Typ"
             },
@@ -805,6 +840,9 @@
             "shop": {
                 "label": "Typ"
             },
+            "sloped_curb": {
+                "label": "abgeschrägter Bordstein"
+            },
             "smoking": {
                 "label": "Rauchen"
             },
@@ -828,7 +866,8 @@
                     "bridge": "Brücke",
                     "tunnel": "Tunnel",
                     "embankment": "Fahrdamm",
-                    "cutting": "Senke"
+                    "cutting": "Senke",
+                    "ford": "Furt"
                 }
             },
             "studio_type": {
@@ -840,8 +879,11 @@
             "surface": {
                 "label": "Oberfläche"
             },
+            "tactile_paving": {
+                "label": "taktile Oberfläche"
+            },
             "toilets/disposal": {
-                "label": "Abfallkübel, Mistkübel"
+                "label": "Toiletten-Bauart"
             },
             "tourism": {
                 "label": "Typ"
@@ -883,6 +925,9 @@
             "wheelchair": {
                 "label": "Rollstuhlzugang"
             },
+            "width": {
+                "label": "Breite (Meter)"
+            },
             "wikipedia": {
                 "label": "Wikipedia"
             },
@@ -1027,6 +1072,10 @@
                 "name": "Autowäsche",
                 "terms": "Auto-Waschanlage, Waschanlage"
             },
+            "amenity/charging_station": {
+                "name": "Ladestation",
+                "terms": "Ladestation"
+            },
             "amenity/childcare": {
                 "name": "Kindertagesbetreuung",
                 "terms": "Hort"
@@ -1047,6 +1096,10 @@
                 "name": "Hochschule",
                 "terms": "Hochschule, Kolleg"
             },
+            "amenity/compressed_air": {
+                "name": "Druckluft",
+                "terms": "Druckluft, Pressluft"
+            },
             "amenity/courthouse": {
                 "name": "Gericht",
                 "terms": "Gericht, Amtsgericht"
@@ -1111,6 +1164,10 @@
                 "name": "Autoparkplatz",
                 "terms": "Autoparkplatz, Parkplatz, Parkhaus, Garage, Parkgarage"
             },
+            "amenity/parking_entrance": {
+                "name": "Garageneinfahrt/-ausfahrt",
+                "terms": "Parkgaragen-Einfahrt/Ausfahrt, Garageneinfahrt/-ausfahrt, Garagenzufahrt/-abfahrt"
+            },
             "amenity/pharmacy": {
                 "name": "Apotheke",
                 "terms": "Apotheke"
@@ -1356,8 +1413,8 @@
                 "terms": "Schlafsaal, Dormitorium"
             },
             "building/entrance": {
-                "name": "Eingang",
-                "terms": "Eingang"
+                "name": "Eingang/Ausgang",
+                "terms": "Eingang/Ausgang, Zugang/Abgang, Einfahrt/Ausfahrt, Eintritt/Austritt"
             },
             "building/garage": {
                 "name": "Garage",
@@ -1539,6 +1596,10 @@
                 "name": "Fotograf",
                 "terms": "Fotograf, Fotostudio, Fotoatelier"
             },
+            "craft/photographic_laboratory": {
+                "name": "Fotolabor",
+                "terms": "Fotolabor, fotografisches Labor"
+            },
             "craft/plasterer": {
                 "name": "Stuckateur",
                 "terms": "Stuckateur, Kaschierer, Gipser, Verputzer"
@@ -1632,8 +1693,8 @@
                 "terms": "Notruf-Telefon, Notrufsäule, Notfallsäule"
             },
             "entrance": {
-                "name": "Eingang",
-                "terms": "Eingang"
+                "name": "Eingang/Ausgang",
+                "terms": "Eingang/Ausgang, Zugang/Abgang, Einfahrt/Ausfahrt, Eintritt/Austritt"
             },
             "footway/crossing": {
                 "name": "Fussgängerüberweg",
@@ -1643,6 +1704,10 @@
                 "name": "Bürgersteig",
                 "terms": "Gehsteig, Fußgängerweg, Gehweg, Fußweg, Gangsteig, Trottoir"
             },
+            "ford": {
+                "name": "Furt",
+                "terms": "Furt"
+            },
             "golf/bunker": {
                 "name": "Bunker (Golf)",
                 "terms": "Bunker, Sandbunker, Sand-Hindernis, Golfbunker"
@@ -1801,7 +1866,7 @@
             },
             "highway/track": {
                 "name": "Feld-/Waldweg",
-                "terms": "Spur, Fährte, Strecke, Weg"
+                "terms": "Forstweg,Wirtschaftsweg,Wiesenweg,Feldweg,Waldweg"
             },
             "highway/traffic_signals": {
                 "name": "Ampeln",
@@ -1853,7 +1918,7 @@
             },
             "historic/wayside_cross": {
                 "name": "Wegkreuz",
-                "terms": "Wegkreuz"
+                "terms": "Wegkreuz,Wegekreuz,Flurkreuz"
             },
             "historic/wayside_shrine": {
                 "name": "Bildstock",
@@ -1875,6 +1940,10 @@
                 "name": "Friedhof",
                 "terms": "Friedhof, Friedwald"
             },
+            "landuse/churchyard": {
+                "name": "Kirchhof",
+                "terms": "Kirchhof, Friedhof, Gottesacker, Leichenhof"
+            },
             "landuse/commercial": {
                 "name": "Gewerbegebiet",
                 "terms": "Gewerbezone,Gewerbegebiet,gewerblich genutzte Gebäude,Business Park,Büros"
@@ -1915,6 +1984,10 @@
                 "name": "Weide",
                 "terms": "Wiese, Weide"
             },
+            "landuse/military": {
+                "name": "Militär",
+                "terms": "Militär, Armee, Landesverteidigung"
+            },
             "landuse/orchard": {
                 "name": "Obstplantage",
                 "terms": "Obstplantage, Streuobstwiese"
@@ -2623,6 +2696,10 @@
                 "name": "Fotofachgeschäft",
                 "terms": "Fotoladen, Fotograf, Fotogeschäft"
             },
+            "shop/seafood": {
+                "name": "Fischgeschäft",
+                "terms": "Fischgeschäft, Meeresfrüchtegeschäft"
+            },
             "shop/shoes": {
                 "name": "Schuhgeschäft",
                 "terms": "Schuhgeschäft"
@@ -2663,6 +2740,10 @@
                 "name": "Videothek",
                 "terms": "Video-Geschäft, DVD-Geschäft"
             },
+            "shop/wine": {
+                "name": "Vinothek",
+                "terms": "Weinladen, Weinhandlung, Weinhaus, Enothek"
+            },
             "tourism": {
                 "name": "Tourismus",
                 "terms": "Fremdenverkehr, Tourimus"

diff --git a/vendor/assets/iD/iD/locales/el.json b/vendor/assets/iD/iD/locales/el.json
index 6d038213c546e4d8f8458f5a96367f1385727c96..541b40832eac11a8795ef04b23db0b621d224ac5 100644 (file)
--- a/vendor/assets/iD/iD/locales/el.json
+++ b/vendor/assets/iD/iD/locales/el.json
@@ -1028,10 +1028,6 @@
                 "name": "Εμπορικό Κτίριο",
                 "terms": "Εμπορικό Κτήριο, Επαγγελματικό κτήριο"
             },
-            "building/entrance": {
-                "name": "Είσοδος",
-                "terms": "Είσοδος"
-            },
             "building/garage": {
                 "name": "Εργαστήριο",
                 "terms": "Γκαράζ"
@@ -1099,10 +1095,6 @@
                 "name": "Τηλέφωνο Ανάγκης",
                 "terms": "Τηλέφωνο επειγόντων, Τηλέφωνο ανάγκης"
             },
-            "entrance": {
-                "name": "Είσοδος",
-                "terms": "Είσοδος"
-            },
             "highway": {
                 "name": "Αυτοκινητόδρομος",
                 "terms": "Οδική αρτηρία, Αυτοκινητόδρομος"

diff --git a/vendor/assets/iD/iD/locales/en.json b/vendor/assets/iD/iD/locales/en.json
index 7882c97519ce146e24fa56954d02aa4d8d66da01..04b1b3571f11ed89213dfc413e7934faa87a21ed 100644 (file)
--- a/vendor/assets/iD/iD/locales/en.json
+++ b/vendor/assets/iD/iD/locales/en.json
@@ -614,6 +614,33 @@
             "fuel": {
                 "label": "Fuel"
             },
+            "fuel/biodiesel": {
+                "label": "Sells Biodiesel"
+            },
+            "fuel/diesel": {
+                "label": "Sells Diesel"
+            },
+            "fuel/e10": {
+                "label": "Sells E10"
+            },
+            "fuel/e85": {
+                "label": "Sells E85"
+            },
+            "fuel/lpg": {
+                "label": "Sells Propane"
+            },
+            "fuel/octane_100": {
+                "label": "Sells Racing Gasoline"
+            },
+            "fuel/octane_91": {
+                "label": "Sells Regular Gasoline"
+            },
+            "fuel/octane_95": {
+                "label": "Sells Midgrade Gasoline"
+            },
+            "fuel/octane_98": {
+                "label": "Sells Premium Gasoline"
+            },
             "gauge": {
                 "label": "Gauge"
             },
@@ -679,6 +706,9 @@
             "leisure": {
                 "label": "Type"
             },
+            "length": {
+                "label": "Length (Meters)"
+            },
             "levels": {
                 "label": "Levels",
                 "placeholder": "2, 4, 6..."
@@ -750,6 +780,9 @@
             "place": {
                 "label": "Type"
             },
+            "population": {
+                "label": "Population"
+            },
             "power": {
                 "label": "Type"
             },
@@ -813,6 +846,9 @@
             "shop": {
                 "label": "Type"
             },
+            "sloped_curb": {
+                "label": "Sloped Curb"
+            },
             "smoking": {
                 "label": "Smoking"
             },
@@ -836,7 +872,8 @@
                     "bridge": "Bridge",
                     "tunnel": "Tunnel",
                     "embankment": "Embankment",
-                    "cutting": "Cutting"
+                    "cutting": "Cutting",
+                    "ford": "Ford"
                 }
             },
             "studio_type": {
@@ -848,6 +885,9 @@
             "surface": {
                 "label": "Surface"
             },
+            "tactile_paving": {
+                "label": "Tactile Paving"
+            },
             "toilets/disposal": {
                 "label": "Disposal"
             },
@@ -891,6 +931,9 @@
             "wheelchair": {
                 "label": "Wheelchair Access"
             },
+            "width": {
+                "label": "Width (Meters)"
+            },
             "wikipedia": {
                 "label": "Wikipedia"
             },
@@ -1035,6 +1078,10 @@
                 "name": "Car Wash",
                 "terms": ""
             },
+            "amenity/charging_station": {
+                "name": "Charging Station",
+                "terms": "EV,Electric Vehicle,Supercharger"
+            },
             "amenity/childcare": {
                 "name": "Childcare",
                 "terms": "nursery,orphanage,playgroup"
@@ -1055,6 +1102,10 @@
                 "name": "College",
                 "terms": ""
             },
+            "amenity/compressed_air": {
+                "name": "Compressed Air",
+                "terms": ""
+            },
             "amenity/courthouse": {
                 "name": "Courthouse",
                 "terms": ""
@@ -1119,6 +1170,10 @@
                 "name": "Car Parking",
                 "terms": ""
             },
+            "amenity/parking_entrance": {
+                "name": "Parking Garage Entrance/Exit",
+                "terms": ""
+            },
             "amenity/pharmacy": {
                 "name": "Pharmacy",
                 "terms": ""
@@ -1364,7 +1419,7 @@
                 "terms": ""
             },
             "building/entrance": {
-                "name": "Entrance",
+                "name": "Entrance/Exit",
                 "terms": ""
             },
             "building/garage": {
@@ -1644,7 +1699,7 @@
                 "terms": ""
             },
             "entrance": {
-                "name": "Entrance",
+                "name": "Entrance/Exit",
                 "terms": ""
             },
             "footway/crossing": {
@@ -1655,6 +1710,10 @@
                 "name": "Sidewalk",
                 "terms": ""
             },
+            "ford": {
+                "name": "Ford",
+                "terms": ""
+            },
             "golf/bunker": {
                 "name": "Sand Trap",
                 "terms": "hazard,bunker"
@@ -1887,6 +1946,10 @@
                 "name": "Cemetery",
                 "terms": ""
             },
+            "landuse/churchyard": {
+                "name": "Churchyard",
+                "terms": ""
+            },
             "landuse/commercial": {
                 "name": "Commercial",
                 "terms": ""
@@ -1927,6 +1990,10 @@
                 "name": "Meadow",
                 "terms": ""
             },
+            "landuse/military": {
+                "name": "Military",
+                "terms": ""
+            },
             "landuse/orchard": {
                 "name": "Orchard",
                 "terms": ""
@@ -2679,6 +2746,10 @@
                 "name": "Video Store",
                 "terms": ""
             },
+            "shop/wine": {
+                "name": "Wine Shop",
+                "terms": "winery"
+            },
             "tourism": {
                 "name": "Tourism",
                 "terms": ""

diff --git a/vendor/assets/iD/iD/locales/es.json b/vendor/assets/iD/iD/locales/es.json
index f8283eb79ab5559bc5cc4cb8aed17f3d4ad6a581..6519a586b1dbb55422fdc407d203b56e727b5c2b 100644 (file)
--- a/vendor/assets/iD/iD/locales/es.json
+++ b/vendor/assets/iD/iD/locales/es.json
@@ -71,7 +71,8 @@
                 "line": "Redondear línea.",
                 "area": "Redondear área."
             },
-            "not_closed": "Esto no se puede redondear porque no es un bucle."
+            "not_closed": "Esto no se puede redondear porque no es un bucle.",
+            "too_large": "Esto no se puede redondear porque no está completamente visible."
         },
         "orthogonalize": {
             "title": "Escuadrar",
@@ -84,13 +85,14 @@
                 "line": "Escuadra las esquinas de una línea.",
                 "area": "Escuadra las esquinas de un área."
             },
-            "not_squarish": "Esto no puede escuadrarse porque no es cuadrado."
+            "not_squarish": "Esto no puede escuadrarse porque no es cuadrado.",
+            "too_large": "Esto no puede escuadrarse porque no está completamente visible."
         },
         "straighten": {
             "title": "Enderezado",
             "description": "Enderezar esta línea",
             "key": "S",
-            "annotation": "Enderezar una línea.",
+            "annotation": "Línea enderezada.",
             "too_bendy": "Esto no puede ser enderezado porque es demasiado sinuoso."
         },
         "delete": {
@@ -222,7 +224,7 @@
     },
     "contributors": {
         "list": "Ediciones de {users}",
-        "truncated_list": "Ediciones de {users} y {count} otros"
+        "truncated_list": "Ediciones de {users} y {count} más"
     },
     "geocoder": {
         "search": "Buscar mundialmente…",
@@ -265,6 +267,8 @@
         "percent_brightness": "{opacity}% brillo",
         "none": "Ninguno",
         "custom": "Personalizado",
+        "custom_button": "Editar fondo personalizado",
+        "custom_prompt": "Introduzca la URL de una plantilla de teselas. Los símbolos válidos son {z}, {x}, {y} para el esquema Z/X/Y y {u} para el esquema quadtile.",
         "fix_misalignment": "Corregir la alineación",
         "reset": "reiniciar"
     },
@@ -582,7 +586,7 @@
                 "label": "Electrificación"
             },
             "elevation": {
-                "label": "Altura"
+                "label": "Altitud"
             },
             "emergency": {
                 "label": "Emergencia"
@@ -606,6 +610,21 @@
             "fuel": {
                 "label": "Combustible"
             },
+            "fuel/biodiesel": {
+                "label": "Venta de biodiesel"
+            },
+            "fuel/diesel": {
+                "label": "Venta de diesel"
+            },
+            "fuel/e10": {
+                "label": "Venta de E10"
+            },
+            "fuel/e85": {
+                "label": "Venta de E85"
+            },
+            "fuel/lpg": {
+                "label": "Venta de propano"
+            },
             "gauge": {
                 "label": "Gálibo"
             },
@@ -633,6 +652,7 @@
                 "label": "Tipo"
             },
             "hoops": {
+                "label": "Aros",
                 "placeholder": "1, 2, 4..."
             },
             "iata": {
@@ -668,6 +688,9 @@
             "leisure": {
                 "label": "Tipo"
             },
+            "length": {
+                "label": "Longitud (Metros)"
+            },
             "levels": {
                 "label": "Niveles",
                 "placeholder": "2, 4, 6..."
@@ -739,6 +762,9 @@
             "place": {
                 "label": "Tipo"
             },
+            "population": {
+                "label": "Población"
+            },
             "power": {
                 "label": "Tipo"
             },
@@ -802,6 +828,9 @@
             "shop": {
                 "label": "Tipo"
             },
+            "smoking": {
+                "label": "Fumar"
+            },
             "social_facility_for": {
                 "label": "Personas atendidas",
                 "placeholder": "Personas sin hogar, discapacitados, niños, etc"
@@ -834,6 +863,9 @@
             "surface": {
                 "label": "Superficie"
             },
+            "tactile_paving": {
+                "label": "Pavimento táctil"
+            },
             "toilets/disposal": {
                 "label": "Disponible"
             },
@@ -877,6 +909,9 @@
             "wheelchair": {
                 "label": "Acceso en silla de ruedas"
             },
+            "width": {
+                "label": "Anchura (Metros)"
+            },
             "wikipedia": {
                 "label": "Wikipedia"
             },
@@ -906,7 +941,8 @@
                 "terms": "Telecabina"
             },
             "aerialway/magic_carpet": {
-                "name": "Ascensor de alfombra mágica"
+                "name": "Ascensor de alfombra mágica",
+                "terms": "Cinta transportadora de esquí"
             },
             "aerialway/platter": {
                 "name": "Ascensor de plato"
@@ -989,7 +1025,7 @@
                 "terms": "asiento público,banco,banquillo,banqueta"
             },
             "amenity/bicycle_parking": {
-                "name": "Aparcamiento de bibicletas",
+                "name": "Aparcamiento de bicicletas",
                 "terms": "bicicleta, bici, aparcamiento, parking, estacionamiento"
             },
             "amenity/bicycle_rental": {
@@ -1015,6 +1051,9 @@
                 "name": "Lavado de automóviles",
                 "terms": "lavadero,lavado de coches"
             },
+            "amenity/charging_station": {
+                "name": "Estación de carga"
+            },
             "amenity/childcare": {
                 "name": "Cuidado de niños",
                 "terms": "canguro,cuidadora"
@@ -1034,6 +1073,9 @@
                 "name": "Instituto",
                 "terms": "facultad,universidad,escuela profesional, instituto"
             },
+            "amenity/compressed_air": {
+                "name": "Aire comprimido"
+            },
             "amenity/courthouse": {
                 "name": "Palacio de justicia",
                 "terms": "tribunal, magistratura, judicatura, audiencia,justicia"
@@ -1075,7 +1117,8 @@
                 "terms": "cementerio,camposanto, necrópolis, sacramental"
             },
             "amenity/hospital": {
-                "name": "Terrenos de hospital"
+                "name": "Hospital",
+                "terms": "Recinto hospitalario"
             },
             "amenity/kindergarten": {
                 "name": "Jardín de infancia",
@@ -1141,24 +1184,28 @@
                 "name": "Puesto de guardaparques"
             },
             "amenity/recycling": {
-                "name": "Reciclaje"
+                "name": "Reciclaje",
+                "terms": "Reciclaje"
             },
             "amenity/restaurant": {
                 "name": "Restaurante",
                 "terms": "restaurante,restorán, comedor, ambigú, bufé, mesón, taberna"
             },
             "amenity/school": {
-                "name": "Terrenos de escuelas"
+                "name": "Escuela",
+                "terms": "Recinto escolar"
             },
             "amenity/shelter": {
                 "name": "Refugio",
                 "terms": "albergue, abrigo, amparo, asilo, cobertizo, garita, refugio"
             },
             "amenity/social_facility": {
-                "name": "Instalación social"
+                "name": "Instalación social",
+                "terms": "Servicios sociales, Asistencia social, "
             },
             "amenity/social_facility/food_bank": {
-                "name": "Banco de alimentos"
+                "name": "Banco de alimentos",
+                "terms": "Banco de alimentos"
             },
             "amenity/social_facility/group_home": {
                 "name": "Grupo residencial"
@@ -1199,7 +1246,8 @@
                 "terms": "universidad,facultad, escuela, seminario, colegio, cátedra, claustro, paraninfo,"
             },
             "amenity/vending_machine": {
-                "name": "Máquina expendedora"
+                "name": "Máquina expendedora",
+                "terms": "máquina expendedora, máquina autoventa, vending"
             },
             "amenity/veterinary": {
                 "name": "Veterinario",
@@ -1227,7 +1275,7 @@
             },
             "barrier/cattle_grid": {
                 "name": "Rejilla de retención",
-                "terms": "Paso con rejas para animales"
+                "terms": "Paso con rejas para animales, paso canadiense, barrera canadiense, guardaganados"
             },
             "barrier/city_wall": {
                 "name": "Muralla de ciudad",
@@ -1262,7 +1310,7 @@
                 "terms": "Puerta de seguridad para ganado"
             },
             "barrier/lift_gate": {
-                "name": "Puerta levadiza",
+                "name": "Barrera levadiza",
                 "terms": "Barrera elevada"
             },
             "barrier/retaining_wall": {
@@ -1294,7 +1342,7 @@
                 "terms": "apartamento, piso, vivienda, alojamiento, buhardilla, estudio, edificio"
             },
             "building/barn": {
-                "name": "Granero, hórreo, silo, depósito de cereal, troj",
+                "name": "Granero",
                 "terms": "Granero, hórreo, silo, depósito de cereal, troj"
             },
             "building/bunker": {
@@ -1302,14 +1350,16 @@
                 "terms": "Fortaleza"
             },
             "building/cabin": {
-                "name": "Cabina"
+                "name": "Cabina",
+                "terms": "Cabina"
             },
             "building/cathedral": {
                 "name": "Catedral",
                 "terms": "Iglesia, Lugar de culto, templo, basílica, parroquia, santuario, oratorio, iglesia, basílica"
             },
             "building/chapel": {
-                "name": "Capilla"
+                "name": "Capilla",
+                "terms": "Capilla"
             },
             "building/church": {
                 "name": "Iglesia",
@@ -1321,7 +1371,7 @@
             },
             "building/construction": {
                 "name": "Edificio en construcción",
-                "terms": "Edificio en construcción"
+                "terms": "Edificio en construcción, edificio en obras"
             },
             "building/detached": {
                 "name": "Casa unifamiliar",
@@ -1330,10 +1380,6 @@
             "building/dormitory": {
                 "name": "Dormitorio"
             },
-            "building/entrance": {
-                "name": "Entrada",
-                "terms": "puerta, portal, vestíbulo, umbral, soportal, pórtico, abertura, acceso, boca, embocadura, agujero, hueco"
-            },
             "building/garage": {
                 "name": "Garaje",
                 "terms": "garaje,cochera"
@@ -1343,14 +1389,16 @@
                 "terms": "garajes, cocheras"
             },
             "building/greenhouse": {
-                "name": "Invernadero"
+                "name": "Invernadero",
+                "terms": "Invernadero, Invernáculo"
             },
             "building/hospital": {
                 "name": "Edificio de hospital",
                 "terms": "Hospital, sanatorio, Centro de primeros auxilios"
             },
             "building/hotel": {
-                "name": "Edificio de hotel"
+                "name": "Edificio de hotel",
+                "terms": "Edificio hotelero"
             },
             "building/house": {
                 "name": "Casa",
@@ -1365,7 +1413,8 @@
                 "terms": "fábrica,factoría, industria, manufactura, taller, empresa, explotación"
             },
             "building/public": {
-                "name": "Edificio público"
+                "name": "Edificio público",
+                "terms": "Edificio público"
             },
             "building/residential": {
                 "name": "Edificio residencial",
@@ -1375,14 +1424,16 @@
                 "name": "Edificio de ventas al por menor"
             },
             "building/roof": {
-                "name": "Tejado"
+                "name": "Tejado",
+                "terms": "Tejado, Techumbre"
             },
             "building/school": {
                 "name": "Edificio escolar",
                 "terms": "Edificio colegio"
             },
             "building/shed": {
-                "name": "Cobertizo"
+                "name": "Cobertizo",
+                "terms": "cobertizo, establo, tinglado, barraca"
             },
             "building/stable": {
                 "name": "Establo de caballos",
@@ -1399,20 +1450,23 @@
                 "terms": "parada, alto, detención, apeadero, terminal, tren, ferrocarril"
             },
             "building/university": {
-                "name": "Edificio universitario"
+                "name": "Edificio universitario",
+                "terms": "Universidad, Facultad, Escuela universitaria"
             },
             "building/warehouse": {
                 "name": "Almacén",
                 "terms": "almacén, depósito, bodega, lonja, nave"
             },
             "craft/basket_maker": {
-                "name": "Fabricante de cestas"
+                "name": "Fabricante de cestas",
+                "terms": "cestero, cesta, cestería, canastero, canasto, mimbrero, mimbre"
             },
             "craft/beekeeper": {
                 "name": "Apicultor"
             },
             "craft/blacksmith": {
-                "name": "Herrero"
+                "name": "Herrero",
+                "terms": "herrero, herrería, herrajes, hierro, forja"
             },
             "craft/boatbuilder": {
                 "name": "Constructor de barco"
@@ -1434,7 +1488,8 @@
                 "name": "Proveedor"
             },
             "craft/clockmaker": {
-                "name": "Relojero"
+                "name": "Relojero",
+                "terms": "relojero, joyero, reloj"
             },
             "craft/confectionary": {
                 "name": "Golosinas",
@@ -1448,7 +1503,8 @@
                 "terms": "electricista, iluminista, trabajo de electricista"
             },
             "craft/gardener": {
-                "name": "Jardinero"
+                "name": "Jardinero",
+                "terms": "Jardinero,  Jardinería"
             },
             "craft/glaziery": {
                 "name": "Vidriería"
@@ -1474,25 +1530,32 @@
                 "terms": "Cerrajero, cerraduras"
             },
             "craft/metal_construction": {
-                "name": "Construcción metálica"
+                "name": "Construcción metálica",
+                "terms": "Metalúrgica, Taller metálico, Construcciones de metal, Calderería"
             },
             "craft/optician": {
                 "name": "Óptico",
                 "terms": "óptico, óptica, gafas"
             },
             "craft/painter": {
-                "name": "Pintor"
+                "name": "Pintor",
+                "terms": "Pintor"
             },
             "craft/photographer": {
                 "name": "Fotógrafo",
                 "terms": "fotógrafo, retratista"
             },
+            "craft/photographic_laboratory": {
+                "name": "Laboratorio Fotográfico",
+                "terms": "Laboratorio fotográfico"
+            },
             "craft/plasterer": {
                 "name": "Yesero",
                 "terms": "yeso, albañil, obra"
             },
             "craft/plumber": {
-                "name": "Fontanero"
+                "name": "Fontanero",
+                "terms": "Fontanero, Fontanería"
             },
             "craft/pottery": {
                 "name": "Cerámica",
@@ -1513,7 +1576,8 @@
                 "terms": "Fabricante de velas"
             },
             "craft/sawmill": {
-                "name": "Aserradero"
+                "name": "Aserradero",
+                "terms": "Aserradero"
             },
             "craft/scaffolder": {
                 "name": "Andamista"
@@ -1527,25 +1591,31 @@
                 "terms": "zapatero, remendón"
             },
             "craft/stonemason": {
-                "name": "Albañil"
+                "name": "Albañil",
+                "terms": "Albañil, Cantero, Enconfrador"
             },
             "craft/sweep": {
-                "name": "Deshollinador"
+                "name": "Deshollinador",
+                "terms": "Deshollinador, Limpiachimeneas"
             },
             "craft/tailor": {
-                "name": "Sastre"
+                "name": "Sastre",
+                "terms": "Sastre, Satrería"
             },
             "craft/tiler": {
                 "name": "Solador"
             },
             "craft/tinsmith": {
-                "name": "Hojalatero"
+                "name": "Hojalatero",
+                "terms": "Hojalatero, Soldador"
             },
             "craft/upholsterer": {
-                "name": "Tapicero"
+                "name": "Tapicero",
+                "terms": "Tapicero"
             },
             "craft/watchmaker": {
-                "name": "Relojero"
+                "name": "Relojero",
+                "terms": "Relojero"
             },
             "craft/window_construction": {
                 "name": "Construcción de ventanas"
@@ -1554,7 +1624,8 @@
                 "name": "Terraplén"
             },
             "emergency/ambulance_station": {
-                "name": "Estación de ambulancias"
+                "name": "Estación de ambulancias",
+                "terms": "Estación de ambulancia"
             },
             "emergency/fire_hydrant": {
                 "name": "Boca de incendio",
@@ -1562,15 +1633,11 @@
             },
             "emergency/phone": {
                 "name": "Teléfono de emergencias",
-                "terms": "Teléfono de emergencia"
-            },
-            "entrance": {
-                "name": "Entrada",
-                "terms": "puerta, portal, vestíbulo, umbral, soportal, pórtico, abertura, acceso, boca, entrada, portilla"
+                "terms": "Teléfono de emergencia, SOS"
             },
             "footway/crossing": {
                 "name": "Cruce peatonal",
-                "terms": "cruce, travesía, paso, cruzamiento, pasaje, vado, paseo, traviesa, paso de peatones"
+                "terms": "cruce, travesía, paso, cruzamiento, pasaje, vado, paseo, traviesa, paso de peatones, paso de cebra"
             },
             "footway/sidewalk": {
                 "name": "Acera",
@@ -1586,7 +1653,8 @@
                 "name": "Putting Green"
             },
             "golf/hole": {
-                "name": "Hoyo de golf"
+                "name": "Hoyo de golf",
+                "terms": "Hoyo de golf"
             },
             "golf/lateral_water_hazard": {
                 "name": "Obstáculo de agua lateral"
@@ -1618,10 +1686,10 @@
             },
             "highway/cycleway": {
                 "name": "Sendero ciclista",
-                "terms": "Camino para bicicletas"
+                "terms": "Camino para bicicletas, senda ciclable, sendero ciclista, carril bici"
             },
             "highway/footway": {
-                "name": "Sendero peatonal",
+                "name": "Vía urbana peatonal",
                 "terms": "Camino peatonal"
             },
             "highway/living_street": {
@@ -1649,7 +1717,7 @@
                 "terms": "vereda, sendero, camino, vía, calzada, ramal, trocha, atajo, travesía, huella, rastro"
             },
             "highway/pedestrian": {
-                "name": "Vía peatonal",
+                "name": "Calle peatonal",
                 "terms": "Peatonal, plaza, calle"
             },
             "highway/primary": {
@@ -1702,7 +1770,7 @@
             },
             "highway/service/parking_aisle": {
                 "name": "Pasillo de aparcamiento",
-                "terms": "aparcamiento, parking"
+                "terms": "aparcamiento, parking, pasillo, estacionamiento"
             },
             "highway/services": {
                 "name": "Área de servicio",
@@ -1717,11 +1785,11 @@
                 "terms": "señal de detención, señal de parada, señal, stop, detención, parada"
             },
             "highway/tertiary": {
-                "name": "Carretera ternaria",
+                "name": "Carretera terciaria",
                 "terms": "calle, ronda, carril, ruta, arteria, rúa, trayecto, avenida, carretera, paseo, camino, vía, local, terciaria"
             },
             "highway/tertiary_link": {
-                "name": "Enlace a carretera ternaria",
+                "name": "Enlace a carretera terciaria",
                 "terms": "enlace, unión, cruce, calle, ronda, carril, ruta, arteria, rúa, trayecto, avenida, carretera, paseo, camino, vía, local, terciaria"
             },
             "highway/track": {
@@ -1734,7 +1802,7 @@
             },
             "highway/trunk": {
                 "name": "Carretera troncal",
-                "terms": "Carretera principal"
+                "terms": "Carretera principal, nacional"
             },
             "highway/trunk_link": {
                 "name": "Enlace a carretera troncal",
@@ -1766,7 +1834,7 @@
             },
             "historic/memorial": {
                 "name": "Monumento",
-                "terms": "memorial, monolito, obelisco, pirámide, estatua, túmulo, panteón, mausoleo, menhir, dolmen"
+                "terms": "memorial, monolito, obelisco, pirámide, estatua, túmulo, panteón, mausoleo, menhir, dolmen, escultura, busto"
             },
             "historic/monument": {
                 "name": "Monumento",
@@ -1800,24 +1868,27 @@
                 "name": "Cementerio",
                 "terms": "cementerio, camposanto, necrópolis, sacramental"
             },
+            "landuse/churchyard": {
+                "name": "Camposanto"
+            },
             "landuse/commercial": {
                 "name": "Comercial",
-                "terms": "Comercial"
+                "terms": "Comercial, tiendas, compras"
             },
             "landuse/construction": {
                 "name": "Construcción",
-                "terms": "Construcción"
+                "terms": "Construcción, obras"
             },
             "landuse/farm": {
-                "name": "Granja",
-                "terms": "Granja"
+                "name": "Tierras de cultivo",
+                "terms": "Granja, cultivo, finca, campo"
             },
             "landuse/farmland": {
                 "name": "Tierra de labranza",
                 "terms": "granja, tierra de cultivo"
             },
             "landuse/farmyard": {
-                "name": "Tierras de cultivo",
+                "name": "Granja",
                 "terms": "Edificios de la granja"
             },
             "landuse/forest": {
@@ -1830,12 +1901,19 @@
             },
             "landuse/industrial": {
                 "name": "Industrial",
-                "terms": "Industrial"
+                "terms": "Industrial, polígono"
+            },
+            "landuse/landfill": {
+                "name": "Vertedero"
             },
             "landuse/meadow": {
                 "name": "Prado",
                 "terms": "prado, pradera, campo, mies, braniza, braña"
             },
+            "landuse/military": {
+                "name": "Militar",
+                "terms": "militar, ejercito, fuerzas armadas, defensa, cuartel, milicia"
+            },
             "landuse/orchard": {
                 "name": "Huerta",
                 "terms": "herbazal, pradera, pradería, prado, pasto, majada, monte, dehesa, huerta, riego, sembrado"
@@ -1845,8 +1923,8 @@
                 "terms": "cantera"
             },
             "landuse/residential": {
-                "name": "Urbano",
-                "terms": "zona, residencial, urbano"
+                "name": "Suelo Urbano residencial",
+                "terms": "zona, residencial, urbano, suelo"
             },
             "landuse/retail": {
                 "name": "Venta al por menor",
@@ -1867,6 +1945,9 @@
                 "name": "Parque canino",
                 "terms": "perro,can,parque"
             },
+            "leisure/firepit": {
+                "name": "Hoguera"
+            },
             "leisure/garden": {
                 "name": "Jardín",
                 "terms": "parque, parterre, vergel, floresta, huerto, rosaleda, jardín"
@@ -1875,16 +1956,20 @@
                 "name": "Campo de golf",
                 "terms": "Campo de golf"
             },
+            "leisure/ice_rink": {
+                "name": "Pista de Hielo"
+            },
             "leisure/marina": {
-                "name": "Marina",
-                "terms": "marina"
+                "name": "Muelle",
+                "terms": "marina, muelle, puerto, embarcadero"
             },
             "leisure/park": {
                 "name": "Parque",
                 "terms": "parque, jardín"
             },
             "leisure/picnic_table": {
-                "name": "Mesa de picnic"
+                "name": "Mesa de picnic",
+                "terms": "Mesa de picnic, Mesa de parque"
             },
             "leisure/pitch": {
                 "name": "Cancha deportiva",
@@ -1946,7 +2031,7 @@
                 "terms": "Línea"
             },
             "man_made": {
-                "name": "Hecho por el hombre",
+                "name": "Estructura artificial",
                 "terms": "manufactura, industrial, fabricado, manufacturado, fábrica, industria, hecho por el hombre"
             },
             "man_made/breakwater": {
@@ -1968,7 +2053,8 @@
                 "terms": "faro"
             },
             "man_made/observation": {
-                "name": "Torre de Observación"
+                "name": "Torre de Observación",
+                "terms": "Torre de observación"
             },
             "man_made/pier": {
                 "name": "Embarcadero",
@@ -2066,7 +2152,7 @@
             },
             "natural/spring": {
                 "name": "Manantial",
-                "terms": "Manantial"
+                "terms": "Manantial, fuente, agua"
             },
             "natural/tree": {
                 "name": "Árbol",
@@ -2130,7 +2216,8 @@
                 "name": "Oficina financiera"
             },
             "office/government": {
-                "name": "Oficina de gobierno"
+                "name": "Oficina de gobierno",
+                "terms": "Oficina gubernamental"
             },
             "office/insurance": {
                 "name": "Aseguradora",
@@ -2144,7 +2231,8 @@
                 "terms": "despacho, bufete, abogado, procurador, letrado, jurisconsulto, jurisperito, jurista, legista"
             },
             "office/newspaper": {
-                "name": "Periódico"
+                "name": "Periódico",
+                "terms": "Periódico"
             },
             "office/ngo": {
                 "name": "ONG",
@@ -2154,10 +2242,12 @@
                 "name": "Doctor"
             },
             "office/political_party": {
-                "name": "Partido político"
+                "name": "Partido político",
+                "terms": "Partido político"
             },
             "office/research": {
-                "name": "Oficina de investigación"
+                "name": "Oficina de investigación",
+                "terms": "Oficina de investigación, Laboratorio de investigación, Departamento de investigación, Centro de investigación"
             },
             "office/telecommunication": {
                 "name": "Oficina de telecomunicaciones"
@@ -2170,7 +2260,8 @@
                 "terms": "agencia, viaje, vacaciones, turismo, excursión"
             },
             "piste": {
-                "name": "Pista/Sendero de ski"
+                "name": "Pista/Sendero de ski",
+                "terms": "Pista de esquí"
             },
             "place": {
                 "name": "Lugar",
@@ -2197,7 +2288,8 @@
                 "terms": "paraje, lugar, sitio, rincón"
             },
             "place/neighbourhood": {
-                "name": "Barrio"
+                "name": "Barrio",
+                "terms": "barrio, vecindario, vecindad"
             },
             "place/town": {
                 "name": "Ciudad",
@@ -2243,7 +2335,8 @@
                 "terms": "Transformador"
             },
             "public_transport/platform": {
-                "name": "Plataforma"
+                "name": "Plataforma",
+                "terms": "Plataforma, Andén"
             },
             "public_transport/stop_position": {
                 "name": "Punto de parada",
@@ -2262,22 +2355,24 @@
                 "terms": "Ferrocarril en deshuso"
             },
             "railway/funicular": {
-                "name": "Funicular"
+                "name": "Funicular",
+                "terms": "Funicular, Teleférico, Telecabina"
             },
             "railway/halt": {
                 "name": "Apeadero",
                 "terms": "apeadero,estación,ferrocarril,tren,andén"
             },
             "railway/level_crossing": {
-                "name": "Cruce a nivel",
-                "terms": "Paso a nivel"
+                "name": "Paso a nivel",
+                "terms": "paso a nivel, cruce a nivel, ferrocarril, tren"
             },
             "railway/monorail": {
                 "name": "Monorraíl",
                 "terms": "Monorail"
             },
             "railway/narrow_gauge": {
-                "name": "Carril de vía estrecha"
+                "name": "Carril de vía estrecha",
+                "terms": "Ferrocarril de vía estrecha"
             },
             "railway/platform": {
                 "name": "Andén",
@@ -2337,7 +2432,7 @@
             },
             "shop/bicycle": {
                 "name": "Tienda de bicicletas",
-                "terms": "tienda de bicicletas, bici"
+                "terms": "tienda de bicicletas, bici, bicicleta, taller de bicicletas"
             },
             "shop/bookmaker": {
                 "name": "Librero"
@@ -2359,7 +2454,7 @@
                 "terms": "concesionario, coches, automóviles, carros, vehículos, venta"
             },
             "shop/car_parts": {
-                "name": "Tienda de partes de automóviles",
+                "name": "Tienda de recambios de automóviles",
                 "terms": "repuestos, tienda, automóvil, vehículo, carro, coche, piezas, almacén"
             },
             "shop/car_repair": {
@@ -2367,7 +2462,7 @@
                 "terms": "reparación, automóvil, vehículo, carro, coche, taller"
             },
             "shop/chemist": {
-                "name": "Farmacia",
+                "name": "Droguería",
                 "terms": "farmacéutico, botica, farmacia, boticario, apoteca"
             },
             "shop/clothes": {
@@ -2417,12 +2512,17 @@
                 "name": "Floristería",
                 "terms": "floristería, florista, flores, ramos, plantas, tienda, comercio"
             },
+            "shop/funeral_directors": {
+                "name": "Funeraria",
+                "terms": "Funeraria"
+            },
             "shop/furniture": {
                 "name": "Mueblería",
                 "terms": "mueble, mobiliario, utensilio, armario, mesa, silla, tienda, decoración, cocina"
             },
             "shop/garden_centre": {
-                "name": "Centro de jardinería"
+                "name": "Centro de jardinería",
+                "terms": "Centro de jardinería, Tienda de jardinería"
             },
             "shop/gift": {
                 "name": "Tienda de regalos",
@@ -2441,7 +2541,8 @@
                 "terms": "Ferreteria"
             },
             "shop/hifi": {
-                "name": "Tienda de equipos de sonido"
+                "name": "Tienda de equipos de sonido",
+                "terms": "sonido, hifi, alta fidelidad, electrónica, altavoces, amplificadores"
             },
             "shop/jewelry": {
                 "name": "Joyería",
@@ -2456,10 +2557,12 @@
                 "terms": "lavandería, lavadero, colada, ropa, tintorería, limpieza"
             },
             "shop/locksmith": {
-                "name": "Cerrajero"
+                "name": "Cerrajero",
+                "terms": "cerrajero, cerradura, candado"
             },
             "shop/lottery": {
-                "name": "Lotería"
+                "name": "Administración de Lotería",
+                "terms": "Administración de loterías, Venta de lotería"
             },
             "shop/mall": {
                 "name": "Centro comercial",
@@ -2496,6 +2599,9 @@
                 "name": "Tienda de fotografía",
                 "terms": "fotografía, tienda , establecimiento, fotógrafo, cámara, retratista, revelado"
             },
+            "shop/seafood": {
+                "name": "Tienda de Mariscos"
+            },
             "shop/shoes": {
                 "name": "Zapatería",
                 "terms": "zapatería, calzado, tienda, zapato, zapatilla, escarpín, bota, sandalia, alpargata, pantufla, babucha, borceguí, almadreña, zueco, chancla, chanclo, madreña, chinela, coturno, alborga"
@@ -2519,7 +2625,8 @@
                 "terms": "agencia de viajes, agencia de turismo"
             },
             "shop/tyres": {
-                "name": "Tienda de neumáticos"
+                "name": "Tienda de neumáticos",
+                "terms": "Taller de neumáticos, Recambio de ruedas"
             },
             "shop/vacant": {
                 "name": "Local vacío"
@@ -2532,19 +2639,24 @@
                 "name": "Videoclub",
                 "terms": "tienda, alquiler, renta, tienda de vídeos, videoclub, alquiler de vídeos, renta de vídeos"
             },
+            "shop/wine": {
+                "name": "Vinoteca, Tienda de vinos"
+            },
             "tourism": {
                 "name": "Turismo",
                 "terms": "turismo"
             },
             "tourism/alpine_hut": {
-                "name": "Cabaña alpina"
+                "name": "Cabaña alpina",
+                "terms": "Refugio de montaña, refugio alpino"
             },
             "tourism/artwork": {
-                "name": "Obra de arte"
+                "name": "Obra de arte",
+                "terms": "obra de arte, pieza de arte, pintura, escultura, mural, pintada, estatua"
             },
             "tourism/attraction": {
                 "name": "Atracción turística",
-                "terms": "punto de interés,interesante"
+                "terms": "punto de interés, interesante, interés turístico, atracción turística"
             },
             "tourism/camp_site": {
                 "name": "Lugar de acampada",
@@ -2571,7 +2683,7 @@
             },
             "tourism/information": {
                 "name": "Información",
-                "terms": "información,aviso,señal"
+                "terms": "información, aviso, señal, información turística"
             },
             "tourism/motel": {
                 "name": "Motel",
@@ -2583,15 +2695,15 @@
             },
             "tourism/picnic_site": {
                 "name": "Zona de picnic",
-                "terms": "picnic,barbacoa,espercimiento"
+                "terms": "picnic, barbacoa, espercimiento, merendero"
             },
             "tourism/theme_park": {
-                "name": "Parque temático",
+                "name": "Parque de atracciones",
                 "terms": "parque temático, parque de atracciones, atracciones"
             },
             "tourism/viewpoint": {
-                "name": "Vista panorámica",
-                "terms": "oteadero, punto de vista, mirador, vistas"
+                "name": "Mirador",
+                "terms": "oteadero, punto de vista, mirador, vistas, vista panorámica"
             },
             "tourism/zoo": {
                 "name": "Zoológico",
@@ -2618,7 +2730,8 @@
                 "terms": "ruta,recorrido,línea"
             },
             "type/route/bicycle": {
-                "name": "Ruta de bicicleta"
+                "name": "Ruta de bicicleta",
+                "terms": "ruta ciclista, ciclovía, carril bici, ciclosenda, bicicleta"
             },
             "type/route/bus": {
                 "name": "Ruta de bus",
@@ -2637,7 +2750,8 @@
                 "terms": "ruta, itinerario, rumbo, dirección, trayecto, peatonal, pie, senderismo , camino, derrotero, vía"
             },
             "type/route/hiking": {
-                "name": "Ruta de senderismo"
+                "name": "Ruta de senderismo",
+                "terms": "Ruta de senderismo"
             },
             "type/route/pipeline": {
                 "name": "Ruta de tubería",
@@ -2650,10 +2764,12 @@
                 "name": "Ruta de carretera"
             },
             "type/route/train": {
-                "name": "Ruta del tren"
+                "name": "Ruta del tren",
+                "terms": "Ruta de tren, Línea de tren"
             },
             "type/route/tram": {
-                "name": "Ruta del tranvía"
+                "name": "Ruta del tranvía",
+                "terms": "Ruta de tranvía, Línea de tranvía"
             },
             "type/route_master": {
                 "name": "Ruta maestra"
@@ -2664,20 +2780,23 @@
             },
             "waterway": {
                 "name": "Vía fluvial",
-                "terms": "canal, cauce, acueducto, fluvial"
+                "terms": "canal, cauce, acueducto, fluvial, agua, río"
             },
             "waterway/canal": {
                 "name": "Canal",
                 "terms": "canaleta, canaleja, canalón, canalizo, caño, cañería, reguero, reguera, tubería, conducto, caz, cacera, zanja, acequia, cauce, cloaca, acueducto, canal"
             },
             "waterway/dam": {
-                "name": "Presa"
+                "name": "Presa",
+                "terms": "Presa, Dique"
             },
             "waterway/ditch": {
-                "name": "Acequia"
+                "name": "Acequia",
+                "terms": "Foso, Zanja, Hoyo, Cuneta"
             },
             "waterway/drain": {
-                "name": "Desagüe"
+                "name": "Desagüe",
+                "terms": "Desagüe, Sumidero"
             },
             "waterway/river": {
                 "name": "Río",

diff --git a/vendor/assets/iD/iD/locales/et.json b/vendor/assets/iD/iD/locales/et.json
index e77b727bfe13f2286412f3cd84c2b84e7b22458a..e8ee8abfe2cf4573a5a21433bd554a06a93a91c1 100644 (file)
--- a/vendor/assets/iD/iD/locales/et.json
+++ b/vendor/assets/iD/iD/locales/et.json
@@ -139,6 +139,7 @@
         },
         "rotate": {
             "title": "Pööra",
+            "description": "Pööra objekti ümber tema keskpunkti.",
             "key": "R",
             "annotation": {
                 "line": "Pööratud joont.",
@@ -657,9 +658,6 @@
             "building/commercial": {
                 "name": "Ärihoone"
             },
-            "building/entrance": {
-                "name": "Sissepääs"
-            },
             "building/house": {
                 "name": "Maja"
             },
@@ -672,9 +670,6 @@
             "emergency/phone": {
                 "name": "Hädaabi telefon"
             },
-            "entrance": {
-                "name": "Sissepääs"
-            },
             "highway": {
                 "name": "Tee"
             },

diff --git a/vendor/assets/iD/iD/locales/fa.json b/vendor/assets/iD/iD/locales/fa.json
index 8cb24bb762b1ffce472a09d2e12104a646cb91bb..061a937ef088330cc4e8f3ecd560fc6a484a3c60 100644 (file)
--- a/vendor/assets/iD/iD/locales/fa.json
+++ b/vendor/assets/iD/iD/locales/fa.json
@@ -1213,10 +1213,6 @@
                 "name": "ساختمان ارتباطی",
                 "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'ساختمان ارتباطی'، با کاما جدا میشوند>"
             },
-            "building/entrance": {
-                "name": "ورودی",
-                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای  'Entrance'، با کاما جدا میشوند>"
-            },
             "building/garage": {
                 "name": "گاراژ",
                 "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'گاراژ'، با کاما جدا میشوند>"
@@ -1379,10 +1375,6 @@
                 "name": "تلفن اورژانسی",
                 "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'تلفن اورژانسی'، با کاما جدا میشوند>"
             },
-            "entrance": {
-                "name": "درب ورودی",
-                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای  'Entrance'، با کاما جدا میشوند>"
-            },
             "footway/crossing": {
                 "name": "خط عابر پیاده"
             },

diff --git a/vendor/assets/iD/iD/locales/fi.json b/vendor/assets/iD/iD/locales/fi.json
index 302460cb8c8ad358b8d4c65a32814ac45841e221..6aba7e270f8192e6ee2128a158bffcfae08ee54b 100644 (file)
--- a/vendor/assets/iD/iD/locales/fi.json
+++ b/vendor/assets/iD/iD/locales/fi.json
@@ -71,7 +71,8 @@
                 "line": "Viiva pyöristettiin.",
                 "area": "Alue pyöristettiin."
             },
-            "not_closed": "Tätä ei voi tehdä ympyränmuotoiseksi, sillä sitä ei ole suljettu."
+            "not_closed": "Tätä ei voi tehdä ympyränmuotoiseksi, sillä sitä ei ole suljettu.",
+            "too_large": "Tätä ei voi pyöristää koska se ei ole tarpeeksi näkyvissä."
         },
         "orthogonalize": {
             "title": "Muuta suorakulmaiseksi",
@@ -84,7 +85,8 @@
                 "line": "Viiva muutettu suorakulmaiseksi.",
                 "area": "Alue muutettu suorakulmaiseksi."
             },
-            "not_squarish": "Nelikulmion tekeminen epäonnistui, koska se ei ole neliömäinen."
+            "not_squarish": "Nelikulmion tekeminen epäonnistui, koska se ei ole neliömäinen.",
+            "too_large": "Tätä ei voi tehdä suorakulmaiseksi, koska se ei ole tarpeeksi näkyvissä."
         },
         "straighten": {
             "title": "Suorista",
@@ -483,7 +485,7 @@
                 "placeholder": "500, 2500, 5000..."
             },
             "aerialway/duration": {
-                "label": "Kesto (minuuttia)",
+                "label": "Matka-aika (minuutteina)",
                 "placeholder": "1, 2, 3..."
             },
             "aerialway/heating": {
@@ -592,6 +594,21 @@
             "fixme": {
                 "label": "Korjaa minut"
             },
+            "fuel/biodiesel": {
+                "label": "Biodiesel-myynti"
+            },
+            "fuel/diesel": {
+                "label": "Diesel-myynti"
+            },
+            "fuel/e10": {
+                "label": "E10-myynti"
+            },
+            "fuel/e85": {
+                "label": "E85-myynti"
+            },
+            "fuel/lpg": {
+                "label": "Propaanin myynti"
+            },
             "gauge": {
                 "label": "Raideväli"
             },
@@ -604,6 +621,14 @@
             "generator/type": {
                 "label": "Tyyppi"
             },
+            "golf_hole": {
+                "label": "Väylänumero",
+                "placeholder": "Väylänumero (1-18)"
+            },
+            "handicap": {
+                "label": "Tasoitussuositus (HCP)",
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "Tyyppi"
             },
@@ -619,6 +644,9 @@
             "incline": {
                 "label": "Kaltevuus"
             },
+            "information": {
+                "label": "Tyyppi"
+            },
             "internet_access": {
                 "label": "Internet-yhteys",
                 "options": {
@@ -640,6 +668,9 @@
             "leisure": {
                 "label": "Tyyppi"
             },
+            "length": {
+                "label": "Pituus (metreinä)"
+            },
             "levels": {
                 "label": "Kerrokset",
                 "placeholder": "2, 4, 6..."
@@ -665,7 +696,7 @@
                 "label": "Luonto"
             },
             "network": {
-                "label": "Verkko"
+                "label": "Verkosto"
             },
             "note": {
                 "label": "Huomautus"
@@ -685,6 +716,10 @@
             "operator": {
                 "label": "Toimija"
             },
+            "par": {
+                "label": "Lyöntimääräsuositus",
+                "placeholder": "3, 4, 5..."
+            },
             "park_ride": {
                 "label": "Autoparkki"
             },
@@ -713,6 +748,18 @@
             "railway": {
                 "label": "Tyyppi"
             },
+            "recycling/cans": {
+                "label": "Tölkinkeräys"
+            },
+            "recycling/clothes": {
+                "label": "Vaatekeräys"
+            },
+            "recycling/glass": {
+                "label": "Lasinkeräys"
+            },
+            "recycling/paper": {
+                "label": "Paperinkeräys"
+            },
             "ref": {
                 "label": "Tie- tai linjanumero"
             },
@@ -752,11 +799,14 @@
             "shop": {
                 "label": "Tyyppi"
             },
+            "smoking": {
+                "label": "Tupakointi"
+            },
             "source": {
                 "label": "Lähde"
             },
             "sport": {
-                "label": "Urheilu"
+                "label": "Urheilulaji"
             },
             "structure": {
                 "label": "Rakenne",
@@ -808,6 +858,9 @@
             "wheelchair": {
                 "label": "Esteettömyys"
             },
+            "width": {
+                "label": "Leveys (metreinä)"
+            },
             "wikipedia": {
                 "label": "Wikipedia"
             },
@@ -904,6 +957,10 @@
             "amenity/bar": {
                 "name": "Baari"
             },
+            "amenity/bbq": {
+                "name": "Grilli",
+                "terms": "grilli, grillaus, grillauspiste, grillauspaikka, grillipiste, grillauspaikka"
+            },
             "amenity/bench": {
                 "name": "Penkki",
                 "terms": "penkki, tuoli, istuin"
@@ -921,7 +978,8 @@
                 "terms": "vene, laiva, paatti, jolla, veneenvuokraus, venevuokra, vuokra, venevuokraus, venevuokraamo, veneenvuokraamo"
             },
             "amenity/cafe": {
-                "name": "Kahvila"
+                "name": "Kahvila",
+                "terms": "Kahvila, Kahvitupa, Teehuone"
             },
             "amenity/car_rental": {
                 "name": "Auton vuokraus",
@@ -934,6 +992,10 @@
                 "name": "Autopesula",
                 "terms": "autopesu, automaattipesu, pesula, pesukone, pesuhalli, auto, autot"
             },
+            "amenity/charging_station": {
+                "name": "Latauspiste",
+                "terms": "sähköauto, sähkönlataus, sähköpiste, latauspiste, lataaminen, lataus"
+            },
             "amenity/childcare": {
                 "name": "Esikoulu",
                 "terms": "esikoulu, eskari, leikkikoulu"
@@ -988,7 +1050,12 @@
                 "terms": "hautausmaa, kalmisto, luutarha"
             },
             "amenity/hospital": {
-                "name": "Sairaala-alue"
+                "name": "Sairaala-alue",
+                "terms": "Sairaala-alue"
+            },
+            "amenity/kindergarten": {
+                "name": "Päiväkodin piha",
+                "terms": "päiväkoti, piha, ulkoilualue, lastentarha"
             },
             "amenity/library": {
                 "name": "Kirjasto",
@@ -997,6 +1064,9 @@
             "amenity/marketplace": {
                 "name": "Tori"
             },
+            "amenity/nightclub": {
+                "name": "Yökerho"
+            },
             "amenity/parking": {
                 "name": "Autopysäköinti",
                 "terms": "auto, parkki, parkkihalli, pysäköintialue, pysäköinti, parkki, parkkipaikka, pysäköintialue, parkkialue"
@@ -1006,22 +1076,27 @@
                 "terms": "apteekki, lääke, lääkkeet, lääkemyymälä, lääkkeenmyynti, farmasia, farmaseutti"
             },
             "amenity/place_of_worship": {
-                "name": "Rukoilupaikka"
+                "name": "Rukoilupaikka",
+                "terms": "Uskonnollinen rakennus, Kirkkorakennus"
             },
             "amenity/place_of_worship/buddhist": {
                 "name": "Buddhalaistemppeli"
             },
             "amenity/place_of_worship/christian": {
-                "name": "Kirkko"
+                "name": "Kirkko",
+                "terms": "Kirkko, Pyhäkkö, Rukoushuone, Stupa, Tsasouna, Moskeija, Temppeli"
             },
             "amenity/place_of_worship/jewish": {
-                "name": "Synagoga"
+                "name": "Synagoga",
+                "terms": "Synagooga"
             },
             "amenity/place_of_worship/muslim": {
-                "name": "Moskeija"
+                "name": "Moskeija",
+                "terms": "Moskeija"
             },
             "amenity/police": {
-                "name": "Poliisiasema"
+                "name": "Poliisiasema",
+                "terms": "Poliisi, Poliisiasema"
             },
             "amenity/post_box": {
                 "name": "Postilaatikko",
@@ -1039,16 +1114,26 @@
                 "terms": "kierrättäminen, kierrätys, lajittelu, uudelleenkäyttö, uudelleenkäyttäminen, ympäristö, lajittelupiste, lajitteluasema, jäte, jätteet, roskat, roska, roskikset, roskis, säiliö, roskasäiliö"
             },
             "amenity/restaurant": {
-                "name": "Ravintola"
+                "name": "Ravintola",
+                "terms": "Ravintola, Ruokaravintola, Bistro, Krouvi, Pizzeria, Ruokala"
+            },
+            "amenity/school": {
+                "name": "Koulun piha",
+                "terms": "Koulun piha, Koulualue"
             },
             "amenity/shelter": {
                 "name": "Katos"
             },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Kodittomien turvakoti",
+                "terms": "koditon, kodittomia, turvatalo, kodittomien"
+            },
             "amenity/studio": {
                 "name": "Studio"
             },
             "amenity/swimming_pool": {
-                "name": "Uima-allas"
+                "name": "Uima-allas",
+                "terms": "uimahalli, uintikeskus, uimastadion, uima-allas, uinti, uiminen"
             },
             "amenity/taxi": {
                 "name": "Taksitolppa",
@@ -1056,10 +1141,11 @@
             },
             "amenity/telephone": {
                 "name": "Yleinen puhelin",
-                "terms": "puhelinkoppi, puhelin, puhelinkioski, yleinen puhelin, julkinen puhelin"
+                "terms": "puhelinkoppi, puhelin, puhelinkioski, julkinen puhelin"
             },
             "amenity/theatre": {
-                "name": "Teatteri"
+                "name": "Teatteri",
+                "terms": "Teatteri, Kaupunginteatteri, Kansallisteatteri"
             },
             "amenity/toilets": {
                 "name": "WC"
@@ -1072,6 +1158,10 @@
                 "name": "Korkeakoulu",
                 "terms": "yliopisto, korkeakoulu, college, ammattikorkeakoulu, amk"
             },
+            "amenity/vending_machine": {
+                "name": "Myyntiautomaatti",
+                "terms": "välipalamaatti, välipala-automaatti, välipala, ruokamaatti, ruoka-automaatti, juoma, juomia, juomamaatti, kahvikone, kahviautomaatti, kahvi, automaatti, myyntilaite, myyntipiste"
+            },
             "amenity/veterinary": {
                 "name": "Eläinlääkäri"
             },
@@ -1142,16 +1232,33 @@
             "building/apartments": {
                 "name": "Kerrostalo"
             },
+            "building/church": {
+                "name": "Kirkko"
+            },
             "building/commercial": {
                 "name": "Kaupallinen rakennus"
             },
+            "building/construction": {
+                "name": "Keskeneräinen rakennus",
+                "terms": "rakennus, rakennustyömaa, rakenteilla"
+            },
             "building/entrance": {
-                "name": "Sisäänkäynti"
+                "name": "Sisään- tai uloskäynti"
             },
             "building/garage": {
                 "name": "Autotalli",
                 "terms": "autotalli, autonsäilytys, autohalli, autovarasto, auto"
             },
+            "building/garages": {
+                "name": "Suuri autotalli",
+                "terms": "ryhmäautotalli, joukkoautotalli, joukkotalli, ryhmätalli, autotalli"
+            },
+            "building/hospital": {
+                "name": "Sairaalarakennus"
+            },
+            "building/hotel": {
+                "name": "Hotellirakennus"
+            },
             "building/house": {
                 "name": "Omakotitalo",
                 "terms": "omakotitalo, omakoti, yksityisasunto, yksityistalo, talo, asunto"
@@ -1163,12 +1270,40 @@
             "building/industrial": {
                 "name": "Teollisuusrakennus"
             },
+            "building/public": {
+                "name": "Julkinen rakennus"
+            },
             "building/residential": {
                 "name": "Asuinrakennus"
             },
+            "building/retail": {
+                "name": "Liikerakennus"
+            },
+            "building/roof": {
+                "name": "Seinätön rakennus",
+                "terms": "katos, katettu, seinätön, rakennus"
+            },
+            "building/school": {
+                "name": "Koulurakennus"
+            },
+            "building/shed": {
+                "name": "Vaja",
+                "terms": "vaja, mökki, liiteri"
+            },
             "building/terrace": {
                 "name": "Rivitalo"
             },
+            "building/train_station": {
+                "name": "Rautatieasema",
+                "terms": "junasema, juna, VR, rautatie, rautatieasema"
+            },
+            "building/university": {
+                "name": "Yliopistorakennus",
+                "terms": "yliopisto, yliopiston, rakennus, korkeakoulu"
+            },
+            "building/warehouse": {
+                "name": "Varasto"
+            },
             "craft/basket_maker": {
                 "name": "Koripaja",
                 "terms": "kori, paju, pajukori, korivalmistaja, koripaja"
@@ -1242,11 +1377,14 @@
             "craft/optician": {
                 "name": "optikko"
             },
+            "craft/painter": {
+                "name": "Maalari"
+            },
             "craft/photographer": {
                 "name": "valokuvaaja"
             },
             "craft/plasterer": {
-                "name": "rappaaja"
+                "name": "Rappaaja"
             },
             "craft/plumber": {
                 "name": "putkiasentaja"
@@ -1286,7 +1424,7 @@
                 "name": "Nuohooja"
             },
             "craft/tailor": {
-                "name": "räätäli"
+                "name": "Räätäli"
             },
             "craft/tiler": {
                 "name": "laatoittaja"
@@ -1301,6 +1439,9 @@
             "craft/watchmaker": {
                 "name": "Rannekelloseppä"
             },
+            "craft/window_construction": {
+                "name": "Ikkunankorjaus"
+            },
             "emergency/ambulance_station": {
                 "name": "Ambulanssiasema",
                 "terms": "ambulanssi, ambulanssit, hälytysajoneuvo, ambulanssihalli, ambulanssivarasto, ambulanssitalli, hälytysajoneuvohalli, hälytysajoneuvotalli, hälytysajoneuvovarasto"
@@ -1314,7 +1455,7 @@
                 "terms": "hätänumero, hätäpuhelin, hätätilanne, poikkeuspuhelin, hätäkeskus, hätäilmoitus"
             },
             "entrance": {
-                "name": "Sisäänkäynti"
+                "name": "Sisään- tai uloskäynti"
             },
             "footway/crossing": {
                 "name": "Suojatieväylä"
@@ -1336,7 +1477,7 @@
                 "terms": "puttigreeni, puttigriini, viheriöalue, golf, maali, maalipaikka, golf-reikä, puttausalue, putti"
             },
             "golf/hole": {
-                "name": "golf-reikä"
+                "name": "Golf-reikä"
             },
             "golf/lateral_water_hazard": {
                 "name": "Sivuvesieste"
@@ -1369,7 +1510,8 @@
                 "name": "Pyörätie"
             },
             "highway/footway": {
-                "name": "Jalkakäytävä"
+                "name": "Jalkakäytävä",
+                "terms": "Polku"
             },
             "highway/living_street": {
                 "name": "Pihakatu"
@@ -1436,7 +1578,12 @@
                 "name": "Huoltoalue"
             },
             "highway/steps": {
-                "name": "Portaat"
+                "name": "Portaat",
+                "terms": "Portaat, Rappuset, Portaikko, Kierreportaat, Tikapuut"
+            },
+            "highway/stop": {
+                "name": "Pakollinen pysähtyminen",
+                "terms": "stop, stop-merkki, stop merkki, liikennemerkki, kieltomerkki, kieltomerkit, pysähtyminen, pysähdys, liikennesääntö, liikennesäännöt, pakollisuus, pakollinen"
             },
             "highway/tertiary": {
                 "name": "Yhdystie"
@@ -1554,11 +1701,16 @@
             "leisure/golf_course": {
                 "name": "Golfkenttä"
             },
+            "leisure/ice_rink": {
+                "name": "Luistelukenttä",
+                "terms": "jää, jääkenttä, jääalue, kaukalo, jääkiekko, luistelu, jääkiekkokaukalo, luistimet, luistinrata, luistelurata"
+            },
             "leisure/marina": {
                 "name": "Venesatama"
             },
             "leisure/park": {
-                "name": "Puisto"
+                "name": "Puisto",
+                "terms": "Puisto, Viheralue, Puistikko"
             },
             "leisure/pitch": {
                 "name": "Urheilukenttä"
@@ -1586,12 +1738,16 @@
                 "name": "Lentopallokenttä"
             },
             "leisure/playground": {
-                "name": "Leikkipuisto"
+                "name": "Leikkipuisto",
+                "terms": "leikkipuisto, leikkipaikka, leikki, leikkiä, lapsipuisto, leikkipiste"
             },
             "leisure/slipway": {
                 "name": "Veneramppi",
                 "terms": "veneramppi, vesillelaskupaikka, veneenlaskupaikka, vene, järveenlaskupaikka, järviramppi"
             },
+            "leisure/sports_center": {
+                "name": "Urheilukeskus"
+            },
             "leisure/stadium": {
                 "name": "Stadion"
             },
@@ -1613,6 +1769,14 @@
             "man_made/cutline": {
                 "name": "Leikkaa viiva"
             },
+            "man_made/embankment": {
+                "name": "Penkere",
+                "terms": "pengerrys, tienreuna, meluvalli, äänivalli, äänimuuri, melumuuri"
+            },
+            "man_made/flagpole": {
+                "name": "Lipputank",
+                "terms": "lippu, liputus, salko, lippusalko, tanko, tolppa, lipputolppa, liputuspäivä, liputtaa"
+            },
             "man_made/lighthouse": {
                 "name": "Majakka"
             },
@@ -1650,6 +1814,10 @@
             "military/bunker": {
                 "name": "Bunkkeri"
             },
+            "military/range": {
+                "name": "Sotilasalue",
+                "terms": "varuskunta, sotilas, armeija, sota, sodankäynti"
+            },
             "natural": {
                 "name": "Luonto"
             },
@@ -1663,7 +1831,8 @@
                 "name": "Kallionjyrkänne"
             },
             "natural/coastline": {
-                "name": "Rannikko"
+                "name": "Rannikko",
+                "terms": "Rantaviiva"
             },
             "natural/glacier": {
                 "name": "Jäätikkö"
@@ -1675,7 +1844,8 @@
                 "name": "Nummi"
             },
             "natural/peak": {
-                "name": "Vuorenhuippu"
+                "name": "Vuorenhuippu",
+                "terms": "Huippu, Vuorenhuippu, Korkein kohta, Vuoren huippu"
             },
             "natural/scrub": {
                 "name": "Pensaikko"
@@ -1690,10 +1860,12 @@
                 "name": "Vesi"
             },
             "natural/water/lake": {
-                "name": "Järvi"
+                "name": "Järvi",
+                "terms": "Järvi, Vesistö"
             },
             "natural/water/pond": {
-                "name": "Lampi"
+                "name": "Lampi",
+                "terms": "Lampi, Lammikko, Lampare, Luoma"
             },
             "natural/water/reservoir": {
                 "name": "Tekojärvi"
@@ -1707,10 +1879,31 @@
             "office": {
                 "name": "Toimisto"
             },
+            "office/accountant": {
+                "name": "Tilintarkastustoimisto",
+                "terms": "tilintarkastus, tilintarkastaja, kirjanpito, kirjanpitäjä, kirjanpitotoimisto"
+            },
+            "office/company": {
+                "name": "Yritystoimisto"
+            },
             "office/educational_institution": {
                 "name": "Oppilatos",
                 "terms": "koulu, alakoulu, ala-aste, yläaste, yläkoulu, lukio, yhteislukio, keskikoulu, koulutus, opiskelu, oppilaitos, yliopisto"
             },
+            "office/employment_agency": {
+                "name": "Työnvälitystoimisto",
+                "terms": "työ, työvoimatoimisto, työnvälitys, työnvälittäjä, työpaikka, työpaikat"
+            },
+            "office/financial": {
+                "name": "Taloustoimisto"
+            },
+            "office/government": {
+                "name": "Hallinnon toimisto"
+            },
+            "office/insurance": {
+                "name": "Vakuutustoimisto",
+                "terms": "vakuutus, vakuutusyhtiö, vakuutukset, vakuutuksia"
+            },
             "office/it": {
                 "name": "Tietotekniikkatoimisto",
                 "terms": "tietotalo, tietotekniikka, teknologia, tietoteknologia, IT-talo, IT-teknologia, IT-tekniikka, teknologiatalo"
@@ -1747,7 +1940,8 @@
                 "name": "Pikkukylä"
             },
             "place/island": {
-                "name": "Saari"
+                "name": "Saari",
+                "terms": "Saari, Saareke, Luoto"
             },
             "place/isolated_dwelling": {
                 "name": "Yksittäinen asunto"
@@ -1755,6 +1949,12 @@
             "place/locality": {
                 "name": "Paikkakunta"
             },
+            "place/neighbourhood": {
+                "name": "Asuinalue"
+            },
+            "place/suburb": {
+                "name": "Kaupunginosa"
+            },
             "place/town": {
                 "name": "Pieni kaupunki",
                 "terms": "kunta, pienkaupunki, pieni kaupunki, keskikokoinen kaupunki"
@@ -1768,6 +1968,9 @@
             "power": {
                 "name": "Sähkö"
             },
+            "power/generator": {
+                "name": "Generaattori"
+            },
             "power/line": {
                 "name": "Voimalinja"
             },
@@ -1787,6 +1990,10 @@
             "power/transformer": {
                 "name": "Muuntaja"
             },
+            "public_transport/platform": {
+                "name": "Laiturialue",
+                "terms": "pysäkki, asema, pysäkkilaituri, laituri, odotus, odotusalue, odotuslaituri, odottaminen, katos, asemalaituri, asema"
+            },
             "railway": {
                 "name": "Rautatie"
             },
@@ -1799,6 +2006,10 @@
             "railway/funicular": {
                 "name": "funikulaari"
             },
+            "railway/halt": {
+                "name": "Seisake",
+                "terms": "rautatie, juna, junarata, pysäkki, asema, rautatieasema, VR"
+            },
             "railway/level_crossing": {
                 "name": "Tasoristeys"
             },
@@ -1809,7 +2020,8 @@
                 "name": "Kapearaiteinen rautatie"
             },
             "railway/platform": {
-                "name": "Rautatielaituri"
+                "name": "Rautatielaituri",
+                "terms": "junalaituri, juna, rautatie, VR, asemalaituri, odotusalue, odotuslaituri"
             },
             "railway/rail": {
                 "name": "Rata"
@@ -1910,6 +2122,10 @@
             "shop/florist": {
                 "name": "Kukkakauppa"
             },
+            "shop/funeral_directors": {
+                "name": "Hautaustoimisto",
+                "terms": "hautajaiset, hautajaistoimisto, toimisto, vainaja"
+            },
             "shop/furniture": {
                 "name": "Huonekaluliike"
             },
@@ -1942,6 +2158,10 @@
             "shop/laundry": {
                 "name": "Pesula"
             },
+            "shop/lottery": {
+                "name": "Veikkauspiste",
+                "terms": "lotto, veikkaus, vedonlyönti, lyödä vetoa, jokeri"
+            },
             "shop/mall": {
                 "name": "Kauppakeskus",
                 "terms": "kauppakeskus, ostoskeskus, kauppakeskittymä"
@@ -2001,6 +2221,9 @@
             "shop/video": {
                 "name": "Videovuokraamo"
             },
+            "shop/wine": {
+                "name": "Viinikauppa"
+            },
             "tourism": {
                 "name": "Turismi"
             },

diff --git a/vendor/assets/iD/iD/locales/fr.json b/vendor/assets/iD/iD/locales/fr.json
index 809cf728f94c1682f453aefd93f16677645ceafd..7c60ad3f31dacacf5ed0f32864a78996b360e11f 100644 (file)
--- a/vendor/assets/iD/iD/locales/fr.json
+++ b/vendor/assets/iD/iD/locales/fr.json
@@ -71,7 +71,8 @@
                 "line": "Ligne rendue circulaire.",
                 "area": "Polygone rendu circulaire."
             },
-            "not_closed": "Cet élément ne peut pas être rendu circulaire car il ne boucle pas."
+            "not_closed": "Cet élément ne peut pas être rendu circulaire car il ne boucle pas.",
+            "too_large": "Ceci ne peut pas être transformé en cercle parce qu'une partie n'est pas visible."
         },
         "orthogonalize": {
             "title": "Carré",
@@ -84,7 +85,8 @@
                 "line": "Ligne rendue orthogonale.",
                 "area": "Polygone rendu orthogonal."
             },
-            "not_squarish": "Cela ne peut être fait, ce n'est pas carré."
+            "not_squarish": "Cela ne peut être fait, ce n'est pas carré.",
+            "too_large": "Ceci ne peut pas être transformé en rectangle parce qu'une partie n'est pas visible."
         },
         "straighten": {
             "title": "Rendre droit",
@@ -134,7 +136,8 @@
             "annotation": "Fusionne les {n} lignes.",
             "not_eligible": "Ces éléments ne peuvent pas être fusionnés.",
             "not_adjacent": "Ces lignes ne peuvent pas être fusionnées car elles ne sont pas connectées.",
-            "restriction": "Ces lignes ne peuvent pas être fusionnées car au moins l'une d'entre elles est membre d'une relation \"{relation}\"."
+            "restriction": "Ces lignes ne peuvent pas être fusionnées car au moins l'une d'entre elles est membre d'une relation \"{relation}\".",
+            "incomplete_relation": "Ces éléments ne peuvent pas être fusionnés parce qu'au moins l'un d'entre eux n'a pas été complètement téléchargé."
         },
         "move": {
             "title": "Déplacer",
@@ -264,6 +267,8 @@
         "percent_brightness": "{opacity}% luminosité",
         "none": "Aucun",
         "custom": "Personnalisé",
+        "custom_button": "Modifier le fond personnalisé",
+        "custom_prompt": "Saisir un template d'URL de tuile. Les symboles sont {z}, {x}, {y} pour la structure Z/X/Y et {u} pour la balance des domaines.",
         "fix_misalignment": "Corriger l'alignement",
         "reset": "réinitialiser"
     },
@@ -556,6 +561,9 @@
             "covered": {
                 "label": "Couvert"
             },
+            "crop": {
+                "label": "Culture"
+            },
             "crossing": {
                 "label": "Type"
             },
@@ -591,7 +599,25 @@
                 "label": "Type"
             },
             "fixme": {
-                "label": "Corrigez-Moi"
+                "label": "À corriger"
+            },
+            "fuel": {
+                "label": "Station essence"
+            },
+            "fuel/biodiesel": {
+                "label": "Vente d'agro-carburant"
+            },
+            "fuel/diesel": {
+                "label": "Vente de diesel"
+            },
+            "fuel/e10": {
+                "label": "Vend du E10"
+            },
+            "fuel/e85": {
+                "label": "Vends du E85"
+            },
+            "fuel/lpg": {
+                "label": "Vente de gaz propane"
             },
             "generator/method": {
                 "label": "Méthode"
@@ -616,6 +642,9 @@
             "historic": {
                 "label": "Type"
             },
+            "hoops": {
+                "placeholder": "1, 2, 4..."
+            },
             "iata": {
                 "label": "IATA"
             },
@@ -649,6 +678,9 @@
             "leisure": {
                 "label": "Type"
             },
+            "length": {
+                "label": "Longueur (mètres)"
+            },
             "levels": {
                 "label": "Niveaux",
                 "placeholder": "2, 4, 6..."
@@ -720,12 +752,27 @@
             "place": {
                 "label": "Type"
             },
+            "population": {
+                "label": "Population"
+            },
             "power": {
                 "label": "Type"
             },
             "railway": {
                 "label": "Type"
             },
+            "recycling/cans": {
+                "label": "Accepte les boîtes de conserve"
+            },
+            "recycling/clothes": {
+                "label": "Accepte les vêtements"
+            },
+            "recycling/glass": {
+                "label": "Accepte le verre"
+            },
+            "recycling/paper": {
+                "label": "Accepte le papier"
+            },
             "ref": {
                 "label": "Référence"
             },
@@ -768,12 +815,21 @@
             "shop": {
                 "label": "Type"
             },
+            "smoking": {
+                "label": "Fumeur"
+            },
+            "social_facility_for": {
+                "placeholder": "Sans-abris, handicapés, enfants, etc."
+            },
             "source": {
                 "label": "Source"
             },
             "sport": {
                 "label": "Sport"
             },
+            "sport_ice": {
+                "label": "Sport"
+            },
             "structure": {
                 "label": "Structure",
                 "placeholder": "Inconnu",
@@ -781,7 +837,8 @@
                     "bridge": "Pont",
                     "tunnel": "Tunnel",
                     "embankment": "Remblai",
-                    "cutting": "Tranchée"
+                    "cutting": "Tranchée",
+                    "ford": "Ford"
                 }
             },
             "studio_type": {
@@ -811,6 +868,9 @@
             "tree_type": {
                 "label": "Type"
             },
+            "trees": {
+                "label": "Arbres"
+            },
             "tunnel": {
                 "label": "Tunnel"
             },
@@ -833,8 +893,11 @@
             "wheelchair": {
                 "label": "Accès en fauteuil roulant"
             },
+            "width": {
+                "label": "Largeur (mètres)"
+            },
             "wikipedia": {
-                "label": "Wikipedia"
+                "label": "Wikipédia"
             },
             "wood": {
                 "label": "Type"
@@ -855,7 +918,8 @@
                 "name": "Télésiège"
             },
             "aerialway/gondola": {
-                "name": "Gondole"
+                "name": "Gondole",
+                "terms": "Gondole"
             },
             "aerialway/magic_carpet": {
                 "name": "Bande transporteuse de personnes"
@@ -898,7 +962,7 @@
             },
             "aeroway/helipad": {
                 "name": "Héliport",
-                "terms": "Hélipad"
+                "terms": "Hélipad, Héliport"
             },
             "aeroway/runway": {
                 "name": "Piste d’atterrissage",
@@ -913,7 +977,7 @@
                 "terms": "Terminal, Terminal Aéroportuaire"
             },
             "amenity": {
-                "name": "Équipements",
+                "name": "Équipement",
                 "terms": "Commodité"
             },
             "amenity/arts_centre": {
@@ -932,6 +996,9 @@
                 "name": "Bar",
                 "terms": "Bar"
             },
+            "amenity/bbq": {
+                "name": "Barbecue/Grill"
+            },
             "amenity/bench": {
                 "name": "Banc",
                 "terms": "Banc"
@@ -984,6 +1051,10 @@
                 "name": "Enseignement supérieur (non universitaire)",
                 "terms": "Institut, École supérieure, Enseignement supérieur, Haute école, CÉGEP, cégep"
             },
+            "amenity/compressed_air": {
+                "name": "Air comprimé",
+                "terms": "Air comprimé"
+            },
             "amenity/courthouse": {
                 "name": "Tribunal",
                 "terms": "Palais de Justice, Tribunal"
@@ -1024,6 +1095,9 @@
                 "name": "Cimetière",
                 "terms": "Cimetière"
             },
+            "amenity/hospital": {
+                "name": "Terrain d'hôpital"
+            },
             "amenity/library": {
                 "name": "Bibliothèque",
                 "terms": "Bibliothèque, Librairie"
@@ -1032,6 +1106,10 @@
                 "name": "Place de marché",
                 "terms": "Marché"
             },
+            "amenity/nightclub": {
+                "name": "Boite de nuit",
+                "terms": "Boîte de nuit"
+            },
             "amenity/parking": {
                 "name": "Parc de stationnement",
                 "terms": "Parc de stationnement, parking"
@@ -1088,10 +1166,17 @@
                 "name": "Restaurant",
                 "terms": "Restaurant"
             },
+            "amenity/school": {
+                "name": "Terrain d'école"
+            },
             "amenity/shelter": {
                 "name": "Abri",
                 "terms": "Abri"
             },
+            "amenity/social_facility/food_bank": {
+                "name": "Banque alimentaire",
+                "terms": "Banque alimentaire"
+            },
             "amenity/studio": {
                 "name": "Studio"
             },
@@ -1108,7 +1193,7 @@
                 "terms": "Téléphone"
             },
             "amenity/theatre": {
-                "name": "Théatre",
+                "name": "Théâtre",
                 "terms": "Théâtre"
             },
             "amenity/toilets": {
@@ -1189,7 +1274,7 @@
             },
             "barrier/lift_gate": {
                 "name": "Barrière levante",
-                "terms": "Hayon"
+                "terms": "Barrière relevable"
             },
             "barrier/retaining_wall": {
                 "name": "Mur de soutènement",
@@ -1219,32 +1304,55 @@
                 "name": "Résidence",
                 "terms": "Appartements"
             },
+            "building/barn": {
+                "name": "Hangar agricole",
+                "terms": "Hangar agricole, Grange"
+            },
+            "building/bunker": {
+                "name": "Bunker",
+                "terms": "Casemate, Blockhaus, Bunker"
+            },
             "building/cathedral": {
-                "name": "Cathédrale"
+                "name": "Cathédrale",
+                "terms": "Cathédrale"
             },
             "building/chapel": {
-                "name": "Chapelle"
+                "name": "Chapelle",
+                "terms": "Chapelle"
             },
             "building/church": {
-                "name": "Église"
+                "name": "Église",
+                "terms": "Église"
             },
             "building/commercial": {
                 "name": "Bâtiment commercial",
                 "terms": "Bâtiment commercial"
             },
-            "building/entrance": {
-                "name": "Entrée",
-                "terms": "Entrée"
+            "building/construction": {
+                "name": "Bâtiment en construction",
+                "terms": "Bâtiment en construction, Chantier"
+            },
+            "building/dormitory": {
+                "name": "Dortoir"
             },
             "building/garage": {
                 "name": "Garage",
                 "terms": "Garage"
             },
+            "building/garages": {
+                "name": "Garages",
+                "terms": "Garages, Parc de stationnement couvert"
+            },
             "building/greenhouse": {
                 "name": "Serre"
             },
+            "building/hospital": {
+                "name": "Hôpital ",
+                "terms": "Hôpital, Clinique"
+            },
             "building/hotel": {
-                "name": "Hôtel"
+                "name": "Hôtel",
+                "terms": "Hôtel"
             },
             "building/house": {
                 "name": "Maison",
@@ -1259,26 +1367,45 @@
                 "terms": "Bâtiment industriel"
             },
             "building/public": {
-                "name": "Établissement public"
+                "name": "Établissement public",
+                "terms": "Bâtiment public"
             },
             "building/residential": {
                 "name": "Bâtiment résidentiel",
                 "terms": "Bâtiment résidentiel"
             },
+            "building/roof": {
+                "name": "Voûte",
+                "terms": "voûte, toit, marché couvert"
+            },
             "building/school": {
                 "name": "Bâtiment d'enseignement"
             },
             "building/stable": {
-                "name": "Étable"
+                "name": "Étable",
+                "terms": "Étable"
             },
             "building/train_station": {
-                "name": "Gare ferroviaire"
+                "name": "Gare ferroviaire",
+                "terms": "Gare, Station, Arrêt"
             },
             "building/university": {
                 "name": "Université"
             },
+            "building/warehouse": {
+                "name": "Entrepôt",
+                "terms": "Entrepôt, magasin, abri, dépôt, docks, hangar"
+            },
+            "craft/basket_maker": {
+                "name": "Vannier"
+            },
+            "craft/beekeeper": {
+                "name": "Apiculteur",
+                "terms": "Apiculteur"
+            },
             "craft/blacksmith": {
-                "name": "Forgeron"
+                "name": "Forgeron",
+                "terms": "Forgeron"
             },
             "craft/boatbuilder": {
                 "name": "Constructeur de bateaux",
@@ -1291,13 +1418,15 @@
                 "name": "Brasserie"
             },
             "craft/carpenter": {
-                "name": "Charpentier"
+                "name": "Charpentier",
+                "terms": "Charpentier"
             },
             "craft/caterer": {
                 "name": "Traiteur"
             },
             "craft/clockmaker": {
-                "name": "Horloger"
+                "name": "Horloger",
+                "terms": "Horloger, Horlogerie"
             },
             "craft/confectionary": {
                 "name": "Confiserie"
@@ -1339,10 +1468,18 @@
                 "name": "Opticien",
                 "terms": "Opticien"
             },
+            "craft/painter": {
+                "name": "Peintre",
+                "terms": "Peintre"
+            },
             "craft/photographer": {
                 "name": "Photographe",
                 "terms": "Photographe"
             },
+            "craft/photographic_laboratory": {
+                "name": "Laboratoire photographique",
+                "terms": "Laboratoire photographique, Laboratoire de développement"
+            },
             "craft/plasterer": {
                 "name": "Plâtrier"
             },
@@ -1351,10 +1488,12 @@
                 "terms": "Plombier"
             },
             "craft/pottery": {
-                "name": "Pottier"
+                "name": "Pottier",
+                "terms": "Potier"
             },
             "craft/roofer": {
-                "name": "Couvreur"
+                "name": "Couvreur",
+                "terms": "Couvreur"
             },
             "craft/saddler": {
                 "name": "Sellier"
@@ -1367,10 +1506,12 @@
                 "name": "Scierie"
             },
             "craft/sculpter": {
-                "name": "Sculpteur"
+                "name": "Sculpteur",
+                "terms": "Sculpteur"
             },
             "craft/shoemaker": {
-                "name": "Cordonnier"
+                "name": "Cordonnier",
+                "terms": "Bottier, Cordonnier"
             },
             "craft/stonemason": {
                 "name": "Tailleur de pierre"
@@ -1409,8 +1550,7 @@
                 "terms": "Téléphone d'urgence"
             },
             "entrance": {
-                "name": "Entrée",
-                "terms": "Entrée"
+                "name": "Entrée/Sortie"
             },
             "footway/crossing": {
                 "name": "Passage pieton ",
@@ -1420,19 +1560,27 @@
                 "name": "Trottoir",
                 "terms": "Trottoir"
             },
+            "ford": {
+                "name": "Ford"
+            },
             "golf/bunker": {
-                "name": "Bunker"
+                "name": "Bunker",
+                "terms": "Bunker"
             },
             "golf/fairway": {
                 "name": "Allée (golf)"
             },
+            "golf/green": {
+                "name": "Green",
+                "terms": "Green"
+            },
             "golf/hole": {
                 "name": "Trou de golf",
                 "terms": "Trou de golf"
             },
             "highway": {
                 "name": "Route",
-                "terms": "Autoroute"
+                "terms": "Autoroute, Voie rapide"
             },
             "highway/bridleway": {
                 "name": "Sentier équestre",
@@ -1452,7 +1600,7 @@
             },
             "highway/footway": {
                 "name": "Voie piétonne",
-                "terms": "Chemin piétonnier"
+                "terms": "Chemin piétonnier, Sentier"
             },
             "highway/living_street": {
                 "name": "Zone de rencontre",
@@ -1464,7 +1612,7 @@
             },
             "highway/motorway": {
                 "name": "Autoroute",
-                "terms": "Autoroute"
+                "terms": "Autoroute, Voie rapide"
             },
             "highway/motorway_junction": {
                 "name": "Bretelle d'autoroute",
@@ -1495,7 +1643,8 @@
                 "terms": "Route résidentielle"
             },
             "highway/rest_area": {
-                "name": "Aire de repos"
+                "name": "Aire de repos",
+                "terms": "Aire de repos, Aire de service"
             },
             "highway/road": {
                 "name": "Voie de type inconnu",
@@ -1519,7 +1668,7 @@
             },
             "highway/service/drive-through": {
                 "name": "Drive In",
-                "terms": "Service au comptoir"
+                "terms": "Service au comptoir, Drive-in"
             },
             "highway/service/driveway": {
                 "name": "Allée",
@@ -1555,11 +1704,11 @@
             },
             "highway/track": {
                 "name": "Piste carrossable",
-                "terms": "Piste"
+                "terms": "Piste, Chemin carrossable"
             },
             "highway/traffic_signals": {
                 "name": "Feux tricolores",
-                "terms": "Feux de circulation, Feux rouges, Lumière rouge"
+                "terms": "Feux de circulation, Feux tricolores, Feux rouges"
             },
             "highway/trunk": {
                 "name": "Voie rapide",
@@ -1665,6 +1814,9 @@
                 "name": "Prairie",
                 "terms": "Prairie"
             },
+            "landuse/military": {
+                "name": "Militaire"
+            },
             "landuse/orchard": {
                 "name": "Verger",
                 "terms": "Verger"
@@ -1705,6 +1857,9 @@
                 "name": "Parcours de golf",
                 "terms": "Golf, Terrain de golf, Parcours de golf"
             },
+            "leisure/ice_rink": {
+                "name": "Patinoire"
+            },
             "leisure/marina": {
                 "name": "Marina",
                 "terms": "Marina"
@@ -1713,6 +1868,10 @@
                 "name": "Parc",
                 "terms": "Parc"
             },
+            "leisure/picnic_table": {
+                "name": "Table de pique-nique",
+                "terms": "Table de pique-nique"
+            },
             "leisure/pitch": {
                 "name": "Terrain de sport",
                 "terms": "Terrain de sport"
@@ -1841,7 +2000,7 @@
             },
             "military/bunker": {
                 "name": "Bunker",
-                "terms": "casemate, blockhaus"
+                "terms": "casemate, blockhaus, bunker"
             },
             "military/range": {
                 "name": "Stand de tir"
@@ -1912,7 +2071,7 @@
             },
             "natural/water/pond": {
                 "name": "Étang",
-                "terms": "Etang, Mare"
+                "terms": "Étang, Mare"
             },
             "natural/water/reservoir": {
                 "name": "Bassin de retenue",
@@ -2011,7 +2170,8 @@
                 "terms": "Agence de voyage"
             },
             "piste": {
-                "name": "Piste de ski"
+                "name": "Piste de ski",
+                "terms": "Piste de ski"
             },
             "place": {
                 "name": "Toponymie",
@@ -2037,6 +2197,9 @@
                 "name": "Lieu-dit",
                 "terms": "Localité"
             },
+            "place/neighbourhood": {
+                "name": "Voisinage"
+            },
             "place/town": {
                 "name": "Ville (10.000-100.000 habitants)",
                 "terms": "Ville"
@@ -2114,6 +2277,9 @@
                 "name": "Monorail",
                 "terms": "Monorail"
             },
+            "railway/narrow_gauge": {
+                "name": "Voie étroite"
+            },
             "railway/platform": {
                 "name": "Quai de gare",
                 "terms": "Quai de gare"
@@ -2154,6 +2320,9 @@
                 "name": "Magasin de vente d'alcool",
                 "terms": "Cave, Caviste, Magasin de vin, Vins & Spiritueux"
             },
+            "shop/art": {
+                "name": "Magasin d'art"
+            },
             "shop/bakery": {
                 "name": "Boulangerie",
                 "terms": "Boulangerie"
@@ -2246,6 +2415,10 @@
                 "name": "Fleuriste",
                 "terms": "Fleuriste"
             },
+            "shop/funeral_directors": {
+                "name": "Funérarium",
+                "terms": "Funérarium, Maison funéraire"
+            },
             "shop/furniture": {
                 "name": "Magasin de meubles",
                 "terms": "Magasin de meubles"
@@ -2290,6 +2463,9 @@
                 "name": "Serrurier",
                 "terms": "Serrurier"
             },
+            "shop/lottery": {
+                "name": "Loterie"
+            },
             "shop/mall": {
                 "name": "Centre commercial",
                 "terms": "Centre d'achat"
@@ -2366,6 +2542,10 @@
                 "name": "Vidéo-club",
                 "terms": "Club vidéo"
             },
+            "shop/wine": {
+                "name": "Caviste",
+                "terms": "Caviste, Chai, Bar à vins"
+            },
             "tourism": {
                 "name": "Tourisme",
                 "terms": "Tourisme"
@@ -2455,19 +2635,19 @@
                 "terms": "Route, rue, chemin, sentier"
             },
             "type/route/bicycle": {
-                "name": "Trajet Cyclable",
+                "name": "Trajet cyclable",
                 "terms": "Piste cyclable"
             },
             "type/route/bus": {
-                "name": "Trajet de Bus",
+                "name": "Trajet de bus",
                 "terms": "Trajet d'autobus"
             },
             "type/route/detour": {
-                "name": "Trajet de Contournement",
+                "name": "Déviation",
                 "terms": "Détour"
             },
             "type/route/ferry": {
-                "name": "Trajet de Ferry",
+                "name": "Trajet de ferry",
                 "terms": "Route de traversier, Ligne de ferry"
             },
             "type/route/foot": {
@@ -2535,7 +2715,7 @@
                 "terms": "Berge"
             },
             "waterway/stream": {
-                "name": "Cours d'eau étroit",
+                "name": "Ruisseau",
                 "terms": "Ruisseau"
             },
             "waterway/weir": {

diff --git a/vendor/assets/iD/iD/locales/gl.json b/vendor/assets/iD/iD/locales/gl.json
index 466b27eade58f2b78dd9c4e9cf54364f9ca1025d..9f5707074c9f77b3ed121ad8d0f6eb47e6725923 100644 (file)
--- a/vendor/assets/iD/iD/locales/gl.json
+++ b/vendor/assets/iD/iD/locales/gl.json
@@ -305,7 +305,9 @@
         "start": "Editar agora"
     },
     "source_switch": {
-        "lose_changes": "Tes cambios sen gardar. Se cambias o servidor do mapa, descartaranse. Estás seguro de que queres cambiar o servidor?"
+        "live": "en línea",
+        "lose_changes": "Tes cambios sen gardar. Se cambias o servidor do mapa, descartaranse. Estás seguro de que queres cambiar o servidor?",
+        "dev": "desenvolvemento"
     },
     "tag_reference": {
         "description": "Descrición",
@@ -419,7 +421,7 @@
                 "types": {
                     "access": "Xeral",
                     "foot": "A pé",
-                    "motor_vehicle": "Automóviles",
+                    "motor_vehicle": "Automóbiles",
                     "bicycle": "Bicicletas",
                     "horse": "Cabalos"
                 },
@@ -455,9 +457,13 @@
                 "placeholders": {
                     "number": "123",
                     "street": "Rúa",
-                    "city": "Cidade"
+                    "city": "Cidade",
+                    "postcode": "Código postal"
                 }
             },
+            "admin_level": {
+                "label": "Nivel administrativo"
+            },
             "aeroway": {
                 "label": "Tipo"
             },
@@ -483,7 +489,18 @@
                 "label": "Edificio"
             },
             "capacity": {
-                "label": "Capacidade"
+                "label": "Capacidade",
+                "placeholder": "50, 100, 200..."
+            },
+            "cardinal_direction": {
+                "label": "Sentido"
+            },
+            "clock_direction": {
+                "label": "Sentido",
+                "options": {
+                    "clockwise": "Sentido horario",
+                    "anticlockwise": "Sentido antihorario"
+                }
             },
             "collection_times": {
                 "label": "Horario de recollida"
@@ -519,7 +536,8 @@
                 "label": "Tipo"
             },
             "fax": {
-                "label": "Fax"
+                "label": "Fax",
+                "placeholder": "+34 989 12 34 56"
             },
             "fee": {
                 "label": "Tarifa"
@@ -547,6 +565,10 @@
             "landuse": {
                 "label": "Tipo"
             },
+            "lanes": {
+                "label": "Carrís",
+                "placeholder": "1, 2, 3..."
+            },
             "layer": {
                 "label": "Capa"
             },
@@ -554,7 +576,8 @@
                 "label": "Tipo"
             },
             "levels": {
-                "label": "Niveis"
+                "label": "Niveis",
+                "placeholder": "2, 4, 6..."
             },
             "lit": {
                 "label": "Iluminado"
@@ -566,7 +589,8 @@
                 "label": "Tipo"
             },
             "maxspeed": {
-                "label": "Límite de velocidade"
+                "label": "Límite de velocidade",
+                "placeholder": "40, 50, 60..."
             },
             "name": {
                 "label": "Nome",
@@ -600,7 +624,8 @@
                 "label": "Tipo"
             },
             "phone": {
-                "label": "Teléfono"
+                "label": "Teléfono",
+                "placeholder": "+34 989 12 34 56"
             },
             "place": {
                 "label": "Tipo"
@@ -638,6 +663,9 @@
             "route_master": {
                 "label": "Tipo"
             },
+            "sac_scale": {
+                "label": "Dificultade do sendeiro"
+            },
             "service": {
                 "label": "Tipo"
             },
@@ -663,15 +691,24 @@
                     "cutting": "Desmonte"
                 }
             },
+            "supervised": {
+                "label": "Vixiado"
+            },
             "surface": {
                 "label": "Superficie"
             },
             "tourism": {
                 "label": "Tipo"
             },
+            "towertype": {
+                "label": "Tipo de torre"
+            },
             "tracktype": {
                 "label": "Tipo"
             },
+            "trail_visibility": {
+                "label": "Visibilidade do sendeiro"
+            },
             "water": {
                 "label": "Tipo"
             },
@@ -679,7 +716,8 @@
                 "label": "Tipo"
             },
             "website": {
-                "label": "Páxina web"
+                "label": "Sitio web",
+                "placeholder": "http://exemplo.com/"
             },
             "wetland": {
                 "label": "Tipo"
@@ -702,10 +740,12 @@
                 "name": "Vía aérea"
             },
             "aeroway/aerodrome": {
-                "name": "Aeroporto"
+                "name": "Aeroporto",
+                "terms": "aeroporto, avión, aeródromo, terminal"
             },
             "aeroway/helipad": {
-                "name": "Heliporto"
+                "name": "Heliporto",
+                "terms": "heliporto, helicóptero"
             },
             "amenity": {
                 "name": "Instalacións"
@@ -714,7 +754,8 @@
                 "name": "Caixeiro automático"
             },
             "amenity/bank": {
-                "name": "Banco"
+                "name": "Banco",
+                "terms": "banco, caixa, entidade financeira"
             },
             "amenity/bar": {
                 "name": "Bar"
@@ -729,7 +770,14 @@
                 "name": "Alugamento de Bicicletas"
             },
             "amenity/cafe": {
-                "name": "Cafetería"
+                "name": "Cafetería",
+                "terms": "cafetería, café, bar"
+            },
+            "amenity/car_rental": {
+                "name": "Aluguer de automóbiles"
+            },
+            "amenity/car_wash": {
+                "name": "Lavado de automóbiles"
             },
             "amenity/cinema": {
                 "name": "Cine"
@@ -761,6 +809,9 @@
             "amenity/hospital": {
                 "name": "Hospital"
             },
+            "amenity/kindergarten": {
+                "name": "Gardería"
+            },
             "amenity/library": {
                 "name": "Biblioteca"
             },
@@ -774,10 +825,12 @@
                 "name": "Farmacia"
             },
             "amenity/place_of_worship": {
-                "name": "Lugar de Culto"
+                "name": "Lugar de Culto",
+                "terms": "lugar de culto, igrexa, templo, capela, basílica, parroquia, santuario, ermida, catedral, sinagoga, mesquita"
             },
             "amenity/place_of_worship/christian": {
-                "name": "Igrexa"
+                "name": "Igrexa",
+                "terms": "igrexa, capela, parroquia, templo, ermida, santuario"
             },
             "amenity/place_of_worship/jewish": {
                 "name": "Sinagoga"
@@ -786,10 +839,12 @@
                 "name": "Mesquita"
             },
             "amenity/police": {
-                "name": "Policía"
+                "name": "Policía",
+                "terms": "policía, comisaría, cuartel, policía local, policía nacional, garda civil, forzas de seguridade"
             },
             "amenity/post_box": {
-                "name": "Caixa do correo"
+                "name": "Caixa do correo",
+                "terms": "correo, buzón, correos, mensaxería, postal"
             },
             "amenity/post_office": {
                 "name": "Oficina de Correos"
@@ -798,10 +853,12 @@
                 "name": "Pub"
             },
             "amenity/restaurant": {
-                "name": "Restaurante"
+                "name": "Restaurante",
+                "terms": "restaurante, mesón, taberna, comedor, comida, comer, xantar, cear, menú"
             },
             "amenity/school": {
-                "name": "Escola"
+                "name": "Escola",
+                "terms": "escola, colexio, instituto, educación, ensinanza, primaria, secundaria, ESO, bacharelato"
             },
             "amenity/swimming_pool": {
                 "name": "Piscina"
@@ -813,16 +870,18 @@
                 "name": "Teatro"
             },
             "amenity/toilets": {
-                "name": "Servicios"
+                "name": "Aseos"
             },
             "amenity/townhall": {
-                "name": "Casa do Concello"
+                "name": "Casa do Concello",
+                "terms": "casa do concello, concello, ayuntamiento, municipal"
             },
             "amenity/university": {
                 "name": "Universidade"
             },
             "amenity/waste_basket": {
-                "name": "Papeleira"
+                "name": "Papeleira",
+                "terms": "papeleira, lixo, basura"
             },
             "area": {
                 "name": "Área"
@@ -834,7 +893,7 @@
                 "name": "Bloque"
             },
             "barrier/bollard": {
-                "name": "Poste"
+                "name": "Bolardo"
             },
             "barrier/city_wall": {
                 "name": "Muralla"
@@ -860,26 +919,52 @@
             "barrier/wall": {
                 "name": "Muro"
             },
+            "boundary/administrative": {
+                "name": "Límite administrativo"
+            },
             "building": {
                 "name": "Edificio"
             },
-            "building/entrance": {
-                "name": "Entrada"
+            "building/cathedral": {
+                "name": "Catedral"
             },
-            "entrance": {
-                "name": "Entrada"
+            "building/chapel": {
+                "name": "Capela"
+            },
+            "building/church": {
+                "name": "Igrexa"
+            },
+            "building/construction": {
+                "name": "Edificio en construcción"
+            },
+            "building/garage": {
+                "name": "Garaxe"
+            },
+            "building/house": {
+                "name": "Casa"
+            },
+            "building/hut": {
+                "name": "Refuxio"
+            },
+            "emergency/phone": {
+                "name": "Teléfono de emerxencia"
+            },
+            "footway/sidewalk": {
+                "name": "Beirarrúa"
             },
             "highway": {
                 "name": "Estrada"
             },
             "highway/bridleway": {
-                "name": "Camiño cabalar"
+                "name": "Camiño de ferradura",
+                "terms": "camiño de ferradura, camiño de cabalos, senda ecuestre"
             },
             "highway/bus_stop": {
                 "name": "Parada de Autobús"
             },
             "highway/crossing": {
-                "name": "Paso de peóns"
+                "name": "Paso de peóns",
+                "terms": "paso peonil, paso peatonal, paso de cebra"
             },
             "highway/cycleway": {
                 "name": "Senda Ciclista"
@@ -894,19 +979,20 @@
                 "name": "Autovía"
             },
             "highway/motorway_link": {
-                "name": "Enlace de autovía"
+                "name": "Enlace de autovía",
+                "terms": "autovía, autopista, enlace, entrada, saída, acceso"
             },
             "highway/path": {
                 "name": "Camiño"
             },
             "highway/pedestrian": {
-                "name": "Vía peonil"
+                "name": "Rúa peonil"
             },
             "highway/primary": {
                 "name": "Estrada Primaria"
             },
             "highway/primary_link": {
-                "name": "Enlace de estrada primaria"
+                "name": "Enlace a estrada primaria"
             },
             "highway/residential": {
                 "name": "Rúa urbana"
@@ -918,7 +1004,7 @@
                 "name": "Estrada Secundaria"
             },
             "highway/secondary_link": {
-                "name": "Enlace de estrada secundaria"
+                "name": "Enlace a estrada secundaria"
             },
             "highway/service": {
                 "name": "Vía de Servicio"
@@ -930,7 +1016,7 @@
                 "name": "Estrada Terciaria"
             },
             "highway/tertiary_link": {
-                "name": "Enlace de estrada terciaria"
+                "name": "Enlace a estrada terciaria"
             },
             "highway/track": {
                 "name": "Pista"
@@ -942,7 +1028,7 @@
                 "name": "Estrada Troncal"
             },
             "highway/trunk_link": {
-                "name": "Enlace de estrada troncal"
+                "name": "Enlace a estrada troncal"
             },
             "highway/turning_circle": {
                 "name": "Círculo de Xiro"
@@ -956,6 +1042,10 @@
             "historic/archaeological_site": {
                 "name": "Sitio arqueolóxico"
             },
+            "historic/boundary_stone": {
+                "name": "Marco",
+                "terms": "marco, fito, mollón, mouteira, linde, pedra"
+            },
             "historic/castle": {
                 "name": "Castelo"
             },
@@ -999,7 +1089,7 @@
                 "name": "Granxa"
             },
             "landuse/forest": {
-                "name": "Bosque"
+                "name": "Forestal"
             },
             "landuse/grass": {
                 "name": "Herba"
@@ -1032,7 +1122,8 @@
                 "name": "Campo de Golf"
             },
             "leisure/park": {
-                "name": "Parque"
+                "name": "Parque",
+                "terms": "parque, zona verde, xardín, alameda"
             },
             "leisure/pitch": {
                 "name": "Campo Deportivo"
@@ -1052,6 +1143,9 @@
             "leisure/pitch/tennis": {
                 "name": "Cancha de Tenis"
             },
+            "leisure/pitch/volleyball": {
+                "name": "Cancha de voleibol"
+            },
             "leisure/playground": {
                 "name": "Parque Infantil"
             },
@@ -1076,12 +1170,18 @@
             "man_made/pier": {
                 "name": "Embarcadoiro"
             },
+            "man_made/pipeline": {
+                "name": "Tubería"
+            },
             "man_made/survey_point": {
                 "name": "Vértice Xeodésico"
             },
             "man_made/tower": {
                 "name": "Torre"
             },
+            "man_made/wastewater_plant": {
+                "name": "Depuradora de augas"
+            },
             "man_made/water_tower": {
                 "name": "Torre de auga"
             },
@@ -1101,7 +1201,8 @@
                 "name": "Cantil"
             },
             "natural/coastline": {
-                "name": "Liña de costa"
+                "name": "Liña de costa",
+                "terms": "liña de costa, costa, litoral, ribeira"
             },
             "natural/glacier": {
                 "name": "Glaciar"
@@ -1113,7 +1214,8 @@
                 "name": "Páramo"
             },
             "natural/peak": {
-                "name": "Cume"
+                "name": "Cume",
+                "terms": "pico, cume, montaña, monte, cúspide"
             },
             "natural/scrub": {
                 "name": "Matogueira"
@@ -1128,10 +1230,12 @@
                 "name": "Auga"
             },
             "natural/water/lake": {
-                "name": "Lago"
+                "name": "Lago",
+                "terms": "lago, lagoa, charca, auga"
             },
             "natural/water/pond": {
-                "name": "Estanque"
+                "name": "Estanque",
+                "terms": "auga, estanque, lagoa, charca"
             },
             "natural/water/reservoir": {
                 "name": "Encoro"
@@ -1149,13 +1253,14 @@
                 "name": "Lugar"
             },
             "place/city": {
-                "name": "Capital"
+                "name": "Cidade"
             },
             "place/hamlet": {
                 "name": "Aldea"
             },
             "place/island": {
-                "name": "Illa"
+                "name": "Illa",
+                "terms": "illa, isla, illote, insua"
             },
             "place/isolated_dwelling": {
                 "name": "Vivenda illada"
@@ -1175,15 +1280,42 @@
             "power": {
                 "name": "Rede eléctrica"
             },
+            "power/generator": {
+                "name": "Xerador de enerxía"
+            },
+            "power/line": {
+                "name": "Liña de alta tensión"
+            },
+            "power/pole": {
+                "name": "Poste eléctrico"
+            },
             "power/sub_station": {
                 "name": "Subestación"
             },
+            "power/tower": {
+                "name": "Torre de alta tensión"
+            },
+            "power/transformer": {
+                "name": "Transformador"
+            },
             "railway": {
                 "name": "Ferrocarril"
             },
+            "railway/abandoned": {
+                "name": "Ferrocarril abandonado"
+            },
+            "railway/disused": {
+                "name": "Ferrocarril en desuso"
+            },
             "railway/level_crossing": {
                 "name": "Paso a nivel"
             },
+            "railway/monorail": {
+                "name": "Monorraíl"
+            },
+            "railway/platform": {
+                "name": "Plataforma"
+            },
             "railway/rail": {
                 "name": "Vía de tren"
             },
@@ -1196,6 +1328,9 @@
             "railway/subway_entrance": {
                 "name": "Entrada de Metro"
             },
+            "railway/tram": {
+                "name": "Tranvía"
+            },
             "relation": {
                 "name": "Relación"
             },
@@ -1208,15 +1343,105 @@
             "shop/beauty": {
                 "name": "Salón de beleza"
             },
+            "shop/bicycle": {
+                "name": "Tenda de bicicletas"
+            },
             "shop/books": {
                 "name": "Librería"
             },
             "shop/butcher": {
                 "name": "Carnicería"
             },
+            "shop/car": {
+                "name": "Concesionario"
+            },
+            "shop/car_parts": {
+                "name": "Tenda de recambios de automóbiles"
+            },
+            "shop/car_repair": {
+                "name": "Taller de reparación de vehículos"
+            },
+            "shop/chemist": {
+                "name": "Droguería"
+            },
+            "shop/clothes": {
+                "name": "Tenda de roupa"
+            },
+            "shop/computer": {
+                "name": "Tenda de informática"
+            },
+            "shop/electronics": {
+                "name": "Tenda de electrodomésticos"
+            },
+            "shop/florist": {
+                "name": "Florería"
+            },
+            "shop/furniture": {
+                "name": "Tenda de mobles"
+            },
+            "shop/garden_centre": {
+                "name": "Centro de xardinería"
+            },
+            "shop/greengrocer": {
+                "name": "Froitería"
+            },
+            "shop/hairdresser": {
+                "name": "Perruquería"
+            },
+            "shop/hardware": {
+                "name": "Ferretería"
+            },
+            "shop/jewelry": {
+                "name": "Xoiería"
+            },
+            "shop/kiosk": {
+                "name": "Quiosco"
+            },
+            "shop/laundry": {
+                "name": "Lavandería"
+            },
+            "shop/mall": {
+                "name": "Centro comercial"
+            },
+            "shop/mobile_phone": {
+                "name": "Tenda de telefonía móvil"
+            },
+            "shop/motorcycle": {
+                "name": "Concesionario de motocicletas"
+            },
+            "shop/music": {
+                "name": "Tenda de música"
+            },
+            "shop/optician": {
+                "name": "Óptica"
+            },
+            "shop/pet": {
+                "name": "Tenda de mascotas"
+            },
+            "shop/shoes": {
+                "name": "Zapatería"
+            },
+            "shop/stationery": {
+                "name": "Papelería"
+            },
             "shop/supermarket": {
                 "name": "Supermercado"
             },
+            "shop/toys": {
+                "name": "Tenda de xoguetes"
+            },
+            "shop/travel_agency": {
+                "name": "Axencia de viaxes"
+            },
+            "shop/tyres": {
+                "name": "Tenda de neumáticos"
+            },
+            "shop/vacant": {
+                "name": "Local baleiro"
+            },
+            "shop/video": {
+                "name": "Videoclub"
+            },
             "tourism": {
                 "name": "Turismo"
             },
@@ -1239,7 +1464,8 @@
                 "name": "Chalé"
             },
             "tourism/guest_house": {
-                "name": "Hostal"
+                "name": "Hostal",
+                "terms": "hostal, pensión, hospedaxe, fonda, pousada, aloxamento, habitación"
             },
             "tourism/hostel": {
                 "name": "Albergue"
@@ -1271,12 +1497,24 @@
             "type/boundary": {
                 "name": "Límite"
             },
+            "type/boundary/administrative": {
+                "name": "Límite administrativo"
+            },
             "type/restriction": {
                 "name": "Restrición"
             },
             "type/route": {
                 "name": "Ruta"
             },
+            "type/route/bicycle": {
+                "name": "Ruta ciclista"
+            },
+            "type/route/bus": {
+                "name": "Ruta de autobús"
+            },
+            "vertex": {
+                "name": "Outro"
+            },
             "waterway": {
                 "name": "Vía de Auga"
             },
@@ -1293,13 +1531,15 @@
                 "name": "Cuneta"
             },
             "waterway/river": {
-                "name": "Río"
+                "name": "Río",
+                "terms": "río, regato, afluente, auga"
             },
             "waterway/riverbank": {
                 "name": "Ribeira do río"
             },
             "waterway/stream": {
-                "name": "Regato"
+                "name": "Regato",
+                "terms": "río, regato, rego, torrente, auga"
             },
             "waterway/weir": {
                 "name": "Presa"

diff --git a/vendor/assets/iD/iD/locales/hr.json b/vendor/assets/iD/iD/locales/hr.json
index 85c681b18bd3f19198723a6b7f7a0455f419f0c1..0a756bffce9c9077d994c0893238a824c6b402db 100644 (file)
--- a/vendor/assets/iD/iD/locales/hr.json
+++ b/vendor/assets/iD/iD/locales/hr.json
@@ -77,8 +77,8 @@
         "orthogonalize": {
             "title": "Stavi pod pravi kut",
             "description": {
-                "line": "Stavi pod pravi kut uglove linije.",
-                "area": "Stavi pod pravi kut uglove područja."
+                "line": "Stavi pod pravi kut lomove linije.",
+                "area": "Stavi pod pravi kut ćoškove područja."
             },
             "key": "S",
             "annotation": {
@@ -339,11 +339,11 @@
         "help": "# Pomoć\n\niD je program za uređivanje [OpenStreetMap](http://www.openstreetmap.org/), \nbesplatne karte svijeta. Možeš ga koristiti za dodavanje i obnavljanje podataka u \nsvom području, čime stvaraš bolju kartu svijeta slobodnih izvornika i podataka \ndostupnu svima.\n\nKorekcije koje napraviš na karti će biti vidljive svakome tko koristi\nOpenStreetMap. Da bi mogao/la uređivati kartu, trebaš [besplatni\nOpenStreetMap korisnički račun](https://www.openstreetmap.org/user/new).\n\n[iD editor](http://ideditor.com/) je suradnički projekt sa [izvornim kôdom dostupnim \nna GitHub-u](https://github.com/openstreetmap/iD).\n",
         "editing_saving": "# Uređivanje i spremanje promjena\n\nOvaj uređivač je primarno dizajniran za uređivanje na mreži i trenutačno ga\nkoristiš kroz internet preglednik kao web stranicu.\n\n### Odabir značajki\n\nZa odabir značajke karte, npr. ceste ili točke od interesa, klikni na nju na karti.\nPojaviti će se obrub oko značajke, otvoriti će se bočno okno koje prikazuje više\ndetalja o značajki i prikazati će se alatni izbornik sa mogućnostima koje možeš\nnapraviti na značajki.\n\nZa odabir nekoliko značajki istovremeno, drži tipku \"Shift\". Zatim ili klikni na\nznačajke koje želiš odabrati ili klikni i povuci za crtanje četverokuta. Time ćeš\nodabrati sve točke unutar četverokuta.\n\n### Spremanje uređivanja\n\nKada napraviš promjene na karti, npr. urediš ulice, zgrade i mjesta, one su\nspremljene lokalno sve dok ih ne spremiš na server. Nemoraš se briniti ukoliko\nnapraviš pogrešku - možeš poništiti promjene klikom na tipku \"Opovrgni\" i\nponoviti promjene klikom na tipku \"Ponovi\".\n\nKlikni na tipku \"Spremi\" da završiš grupu promjena - na primjer ako si završio/la\npodručje grada i želiš početi uređivati novo područje. Nakon što stisneš \"Spremi\"\nmoći ćeš pregledati sve promjene koje si napravio/la i uređivač će ti dati korisne\nprijedloge i upozorenja ako je nešto neuobičajeno među promjenama.\n\nAko je sve u redu, možeš ostaviti kratak komentar u kojem ćeš opisati napravljenu\npromjenu na karti. Ponovno klikni \"Spremi\" za postavljanje promjena na\n[OpenStreetMap.org](http://www.openstreetmap.org/), gdje će biti vidljive svim\ndrugim korisnicima i dostupne drugima za dopunu i nadogradnju.\n\nAko ne možeš završiti sve planirane promjene odjednom, možeš ugasiti prozor\nuređivača i kasnije se vratiti (na isti internet preglednik i isto računalo) i uređivač\nće ti ponuditi da nastaviš gdje si stao/la. \n",
         "roads": "# Ceste\n\nMožeš stvarati, popraviti/urediti i obrisati ceste pomoću ovog uređivača. Ceste\nmogu biti svih vrsta: puteljci, ceste, poljski putovi, biciklističke staze i drugo -\nsve staze preko kojih se često prolazi bi se trebale kartirati.\n\n### Odabir\n\nKlikni na cestu da ju odabereš. Pojaviti će se obrub oko ceste, zajedno s\nmalim alatnim izbornikom na karti i bočnim oknom koji prikazuje dodatne\ninformacije o selektiranoj cesti.\n\n### Uređivanje\n\nČesto ćeš vidjeti ceste koje se ne podudaraju s pozadinskim snimcima ili s\nGNSS tragom. Možeš urediti te ceste tako da se nalaze na ispravnom mjestu.\n\nPrvo klikni na cestu koju želiš urediti. To će ju označiti i prikazati kontrolne\ntočke unutar nje koje možeš premjestiti na točnije lokacije. Ako želiš dodati\nnove kontrolne točke za precizniju putanju, klikni dvoklikom na dio ceste gdje\nnema točke kako bi dodao/la novu.\n\nAko se cesta spaja s drugom cestom, ali nije ispravno spojena na karti, možeš\npovući kontrolnu točku na drugu cestu kako bi ih spojio/la. Spojene ceste su\nvrlo važne za kartu i osnova za omogućavanje uputa za navigaciju.\n\nTakođer možeš kliknuti alat \"Premjesti\" ili pritisnuti kraticu - tipku `M` za\npomak cijele ceste odjednom i zatim kliknuti ponovno za spremanje tog\npomaka.\n\n### Brisanje\n\nAko je cesta potpuno krivo ucrtana - ne vidi se na satelitskim snimkama i ako\nsi utvrdio/la da zbilja ne postoji uvidom na terenu možeš ju obrisati, što će ju\nobrisati s karte. Budi oprezan/na kada brišeš značajke - kao i kod svakog\ndrugog uređivanja rezultati su vidljivi svima, a satelitske snimke su često\nzastarjele, pa je moguće da je cesta nedavno sagrađena.\n\nZa brisanje ceste najprije ju označi, a zatim klikni na ikonicu kante za smeće ili\npritisni tipku \"Delete\".\n\n### Stvaranje\n\nAko si pronašao/la cestu koja bi trebala biti ucrtana ali nije, klikni ikonicu\n\"Linija\" na gornjem lijevom dijelu uređivača ili pritisni kraticu - tipku `2` da\nzapočneš crtanje linije.\n\nKlikni na početak ceste na karti da započneš crtanje. Ako se cesta odvaja od\npostojeće ceste, klikni na mjesto gdje se spajaju.\n\nZatim klikni na točke duž ceste tako da prate ispravnu putanju ceste, prema\npodacima satelitske snimke ili GNSS traga. Ako se cesta koju crtaš križa s\ndrugom cestom, spoji ih klikom na mjestu raskrižja. Kada si završio/la s\ncrtanjem, klikni dvoklikom sastrane ili pritisni tipku \"Return\" ili \"Enter\" na\ntipkovnici.\n",
-        "gps": "# GNSS\n\nPojam GNSS obuhvaća sve Globalne Navigacijske Satelitske Sustave, npr. američki Navstar GPS, ruski GLONASS, europski GALILEO, kineski BEIDOU. Suvremeni uređaji često koriste signale više sustava istovremeno za određivanje pozicije. GNSS podaci su najpouzdaniji izvor podataka za OpenStreetMap. Ovaj\nuređivač podržava lokalne tragove - `.gpx` datoteteke sa tvog računala.\nTakav oblik GNSS traga možeš prikupiti s raznim aplikacijama za pametne\ntelefone kao i sa drugim GNSS/GPS uređajima.\n\nZa više informacija o postupku izmjere pomoću GNSS satelita, pročitaj članak\n[\"Mjerenje sa GPS-om\"](http://learnosm.org/en/beginner/using-gps/).\n\nKako bi koristio GPX tragove za kartiranje, povuci i ispusti GPX datoteku\nna uređivač karte. Ako se datoteka ispravno učita, biti će dodana na kartu\nkao linija svjetlo zelene boje. Klikni na izbornik \"Postavke pozadine\" s\ndesne strane za uključivanje, isključivanje ili povećanje na taj novi GPX sloj.\n\nGPX trag nije direktno postavljen na OpenStreetMap, samo je prikazan na\nkarti. Da bi ga iskoristio/la na najbolji način, preko njega crtaj na\nkarti koristeći ga kao vodilju za dodavanje novih značajki. Trag možeš također\n[postaviti na OpenStreetMap](http://www.openstreetmap.org/trace/create)\nkako bi ga i drugi korisnici mogli koristiti.\n",
+        "gps": "# GNSS\n\nPojam GNSS obuhvaća sve \"Globalne Navigacijske Satelitske Sustave\", to su: američki Navstar GPS, ruski GLONASS, europski GALILEO i kineski BEIDOU. Suvremeni uređaji često koriste signale više sustava istovremeno za određivanje pozicije. GNSS podaci su najpouzdaniji izvor podataka za OpenStreetMap. Ovaj\nuređivač podržava lokalne tragove - `.gpx` datoteteke koje se nalaze na tvom računalu.\nTakav oblik GNSS traga možeš prikupiti s raznim aplikacijama za pametne\ntelefone kao i sa drugim GNSS/GPS uređajima.\n\nZa više informacija o postupku izmjere pomoću GNSS satelita, pročitaj članak\n[\"Mjerenje sa GPS-om\"](http://learnosm.org/en/beginner/using-gps/).\n\nKako bi koristio GPX tragove za kartiranje, povuci i ispusti GPX datoteku\nna uređivač karte. Ako se datoteka ispravno učita, biti će dodana na kartu\nkao linija svjetlo zelene boje. Klikni na izbornik \"Postavke pozadine\" s\ndesne strane za uključivanje, isključivanje ili povećanje na taj novi GPX sloj.\n\nGPX trag nije direktno postavljen na OpenStreetMap, samo je prikazan na\nkarti. Da bi ga iskoristio/la na najbolji način, preko njega crtaj na\nkarti koristeći ga kao vodilju za dodavanje novih značajki. Trag možeš također\n[postaviti na OpenStreetMap](http://www.openstreetmap.org/trace/create)\nkako bi ga i drugi korisnici mogli koristiti.\n",
         "imagery": "# Fotografski snimci\n\nZračni snimci su važan izvor za kartiranje. Kombinacija snimaka iz aviona,\nsatelitskih snimaka i drugih besplatno prikupljenih izvornika je dostupna s\ndesne strane u izborniku \"Postavke pozadine\".\n\nPočetno je u pozadini prikazan sloj satelitskih snimaka [karte Bing Maps](http://www.bing.com/maps/). Novi izvornici postaju dostupni pomicanjem\ni povećanjem karte na novo geografsko područje. Neke države, poput SAD-a,\nFrancuske i Danske imaju dostupne vrlo kvalitetne snimke za određena\npodručja.\n\nSnimke su ponekad pomaknute u odnosu na podatke karte zbog pogreške\nna koordinatama izvornih snimaka. Ako vidiš puno cesta izmaknutih u\nodnosu na pozadinu, nemoj ih odmah pomicati da se poklope sa pozadinom.\nUmjesto toga, možeš podesiti snimke da odgovaraju postojećim podacima\ntako da klikneš \"Popravi odstupanje\" na dnu izbornika \"Postavke pozadine\".\n",
         "addresses": "# Adrese\n\nAdrese spadaju u najkorisnije informacije na karti.\n\nIako su adrese često prikazane kao dio ulica, na OpenStreetMap karti su zapisane\nkao svojstva građevina i mjesta uzduž ulica.\n\nMožeš dodati informacije o adresi na mjesta kartirana kao rub građevine, ali i na\ngrađevine koje su kartirane kao točkasti objekt. Najbolji izvor podataka o adresama\nje prikupljanje podataka na terenu ili iz osobnog znanja - kao i svake druge\nznačajke, kopiranje sa komercijalnih izvora poput Google Maps servisa je strogo\nzabranjeno.\n",
         "inspector": "# Korištenje preglednika\n\nPreglednik je element korisničkog sučelja na lijevoj strani stranice koji se pojavljuje\nnakon što se neka značajka odabere i on omogućava uređivanje detalja značajke.\n\n### Odabir vrste značajke\n\nNakon što dodaš točku, liniju ili područje, možeš odabrati koje je vrste ta značajka,\nnpr. je li to državna cesta ili ulica, veletrgovina ili kafić.\n\nPreglednik će prikazati tipke za često korištene vrste značajki, a ostale možeš\npronaći upisivanjem naziva vrste koju tražiš u okvir za pretraživanje.\n\nKlikni na \"i\" na desnoj strani vrste značajke da saznaš više o toj značajki. Klikni na\ntipku sa imenom vrste da odabereš tu vrstu.\n\n### Korištenje obrazaca i oznaka\n\nNakon što odabereš vrstu značajke ili kada odabereš značajku koja već ima\ndefeniranu vrstu, preglednik će ti prikazati polja sa detaljima o značajki, npr.\nnjezino ime i adresu.\n\nIspod polja možeš kliknuti na ikone za dodavanje drugih detalja, kao informacije sa\n[Wikipedije](http://www.wikipedia.org/), pristup invalidskim kolicima i drugo.\n\nNa dnu preglednika, klikni na \"Sve oznake\" za dodavanje proizvoljnih drugih\noznaka za značajke. [Taginfo](http://taginfo.openstreetmap.org/) je izvrstan\nizvornik za učenje o popularnim kombinacijama oznaka koje se koriste.\n\nPromjene koje napraviš u pregledniku su automatski primijenjene na kartu.\n\nMožeš poništiti promjene u bilo kojem trenutku pritiskom na tipku \"Opovrgni\".\n",
-        "buildings": "# Građevine\n\nOpenStreetMap je najveća svjetska baza podataka o građevinama. Možeš\nstvarati i unaprijediti tu bazu podataka.\n\n### Odabir\n\nMožeš odabrati građevinu klikom na njezin rub. Pojaviti će se obrub oko\ngrađevine i otvoriti će se mali alatni izbornik i bočno okno koje prikazuje više\ninformacija o građevini.\n\n### Uređivanje\n\nPonekad su građevine neispravno pozicionirane ili imaju netočna svojstva.\n\nZa premještanje cijele građevine, odaberi ju, a zatim klikni alat \"Premjesti\".\nPomakom miša namjesti točnu lokaciju građevine i zatim klikni lijevu tipku\nmiša.\n\nZa ispravak oblika zgrade, klikni i povlači rubne točke građevine na ispravnije\nmjesto.\n\n### Stvaranje\n\nJedno od glavnih pitanja u vezi dodavanja građevina na kartu je kako ih dodati\n- kao područje ili kao točke. Pravilo je da se građevine _crtaju kao područje\nkada je god to moguće_, a označavanje tvrtki, kuća, kućnih brojeva, usluga i\ndrugih stvari za koje se građevine koriste kao točke koje se nalaze unutar\npovršine građevine.\n\nZapočni crtanje građevine kao površine klikom na tipku \"Površina\" u gornjem\nlijevom uglu sučelja, a po završetku crtanja građevine pritisni tipku \"Return\"\nna tipkovnici ili klikni na početnu točku za zatvaranje oblika.\n\n### Brisanje\n\nAko je građevina potpuno krivo ucrtana - ne vidi se na satelitskim snimkama i\nako si utvrdio/la da zbilja ne postoji uvidom na terenu možeš ju obrisati, što će\nju obrisati s karte. Budi oprezan/na kada brišeš značajke - kao i kod svakog\ndrugog uređivanja rezultati su vidljivi svima, a satelitske snimke su često\nzastarjele, pa je moguće da je građevina nedavno sagrađena.\n\nMožeš obrisati građevinu tako da klikneš na rub za selektiranje, a zatim\nklikneš na ikonu kante za smeće ili pritiskom tipke \"Delete\" na tipkovnici.\n",
+        "buildings": "# Građevine\n\nOpenStreetMap je najveća svjetska baza podataka o građevinama. Možeš\nstvarati i unaprijediti tu bazu podataka.\n\n### Odabir\n\nMožeš odabrati građevinu klikom na njezin rub. Pojaviti će se obrub oko\ngrađevine i otvoriti će se mali alatni izbornik i bočno okno koje prikazuje više\ninformacija o građevini.\n\n### Uređivanje\n\nPonekad su građevine neispravno pozicionirane ili imaju netočna svojstva.\n\nZa premještanje cijele građevine, odaberi ju, a zatim klikni alat \"Premjesti\".\nPomakom miša namjesti točnu lokaciju građevine i zatim klikni lijevu tipku\nmiša.\n\nZa ispravak oblika zgrade, klikni i povlači rubne točke građevine na ispravnije\nmjesto.\n\n### Stvaranje\n\nJedno od glavnih pitanja u vezi dodavanja građevina na kartu je kako ih dodati\n- kao područje ili kao točke. Pravilo je da se građevine _crtaju kao područje\nkada je god to moguće_, a označavanje tvrtki, kuća, kućnih brojeva, usluga i\ndrugih stvari za koje se građevine koriste kao točke koje se nalaze unutar\npovršine građevine.\n\nZapočni crtanje građevine kao površine klikom na tipku \"Površina\" u gornjem\nlijevom kutu sučelja, a po završetku crtanja građevine pritisni tipku \"Return\"\nna tipkovnici ili klikni na početnu točku za zatvaranje oblika.\n\n### Brisanje\n\nAko je građevina potpuno krivo ucrtana - ne vidi se na satelitskim snimkama i\nako si utvrdio/la da zbilja ne postoji uvidom na terenu možeš ju obrisati, što će\nju obrisati s karte. Budi oprezan/na kada brišeš značajke - kao i kod svakog\ndrugog uređivanja rezultati su vidljivi svima, a satelitske snimke su često\nzastarjele, pa je moguće da je građevina nedavno sagrađena.\n\nMožeš obrisati građevinu tako da klikneš na rub za selektiranje, a zatim\nklikneš na ikonu kante za smeće ili pritiskom tipke \"Delete\" na tipkovnici.\n",
         "relations": "# Relacije\n\nRelacija je poseban oblik značajki na OpenStreetMap karti koja grupira druge\nznačajke. Na primjer, dvije često korištene relacije su *cestovne relacije*, koje\nmeđusobno grupiraju dijelove cesta koje zajedno pripadaju državnoj ili\nžupanijskoj cesti i *multipoligoni*, koji međusobno grupiraju nekoliko linija\nkoje definiraju složena područja (koja se sastoje od  više područja ili ona koja\nimaju rupu u sebi poput krafne).\n\nSkupine značajki u relaciji se nazivaju *članovi*. U bočnom oknu možeš vidjeti\nkojim sve relacijama značajka pripada i tamo kliknuti na relaciju kako bi ju\nodabrao/la. Kada je relacija odabrana možeš vidjeti sve njezine članove koji su\noznačeni na karti i izlistani u bočnom oknu.\n\niD će uglavnom automatski održavati relacije dok ti uređuješ kartu. Glavna\nstvar koje moraš biti svjestan/na je da ako obrišeš dio ceste da ju nacrtaš\npreciznije, trebaš provjeriti da je i novi dio član istih relacija kao i originalni\ndio.\n\n## Uređivanje relacija\n\nAko želiš uređivati relacije, ovdje su navedene osnove.\n\nZa dodavanje značajke nekoj relaciji, označi značajku, klikni tipku \"+\" u odjeljku\n\"Sve relacije\" na dnu bočnog okna i odaberi ili upiši ime relacije.\n\nZa stvaranje nove relacije, odaberi prvu značajku koja bi trebala biti član,\nzatim klikni tipku \"+\" u odjeljku \"Sve relacije\" i odaberi \"Nova relacija...\".\n\nZa odstranjivanje značajke iz relacije, odaberi značajku i klikni ikonu kante za\nsmeće pokraj relacije iz koje ju želiš ukloniti.\n\nMožeš stvarati višestruke poligone - multipoligone sa rupama pomoću alata\n\"Spoji\". Nacrtaj dva područja (unutarnje i vanjsko), drži tipku Shift i klikni na\noba područja kako bi ih selektirao/la i zatim klikni na tipku \"Spoji\" (+).\n"
     },
     "intro": {
@@ -352,7 +352,7 @@
             "drag": "Glavno područje karte prikazuje OpenStreetMap podatke iznad pozadine. Možeš mijenjati pogled povlačeći i pomičući, kao na svakoj drugoj web karti. **Pomakni prikaz karte!**",
             "select": "Značajke karte su prikazane na tri načina: koristeći točke, linije ili područja. Sve značajke mogu se odabrati klikom na njih. **Klikni na točku kako bi ju odabrao/la.**",
             "header": "Zaglavlje nam pokazuje tip svojstva.",
-            "pane": "Kada je značajka odabrana, prikazan je uređivač svojstava. Zaglavlje prikazuje tip značajke, a glavni prozor prikazuje njegova svojstva npr. naziv i adresu. **Zatvori uređivač svojstava sa gumbom x u gornjem desnom uglu.**"
+            "pane": "Kada je značajka odabrana, prikazan je uređivač svojstava. Zaglavlje prikazuje tip značajke, a glavni prozor prikazuje njegova svojstva npr. naziv i adresu. **Zatvori uređivač svojstava sa gumbom x u gornjem desnom kutu.**"
         },
         "points": {
             "title": "Točke",
@@ -1224,9 +1224,6 @@
             "building/detached": {
                 "name": "Samostojni dom"
             },
-            "building/entrance": {
-                "name": "Ulaz"
-            },
             "building/garage": {
                 "name": "Garaža"
             },
@@ -1372,9 +1369,6 @@
             "emergency/phone": {
                 "name": "Telefon za nuždu"
             },
-            "entrance": {
-                "name": "Ulaz"
-            },
             "golf/rough": {
                 "name": "Grubo"
             },

diff --git a/vendor/assets/iD/iD/locales/hu.json b/vendor/assets/iD/iD/locales/hu.json
index e42e5cf5f889fdff7a4dd44832c1f30b24b5747f..920fe72985c398543614b87233584388a149a072 100644 (file)
--- a/vendor/assets/iD/iD/locales/hu.json
+++ b/vendor/assets/iD/iD/locales/hu.json
@@ -71,7 +71,8 @@
                 "line": "Vonal köralakúvá tétele.",
                 "area": "Terület köralakúvá tétele."
             },
-            "not_closed": "Nem lehet köralakúvá tenni, mert nem hurok."
+            "not_closed": "Nem lehet köralakúvá tenni, mert nem hurok.",
+            "too_large": "Nem lehet körré igazítani, mert nem látszik az egész alakzat."
         },
         "orthogonalize": {
             "title": "Szögletesít",
@@ -84,7 +85,8 @@
                 "line": "Vonal sarkainak szögletesítése.",
                 "area": "Terület sarkainak szögletesítése."
             },
-            "not_squarish": "Nem lehet szögletesíteni, mert nem szögletes."
+            "not_squarish": "Nem lehet szögletesíteni, mert nem szögletes.",
+            "too_large": "Nem lehet négyszögesíteni, mert nem látszik az egész alakzat."
         },
         "straighten": {
             "title": "Kiegyenesít",
@@ -134,7 +136,8 @@
             "annotation": "{n} vonal egyesítve.",
             "not_eligible": "Az elemek nem egyesíthetőek.",
             "not_adjacent": "A vonalak nem egyesíthetőek, mert nincsenek összekapcsolva.",
-            "restriction": "A vonalak nem egyesíthetőek, mert legalább az egyikük egy \"{relation}\" kapcsolat tagja."
+            "restriction": "A vonalak nem egyesíthetőek, mert legalább az egyikük egy \"{relation}\" kapcsolat tagja.",
+            "incomplete_relation": "Nem sikerült az egyesítés, mert legalább egy elem nincs teljesen letöltve."
         },
         "move": {
             "title": "Mozgatás",
@@ -264,6 +267,8 @@
         "percent_brightness": "{opacity}% fényerő",
         "none": "Nincs",
         "custom": "Egyéni",
+        "custom_button": "Egyedi háttér szerkesztése",
+        "custom_prompt": "Adj meg egy csempe URL sablont. Érvényes tokenek: {z}, {x}, {y} a Z/X/Y rendszerű URL-ekhez és {u} a kvadratikusakhoz.",
         "fix_misalignment": "Eltolódás korrigálása",
         "reset": "visszavonás"
     },
@@ -394,6 +399,9 @@
             "category-building": {
                 "name": "Épület"
             },
+            "category-golf": {
+                "name": "Golf"
+            },
             "category-landuse": {
                 "name": "Területfunkció"
             },
@@ -567,6 +575,9 @@
             "description": {
                 "label": "Leírás"
             },
+            "electrified": {
+                "label": "Villamosítottság"
+            },
             "elevation": {
                 "label": "Tengerszint feletti magasság"
             },
@@ -589,6 +600,9 @@
             "fixme": {
                 "label": "JavítsKi"
             },
+            "fuel": {
+                "label": "Üzemanyag"
+            },
             "generator/method": {
                 "label": "Módszer"
             },
@@ -707,6 +721,18 @@
             "railway": {
                 "label": "Típus"
             },
+            "recycling/cans": {
+                "label": "Fémhulladékot elfogad"
+            },
+            "recycling/clothes": {
+                "label": "Használt ruhát elfogad"
+            },
+            "recycling/glass": {
+                "label": "Üveget elfogad"
+            },
+            "recycling/paper": {
+                "label": "Papírt elfogad"
+            },
             "ref": {
                 "label": "Azonosító"
             },
@@ -737,6 +763,9 @@
             "sac_scale": {
                 "label": "Ösvény nehézsége"
             },
+            "seasonal": {
+                "label": "Időszakos"
+            },
             "service": {
                 "label": "Típus"
             },
@@ -749,12 +778,18 @@
             "shop": {
                 "label": "Típus"
             },
+            "smoking": {
+                "label": "Dohányzó"
+            },
             "source": {
                 "label": "Forrás"
             },
             "sport": {
                 "label": "Sport"
             },
+            "sport_ice": {
+                "label": "Sport"
+            },
             "structure": {
                 "label": "Szerkezet",
                 "placeholder": "Ismeretlen",
@@ -765,6 +800,9 @@
                     "cutting": "Bevágás"
                 }
             },
+            "studio_type": {
+                "label": "Típus"
+            },
             "supervised": {
                 "label": "Felügyelt"
             },
@@ -789,6 +827,12 @@
             "tree_type": {
                 "label": "Típus"
             },
+            "trees": {
+                "label": "Fák"
+            },
+            "tunnel": {
+                "label": "Alagút"
+            },
             "vending": {
                 "label": "Termékek típusa"
             },
@@ -933,12 +977,28 @@
             "amenity/cinema": {
                 "name": "Mozi"
             },
+            "amenity/clinic": {
+                "name": "Klinika",
+                "terms": "Klinika, Rendelőintézet"
+            },
+            "amenity/clock": {
+                "name": "Óra",
+                "terms": "Óra"
+            },
             "amenity/college": {
                 "name": "Főiskola"
             },
             "amenity/courthouse": {
                 "name": "Bíróság"
             },
+            "amenity/dentist": {
+                "name": "Fogorvos",
+                "terms": "Fogorvos, Fogász, Fogászat"
+            },
+            "amenity/doctor": {
+                "name": "Orvos",
+                "terms": "Orvos, Doktor"
+            },
             "amenity/drinking_water": {
                 "name": "Ivóvíz"
             },
@@ -960,6 +1020,12 @@
             "amenity/grave_yard": {
                 "name": "Sírkert"
             },
+            "amenity/hospital": {
+                "name": "Kórház"
+            },
+            "amenity/kindergarten": {
+                "name": "Óvoda"
+            },
             "amenity/library": {
                 "name": "Könyvtár"
             },
@@ -1010,10 +1076,21 @@
             "amenity/restaurant": {
                 "name": "Étterem"
             },
+            "amenity/school": {
+                "name": "Iskola"
+            },
             "amenity/shelter": {
                 "name": "Menedék",
                 "terms": "fedett, fedél, esőház, esőkunyhó, menedékház"
             },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Hajléktalan menedék",
+                "terms": "Hajléktalan menedék"
+            },
+            "amenity/studio": {
+                "name": "Stúdió",
+                "terms": "Stúdió"
+            },
             "amenity/swimming_pool": {
                 "name": "Úszómedence"
             },
@@ -1039,6 +1116,10 @@
                 "name": "Árusító automata",
                 "terms": "italautomata, italgép"
             },
+            "amenity/veterinary": {
+                "name": "Állatorvos",
+                "terms": "Állatorvos, Állatorvosi rendelő"
+            },
             "amenity/waste_basket": {
                 "name": "Szemetes"
             },
@@ -1106,15 +1187,60 @@
             "building/apartments": {
                 "name": "Lakások"
             },
+            "building/barn": {
+                "name": "Pajta",
+                "terms": "Pajta"
+            },
+            "building/bunker": {
+                "name": "Bunker",
+                "terms": "Bunker"
+            },
+            "building/cabin": {
+                "name": "Faház",
+                "terms": "Faház"
+            },
+            "building/cathedral": {
+                "name": "Katedrális",
+                "terms": "Katedrális, Székesegyház"
+            },
+            "building/chapel": {
+                "name": "Kápolna",
+                "terms": "Kápolna, Imaház"
+            },
+            "building/church": {
+                "name": "Templom",
+                "terms": "Templom, Plébánia, Imaház"
+            },
             "building/commercial": {
                 "name": "Kereskedelmi épület"
             },
-            "building/entrance": {
-                "name": "Bejárat"
+            "building/construction": {
+                "name": "Ház építés alatt",
+                "terms": "Ház építés alatt"
+            },
+            "building/dormitory": {
+                "name": "Kollégium",
+                "terms": "Kollégium, Diákszálló, Diákotthon"
             },
             "building/garage": {
                 "name": "Garázs"
             },
+            "building/garages": {
+                "name": "Garazsak",
+                "terms": "Garazsak"
+            },
+            "building/greenhouse": {
+                "name": "Üvegház",
+                "terms": "Üvegház"
+            },
+            "building/hospital": {
+                "name": "Kórházi épület",
+                "terms": "Kórházi épület"
+            },
+            "building/hotel": {
+                "name": "Hotel épület",
+                "terms": "Hotel épület"
+            },
             "building/house": {
                 "name": "Ház"
             },
@@ -1125,10 +1251,122 @@
                 "name": "Ipari épület",
                 "terms": "Gyárépület"
             },
+            "building/public": {
+                "name": "Nyilvános épület",
+                "terms": "Nyilvános épület"
+            },
             "building/residential": {
                 "name": "Lakóépület",
                 "terms": "Lakóház, lakás, ház"
             },
+            "building/roof": {
+                "name": "Tető",
+                "terms": "Tető"
+            },
+            "building/school": {
+                "name": "Iskolaépület",
+                "terms": "Iskolaépület"
+            },
+            "building/shed": {
+                "name": "Kunyhó",
+                "terms": "Kunyhó, Fészer, Pajta"
+            },
+            "building/terrace": {
+                "name": "Sorház",
+                "terms": "Sorház"
+            },
+            "building/train_station": {
+                "name": "Vasútállomás",
+                "terms": "Vasútállomás, Vasúti megálló"
+            },
+            "building/university": {
+                "name": "Egyetemi épület",
+                "terms": "Egyetemi épület"
+            },
+            "building/warehouse": {
+                "name": "Raktár",
+                "terms": "Raktár, Lerakat"
+            },
+            "craft/basket_maker": {
+                "name": "Kosárfonó",
+                "terms": "Kosárfonó"
+            },
+            "craft/beekeeper": {
+                "name": "Méhész",
+                "terms": "Méhész"
+            },
+            "craft/blacksmith": {
+                "name": "Patkolókovács",
+                "terms": "Patkolókovács"
+            },
+            "craft/boatbuilder": {
+                "name": "Hajógyáros",
+                "terms": "Hajógyáros"
+            },
+            "craft/bookbinder": {
+                "name": "Könyvkötő",
+                "terms": "Könyvkötő"
+            },
+            "craft/brewery": {
+                "name": "Sörfőzde",
+                "terms": "Sörfőzde, Sörfőző"
+            },
+            "craft/carpenter": {
+                "name": "Asztalos",
+                "terms": "Asztalos, Ács"
+            },
+            "craft/electrician": {
+                "name": "Villanyszerelő",
+                "terms": "Villanyszerelő"
+            },
+            "craft/gardener": {
+                "name": "Kertész",
+                "terms": "Kertész"
+            },
+            "craft/insulator": {
+                "name": "Szigetelő",
+                "terms": "Szigetelő"
+            },
+            "craft/jeweler": {
+                "name": "Ékszerész",
+                "terms": "Ékszerész, Ékszeres"
+            },
+            "craft/key_cutter": {
+                "name": "Kulcsos",
+                "terms": "Kulcsos, Kulcskészítő, Kulcsmásoló"
+            },
+            "craft/optician": {
+                "name": "Szemész",
+                "terms": "Szemész"
+            },
+            "craft/painter": {
+                "name": "Festő",
+                "terms": "Festő, Festőművész"
+            },
+            "craft/photographer": {
+                "name": "Fotós",
+                "terms": "Fotós, Fotográfus"
+            },
+            "craft/photographic_laboratory": {
+                "name": "Fotólabor",
+                "terms": "Fotólabor"
+            },
+            "craft/shoemaker": {
+                "name": "Cipész",
+                "terms": "Cipész, Cipőkészítő"
+            },
+            "craft/sweep": {
+                "name": "Kéményseprő",
+                "terms": "Kéményseprő"
+            },
+            "craft/tailor": {
+                "name": "Szabó",
+                "terms": "Szabó"
+            },
+            "craft/watchmaker": {
+                "name": "Órás",
+                "terms": "Órás"
+            },
             "embankment": {
                 "name": "Töltés"
             },
@@ -1142,9 +1380,6 @@
             "emergency/phone": {
                 "name": "Segélykérő telefon"
             },
-            "entrance": {
-                "name": "Bejárat"
-            },
             "footway/crossing": {
                 "name": "Kereszteződés"
             },
@@ -1323,6 +1558,10 @@
             "landuse/meadow": {
                 "name": "Rét"
             },
+            "landuse/military": {
+                "name": "Katonai",
+                "terms": "Katonai, Honvédségi"
+            },
             "landuse/orchard": {
                 "name": "Gyümölcsös"
             },
@@ -1348,6 +1587,10 @@
                 "name": "Kutyafuttató",
                 "terms": "Kutyasétáltató"
             },
+            "leisure/firepit": {
+                "name": "Tűzrakó hely",
+                "terms": "Tűzrakó hely"
+            },
             "leisure/garden": {
                 "name": "Kert"
             },
@@ -1360,6 +1603,10 @@
             "leisure/park": {
                 "name": "Park"
             },
+            "leisure/picnic_table": {
+                "name": "Piknikasztal",
+                "terms": "Piknikasztal"
+            },
             "leisure/pitch": {
                 "name": "Sportpálya"
             },
@@ -1619,6 +1866,10 @@
             "place/locality": {
                 "name": "Lakatlan hely"
             },
+            "place/neighbourhood": {
+                "name": "Környék",
+                "terms": "Környék, Negyed"
+            },
             "place/town": {
                 "name": "Város"
             },
@@ -1669,6 +1920,10 @@
             "railway/disused": {
                 "name": "Használaton kívüli vasút"
             },
+            "railway/funicular": {
+                "name": "Sikló",
+                "terms": "Sikló, Siklóvasút"
+            },
             "railway/halt": {
                 "name": "Vasúti megállóhely",
                 "terms": "megállóhely"
@@ -1679,6 +1934,10 @@
             "railway/monorail": {
                 "name": "Egysínű vasút"
             },
+            "railway/narrow_gauge": {
+                "name": "Kisvasút",
+                "terms": "Kisvasút, Keskeny nyomközű vasút"
+            },
             "railway/platform": {
                 "name": "Vasúti platform"
             },

diff --git a/vendor/assets/iD/iD/locales/id.json b/vendor/assets/iD/iD/locales/id.json
index bd16e36e1b27417883cd1a1a7e7d79db77962c06..bba2115d5c9f99237909b89b8397cbf5dad7a92e 100644 (file)
--- a/vendor/assets/iD/iD/locales/id.json
+++ b/vendor/assets/iD/iD/locales/id.json
@@ -866,9 +866,6 @@
             "building/apartments": {
                 "name": "Apartemen"
             },
-            "building/entrance": {
-                "name": "Masuk"
-            },
             "building/garage": {
                 "name": "Garasi"
             },
@@ -878,9 +875,6 @@
             "emergency/phone": {
                 "name": "Telepon Darurat"
             },
-            "entrance": {
-                "name": "Pintu Masuk"
-            },
             "highway": {
                 "name": "Jalan Raya"
             },

diff --git a/vendor/assets/iD/iD/locales/is.json b/vendor/assets/iD/iD/locales/is.json
index 785093504e9fc532d1fe9ad7c16c9c7d074863ed..15c73a04d577c0860da35481522a2e558f9772cf 100644 (file)
--- a/vendor/assets/iD/iD/locales/is.json
+++ b/vendor/assets/iD/iD/locales/is.json
@@ -480,6 +480,9 @@
             "country": {
                 "label": "Land"
             },
+            "crop": {
+                "label": "Uppskera"
+            },
             "crossing": {
                 "label": "Tegund"
             },
@@ -514,12 +517,18 @@
             "fixme": {
                 "label": "Lagaðu mig"
             },
+            "fuel": {
+                "label": "Eldsneyti"
+            },
             "highway": {
                 "label": "Tegund"
             },
             "historic": {
                 "label": "Tegund"
             },
+            "hoops": {
+                "placeholder": "1, 2, 4..."
+            },
             "iata": {
                 "label": "IATA"
             },
@@ -611,6 +620,18 @@
             "railway": {
                 "label": "Tegund"
             },
+            "recycling/cans": {
+                "label": "Tekur við dósum"
+            },
+            "recycling/clothes": {
+                "label": "Tekur við fötum"
+            },
+            "recycling/glass": {
+                "label": "Tekur við gleri"
+            },
+            "recycling/paper": {
+                "label": "Tekur við pappír"
+            },
             "ref": {
                 "label": "Heimildir"
             },
@@ -641,6 +662,9 @@
             "sac_scale": {
                 "label": "Erfiðleikastig"
             },
+            "seasonal": {
+                "label": "Árstíðabundið"
+            },
             "service": {
                 "label": "Tegund"
             },
@@ -650,12 +674,18 @@
             "shop": {
                 "label": "Tegund"
             },
+            "smoking": {
+                "label": "Reykingar"
+            },
             "source": {
                 "label": "Uppruni"
             },
             "sport": {
                 "label": "Íþrótt"
             },
+            "sport_ice": {
+                "label": "Íþrótt"
+            },
             "structure": {
                 "label": "Mannvirki",
                 "placeholder": "Óþekkt",
@@ -684,6 +714,12 @@
             "trail_visibility": {
                 "label": "Sýnileiki"
             },
+            "trees": {
+                "label": "Tré"
+            },
+            "tunnel": {
+                "label": "Göng"
+            },
             "water": {
                 "label": "Tegund"
             },
@@ -729,7 +765,8 @@
                 "name": "Flugskýli"
             },
             "aeroway/helipad": {
-                "name": "Þyrlupallur"
+                "name": "Þyrlupallur",
+                "terms": "lendingarpallur"
             },
             "aeroway/runway": {
                 "name": "Flugbraut"
@@ -747,11 +784,15 @@
                 "name": "Hraðbanki"
             },
             "amenity/bank": {
-                "name": "Banki"
+                "name": "Banki",
+                "terms": "fjármálastofnun"
             },
             "amenity/bar": {
                 "name": "Knæpa"
             },
+            "amenity/bbq": {
+                "name": "Grill"
+            },
             "amenity/bench": {
                 "name": "Bekkur"
             },
@@ -762,7 +803,8 @@
                 "name": "Hjólaleiga"
             },
             "amenity/cafe": {
-                "name": "Kaffihús"
+                "name": "Kaffihús",
+                "terms": "tehús"
             },
             "amenity/car_rental": {
                 "name": "Bílaleiga"
@@ -770,8 +812,15 @@
             "amenity/car_wash": {
                 "name": "Bílaþvottur"
             },
+            "amenity/childcare": {
+                "name": "Barnagæsla"
+            },
             "amenity/cinema": {
-                "name": "Kvikmyndahús"
+                "name": "Kvikmyndahús",
+                "terms": "bíó"
+            },
+            "amenity/clock": {
+                "name": "Klukka"
             },
             "amenity/college": {
                 "name": "Háskóli"
@@ -800,17 +849,30 @@
             "amenity/grave_yard": {
                 "name": "Grafreitur"
             },
+            "amenity/hospital": {
+                "name": "Spítalalóð"
+            },
+            "amenity/kindergarten": {
+                "name": "Leikskólalóð"
+            },
             "amenity/library": {
                 "name": "Bókasafn"
             },
             "amenity/marketplace": {
                 "name": "Markaður"
             },
+            "amenity/nightclub": {
+                "name": "Næturklúbbur"
+            },
+            "amenity/parking": {
+                "name": "Bílastæði"
+            },
             "amenity/pharmacy": {
                 "name": "Lyfjaverslun"
             },
             "amenity/place_of_worship": {
-                "name": "Tilbeiðsluhús"
+                "name": "Tilbeiðsluhús",
+                "terms": "musteri, kirkja, kapella, bænahús"
             },
             "amenity/place_of_worship/buddhist": {
                 "name": "Búddistamusteri"
@@ -822,10 +884,12 @@
                 "name": "Bænahús gyðinga"
             },
             "amenity/place_of_worship/muslim": {
-                "name": "Moska"
+                "name": "Moska",
+                "terms": "bænahús múslima"
             },
             "amenity/police": {
-                "name": "Lögregla"
+                "name": "Lögregla",
+                "terms": "löggan"
             },
             "amenity/post_box": {
                 "name": "Póstkassi"
@@ -839,6 +903,15 @@
             "amenity/restaurant": {
                 "name": "Veitingahús"
             },
+            "amenity/school": {
+                "name": "Skólalóð"
+            },
+            "amenity/social_facility/food_bank": {
+                "name": "Mataraðstoð"
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Athvarf heimilislausra"
+            },
             "amenity/swimming_pool": {
                 "name": "Sundlaug"
             },
@@ -860,6 +933,9 @@
             "amenity/university": {
                 "name": "Háskóli"
             },
+            "amenity/veterinary": {
+                "name": "Dýralæknir"
+            },
             "amenity/waste_basket": {
                 "name": "Ruslafata"
             },
@@ -926,14 +1002,39 @@
             "building/apartments": {
                 "name": "Íbúðir"
             },
+            "building/barn": {
+                "name": "Hlaða"
+            },
+            "building/bunker": {
+                "name": "Byrgi"
+            },
+            "building/cabin": {
+                "name": "Sumarhús",
+                "terms": "Sumarbústaður, kofi"
+            },
+            "building/cathedral": {
+                "name": "Dómkirkja"
+            },
+            "building/chapel": {
+                "name": "Kapella"
+            },
+            "building/church": {
+                "name": "Kirkja"
+            },
             "building/commercial": {
                 "name": "Atvinnuhúsnæði"
             },
             "building/construction": {
                 "name": "Á byggingarstigi"
             },
-            "building/entrance": {
-                "name": "Inngangur"
+            "building/dormitory": {
+                "name": "Heimavist"
+            },
+            "building/garage": {
+                "name": "Bílskúr"
+            },
+            "building/garages": {
+                "name": "Bílskúrar"
             },
             "building/hospital": {
                 "name": "Sjúkrahúsbygging"
@@ -944,6 +1045,9 @@
             "building/house": {
                 "name": "Einbýlishús"
             },
+            "building/hut": {
+                "name": "Kofi"
+            },
             "building/industrial": {
                 "name": "Iðnaðarhúsnæði"
             },
@@ -956,24 +1060,79 @@
             "building/retail": {
                 "name": "Verslunarhúsnæði"
             },
+            "building/roof": {
+                "name": "Þak"
+            },
             "building/school": {
                 "name": "Skólabygging"
             },
+            "building/shed": {
+                "name": "Skúr",
+                "terms": "garðskáli"
+            },
+            "building/static_caravan": {
+                "name": "Staðfast hjólhýsi"
+            },
+            "building/terrace": {
+                "name": "Raðhús"
+            },
+            "building/train_station": {
+                "name": "Lestarstöð"
+            },
             "building/university": {
                 "name": "Háskólabygging"
             },
+            "building/warehouse": {
+                "name": "Vöruhús"
+            },
+            "craft/dressmaker": {
+                "name": "Kjólasaumari"
+            },
+            "craft/electrician": {
+                "name": "Rafvirki"
+            },
+            "craft/gardener": {
+                "name": "Garðyrkjumaður"
+            },
+            "craft/jeweler": {
+                "name": "Skartgripasali"
+            },
+            "craft/key_cutter": {
+                "name": "Lyklaþjónusta"
+            },
+            "craft/locksmith": {
+                "name": "Lyklasmiður"
+            },
+            "craft/optician": {
+                "name": "Gleraugnasali"
+            },
+            "craft/painter": {
+                "name": "Málari"
+            },
             "craft/photographer": {
                 "name": "Ljósmyndari"
             },
+            "craft/plumber": {
+                "name": "Pípari"
+            },
+            "craft/shoemaker": {
+                "name": "Skósmiður"
+            },
+            "craft/tailor": {
+                "name": "Skraddari"
+            },
+            "craft/upholsterer": {
+                "name": "Bólstrari"
+            },
+            "craft/watchmaker": {
+                "name": "Úrsmiður"
+            },
             "emergency/ambulance_station": {
                 "name": "Sjúkrabílastöð"
             },
             "emergency/phone": {
                 "name": "Neyðarsími"
             },
-            "entrance": {
-                "name": "Inngangur"
-            },
             "highway": {
                 "name": "Þjóðvegur"
             },
@@ -1022,6 +1181,9 @@
             "highway/residential": {
                 "name": "Íbúagata"
             },
+            "highway/rest_area": {
+                "name": "Hvíldarsvæði"
+            },
             "highway/road": {
                 "name": "Óþekktur vegur"
             },
@@ -1041,7 +1203,8 @@
                 "name": "Afgreiðslulúga"
             },
             "highway/service/driveway": {
-                "name": "Innkeyrsla"
+                "name": "Innkeyrsla",
+                "terms": "Heimreið"
             },
             "highway/service/emergency_access": {
                 "name": "Neyðaraðgangur"
@@ -1049,6 +1212,9 @@
             "highway/service/parking_aisle": {
                 "name": "Bílastæðagangur"
             },
+            "highway/services": {
+                "name": "Þjónustusvæði"
+            },
             "highway/steps": {
                 "name": "Tröppur"
             },
@@ -1136,9 +1302,16 @@
             "landuse/industrial": {
                 "name": "Iðnaðarsvæði"
             },
+            "landuse/landfill": {
+                "name": "Landfylling"
+            },
             "landuse/meadow": {
                 "name": "Engi"
             },
+            "landuse/military": {
+                "name": "Hersvæði",
+                "terms": "herstöð, æfingasvæði"
+            },
             "landuse/orchard": {
                 "name": "Aldingarður"
             },
@@ -1160,12 +1333,18 @@
             "leisure/dog_park": {
                 "name": "Hundagarður"
             },
+            "leisure/firepit": {
+                "name": "Eldstæði"
+            },
             "leisure/garden": {
                 "name": "Garður"
             },
             "leisure/golf_course": {
                 "name": "Golfvöllur"
             },
+            "leisure/ice_rink": {
+                "name": "Skautasvell"
+            },
             "leisure/marina": {
                 "name": "Bátahöfn"
             },
@@ -1322,6 +1501,9 @@
             "place/locality": {
                 "name": "Staðfesti"
             },
+            "place/neighbourhood": {
+                "name": "Hverfi"
+            },
             "place/town": {
                 "name": "Bær"
             },
@@ -1334,6 +1516,9 @@
             "power": {
                 "name": "Orka"
             },
+            "power/generator": {
+                "name": "Aflstöð"
+            },
             "power/line": {
                 "name": "Orkulína"
             },
@@ -1358,6 +1543,9 @@
             "railway/disused": {
                 "name": "Ónotaðir lestarteinar"
             },
+            "railway/funicular": {
+                "name": "Toglest"
+            },
             "railway/level_crossing": {
                 "name": "Jöfn vegamót"
             },
@@ -1394,6 +1582,9 @@
             "shop/alcohol": {
                 "name": "Vínbúð"
             },
+            "shop/art": {
+                "name": "Listverslun"
+            },
             "shop/bakery": {
                 "name": "Bakarí"
             },
@@ -1406,6 +1597,9 @@
             "shop/bicycle": {
                 "name": "Hjólabúð"
             },
+            "shop/bookmaker": {
+                "name": "Veðmangari"
+            },
             "shop/books": {
                 "name": "Bóksala"
             },
@@ -1463,6 +1657,9 @@
             "shop/florist": {
                 "name": "Blómabúð"
             },
+            "shop/funeral_directors": {
+                "name": "Útfararheimili"
+            },
             "shop/furniture": {
                 "name": "Húsgagnaverslun"
             },
@@ -1517,6 +1714,10 @@
             "shop/pet": {
                 "name": "Dýrabúð"
             },
+            "shop/seafood": {
+                "name": "Fiskverslu",
+                "terms": "verslun með sjávarfang"
+            },
             "shop/shoes": {
                 "name": "Skóbúð"
             },

diff --git a/vendor/assets/iD/iD/locales/it.json b/vendor/assets/iD/iD/locales/it.json
index e49eac4ea241d7bb3cb8eab522a0151f984a1262..e3866479c7b6b60eadc35dd62fc045de134bb237 100644 (file)
--- a/vendor/assets/iD/iD/locales/it.json
+++ b/vendor/assets/iD/iD/locales/it.json
@@ -212,7 +212,7 @@
     "commit": {
         "title": "Salva le modifiche",
         "description_placeholder": "Una breve descrizione delle tue modifiche",
-        "message_label": "Messaggio di invio",
+        "message_label": "Commento",
         "upload_explanation": "Le modifiche che carichi saranno visibili su tutte le mappe che usano i dati di OpenStreetMap.",
         "upload_explanation_with_user": "Le modifiche che carichi come {user} saranno visibili su tutte le mappe che usano i dati di OpenStreetMap.",
         "save": "Salva",
@@ -607,6 +607,9 @@
             "fixme": {
                 "label": "Sistemare"
             },
+            "fuel": {
+                "label": "Carburante"
+            },
             "gauge": {
                 "label": "Scartamento"
             },
@@ -634,6 +637,7 @@
                 "label": "Tipo"
             },
             "hoops": {
+                "label": "Canestri",
                 "placeholder": "1, 2, 4..."
             },
             "iata": {
@@ -740,6 +744,9 @@
             "place": {
                 "label": "Tipo"
             },
+            "population": {
+                "label": "Popolazione"
+            },
             "power": {
                 "label": "Tipo"
             },
@@ -788,6 +795,9 @@
             "sac_scale": {
                 "label": "Difficoltà del sentiero"
             },
+            "seasonal": {
+                "label": "Stagionale"
+            },
             "service": {
                 "label": "Tipo"
             },
@@ -800,6 +810,12 @@
             "shop": {
                 "label": "Tipo"
             },
+            "sloped_curb": {
+                "label": "Cordolo inclinato"
+            },
+            "smoking": {
+                "label": "Zona fumatori"
+            },
             "social_facility_for": {
                 "label": "Tipo di utenza",
                 "placeholder": "Senza dimora, disabili, minori, ..."
@@ -810,6 +826,9 @@
             "sport": {
                 "label": "Sport"
             },
+            "sport_ice": {
+                "label": "Sport"
+            },
             "structure": {
                 "label": "Struttura",
                 "placeholder": "Sconosciuto",
@@ -817,7 +836,8 @@
                     "bridge": "Ponte",
                     "tunnel": "Tunnel",
                     "embankment": "Argine",
-                    "cutting": "Infossato"
+                    "cutting": "Infossato",
+                    "ford": "Guado"
                 }
             },
             "studio_type": {
@@ -829,6 +849,9 @@
             "surface": {
                 "label": "Superficie"
             },
+            "tactile_paving": {
+                "label": "Pavimento tattile"
+            },
             "toilets/disposal": {
                 "label": "Smaltimento"
             },
@@ -980,6 +1003,10 @@
                 "name": "Bar",
                 "terms": "caffè,caffé,snack,caffetteria"
             },
+            "amenity/bbq": {
+                "name": "Barbecue/Griglia",
+                "terms": "grigliata,barbeque"
+            },
             "amenity/bench": {
                 "name": "Panchina",
                 "terms": "panca,poltrona,sedile"
@@ -1096,6 +1123,10 @@
                 "name": "Parcheggio",
                 "terms": "parcheggio auto,autorimessa"
             },
+            "amenity/parking_entrance": {
+                "name": "Entrata/Uscita Garage",
+                "terms": "garage,posto auto,posteggio,parcheggio"
+            },
             "amenity/pharmacy": {
                 "name": "Farmacia",
                 "terms": "Farmacia"
@@ -1300,14 +1331,26 @@
                 "name": "Appartamenti",
                 "terms": "appartamenti,condominio,palazzo,palazzone,casermone,case popolari,abitazioni,case,edilizia popolare,peep,iacp"
             },
+            "building/barn": {
+                "name": "Fienile",
+                "terms": "granaio,basso servizio,tesa"
+            },
             "building/bunker": {
                 "name": "Bunker",
                 "terms": "bunker,casamatta"
             },
+            "building/cabin": {
+                "name": "Capanna",
+                "terms": "capanna,attrezzi,rimessa,ripostiglio,basso servizio"
+            },
             "building/cathedral": {
                 "name": "Cattedrale",
                 "terms": "cattedrale,chiesa,monumento,religioso"
             },
+            "building/chapel": {
+                "name": "Cappella",
+                "terms": "chiesetta,capellina"
+            },
             "building/church": {
                 "name": "Chiesa",
                 "terms": "cristiano,abbazia,basilica,cattedrale,presbiterio,cappella,chiesa,casa di Dio,luogo di preghiera,luogo di culto,missione,oratorio,parrocchia,sacello,edicola votiva,tabernacolo,tempio"
@@ -1320,13 +1363,17 @@
                 "name": "Edificio in costruzione",
                 "terms": "cantiere,struttura,in costruzione"
             },
+            "building/detached": {
+                "name": "Casa autonoma",
+                "terms": "casa autonoma"
+            },
             "building/dormitory": {
                 "name": "Dormitorio",
                 "terms": "dormitorio,struttura sociale"
             },
             "building/entrance": {
-                "name": "Entrata",
-                "terms": "Entrata"
+                "name": "Entrata/Uscita",
+                "terms": "entrata,uscita,emergenza,accesso,porta,portone,ingresso"
             },
             "building/garage": {
                 "name": "Garage",
@@ -1368,6 +1415,10 @@
                 "name": "Edificio residenziale",
                 "terms": "Edificio residenziale"
             },
+            "building/retail": {
+                "name": "Negozio",
+                "terms": "edificio commerciale,commerciale,negozi"
+            },
             "building/roof": {
                 "name": "Tettoia",
                 "terms": "tetto,pensilina"
@@ -1376,10 +1427,18 @@
                 "name": "Edificio scolastico",
                 "terms": "accademia,alma mater,lavagna,collegio,dipartimento,disciplina,classe,facoltà,aula,istituto,istituzione,riformatorio,scuola,edificio scolastico,seminario,università"
             },
+            "building/shed": {
+                "name": "Capanno",
+                "terms": "capanno degli attrezzi,capanna,rimessa,capannone"
+            },
             "building/stable": {
                 "name": "Stalla",
                 "terms": "stalla,ricovero,scuderia"
             },
+            "building/terrace": {
+                "name": "Villette a schiera",
+                "terms": "villette,fila di case"
+            },
             "building/train_station": {
                 "name": "Stazione ferroviaria",
                 "terms": "treno,stazione,centrale"
@@ -1454,12 +1513,20 @@
                 "name": "Fotografo",
                 "terms": "fotografia,stampe"
             },
+            "craft/photographic_laboratory": {
+                "name": "Laboratorio Fotografico",
+                "terms": "laboratorio,foto,fotografia,stampe"
+            },
             "craft/plumber": {
                 "name": "Idraulico"
             },
             "craft/sailmaker": {
                 "name": "Velaio"
             },
+            "craft/sawmill": {
+                "name": "Segheria",
+                "terms": "legno,segheria"
+            },
             "craft/sculpter": {
                 "name": "Scultore"
             },
@@ -1488,8 +1555,8 @@
                 "terms": "Telefono di emergenza"
             },
             "entrance": {
-                "name": "Entrata",
-                "terms": "Entrata"
+                "name": "Entrata/Uscita",
+                "terms": "entrata,uscita,emergenza,accesso,porta,portone,ingresso"
             },
             "footway/crossing": {
                 "name": "Attraversamento",
@@ -1499,6 +1566,10 @@
                 "name": "Marciapiede",
                 "terms": "marciapiedi,passeggio,salvagente,banchina"
             },
+            "ford": {
+                "name": "Guado",
+                "terms": "guado"
+            },
             "golf/bunker": {
                 "name": "Bunker",
                 "terms": "sabbia"
@@ -1723,6 +1794,10 @@
                 "name": "Cimitero",
                 "terms": "Cimitero"
             },
+            "landuse/churchyard": {
+                "name": "Area parrocchiale",
+                "terms": "sagrato,parrocchia"
+            },
             "landuse/commercial": {
                 "name": "Commerciale",
                 "terms": "Commerciale"
@@ -1763,6 +1838,10 @@
                 "name": "Coltivazione erbacea",
                 "terms": "Prato"
             },
+            "landuse/military": {
+                "name": "Militare",
+                "terms": "base,militare,forze dell'ordine,soldati,caserma,fanteria,artiglieria"
+            },
             "landuse/orchard": {
                 "name": "Frutteto",
                 "terms": "Frutteto"
@@ -2358,6 +2437,10 @@
                 "name": "Fioraio",
                 "terms": "Fioraio"
             },
+            "shop/funeral_directors": {
+                "name": "Casa funeraria",
+                "terms": "funerale,cimitero"
+            },
             "shop/furniture": {
                 "name": "Negozio di mobili",
                 "terms": "Negozio di mobili"
@@ -2486,6 +2569,10 @@
                 "name": "Videoteca",
                 "terms": "Videoteca"
             },
+            "shop/wine": {
+                "name": "Enoteca",
+                "terms": "vino,negozio di vini"
+            },
             "tourism": {
                 "name": "Turismo",
                 "terms": "turismo,attrazione,turistica,interesse,turisti,escursionismo,viaggio,gita"

diff --git a/vendor/assets/iD/iD/locales/ja.json b/vendor/assets/iD/iD/locales/ja.json
index d3ead5fc3ad700f292ef7cd6b06b99edf36849e5..61985762ce5ff3bf0a78fe6b0b5ac7b995cfb922 100644 (file)
--- a/vendor/assets/iD/iD/locales/ja.json
+++ b/vendor/assets/iD/iD/locales/ja.json
@@ -610,6 +610,33 @@
             "fuel": {
                 "label": "ガソリンスタンド"
             },
+            "fuel/biodiesel": {
+                "label": "バイオディーゼルの販売"
+            },
+            "fuel/diesel": {
+                "label": "軽油の販売"
+            },
+            "fuel/e10": {
+                "label": "E10の販売"
+            },
+            "fuel/e85": {
+                "label": "E85の販売"
+            },
+            "fuel/lpg": {
+                "label": "プロパンの販売"
+            },
+            "fuel/octane_100": {
+                "label": "レース用ガソリンの販売"
+            },
+            "fuel/octane_91": {
+                "label": "レギュラーガソリンの販売"
+            },
+            "fuel/octane_95": {
+                "label": "中品質ガソリンの販売"
+            },
+            "fuel/octane_98": {
+                "label": "ハイオクガソリンの販売"
+            },
             "gauge": {
                 "label": "軌間"
             },
@@ -673,6 +700,9 @@
             "leisure": {
                 "label": "タイプ"
             },
+            "length": {
+                "label": "長さ (m)"
+            },
             "levels": {
                 "label": "階数",
                 "placeholder": "2, 4, 6..."
@@ -744,6 +774,9 @@
             "place": {
                 "label": "タイプ"
             },
+            "population": {
+                "label": "人口"
+            },
             "power": {
                 "label": "区分"
             },
@@ -807,6 +840,9 @@
             "shop": {
                 "label": "店舗種別"
             },
+            "sloped_curb": {
+                "label": "歩道のすりつけ勾配"
+            },
             "smoking": {
                 "label": "喫煙"
             },
@@ -830,7 +866,8 @@
                     "bridge": "橋",
                     "tunnel": "トンネル",
                     "embankment": "土手",
-                    "cutting": "切り通し"
+                    "cutting": "切り通し",
+                    "ford": "洗い越し"
                 }
             },
             "studio_type": {
@@ -842,6 +879,9 @@
             "surface": {
                 "label": "路面状態"
             },
+            "tactile_paving": {
+                "label": "点字ブロック"
+            },
             "toilets/disposal": {
                 "label": "汚物処理"
             },
@@ -885,6 +925,9 @@
             "wheelchair": {
                 "label": "車椅子の利用可否"
             },
+            "width": {
+                "label": "幅 (m)"
+            },
             "wikipedia": {
                 "label": "Wikipedia"
             },
@@ -1029,6 +1072,10 @@
                 "name": "車の洗浄",
                 "terms": "洗車機, 洗車, 車洗浄, カーウォッシュ"
             },
+            "amenity/charging_station": {
+                "name": "充電スタンド",
+                "terms": "充電ステーション, 急速充電システム, 充電スタンド, 給電スタンド"
+            },
             "amenity/childcare": {
                 "name": "保育施設",
                 "terms": "託児所,保育園,幼稚園,学童保育"
@@ -1049,6 +1096,10 @@
                 "name": "単科大学",
                 "terms": "大学,短大,専門学校,高専"
             },
+            "amenity/compressed_air": {
+                "name": "空気入れ",
+                "terms": "空気入れ, エアー調整"
+            },
             "amenity/courthouse": {
                 "name": "裁判所",
                 "terms": "裁判所"
@@ -1113,6 +1164,10 @@
                 "name": "駐車場",
                 "terms": "駐車場"
             },
+            "amenity/parking_entrance": {
+                "name": "駐車場の出入口",
+                "terms": "駐車場の出入口"
+            },
             "amenity/pharmacy": {
                 "name": "薬局",
                 "terms": "調剤,調剤薬局,薬局"
@@ -1359,7 +1414,7 @@
             },
             "building/entrance": {
                 "name": "出入口",
-                "terms": "出入口, エントランス"
+                "terms": "出入口, 入口, 出口"
             },
             "building/garage": {
                 "name": "車庫",
@@ -1639,7 +1694,7 @@
             },
             "entrance": {
                 "name": "出入口",
-                "terms": "出入口"
+                "terms": "出入口, 入口, 出口"
             },
             "footway/crossing": {
                 "name": "横断歩道",
@@ -1649,6 +1704,10 @@
                 "name": "歩道",
                 "terms": "歩道"
             },
+            "ford": {
+                "name": "洗い越し",
+                "terms": "洗い越し, 浅瀬"
+            },
             "golf/bunker": {
                 "name": "サンドトラップ",
                 "terms": "サンドトラップ,バンカー"
@@ -1881,6 +1940,10 @@
                 "name": "霊園",
                 "terms": "霊園, 墓地"
             },
+            "landuse/churchyard": {
+                "name": "教会の敷地",
+                "terms": "教会, 教会の敷地"
+            },
             "landuse/commercial": {
                 "name": "オフィス地区",
                 "terms": "ビジネス街,オフィス街,オフィス地区"
@@ -1921,6 +1984,10 @@
                 "name": "牧草地",
                 "terms": "牧草地"
             },
+            "landuse/military": {
+                "name": "軍事",
+                "terms": "軍事,自衛隊"
+            },
             "landuse/orchard": {
                 "name": "果樹園",
                 "terms": "果樹園, 果物畑, リンゴ畑, ミカン畑"
@@ -2673,6 +2740,10 @@
                 "name": "ビデオソフト店",
                 "terms": "ビデオソフト店, DVD店"
             },
+            "shop/wine": {
+                "name": "ワイン店",
+                "terms": "ワイン店, 酒屋"
+            },
             "tourism": {
                 "name": "観光",
                 "terms": "旅行, 観光"

diff --git a/vendor/assets/iD/iD/locales/ko.json b/vendor/assets/iD/iD/locales/ko.json
index b30d639723eaf063e73314d11c174574656fa517..7eaca38bc77b772370eaf754d6e512a0ff62f6a6 100644 (file)
--- a/vendor/assets/iD/iD/locales/ko.json
+++ b/vendor/assets/iD/iD/locales/ko.json
@@ -61,17 +61,18 @@
             "annotation": "태그를 바꿨습니다."
         },
         "circularize": {
-            "title": "순환하기",
+            "title": "둥글게하기",
             "description": {
-                "line": "이 선 순환을 만듭니다.",
-                "area": "이 지역 순환을 만듭니다."
+                "line": "이 선을 둥글게 만듭니다.",
+                "area": "이 지역을 둥글게 만듭니다."
             },
             "key": "O",
             "annotation": {
-                "line": "선 순환을 만들었습니다.",
-                "area": "지역 순환을 만들었습니다."
+                "line": "선을 둥글게 만들었습니다.",
+                "area": "지역을 둥글게 만들었습니다."
             },
-            "not_closed": "지역이 닫혀있지 않기 때문에 순환을 만들 수 없습니다."
+            "not_closed": "지역이 닫혀있지 않기 때문에 둥글게 만들 수 없습니다.",
+            "too_large": "지역이 현재 충분히 보이지 않기 때문에 둥글게 만들 수 없습니다."
         },
         "orthogonalize": {
             "title": "사각지기",
@@ -84,7 +85,8 @@
                 "line": "선의 모서리를 사각지게 했습니다.",
                 "area": "지역의 모서리를 사각지게 했습니다."
             },
-            "not_squarish": "사각 형태가 아니기 때문에 사각지게 할 수 없습니다."
+            "not_squarish": "사각 형태가 아니기 때문에 사각지게 만들 수 없습니다.",
+            "too_large": "지역이 현재 충분히 보이지 않기 때문에 사각지게 만들 수 없습니다."
         },
         "straighten": {
             "title": "곧게 하기",
@@ -265,6 +267,8 @@
         "percent_brightness": "명도 {opacity}%",
         "none": "없음",
         "custom": "사용자 지정",
+        "custom_button": "사용자 지정 배경 편집",
+        "custom_prompt": "타일 URL 템플릿을 입력하세요. 올바른 토큰은 Z/X/Y scheme에 대해 {z}, {x}, {y}이고 quadtile scheme에 대해 {u}입니다.",
         "fix_misalignment": "정렬 고치기",
         "reset": "재설정"
     },
@@ -376,7 +380,7 @@
             "title": "선",
             "add": "선은 도로, 철도와 강과 같은 기능을 표현하는 데 사용됩니다. **새 선을 추가하려면 선 버튼을 클릭하세요.**",
             "start": "**도로의 끝에 클릭하여 선을 시작하세요.**",
-            "intersect": "ì\84 ì\97\90 ë\8d\94 ë§\8eì\9d\80 ë\85¸ë\93\9c를 ì¶\94ê°\80í\95\98ë ¤ë©´ í\81´ë¦­í\95\98ì\84¸ì\9a\94. í\95\84ì\9a\94í\95\98ë\8b¤ë©´ 그리ë\8a\94 ë\8f\99ì\95\88 ì§\80ë\8f\84를 ë\93\9cë\9e\98ê·¸í\95  ì\88\98 ì\9e\88ì\8aµë\8b\88ë\8b¤. ë\8f\84ë¡\9cì\99\80 ì\84 ì\9d\98 ë\8b¤ë¥¸ ë§\8eì\9d\80 ì\9c í\98\95ì\9d\80 í\81° ë\84¤í\8a¸ì\9b\8cí\81¬ì\9d\98 ë¶\80ë¶\84ì\9e\85ë\8b\88ë\8b¤. ì\9d´ ì\84 ì\9d´ ì\9e\91ë\8f\99í\95\98ë\8a\94 ì\95 í\94\8c리ì¼\80ì\9d´ì\85\98ì\9d\84 ê²½ë¡\9c ì§\80ì \95í\95\98기 위해서는 제대로 연결하는 것이 중요합니다. **두 선을 연결하는 교차로를 만드려면, Flower Street를 클릭하세요.**",
+            "intersect": "ì\84 ì\97\90 ë\8d\94 ë§\8eì\9d\80 ë\85¸ë\93\9c를 ì¶\94ê°\80í\95\98ë ¤ë©´ í\81´ë¦­í\95\98ì\84¸ì\9a\94. í\95\84ì\9a\94í\95\98ë\8b¤ë©´ 그리ë\8a\94 ë\8f\99ì\95\88 ì§\80ë\8f\84를 ë\93\9cë\9e\98ê·¸í\95  ì\88\98 ì\9e\88ì\8aµë\8b\88ë\8b¤. ë\8f\84ë¡\9cì\99\80 ì\84 ì\9d\98 ë\8b¤ë¥¸ ë§\8eì\9d\80 ì\9c í\98\95ì\9d\80 í\81° ë\84¤í\8a¸ì\9b\8cí\81¬ì\9d\98 ë¶\80ë¶\84ì\9e\85ë\8b\88ë\8b¤. ì\9d´ ì\84 ì\9d´ ì\9e\91ë\8f\99í\95\98ë\8a\94 ì\95 í\94\8c리ì¼\80ì\9d´ì\85\98ì\9d\98 ê²½ë¡\9c ì§\80ì \95ì\9d\84 위해서는 제대로 연결하는 것이 중요합니다. **두 선을 연결하는 교차로를 만드려면, Flower Street를 클릭하세요.**",
             "finish": "선은 마지막 노드를 다시 클릭하여 마칠 수 있습니다. **도로 그리기를 마치세요.**",
             "road": "**목록에서 도로를 선택하세요**",
             "residential": "여기에 도로의 여러 종류가 있지만, 가장 자주 그리게 되는 것은 주거 도로입니다. **주거 도로 유형을 선택하세요**",
@@ -474,6 +478,21 @@
             "admin_level": {
                 "label": "관리 수준"
             },
+            "aerialway": {
+                "label": "유형"
+            },
+            "aerialway/capacity": {
+                "label": "수용자 수 (시간당)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "label": "소요 시간 (분)",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/occupancy": {
+                "label": "무게",
+                "placeholder": "2, 4, 8..."
+            },
             "aeroway": {
                 "label": "유형"
             },
@@ -508,7 +527,7 @@
                 "label": "건물"
             },
             "capacity": {
-                "label": "수용 가능한 수",
+                "label": "수용자 수",
                 "placeholder": "50, 100, 200..."
             },
             "cardinal_direction": {
@@ -580,12 +599,18 @@
                 "label": "참고",
                 "placeholder": "홀 수 (1-18)"
             },
+            "handicap": {
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "유형"
             },
             "historic": {
                 "label": "유형"
             },
+            "hoops": {
+                "placeholder": "1, 2, 4..."
+            },
             "iata": {
                 "label": "IATA"
             },
@@ -677,6 +702,9 @@
                 "label": "전화",
                 "placeholder": "+31 42 123 4567"
             },
+            "piste/type": {
+                "label": "유형"
+            },
             "place": {
                 "label": "유형"
             },
@@ -744,6 +772,9 @@
                     "cutting": "절토"
                 }
             },
+            "studio_type": {
+                "label": "유형"
+            },
             "supervised": {
                 "label": "감독 장소"
             },
@@ -952,6 +983,9 @@
             "amenity/restaurant": {
                 "name": "음식점"
             },
+            "amenity/school": {
+                "name": "학교 운동장"
+            },
             "amenity/shelter": {
                 "name": "피난처"
             },
@@ -1049,9 +1083,6 @@
             "building/commercial": {
                 "name": "상업 건물"
             },
-            "building/entrance": {
-                "name": "입구"
-            },
             "building/garage": {
                 "name": "차고"
             },
@@ -1067,6 +1098,9 @@
             "building/residential": {
                 "name": "주거 건물"
             },
+            "building/school": {
+                "name": "학교 건물"
+            },
             "embankment": {
                 "name": "둑",
                 "terms": "제방"
@@ -1081,9 +1115,6 @@
             "emergency/phone": {
                 "name": "긴급 전화"
             },
-            "entrance": {
-                "name": "입구"
-            },
             "footway/crossing": {
                 "name": "횡단보도"
             },
@@ -1322,6 +1353,9 @@
             "leisure/golf_course": {
                 "name": "골프장"
             },
+            "leisure/ice_rink": {
+                "name": "아이스 링크"
+            },
             "leisure/marina": {
                 "name": "마리나",
                 "terms": "항구,선착장"
@@ -1329,6 +1363,9 @@
             "leisure/park": {
                 "name": "공원"
             },
+            "leisure/picnic_table": {
+                "name": "피크닉 테이블"
+            },
             "leisure/pitch": {
                 "name": "운동장"
             },

diff --git a/vendor/assets/iD/iD/locales/lt.json b/vendor/assets/iD/iD/locales/lt.json
index 9debdd528976100421cf6e6630e83bdcef40108e..9fac89b5b17413d5d7e78ad2711e1dd74b4f9bf6 100644 (file)
--- a/vendor/assets/iD/iD/locales/lt.json
+++ b/vendor/assets/iD/iD/locales/lt.json
@@ -941,9 +941,6 @@
                 "name": "Komercinis pastatas",
                 "terms": "komercinis,pastatas,statinys"
             },
-            "building/entrance": {
-                "name": "Įėjimas"
-            },
             "building/garage": {
                 "name": "Garažas"
             },
@@ -964,9 +961,6 @@
             "emergency/phone": {
                 "name": "Pagalbos telefonas"
             },
-            "entrance": {
-                "name": "Įėjimas"
-            },
             "footway/sidewalk": {
                 "name": "Šaligatvis"
             },

diff --git a/vendor/assets/iD/iD/locales/lv.json b/vendor/assets/iD/iD/locales/lv.json
index b3b8a0a67093a0d74839af0d997fb053c54b8217..4548cab9fa1b2e0ab171e789029e0c5c936a7ac3 100644 (file)
--- a/vendor/assets/iD/iD/locales/lv.json
+++ b/vendor/assets/iD/iD/locales/lv.json
@@ -676,15 +676,9 @@
             "building/apartments": {
                 "name": "Dzīvokļi"
             },
-            "building/entrance": {
-                "name": "Ieeja"
-            },
             "building/house": {
                 "name": "Māja"
             },
-            "entrance": {
-                "name": "Ieeja"
-            },
             "highway": {
                 "name": "Šoseja"
             },

diff --git a/vendor/assets/iD/iD/locales/nl.json b/vendor/assets/iD/iD/locales/nl.json
index db8dfaa53c18a98d35035c7491c379aec68a1776..12effe1acae884da0c90ea57fea62cb6422d40a0 100644 (file)
--- a/vendor/assets/iD/iD/locales/nl.json
+++ b/vendor/assets/iD/iD/locales/nl.json
@@ -1132,9 +1132,6 @@
             "building/dormitory": {
                 "name": "Slaapzaal"
             },
-            "building/entrance": {
-                "name": "Ingang"
-            },
             "building/garage": {
                 "name": "Garage",
                 "terms": "garage"
@@ -1265,9 +1262,6 @@
             "emergency/phone": {
                 "name": "Praatpaal"
             },
-            "entrance": {
-                "name": "Ingang"
-            },
             "highway": {
                 "name": "Autosnelweg"
             },

diff --git a/vendor/assets/iD/iD/locales/no.json b/vendor/assets/iD/iD/locales/no.json
index d2f4346cb07ca56080ded7cdf5ec2b1f0e51309f..5a6c35edf7846076d0bc889a0f7c096120029ec7 100644 (file)
--- a/vendor/assets/iD/iD/locales/no.json
+++ b/vendor/assets/iD/iD/locales/no.json
@@ -800,9 +800,6 @@
             "building/apartments": {
                 "name": "Leiligheter"
             },
-            "building/entrance": {
-                "name": "Inngang"
-            },
             "building/house": {
                 "name": "Hus"
             },
@@ -812,9 +809,6 @@
             "emergency/phone": {
                 "name": "Nødtelefon"
             },
-            "entrance": {
-                "name": "Inngang"
-            },
             "highway": {
                 "name": "Vei"
             },

diff --git a/vendor/assets/iD/iD/locales/pl.json b/vendor/assets/iD/iD/locales/pl.json
index c87b7c3f4237a2f112e67d822bd61a7a4539ca32..3e159f58323cd2ac365666b023a68cbc7c9541ae 100644 (file)
--- a/vendor/assets/iD/iD/locales/pl.json
+++ b/vendor/assets/iD/iD/locales/pl.json
@@ -265,6 +265,7 @@
         "percent_brightness": "jasność {opacity}%",
         "none": "Brak",
         "custom": "Własne",
+        "custom_button": "Edycja własnego podkładu",
         "fix_misalignment": "Wyrównaj podkład",
         "reset": "resetuj"
     },
@@ -597,6 +598,9 @@
             "fixme": {
                 "label": "Napraw mnie"
             },
+            "fuel": {
+                "label": "Paliwo"
+            },
             "gauge": {
                 "label": "Wskaźnik"
             },
@@ -712,6 +716,9 @@
             "place": {
                 "label": "Typ"
             },
+            "population": {
+                "label": "Populacja"
+            },
             "power": {
                 "label": "Typ"
             },
@@ -748,6 +755,9 @@
             "sac_scale": {
                 "label": "Trudność trasy"
             },
+            "seasonal": {
+                "label": "Sezonowy"
+            },
             "service": {
                 "label": "Typ"
             },
@@ -760,12 +770,18 @@
             "shop": {
                 "label": "Typ"
             },
+            "smoking": {
+                "label": "Dla palących, Palenie, "
+            },
             "source": {
                 "label": "Źródło"
             },
             "sport": {
                 "label": "Sport"
             },
+            "sport_ice": {
+                "label": "Sport"
+            },
             "structure": {
                 "label": "Struktura",
                 "placeholder": "Nieznane",
@@ -844,22 +860,28 @@
                 "name": "Kolejka górska"
             },
             "aerialway/chair_lift": {
-                "name": "Wyciag krzesełkowy"
+                "name": "Wyciag krzesełkowy",
+                "terms": "Wyciąg narciarski krzesełkowy,"
             },
             "aerialway/gondola": {
-                "name": "Gondola"
+                "name": "Gondola",
+                "terms": "Wyciąg narciarski gondolowy, Gondola"
             },
             "aerialway/magic_carpet": {
-                "name": "wyciąg narciarski dywanowy"
+                "name": "wyciąg narciarski dywanowy",
+                "terms": "Narciarski pas transmisyjny dla dzieci, "
             },
             "aerialway/platter": {
-                "name": "Wyciag talerzykowy"
+                "name": "Wyciag talerzykowy",
+                "terms": "Wyciąg talerzykowy, "
             },
             "aerialway/pylon": {
-                "name": "Podpora wyciagu narciarskiego"
+                "name": "Podpora wyciagu narciarskiego",
+                "terms": "Podpora, słup "
             },
             "aerialway/rope_tow": {
-                "name": "Wyrwirączka"
+                "name": "Wyrwirączka",
+                "terms": "Wyrwirączka"
             },
             "aerialway/station": {
                 "name": "Stacja wyciagu narciarskiego"
@@ -921,6 +943,9 @@
                 "name": "Bar",
                 "terms": "bar"
             },
+            "amenity/bbq": {
+                "name": "Grill"
+            },
             "amenity/bench": {
                 "name": "Ławka",
                 "terms": "ławka,siedzenie,siedzisko"
@@ -964,7 +989,8 @@
                 "name": "Klinika"
             },
             "amenity/clock": {
-                "name": "Zegar"
+                "name": "Zegar",
+                "terms": "Zegar, "
             },
             "amenity/college": {
                 "name": "Uczelnia",
@@ -975,7 +1001,8 @@
                 "terms": "sąd,sprawiedliwość,trybunał"
             },
             "amenity/dentist": {
-                "name": "Dentysta"
+                "name": "Dentysta",
+                "terms": "Dentysta, "
             },
             "amenity/doctor": {
                 "name": "Doktor"
@@ -1016,6 +1043,10 @@
                 "name": "Targowisko",
                 "terms": "targowisko,targ,rynek,giełda"
             },
+            "amenity/nightclub": {
+                "name": "Klub nocny",
+                "terms": "Klub nocny,"
+            },
             "amenity/parking": {
                 "name": "Parking samochodowy"
             },
@@ -1067,13 +1098,15 @@
                 "terms": "bar,kawiarnia,stołówka,jadalnia,drive-in,knajpa,jadłodajnia,fast food,grill,gospoda,klub nocny,pizzeria"
             },
             "amenity/shelter": {
-                "name": "Schronienie"
+                "name": "Schronienie",
+                "terms": "schronienie, "
             },
             "amenity/social_facility": {
                 "name": "Placówka pomocy społecznej"
             },
             "amenity/social_facility/food_bank": {
-                "name": "Bank żywności"
+                "name": "Bank żywności",
+                "terms": "Bank żywności, "
             },
             "amenity/social_facility/homeless_shelter": {
                 "name": "Schronisko dla bezdomnych"
@@ -1114,7 +1147,8 @@
                 "terms": "automat do sprzedaży"
             },
             "amenity/veterinary": {
-                "name": "Weterynarz"
+                "name": "Weterynarz",
+                "terms": "Zakład weterynaryjny, Weterynarz"
             },
             "amenity/waste_basket": {
                 "name": "Kosz na śmieci",
@@ -1209,24 +1243,24 @@
                 "name": "Bunkier"
             },
             "building/cathedral": {
-                "name": "Katedra"
+                "name": "Katedra",
+                "terms": "Katedra, "
             },
             "building/chapel": {
-                "name": "Kaplica"
+                "name": "Kaplica",
+                "terms": "Kaplica, "
             },
             "building/church": {
-                "name": "Kościół"
+                "name": "Kościół",
+                "terms": "Kościół, "
             },
             "building/commercial": {
                 "name": "Nieruchomość komercyjna",
                 "terms": "sklep,komercyjny,sprzedaż,handlowy"
             },
             "building/dormitory": {
-                "name": "Akademik"
-            },
-            "building/entrance": {
-                "name": "Wejście",
-                "terms": "wejście,drzwi"
+                "name": "Akademik",
+                "terms": "Akademik, bursa, "
             },
             "building/garage": {
                 "name": "Garaż",
@@ -1236,7 +1270,8 @@
                 "name": "Garaże"
             },
             "building/greenhouse": {
-                "name": "Szklarnia"
+                "name": "Szklarnia",
+                "terms": "Szklarnia"
             },
             "building/house": {
                 "name": "Dom",
@@ -1258,7 +1293,11 @@
                 "terms": "blok, kamienica, dom, czynszówka"
             },
             "building/roof": {
-                "name": "Zadaszenie"
+                "name": "Zadaszenie",
+                "terms": "Dach,"
+            },
+            "building/school": {
+                "name": "Budynek szkolny"
             },
             "building/shed": {
                 "name": "Szopa"
@@ -1267,7 +1306,8 @@
                 "name": "Stajnia"
             },
             "building/train_station": {
-                "name": "Stacja kolejowa"
+                "name": "Stacja kolejowa",
+                "terms": "Stacja kolejowa, "
             },
             "building/warehouse": {
                 "name": "Magazyn"
@@ -1285,7 +1325,8 @@
                 "name": "Introligator"
             },
             "craft/brewery": {
-                "name": "Gorzelnia"
+                "name": "Gorzelnia",
+                "terms": "Gorzelnia, "
             },
             "craft/caterer": {
                 "name": "Żywieniowiec"
@@ -1306,7 +1347,8 @@
                 "name": "Ogrodnik"
             },
             "craft/glaziery": {
-                "name": "Szklarz"
+                "name": "Szklarz",
+                "terms": "Zakład szklarski, Szklarz"
             },
             "craft/handicraft": {
                 "name": "Rzemiosło"
@@ -1318,7 +1360,8 @@
                 "name": "Ślusarz"
             },
             "craft/optician": {
-                "name": "Optyk"
+                "name": "Optyk",
+                "terms": "Zakład optyczny, Optyk"
             },
             "craft/painter": {
                 "name": "Malarz"
@@ -1326,6 +1369,9 @@
             "craft/photographer": {
                 "name": "Fotograf"
             },
+            "craft/photographic_laboratory": {
+                "name": "Laboratorium fotograficzne"
+            },
             "craft/plasterer": {
                 "name": "Tynkarz"
             },
@@ -1357,10 +1403,12 @@
                 "name": "Szewc"
             },
             "craft/stonemason": {
-                "name": "Zakład kamieniarski"
+                "name": "Zakład kamieniarski",
+                "terms": "Zakład Kamieniarski, Kamieniarz"
             },
             "craft/sweep": {
-                "name": "Kominiarz"
+                "name": "Kominiarz",
+                "terms": "Kominiarz"
             },
             "craft/tailor": {
                 "name": "Krawiec"
@@ -1392,17 +1440,17 @@
                 "name": "Telefon alarmowy",
                 "terms": "telefon,alarmowy,alarm"
             },
-            "entrance": {
-                "name": "Wejście",
-                "terms": "wejście,przejście"
-            },
             "footway/crossing": {
-                "name": "Przejście dla pieszych"
+                "name": "Przejście dla pieszych",
+                "terms": "przejście dla pieszych, "
             },
             "footway/sidewalk": {
                 "name": "Chodnik",
                 "terms": "chodnik"
             },
+            "golf/hole": {
+                "name": "dołek na polu golfowym "
+            },
             "highway": {
                 "name": "Droga",
                 "terms": "droga,szlak,ulica"
@@ -1503,7 +1551,8 @@
                 "name": "Uliczka parkingowa"
             },
             "highway/services": {
-                "name": "Obszar usługowy"
+                "name": "Obszar usługowy",
+                "terms": "Obszar serwisowy, "
             },
             "highway/steps": {
                 "name": "Schody",
@@ -1630,6 +1679,9 @@
                 "name": "Łąka",
                 "terms": "Łąka"
             },
+            "landuse/military": {
+                "name": "Wojskowy"
+            },
             "landuse/orchard": {
                 "name": "Sad",
                 "terms": "Sad"
@@ -1650,7 +1702,8 @@
                 "terms": "winnica"
             },
             "leisure": {
-                "name": "Rozrywka i wypoczynek"
+                "name": "Rozrywka i wypoczynek",
+                "terms": "Wypoczynek, czas wolny"
             },
             "leisure/dog_park": {
                 "name": "Park dla psów"
@@ -1663,6 +1716,9 @@
                 "name": "Pole golfowe",
                 "terms": "pole golfowe"
             },
+            "leisure/ice_rink": {
+                "name": "Lodowisko"
+            },
             "leisure/marina": {
                 "name": "Przystań",
                 "terms": "przystań"
@@ -1671,8 +1727,12 @@
                 "name": "Park",
                 "terms": "las,ogród,trawa,zieleń,trawnik,łąka,miejsce,plac,teren rekreacyjny"
             },
+            "leisure/picnic_table": {
+                "name": "Stół piknikowy"
+            },
             "leisure/pitch": {
-                "name": "Boisko"
+                "name": "Boisko",
+                "terms": "boisko sportowe, boisko"
             },
             "leisure/pitch/american_football": {
                 "name": "Boisko do futbolu amerykańskiego"
@@ -1725,7 +1785,8 @@
                 "terms": "tor wyścigowy"
             },
             "line": {
-                "name": "Linia"
+                "name": "Linia",
+                "terms": "Linia, lina"
             },
             "man_made": {
                 "name": "Obiekty sztuczne"
@@ -1831,7 +1892,8 @@
                 "terms": "Krzaki, zarośla"
             },
             "natural/spring": {
-                "name": "Źródło"
+                "name": "Źródło",
+                "terms": "źródło"
             },
             "natural/tree": {
                 "name": "Drzewo",
@@ -1861,7 +1923,8 @@
                 "name": "Puszcza"
             },
             "office": {
-                "name": "Biuro"
+                "name": "Biuro",
+                "terms": "Biuro,"
             },
             "office/accountant": {
                 "name": "Księgowy",
@@ -1875,13 +1938,15 @@
                 "name": "Instytucja edukacyjna"
             },
             "office/employment_agency": {
-                "name": "Agencja zatrudnienia"
+                "name": "Agencja zatrudnienia",
+                "terms": "Agencja pracy, "
             },
             "office/estate_agent": {
                 "name": "Biuro nieruchomości"
             },
             "office/insurance": {
-                "name": "Biuro ubezpieczeń"
+                "name": "Biuro ubezpieczeń",
+                "terms": "Agencja ubezpieczeniowa"
             },
             "office/newspaper": {
                 "name": "Gazeta"
@@ -1906,7 +1971,8 @@
                 "name": "Biuro podróży"
             },
             "piste": {
-                "name": "Trasa narciarska"
+                "name": "Trasa narciarska",
+                "terms": "Trasa narciarska"
             },
             "place": {
                 "name": "Miejsce"
@@ -1929,6 +1995,9 @@
             "place/locality": {
                 "name": "Okolica"
             },
+            "place/neighbourhood": {
+                "name": "Sąsiedztwo"
+            },
             "place/town": {
                 "name": "Miasto",
                 "terms": "Miasteczko"
@@ -1951,7 +2020,8 @@
                 "terms": "lina wysokiego napięcia, lina energetyczna"
             },
             "power/minor_line": {
-                "name": "Linia energetyczna o niskim stopniu ważności"
+                "name": "Linia energetyczna o niskim stopniu ważności",
+                "terms": "Linia energetyczna niskiego napięcia, "
             },
             "power/pole": {
                 "name": "Słup elektryczny"
@@ -2084,7 +2154,8 @@
                 "name": "Konfekcja"
             },
             "shop/convenience": {
-                "name": "Sklep ogólnospożywczy"
+                "name": "Sklep ogólnospożywczy",
+                "terms": "mały sklep, sklepik osiedlowy"
             },
             "shop/deli": {
                 "name": "Delikatesy"
@@ -2093,7 +2164,8 @@
                 "name": "Dom towarowy"
             },
             "shop/doityourself": {
-                "name": "Sklep dla majsterkowiczów"
+                "name": "Sklep dla majsterkowiczów",
+                "terms": "sklep dla majsterkowiczów"
             },
             "shop/dry_cleaning": {
                 "name": "Pralnia chemiczna"
@@ -2119,7 +2191,8 @@
                 "name": "Centrum ogrodnicze"
             },
             "shop/gift": {
-                "name": "Sklep z pamiątkami"
+                "name": "Sklep z pamiątkami",
+                "terms": "sklep z prezentami"
             },
             "shop/greengrocer": {
                 "name": "Warzywniak",
@@ -2159,7 +2232,8 @@
                 "name": "Sklep z telefonami komórkowymi"
             },
             "shop/motorcycle": {
-                "name": "Dealer motocykli"
+                "name": "Dealer motocykli",
+                "terms": "Dealer motocyklowy"
             },
             "shop/music": {
                 "name": "Sklep muzyczny",
@@ -2176,7 +2250,8 @@
                 "name": "Sklep turystyczny"
             },
             "shop/pet": {
-                "name": "Sklep zoologiczny"
+                "name": "Sklep zoologiczny",
+                "terms": "Sklep zoologiczny"
             },
             "shop/photo": {
                 "name": "sklep fotograficzny"
@@ -2199,7 +2274,8 @@
                 "terms": "sklep z zabawkami"
             },
             "shop/travel_agency": {
-                "name": "Biuro podróży"
+                "name": "Biuro podróży",
+                "terms": "Biuro podróży, "
             },
             "shop/tyres": {
                 "name": "Sklep z oponami"
@@ -2213,6 +2289,10 @@
             "shop/video": {
                 "name": "Sklep wideo"
             },
+            "shop/wine": {
+                "name": "Winiarnia",
+                "terms": "Winiarnia"
+            },
             "tourism": {
                 "name": "Turystyka",
                 "terms": "Turystyka"
@@ -2277,7 +2357,8 @@
                 "name": "Granica"
             },
             "type/boundary/administrative": {
-                "name": "Granica administracyjna"
+                "name": "Granica administracyjna",
+                "terms": "Granica administracyjna, "
             },
             "type/multipolygon": {
                 "name": "Wielokąt złożony"
@@ -2291,7 +2372,8 @@
                 "terms": "trasa"
             },
             "type/route/bicycle": {
-                "name": "Droga rowerowa"
+                "name": "Droga rowerowa",
+                "terms": "Trasa rowerowa, "
             },
             "type/route/bus": {
                 "name": "Trasa autobusowa "
@@ -2336,7 +2418,8 @@
                 "name": "Kanał"
             },
             "waterway/dam": {
-                "name": "Tama"
+                "name": "Tama",
+                "terms": "Zapora"
             },
             "waterway/ditch": {
                 "name": "Rów"
@@ -2349,7 +2432,8 @@
                 "terms": "odpływ,potok,ujście,strumyk,dopływ,ciek wodny"
             },
             "waterway/riverbank": {
-                "name": "Brzeg rzeki"
+                "name": "Brzeg rzeki",
+                "terms": "Brzeg rzeki, "
             },
             "waterway/stream": {
                 "name": "Strumień",

diff --git a/vendor/assets/iD/iD/locales/pt-BR.json b/vendor/assets/iD/iD/locales/pt-BR.json
index 85699482d3fa737de6f4f79e0a20c98512b725bf..f05ab243fb505038fb02c77610cc9cab8c42bbef 100644 (file)
--- a/vendor/assets/iD/iD/locales/pt-BR.json
+++ b/vendor/assets/iD/iD/locales/pt-BR.json
@@ -2,12 +2,12 @@
     "modes": {
         "add_area": {
             "title": "Área",
-            "description": "Adicione parques, prédios, lagos ou outras áreas ao mapa.",
+            "description": "Adicione parques, edifícios, lagos ou outras áreas ao mapa.",
             "tail": "Clique no mapa para começar a desenhar uma área, como um parque, lago ou edifício."
         },
         "add_line": {
             "title": "Linha",
-            "description": "Adicione rodovias, ruas, caminhos de pedestres, rios ou outras linhas ao mapa.",
+            "description": "Adicione estradas, ruas, vias de pedestres, rios ou outras linhas ao mapa.",
             "tail": "Clique no mapa para começar a desenhar uma estrada, caminho ou rota."
         },
         "add_point": {
@@ -20,24 +20,24 @@
             "description": "Mover e ampliar o mapa."
         },
         "draw_area": {
-            "tail": "Clique para adicionar nós na sua área. Clique no primeiro nó para concluir a área."
+            "tail": "Clique para adicionar pontos na sua área. Clique no primeiro ponto para concluir a área."
         },
         "draw_line": {
-            "tail": "Clique para adicionar mais nós à linha. Clique em outras linhas para conectá-la a elas. Dê um duplo clique para finalizar a linha."
+            "tail": "Clique para adicionar mais pontos à linha. Clique em outras linhas para conectá-la a elas. Dê um duplo clique para finalizar a linha."
         }
     },
     "operations": {
         "add": {
             "annotation": {
                 "point": "Adicionou um ponto.",
-                "vertex": "Adicionou um nó a uma via.",
+                "vertex": "Adicionou um ponto numa linha.",
                 "relation": "Adicionou uma relação."
             }
         },
         "start": {
             "annotation": {
                 "line": "Iniciou uma linha.",
-                "area": "Área iniciada."
+                "area": "Iniciou uma área."
             }
         },
         "continue": {
@@ -61,17 +61,18 @@
             "annotation": "Etiquetas alteradas."
         },
         "circularize": {
-            "title": "Fazer um círculo",
+            "title": "Circularizar",
             "description": {
-                "line": "Fazer um círculo com essa linha.",
-                "area": "Fazer um círculo com essa área."
+                "line": "Tornar essa linha circular.",
+                "area": "Tornar essa área circular."
             },
             "key": "O",
             "annotation": {
-                "line": "Fez da linha um círculo.",
-                "area": "Fez da área um círculo."
+                "line": "Circularizou uma linha.",
+                "area": "Circularizou uma área."
             },
-            "not_closed": "Não é possível fazer disso um círculo, pois não forma um ciclo fechado."
+            "not_closed": "Não é possível circularizar isso porque isto não forma um ciclo fechado.",
+            "too_large": "Não é possível circularizar isso porque uma parte disso não está visível."
         },
         "orthogonalize": {
             "title": "Ortogonalizar",
@@ -84,40 +85,41 @@
                 "line": "Ajustou os cantos de uma linha para 90°.",
                 "area": "Ajustou os cantos de uma área para 90°."
             },
-            "not_squarish": "Isto não pode ser ortogonalizado porque não é um polígono."
+            "not_squarish": "Isto não pode ser ortogonalizado porque não é um polígono.",
+            "too_large": "Não é possível ortogonalizar isso porque uma parte disso não está visível."
         },
         "straighten": {
-            "title": "Endireitar",
-            "description": "Endireitar esta linha.",
+            "title": "Retilinizar",
+            "description": "Tornar esta linha reta.",
             "key": "S",
-            "annotation": "Endireitar uma linha.",
-            "too_bendy": "Isto não pode ser alinhado porque possui muitas curvas."
+            "annotation": "Retilinizou uma linha.",
+            "too_bendy": "Isso não pode ser retilinizado porque é curvo demais."
         },
         "delete": {
-            "title": "Deletar",
+            "title": "Excluir",
             "description": "Remover isto do mapa.",
             "annotation": {
-                "point": "Removido um ponto.",
-                "vertex": "Removido um nó do caminho.",
-                "line": "Removida uma linha.",
-                "area": "Removida uma área.",
-                "relation": "Removida uma relação.",
-                "multiple": "Removidos {n} objetos."
-            },
-            "incomplete_relation": "Este elemento não pode ser removido porque não foi ainda totalmente baixado."
+                "point": "Excluído um ponto.",
+                "vertex": "Excluído um pondo de uma linha.",
+                "line": "Excluída uma linha.",
+                "area": "Excluída uma área.",
+                "relation": "Excluída uma relação.",
+                "multiple": "Excluídos {n} objetos."
+            },
+            "incomplete_relation": "Este objeto não pode ser excluído porque não foi ainda totalmente baixado."
         },
         "add_member": {
             "annotation": "Adicionado um membro à relação."
         },
         "delete_member": {
-            "annotation": "Removido um membro de uma relação."
+            "annotation": "Retirado um membro de uma relação."
         },
         "connect": {
             "annotation": {
-                "point": "Conectou uma via a um ponto.",
-                "vertex": "Conectou uma via a outra.",
+                "point": "Conectou uma linha a um ponto.",
+                "vertex": "Conectou uma linha a outra.",
                 "line": "Conectou uma via a uma linha.",
-                "area": "Conectou uma via a uma área."
+                "area": "Conectou uma linha a uma área."
             }
         },
         "disconnect": {
@@ -132,10 +134,10 @@
             "description": "Mesclar estas linhas.",
             "key": "C",
             "annotation": "Mesclou {n} linhas.",
-            "not_eligible": "Esses elementos não podem ser mesclados.",
+            "not_eligible": "Esses objetos não podem ser mesclados.",
             "not_adjacent": "Essas linhas não podem ser mescladas porque não estão conectadas.",
             "restriction": "Estas linhas não podem ser mescladas porque pelo menos uma delas é membro da relação \"{relation}\".",
-            "incomplete_relation": "Estas funcionalidades não podem ser mescladas porque pelo menos uma delas não foi transferida completamente."
+            "incomplete_relation": "Estes objetos não podem ser mesclados porque pelo menos um deles não foi transferido completamente."
         },
         "move": {
             "title": "Mover",
@@ -143,12 +145,12 @@
             "key": "M",
             "annotation": {
                 "point": "Ponto movido.",
-                "vertex": "Moveu um nó em uma via.",
+                "vertex": "Moveu um ponto numa linha.",
                 "line": "Moveu uma linha.",
                 "area": "Moveu uma área.",
                 "multiple": "Moveu múltiplos objetos."
             },
-            "incomplete_relation": "Este elemento não pode ser movido porque ainda não foi totalmente baixado."
+            "incomplete_relation": "Este objeto não pode ser movido porque ainda não foi totalmente baixado."
         },
         "rotate": {
             "title": "Girar",
@@ -161,16 +163,16 @@
         },
         "reverse": {
             "title": "Inverter",
-            "description": "Fazer esta linha ir na direção oposta.",
+            "description": "Fazer esta via/linha ir na direção oposta.",
             "key": "V",
             "annotation": "Inverteu uma linha."
         },
         "split": {
             "title": "Dividir",
             "description": {
-                "line": "Dividir essa linha em duas nesse nó.",
+                "line": "Dividir essa linha em duas nesse ponto.",
                 "area": "Dividir a borda dessa área em dois pedaços.",
-                "multiple": "Dividir as linhas/áreas em duas nesse nó."
+                "multiple": "Dividir as linhas/áreas em duas nesse ponto."
             },
             "key": "X",
             "annotation": {
@@ -205,11 +207,11 @@
     "status": {
         "error": "Incapaz de conectar à API.",
         "offline": "A API está offline. Por favor tente editar mais tarde.",
-        "readonly": "O OpenStreetMap está em modo somente leitura. Você terá que esperar para salvar as suas alterações."
+        "readonly": "A API do OpenStreetMap está em modo somente leitura. Espere um pouco para salvar as suas alterações."
     },
     "commit": {
         "title": "Salvar Alterações",
-        "description_placeholder": "Breve descrição de suas contribuições",
+        "description_placeholder": "Descrição curta e clara de suas contribuições",
         "message_label": "Mensagem de alteração",
         "upload_explanation": "As alterações que você enviar ficarão visíveis em todos os mapas que usam dados do OpenStreetMap.",
         "upload_explanation_with_user": "As alterações que você enviar como {user} estarão visíveis em todos os mapas que usam os dados do OpenStreetMap.",
@@ -217,12 +219,12 @@
         "cancel": "Cancelar",
         "warnings": "Alertas",
         "modified": "Modificado",
-        "deleted": "Removido",
+        "deleted": "Excluído",
         "created": "Criado"
     },
     "contributors": {
-        "list": "Edições por {users}",
-        "truncated_list": "Edições por {users} e {count} outros"
+        "list": "Edições de {users}",
+        "truncated_list": "Edições de {users} e {count} outros"
     },
     "geocoder": {
         "search": "Buscar no mundo todo...",
@@ -242,17 +244,17 @@
         "all_relations": "Todas as relações",
         "new_relation": "Nova relação...",
         "role": "Papel",
-        "choose": "Selecione o tipo de elemento",
+        "choose": "Selecione o tipo de objeto",
         "results": "{n} resultado(s) para {search}",
         "reference": "Ver no wiki do OpenStreetMap",
-        "back_tooltip": "Alterar elemento",
+        "back_tooltip": "Alterar objeto",
         "remove": "Remover",
         "search": "Procurar",
         "multiselect": "Itens Selecionados",
         "unknown": "Desconhecido",
         "incomplete": "<não baixado>",
-        "feature_list": "Buscar elementos",
-        "edit": "Editar elemento",
+        "feature_list": "Buscar objetos",
+        "edit": "Editar objeto",
         "none": "Nenhum",
         "node": "Ponto",
         "way": "Linha",
@@ -266,12 +268,13 @@
         "none": "Nenhum",
         "custom": "Customizado",
         "custom_button": "Editar fundo de tela personalizado",
+        "custom_prompt": "Informe um modelo de URL de quadrículas. Tokens válidos são {z}, {x}, {y} para o esquema Z/X/Y e {u} para o esquema quadtile.",
         "fix_misalignment": "Corrigir alinhamento",
         "reset": "resetar"
     },
     "restore": {
         "heading": "Você tem alterações não salvas",
-        "description": "Você deseja restaurar as alterações não salvas da sessão anterior?",
+        "description": "Deseja restaurar as alterações não salvas da sessão anterior?",
         "restore": "Restaurar",
         "reset": "Resetar"
     },
@@ -290,7 +293,7 @@
         "facebook": "Compartilhar no Facebook",
         "twitter": "Compartilhar no Twitter",
         "google": "Compartilhar Google+",
-        "help_html": "Suas mudanças devem aparecer na camada \"Padrão\" do OSM em poucos minutos. Outras camadas e certos recursos podem demorar mais\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map' target='_blank'>detalhes</a>).\n"
+        "help_html": "Suas mudanças devem aparecer na camada \"Padrão\" do OSM em poucos minutos. Outras camadas e certos objetos podem demorar mais\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map' target='_blank'>detalhes</a>).\n"
     },
     "confirm": {
         "okay": "O.K."
@@ -303,7 +306,7 @@
     },
     "source_switch": {
         "live": "ao vivo",
-        "lose_changes": "Você tem alterações não salvas. Trocar o servidor de mapas irá descartar essas alterações. Você tem certeza que deseja trocar de servidor?",
+        "lose_changes": "Você tem alterações não salvas. Trocar o servidor de mapas irá descartar essas alterações. Tem certeza que deseja trocar de servidor?",
         "dev": "dev"
     },
     "tag_reference": {
@@ -315,9 +318,9 @@
         "untagged_point": "Ponto sem etiquetas",
         "untagged_line": "Linha sem etiquetas",
         "untagged_area": "Área sem etiquetas",
-        "many_deletions": "Você está deletando {n} objetos. Você tem certeza que quer fazer isto? Isto irá deletá-los do mapa que todos veem no openstreetmap.org.",
+        "many_deletions": "Você está excluíndo {n} objetos. Tem certeza disto? Isto os excluirá do mapa que todos veem no openstreetmap.org.",
         "tag_suggests_area": "A etiqueta {tag} sugere que seja utilizada numa área, mas essa linha não é uma área",
-        "untagged_tooltip": "Selecione um tipo de feição que descreve o que esta {geometry} é.",
+        "untagged_tooltip": "Selecione um tipo de objeto que descreve o que este(a) {geometry} é.",
         "deprecated_tags": "Etiquetas obsoletas: {tags}"
     },
     "zoom": {
@@ -334,54 +337,54 @@
     "help": {
         "title": "Ajuda",
         "help": "# Ajuda\n\nEste é um editor para OpenStreetMap (http://www.openstreetmap.org/), o mapa mundial livre e editavel. Você pode usá-lo para adicionar e atualizar de dados em sua área,  tornando um mapa mundi de codigo aberto melhor para todos.\nAs edições que você fizer nesse mapa serão visíveis para todos que usam OpenStreetMap. Para fazer uma edição você precisará de uma conta gratuita OpenStreetMap(https://www.openstreetmap.org/user/new).\n\nO editor iD (http://ideditor.com/) é um projeto colaborativo com o código fonte disponível no GitHub(https://github.com/openstreetmap/iD).\n",
-        "editing_saving": "# Editando e Salvando\n\nEsse editor é feito para trabalhar primariamente online e você está\nneste momento acessando-o através de um sítio eletrônico.\n\n### Selecionando Elementos\n\nPara selecionar um elemento do mapa, como uma estrada ou \num ponto de interesse, clique sobre ele. Isso vai pôr o elemento\nselecionado em destaque, abrir um painel com detalhes sobre\nele e mostrar um menu de coisas que podem ser feitas com ele.\n\nMúltiplos elementos podem ser selecionados segurando a tecla\n\"Shift\", clicando e arrastando no mapa. Isso vai selecionar todos\nos elementos que estiverem dentro da caixa que foi desenhada,\npermitindo você fazer coisas com vários elementos de uma vez\nsó.\n\n### Salvando as Alterações\n\nQuando você faz alterações como editar ruas, prédios e lugares, elas\nsão guardadas localmente até que você as envie para o servidor. Não\nse preocupe se você cometer algum deslize: você pode desfazer\nalterações clicando no botão de desfazer e também refazer as\nalterações clicando no botão de refazer.\n\nClique em \"Salvar\" para salvar um conjunto de alterações. Por exemplo,\nvocê completou uma área de uma cidade e gostaria de começar a\neditar uma outra área. Você terá a chance de revisar o que foi feito\naté o momento e o editor mostrará sugestões e dicas se alguma coisa\nparecer estar errada com as suas alterações.\n\nSe tudo parecer estar OK, você pode inserir um breve comentário\nexplicando as mudanças que você fez e clicar em \"Salvar\" de novo\npara lançar as mudanças para o [OpenStreetMap](http://www.openstreetmap.org/),\nonde elas estarão visíveis para todos os outros usuários.\n\nSe você não conseguir concluir uma sessão de edição, você pode\ndeixar a janela do seu editor aberta e voltar mais tarde (no mesmo\nnavegador e computador) que o editor irá oferecer a possibilidade\nde restaurar o seu trabalho.\n",
-        "roads": "# Estradas \n\nVocê pode criar, corrigir e excluir estradas com este editor. Estradas podem ser de vários \ntipos: caminhos, estradas, trilhas, ciclovias e muito mais - qualquer segmento\nonde se passa, mesmo que às vezes, pode ser mapeado. \n\n### Selecionando \n\nClique em uma estrada para selecioná-la. Um esboço deve tornar-se visível, junto \ncom um pequeno menu de ferramentas no mapa e uma barra lateral mostrando mais informações \nsobre a estrada. \n\n### Modificando \n\nMuitas vezes você vai encontrar estradas que não estão alinhadas com as imagens por trás delas \nou com uma faixa de GPS. Você pode ajustar estas estradas para que elas fiquem no \nlugar certo. \n\nPrimeiro clique no caminho que você deseja alterar. Isso irá destacá-lo e mostrar \npontos de controle ao longo dela que você pode arrastar para locais melhores. Se \no que você deseja é adicionar novos pontos de controle para obter mais detalhes, clique duas vezes em uma parte \nda estrada sem um nó, e um ponto será adicionado.\n\nSe a estrada se conecta a uma outra estrada, mas não está corretamente conectada no \nmapa, você pode arrastar um de seus pontos de controle para a outra estrada \na fim de juntá-las. Ter estradas que se conectam é importante para o mapa \ne essencial para fornecer instruções de direção. \n\nVocê também pode clicar na ferramenta 'Mover' ou pressione a tecla 'M' para mover o caminho inteiro de \numa vez, e em seguida, clique novamente para salvar esse movimento. \n\n### Apagando \n\nSe uma estrada está completamente errada - você pode ver que ela não existe nas imagens \nde satélite e, junto a isso, ter confirmado localmente que ela não existe - você pode apagá-la do mapa.\nSeja cauteloso ao excluir recursos - \ncomo qualquer outra edição, os resultados são vistos por todos, e como as imagens de satélite \npodem estar desatualizadas, a estrada pode simplesmente ser recém-construída. \n\nVocê pode excluir um caminho, clicando sobre ele para selecioná-lo, em seguida, clicar no \nícone de lixeira ou pressionando a tecla 'Delete'.\n\n### Criando \n\nEncontrou um lugar onde deveria ter uma estrada, mas não tem? Clique no botão 'Linha' \nno canto superior esquerdo do editor ou pressione a tecla de atalho '2' para começar a desenhar \numa linha. \n\nClique no início da estrada no mapa para começar a desenhar. Se a estrada \nse ramifica de uma estrada existente, comece clicando sobre o lugar onde eles se conectam. \n\nEm seguida, clique em pontos ao longo da estrada para que ela siga o caminho certo, de acordo \ncom imagens de satélite ou GPS. Se a estrada que você está desenhando atravessa outra estrada, ligue-as \nclicando sobre o ponto de intersecção. Quando você terminar de desenhar, clique duas vezes \nou pressione 'Voltar' ou 'Enter' no seu teclado.\n",
-        "gps": "# GPS\n\nO GPS é a fonte de dados mais confiável do OpenStreetMap. Esse editor\nsuporta trilhas locais, isto é, arquivos \".gpx\" guardados no seu computador.\nVocê pode coletar esse tipo de trilha usando um smartphone ou um\num aparelho de GPS dedicado.\n\nPara mais informações sobre como fazer mapeamento por GPS, leia\n[Utilizando o GPS](http://learnosm.org/pt/beginner/using-gps/).\n\nPara utilizar uma trilha GPS no iD, arraste o arquivo GPX para o mapa. Se\na trilha for reconhecida, ela será adicionada ao mapa como uma linha\nem verde brilhante. Clique no menu \"Configurações da imagem de fundo\",\nno lado esquerdo, para habilitar, desabilitar ou focar o zoom na camada\nreferente a essa trilha.\n\nNote que a trilha GPX não é enviada diretamente ao OpenStreetMap. A\nmelhor maneira de utilizá-la é usando-a como uma linha guia, isto é, desenhando\npor cima dela os novos elementos que estão sendo adicionados no mapa.\nAlém disso, [envie a trilha para o OpenStreetMap](http://www.openstreetmap.org/trace/create)\npara que outras pessoas possam usá-la.\n",
+        "editing_saving": "# Editando e Salvando\n\nEsse editor é feito para trabalhar primariamente online e você está\nneste momento acessando-o através de um sítio eletrônico.\n\n### Selecionando Objetos\n\nPara selecionar um objeto do mapa, como uma estrada ou \num ponto de interesse, clique sobre ele. Isso vai pôr o objeto\nselecionado em destaque, abrir um painel com detalhes sobre\nele e mostrar um menu de coisas que podem ser feitas com ele.\n\nMúltiplos objetos podem ser selecionados segurando a tecla\n\"Shift\", clicando e arrastando no mapa. Isso vai selecionar todos\nos objetos que estiverem dentro da caixa que foi desenhada,\npermitindo você fazer coisas com vários objetos de uma vez\nsó.\n\n### Salvando as Alterações\n\nQuando você faz alterações como editar ruas, prédios e lugares, elas\nsão guardadas localmente até que você as envie para o servidor. Não\nse preocupe se você cometer algum deslize: você pode desfazer\nalterações clicando no botão de desfazer e também refazer as\nalterações clicando no botão de refazer.\n\nClique em \"Salvar\" para salvar um conjunto de alterações. Por exemplo,\nvocê completou uma área de uma cidade e gostaria de começar a\neditar uma outra área. Você terá a chance de revisar o que foi feito\naté o momento e o editor mostrará sugestões e dicas se alguma coisa\nparecer estar errada com as suas alterações.\n\nSe tudo parecer estar OK, você pode inserir um breve comentário\nexplicando as mudanças que você fez e clicar em \"Salvar\" de novo\npara lançar as mudanças para o [OpenStreetMap](http://www.openstreetmap.org/),\nonde elas estarão visíveis para todos os outros usuários.\n\nSe você não conseguir concluir uma sessão de edição, você pode\ndeixar a janela do seu editor aberta e voltar mais tarde (no mesmo\nnavegador e computador) que o editor irá oferecer a possibilidade\nde restaurar o seu trabalho.\n",
+        "roads": "# Estradas \n\nVocê pode criar, corrigir e excluir estradas com este editor. Estradas podem ser de vários \ntipos: caminhos, estradas, trilhas, ciclovias e muito mais - qualquer segmento\nonde se passa, mesmo que às vezes, pode ser mapeado. \n\n### Selecionando \n\nClique em uma estrada para selecioná-la. Um esboço deve tornar-se visível, junto \ncom um pequeno menu de ferramentas no mapa e uma barra lateral mostrando mais informações \nsobre a estrada. \n\n### Modificando \n\nMuitas vezes você vai encontrar estradas que não estão alinhadas com as imagens por trás delas \nou com uma faixa de GPS. Você pode ajustar estas estradas para que elas fiquem no \nlugar certo. \n\nPrimeiro clique no caminho que você deseja alterar. Isso irá destacá-lo e mostrar \npontos de controle ao longo dela que você pode arrastar para locais melhores. Se \no que você deseja é adicionar novos pontos de controle para obter mais detalhes, clique duas vezes em uma parte \nda estrada sem um ponto, e um ponto será adicionado.\n\nSe a estrada se conecta a uma outra estrada, mas não está corretamente conectada no \nmapa, você pode arrastar um de seus pontos de controle para a outra estrada \na fim de juntá-las. Ter estradas que se conectam é importante para o mapa \ne essencial para fornecer instruções de direção. \n\nVocê também pode clicar na ferramenta 'Mover' ou pressione a tecla 'M' para mover o caminho inteiro de \numa vez, e em seguida, clique novamente para salvar esse movimento. \n\n### Apagando \n\nSe uma estrada está completamente errada - você pode ver que ela não existe nas imagens \nde satélite e, junto a isso, ter confirmado localmente que ela não existe - você pode apagá-la do mapa.\nSeja cauteloso ao excluir objetos - \ncomo qualquer outra edição, os resultados são vistos por todos, e como as imagens de satélite \npodem estar desatualizadas, a estrada pode simplesmente ser recém-construída. \n\nVocê pode excluir um caminho, clicando sobre ele para selecioná-lo, em seguida, clicar no \nícone de lixeira ou pressionando a tecla 'Delete'.\n\n### Criando \n\nEncontrou um lugar onde deveria ter uma estrada, mas não tem? Clique no botão 'Linha' \nno canto superior esquerdo do editor ou pressione a tecla de atalho '2' para começar a desenhar \numa linha. \n\nClique no início da estrada no mapa para começar a desenhar. Se a estrada \nse ramifica de uma estrada existente, comece clicando sobre o lugar onde eles se conectam. \n\nEm seguida, clique em pontos ao longo da estrada para que ela siga o caminho certo, de acordo \ncom imagens de satélite ou GPS. Se a estrada que você está desenhando atravessa outra estrada, ligue-as \nclicando sobre o ponto de intersecção. Quando você terminar de desenhar, clique duas vezes \nou pressione 'Voltar' ou 'Enter' no seu teclado.\n",
+        "gps": "# GPS\n\nO GPS é a fonte de dados mais confiável do OpenStreetMap. Esse editor\nsuporta trilhas locais, isto é, arquivos \".gpx\" guardados no seu computador.\nVocê pode coletar esse tipo de trilha usando um smartphone ou um\num aparelho de GPS dedicado.\n\nPara mais informações sobre como fazer mapeamento por GPS, leia\n[Utilizando o GPS](http://learnosm.org/pt/beginner/using-gps/).\n\nPara utilizar uma trilha GPS no iD, arraste o arquivo GPX para o mapa. Se\na trilha for reconhecida, ela será adicionada ao mapa como uma linha\nem verde brilhante. Clique no menu \"Configurações da imagem de fundo\",\nno lado esquerdo, para habilitar, desabilitar ou focar o zoom na camada\nreferente a essa trilha.\n\nNote que a trilha GPX não é enviada diretamente ao OpenStreetMap. A\nmelhor maneira de utilizá-la é usando-a como uma linha guia, isto é, desenhando\npor cima dela os novos objetos que estão sendo adicionados no mapa.\nAlém disso, [envie a trilha para o OpenStreetMap](http://www.openstreetmap.org/trace/create)\npara que outras pessoas possam usá-la.\n",
         "imagery": "# Imagens Aéreas\n\nAs imagens aéreas são um recurso muito importante para o mapeamento.\nFotos de avião, de satélite e de outras fontes livre estão disponíveis no editor,\nno menu \"Configurações da Imagem de Fundo\", no lado esquerdo.\n\nPor padrão as imagens de satélite do [Bing Maps](http://www.bing.com/maps/)\nestão habilitadas no editor, mas ao mover e aproximar o mapa para certas áreas,\nnovas fontes de imagens estarão disponíveis. Alguns países, tais como os EUA, a\nFrança e a Dinamarca, têm imagens aéreas de alta qualidade em algumas áreas.\n\nAtenção: as imagens aéreas algumas vezes não batem exatamente com o\nque há em terra, isto é, têm algum deslocamento por causa de algum erro por\nparte de quem as gerou. Se você notar que muitas ruas estão deslocadas\nem comparação com a imagem de fundo, não as alinhe imediatamente com\na imagem. Em vez disso ajuste a imagem para que ela se alinhe com as ruas\natravés do botão \"Corrigir desalinhamento\" no final do painel de Configurações\nda Imagem de Fundo.\n",
         "addresses": "# Endereços\n\nOs endereços são uma das informações mais úteis do mapa.\n\nApesar de os endereços serem representados como parte de uma rua, no OpenStreetMap\neles também são gravados como atributos de prédios e outros lugares ao longo das ruas.\n\nVocê pode adicionar informações de endereço nos locais mapeados como área de edifícios\nou mapeados como pontos. A melhor fonte de informações sobre endereços\né a que vem de pesquisas de campo ou conhecimento pessoal do local - assim\ncomo qualquer outra informação, copiar de fontes comerciais como o Google Maps é estritamente\nproibido.\n",
-        "inspector": "# Usando o Inspetor\n\nO inspetor é a seção no lado direito da página que aparece quando um recurso\né selecionado e permite que você edite seus detalhes.\n\n### Selecionando um tipo de recurso\n\nDepois de adicionar um ponto, linha ou área, você pode escolher que tipo de característica ele\ntem, como por exemplo se é uma autoestrada ou via residencial, supermercado ou cafeteria.\nO inspetor vai exibir botões para os tipos de recursos mais comuns, e você pode\nencontrar outros, digitando o que você está procurando na caixa de pesquisa.\n\nClique no botão \"i\" no canto inferior direito de um botão de recurso para\naprender mais sobre ele. Clique em um botão para escolher o tipo.\n\n### Usando formas e editando etiquetas\n\nDepois de escolher um tipo de recurso, ou quando você seleciona um recurso que já \ntem um tipo atribuído, o inspetor vai exibir campos com detalhes sobre \no recurso como seu nome e endereço. \n\nAbaixo dos campos que você vê, você pode clicar nos ícones para adicionar outros detalhes, \ncomo informações da [Wikipedia] (http://www.wikipedia.org/), acesso para cadeirantes, \nentre outros. \n\nNa parte inferior do inspetor, clique em 'Etiquetas adicionais' para adicionar \noutras etiquetas ao elemento. O [Taginfo] (http://taginfo.openstreetmap.org/) é um \nexcelente recurso para aprender mais sobre as combinações de etiquetas mais populares.\n\nAs alterações feitas no Inspetor são automaticamente aplicadas ao mapa.\nVocê pode desfazê-los a qualquer momento, clicando no botão 'Desfazer'.\n",
-        "buildings": "# Edifícios\n\nO OpenStreetMap é a maior base de dados de edifícios do mundo. Você pode criar\ne melhorar esta base de dados.\n\n### Selecionando\n\nVocê pode selecionar um edifício clicando em sua borda. Isto vai destacar o\nedifício, abrir um pequeno menu de ferramentas e uma barra lateral, mostrando mais informações\nsobre o edifício.\n\n### Modificando\n\nÀs vezes um edifício está no lugar errado ou tem etiquetas erradas.\n\nPara mover um edifício inteiro, selecione-o, e clique na ferramenta 'Mover'. Mova o\nmouse para deslocar o edifício, e clique novamente quando ele estiver no local certo.\n\nPara corrigir o formato de um edifício, clique e arraste os nós que formam as bordas\npara o lugar apropriado.\n\n### Criando\n\nUma das principais questões sobre adicionar edifícios ao mapa é que o\nOpenStreetMap registra-os tanto como formas quanto como pontos. A regra geral é\n_mapeie um edifício como uma forma sempre que possível_, e mapeie empresas, casas,\nserviços, e outros locais que operam fora de um edifício como pontos\ndentro da forma do edifício.\n\nComece desenhando um edifício como forma clicando no botão 'Área' no canto superior\nesquerdo da interface, e finalize pressionando 'Enter' no teclado\nou clicando no primeiro nó que você desenhou para fechar a forma.\n\n### Deletando\n\nSe um edifício estiver totalmente errado - você vê que ele não existe na imagem de satélite\ne também confirmou pessoalmente que ele não está lá - você pode deletá-lo,\nremovendo-o do mapa. Seja cuidadoso ao remover coisas -\nassim como qualquer outra edição, os resultados são vistos por todos, e as imagens de satélite\npodem estar desatualizadas, ou seja, pode ser que o edifício seja bem recente.\n\nVocê pode remover um edifício clicando nele para selecioná-lo, e depois clicando \nna lixeira ou pressionando a tecla 'Delete'.\n",
-        "relations": "# Relações\n\nUma relação é um tipo especial de feição do OpenStreetMap que agrupa outras feições.\nPor exemplo, dois tipos comuns de relações são as *relações de rotas*, que agrupam \ntrecho de vias que pertecem a uma mesma estrada ou rodovia, e as *relações de\n multipolígonos*, que agrupam várias linhas para definir áreas complexas, que podem\nconter áreas não contínuas ou vazios dentro de áreas.\n\nO grupo de feições em uma relação é chamado de *membros*. Na barra lateral, você \npode ver de qual relação uma feição é membro, e clicar em uma destas relações para \nselecioná-la. Quando uma relação é selecionada, você pode ver todos os seus membros \nlistados na barra lateral e selecionados no mapa.\n\nPara a maioria dos casos, o iD vai cuidar automaticamente das relações enquanto você \nedita. O mais importante a se levar em conta é que se você deletar um trecho de via \nque faz parte de uma relação para redesenhá-lo, você terá que adicioná-lo novamente \ncomo membro da relação original.\n\n## Editando Relações\n\nSe você quer editar relações, aqui estão instruções básicas.\n\nPara adicionar uma feição a uma relação, clique no botão \"+\" na seção \"Todas relações\"\nda barra lateral, e selecione ou digite o nome da relação.\n\nPara criar uma nova relação, primeiro selecione a feição que deverá ser um membro,\ndepois clique no botão \"+\" da seção \"Todas relações\" e selecione \"Nova relação...\".\n\nPara remover uma feição de uma relação, selecione ela e clique no botão de lixeira\npróximo à relação da qual você quer fazer a remoção.\n\nVocê pode criar multipolígonos com vazios usando a ferramenta \"Mesclar\". Desenhe \nduas áreas (interior e exterior), segure a tecla Shift, clique em cada uma dessas áreas\npara selecioná-las e clique no botão \"Mesclar\" (+).\n\n"
+        "inspector": "# Usando o Inspetor\n\nO inspetor é a seção no lado direito da página que aparece quando um recurso\né selecionado e permite que você edite seus detalhes.\n\n### Selecionando um tipo de recurso\n\nDepois de adicionar um ponto, linha ou área, você pode escolher que tipo de característica ele\ntem, como por exemplo se é uma autoestrada ou via residencial, supermercado ou cafeteria.\nO inspetor vai exibir botões para os tipos de recursos mais comuns, e você pode\nencontrar outros, digitando o que você está procurando na caixa de pesquisa.\n\nClique no botão \"i\" no canto inferior direito de um botão de recurso para\naprender mais sobre ele. Clique em um botão para escolher o tipo.\n\n### Usando formas e editando etiquetas\n\nDepois de escolher um tipo de recurso, ou quando você seleciona um recurso que já \ntem um tipo atribuído, o inspetor vai exibir campos com detalhes sobre \no recurso como seu nome e endereço. \n\nAbaixo dos campos que você vê, você pode clicar nos ícones para adicionar outros detalhes, \ncomo informações da [Wikipedia] (http://www.wikipedia.org/), acesso para cadeirantes, \nentre outros. \n\nNa parte inferior do inspetor, clique em 'Etiquetas adicionais' para adicionar \noutras etiquetas ao objeto. O [Taginfo] (http://taginfo.openstreetmap.org/) é um \nexcelente recurso para aprender mais sobre as combinações de etiquetas mais populares.\n\nAs alterações feitas no Inspetor são automaticamente aplicadas ao mapa.\nVocê pode desfazê-los a qualquer momento, clicando no botão 'Desfazer'.\n",
+        "buildings": "# Edifícios\n\nO OpenStreetMap é a maior base de dados de edifícios do mundo. Você pode criar\ne melhorar esta base de dados.\n\n### Selecionando\n\nVocê pode selecionar um edifício clicando em sua borda. Isto vai destacar o\nedifício, abrir um pequeno menu de ferramentas e uma barra lateral, mostrando mais informações\nsobre o edifício.\n\n### Modificando\n\nÀs vezes um edifício está no lugar errado ou tem etiquetas erradas.\n\nPara mover um edifício inteiro, selecione-o, e clique na ferramenta 'Mover'. Mova o\nmouse para deslocar o edifício, e clique novamente quando ele estiver no local certo.\n\nPara corrigir o formato de um edifício, clique e arraste os pontos que formam as bordas\npara o lugar apropriado.\n\n### Criando\n\nUma das principais questões sobre adicionar edifícios ao mapa é que o\nOpenStreetMap registra-os tanto como formas quanto como pontos. A regra geral é\n_mapeie um edifício como uma forma sempre que possível_, e mapeie empresas, casas,\nserviços, e outros locais que operam fora de um edifício como pontos\ndentro da forma do edifício.\n\nComece desenhando um edifício como forma clicando no botão 'Área' no canto superior\nesquerdo da interface, e finalize pressionando 'Enter' no teclado\nou clicando no primeiro ponto que você desenhou para fechar a forma.\n\n### Excluindo\n\nSe um edifício estiver totalmente errado - você vê que ele não existe na imagem de satélite\ne também confirmou pessoalmente que ele não está lá - você pode excluí-lo,\nremovendo-o do mapa. Seja cuidadoso ao remover coisas -\nassim como qualquer outra edição, os resultados são vistos por todos, e as imagens de satélite\npodem estar desatualizadas, ou seja, pode ser que o edifício seja bem recente.\n\nVocê pode remover um edifício clicando nele para selecioná-lo, e depois clicando \nna lixeira ou pressionando a tecla 'Delete'.\n",
+        "relations": "# Relações\n\nUma relação é um tipo especial de objeto do OpenStreetMap que agrupa outros objetos.\nPor exemplo, dois tipos comuns de relações são as *relações de rotas*, que agrupam \ntrecho de vias que pertecem a uma mesma estrada ou rodovia, e as *relações de\n multipolígonos*, que agrupam várias linhas para definir áreas complexas, que podem\nconter áreas não contínuas ou vazios dentro de áreas.\n\nOs objetos agrupados numa relação são chamados de *membros*. Na barra lateral, você \npode ver de qual relação um objeto é membro, e clicar em uma destas relações para \nselecioná-la. Quando uma relação é selecionada, você pode ver todos os seus membros \nlistados na barra lateral e selecionados no mapa.\n\nPara a maioria dos casos, o iD vai cuidar automaticamente das relações enquanto você \nedita. O mais importante a se levar em conta é que se você deletar um trecho de via \nque faz parte de uma relação para redesenhá-lo, você terá que adicioná-lo novamente \ncomo membro da relação original.\n\n## Editando Relações\n\nSe você quer editar relações, aqui estão instruções básicas.\n\nPara adicionar um objeto a uma relação, clique no botão \"+\" na seção \"Todas relações\"\nda barra lateral, e selecione ou digite o nome da relação.\n\nPara criar uma nova relação, primeiro selecione o objeto que deverá ser um membro,\ndepois clique no botão \"+\" da seção \"Todas relações\" e selecione \"Nova relação...\".\n\nPara remover um objeto de uma relação, selecione ela e clique no botão de lixeira\npróximo à relação da qual você quer fazer a remoção.\n\nVocê pode criar multipolígonos com vazios usando a ferramenta \"Mesclar\". Desenhe \nduas áreas (interior e exterior), segure a tecla Shift, clique em cada uma dessas áreas\npara selecioná-las e clique no botão \"Mesclar\" (+).\n\n"
     },
     "intro": {
         "navigation": {
             "title": "Navegação",
             "drag": "A área principal do mapa mostra os dados do OpenStreetMap sobre um fundo (uma imagem aérea, normalmente). Você pode navegar arrastando ou usando a roda do mouse, do mesmo jeito que em qualquer mapa online. **Arraste o mapa!**",
-            "select": "Os elementos do mapa são representados de três formas: pontos, linhas ou áreas. Todos os elementos podem ser selecionados clicando neles. **Clique no ponto e selecione-o.**",
-            "header": "O cabeçalho nos mostra qual é o tipo do elemento.",
-            "pane": "Quando um elemento é selecionado, o editor de elemento é mostrado. O cabeçalho nos mostra o tipo do elemento e o painel principal mostra os atributos do elemento, tais como seu nome e endereço. **Feche o editor de elemento com o botão de fechar no canto superior direito.**"
+            "select": "Os objetos do mapa são representados de três formas: pontos, linhas ou áreas. Todos os objetos podem ser selecionados clicando neles. **Clique no ponto e selecione-o.**",
+            "header": "O cabeçalho nos mostra qual é o tipo do objeto.",
+            "pane": "Quando um objeto é selecionado, o editor de objeto é mostrado. O cabeçalho nos mostra o tipo do objeto e o painel principal mostra os atributos do objeto, tais como seu nome e endereço. **Feche o editor de objeto com o botão de fechar no canto superior direito.**"
         },
         "points": {
             "title": "Pontos",
-            "add": "Pontos podem ser usados para representar elementos como lojas, restaurantes e monumentos. Eles marcam uma posição específica e descrevem o que há nela. **Clique no botão Ponto para adicionar um novo ponto.**",
-            "place": "Clicando no mapa nós criamos um ponto nele. **Coloque o ponto no topo do prédio.**",
-            "search": "Existem muitos elementos diferentes que podem ser representados por pontos. O ponto que você acabou de adicionar é uma Cafeteria. **Procure por '{name}'**",
+            "add": "Pontos podem ser usados para representar coisas como lojas, restaurantes e monumentos. Eles marcam uma posição específica e descrevem o que há nela. **Clique no botão Ponto para adicionar um novo ponto.**",
+            "place": "Clicando no mapa criamos um ponto nele. **Coloque o ponto no topo do prédio.**",
+            "search": "Existem muitos objetos diferentes que podem ser representados por pontos. O ponto que você acabou de adicionar é uma Cafeteria. **Procure por '{name}'**",
             "choose": "**Escolha \"Cafeteria\" na lista.**",
-            "describe": "O ponto agora está marcado como uma cafeteria. Usando o editor de elemento, podemos adicionar mais informações sobre ele. **Adicione um nome**",
-            "close": "O editor de elementos pode ser fechado clicando no botão de fechar. **Feche o editor de elementos.**",
-            "reselect": "Frequentemente um dado ponto pode já existir, mas ter erros ou estar incompleto. Nós podemos editar pontos já existentes. **Selecione o ponto que você acabou de criar.**",
-            "fixname": "**Altere o nome da cafeteria e feche o editor de elementos.**",
-            "reselect_delete": "Todos os elementos do mapa podem ser removidos. **Clique no ponto que você criou.**",
-            "delete": "O menu em volta do ponto contém operações que podem ser realizadas sobre ele, incluindo removê-lo. **Remova o ponto.**"
+            "describe": "O ponto agora está marcado como uma cafeteria. Usando o editor de objeto, podemos adicionar mais informações sobre ele. **Adicione um nome**",
+            "close": "O editor de objetos pode ser fechado clicando no botão de fechar. **Feche o editor de objetos.**",
+            "reselect": "Frequentemente um dado ponto pode já existir, mas ter erros ou estar incompleto. Podemos editar pontos já existentes. **Selecione o ponto que você acabou de criar.**",
+            "fixname": "**Altere o nome da cafeteria e feche o editor de objetos.**",
+            "reselect_delete": "Todos os objetos do mapa podem ser excluídos. **Clique no ponto que você criou.**",
+            "delete": "O menu em volta do ponto contém operações que podem ser realizadas sobre ele, incluindo removê-lo. **Exclua o ponto.**"
         },
         "areas": {
             "title": "Áreas",
-            "add": "Áreas são uma forma mais detalhada de representar os elementos do mapa. Elas informam quais são as bordas do elemento. As áreas podem ser usadas para a maioria dos tipos de elementos que os pontos são usados. Na verdade, é frequentemente preferível utilizá-las no lugar de pontos. **Clique no botão Área pra adicionar uma nova área.**",
-            "corner": "Para desenhar as áreas, colocamos os nós que formam a sua borda. **Coloque o primeiro nó num dos cantos do parquinho.**",
-            "place": "Coloque mais nós para desenhar o resto da área. Para terminar, complete a área clicando de novo no primeiro nó. **Desenhar a área do parquinho.**",
+            "add": "Áreas são uma forma mais detalhada de representar os objetos do mapa. Elas informam quais são as bordas do objeto. As áreas podem ser usadas para a maioria dos tipos de objetos que os pontos são usados. Na verdade, é frequentemente preferível utilizá-las no lugar de pontos. **Clique no botão Área pra adicionar uma nova área.**",
+            "corner": "Para desenhar as áreas, colocamos os pontos que formam a sua borda. **Coloque o primeiro ponto num dos cantos do parquinho.**",
+            "place": "Coloque mais pontos para desenhar o resto da área. Para terminar, complete a área clicando de novo no primeiro ponto. **Desenhar a área do parquinho.**",
             "search": "**Procurar por '{name}'.**",
             "choose": "**Escolha \"Parquinho\" na lista.**",
-            "describe": "**Adicione um nome e feche o editor de elementos.**"
+            "describe": "**Adicione um nome e feche o editor de objetos.**"
         },
         "lines": {
             "title": "Linhas",
-            "add": "As linhas são usadas para representar elementos como estradas, ferrovias e rios. **Clique no botão Linha para adicionar uma nova linha.**",
+            "add": "As linhas são usadas para representar coisas como estradas, ferrovias e rios. **Clique no botão Linha para adicionar uma nova linha.**",
             "start": "**Comece a desenhar a linha clicando no final da estrada.**",
-            "intersect": "Clique para adicionar mais nós à linha. Você pode arrastar o mapa enquanto desenha, se for necessário. Estradas, e muitos outros tipos de linhas, são partes de uma rede maior. É importante que essas linhas estejam conectadas corretamente para que as aplicações de roteamento funcionem bem. **Clique na Flower Street para criar uma interseção que conecta as duas linhas.**",
-            "finish": "Para indicar o final da criação de uma linha, clique novamente no seu último nó. **Termine de criar a rua.**",
+            "intersect": "Clique para adicionar mais pontos à linha. Você pode arrastar o mapa enquanto desenha, se for necessário. Estradas, e muitos outros tipos de linhas, são partes de uma rede maior. É importante que essas linhas estejam conectadas corretamente para que as aplicações de roteamento funcionem bem. **Clique na Flower Street para criar uma interseção que conecta as duas linhas.**",
+            "finish": "Para indicar o final da criação de uma linha, clique novamente no seu último ponto. **Termine de criar a rua.**",
             "road": "**Selecione \"Estrada\" na lista**",
             "residential": "Há vários tipos diferentes de estrada, o mais comum entre elas é a via residencial. **Escolha o tipo Via Residencial.**",
-            "describe": "**Coloque o nome da rua e feche o editor de elementos.**",
+            "describe": "**Coloque o nome da rua e feche o editor de objetos.**",
             "restart": "A rua precisa ter um ponto de interseção com a Flower Street.",
             "wrong_preset": "Você não selecionou o tipo de via Residencial. **Clique aqui para escolher novamente**"
         },
@@ -395,7 +398,7 @@
     "presets": {
         "categories": {
             "category-building": {
-                "name": "Prédio"
+                "name": "Edifício"
             },
             "category-golf": {
                 "name": "Golfe"
@@ -435,28 +438,28 @@
                 },
                 "options": {
                     "yes": {
-                        "title": "Permitido",
-                        "description": "Acesso permitido por lei; direito de passagem"
+                        "title": "Público",
+                        "description": "Acesso permitido por lei; via pública com direito de passagem"
                     },
                     "no": {
                         "title": "Proibido",
                         "description": "Acesso não permitido ao público em geral"
                     },
                     "permissive": {
-                        "title": "Concedido",
-                        "description": "Acesso permitido até que o dono cancele a permissão"
+                        "title": "Autorizado",
+                        "description": "Acesso livre e autorizado (mas cancelável) pelo dono"
                     },
                     "private": {
                         "title": "Privado",
-                        "description": "Acesso permitido apenas com a permissão do dono, dada individualmente"
+                        "description": "Acesso requer permissão prévia do dono, dada individualmente"
                     },
                     "designated": {
                         "title": "Designado",
-                        "description": "Acesso permitido de acordo com placas ou leis locais"
+                        "description": "Acesso designado por placas (ou leis locais) para uso preferencial por veículos específicos"
                     },
                     "destination": {
                         "title": "Destino",
-                        "description": "Acesso permitido apenas para aproximar-se do destino"
+                        "description": "Acesso permitido apenas na saída ou na chegada a um destino"
                     }
                 }
             },
@@ -561,6 +564,9 @@
             "covered": {
                 "label": "Coberto"
             },
+            "crop": {
+                "label": "Cultivo"
+            },
             "crossing": {
                 "label": "Tipo"
             },
@@ -576,6 +582,9 @@
             "description": {
                 "label": "Descrição"
             },
+            "electrified": {
+                "label": "Eletrificação"
+            },
             "elevation": {
                 "label": "Altitude"
             },
@@ -601,6 +610,36 @@
             "fuel": {
                 "label": "Combustível"
             },
+            "fuel/biodiesel": {
+                "label": "Vende Biodiesel"
+            },
+            "fuel/diesel": {
+                "label": "Vende Diesel"
+            },
+            "fuel/e10": {
+                "label": "Vende Gasolina E10 10% Álcool"
+            },
+            "fuel/e85": {
+                "label": "Vende Combustível E85 85 Álcool/15 Gasolina"
+            },
+            "fuel/lpg": {
+                "label": "Vende Propano"
+            },
+            "fuel/octane_100": {
+                "label": "Vende Gasolina de Competição"
+            },
+            "fuel/octane_91": {
+                "label": "Vende Gasolina Comum"
+            },
+            "fuel/octane_95": {
+                "label": "Vende Gasolina Aditivada"
+            },
+            "fuel/octane_98": {
+                "label": "Vende Gasolina Premium"
+            },
+            "gauge": {
+                "label": "Bitola"
+            },
             "generator/method": {
                 "label": "Método"
             },
@@ -612,10 +651,10 @@
             },
             "golf_hole": {
                 "label": "Nº do buraco",
-                "placeholder": "Buraco numero (1-18)"
+                "placeholder": "Número do buraco (1-18)"
             },
             "handicap": {
-                "label": "Desvantagem",
+                "label": "Acessível a deficientes",
                 "placeholder": "1-18"
             },
             "highway": {
@@ -624,6 +663,10 @@
             "historic": {
                 "label": "Tipo"
             },
+            "hoops": {
+                "label": "Aros de Tabela",
+                "placeholder": "1, 2, 4..."
+            },
             "iata": {
                 "label": "Código IATA"
             },
@@ -637,7 +680,7 @@
                 "label": "Tipo"
             },
             "internet_access": {
-                "label": "Acesso a Internet",
+                "label": "Acesso à Internet",
                 "options": {
                     "wlan": "Sem Fio",
                     "wired": "Cabeada",
@@ -657,6 +700,9 @@
             "leisure": {
                 "label": "Tipo"
             },
+            "length": {
+                "label": "Comprimento (Metros)"
+            },
             "levels": {
                 "label": "Número de andares",
                 "placeholder": "2, 4, 6..."
@@ -703,7 +749,7 @@
                 "label": "Operador"
             },
             "par": {
-                "label": "par",
+                "label": "Par",
                 "placeholder": "3, 4, 5..."
             },
             "park_ride": {
@@ -719,18 +765,36 @@
             "piste/difficulty": {
                 "label": "Dificuldade"
             },
+            "piste/grooming": {
+                "label": "Tosa de Animais"
+            },
             "piste/type": {
                 "label": "Modelo"
             },
             "place": {
                 "label": "Tipo"
             },
+            "population": {
+                "label": "População"
+            },
             "power": {
                 "label": "Tipo"
             },
             "railway": {
                 "label": "Tipo"
             },
+            "recycling/cans": {
+                "label": "Aceita Latinhas"
+            },
+            "recycling/clothes": {
+                "label": "Aceita Roupas"
+            },
+            "recycling/glass": {
+                "label": "Aceita Vidro"
+            },
+            "recycling/paper": {
+                "label": "Aceita Papel"
+            },
             "ref": {
                 "label": "Código de referência"
             },
@@ -761,6 +825,9 @@
             "sac_scale": {
                 "label": "Dificuldade do Caminho"
             },
+            "seasonal": {
+                "label": "Sazonal"
+            },
             "service": {
                 "label": "Tipo"
             },
@@ -773,9 +840,16 @@
             "shop": {
                 "label": "Tipo"
             },
+            "sloped_curb": {
+                "label": "Rampa no Meio-fio"
+            },
             "smoking": {
                 "label": "Fumantes"
             },
+            "social_facility_for": {
+                "label": "Pessoas atendidas",
+                "placeholder": "Moradores de rua, deficientes, crianças, etc"
+            },
             "source": {
                 "label": "Fonte"
             },
@@ -795,12 +869,18 @@
                     "cutting": "Escavação"
                 }
             },
+            "studio_type": {
+                "label": "Tipo"
+            },
             "supervised": {
                 "label": "Supervisionado"
             },
             "surface": {
                 "label": "Superfície"
             },
+            "tactile_paving": {
+                "label": "Piso Tátil"
+            },
             "toilets/disposal": {
                 "label": "Descarte"
             },
@@ -844,6 +924,9 @@
             "wheelchair": {
                 "label": "Acesso a Cadeirantes"
             },
+            "width": {
+                "label": "Largura (Metros)"
+            },
             "wikipedia": {
                 "label": "Wikipédia"
             },
@@ -856,6 +939,46 @@
                 "name": "Endereço",
                 "terms": "Endereço"
             },
+            "aerialway": {
+                "name": "Teleférico",
+                "terms": "Teleférico, Bondinho, Subida Mecânica"
+            },
+            "aerialway/cable_car": {
+                "name": "Bonde Aéreo",
+                "terms": "Telecabine, Teleférico de cabine"
+            },
+            "aerialway/chair_lift": {
+                "name": "Telecadeira",
+                "terms": "Teleférico de cadeira"
+            },
+            "aerialway/gondola": {
+                "name": "Gôndola",
+                "terms": "Gôndola, Bondinho"
+            },
+            "aerialway/magic_carpet": {
+                "name": "Esteira de Ski",
+                "terms": "Esteira, Esteira de Ski"
+            },
+            "aerialway/platter": {
+                "name": "Telesqui de prato",
+                "terms": "Telesqui de prato"
+            },
+            "aerialway/pylon": {
+                "name": "Torre de Suporte de Teleférico",
+                "terms": "Torre de Suporte de Teleférico"
+            },
+            "aerialway/rope_tow": {
+                "name": "Telecorda",
+                "terms": "Telecorda"
+            },
+            "aerialway/station": {
+                "name": "Estação de Teleférico",
+                "terms": "Estação de Teleférico, Estação de Bondinho"
+            },
+            "aerialway/t-bar": {
+                "name": "Telesquis T-bar",
+                "terms": "Telesquis T-bar"
+            },
             "aeroway": {
                 "name": "Aerovia",
                 "terms": "Aerovia"
@@ -922,11 +1045,11 @@
             },
             "amenity/bicycle_parking": {
                 "name": "Bicicletário",
-                "terms": "Estacionamento de Bicicletas, Bicicletário,"
+                "terms": "Estacionamento de Bicicletas, Bicicletário, Paraciclo"
             },
             "amenity/bicycle_rental": {
                 "name": "Aluguel de Bicicletas",
-                "terms": "Aluguel de Bicicletas"
+                "terms": "Aluguel de Bicicletas, Compartilhamento de Bicicletas"
             },
             "amenity/boat_rental": {
                 "name": "Aluguel de Barcos",
@@ -948,6 +1071,10 @@
                 "name": "Lavagem de Veículos",
                 "terms": "Lavagem de Veículos, Lava jato"
             },
+            "amenity/charging_station": {
+                "name": "Estação de Carregamento",
+                "terms": "Estação de Recarga, Estação de Carga Elétrica, Tomada de Cargamento, Tomada de Recarga"
+            },
             "amenity/childcare": {
                 "name": "Creche",
                 "terms": "Creche"
@@ -956,19 +1083,33 @@
                 "name": "Cinema",
                 "terms": "Cinema, Sala de Cinema"
             },
+            "amenity/clinic": {
+                "name": "Clínica",
+                "terms": "Clínica, Consultório"
+            },
             "amenity/clock": {
-                "name": "Relógio"
+                "name": "Relógio",
+                "terms": "Relógio"
             },
             "amenity/college": {
                 "name": "Faculdade",
                 "terms": "faculdade, educação superior, curso superior"
             },
+            "amenity/compressed_air": {
+                "name": "Ar Comprimido",
+                "terms": "Ar Comprimido"
+            },
             "amenity/courthouse": {
                 "name": "Tribunal",
                 "terms": "Tribunal, Fórum"
             },
             "amenity/dentist": {
-                "name": "Dentista"
+                "name": "Dentista",
+                "terms": "Dentista, Odontologista"
+            },
+            "amenity/doctor": {
+                "name": "Médico",
+                "terms": "Doutor, Médico"
             },
             "amenity/drinking_water": {
                 "name": "Água Potável",
@@ -1003,7 +1144,7 @@
                 "terms": "clínica,sala de emergência,serviço de saúde,hospício,enfermaria,instituição,asilo,sanatório,cirurgia"
             },
             "amenity/kindergarten": {
-                "name": "Jardim de infância",
+                "name": "Escola Infantil",
                 "terms": "Creche, Pré-escola, Cuidados infantis, Bebês, Centro de Educação Infantil, CEI"
             },
             "amenity/library": {
@@ -1014,6 +1155,10 @@
                 "name": "Mercado municipal",
                 "terms": "Feira"
             },
+            "amenity/nightclub": {
+                "name": "Danceteria",
+                "terms": "Discoteca, Boate, Casa Noturna"
+            },
             "amenity/parking": {
                 "name": "Estacionamento",
                 "terms": "estacionamento,parada"
@@ -1063,19 +1208,41 @@
                 "terms": "Patrulha, Ranger"
             },
             "amenity/recycling": {
-                "name": "Reciclagem"
+                "name": "Reciclagem",
+                "terms": "Reciclagem, Reaproveitamento, Recuperação, Reutilização"
             },
             "amenity/restaurant": {
                 "name": "Restaurante",
                 "terms": "Restaurante"
             },
             "amenity/school": {
-                "name": "Escola"
+                "name": "Escola",
+                "terms": "Área Escolar, Terreno Escolar, Pátio Escolar"
             },
             "amenity/shelter": {
                 "name": "Abrigo",
                 "terms": "Abrigo"
             },
+            "amenity/social_facility": {
+                "name": "Unidade de Assistência Social",
+                "terms": "Unidade de Assistência Social"
+            },
+            "amenity/social_facility/food_bank": {
+                "name": "Banco de Alimentos",
+                "terms": "Banco de Alimentos"
+            },
+            "amenity/social_facility/group_home": {
+                "name": "Lar Compartilhado",
+                "terms": "Lar Compartilhado"
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Abrigo para moradores de rua",
+                "terms": "Refúgio para Desabrigados"
+            },
+            "amenity/studio": {
+                "name": "Estúdio",
+                "terms": "Estúdio"
+            },
             "amenity/swimming_pool": {
                 "name": "Piscina",
                 "terms": "Piscina"
@@ -1094,7 +1261,7 @@
             },
             "amenity/toilets": {
                 "name": "Banheiros Públicos",
-                "terms": "Banheiros, Sanitário, WC, Toiletes, Toilettes, Lavabo, Toalete"
+                "terms": "Banheiros, Sanitário, WC, Lavabo, Toalete"
             },
             "amenity/townhall": {
                 "name": "Paço Municipal",
@@ -1109,7 +1276,8 @@
                 "terms": "Totem de vendas, Máquina de Venda Automática"
             },
             "amenity/veterinary": {
-                "name": "Veterinário"
+                "name": "Veterinário",
+                "terms": "Veterinário"
             },
             "amenity/waste_basket": {
                 "name": "Lixeira",
@@ -1197,46 +1365,71 @@
             },
             "building/apartments": {
                 "name": "Apartamentos",
-                "terms": "Apartamentos, Kit net"
+                "terms": "Apartamentos"
+            },
+            "building/barn": {
+                "name": "Celeiro",
+                "terms": "Celeiro"
+            },
+            "building/bunker": {
+                "name": "Casamata",
+                "terms": "Trincheira, Barreira, Obstáculo, Paiol, Abrigo"
+            },
+            "building/cabin": {
+                "name": "Cabine",
+                "terms": "Cabine"
             },
             "building/cathedral": {
-                "name": "Catedral"
+                "name": "Catedral",
+                "terms": "Catedral"
             },
             "building/chapel": {
-                "name": "Capela"
+                "name": "Capela",
+                "terms": "Capela, Igreja"
             },
             "building/church": {
-                "name": "Igreja"
+                "name": "Igreja",
+                "terms": "Igreja"
             },
             "building/commercial": {
                 "name": "Edifício Comercial",
                 "terms": "Edifício Comercial, Prédio Comercial"
             },
             "building/construction": {
-                "name": "Edifício em construção"
+                "name": "Edifício em construção",
+                "terms": "Edificação em Construção"
             },
-            "building/dormitory": {
-                "name": "Dormitório"
+            "building/detached": {
+                "name": "Casa Separada",
+                "terms": "Casa Separada"
             },
-            "building/entrance": {
-                "name": "Entrada",
-                "terms": "Entrada"
+            "building/dormitory": {
+                "name": "Dormitório",
+                "terms": "Alojamento Estudantil, República Estudantil, Dormitório"
             },
             "building/garage": {
-                "name": "Garagem Individual",
+                "name": "Garagem",
                 "terms": "Garagem"
             },
             "building/garages": {
                 "name": "Garagens",
                 "terms": "Garagens"
             },
+            "building/greenhouse": {
+                "name": "Estufa",
+                "terms": "Estufa"
+            },
             "building/hospital": {
                 "name": "Edifício do Hospital",
                 "terms": "Edifício hospitalar"
             },
+            "building/hotel": {
+                "name": "Hotel",
+                "terms": "Hotel"
+            },
             "building/house": {
                 "name": "Casa",
-                "terms": "Casa"
+                "terms": "Casa, Residência"
             },
             "building/hut": {
                 "name": "Cabana",
@@ -1246,45 +1439,233 @@
                 "name": "Edifício Industrial",
                 "terms": "Edifício Industrial"
             },
+            "building/public": {
+                "name": "Edifício Público",
+                "terms": "Edifício Público"
+            },
             "building/residential": {
                 "name": "Edifício Residencial",
                 "terms": "Edifício Residencial"
             },
+            "building/retail": {
+                "name": "Edifício Comercial",
+                "terms": "Edifício Comercial, Loja, Mercado, Shopping"
+            },
             "building/roof": {
-                "name": "Teto"
+                "name": "Teto",
+                "terms": "Telhado, Cobertura"
             },
             "building/school": {
-                "name": "Edifício da Escola"
+                "name": "Edifício da Escola",
+                "terms": "Edifício Escolar"
+            },
+            "building/shed": {
+                "name": "Cabana",
+                "terms": "Cabana, Barraco, Galpão, Choupana"
+            },
+            "building/stable": {
+                "name": "Estábulo",
+                "terms": "Estábulo"
+            },
+            "building/static_caravan": {
+                "name": "Casa Transportável",
+                "terms": "Casa Transportável"
+            },
+            "building/terrace": {
+                "name": "Fileira de Casas",
+                "terms": "Fileira de Casas"
+            },
+            "building/train_station": {
+                "name": "Estação Ferroviária",
+                "terms": "Estação Ferroviária, Estação de Trem"
+            },
+            "building/university": {
+                "name": "Edifício Universitário",
+                "terms": "Edifício Universitário"
+            },
+            "building/warehouse": {
+                "name": "Armazém",
+                "terms": "Armazém, Depósito, Almoxarifado"
+            },
+            "craft/basket_maker": {
+                "name": "Cesteiro",
+                "terms": "Cesteiro"
             },
             "craft/beekeeper": {
-                "name": "Apicultor"
+                "name": "Apicultor",
+                "terms": "Apicultor"
             },
             "craft/blacksmith": {
-                "name": "Ferreiro"
+                "name": "Ferreiro",
+                "terms": "Serralheiro, Ferreiro"
+            },
+            "craft/boatbuilder": {
+                "name": "Fabricante de Barcos",
+                "terms": "Fabricante de Barcos, Estaleiro"
+            },
+            "craft/bookbinder": {
+                "name": "Encadernador",
+                "terms": "Encadernador"
             },
             "craft/brewery": {
-                "name": "Cervejaria"
+                "name": "Cervejaria",
+                "terms": "Cervejaria"
             },
             "craft/carpenter": {
-                "name": "Carpinteiro"
+                "name": "Carpinteiro",
+                "terms": "Carpinteiro"
+            },
+            "craft/carpet_layer": {
+                "name": "Colocador de Carpete",
+                "terms": "Colocador de Carpete"
+            },
+            "craft/caterer": {
+                "name": "Fornecedor de Mantimentos",
+                "terms": "Fornecedor de Mantimentos, Aprovisionador"
+            },
+            "craft/clockmaker": {
+                "name": "Relojoeiro",
+                "terms": "Relojoeiro"
             },
             "craft/confectionary": {
-                "name": "Doçaria"
+                "name": "Doçaria",
+                "terms": "Confeitaria, Doceria"
+            },
+            "craft/dressmaker": {
+                "name": "Costureira",
+                "terms": "Costureira"
             },
             "craft/electrician": {
-                "name": "Eletricista"
+                "name": "Eletricista",
+                "terms": "Eletricista"
             },
             "craft/gardener": {
-                "name": "Jardineiro"
+                "name": "Jardineiro",
+                "terms": "Jardineiro"
+            },
+            "craft/glaziery": {
+                "name": "Vidraceiro",
+                "terms": "Vidraceiro"
+            },
+            "craft/handicraft": {
+                "name": "Artesanato",
+                "terms": "Artesanato"
+            },
+            "craft/hvac": {
+                "name": "HVAC",
+                "terms": "HVAC, Refrigeração, Aquecimento, Ventilação"
+            },
+            "craft/insulator": {
+                "name": "Isolador",
+                "terms": "Isolador"
+            },
+            "craft/jeweler": {
+                "name": "Joalheiro",
+                "terms": "Ourives"
+            },
+            "craft/key_cutter": {
+                "name": "Chaveiro",
+                "terms": "Chaveiro"
             },
             "craft/locksmith": {
-                "name": "Chaveiro"
+                "name": "Chaveiro",
+                "terms": "Chaveiro"
+            },
+            "craft/metal_construction": {
+                "name": "Construção Metálica",
+                "terms": "Construção Metálica"
+            },
+            "craft/optician": {
+                "name": "Ótica",
+                "terms": "Oculista"
             },
             "craft/painter": {
-                "name": "Pintor"
+                "name": "Pintor",
+                "terms": "Pintor"
             },
             "craft/photographer": {
-                "name": "Fotógrafo"
+                "name": "Fotógrafo",
+                "terms": "Fotógrafo"
+            },
+            "craft/photographic_laboratory": {
+                "name": "Laboratório Fotográfico",
+                "terms": "Laboratório Fotográfico"
+            },
+            "craft/plasterer": {
+                "name": "Gesseiro",
+                "terms": "Gesseiro"
+            },
+            "craft/plumber": {
+                "name": "Encanador",
+                "terms": "Encanador, Bombeiro Hidráulico"
+            },
+            "craft/pottery": {
+                "name": "Oleiro",
+                "terms": "Cerâmica"
+            },
+            "craft/rigger": {
+                "name": "Técnico em Movimentação de Cargas",
+                "terms": "Rigger"
+            },
+            "craft/roofer": {
+                "name": "Reparador de Telhados",
+                "terms": "Telheiro"
+            },
+            "craft/saddler": {
+                "name": "Seleiro",
+                "terms": "Seleiro"
+            },
+            "craft/sailmaker": {
+                "name": "Fabricante de Velas Náuticas",
+                "terms": "Veleiro"
+            },
+            "craft/sawmill": {
+                "name": "Serraria",
+                "terms": "Serraria"
+            },
+            "craft/scaffolder": {
+                "name": "Montador de Andaimes",
+                "terms": "Montador de Andaimes"
+            },
+            "craft/sculpter": {
+                "name": "Escultor",
+                "terms": "Escultor"
+            },
+            "craft/shoemaker": {
+                "name": "Sapateiro",
+                "terms": "Sapateiro"
+            },
+            "craft/stonemason": {
+                "name": "Pedreiro",
+                "terms": "Pedreiro"
+            },
+            "craft/sweep": {
+                "name": "Limpador de Chaminé",
+                "terms": "Limpador de Chaminé"
+            },
+            "craft/tailor": {
+                "name": "Alfaiate",
+                "terms": "Alfaiate"
+            },
+            "craft/tiler": {
+                "name": "Ladrilheiro",
+                "terms": "Ladrilheiro"
+            },
+            "craft/tinsmith": {
+                "name": "Funileiro",
+                "terms": "Funileiro"
+            },
+            "craft/upholsterer": {
+                "name": "Estofador",
+                "terms": "Estofador"
+            },
+            "craft/watchmaker": {
+                "name": "Relojoeiro",
+                "terms": "Relojoeiro"
+            },
+            "craft/window_construction": {
+                "name": "Fabricante de Janelas",
+                "terms": "Janeleiro"
             },
             "embankment": {
                 "name": "Aterro Elevado",
@@ -1302,21 +1683,49 @@
                 "name": "Telefone de Emergência",
                 "terms": "Telefone de Emergência"
             },
-            "entrance": {
-                "name": "Entrada",
-                "terms": "Entrada"
-            },
             "footway/crossing": {
-                "name": "Travessia",
+                "name": "Travessia de Pedestres",
                 "terms": "faixa de segurança,cruzamento,passagem"
             },
             "footway/sidewalk": {
                 "name": "Calçada",
                 "terms": "calçada,passeio"
             },
+            "golf/bunker": {
+                "name": "Banco de Areia",
+                "terms": "Bunker, Banco de Areia, Banca de Areia, Poça de Areia, Obstáculo de Areia"
+            },
+            "golf/fairway": {
+                "name": "Fairway",
+                "terms": "Fairway, Percurso Intermediário"
+            },
+            "golf/green": {
+                "name": "Green",
+                "terms": "Green, Putting Green"
+            },
+            "golf/hole": {
+                "name": "Buraco",
+                "terms": "Buraco"
+            },
+            "golf/lateral_water_hazard": {
+                "name": "Obstáculo Lateral de Água",
+                "terms": "Obstáculo Lateral de Água"
+            },
+            "golf/rough": {
+                "name": "Rough",
+                "terms": "Rough, Mato"
+            },
+            "golf/tee": {
+                "name": "Tee Box",
+                "terms": "Tee Box"
+            },
+            "golf/water_hazard": {
+                "name": "Obstáculo de Água",
+                "terms": "Obstáculo de Água, Lago"
+            },
             "highway": {
-                "name": "Rodovia",
-                "terms": "Rodovia"
+                "name": "Via Terrestre",
+                "terms": "Rodovia, Estrada, Rua, Caminho"
             },
             "highway/bridleway": {
                 "name": "Hipovia",
@@ -1327,7 +1736,7 @@
                 "terms": "Ponto de Ônibus, Parada de Ônibus"
             },
             "highway/crossing": {
-                "name": "Faixa de Pedestre",
+                "name": "Travessia de Pedestres",
                 "terms": "Interseção"
             },
             "highway/cycleway": {
@@ -1340,7 +1749,7 @@
             },
             "highway/living_street": {
                 "name": "Via de Espaço Compartilhado",
-                "terms": "Rua Viva, Rua Preferencial a Pedestres"
+                "terms": "Rua Preferencial a Pedestres"
             },
             "highway/mini_roundabout": {
                 "name": "Mini-Rotatória",
@@ -1348,7 +1757,7 @@
             },
             "highway/motorway": {
                 "name": "Autoestrada",
-                "terms": "Auto-estrada, auto estrada"
+                "terms": "Autoestrada, Via Expressa"
             },
             "highway/motorway_junction": {
                 "name": "Saída de Autoestrada",
@@ -1378,6 +1787,10 @@
                 "name": "Via Residencial",
                 "terms": "Via Residencial, Rua Residencial"
             },
+            "highway/rest_area": {
+                "name": "Área de Repouso",
+                "terms": "Área de Repouso"
+            },
             "highway/road": {
                 "name": "Via de Tipo Desconhecido",
                 "terms": "Estrada Desconhecida"
@@ -1403,7 +1816,7 @@
                 "terms": "Drive-Thru"
             },
             "highway/service/driveway": {
-                "name": "Via de Garagem",
+                "name": "Acesso de Estacionamento",
                 "terms": "Via de Garagem"
             },
             "highway/service/emergency_access": {
@@ -1414,6 +1827,10 @@
                 "name": "Corredor de Estacionamento",
                 "terms": "Corredor de Estacionamento"
             },
+            "highway/services": {
+                "name": "Área de Serviço",
+                "terms": "Área de Serviço"
+            },
             "highway/steps": {
                 "name": "Via com Degraus",
                 "terms": "Degraus, Escada, Escadaria"
@@ -1488,7 +1905,7 @@
             },
             "historic/wayside_shrine": {
                 "name": "Capelinha de Beira de Estrada",
-                "terms": "Ermida, Alminhas"
+                "terms": "Santuário de Beira de Estrada"
             },
             "landuse": {
                 "name": "Uso da Terra",
@@ -1506,6 +1923,10 @@
                 "name": "Cemitério Secular",
                 "terms": "Sepulcrário, Cemitério"
             },
+            "landuse/churchyard": {
+                "name": "Adro",
+                "terms": "Adro, Entorno da Igreja, Terreno Adjacente à Igreja"
+            },
             "landuse/commercial": {
                 "name": "Comercial",
                 "terms": "Comercial"
@@ -1527,7 +1948,7 @@
                 "terms": "Pátio de Fazenda"
             },
             "landuse/forest": {
-                "name": "Floresta",
+                "name": "Floresta manejada",
                 "terms": "Floresta"
             },
             "landuse/grass": {
@@ -1538,10 +1959,18 @@
                 "name": "Industrial",
                 "terms": "Industrial"
             },
+            "landuse/landfill": {
+                "name": "Aterro Sanitário",
+                "terms": "Aterro Sanitário, Depósito de Lixo"
+            },
             "landuse/meadow": {
                 "name": "Prado",
                 "terms": "Prado, Pasto, Pradaria"
             },
+            "landuse/military": {
+                "name": "Militar",
+                "terms": "Militar"
+            },
             "landuse/orchard": {
                 "name": "Pomar",
                 "terms": "Pomar"
@@ -1572,7 +2001,11 @@
             },
             "leisure/dog_park": {
                 "name": "Cachorródromo",
-                "terms": "Canódromo, Parque de Cães, Parque Canino"
+                "terms": "Canódromo, Parque de Cães, Parque Canino, Parque de Cachorros"
+            },
+            "leisure/firepit": {
+                "name": "Fogueira",
+                "terms": "Fogueira"
             },
             "leisure/garden": {
                 "name": "Jardim",
@@ -1582,6 +2015,10 @@
                 "name": "Campo de Golfe",
                 "terms": "Campo de Golfe"
             },
+            "leisure/ice_rink": {
+                "name": "Pista de Gelo",
+                "terms": "Rinque de Patinação no Gelo"
+            },
             "leisure/marina": {
                 "name": "Marina",
                 "terms": "Marina"
@@ -1591,7 +2028,8 @@
                 "terms": "Parque, praça"
             },
             "leisure/picnic_table": {
-                "name": "Mesa de piquenique"
+                "name": "Mesa de piquenique",
+                "terms": "Mesa de Piquenique"
             },
             "leisure/pitch": {
                 "name": "Quadra Esportiva",
@@ -1687,7 +2125,7 @@
             },
             "man_made/pipeline": {
                 "name": "Tubulação",
-                "terms": "Encanamento"
+                "terms": "Encanamento, Duto"
             },
             "man_made/survey_point": {
                 "name": "Ponto de Exame Geográfico",
@@ -1751,7 +2189,7 @@
             },
             "natural/fell": {
                 "name": "Fell",
-                "terms": "Colina, Morro, Cerro,\nCoxilha, Montanha, Outeiro"
+                "terms": "Colina, Morro, Cerro, Coxilha, Montanha, Outeiro"
             },
             "natural/glacier": {
                 "name": "Geleira",
@@ -1830,7 +2268,7 @@
                 "terms": "Escritório da Empresa"
             },
             "office/educational_institution": {
-                "name": "Escritório de Instituto de Educação",
+                "name": "Instituição Educacional",
                 "terms": "escola,colégio,universidade,faculdade,curso,instituto,educação,educacional"
             },
             "office/employment_agency": {
@@ -1858,7 +2296,7 @@
                 "terms": "ti,cpd,informática,computador,rede"
             },
             "office/lawyer": {
-                "name": "Escritório de Advogado",
+                "name": "Escritório de Advocacia",
                 "terms": "advogado,advocacia,escritório"
             },
             "office/newspaper": {
@@ -1893,6 +2331,10 @@
                 "name": "Agência de Viagens",
                 "terms": "viagem,viagens,agência"
             },
+            "piste": {
+                "name": "Pista de Ski",
+                "terms": "Pista de Ski, Trilha de Ski"
+            },
             "place": {
                 "name": "Local",
                 "terms": "Local"
@@ -1917,6 +2359,14 @@
                 "name": "Localidade",
                 "terms": "Localidade"
             },
+            "place/neighbourhood": {
+                "name": "Vizinhança",
+                "terms": "Vizinhança, Bairro"
+            },
+            "place/suburb": {
+                "name": "Distrito Municipal",
+                "terms": "Distrito Municipal"
+            },
             "place/town": {
                 "name": "Cidade Menor",
                 "terms": "Vila, Cidade, Município"
@@ -1931,7 +2381,7 @@
             },
             "power": {
                 "name": "Eletricidade",
-                "terms": "Eletricidade"
+                "terms": "Energia, Eletricidade"
             },
             "power/generator": {
                 "name": "Gerador de Energia",
@@ -1939,11 +2389,11 @@
             },
             "power/line": {
                 "name": "Linha de Transmissão",
-                "terms": "Fio Elétrico"
+                "terms": "Fio Elétrico, Condutor Elétrico, Linha de Transmissão"
             },
             "power/minor_line": {
-                "name": "Linha de Transmissão Pequena",
-                "terms": "Menor Linha de Energia"
+                "name": "Linha de Distribuição",
+                "terms": "Linha de Subtransmissão, Linha de Transmissão Secundária"
             },
             "power/pole": {
                 "name": "Poste de Transmissão",
@@ -1959,7 +2409,7 @@
             },
             "power/transformer": {
                 "name": "Transformador",
-                "terms": "Transformado"
+                "terms": "Transformador"
             },
             "public_transport/platform": {
                 "name": "Plataforma",
@@ -1981,8 +2431,13 @@
                 "name": "Ferrovia Inativa",
                 "terms": "Ferrovia em Desuso"
             },
+            "railway/funicular": {
+                "name": "Funicular",
+                "terms": "Funicular, Plano Inclinado"
+            },
             "railway/halt": {
-                "name": "Parada de Ferrovia"
+                "name": "Parada de Ferrovia",
+                "terms": "Estação de Parada na Ferrovia, Estação Simples, Estação Sem Facilidades"
             },
             "railway/level_crossing": {
                 "name": "Passagem de Nível",
@@ -1992,6 +2447,10 @@
                 "name": "Monotrilho",
                 "terms": "Monotrilho"
             },
+            "railway/narrow_gauge": {
+                "name": "Ferrovia de Bitola Estreita",
+                "terms": "Ferrovia de Bitola Estreita"
+            },
             "railway/platform": {
                 "name": "Plataforma de Trem",
                 "terms": "Plataforma de Trem"
@@ -2032,6 +2491,10 @@
                 "name": "Loja de Licores",
                 "terms": "Loja de Licores"
             },
+            "shop/art": {
+                "name": "Loja de Artes",
+                "terms": "Loja de Artes"
+            },
             "shop/bakery": {
                 "name": "Padaria",
                 "terms": "Padaria, Panificadora"
@@ -2048,6 +2511,10 @@
                 "name": "Loja de Bicicletas",
                 "terms": "Loja de Bicicletas, Bicicletaria"
             },
+            "shop/bookmaker": {
+                "name": "Casa de Apostas",
+                "terms": "Casa de Apostas"
+            },
             "shop/books": {
                 "name": "Livraria",
                 "terms": "Livraria"
@@ -2066,14 +2533,14 @@
             },
             "shop/car_parts": {
                 "name": "Loja de Peças Automotivas",
-                "terms": "Loja de Peças Automotivas"
+                "terms": "Loja de Peças Automotivas, Autopeças"
             },
             "shop/car_repair": {
                 "name": "Oficina Mecânica",
                 "terms": "Oficina Automotiva"
             },
             "shop/chemist": {
-                "name": "Loja de Cosméticos",
+                "name": "Loja de Cosméticos e Higiene",
                 "terms": "Loja de Cosméticos e Higiene Pessoal"
             },
             "shop/clothes": {
@@ -2124,6 +2591,10 @@
                 "name": "Floricultura",
                 "terms": "Floricultura"
             },
+            "shop/funeral_directors": {
+                "name": "Funerária",
+                "terms": "Funerária"
+            },
             "shop/furniture": {
                 "name": "Loja de Móveis",
                 "terms": "Loja de Móveis, Decoração"
@@ -2170,7 +2641,7 @@
             },
             "shop/lottery": {
                 "name": "Lotérica",
-                "terms": "Loteria, Mega Sena, Trimania, Quina"
+                "terms": "Loteria, Casa Lotérica, Mega Sena, Trimania, Quina"
             },
             "shop/mall": {
                 "name": "Centro Comercial",
@@ -2214,7 +2685,7 @@
             },
             "shop/shoes": {
                 "name": "Loja de Calçados",
-                "terms": "Loja de Calçados"
+                "terms": "Loja de Calçados, Sapataria"
             },
             "shop/sports": {
                 "name": "Loja de Equipamentos Esportivos",
@@ -2246,12 +2717,16 @@
             },
             "shop/variety_store": {
                 "name": "Loja de Variedades a 1,99",
-                "terms": "Loja de Variedades, Um e Noventa e Nove, 1.99, 199"
+                "terms": "Loja de Variedades"
             },
             "shop/video": {
                 "name": "Loja/Locadora de Vídeos",
                 "terms": "Loja de Vídeos, Locadora de Vídeos, Videolocadora"
             },
+            "shop/wine": {
+                "name": "Loja de Vinhos",
+                "terms": "Vinícola, Adega"
+            },
             "tourism": {
                 "name": "Turismo",
                 "terms": "Turismo"
@@ -2366,7 +2841,7 @@
             },
             "type/route/pipeline": {
                 "name": "Rota de Tubulação",
-                "terms": "Rota de Tubulação"
+                "terms": "Rota de Tubulação, Faixa de Dutos"
             },
             "type/route/power": {
                 "name": "Rota de Energia Elétrica",

diff --git a/vendor/assets/iD/iD/locales/pt.json b/vendor/assets/iD/iD/locales/pt.json
index b618e9d21101964e668258a053acd424aa3e6fd7..e8b90b3bb2c15d13c61492fd86a6597a75f4da3b 100644 (file)
--- a/vendor/assets/iD/iD/locales/pt.json
+++ b/vendor/assets/iD/iD/locales/pt.json
@@ -71,7 +71,8 @@
                 "line": "Fazer uma linha circular.",
                 "area": "Área tornada circular."
             },
-            "not_closed": "Isto não pode ser tornado circular porque não é uma linha fechada."
+            "not_closed": "Isto não pode ser tornado circular porque não é uma linha fechada.",
+            "too_large": "Não é possível fazer um circulo porque o objecto não está completamente visível no mapa."
         },
         "orthogonalize": {
             "title": "Esquadrar",
@@ -84,7 +85,8 @@
                 "line": "Cantos da linha ortogonalizados.",
                 "area": "Cantos da área ortogonalizados."
             },
-            "not_squarish": "Isto não pode ser tornado quadrado porque não tem um formato quadrangular."
+            "not_squarish": "Isto não pode ser tornado quadrado porque não tem um formato quadrangular.",
+            "too_large": "Não é possível esquadrar porque o objecto não está completamente visível no mapa."
         },
         "straighten": {
             "title": "Endireitar",
@@ -134,7 +136,8 @@
             "annotation": "{n} linhas combinadas.",
             "not_eligible": "Estes elementos não podem ser unidos.",
             "not_adjacent": "Estas linhas não podem ser unidas porque não estão ligadas num ponto comum a ambas.",
-            "restriction": "Estas linhas não podem ser unidas porque pelo menos uma delas faz parte de uma relação \"{relation}\"."
+            "restriction": "Estas linhas não podem ser unidas porque pelo menos uma delas faz parte de uma relação \"{relation}\".",
+            "incomplete_relation": "Estes elementos não podem ser unidos porque pelo menos um deles não está completamente descarregado no mapa."
         },
         "move": {
             "title": "Mover",
@@ -253,6 +256,8 @@
         "feature_list": "Pesquisar elementos",
         "edit": "Editar elemento",
         "none": "Nenhum",
+        "node": "Nó",
+        "way": "Linha",
         "relation": "Relação",
         "location": "Localização"
     },
@@ -262,6 +267,8 @@
         "percent_brightness": "{opacity}% transparente",
         "none": "Nenhum",
         "custom": "Personalizado",
+        "custom_button": "Editar fundo personalizando",
+        "custom_prompt": "Introduz um endereço URL válido. Pontos validos são {z}, {x}, {y} para esquemas Z/X/Y e {u} para esquemas QuadTile.",
         "fix_misalignment": "Corrigir alinhamento",
         "reset": "reiniciar"
     },
@@ -402,7 +409,7 @@
                 "name": "Ferrovia"
             },
             "category-road": {
-                "name": "Estrada"
+                "name": "Rodovia"
             },
             "category-route": {
                 "name": "Rota"
@@ -420,10 +427,10 @@
                 "placeholder": "Desconhecido",
                 "types": {
                     "access": "Geral",
-                    "foot": "A pé",
-                    "motor_vehicle": "Veículos motorizados",
+                    "foot": "Peões",
+                    "motor_vehicle": "Veículos Motorizados",
                     "bicycle": "Bicicletas",
-                    "horse": "Cavalos"
+                    "horse": "Animais"
                 },
                 "options": {
                     "yes": {
@@ -444,11 +451,11 @@
                     },
                     "designated": {
                         "title": "Designado",
-                        "description": "Acesso permitido de acordo com sinalética ou leis locais específicas"
+                        "description": "Acesso permitido de acordo com a sinalética e/ou com leis locais específicas; como p. ex. o Código da Estrada"
                     },
                     "destination": {
                         "title": "Destino",
-                        "description": "Acesso permitido apenas para chegar a determinado destino"
+                        "description": "Acesso permitido apenas para chegar a determinado destino; como p. ex. parques de estacionamento ou centros comerciais"
                     }
                 }
             },
@@ -460,7 +467,7 @@
                 "placeholders": {
                     "number": "123",
                     "street": "Rua",
-                    "city": "Cidade",
+                    "city": "Localidade",
                     "postcode": "Código postal"
                 }
             },
@@ -473,6 +480,9 @@
             "aerialway/access": {
                 "label": "Acesso"
             },
+            "aerialway/bubble": {
+                "label": "Bolha"
+            },
             "aerialway/capacity": {
                 "label": "Capacidade (por hora)",
                 "placeholder": "500, 2500, 5000..."
@@ -481,7 +491,11 @@
                 "label": "Duração (minutos)",
                 "placeholder": "1, 2, 3..."
             },
+            "aerialway/heating": {
+                "label": "Aquecido"
+            },
             "aerialway/occupancy": {
+                "label": "Ocupação",
                 "placeholder": "2, 4, 8...."
             },
             "aerialway/summer/access": {
@@ -500,7 +514,7 @@
                 "label": "Tipo"
             },
             "atm": {
-                "label": "MultiBanco, MB"
+                "label": "Multibanco"
             },
             "backrest": {
                 "label": "Encosto"
@@ -528,10 +542,10 @@
                 "label": "Direção"
             },
             "clock_direction": {
-                "label": "DIreção",
+                "label": "Direção",
                 "options": {
                     "clockwise": "Sentido dos Ponteiros do Relógio",
-                    "anticlockwise": "Sentido Inverso dos Ponteiros do Relógio"
+                    "anticlockwise": "Sentido Contrário aos Ponteiros do Relógio."
                 }
             },
             "collection_times": {
@@ -543,11 +557,14 @@
             "country": {
                 "label": "País"
             },
+            "covered": {
+                "label": "Coberto"
+            },
             "crossing": {
                 "label": "Tipo"
             },
             "cuisine": {
-                "label": "Cozinha"
+                "label": "Culinária"
             },
             "denomination": {
                 "label": "Denominação"
@@ -562,7 +579,7 @@
                 "label": "Eletrificação"
             },
             "elevation": {
-                "label": "Altura acima do nível médio do mar"
+                "label": "Elevação"
             },
             "emergency": {
                 "label": "Emergência"
@@ -572,10 +589,10 @@
             },
             "fax": {
                 "label": "Fax",
-                "placeholder": "+351 99 123 4567"
+                "placeholder": "+351 252 471441"
             },
             "fee": {
-                "label": "Tarifa"
+                "label": "Taxa"
             },
             "fire_hydrant/type": {
                 "label": "Tipo"
@@ -586,6 +603,18 @@
             "fuel": {
                 "label": "Combustível"
             },
+            "fuel/diesel": {
+                "label": "Vende gasóleo"
+            },
+            "fuel/octane_100": {
+                "label": "Vende gasolina de corrida"
+            },
+            "fuel/octane_91": {
+                "label": "Vende gasolina normal"
+            },
+            "fuel/octane_98": {
+                "label": "Vende gasolina \"premium\""
+            },
             "generator/method": {
                 "label": "Método"
             },
@@ -596,9 +625,11 @@
                 "label": "Tipo"
             },
             "golf_hole": {
-                "label": "Referência"
+                "label": "Referência",
+                "placeholder": "Número do buraco (1-18)"
             },
             "handicap": {
+                "label": "Handicap",
                 "placeholder": "1-18"
             },
             "highway": {
@@ -625,7 +656,7 @@
             "internet_access": {
                 "label": "Acesso à Internet",
                 "options": {
-                    "wlan": "Wifi",
+                    "wlan": "Wi-Fi",
                     "wired": "Com fio",
                     "terminal": "Terminal de acesso"
                 }
@@ -638,13 +669,16 @@
                 "placeholder": "1, 2, 3..."
             },
             "layer": {
-                "label": "Nível"
+                "label": "Camada"
             },
             "leisure": {
                 "label": "Tipo"
             },
+            "length": {
+                "label": "Comprimento (metros)"
+            },
             "levels": {
-                "label": "Níveis",
+                "label": "Nº de Andares",
                 "placeholder": "2, 4, 6..."
             },
             "lit": {
@@ -658,11 +692,11 @@
             },
             "maxspeed": {
                 "label": "Limite de Velocidade",
-                "placeholder": "50, 90, 120..."
+                "placeholder": "50, 90, 100, 120..."
             },
             "name": {
                 "label": "Nome",
-                "placeholder": "Nome comum (caso se aplique)"
+                "placeholder": "Nome Comum (caso se aplique)"
             },
             "natural": {
                 "label": "Natural"
@@ -671,7 +705,7 @@
                 "label": "Rede"
             },
             "note": {
-                "label": "Nota"
+                "label": "Notas"
             },
             "office": {
                 "label": "Tipo"
@@ -689,6 +723,7 @@
                 "label": "Operador"
             },
             "par": {
+                "label": "Par",
                 "placeholder": "3, 4, 5..."
             },
             "park_ride": {
@@ -698,24 +733,42 @@
                 "label": "Tipo"
             },
             "phone": {
-                "label": "Telefone",
-                "placeholder": "+351 99 123 4567"
+                "label": "Telefone / Telemóvel",
+                "placeholder": "+351 245 125961"
             },
             "piste/difficulty": {
                 "label": "Dificuldade"
             },
+            "piste/grooming": {
+                "label": "Niveladora de neve"
+            },
             "piste/type": {
                 "label": "Tipo"
             },
             "place": {
                 "label": "Tipo"
             },
+            "population": {
+                "label": "População"
+            },
             "power": {
                 "label": "Tipo"
             },
             "railway": {
                 "label": "Tipo"
             },
+            "recycling/cans": {
+                "label": "Aceita latas"
+            },
+            "recycling/clothes": {
+                "label": "Aceita roupas"
+            },
+            "recycling/glass": {
+                "label": "Aceita vidro"
+            },
+            "recycling/paper": {
+                "label": "Aceita papel"
+            },
             "ref": {
                 "label": "Referência"
             },
@@ -744,7 +797,7 @@
                 "label": "Tipo"
             },
             "sac_scale": {
-                "label": "Dificuldade"
+                "label": "Dificuldade do Terreno"
             },
             "seasonal": {
                 "label": "Sazonal"
@@ -761,6 +814,10 @@
             "shop": {
                 "label": "Tipo"
             },
+            "social_facility_for": {
+                "label": "Pessoas servidas",
+                "placeholder": "Sem-abrigo, deficientes, crianças, etc."
+            },
             "source": {
                 "label": "Fonte das informações"
             },
@@ -789,6 +846,9 @@
             "surface": {
                 "label": "Superfície"
             },
+            "tactile_paving": {
+                "label": "Pavimentação táctil"
+            },
             "toilets/disposal": {
                 "label": "Eliminação de resíduos"
             },
@@ -823,8 +883,8 @@
                 "label": "Tipo"
             },
             "website": {
-                "label": "Website",
-                "placeholder": "http://exemplo.org/"
+                "label": "Sítio Eletrónico",
+                "placeholder": "http://www.exemplo.org/"
             },
             "wetland": {
                 "label": "Tipo"
@@ -832,6 +892,9 @@
             "wheelchair": {
                 "label": "Acesso com cadeira de rodas"
             },
+            "width": {
+                "label": "Largura (metros)"
+            },
             "wikipedia": {
                 "label": "Wikipédia"
             },
@@ -842,73 +905,96 @@
         "presets": {
             "address": {
                 "name": "Morada",
-                "terms": "Endereço,Morada"
+                "terms": "Endereço, Morada"
+            },
+            "aerialway": {
+                "name": "Telesqui",
+                "terms": "Telesqui,  Teleférico de superfície"
+            },
+            "aerialway/cable_car": {
+                "name": "Teleférico"
+            },
+            "aerialway/chair_lift": {
+                "name": "Telecadeira",
+                "terms": "Teleférico de cadeira"
             },
             "aerialway/gondola": {
                 "name": "Gôndola",
                 "terms": "Gôndola"
             },
+            "aerialway/magic_carpet": {
+                "name": "Esteira de esqui"
+            },
+            "aerialway/platter": {
+                "name": "Telesqui de prato"
+            },
             "aeroway": {
-                "name": "Via área"
+                "name": "Via área",
+                "terms": "Aerodromo, Aviões, Avião, Helicóptero"
             },
             "aeroway/aerodrome": {
                 "name": "Aeroporto",
-                "terms": "Aeroporto"
+                "terms": "Avião, aeródromo"
             },
             "aeroway/apron": {
-                "name": "Plataforma de Estacionamento"
+                "name": "Plataforma de Estacionamento",
+                "terms": "Rampa"
             },
             "aeroway/gate": {
-                "name": "Porta de Embarque / Desembarque"
+                "name": "Porta de Embarque / Desembarque",
+                "terms": "Porão, Porta de Embarque, Porta de Desembarque, Manga"
             },
             "aeroway/hangar": {
                 "name": "Hangar",
-                "terms": "Hangar"
+                "terms": "Hangar, Abrigo de Aviões"
             },
             "aeroway/helipad": {
-                "name": "Heliponto, Heliporto",
-                "terms": "Heliporto"
+                "name": "Heliporto / Heliponto",
+                "terms": "Helicóptero"
             },
             "aeroway/runway": {
-                "name": "Pista de Aterragem e Descolagem"
+                "name": "Pista de Aterragem e Descolagem",
+                "terms": "Faixa de Aterragem"
             },
             "aeroway/taxiway": {
-                "name": "Via de Circulação"
+                "name": "Faixa de Rolagem / Táxi",
+                "terms": "Rolar, Faixa de Rolagem"
             },
             "aeroway/terminal": {
                 "name": "Terminal de Aeroporto",
-                "terms": "Terminal de Aeroporto"
+                "terms": "Aeroporto, Aeródromo"
             },
             "amenity": {
-                "name": "Infraestrutura"
+                "name": "Infraestrutura",
+                "terms": "característica, qualidade, aspecto"
             },
             "amenity/arts_centre": {
                 "name": "Centro artístico",
                 "terms": "Centro de Artes"
             },
             "amenity/atm": {
-                "name": "Caixa MultiBanco",
-                "terms": "Multibanco, MB"
+                "name": "Multibanco",
+                "terms": "Caixa Multibanco, Caixa de Multibanco, MB, Caixa de MB"
             },
             "amenity/bank": {
                 "name": "Banco",
-                "terms": "Banco"
+                "terms": "Agência bancária, Agência financeira, Agência de Investimentos, Cofre, Depósito, Levantamentos, Firma de Investimentos"
             },
             "amenity/bar": {
                 "name": "Bar",
-                "terms": "Bar"
+                "terms": "Bar, Bares, Bebidas, Alcool"
             },
             "amenity/bench": {
-                "name": "Banco (mobiliário)",
-                "terms": "Banco, Assento"
+                "name": "Assento",
+                "terms": "Banco, Assento, Banco de Sentar, Sentar"
             },
             "amenity/bicycle_parking": {
                 "name": "Parque de Bicicletas",
-                "terms": "Parque de Bicicletas"
+                "terms": "Parque de Bicicletas, Área de Bicicletas, Zona de Bicicletas"
             },
             "amenity/bicycle_rental": {
                 "name": "Aluguer de Bicicletas",
-                "terms": "Aluguer de Bicicletas"
+                "terms": "Aluguer de Bicicletas, Área de Aluguer de Bicicletas, Zona de Aluguer de Bicicletas"
             },
             "amenity/boat_rental": {
                 "name": "Aluguer de barcos",
@@ -916,25 +1002,30 @@
             },
             "amenity/cafe": {
                 "name": "Café",
-                "terms": "Café"
+                "terms": "Chá, Loja de Café, Cafetaria"
             },
             "amenity/car_rental": {
                 "name": "Aluguer de Automóveis",
-                "terms": "Aluguer de Automóveis"
+                "terms": "Aluguer de Automóveis, Área de Aluguer de Automóveis, Zona de Aluguer de Automoveis"
             },
             "amenity/car_sharing": {
-                "name": "Partilha de Automóveis"
+                "name": "Partilha de Automóveis",
+                "terms": "Partilha de Carros, Partilha de Veículos "
             },
             "amenity/car_wash": {
-                "name": "Lavagem de Veículos"
+                "name": "Lavagem de Veículos",
+                "terms": "Lavagem, Lavagem Automática, Mangueira, Limpeza"
+            },
+            "amenity/charging_station": {
+                "name": "Estação de recarga"
             },
             "amenity/childcare": {
                 "name": "Creche",
-                "terms": "Área de cuidados infantis"
+                "terms": "Área de Cuidados Infantis"
             },
             "amenity/cinema": {
                 "name": "Cinema",
-                "terms": "cinema"
+                "terms": "Filme, filmes"
             },
             "amenity/clinic": {
                 "name": "Clínica",
@@ -946,10 +1037,14 @@
             },
             "amenity/college": {
                 "name": "Colégio",
-                "terms": "Colégio"
+                "terms": "Colégio, Colégio Interno, Escola Privada, Privada, Externatos, Semiprivado"
+            },
+            "amenity/compressed_air": {
+                "name": "Ar comprimido"
             },
             "amenity/courthouse": {
-                "name": "Tribunal"
+                "name": "Tribunal",
+                "terms": "Casa da Justiça"
             },
             "amenity/dentist": {
                 "name": "Dentista",
@@ -961,85 +1056,94 @@
             },
             "amenity/drinking_water": {
                 "name": "Água Potável",
-                "terms": "Água Potável"
+                "terms": "Fonte de Água, Água Potável, Bebedouro"
             },
             "amenity/embassy": {
                 "name": "Embaixada",
-                "terms": "Embaixada"
+                "terms": "Consulado"
             },
             "amenity/fast_food": {
-                "name": "Comida Rápida"
+                "name": "Comida Rápida",
+                "terms": "Comida Instantânea, Comida de plástico, Fast Food"
             },
             "amenity/fire_station": {
                 "name": "Quartel de Bombeiros",
-                "terms": "bombeiros,quartel,quartel dos bombeiros,quartel de bombeiros"
+                "terms": "Bombeiros, Quartel, Quartel dos Bombeiros, Quartel de Bombeiros"
             },
             "amenity/fountain": {
                 "name": "Fonte Decorativa",
-                "terms": "Fonte"
+                "terms": "Fonte, Fonte de Água, Jacto de Água"
             },
             "amenity/fuel": {
-                "name": "Posto de Combustível",
+                "name": "Gasolineira / Posto de Combustível",
                 "terms": "Bombas de Abastecimento, Bombas de Gasolina"
             },
             "amenity/grave_yard": {
                 "name": "Sepultura",
-                "terms": "Cemitério"
+                "terms": "Cemitério, Mortos, Funerário, Solene"
+            },
+            "amenity/hospital": {
+                "name": "Hospital",
+                "terms": "Sala de emergência, Operação, Serviço de Saúde, Hospício, Enfermaria, Sanatório, Cirurgia, Médico, Ambulância"
             },
             "amenity/kindergarten": {
                 "name": "Jardim Infantil / Infantário",
-                "terms": "jardim infantil,infantário,pré-escola,pré escola"
+                "terms": "Pré-Escola, Pré Escola"
             },
             "amenity/library": {
                 "name": "Biblioteca",
-                "terms": "Biblioteca"
+                "terms": "Biblioteca, Livros, Consulta, Publica"
             },
             "amenity/marketplace": {
-                "name": "Mercado / Feira"
+                "name": "Mercado / Feira",
+                "terms": "Bazar, Minimercado"
             },
             "amenity/nightclub": {
                 "name": "Clube Nocturno",
                 "terms": "Clube Noturno, Discoteca"
             },
             "amenity/parking": {
-                "name": "Estacionamento",
-                "terms": "Estacionamento"
+                "name": "Parque de Estacionamento",
+                "terms": "Estacionamento, Lugar de Estacionamento"
             },
             "amenity/pharmacy": {
                 "name": "Farmácia",
-                "terms": "Farmácia"
+                "terms": "Farmácia, Parafarmácia"
             },
             "amenity/place_of_worship": {
-                "name": "Local de Oração"
+                "name": "Local de Oração",
+                "terms": "Abadia, Basílica, Casa de Adoração, Casa de Deus, Catedral, Capela, Capelinha, Centro Espiritual, Santuário, Templo"
             },
             "amenity/place_of_worship/buddhist": {
                 "name": "Templo Budista",
-                "terms": "Templo Budista"
+                "terms": "Estupa, Vihara, Mosteiro, Templo, Pagode, Zendo, Dojo"
             },
             "amenity/place_of_worship/christian": {
                 "name": "Igreja",
-                "terms": "Igreja"
+                "terms": "Cristão, Abadia, Alminha, Alminhas, Basílica, Betel, Casa de Adoração, Casa de Deus, Carmelo, Catedral, Capela, Capelinha, Colegiada, Congregação, Convento, Cruzeiro, Ermida, Mosteiro, Oratório, Paróquia, Salão do Reino  Sé"
             },
             "amenity/place_of_worship/jewish": {
                 "name": "Sinagoga",
-                "terms": "Sinagoga"
+                "terms": "Judaico, Sinagoga"
             },
             "amenity/place_of_worship/muslim": {
                 "name": "Mesquita",
-                "terms": "Mesquita"
+                "terms": "Muçulmano, Mesquita"
             },
             "amenity/police": {
                 "name": "Polícia",
-                "terms": "polícia,gnr,psp,g.n.r.,p.s.p.,polícia de segurança pública,guarda nacional republicana"
+                "terms": "Polícia, GNR, G.N.R., PSP, P.S.P., Polícia de Segurança Pública, Guarda Nacional Republicana"
             },
             "amenity/post_box": {
-                "name": "Caixa de Correio"
+                "name": "Caixa de Correio",
+                "terms": "Marco de Correio, Caixa Postal, Posto de Correio"
             },
             "amenity/post_office": {
-                "name": "Estação de Correios"
+                "name": "Estação de Correios",
+                "terms": "Central de Correio, CTT, C.T.T., CTTs, Correio de Portugal"
             },
             "amenity/pub": {
-                "name": "Bar",
+                "name": "Taberna",
                 "terms": "Pub"
             },
             "amenity/ranger_station": {
@@ -1051,42 +1155,50 @@
             },
             "amenity/restaurant": {
                 "name": "Restaurante",
-                "terms": "Restaurante"
+                "terms": "Bar, Cafetaria, Café, Cantina, Almoço, Jantar, Cozinha, Restaurante, Pizzaria, Culinária, Gastronomia, Restauração"
+            },
+            "amenity/school": {
+                "name": "Escola",
+                "terms": "Academia, Creche, Colégio, Departamento, Externato, Liceu, Seminário"
             },
             "amenity/shelter": {
                 "name": "Abrigo",
                 "terms": "Abrigo"
             },
+            "amenity/social_facility/food_bank": {
+                "name": "Banco alimentar"
+            },
             "amenity/studio": {
                 "name": "Estúdio",
                 "terms": "Estúdio"
             },
             "amenity/swimming_pool": {
                 "name": "Piscina",
-                "terms": "Piscina"
+                "terms": "Piscina, Parque Aquático "
             },
             "amenity/taxi": {
-                "name": "Praça de táxis",
-                "terms": "Paragem de táxis"
+                "name": "Praça de Táxis",
+                "terms": "Paragem de Táxis"
             },
             "amenity/telephone": {
                 "name": "Telefone",
-                "terms": "Telefone"
+                "terms": "Telefone, Telemóvel"
             },
             "amenity/theatre": {
                 "name": "Teatro",
-                "terms": "Teatro"
+                "terms": "Teatro, Performance, Peça, Peça de Teatro, Musical"
             },
             "amenity/toilets": {
                 "name": "Casas de Banho",
-                "terms": "Casas de Banho"
+                "terms": "Casas de Banho, Instalações Sanitárias, Sanitário, Gabinete Sanitário, Toilette, lavabo, WC"
             },
             "amenity/townhall": {
-                "name": "Câmara Municipal / Junta de Freguesia"
+                "name": "Câmara Municipal / Junta de Freguesia",
+                "terms": "Junta, Câmara, Paços, Centro Administrativo, Capital de Concelho, Capital de Freguesia, Capital de Distrito, Capital de Região"
             },
             "amenity/university": {
                 "name": "Universidade",
-                "terms": "universidade,faculdade,instituto"
+                "terms": "Universidade, Faculdade, Instituto, Politécnico"
             },
             "amenity/vending_machine": {
                 "name": "Máquina automática de vendas"
@@ -1095,82 +1207,103 @@
                 "name": "Veterinária"
             },
             "amenity/waste_basket": {
-                "name": "Caixote do Lixo"
+                "name": "Caixote do Lixo",
+                "terms": "Papeleira, Lixo, Reciclagem"
             },
             "area": {
                 "name": "Área",
-                "terms": "Área"
+                "terms": "Espaço, Extensão, Zona"
             },
             "barrier": {
                 "name": "Barreira",
-                "terms": "Barreira"
+                "terms": "Barreira, Muro"
             },
             "barrier/block": {
-                "name": "Bloco de Cimento / Pedra"
+                "name": "Bloco de Cimento / Pedra",
+                "terms": "Bloqueio, Obstáculo"
             },
             "barrier/bollard": {
-                "name": "Pilar"
+                "name": "Pilar",
+                "terms": "Bolardo, Poste de Amarração"
             },
             "barrier/cattle_grid": {
-                "name": "Grelha Anti-Gado"
+                "name": "Grelha Anti-Gado",
+                "terms": "Gado, Vaca, Porco, Boi, Cabra, Ovelha, Cavalo"
             },
             "barrier/city_wall": {
                 "name": "Muralha de Cidade",
-                "terms": "Camâra Municipal"
+                "terms": "Muro defensivo, Parede Defensiva, Muro Histórico, Fortificações"
             },
             "barrier/cycle_barrier": {
-                "name": "Barreira de Bicicletas"
+                "name": "Barreira de Bicicletas",
+                "terms": "Bicicleta"
             },
             "barrier/ditch": {
-                "name": "Fosso / Vala / Trincheira"
+                "name": "Fosso sem Água",
+                "terms": "Sem Água, Seca, Vala sem Água, Vala Seca, Trincheira sem Água, Trincheira  Seca"
             },
             "barrier/entrance": {
                 "name": "Entrada",
-                "terms": "Entrada"
+                "terms": "Entrada, Acesso, Abertura, Porta, Pórtico, Portão"
             },
             "barrier/fence": {
-                "name": "Vedação"
+                "name": "Vedação",
+                "terms": "Cerca, Proteção"
             },
             "barrier/gate": {
-                "name": "Cancela / Portão"
+                "name": "Cancela / Portão",
+                "terms": "Grade"
             },
             "barrier/hedge": {
-                "name": "Sebe"
+                "name": "Sebe",
+                "terms": "Arbusto, Muro de Flores, Muro de Plantas"
             },
             "barrier/kissing_gate": {
-                "name": "Cancela de Encosto Anti-Gado"
+                "name": "Cancela de Encosto Anti-Gado",
+                "terms": "Grade de Gado"
             },
             "barrier/lift_gate": {
-                "name": "Cancela Elevatória"
+                "name": "Barreira Automática",
+                "terms": "Cancela Elevatória, Barreira de Estacionamento"
             },
             "barrier/retaining_wall": {
-                "name": "Muro de Contenção"
+                "name": "Muro de Contenção",
+                "terms": "Arrimo, Amparo"
             },
             "barrier/stile": {
-                "name": "Escadas de Passagem Anti-Gado"
+                "name": "Passagem Anti-Gado",
+                "terms": "Escada"
             },
             "barrier/toll_booth": {
-                "name": "Portagem"
+                "name": "Portagem",
+                "terms": "Pedágio, Tarifa, Pórtico"
             },
             "barrier/wall": {
-                "name": "Muro"
+                "name": "Muro",
+                "terms": "Parede, Muro"
             },
             "boundary/administrative": {
-                "name": "Fronteira Administrativa (Concelho, freguesia...)",
-                "terms": "Fronteira Admistrativa"
+                "name": "Fronteira Administrativa",
+                "terms": "Fronteira Administrativa, Concelho, Freguesia, Distrito, Região, Limite Adminsitrativo"
             },
             "building": {
                 "name": "Edifício",
-                "terms": "Edifício"
+                "terms": "Edifício, Prédio"
             },
             "building/apartments": {
                 "name": "Apartamentos",
-                "terms": "Apartamentos"
+                "terms": "Apartamentos, Habitáculos"
+            },
+            "building/barn": {
+                "name": "Celeiro"
             },
             "building/bunker": {
                 "name": "Bunker",
                 "terms": "Bunker"
             },
+            "building/cabin": {
+                "name": "Cabana"
+            },
             "building/cathedral": {
                 "name": "Catedral",
                 "terms": "Catedral"
@@ -1184,8 +1317,8 @@
                 "terms": "Igreja"
             },
             "building/commercial": {
-                "name": "Edifício comercial",
-                "terms": "Prédio comercial"
+                "name": "Escritórios",
+                "terms": "Prédio Comercial, Edifício Comercial"
             },
             "building/construction": {
                 "name": "Edifício em Construção",
@@ -1195,12 +1328,9 @@
                 "name": "Dormitório",
                 "terms": "Dormitório"
             },
-            "building/entrance": {
-                "name": "Entrada"
-            },
             "building/garage": {
                 "name": "Garagem",
-                "terms": "Garagem"
+                "terms": "Garagem, Abrigo de Automoveis"
             },
             "building/garages": {
                 "name": "Garagens",
@@ -1212,23 +1342,27 @@
             },
             "building/house": {
                 "name": "Casa",
-                "terms": "Casa"
+                "terms": "Casa, Domicílio, Moradia, Mansão, Solar, Vivenda"
             },
             "building/hut": {
                 "name": "Cabana",
                 "terms": "Barraca"
             },
             "building/industrial": {
-                "name": "Edifício industrial",
-                "terms": "Edifício Industrial, Fábrica"
+                "name": "Industria",
+                "terms": "Edifício Industrial, Manufactura, Fábrica"
             },
             "building/public": {
                 "name": "Edifício Público",
                 "terms": "Edifício Público"
             },
             "building/residential": {
-                "name": "Edifício residencial",
-                "terms": "Prédio residencial"
+                "name": "Edifício Residencial",
+                "terms": "Prédio Residencial, Habitação"
+            },
+            "building/retail": {
+                "name": "Retalho",
+                "terms": "Varejo"
             },
             "building/roof": {
                 "name": "Telhado, Cobertura",
@@ -1238,6 +1372,12 @@
                 "name": "Edifício Escolar",
                 "terms": "Edifício Escolar"
             },
+            "building/shed": {
+                "name": "Barraca"
+            },
+            "building/stable": {
+                "name": "Estábulo"
+            },
             "building/train_station": {
                 "name": "Estação de Comboio",
                 "terms": "Estação de Comboio"
@@ -1254,10 +1394,29 @@
                 "name": "Ferreiro",
                 "terms": "Ferreiro"
             },
+            "craft/bookbinder": {
+                "name": "Encadernador"
+            },
+            "craft/brewery": {
+                "name": "Cervejaria"
+            },
             "craft/carpenter": {
                 "name": "Carpintaria",
                 "terms": "Carpintaria"
             },
+            "craft/carpet_layer": {
+                "name": "Colocador de tapetes"
+            },
+            "craft/clockmaker": {
+                "name": "Relojoeiro"
+            },
+            "craft/confectionary": {
+                "name": "Confeitaria"
+            },
+            "craft/dressmaker": {
+                "name": "Costureira",
+                "terms": "Costureira, Costureiro, Estilista, Alfaiate, Modista"
+            },
             "craft/electrician": {
                 "name": "Eletricista",
                 "terms": "Eletricista"
@@ -1266,6 +1425,24 @@
                 "name": "Jardineiro",
                 "terms": "Jardineiro"
             },
+            "craft/insulator": {
+                "name": "Isolador"
+            },
+            "craft/jeweler": {
+                "name": "Joalheiro"
+            },
+            "craft/key_cutter": {
+                "name": "Chaveiro"
+            },
+            "craft/locksmith": {
+                "name": "Serralheiro"
+            },
+            "craft/metal_construction": {
+                "name": "Construção metálica"
+            },
+            "craft/optician": {
+                "name": "Oculista"
+            },
             "craft/painter": {
                 "name": "Pintor",
                 "terms": "Pintor"
@@ -1274,10 +1451,26 @@
                 "name": "Fotógrafo",
                 "terms": "Fotográfo"
             },
+            "craft/photographic_laboratory": {
+                "name": "Laboratório Fotográfico",
+                "terms": "Loja Fotográfica, Fotógrafo"
+            },
+            "craft/plasterer": {
+                "name": "Gesseiro"
+            },
             "craft/plumber": {
                 "name": "Canalizador",
                 "terms": "Canalizador"
             },
+            "craft/pottery": {
+                "name": "Oleiro"
+            },
+            "craft/roofer": {
+                "name": "Telhador"
+            },
+            "craft/saddler": {
+                "name": "Seleiro"
+            },
             "craft/sculpter": {
                 "name": "Escultor",
                 "terms": "Escultor"
@@ -1294,6 +1487,9 @@
                 "name": "Relojoeiro",
                 "terms": "Relojoeiro"
             },
+            "embankment": {
+                "name": "Aterro"
+            },
             "emergency/ambulance_station": {
                 "name": "Central de ambulâncias"
             },
@@ -1302,100 +1498,142 @@
             },
             "emergency/phone": {
                 "name": "Telefone de Emergência",
-                "terms": "Telefone de Emergência"
+                "terms": "Telefone de Emergência, 112"
             },
-            "entrance": {
-                "name": "Entrada"
+            "footway/crossing": {
+                "name": "Passadeira"
             },
             "footway/sidewalk": {
                 "name": "Passeio",
                 "terms": "Passeio"
             },
+            "golf/bunker": {
+                "name": "Banco de areia"
+            },
+            "golf/fairway": {
+                "name": "Fairway"
+            },
+            "golf/green": {
+                "name": "Green"
+            },
+            "golf/hole": {
+                "name": "Buraco de golfe"
+            },
+            "golf/lateral_water_hazard": {
+                "name": "Obstáculo de água lateral"
+            },
+            "golf/rough": {
+                "name": "Rough"
+            },
+            "golf/tee": {
+                "name": "Tee"
+            },
+            "golf/water_hazard": {
+                "name": "Obstáculo de água"
+            },
             "highway": {
-                "name": "Auto-Estrada",
-                "terms": "Auto-Estrada"
+                "name": "Rodovia",
+                "terms": "Estrada, Via, Trânsito, Carro, Veiculo"
             },
             "highway/bridleway": {
-                "name": "Caminhos Exclusivo para Cavalos"
+                "name": "Caminhos Exclusivo para Cavalos",
+                "terms": "Trilho para Cavalos, Trilho para Cavaleiros, Trilho Equestre, Caminho Equestre, Caminho para Cavalos, Caminho para Cavaleiros"
             },
             "highway/bus_stop": {
                 "name": "Paragem de Autocarro",
-                "terms": "Paragem de Autocarro"
+                "terms": "Paragem de Autocarro, Terminal de Autocarros"
             },
             "highway/crossing": {
-                "name": "Passadeira"
+                "name": "Passadeira",
+                "terms": "Zebra, Faixa de segurança, Passagem, Passagem de Peões, Riscas"
             },
             "highway/cycleway": {
-                "name": "Ciclovia"
+                "name": "Ciclovia",
+                "terms": "Bicicleta"
             },
             "highway/footway": {
-                "name": "Via Pedonal"
+                "name": "Via Pedonal",
+                "terms": "Andar, Caminho, Estrada, Pé, Pedestre, Percurso, Rua, Ruela, Trajectória, Trilha, Trilho, Via, Viela, Caminho Pedonal"
             },
             "highway/living_street": {
-                "name": "Living Street (não existem em países lusófonos)"
+                "name": "Zonas de coexistência",
+                "terms": "Zona de Peões"
             },
             "highway/mini_roundabout": {
                 "name": "Mini-Rotunda",
-                "terms": "Mini-Rotunda"
+                "terms": "Mini-Rotunda, Minirotunda, Rotunda Pintada"
             },
             "highway/motorway": {
-                "name": "Autoestrada"
+                "name": "Autoestrada",
+                "terms": "Auto-Estrada, Auto Estrada"
             },
             "highway/motorway_junction": {
-                "name": "Interseção de Autoestradas"
+                "name": "Interseção / Saída de Autoestradas",
+                "terms": "Junção, Saída de Autoestradas"
             },
             "highway/motorway_link": {
-                "name": "Ligação a Autoestrada"
+                "name": "Nó de ligação a uma Autoestrada",
+                "terms": "Ligação Autoestrada, Entrada Autoestrada, Saída Autoestrada"
             },
             "highway/path": {
-                "name": "Caminho"
+                "name": "Trilho",
+                "terms": "Trilha, Caminho"
             },
             "highway/pedestrian": {
-                "name": "Rua Pedonal"
+                "name": "Praça / Rua Pedonal",
+                "terms": "Pedonal, Pedestre"
             },
             "highway/primary": {
-                "name": "Estrada Primária / Nacional"
+                "name": "Estrada Nacional (Primária)",
+                "terms": "Estrada Principal, Rodovia Principal, Estrada Primária, Rodovia Primária, Primário"
             },
             "highway/primary_link": {
-                "name": "Ligação a Estrada Primária / Nacional"
+                "name": "Nó de Ligação a uma Estrada Nacional",
+                "terms": "Ligação Estrada Nacional, Ligação Rodovia Nacional, Ligação Nacional,  Ligação Estrada Principal, Entrada Estrada Nacional, Entrada Rodovia Nacional, Entrada Nacional, Entrada Estrada Nacional, Saída Nacional, Saída Rodovia Nacional, Saída Nacional, Saída Estrada Nacional,"
             },
             "highway/residential": {
                 "name": "Estrada Residencial",
-                "terms": "Estrada Residencial"
+                "terms": "Estrada Residencial, Rodovia Residencial, Estrada Urbana, Rodovia Urbana, Estrada Suburbana, Rodovia Suburbana, Estrada dentro de localidades, Rodovia dentro de localidades"
             },
             "highway/rest_area": {
                 "name": "Área de Descanso",
                 "terms": "Área de Descanso"
             },
             "highway/road": {
-                "name": "Estrada Genérica",
-                "terms": "Estrada Desconhecida"
+                "name": "Estrada Incógnita",
+                "terms": "Estrada Genérica, Rodovia Genérica, Estrada Desconhecida, Rodovia Desconhecida"
             },
             "highway/secondary": {
-                "name": "Estrada Secundária / Regional"
+                "name": "Estrada Regional",
+                "terms": "Estrada Secundária, Rodovia Secundária, Secundário"
             },
             "highway/secondary_link": {
-                "name": "Ligação a Estrada Secundária / Regional"
+                "name": "Nó de ligação a uma Estrada Regional",
+                "terms": "Ligação Estrada Regional, Ligação Rodovia Regional, Ligação Regional,  Ligação Estrada Secundária, Entrada Estrada Regional, Entrada Rodovia Regional, Entrada Regional, Entrada Estrada Secundária, Saída Regional, Saída Rodovia Regional, Saída Regional, Saída Estrada Secundária"
             },
             "highway/service": {
                 "name": "Estrada de Serviço",
-                "terms": "Estrada de Serviço"
+                "terms": "Rodovia de Serviço"
             },
             "highway/service/alley": {
-                "name": "Rua de Traseiras"
+                "name": "Traseiras",
+                "terms": "Beco"
             },
             "highway/service/drive-through": {
-                "name": "Serviço ao volante"
+                "name": "Drive-Through",
+                "terms": "Drive-in, Serviço ao Volante"
             },
             "highway/service/driveway": {
-                "name": "Acesso a residência / serviço"
+                "name": "Acesso a residência / garagem",
+                "terms": "Rampa de Acesso, Corredor"
             },
             "highway/service/emergency_access": {
                 "name": "Acesso de Emergência",
-                "terms": "Acesso de Emergência"
+                "terms": "Acesso de Emergência, Entrada de Emergência, Corredor de Emergência"
             },
             "highway/service/parking_aisle": {
-                "name": "Estrada de Parque de Estacionamento"
+                "name": "Corredor de Estacionamento",
+                "terms": "Pista de Estacionamento, Estacionar"
             },
             "highway/services": {
                 "name": "Área de Serviço",
@@ -1403,36 +1641,42 @@
             },
             "highway/steps": {
                 "name": "Escadas",
-                "terms": "Escadas"
+                "terms": "Escadaria, degraus"
             },
             "highway/stop": {
                 "name": "Sinal de stop",
                 "terms": "Sinal de Stop, Sinal de Paragem, Paragem Obrigatória"
             },
             "highway/tertiary": {
-                "name": "Estrada Terciária / Municipal"
+                "name": "Estrada / Caminho Municipal",
+                "terms": "Estrada Terciária, Rodovia Terciária, Terciário, Caminho Municipal"
             },
             "highway/tertiary_link": {
-                "name": "Ligação a Estrada Terciária / Municipal"
+                "name": "Nó de ligação a uma Estrada Municipal",
+                "terms": "Ligação Estrada Municipal, Ligação Rodovia Municipal, Ligação Municipal,  Ligação Estrada Terciária, Entrada Estrada Municipal, Entrada Rodovia Municipal, Entrada Municipal, Entrada Estrada Terciária, Saída Municipal, Saída Rodovia Municipal, Saída Municipal, Saída Estrada Municipal"
             },
             "highway/track": {
-                "name": "Carreiro Florestal / Agrícola"
+                "name": "Estrada Florestal / Agrícola",
+                "terms": "Estrada Rural"
             },
             "highway/traffic_signals": {
-                "name": "Semáforo",
-                "terms": "Sinais de Trânsito"
+                "name": "Semáforos",
+                "terms": "Semáforo, Vermelho, Verde, Amarelo, Sinal, Sinal de Trânsito"
             },
             "highway/trunk": {
-                "name": "Via Rápida /Variante / IP / IC"
+                "name": "Via Rápida",
+                "terms": "Via Reservada a Automóveis e Motociclos, Estrada Reservada a Automóveis e Motociclos, Via Expressa, Via Reservada"
             },
             "highway/trunk_link": {
-                "name": "Ligação a Via Rápida / IP / IC"
+                "name": "Nó de ligação a uma Via Rápida",
+                "terms": "Ligação Via Rápida, Entrada Via Rápida, Saída Via Rápida, Ligação Via Reservada a Automóveis e Motociclos, Entrada Via Reservada a Automóveis e Motociclos, Saída Via Reservada a Automóveis e Motociclos, Ligação Via Expressa, Entrada Expressa, Saída Via Expressa, Ligação Via Reservada, Entrada Via Reservada, Saída Via Reservada"
             },
             "highway/turning_circle": {
-                "name": "Circulo de Viragem"
+                "name": "Circulo de Viragem",
+                "terms": "Inversão de Marcha"
             },
             "highway/unclassified": {
-                "name": "Estrada Não-Classificada",
+                "name": "Estrada Normal",
                 "terms": "Estrada Não-Classificada"
             },
             "historic": {
@@ -1444,112 +1688,138 @@
                 "terms": "Local Arqueológico"
             },
             "historic/boundary_stone": {
-                "name": "Marco de Fronteira"
+                "name": "Marco de Fronteira",
+                "terms": "Pilar de Fronteira"
             },
             "historic/castle": {
                 "name": "Castelo",
-                "terms": "Castelo"
+                "terms": "Castelo, Fortaleza, Edificação, Medieval"
             },
             "historic/memorial": {
                 "name": "Memorial",
-                "terms": "Memorial"
+                "terms": "Memorial, Homenagem"
             },
             "historic/monument": {
                 "name": "Monumento",
-                "terms": "Monumento"
+                "terms": "Monumento, Marco"
             },
             "historic/ruins": {
                 "name": "Ruínas",
-                "terms": "Ruínas"
+                "terms": "Ruínas, Abandonado"
             },
             "historic/wayside_cross": {
-                "name": "Cruzeiro / Cruz ao Ar Livre"
+                "name": "Cruzeiro",
+                "terms": " Cruz ao Ar Livre"
             },
             "historic/wayside_shrine": {
-                "name": "Alminhas / Nicho / Capelinha"
+                "name": "Alminhas / Nicho / Capelinha",
+                "terms": "Alminhas / Nicho / Capelinha"
             },
             "landuse": {
-                "name": "Uso do Solo"
+                "name": "Uso do Solo",
+                "terms": "Uso de Terra, Uso de Solo"
             },
             "landuse/allotments": {
-                "name": "Horta Urbana / Comunitária"
+                "name": "Hortas",
+                "terms": "Horta Comunitária, Horta Urbana"
             },
             "landuse/basin": {
-                "name": "Bacia Hidrográfica"
+                "name": "Bacia Hidrográfica",
+                "terms": "Bacia de Drenagem"
             },
             "landuse/cemetery": {
                 "name": "Cemitério",
-                "terms": "Cemitério"
+                "terms": "Cemitério, Vala"
             },
             "landuse/commercial": {
-                "name": "Comercial"
+                "name": "Zona de Escritórios",
+                "terms": "Área comercial, Baixa Comercial"
             },
             "landuse/construction": {
                 "name": "Construção",
-                "terms": "Construção, Obras"
+                "terms": "Construção, Obras, Em Curso"
             },
             "landuse/farm": {
                 "name": "Quinta",
-                "terms": "Quinta"
+                "terms": "Quinta, Campo Agricula"
             },
             "landuse/farmland": {
                 "name": "Quinta",
                 "terms": "Quinta"
             },
             "landuse/farmyard": {
-                "name": "Quinta",
-                "terms": "Quinta"
+                "name": "Edifícios Agrícolas",
+                "terms": "Fazenda, Casa de Campo, Celeiro"
             },
             "landuse/forest": {
                 "name": "Floresta",
-                "terms": "Floresta"
+                "terms": "Floresta, Área Verde"
             },
             "landuse/grass": {
                 "name": "Relva",
-                "terms": "Relva"
+                "terms": "Relva, Grama"
             },
             "landuse/industrial": {
-                "name": "Industrial",
+                "name": "Zona de Industrias",
                 "terms": "Industrial"
             },
+            "landuse/landfill": {
+                "name": "Aterro sanitário"
+            },
             "landuse/meadow": {
-                "name": "Prado"
+                "name": "Prado",
+                "terms": "Meadow"
+            },
+            "landuse/military": {
+                "name": "Militar",
+                "terms": "Exército, Marinha, Forças Especiais, Força Aérea"
             },
             "landuse/orchard": {
-                "name": "Pomar"
+                "name": "Pomar",
+                "terms": "Plantação, Orchard"
             },
             "landuse/quarry": {
-                "name": "Pedreira"
+                "name": "Pedreira",
+                "terms": "Canteira, Quarry"
             },
             "landuse/residential": {
                 "name": "Residencial",
-                "terms": "Residencial"
+                "terms": "Residencial, Urbano, Antrópico, Residential"
             },
             "landuse/retail": {
-                "name": "Área de Retalho",
-                "terms": "Retalho"
+                "name": "Zona de Retalhos",
+                "terms": "Retalho, Varejo, Compras, Vendas, Retail"
             },
             "landuse/vineyard": {
                 "name": "Vinha",
-                "terms": "Vinhas"
+                "terms": "Vinhas, Vinhedo, Vinhão, Vineyard"
             },
             "leisure": {
                 "name": "Lazer",
-                "terms": "Lazer"
+                "terms": "Lazer, Diversão, Leisure"
             },
             "leisure/common": {
                 "name": "Comum"
             },
             "leisure/dog_park": {
-                "name": "Parque de cães",
-                "terms": "Parque para cães"
+                "name": "Parque de Cães",
+                "terms": "Parque para Cães, Dog Park"
+            },
+            "leisure/firepit": {
+                "name": "Fogueira",
+                "terms": "Fogo controlado, chama, brasa"
             },
             "leisure/garden": {
                 "name": "Jardim",
-                "terms": "Jardim"
+                "terms": "Jardim, Garden"
             },
             "leisure/golf_course": {
-                "name": "Campo de Golfe"
+                "name": "Campo de Golfe",
+                "terms": "Campo de Golf, Golf, Golf Course"
+            },
+            "leisure/ice_rink": {
+                "name": "Ringue de Patinagem",
+                "terms": "Ringue de Gelo, Gelo, Pista de Gelo, Pista de Patinagem"
             },
             "leisure/marina": {
                 "name": "Marina",
@@ -1557,26 +1827,27 @@
             },
             "leisure/park": {
                 "name": "Parque",
-                "terms": "Parque"
+                "terms": "Bosque, Floresta, Jardim, Relva, Relvado"
             },
             "leisure/picnic_table": {
-                "name": "Mesa de Merenda",
+                "name": "Mesa de Picnic",
                 "terms": "Mesa de Merenda"
             },
             "leisure/pitch": {
                 "name": "Campo de Desporto",
-                "terms": "Campo de Desportos, Quadra Desportiva"
+                "terms": "Campo de Desportos, Quadra Desportiva, Sport Pitch"
             },
             "leisure/pitch/american_football": {
                 "name": "Campo de Futebol Americano",
-                "terms": "Campo de Futebol Americano"
+                "terms": "Campo de Futebol Americano, Rugby, Râguebi, American Football"
             },
             "leisure/pitch/baseball": {
-                "name": "Campo de Basebol"
+                "name": "Campo de Basebol",
+                "terms": "Campo de Baisebol, Baseball Diamond"
             },
             "leisure/pitch/basketball": {
                 "name": "Campo de Basquetebol",
-                "terms": "Campo de Basquetebol, Quadra de Basquetebol"
+                "terms": "Campo de Basquetebol, Quadra de Basquetebol, Basketball Court"
             },
             "leisure/pitch/skateboard": {
                 "name": "Parque de skate",
@@ -1584,32 +1855,34 @@
             },
             "leisure/pitch/soccer": {
                 "name": "Campo de Futebol",
-                "terms": "Campo de Futebol"
+                "terms": "Campo de Futebol, Soccer Field"
             },
             "leisure/pitch/tennis": {
                 "name": "Campo de Ténis",
-                "terms": "Campo de Ténis, Quadra de Ténis"
+                "terms": "Campo de Ténis, Quadra de Ténis, Tennis Court"
             },
             "leisure/pitch/volleyball": {
                 "name": "Campo de Voleibol",
-                "terms": "Campo de Voleibol, Quadra de Voleibol"
+                "terms": "Campo de Voleibol, Quadra de Voleibol, Volleyball Court"
             },
             "leisure/playground": {
-                "name": "Parque infantil"
+                "name": "Parque Infantil",
+                "terms": "Parque Infantil, Escorrega, Baloiço, Escorregas, Baloiços"
             },
             "leisure/slipway": {
-                "name": "Rampa para Barcos"
+                "name": "Rampa para Barcos",
+                "terms": "Slipway"
             },
             "leisure/sports_center": {
                 "name": "Centro desportivo"
             },
             "leisure/stadium": {
                 "name": "Estádio",
-                "terms": "Estádio"
+                "terms": "Estádio, Stadium"
             },
             "leisure/swimming_pool": {
                 "name": "Piscina",
-                "terms": "Piscina"
+                "terms": "Piscina, Swimming Pool"
             },
             "leisure/track": {
                 "name": "Pista de corridas",
@@ -1617,17 +1890,22 @@
             },
             "line": {
                 "name": "Linha",
-                "terms": "Linha"
+                "terms": "Linha, Line"
             },
             "man_made": {
-                "name": "Construção",
-                "terms": "Construção Humana"
+                "name": "Estrutura Artificial",
+                "terms": "Construção Humana, Obra Humana, Man Made"
             },
             "man_made/breakwater": {
-                "name": "Quebra-mar / Molhe"
+                "name": "Quebra-mar / Molhe",
+                "terms": "Breakwater"
             },
             "man_made/cutline": {
-                "name": "Linha corta-fogo"
+                "name": "Linha corta-fogo",
+                "terms": "Cut line"
+            },
+            "man_made/embankment": {
+                "name": "Aterro"
             },
             "man_made/flagpole": {
                 "name": "Estandarte",
@@ -1635,30 +1913,35 @@
             },
             "man_made/lighthouse": {
                 "name": "Farol",
-                "terms": "Faról"
+                "terms": "Faról, Lighthouse"
             },
             "man_made/observation": {
                 "name": "Torre de observação",
                 "terms": "Torre de Observação"
             },
             "man_made/pier": {
-                "name": "Pontão / Atracadouro"
+                "name": "Pontão / Atracadouro",
+                "terms": "Pier, Porto, Doca"
             },
             "man_made/pipeline": {
-                "name": "Pipeline"
+                "name": "Gasoduto / Oleoduto",
+                "terms": "Tubo, Pipeline"
             },
             "man_made/survey_point": {
-                "name": "Vértice Geodésico"
+                "name": "Vértice Geodésico / Talefe",
+                "terms": "Survey Point"
             },
             "man_made/tower": {
                 "name": "Torre",
-                "terms": "Torre"
+                "terms": "Torre, Alto, Tower"
             },
             "man_made/wastewater_plant": {
-                "name": "ETAR"
+                "name": "ETAR",
+                "terms": "ETAR, E.T.A.R., Estação de Tratamento de Resíduos, Estação de Tratamento de Águas Residuais"
             },
             "man_made/water_tower": {
-                "name": "Depósito de Água"
+                "name": "Reservatório Elevado",
+                "terms": "Depósito de Água, Torre de Água, Water Tower"
             },
             "man_made/water_well": {
                 "name": "Poço de Água"
@@ -1666,10 +1949,19 @@
             "man_made/water_works": {
                 "name": "Estação de Captação e Tratamento de Água"
             },
+            "military/airfield": {
+                "name": "Aeródromo"
+            },
+            "military/barracks": {
+                "name": "Quartel"
+            },
             "military/bunker": {
                 "name": "Bunker",
                 "terms": "Bunker"
             },
+            "military/range": {
+                "name": "Pista de tiro"
+            },
             "natural": {
                 "name": "Natural",
                 "terms": "Natural"
@@ -1688,7 +1980,7 @@
             },
             "natural/coastline": {
                 "name": "Linha Costeira",
-                "terms": "Costa"
+                "terms": "Costa, Orla"
             },
             "natural/fell": {
                 "name": "Encosta"
@@ -1704,7 +1996,8 @@
                 "name": "Charneca"
             },
             "natural/peak": {
-                "name": "Cume"
+                "name": "Cume",
+                "terms": "Cume, Montanha, Pináculo"
             },
             "natural/scree": {
                 "name": "Encosta de cascalho"
@@ -1726,17 +2019,18 @@
             },
             "natural/water/lake": {
                 "name": "Lago",
-                "terms": "Lago"
+                "terms": "Jardim de Água, Jardim d'Água, Lagoa, Lagoinha, Pateira"
             },
             "natural/water/pond": {
-                "name": "Lagoa"
+                "name": "Lagoa",
+                "terms": "Jardim de Água, Jardim d'Água, Lagoinha, Pateira"
             },
             "natural/water/reservoir": {
                 "name": "Reservatório Artificial",
                 "terms": "Reservatório, Reservatório de Água"
             },
             "natural/wetland": {
-                "name": "Zonas Encharcadas",
+                "name": " Zona húmida",
                 "terms": "Pântano"
             },
             "natural/wood": {
@@ -1745,25 +2039,68 @@
             "office": {
                 "name": "Escritório"
             },
+            "office/accountant": {
+                "name": "Contabilista"
+            },
+            "office/administrative": {
+                "name": "Escritório administrativo"
+            },
             "office/architect": {
                 "name": "Arquiteto",
                 "terms": "Arquiteto"
             },
+            "office/company": {
+                "name": "Escritório de empresa"
+            },
+            "office/educational_institution": {
+                "name": "Instituição de ensino"
+            },
             "office/employment_agency": {
+                "name": "Agência de emprego",
                 "terms": "Centro de Emprego"
             },
+            "office/estate_agent": {
+                "name": "Agência imobiliária"
+            },
             "office/financial": {
                 "name": "Finanças",
                 "terms": "Finanças"
             },
+            "office/government": {
+                "name": "Escritório do Governo"
+            },
             "office/insurance": {
                 "name": "Seguradora, Seguros",
                 "terms": "Seguradora, Seguros"
             },
+            "office/it": {
+                "name": "Escritório de informática"
+            },
+            "office/lawyer": {
+                "name": "Escritório de advogados"
+            },
+            "office/newspaper": {
+                "name": "Jornal"
+            },
+            "office/ngo": {
+                "name": "Escritório de ONG"
+            },
+            "office/physician": {
+                "name": "Médico"
+            },
             "office/political_party": {
                 "name": "Partido Político",
                 "terms": "Partido Político"
             },
+            "office/research": {
+                "name": "Centro de Investigação"
+            },
+            "office/telecommunication": {
+                "name": "Escritório de telecomunicações"
+            },
+            "office/therapist": {
+                "name": "Terapeuta"
+            },
             "office/travel_agent": {
                 "name": "Agência de Viagens",
                 "terms": "Agência de Viagens"
@@ -1781,11 +2118,11 @@
                 "terms": "Cidade"
             },
             "place/hamlet": {
-                "name": "Aldeia / Lugar"
+                "name": "Aldeia"
             },
             "place/island": {
                 "name": "Ilha",
-                "terms": "Ilha"
+                "terms": "Arquipélago, Atol, Ilha, Ilhéu, Recife, Restinga"
             },
             "place/isolated_dwelling": {
                 "name": "Habitação Isolada"
@@ -1795,14 +2132,18 @@
                 "terms": "Localidade"
             },
             "place/neighbourhood": {
-                "name": "Bairro",
+                "name": "Vizinhança",
                 "terms": "Bairro"
             },
+            "place/suburb": {
+                "name": "Borough",
+                "terms": "Borough"
+            },
             "place/town": {
-                "name": "Sede de Concelho (cidade, vila)"
+                "name": "Cidade"
             },
             "place/village": {
-                "name": "Sede de freguesia",
+                "name": "Vila",
                 "terms": "Vila"
             },
             "point": {
@@ -1821,12 +2162,15 @@
                 "name": "Linha de Transmissão",
                 "terms": "Linha de Eletricidade"
             },
+            "power/minor_line": {
+                "name": "Linha de transmissão menor"
+            },
             "power/pole": {
                 "name": "Poste de Eletricidade",
                 "terms": "Poste de Eletricidade"
             },
             "power/sub_station": {
-                "name": "Sub-estação"
+                "name": "Subestação"
             },
             "power/tower": {
                 "name": "Torre de Alta Tensão",
@@ -1836,12 +2180,18 @@
                 "name": "Transformador de Distribuição",
                 "terms": "Transformador"
             },
+            "public_transport/platform": {
+                "name": "Plataforma"
+            },
+            "public_transport/stop_position": {
+                "name": "Posição de paragem"
+            },
             "railway": {
                 "name": "Ferrovia",
                 "terms": "Carris, Linha de Carris"
             },
             "railway/abandoned": {
-                "name": "Ferrovia Abandonada (carris removidos)",
+                "name": "Ferrovia Abandonada",
                 "terms": "Carris Abandonados, Linha de Carris Abandonados"
             },
             "railway/disused": {
@@ -1855,7 +2205,8 @@
                 "name": "Apeadeiro"
             },
             "railway/level_crossing": {
-                "name": "Passagem de Nível Ferroviária"
+                "name": "Passagem de Nível",
+                "terms": "Passagem em Nível, Passagem de Comboios"
             },
             "railway/monorail": {
                 "name": "Monocarril"
@@ -1875,7 +2226,7 @@
             },
             "railway/subway_entrance": {
                 "name": "Entrada de Metro",
-                "terms": "Entrada do Metro"
+                "terms": "Entrada do Metro, Metro, Metropolitano, Subterrâneo "
             },
             "railway/tram": {
                 "name": "Elétrico",
@@ -1886,7 +2237,7 @@
                 "terms": "Relação"
             },
             "route/ferry": {
-                "name": "Rota de Ferry",
+                "name": "Rota de Barca / Ferry",
                 "terms": "Rota do Ferry"
             },
             "shop": {
@@ -1894,7 +2245,8 @@
                 "terms": "Loja"
             },
             "shop/alcohol": {
-                "name": "Loja de Bebidas Alcoólicas"
+                "name": "Loja de Bebidas Alcoólicas",
+                "terms": "Alcool"
             },
             "shop/art": {
                 "name": "Loja de Arte",
@@ -1958,7 +2310,7 @@
                 "terms": "Loja de Conviniência"
             },
             "shop/deli": {
-                "name": "Loja de Gourmet"
+                "name": "Loja de Gourmet / Delicacias"
             },
             "shop/department_store": {
                 "name": "Grande Armazém"
@@ -1974,7 +2326,8 @@
                 "terms": "Loja de Eletrodomésticos"
             },
             "shop/farm": {
-                "name": "Barraca de produtos do campo"
+                "name": "Barraca de Produtos do Campo",
+                "terms": "Barraca de Fruta, Barraca de Legumes, Barraca de Hortaliças, Barraca de Batatas"
             },
             "shop/fishmonger": {
                 "name": "Peixaria"
@@ -1984,8 +2337,8 @@
                 "terms": "Florista"
             },
             "shop/funeral_directors": {
-                "name": "Funerária",
-                "terms": "Funerária"
+                "name": "Agência Funerária",
+                "terms": "Casa Funerária, Agência Mortuária, Casa Mortuária"
             },
             "shop/furniture": {
                 "name": "Loja de Mobiliário",
@@ -2024,6 +2377,9 @@
             "shop/locksmith": {
                 "name": "Serralheiro"
             },
+            "shop/lottery": {
+                "name": "Lotaria"
+            },
             "shop/mall": {
                 "name": "Centro Comercial"
             },
@@ -2043,7 +2399,7 @@
                 "name": "Loja de Jornais e Revistas"
             },
             "shop/optician": {
-                "name": "Ótica"
+                "name": "Loja de Ótica / Oculos"
             },
             "shop/outdoor": {
                 "name": "Loja de Artigos p/Atividades ao Ar Livre"
@@ -2056,6 +2412,10 @@
                 "name": "Loja de Fotografia, Fotógrafo",
                 "terms": "Loja de Fotografia, Fotográfo"
             },
+            "shop/seafood": {
+                "name": "Loja de Frutos do Mar",
+                "terms": "Camarão, Lagosta, Caranguejo, Ameijoas, Mexilhões"
+            },
             "shop/shoes": {
                 "name": "Sapataria",
                 "terms": "Loja de Sapatos, Sapataria"
@@ -2069,7 +2429,7 @@
             },
             "shop/supermarket": {
                 "name": "Supermercado",
-                "terms": "Supermercado"
+                "terms": "Bazar, Centro Comercial, Compras, Feira, Hipermercado, Minimercado, Stand, Outlet"
             },
             "shop/toys": {
                 "name": "Loja de Brinquedos",
@@ -2087,11 +2447,14 @@
                 "name": "Loja Vazia"
             },
             "shop/variety_store": {
-                "name": "Loja de Descontos (1,99€...)"
+                "name": "Loja dos Chineses"
             },
             "shop/video": {
                 "name": "Videoclube"
             },
+            "shop/wine": {
+                "name": "Loja de vinhos"
+            },
             "tourism": {
                 "name": "Turismo",
                 "terms": "Turismo"
@@ -2115,10 +2478,11 @@
                 "name": "Parque de Caravanas"
             },
             "tourism/chalet": {
-                "name": "Chalé"
+                "name": "Chalé / Casa de Férias"
             },
             "tourism/guest_house": {
-                "name": "Casa de Hóspedes"
+                "name": "Casa de Hóspedes",
+                "terms": "Cama e Pequeno Almoço, Cama e Peq. Almoço, Cama e Almoço"
             },
             "tourism/hostel": {
                 "name": "Pousada / Hostel",
@@ -2138,7 +2502,7 @@
             },
             "tourism/museum": {
                 "name": "Museu",
-                "terms": "Museu"
+                "terms": "Exposição, Fundação, Galeria, Galeria de Arte, Instituição, Livraria, Salão"
             },
             "tourism/picnic_site": {
                 "name": "Parque de Merendas / Piqueniques",
@@ -2159,11 +2523,11 @@
                 "terms": "Fronteira"
             },
             "type/boundary/administrative": {
-                "name": "Fronteira Administrativa (Concelho, Freguesia...)",
+                "name": "Fronteira Administrativa",
                 "terms": "Fronteira Admistrativa"
             },
             "type/multipolygon": {
-                "name": "Multi-polígono",
+                "name": "Multipolígono",
                 "terms": "Multipolígono"
             },
             "type/restriction": {
@@ -2186,7 +2550,7 @@
                 "name": "Rota de Desvio"
             },
             "type/route/ferry": {
-                "name": "Rota de Ferry",
+                "name": "Rota de Barca / Ferry",
                 "terms": "Rota do Ferry"
             },
             "type/route/foot": {
@@ -2196,14 +2560,15 @@
                 "name": "Rota de caminhada"
             },
             "type/route/pipeline": {
-                "name": "Rota de Pipeline"
+                "name": "Rota de Gasoduto / Oleoduto"
             },
             "type/route/power": {
                 "name": "Rota de Transmissão de Energia",
                 "terms": "Linha de Eletricidade, Linha de Energia"
             },
             "type/route/road": {
-                "name": "Rota Rodoviária"
+                "name": "Rota Rodoviária",
+                "terms": "Percurso Rodoviário, Trajecto Rodoviário"
             },
             "type/route/train": {
                 "name": "Rota Ferroviária"
@@ -2230,21 +2595,22 @@
                 "terms": "Barragem"
             },
             "waterway/ditch": {
-                "name": "Fosso / Vala / Trincheira",
-                "terms": "Represa"
+                "name": "Fosso",
+                "terms": "Vala, Trincheira, Represa"
             },
             "waterway/drain": {
                 "name": "Vala de Drenagem"
             },
             "waterway/river": {
                 "name": "Rio",
-                "terms": "Rio"
+                "terms": "Afluente, Barra, Barroca, Canal, Corga, Curso de Água, Delta, Estuário, Grota, Ria"
             },
             "waterway/riverbank": {
                 "name": "Margem de Rio"
             },
             "waterway/stream": {
-                "name": "Ribeiro"
+                "name": "Ribeiro",
+                "terms": "Afluente, Barra, Barroca, Canal, Corga, Curso de Água, Delta, Estuário, Fio de Água, Grota, Regato, Rego, Riacho, Ribeira, Ribeiro, Ria, Vala, Valeiro"
             },
             "waterway/weir": {
                 "name": "Represa"

diff --git a/vendor/assets/iD/iD/locales/ro-RO.json b/vendor/assets/iD/iD/locales/ro-RO.json
index 9cf58b6e499b92b430a219a158c1d3049777825f..3fb5265040a15acffc915fdd7af0c98b2ffef503 100644 (file)
--- a/vendor/assets/iD/iD/locales/ro-RO.json
+++ b/vendor/assets/iD/iD/locales/ro-RO.json
@@ -478,9 +478,6 @@
             "building": {
                 "name": "Clădire"
             },
-            "entrance": {
-                "name": "Intrare"
-            },
             "highway": {
                 "name": "Autostradă"
             },

diff --git a/vendor/assets/iD/iD/locales/ru.json b/vendor/assets/iD/iD/locales/ru.json
index 0be13f32730250f3f5a59f5b65b47feeae8160d0..c4cf3f92ba5d6bb9715d9c03ed08ca67728f8341 100644 (file)
--- a/vendor/assets/iD/iD/locales/ru.json
+++ b/vendor/assets/iD/iD/locales/ru.json
@@ -663,6 +663,9 @@
             "leisure": {
                 "label": "Тип"
             },
+            "length": {
+                "label": "Длина (метры)"
+            },
             "levels": {
                 "label": "Этажи",
                 "placeholder": "2, 4, 6..."
@@ -733,6 +736,9 @@
             "place": {
                 "label": "Тип"
             },
+            "population": {
+                "label": "Население"
+            },
             "power": {
                 "label": "Тип"
             },
@@ -867,6 +873,9 @@
             "wheelchair": {
                 "label": "Доступность для инвалидных колясок"
             },
+            "width": {
+                "label": "Ширина (метры)"
+            },
             "wikipedia": {
                 "label": "Википедия"
             },
@@ -1026,6 +1035,9 @@
                 "name": "Колледж",
                 "terms": "ПТУ, колледж, техникум"
             },
+            "amenity/compressed_air": {
+                "name": "Сжатый воздух"
+            },
             "amenity/courthouse": {
                 "name": "Суд",
                 "terms": "Суд"
@@ -1128,6 +1140,9 @@
                 "name": "Паб",
                 "terms": "Паб"
             },
+            "amenity/ranger_station": {
+                "name": "Лесничество"
+            },
             "amenity/recycling": {
                 "name": "Переработка мусора",
                 "terms": "Переработка мусора, Мусоропереработка, Утилизация мусора, Переработка отходов, Утилизация отходов"
@@ -1308,8 +1323,8 @@
                 "name": "Общежитие"
             },
             "building/entrance": {
-                "name": "Вход",
-                "terms": "вÑ\85од, двеÑ\80Ñ\8c, главнÑ\8bй вход"
+                "name": "Вход/выход",
+                "terms": "вÑ\85од, вÑ\8bход"
             },
             "building/garage": {
                 "name": "Гараж",
@@ -1371,7 +1386,8 @@
                 "name": "Здание университета, института "
             },
             "building/warehouse": {
-                "name": "Склад"
+                "name": "Склад",
+                "terms": " склад, складское помещение, товарный склад, пакгауз, хранилище"
             },
             "craft/basket_maker": {
                 "name": "Корзина",
@@ -1382,7 +1398,8 @@
                 "terms": "пчеловод, пасечник"
             },
             "craft/blacksmith": {
-                "name": "Кузнец"
+                "name": "Кузнец",
+                "terms": "ковка, кузнец, кузница, кузня"
             },
             "craft/boatbuilder": {
                 "name": "Строительство лодок"
@@ -1419,6 +1436,10 @@
                 "name": "Садовник",
                 "terms": "садовник"
             },
+            "craft/glaziery": {
+                "name": "Стекольная мастерская ",
+                "terms": "остекление, стекла, стёкла, стекольная мастерская, стекольщик"
+            },
             "craft/handicraft": {
                 "name": "Рукодельник"
             },
@@ -1451,6 +1472,9 @@
                 "name": "фотограф",
                 "terms": "фотограф, фото оператор"
             },
+            "craft/photographic_laboratory": {
+                "name": "Фотолаборатория"
+            },
             "craft/plasterer": {
                 "name": "Скульптор"
             },
@@ -1529,8 +1553,8 @@
                 "terms": "аварийный телефон, телефон спасения, 112, 911, 01, 02, 03, 04"
             },
             "entrance": {
-                "name": "Вход",
-                "terms": "вÑ\85од, двеÑ\80Ñ\8c, главнÑ\8bй вход"
+                "name": "Вход/выход",
+                "terms": "вÑ\85од, вÑ\8bход"
             },
             "footway/crossing": {
                 "name": "Пешеходный переход",
@@ -2092,6 +2116,10 @@
                 "name": "Страховая компания",
                 "terms": "Страховой агент, Страхование, Автострахование, Полис, ОМС, КАСКО, ОСАГО, Страховка,"
             },
+            "office/it": {
+                "name": "IT-офис",
+                "terms": "IT-офис, ИТ-офис, офис IT, офис IT-специалиста, офис ИТ, офис ИТ-специалиста"
+            },
             "office/lawyer": {
                 "name": "Юридические услуги",
                 "terms": "Адвокат, Нотариус, Адвокатская контора, Нотариальная контора, Юридическая консультация"
@@ -2488,6 +2516,9 @@
                 "name": "Видеомагазин",
                 "terms": "Видео салон, Продажа фильмов и видеозаписей"
             },
+            "shop/wine": {
+                "name": "Винный магазин"
+            },
             "tourism": {
                 "name": "Туризм",
                 "terms": "Туризм, Отдых, Путешествия"

diff --git a/vendor/assets/iD/iD/locales/sk.json b/vendor/assets/iD/iD/locales/sk.json
index c8f0cbabe94312f4a84a7b9b6e1c7837f533ef07..bfabda53524c069f0a3e091bb9df0002e3be8ad8 100644 (file)
--- a/vendor/assets/iD/iD/locales/sk.json
+++ b/vendor/assets/iD/iD/locales/sk.json
@@ -267,6 +267,8 @@
         "percent_brightness": "{opacity}% jas",
         "none": "Žiadne",
         "custom": "Voliteľné",
+        "custom_button": "Upraviť volitelné pozadie",
+        "custom_prompt": "Zadajte URL pre vzor mapového podkladu. Platné znaky sú {z}, {x}, {y} pre Z/X/Y schému a {u} pre quadtile schému.",
         "fix_misalignment": "Oprav zarovnanie",
         "reset": "vynulovať"
     },
@@ -805,6 +807,9 @@
             "shop": {
                 "label": "Typ"
             },
+            "sloped_curb": {
+                "label": "Znížený obrubník"
+            },
             "smoking": {
                 "label": "Fajčenie"
             },
@@ -840,6 +845,9 @@
             "surface": {
                 "label": "Povrch"
             },
+            "tactile_paving": {
+                "label": "Taktilné značenie"
+            },
             "toilets/disposal": {
                 "label": "Odstraňovanie"
             },
@@ -1355,10 +1363,6 @@
                 "name": "Internát",
                 "terms": "internat,intrak,intrák"
             },
-            "building/entrance": {
-                "name": "Vstup",
-                "terms": "vchod,východ,vychod,únikový východ,unikovy vychod,brána,brana,dvere,vráta,vrata"
-            },
             "building/garage": {
                 "name": "Garáž",
                 "terms": "garaz,garáže,garaze,parkovanie,kryté parkovanie,kryte parkovanie"
@@ -1539,6 +1543,10 @@
                 "name": "Fotograf",
                 "terms": "fotografia,fotografovanie,fotka,fotky"
             },
+            "craft/photographic_laboratory": {
+                "name": "Fotografické laboratórium",
+                "terms": "fotograficke laboratorium,fotolab"
+            },
             "craft/plasterer": {
                 "name": "Fasádnik",
                 "terms": "fasadnik,štukatér,stukater,omietkár,omietkar"
@@ -1631,10 +1639,6 @@
                 "name": "Núdzový telefón",
                 "terms": "nudzovy telefon,SOS,tiesňová linka,tiesnova linka,núdzový telefón.nudzovy telefon"
             },
-            "entrance": {
-                "name": "Vstup",
-                "terms": "vchod,východ,vychod,únikový východ,unikovy vychod,brána,brana,dvere,vráta,vrata"
-            },
             "footway/crossing": {
                 "name": "Prechod",
                 "terms": "Prechod pre chodcov,zebra"
@@ -1875,6 +1879,10 @@
                 "name": "Cintorín",
                 "terms": "cintorin,hroby,pohrebisko,hrobky,cmiter"
             },
+            "landuse/churchyard": {
+                "name": "Kostolný pozemok",
+                "terms": "kostolny pozemok,kostol"
+            },
             "landuse/commercial": {
                 "name": "Obchodné",
                 "terms": "obchodne,komercia,komercne,komerčné"
@@ -1915,6 +1923,10 @@
                 "name": "Lúka",
                 "terms": "luka,pastviny,trava,tráva,paša,pasa"
             },
+            "landuse/military": {
+                "name": "Armádne",
+                "terms": "armadne, armada"
+            },
             "landuse/orchard": {
                 "name": "Sad",
                 "terms": "sad,stromy,ovocie,ovocné stromy,ovocne stromy,ovocný sad,ovocny sad"
@@ -2307,6 +2319,10 @@
                 "name": "Susedstvo",
                 "terms": "okrsok,oblast,oblasť,štvrť,stvrt"
             },
+            "place/suburb": {
+                "name": "Mestská časť",
+                "terms": "mestska cast"
+            },
             "place/town": {
                 "name": "Mesto",
                 "terms": "mestecko,mestečko"
@@ -2619,6 +2635,10 @@
                 "name": "Obchod s fototechnikou",
                 "terms": "Fotoateliér,fotoatelier,fotostudio,fotoštúdio,fotografia"
             },
+            "shop/seafood": {
+                "name": "Obchod s morskými špecialitami",
+                "terms": "obchod s morskymi specialitami,plody mora,ryby,morské ryby,morske ryby,kreverty,treska,tuniak"
+            },
             "shop/shoes": {
                 "name": "Obchod s obuvov",
                 "terms": "obuv,topánky,topanky"
@@ -2659,6 +2679,10 @@
                 "name": "Videopožičovňa",
                 "terms": "videopozicovna,DVD,CD,VHS,blue-ray,blueray,blue ray,video"
             },
+            "shop/wine": {
+                "name": "Vináreň",
+                "terms": "vinaren,vinoteka,vínotéka,vino,víno"
+            },
             "tourism": {
                 "name": "Turizmus",
                 "terms": "turizmus,turistika,turisticke,turistické,hotel,motel,chata,muzeum,múzeum,atrakcia,zoo,park"

diff --git a/vendor/assets/iD/iD/locales/sl.json b/vendor/assets/iD/iD/locales/sl.json
index ffa7788f4de14b78981cb633e54c6440d7ef7cce..12a624620e8ebee050207dbd39fe78cd1fd7db3e 100644 (file)
--- a/vendor/assets/iD/iD/locales/sl.json
+++ b/vendor/assets/iD/iD/locales/sl.json
@@ -1002,10 +1002,6 @@
                 "name": "Poslovna stavba",
                 "terms": "Pisarne"
             },
-            "building/entrance": {
-                "name": "Vhod",
-                "terms": "Vrata, Izhod, Portal"
-            },
             "building/garage": {
                 "name": "Garaža",
                 "terms": "Garažna hiša"
@@ -1145,9 +1141,6 @@
                 "name": "Požarni hidrant",
                 "terms": "hidrant, vodni hidrant"
             },
-            "entrance": {
-                "name": "Vhod"
-            },
             "footway/crossing": {
                 "name": "Prehod za pešce",
                 "terms": "zebra"

diff --git a/vendor/assets/iD/iD/locales/sr.json b/vendor/assets/iD/iD/locales/sr.json
index 2a929f79339b31f659b94fb309d7bd0d287233b8..cd308d18ab3cdb71d35466f6b2dffdd740849952 100644 (file)
--- a/vendor/assets/iD/iD/locales/sr.json
+++ b/vendor/assets/iD/iD/locales/sr.json
@@ -594,6 +594,24 @@
             "fixme": {
                 "label": "Поправи ме"
             },
+            "fuel/biodiesel": {
+                "label": "Продаје биодизел"
+            },
+            "fuel/diesel": {
+                "label": "Продаје дизел"
+            },
+            "fuel/e10": {
+                "label": "Продаје Е10"
+            },
+            "fuel/e85": {
+                "label": "Продаје Е85"
+            },
+            "fuel/lpg": {
+                "label": "Продаје пропан"
+            },
+            "fuel/octane_98": {
+                "label": "Продаје премијум бензин"
+            },
             "gauge": {
                 "label": "Колосек"
             },
@@ -610,6 +628,7 @@
                 "placeholder": "Број рупе (1-18)"
             },
             "handicap": {
+                "label": "Хендикеп",
                 "placeholder": "1-18"
             },
             "highway": {
@@ -655,6 +674,9 @@
             "leisure": {
                 "label": "Врста"
             },
+            "length": {
+                "label": "Дужина (метара)"
+            },
             "levels": {
                 "label": "Нивои",
                 "placeholder": "2, 4, 6..."
@@ -722,6 +744,9 @@
             "place": {
                 "label": "Врста"
             },
+            "population": {
+                "label": "Насељеност"
+            },
             "power": {
                 "label": "Врста"
             },
@@ -863,6 +888,9 @@
             "wheelchair": {
                 "label": "Прилаз за инвалидска колица"
             },
+            "width": {
+                "label": "Ширина (метара)"
+            },
             "wikipedia": {
                 "label": "Википедија"
             },
@@ -964,6 +992,9 @@
             "amenity/college": {
                 "name": "Факултет"
             },
+            "amenity/compressed_air": {
+                "name": "Компримовани ваздух"
+            },
             "amenity/courthouse": {
                 "name": "Судница"
             },
@@ -1009,6 +1040,9 @@
             "amenity/nightclub": {
                 "name": "Ноћни клуб"
             },
+            "amenity/parking": {
+                "name": "Ауто паркинг"
+            },
             "amenity/pharmacy": {
                 "name": "Апотека"
             },
@@ -1184,7 +1218,7 @@
                 "name": "Студентски дом"
             },
             "building/entrance": {
-                "name": "Улаз"
+                "name": "Улаз/излаз"
             },
             "building/garage": {
                 "name": "Гаража"
@@ -1246,9 +1280,15 @@
             "craft/bookbinder": {
                 "name": "Књиговезац"
             },
+            "craft/brewery": {
+                "name": "Пивара"
+            },
             "craft/carpenter": {
                 "name": "Столар"
             },
+            "craft/carpet_layer": {
+                "name": "Паркетар"
+            },
             "craft/clockmaker": {
                 "name": "Сајџија"
             },
@@ -1309,6 +1349,9 @@
             "craft/tailor": {
                 "name": "Kројач"
             },
+            "craft/tiler": {
+                "name": "Керамичар"
+            },
             "craft/tinsmith": {
                 "name": "Калајџија"
             },
@@ -1331,7 +1374,7 @@
                 "name": "Телефон за хитне случајеве"
             },
             "entrance": {
-                "name": "Улаз"
+                "name": "Улаз/излаз"
             },
             "footway/crossing": {
                 "name": "Прелаз"
@@ -1493,6 +1536,9 @@
             "landuse/cemetery": {
                 "name": "Гробље"
             },
+            "landuse/churchyard": {
+                "name": "Црквено двориште"
+            },
             "landuse/commercial": {
                 "name": "Пословна област"
             },
@@ -1502,6 +1548,9 @@
             "landuse/farm": {
                 "name": "Фарма"
             },
+            "landuse/farmland": {
+                "name": "Обрадиво земљиште"
+            },
             "landuse/farmyard": {
                 "name": "Сеоско двориште"
             },
@@ -1520,6 +1569,9 @@
             "landuse/meadow": {
                 "name": "Ливада"
             },
+            "landuse/military": {
+                "name": "Војска "
+            },
             "landuse/orchard": {
                 "name": "Воћњак"
             },
@@ -1619,6 +1671,9 @@
             "man_made/embankment": {
                 "name": "Насип"
             },
+            "man_made/flagpole": {
+                "name": "Јарбол за заставу"
+            },
             "man_made/lighthouse": {
                 "name": "Светионик"
             },
@@ -1649,6 +1704,9 @@
             "man_made/water_works": {
                 "name": "Водовод"
             },
+            "military/airfield": {
+                "name": "Узлетиште"
+            },
             "military/barracks": {
                 "name": "Касарна"
             },
@@ -1718,9 +1776,18 @@
             "office": {
                 "name": "Канцеларија"
             },
+            "office/accountant": {
+                "name": "Рачуновођа"
+            },
+            "office/architect": {
+                "name": "Архитекта"
+            },
             "office/educational_institution": {
                 "name": "Образовна институција"
             },
+            "office/employment_agency": {
+                "name": "Служба за запошљавање"
+            },
             "office/lawyer": {
                 "name": "Адвокатска канцеларија"
             },
@@ -1967,6 +2034,9 @@
             "shop/pet": {
                 "name": "Продавница кућних љубимаца"
             },
+            "shop/seafood": {
+                "name": "Продавница морске хране "
+            },
             "shop/shoes": {
                 "name": "Продавница обуће"
             },
@@ -1997,6 +2067,9 @@
             "shop/video": {
                 "name": "Видео клуб"
             },
+            "shop/wine": {
+                "name": "Продавница вина"
+            },
             "tourism": {
                 "name": "Туризам"
             },

diff --git a/vendor/assets/iD/iD/locales/sv.json b/vendor/assets/iD/iD/locales/sv.json
index a5824c7ee1644133fdcd0389d14adcf22f755dea..ec4ed376914258a9905e6eea4ec7e44343ced0dd 100644 (file)
--- a/vendor/assets/iD/iD/locales/sv.json
+++ b/vendor/assets/iD/iD/locales/sv.json
@@ -970,9 +970,6 @@
             "building/apartments": {
                 "name": "Lägenheter"
             },
-            "building/entrance": {
-                "name": "Entré"
-            },
             "building/garage": {
                 "name": "Garage"
             },
@@ -989,9 +986,6 @@
             "emergency/phone": {
                 "name": "Nödtelefon"
             },
-            "entrance": {
-                "name": "Entré"
-            },
             "highway": {
                 "name": "Väg",
                 "terms": "Väg, gata, förbindelse, led, trafikled, körbana, stråk, stig, gång, bana, sträcka, passage"

diff --git a/vendor/assets/iD/iD/locales/ta.json b/vendor/assets/iD/iD/locales/ta.json
index 4c652e83551ffee017be8745c5981e75b24c28a5..b0e28f08f6402fd386ce9e9173886faaeffe1e3f 100644 (file)
--- a/vendor/assets/iD/iD/locales/ta.json
+++ b/vendor/assets/iD/iD/locales/ta.json
@@ -438,18 +438,12 @@
             "building/apartments": {
                 "name": "அபார்ட்மண்டுகள்"
             },
-            "building/entrance": {
-                "name": "நுழைவுவாயில்"
-            },
             "building/house": {
                 "name": "வீடு"
             },
             "craft/painter": {
                 "name": "ஓவியர்"
             },
-            "entrance": {
-                "name": "நுழைவுவாயில்"
-            },
             "highway/bus_stop": {
                 "name": "பேருந்து நிலையம்"
             },

diff --git a/vendor/assets/iD/iD/locales/te.json b/vendor/assets/iD/iD/locales/te.json
index acd4fb0ce999c7d771c284c853b9558c45eab8cb..9049f79975dbfd7dd19ee91ed78078716cc39c42 100644 (file)
--- a/vendor/assets/iD/iD/locales/te.json
+++ b/vendor/assets/iD/iD/locales/te.json
@@ -532,9 +532,6 @@
             "building/hut": {
                 "name": "గుడిసె"
             },
-            "entrance": {
-                "name": "ప్రవేశ ద్వారం"
-            },
             "highway/footway": {
                 "name": "కాల్దారి"
             },

diff --git a/vendor/assets/iD/iD/locales/tl.json b/vendor/assets/iD/iD/locales/tl.json
new file mode 100644 (file)
index 0000000..f44ea63
--- /dev/null
+++ b/vendor/assets/iD/iD/locales/tl.json
@@ -0,0 +1,544 @@
+{
+    "modes": {
+        "add_area": {
+            "title": "Area o poligon",
+            "description": "Magdagdag ng mga parke, mga gusali, lawa o iba pang mga \"area\" sa mapa.",
+            "tail": "Mag-click sa mapa upang simulan ang pagguhit ng isang lugar, tulad ng isang parke, lawa, o gusali."
+        },
+        "add_line": {
+            "title": "Linya o guhit",
+            "description": "Magdagdag ng mga kalsada o kalye, mga daanang pantao, kanal o iba pang mga linya sa mapa.",
+            "tail": "Mag-click sa mapa upang simulan ang pagguhit ng isang linya tulad ng kalsada, daanang pantao, o ruta."
+        },
+        "add_point": {
+            "title": "Punto o tuldok",
+            "description": "Magdagdag ng kainan, monumento, \"postbox\" o iba pang mga punto o tuldok sa mapa.",
+            "tail": "Mag-click sa mapa upang magdagdag ng isang punto o tuldok."
+        },
+        "browse": {
+            "title": "Mag-browse",
+            "description": "I-pan at i-zoom ang mapa."
+        },
+        "draw_area": {
+            "tail": "I-click upang magdagdag ng mga node sa iyong polygon o area. I-click ang unang node upang isarado ang polygon o area."
+        },
+        "draw_line": {
+            "tail": "I-click upang magdagdag ng higit pang mga node sa linya. Mag-click sa iba pang mga linya upang kumonekta sa kanila, at i-double click upang tapusin ang linya."
+        }
+    },
+    "operations": {
+        "add": {
+            "annotation": {
+                "point": "Nagdagdag ng isang punto o tuldok.",
+                "vertex": "Nagdagdag ng node sa isang way.",
+                "relation": "Nagdagdag ng relation."
+            }
+        },
+        "start": {
+            "annotation": {
+                "line": "Nagsimula ng isang linya.",
+                "area": "Nagsimula sa isang area o polygon."
+            }
+        },
+        "continue": {
+            "key": "S",
+            "title": "Ipagpatuloy",
+            "description": "Ipagpatuloy ang linyang ito.",
+            "not_eligible": "Walang linyang maaring ipagpatuloy dito.",
+            "multiple": "Mga ilang mga linya ay maaaring ipagpatuloy dito. Upang pumili ng isang linya, pindutin ang ng Shift at i-click ito upang piliin.",
+            "annotation": {
+                "line": "Karugtong ng isang linya.",
+                "area": "Nagpatuloy sa pagguhit ng area o poligon."
+            }
+        },
+        "cancel_draw": {
+            "annotation": "Kinansela ang pagguhit."
+        },
+        "change_role": {
+            "annotation": "Binago ang role ng isang kasapi ng  relation."
+        },
+        "change_tags": {
+            "annotation": "Pinalitan ang mga tag."
+        },
+        "circularize": {
+            "title": "Pina-bilog",
+            "description": {
+                "line": "Gawing pabilog ang linyang ito.",
+                "area": "Gawing pabilog ang area o poligong ito."
+            },
+            "key": "O",
+            "annotation": {
+                "line": "Ginawang pabilog and isang linya.",
+                "area": "Ginawang pabilog and isang area o poligon."
+            },
+            "not_closed": "Hindi ito maaaring gawing pabilog dahil hindi ito isang \"loop\".",
+            "too_large": "Hindi na ito maaaring gawing pabilog dahil hindi sapat ang kasalukuyang nakikita sa mapa."
+        },
+        "orthogonalize": {
+            "title": "Iskawalado",
+            "description": {
+                "line": "Gawing iskwalado ang mga kanto ng linyang ito.",
+                "area": "Gawing iskwalado ang mga kanto ng area o poligong ito."
+            },
+            "key": "S",
+            "annotation": {
+                "line": "Ginawang iskawalado ang bawat kanto ng linya.",
+                "area": "Ginawang iskawalado ang bawat kanto ng area o poligon."
+            },
+            "not_squarish": "Hindi maaring gawing iskwalado.",
+            "too_large": "Hindi ito maaaring gawing iskuwalado dahil hindi sapat ang kasalukuyang nakikita sa mapa."
+        },
+        "straighten": {
+            "title": "Ituwid",
+            "description": "Ituwid ang linyang ito.",
+            "key": "S",
+            "annotation": "Naituwid ang linya.",
+            "too_bendy": "Hindi naituwid dahil masyadong kurbado."
+        },
+        "delete": {
+            "title": "Burahin",
+            "description": "Burahin ito sa mapa.",
+            "annotation": {
+                "point": "Binura ang isang point o tuldok.",
+                "vertex": "Binura ang isang node mula sa way o linya.",
+                "line": "Binura ang isang linya.",
+                "area": "Binary ang isang area o poligon.",
+                "relation": "Binura ang isang \"relation\".",
+                "multiple": "Binura ang {n} bagay sa mapa."
+            },
+            "incomplete_relation": "Hindi maaring mabura dahil ito ay hindi pa ganap na nai-download."
+        },
+        "add_member": {
+            "annotation": "Dinagdag ang kasapi o miyembro ng relation."
+        },
+        "delete_member": {
+            "annotation": "Inalis ang kasapi o miyembro ng relation."
+        },
+        "connect": {
+            "annotation": {
+                "point": "Dinugtong ang isang \"way\" sa isang punto o tuldok.",
+                "vertex": "Dinugtong ang isang \"way\" sa isa pang \"way\".",
+                "line": "Dinugtong ang isang \"way\" sa isang linya.",
+                "area": "Dinugtong ang isang \"way\" sa isang area o poligon."
+            }
+        },
+        "disconnect": {
+            "title": "Alisin ang pagkakadugtong",
+            "description": "Alisin sa pagkakadugtong ang mga linya / poligon.",
+            "key": "D",
+            "annotation": "Naalis sa pagkakadugtong ang mga linya / poligon.",
+            "not_connected": "Hindi sapat na bilang ng mga linya upang i-diskonekta o paghiwalayin."
+        },
+        "merge": {
+            "title": "Pagsamahin",
+            "description": "Pagdugtungin ang mga linyang ito.",
+            "key": "C",
+            "annotation": "Dinugtung ang {n} linya.",
+            "not_eligible": "Ang mga bagay na ito ay hindi maaaring pagsamahin.",
+            "not_adjacent": "Hindi mapagsama ang linyang ito dahil sila ay hindi konektado.",
+            "restriction": "Hindi maaaring ipagsama o i-merge dahil ang isa sa mga miyembro ng '{relation}\" ito ay hindi pa ganap na nai-download.",
+            "incomplete_relation": "Hindi maaaring ipagsama o i-merge dahil ang isa sa mga ito ay hindi pa ganap na nai-download."
+        },
+        "move": {
+            "title": "Ilipat ng posisyon",
+            "description": "Ilipat ang posisyon.",
+            "key": "M",
+            "annotation": {
+                "point": "Inilipat ang posisyon ng isang punto o tuldok.",
+                "vertex": "Inilipat ang posisyon ng isang \"node\" na sa isang \"way\".",
+                "line": "Inilipat ang posisyon ng isang linya.",
+                "area": "Inilipat ang posisyon ng isang area o poligon.",
+                "multiple": "Inilipat ang posisyon ang maraming bagay."
+            },
+            "incomplete_relation": "Hindi maaring ilipat ng posisyon dahil ito ay hindi pa ganap na nai-download."
+        },
+        "rotate": {
+            "title": "Paikutin",
+            "description": "Paikutin ang bagay na ito mula sa kanyang \"center point\".",
+            "key": "R",
+            "annotation": {
+                "line": "Pinaikot ang linya.",
+                "area": "Pinaikot ang area o poligon."
+            }
+        },
+        "reverse": {
+            "title": "Baliktarin",
+            "description": "Baliktarin ang direksyon ng linyang ito.",
+            "key": "V",
+            "annotation": "Binaliktad ang direksyon ng linya."
+        },
+        "split": {
+            "title": "Hatiin",
+            "description": {
+                "line": "Hatiin sa dalawa ang linya mula sa node na ito.",
+                "area": "Hatiin ang hangganan ng lugar na ito sa dalawa.",
+                "multiple": "Hatiin ang linya o hangganan ng lugar na ito sa dalawa."
+            },
+            "key": "X",
+            "annotation": {
+                "line": "Hatiin ang linya.",
+                "area": "Hatiin ang hangganan ng area o poligon.",
+                "multiple": "Hatiin ang {n} linya/area o poligon."
+            },
+            "not_eligible": "Hindi maaaring hatiin ang linya mula sa umpisa o dulong \"node\" nito.",
+            "multiple_ways": "Masyadong maraming mga linya dito upang hatiin."
+        }
+    },
+    "undo": {
+        "tooltip": "I-undo:{action}",
+        "nothing": "Walang ma-undo"
+    },
+    "redo": {
+        "tooltip": "i-redo: {action}",
+        "nothing": "Walang ma-redo."
+    },
+    "tooltip_keyhint": "Shortcut:",
+    "browser_notice": "Ang editor na ito ay suportado sa Firefox, Chrome, Safari, Opera, at Internet Explorer 9 at sa mas mataas pang bersion. I-upgrade ang inyong browser o gamitin Potlatch 2 upang i-edit ng mapa.",
+    "translate": {
+        "translate": "I-salin",
+        "localized_translation_label": "Multilingual name",
+        "localized_translation_language": "Pumili ng wika",
+        "localized_translation_name": "Pangalan"
+    },
+    "zoom_in_edit": "Mag-zoom-in para makapag-edit",
+    "logout": "Mag-logout",
+    "loading_auth": "Kumokonekta sa OpenStreetMap ...",
+    "report_a_bug": "I-ulat ang bug",
+    "status": {
+        "error": "Hindi maka-konekta sa API.",
+        "offline": "Kasalukuyang offline ang API. Subukang mag-edit muli sa ibang pagkakataon.",
+        "readonly": "Kasalukuyang nasa read-only ang API. Kailangan mong maghintay upang i-save ang iyong mga pagbabago."
+    },
+    "commit": {
+        "title": "I-save ang mga binago.",
+        "description_placeholder": "Maikling paglalarawan ng iyong mga ambag o edits",
+        "message_label": "Mag-commit mensahe",
+        "upload_explanation": "Ang mga pagbabagong na-upload ay makikita sa lahat ng mapang gumagamit ng datos ng OpenStreetMap.",
+        "upload_explanation_with_user": "Ang mga pagbabagong na-upload bilang {user} ay makikita sa lahat ng mapang gumagamit ng datos ng OpenStreetMap.",
+        "save": "I-save",
+        "cancel": "Kanselahin",
+        "warnings": "Mga babala",
+        "modified": "Binago",
+        "deleted": "Binura",
+        "created": "Nilikha"
+    },
+    "contributors": {
+        "list": "Edits nina {users}",
+        "truncated_list": "Edits nina {users} at {count} iba pa"
+    },
+    "geocoder": {
+        "search": "Maghanap sa buong mundo ...",
+        "no_results_visible": "Walang mga resulta sa kasalukuyang lugar sa mapa",
+        "no_results_worldwide": "Walang mga resultang natagpuan"
+    },
+    "geolocate": {
+        "title": "Ipakita ang kasalukuyang lokasyon."
+    },
+    "inspector": {
+        "no_documentation_combination": "Walang documentation para sa kumbinasyon ng mga tag na ginamit",
+        "no_documentation_key": "Walang \"documentation\" na magagamit para sa \"key\" na ito.",
+        "show_more": "Higit pang detalye",
+        "view_on_osm": "Tingnan sa openstreetmap.org",
+        "all_tags": "Lahat ng tags",
+        "all_members": "Lahat ng kasapi",
+        "all_relations": "Lahat ng \"relation\"",
+        "new_relation": "Bagong relation ...",
+        "role": "Kasapi",
+        "choose": "Pumili ng uri ng \"features\"",
+        "results": "{n} mga resulta para sa {search}",
+        "reference": "Tingnan sa OpenStreetMap Wiki",
+        "back_tooltip": "Baguhin ang \"feature\"",
+        "remove": "Alisin",
+        "search": "Mag-search",
+        "multiselect": "Napiling mga item",
+        "unknown": "Unknown",
+        "incomplete": "<not downloaded>",
+        "feature_list": "Mag-hanap ng \"feature\"",
+        "edit": "I-edit ang \"feature\"",
+        "none": "Wala",
+        "node": "Node",
+        "way": "Way",
+        "relation": "Relation",
+        "location": "Lokasyon"
+    },
+    "background": {
+        "title": "\"Background\" o \"imagery\"",
+        "description": "Mga setting ng \"background\" o \"imagery\"",
+        "percent_brightness": "{opacity}% Pagkalinaw",
+        "none": "Wala",
+        "custom": "Custom",
+        "custom_button": "I-edit ang custom na background",
+        "custom_prompt": "Magpasok ng template na tile URL. Ang wastong mga token ay {z}, {x}, {y} para sa Z/X/Y scheme at {u} naman para sa quadtile scheme.",
+        "fix_misalignment": "Ayusin ang pagkakahanay ng \"imagery\"",
+        "reset": "I-reset"
+    },
+    "restore": {
+        "heading": "Mayroon kang hindi na-save ng mga pagbabago",
+        "description": "Ibig mo bang ibalik ang mga hindi na-save na pagbabago mula sa isang nakaraang session sa pag-edit?",
+        "restore": "Ibalik",
+        "reset": "I-reset"
+    },
+    "save": {
+        "title": "I-save",
+        "help": "I-save ang mga pagbabago sa OpenStreetMap upang makita ng ibang gumagamit ng datos.",
+        "no_changes": "Walang mga pagbabago upang i-save.",
+        "error": "May error habang sinusubukang i-save",
+        "uploading": "Ina-upload ang mga pagbabago sa OpenStreetMap.",
+        "unsaved_changes": "Mayroon kang hindi na-save ng mga pagbabago"
+    },
+    "success": {
+        "edited_osm": "Nag-edit sa OSM!",
+        "just_edited": "Nag-edit ka sa OpenStreetMap!",
+        "view_on_osm": "Tingnan sa OSM",
+        "facebook": "I-share sa Facebook",
+        "twitter": "I-share sa Twitter",
+        "google": "I-share sa Google+",
+        "help_html": "Ang iyong nagawang mga pagbabago ay lilitaw sa \"Standard\" layer sa loob ng ilang minuto. Para sa iba pang mga layer at ang ilang mga tampok, maaaring mas matagal kaysa ilang minuto\n(<a href ='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map' target='_blank '>basahin ang detalye dito</ a>).\n"
+    },
+    "confirm": {
+        "okay": "Okay"
+    },
+    "splash": {
+        "welcome": "Maligayang pagdating sa iD OpenStreetMap editor",
+        "text": "Ang iD ay isang simple ngunit magandang editor para sa pag-edit ng libreng mapa ng buong mundo.  Ito ay bersyon {version}. Para sa karagdagang impormasyon tingnan ang {website} at i-ulat ang mga bugs sa {github}.",
+        "walkthrough": "Simulan ang \"Walkthrough\"",
+        "start": "Simulan ang pag-edit"
+    },
+    "source_switch": {
+        "live": "live",
+        "lose_changes": "Mayroon kang hindi na-save ang mga pagbabago. Mawawala ang pagbabagong ito kung lilipat sa ibang map server.   Sigurado ka bang gusto mong lumipat ng server?",
+        "dev": "dev"
+    },
+    "tag_reference": {
+        "description": "Paglalarawan",
+        "on_wiki": "{tag} sa wiki.osm.org",
+        "used_with": "Kabilang sa gingamait ang {type}"
+    },
+    "validations": {
+        "untagged_point": "Walang tag na punto o tuldok",
+        "untagged_line": "Walang tag na linya",
+        "untagged_area": "Walang tag na area o poligon",
+        "many_deletions": "Nagbura ka ng {n} bagay sa mapa. Sigurado ka bang gusto mong gawin ito? Ito ay tatanggalin sa mapa na nakikita sa openstreetmap.org.",
+        "tag_suggests_area": "Ang tag na {tag} ay kalimitang para sa mga area o poligon sublait ito ay nasa linya lamang.",
+        "untagged_tooltip": "Pumili ng uri ng \"feature\" na naglalarawan kung ano ang {geometry} na ito.",
+        "deprecated_tags": "Hindi na ginagamit na \"tag\": {tags}"
+    },
+    "zoom": {
+        "in": "i-zoom in",
+        "out": "I-zoom out"
+    },
+    "cannot_zoom": "Hindi na pwedeng mag-zoom out sa kasalukuyang \"mode\".",
+    "gpx": {
+        "local_layer": "Lokal na GPX file",
+        "drag_drop": "I-drag at i-drop ang .gpx file mula sa inyong \"computer\" sa pahinang ito, o i-click ang button sa kanan upang mag-browse",
+        "zoom": "I-zoom sa GPX track",
+        "browse": "Mag-browse ng .gpx file"
+    },
+    "help": {
+        "title": "Tulong",
+        "help": "# Help\n\nIto ay isang editor para sa [OpenStreetMap] (http://www.openstreetmap.org/), isang libre at maaaring i-edit na mapa ng mundo. Maaari mo itong gamitin upang idagdag at i-update ang iyong lugar, sa paggawa ng isang open-source at open-data na mapa ng mundo para magamit ng lahat.\n\nAng pag-edit na gagawin mo sa mapang ito ay makikita ng lahat ng gumagamit OpenStreetMap. Upang makapag-edit, kakailanganin mo ng [OpenStreetMap account] (https://www.openstreetmap.org/user/new). \n\nAng [iD editor] (http://ideditor.com/) ay isang collaborative proyekto,  ang [source code ay matatagpuan sa GitHub] (https://github.com/openstreetmap/iD).\n",
+        "editing_saving": "### Pag-edit & Saving\n\nEditor na ito ay dinisenyo upang gumana lalo na sa online, at ina-access mo ito sa pamamagitan ng isang website sa ngayon.\n\n### Pagpili ng Mga Tampok\n\nUpang pumili ng isang tampok ng mapa , tulad ng kalsada o punto ng interes , i-click \nsa ito sa mapa. Ito ay i-highlight ang mga napiling tampok , buksan ang isang panel na may \nmga detalye tungkol dito , at ipakita ang menu ng mga bagay na maaari mong gawin gamit ang tampok. \n\nUpang pumili ng maraming mga tampok , pindutin nang matagal ang 'Shift ' key. Pagkatapos ay i-click ang alinman sa \nsa ang tampok na gusto mong piliin , o i-drag sa mapa upang gumuhit ng parihaba . \nAy ito gumuhit ng isang kahon at piliin ang lahat ng mga punto sa loob nito.\n\n### Saving Pag-edit \n\nKapag gumawa ka ng mga pagbabago tulad ng pag-edit ng mga kalsada, gusali , at mga lugar, ang mga ito ay \nnaka-imbak sa isang lugar lamang hanggang sa i-save mo ang mga ito sa server. Huwag mag-alala kung gumawa ka \nisang pagkakamali - maaari mong i-undo ang mga pagbabago sa pamamagitan ng pag-click sa pindutan undo , at gawing muli ang \nmga pagbabago sa pamamagitan ng pag-click sa pindutan gawing muli.\n\nI-click ang 'I-save ' upang matapos sa isang pangkat ng mga pag-edit - halimbawa , kung nag- nakumpleto \nisang lugar ng bayan at nais na magsimula sa isang bagong lugar . Magkakaroon ka ng pagkakataong \nupang suriin kung ano ang iyong nagawa , at ang editor supplies nakakatulong na mga mungkahi\nat babala kung may isang bagay ay hindi tila karapatan tungkol sa mga pagbabago . \n\nKung mukhang maganda ang lahat ng bagay , maaari mong ipasok ang isang maikling komento na nagpapaliwanag ng mga pagbabago\nna ginawa mo , at i-click muli ang ' I-save' upang i-post ang mga pagbabago\nsa [ OpenStreetMap.org ] ( http://www.openstreetmap.org/ ), kung saan ang mga ito ay nakikita \nsa lahat ng iba pang mga gumagamit at magagamit para sa iba upang bumuo at pagbutihin sa.\n\nKung hindi mo maaaring tapusin ang iyong mga pag-edit sa isang sitting , maaari mong iwanan ang editor window at bumalik ( sa parehong browser at computer ) , at ang\neditor application ay mag-aalok upang ibalik ang iyong trabaho .\n\n"
+    },
+    "intro": {
+        "navigation": {
+            "title": "Navigation",
+            "drag": "Ang pangunahing lugar ng mapa ay nagpapakita ng datos ng na makikita sa OpenStreetMap. Maaari kang mag-navigate sa pamamagitan ng pag-drag at pag-scroll, tulad ng anumang webmap. **I-drag ang mapa!**",
+            "select": "Mga tampok ng mapa ay kinakatawan ng tatlong paraan: gamit ang mga puntos, mga linya o area/poligon. Ang lahat ng mga tampok ay maaaring piliin sa pamamagitan ng pag-click sa mga ito. **Mag-click sa punto upang piliin ito.**",
+            "header": "Ang \"header\" ay nagpapakita kung anong uri ng \"feature\" ito.",
+            "pane": "Kapag ang isang tampok ay pinili, ang feature editor ay ipinapakita. Ang header ay nagpapakita kung anong uri ng tampok at ipinapakita sa pangunahing pane ang mga katangian ng tampok, tulad ng pangalan at address. **Isara ang feature editor gamit ang close button na malapit sa kanang tuktok. **"
+        },
+        "points": {
+            "title": "Mga Punto o tuldok",
+            "add": "Ang mga puntos ay maaaring gamitin upang kumatawan sa mga tampok tulad ng mga tindahan, kainan at mga monumento. Markahan ang mga ito sa tukoy na lokasyon, at ilarawan kung ano ito. **I-click ang pindutan ng Point upang magdagdag ng bagong punto.**",
+            "place": "Gumawa ng punto sa pamamagitan ng pag-click sa mapa. **Ilagay ang tuldok sa tuktok ng gusali.**",
+            "search": "Maraming iba't ibang mga tampok ang pwedeng kumatawan bilang puntos. Ang puntong iyong nai-dagdag ay isang Cafe. **I-search ang '{name}'**",
+            "choose": "**Pumili ng Cafe mula sa talaan.**",
+            "describe": "Ang punto o tuldok na ito ay minarkahan bilang \"cafe\".  Gamit ang \"feature editor\", maari tayong magdagdag ng iba pang impormasyon. **Magdagdag ng pangalan**",
+            "close": "Ang feature editor ay maaring isara sa pamamagitan ng pag-click ng \"Close\". **Isara the feature editor**",
+            "reselect": "Kadalasan, may mga puntos nang nalikha ng ibang mappers, ngunit may mga mali o hindi kumpleto. Maaaring i-edit ang mga puntos na ito. **Piliin ang punto na nilikha mo kanina.**",
+            "fixname": "**Baguhin o magdagdag ng pangalan ng kalsada at isara ang \"feature editor\"**",
+            "reselect_delete": "Ang lahat ng mga nasa mapa ay maaring burahin. **Mag-click sa punto na nilikha mo.**",
+            "delete": "Ang menu sa paligid ng punto ay naglalaman ng mga operasyon na maaaring isagawa dito, tulad ng pagbura. **Burahin ang punto. **"
+        },
+        "areas": {
+            "title": "Mga area o poligon",
+            "add": "Ang mga area o poligon ay mas detalyadong paraan upang kumatawan sa mga tampok. Nagbibigay ang mga ito ng impormasyon sa mga hangganan o boundary ng lugar. Ang karamihan ng maaring i-mapa gamit ang puntos ay pwede rin i-katawan bilang area o poligon. **I-click ang button para sa Area upang magdagdag ng bagong area o poligon.**",
+            "corner": "Ang paglikha ng area o poligon ay sa pamamagitan ng paglalagay node sa paligid ng mga hangganan ng lugar. **Ilagay ang unang node sa isa sa mga sulok ng palaruan.**",
+            "place": "Ipagpatuloy ang pag-guhit ng area o pligon sa pamamagitan ng paglalagay ng higit pang mga node. Tapusin ito sa pamamagitan ng pag-click sa umpisang node. ** Gumuhit ng area o pilgon ng palaruan.**",
+            "search": "**Hanapin ang '{name}'.**",
+            "choose": "**Pliin ang \"Playground\" mula sa talaan.**",
+            "describe": "**Magdagdag ng pangalan at isara ang \"feature editor\"**"
+        },
+        "lines": {
+            "title": "Mga linya",
+            "add": "Ang mga linya ay ginagamit para kumatawan sa mga \"feature\" na gaya ng mga kalsada, riles ng tren at ilog. **I-click ang button para sa \"Linya\" upang magdagdag ng bagong linya. **",
+            "start": "**Simulan ang linya sa pamamagitan ng pag-click sa dulo ng kalsada.**",
+            "finish": "Ang mga linya ay matatapos sa pamamagitan ng pag-click muli sa huling node. **Taposin ang pagguhit ng kalsada.**",
+            "road": "**Piliin ang \"Road\" mula sa talaan**",
+            "residential": "Mayroong iba't ibang mga uri ng mga kalsada, ang pinaka-karaniwang ay residential. **Piliin ang residential na uri ng kalsada**",
+            "describe": "**Magdagdag ng pangalan ng kalsada at isara ang \"feature editor\"**",
+            "restart": "Kailangang i-intersect ang kalsada sa Flower Street.",
+            "wrong_preset": "Hindi ka pumili ang Residential na uri ng kalsada. **I-click dito upang piliin muli**"
+        },
+        "startediting": {
+            "title": "Umpisahan ang pag-edit",
+            "help": "Higit pang mga documentation at ang walkthrough ang makukuha dito.",
+            "save": "Huwag kalimutan na regular na i-save ang iyong mga binago!",
+            "start": "Simulan ang pagma-mapa!"
+        }
+    },
+    "presets": {
+        "fields": {
+            "address": {
+                "label": "Address",
+                "placeholders": {
+                    "number": "123",
+                    "street": "Kalsada",
+                    "city": "Siyudad"
+                }
+            },
+            "aerialway": {
+                "label": "Uri"
+            },
+            "aeroway": {
+                "label": "Uri"
+            },
+            "amenity": {
+                "label": "Uri"
+            },
+            "artwork_type": {
+                "label": "Uri"
+            },
+            "atm": {
+                "label": "ATM"
+            },
+            "barrier": {
+                "label": "Uri"
+            },
+            "bicycle_parking": {
+                "label": "Uri"
+            },
+            "boundary": {
+                "label": "Uri"
+            },
+            "building": {
+                "label": "Gusali"
+            },
+            "building_area": {
+                "label": "Gusali"
+            },
+            "capacity": {
+                "label": "Kapasidad"
+            },
+            "construction": {
+                "label": "Uri"
+            },
+            "crossing": {
+                "label": "Uri"
+            },
+            "entrance": {
+                "label": "Uri"
+            },
+            "fire_hydrant/type": {
+                "label": "Uri"
+            },
+            "generator/type": {
+                "label": "Uri"
+            },
+            "highway": {
+                "label": "Uri"
+            },
+            "historic": {
+                "label": "Uri"
+            },
+            "information": {
+                "label": "Uri"
+            },
+            "internet_access": {
+                "options": {
+                    "wlan": "Wifi"
+                }
+            },
+            "landuse": {
+                "label": "Uri"
+            },
+            "leisure": {
+                "label": "Uri"
+            },
+            "man_made": {
+                "label": "Uri"
+            },
+            "name": {
+                "label": "Pangalan"
+            },
+            "office": {
+                "label": "Uri"
+            },
+            "parking": {
+                "label": "Uri"
+            },
+            "piste/type": {
+                "label": "Uri"
+            },
+            "place": {
+                "label": "Uri"
+            },
+            "power": {
+                "label": "Uri"
+            },
+            "railway": {
+                "label": "Uri"
+            },
+            "relation": {
+                "label": "Uri"
+            },
+            "restriction": {
+                "label": "Uri"
+            },
+            "route": {
+                "label": "Uri"
+            },
+            "route_master": {
+                "label": "Uri"
+            },
+            "service": {
+                "label": "Uri"
+            },
+            "shelter_type": {
+                "label": "Uri"
+            },
+            "shop": {
+                "label": "Uri"
+            },
+            "studio_type": {
+                "label": "Uri"
+            },
+            "tourism": {
+                "label": "Uri"
+            },
+            "tracktype": {
+                "label": "Uri"
+            },
+            "tree_type": {
+                "label": "Uri"
+            },
+            "water": {
+                "label": "Uri"
+            },
+            "waterway": {
+                "label": "Uri"
+            },
+            "wetland": {
+                "label": "Uri"
+            },
+            "wood": {
+                "label": "Uri"
+            }
+        },
+        "presets": {
+            "building": {
+                "name": "Gusali"
+            }
+        }
+    }
+}
\ No newline at end of file

diff --git a/vendor/assets/iD/iD/locales/tr.json b/vendor/assets/iD/iD/locales/tr.json
index d301b70bcdd10fc88120f8219c3d8bcea6d4e194..5b77ce8bc569656c262e307a2164b1aab25be87d 100644 (file)
--- a/vendor/assets/iD/iD/locales/tr.json
+++ b/vendor/assets/iD/iD/locales/tr.json
@@ -848,9 +848,6 @@
             "building/construction": {
                 "name": "Yapı İnşaat Aşamasında"
             },
-            "building/entrance": {
-                "name": "Giriş"
-            },
             "building/garage": {
                 "name": "Garaj"
             },
@@ -953,9 +950,6 @@
             "emergency/fire_hydrant": {
                 "name": "Yangın Musluğu"
             },
-            "entrance": {
-                "name": "Giriş"
-            },
             "footway/sidewalk": {
                 "name": "Kaldırım"
             },

diff --git a/vendor/assets/iD/iD/locales/uk.json b/vendor/assets/iD/iD/locales/uk.json
index 346d5a636cc776840f5971c3d80c8145bf5442de..884df9544543d8cf296cef71f0a31e0d8c5cac26 100644 (file)
--- a/vendor/assets/iD/iD/locales/uk.json
+++ b/vendor/assets/iD/iD/locales/uk.json
@@ -71,7 +71,8 @@
                 "line": "Лінія перетворена на коло.",
                 "area": "Полігон перетворено на коло."
             },
-            "not_closed": "Неможливо перетворити на коло — лінія не замкнена."
+            "not_closed": "Неможливо перетворити на коло — лінія не замкнена.",
+            "too_large": "Неможливо перетворити на коло, не все що є видно."
         },
         "orthogonalize": {
             "title": "Випрямити кути",
@@ -84,7 +85,8 @@
                 "line": "Випрямлено кути лінії.",
                 "area": "Випрямлено кути полігону."
             },
-            "not_squarish": "Випрямити кути не вдалось, об’єкт не має відповідних кутів."
+            "not_squarish": "Випрямити кути не вдалось, об’єкт не має відповідних кутів.",
+            "too_large": "Неможливо зробити кути прямими, не все що є видно."
         },
         "straighten": {
             "title": "Випрямити",
@@ -134,7 +136,8 @@
             "annotation": "Об’єднати {n} ліній.",
             "not_eligible": "Ці об’єкти неможливо злити.",
             "not_adjacent": "Ці лінії неможливо злити, бо вони не з’єднані.",
-            "restriction": "Ці лінії не можуть бути об’єднані, принаймні одна з них є членом зв’язку \"{relation}\"."
+            "restriction": "Ці лінії не можуть бути об’єднані, принаймні одна з них є членом зв’язку \"{relation}\".",
+            "incomplete_relation": "Ці об’єкти не можуть бути об’єднані, принаймні один з них завантажений не повністю."
         },
         "move": {
             "title": "Пересунути",
@@ -264,6 +267,8 @@
         "percent_brightness": "прозорість {opacity}%",
         "none": "Пусте",
         "custom": "Власний фон",
+        "custom_button": "Параметри власного фону",
+        "custom_prompt": "Введіть шаблон URL для квадратів мапи. Використовуйте  {z}, {x}, {y} для схеми Z/X/Y та {u} для схеми QuadTiles.",
         "fix_misalignment": "Виправити зсув",
         "reset": "скинути"
     },
@@ -961,7 +966,8 @@
                 "terms": "Marketplace, hbyjr,базар,базарна площа"
             },
             "amenity/parking": {
-                "name": "Автостоянка"
+                "name": "Автостоянка",
+                "terms": "стоянка, паркування, парковка, fdnjcnjzyrf"
             },
             "amenity/pharmacy": {
                 "name": "Аптека",
@@ -1141,10 +1147,6 @@
                 "name": "Комерційна нерухомість",
                 "terms": "Commercial Building,rjvthwsqyf ythejvscnm"
             },
-            "building/entrance": {
-                "name": "Вхід",
-                "terms": "Entrance,dsl,двері,ворота,вихід,фіртка"
-            },
             "building/garage": {
                 "name": "Гараж",
                 "terms": "Garage,ufhf"
@@ -1183,10 +1185,6 @@
                 "name": "Телефон виклику екстрених служб",
                 "terms": "Emergency Phone,tekeajy dbrkbre trchtyb cke"
             },
-            "entrance": {
-                "name": "Вхід",
-                "terms": "Entrance,dsl,двері,ворота,вихід,фіртка"
-            },
             "footway/crossing": {
                 "name": "Перехрестя"
             },

diff --git a/vendor/assets/iD/iD/locales/vi.json b/vendor/assets/iD/iD/locales/vi.json
index 22a6a9982ad1ee1a95f1e7869e445dd328c756a1..616d62e4beb74cfd4773bd4b60d9ae0cd9bcbd61 100644 (file)
--- a/vendor/assets/iD/iD/locales/vi.json
+++ b/vendor/assets/iD/iD/locales/vi.json
@@ -610,6 +610,33 @@
             "fuel": {
                 "label": "Nhiên liệu"
             },
+            "fuel/biodiesel": {
+                "label": "Bán Diesel Sinh học"
+            },
+            "fuel/diesel": {
+                "label": "Bán Diesel"
+            },
+            "fuel/e10": {
+                "label": "Bán E10"
+            },
+            "fuel/e85": {
+                "label": "Bán E85"
+            },
+            "fuel/lpg": {
+                "label": "Bán Prôpan"
+            },
+            "fuel/octane_100": {
+                "label": "Bán Xăng Xe đua"
+            },
+            "fuel/octane_91": {
+                "label": "Bán Xăng Bình thường"
+            },
+            "fuel/octane_95": {
+                "label": "Bán Xăng Trung hạng"
+            },
+            "fuel/octane_98": {
+                "label": "Bán Xăng Thượng hạng"
+            },
             "gauge": {
                 "label": "Khổ"
             },
@@ -673,6 +700,9 @@
             "leisure": {
                 "label": "Loại"
             },
+            "length": {
+                "label": "Chiều dài (Mét)"
+            },
             "levels": {
                 "label": "Số Tầng",
                 "placeholder": "2, 4, 6…"
@@ -744,6 +774,9 @@
             "place": {
                 "label": "Kiểu"
             },
+            "population": {
+                "label": "Dân số"
+            },
             "power": {
                 "label": "Kiểu"
             },
@@ -807,6 +840,9 @@
             "shop": {
                 "label": "Kiểu"
             },
+            "sloped_curb": {
+                "label": "Lề đường Dốc"
+            },
             "smoking": {
                 "label": "Hút thuốc"
             },
@@ -830,7 +866,8 @@
                     "bridge": "Cầu",
                     "tunnel": "Đường hầm",
                     "embankment": "Đường đắp cao",
-                    "cutting": "Đường xẻ"
+                    "cutting": "Đường xẻ",
+                    "ford": "Nơi Lội qua Sông"
                 }
             },
             "studio_type": {
@@ -842,6 +879,9 @@
             "surface": {
                 "label": "Mặt"
             },
+            "tactile_paving": {
+                "label": "Gạch dành cho Người Khiếm thị"
+            },
             "toilets/disposal": {
                 "label": "Phương pháp thải"
             },
@@ -885,6 +925,9 @@
             "wheelchair": {
                 "label": "Đi Xe lăn Được"
             },
+            "width": {
+                "label": "Chiều ngang (Mét)"
+            },
             "wikipedia": {
                 "label": "Wikipedia"
             },
@@ -1029,6 +1072,10 @@
                 "name": "Rửa xe",
                 "terms": "tiệm rửa xe, rửa xe, tiem rua xe, rua xe"
             },
+            "amenity/charging_station": {
+                "name": "Trạm Sạc Pin",
+                "terms": "trạm sạc pin, trạm sạc xe hơi điện, tram sac pin, tram sac xe hoi dien"
+            },
             "amenity/childcare": {
                 "name": "Giữ trẻ",
                 "terms": "giữ trẻ, giữ con nít, giữ đứa bé, giu tre, giu con nit, giu dua be"
@@ -1049,6 +1096,10 @@
                 "name": "Trường Cao đẳng",
                 "terms": "trường cao đẳng, cao đẳng, CĐ, truong cao dang, cao dang, CD"
             },
+            "amenity/compressed_air": {
+                "name": "Khí Nén",
+                "terms": "khí nén, không khí nén, khi nen, khong khi nen"
+            },
             "amenity/courthouse": {
                 "name": "Tòa",
                 "terms": "tòa án, tòa, toà án, toà, toa an, toa"
@@ -1113,6 +1164,10 @@
                 "name": "Bãi Đậu xe",
                 "terms": "bãi đậu xe, sân đậu xe, đậu xe, bãi đỗ xe, sân đỗ xe, đỗ xe, bai dau xe, san dau xe, dau xe, bai do xe, san do xe, do xe"
             },
+            "amenity/parking_entrance": {
+                "name": "Lối Ra vào Ga ra",
+                "terms": "lối ra vào ga ra, lối ra vào ga-ra, lối ra ga ra, lối vào ga ra, lối ra ga-ra, lối ra ga-ra, loi ra vao ga ra, loi ra vao ga-ra, loi ra ga ra, loi vao ga ra, loi ra ga-ra, loi ra ga-ra"
+            },
             "amenity/pharmacy": {
                 "name": "Nhà thuốc",
                 "terms": "nhà thuốc, tiệm thuốc, nha thuoc, tiem thuoc"
@@ -1358,8 +1413,8 @@
                 "terms": "ký túc xá, kí túc xá, ký túc sá, kí túc sá, cư xá, ky tuc xa, ki tuc xa, ky tuc sa, ki tuc sa, cu xa"
             },
             "building/entrance": {
-                "name": "Cửa vào",
-                "terms": "cửa vào, lối vào, cua vao, loi vao"
+                "name": "Cửa Ra vào",
+                "terms": "cửa ra vào, cửa ra, cửa vào, cổng vào, lối vào, cua ra vao, cua ra, cua vao, cong vao, loi vao"
             },
             "building/garage": {
                 "name": "Ga ra",
@@ -1638,8 +1693,8 @@
                 "terms": "điện thoại khẩn cấp, dien thoai khan cap"
             },
             "entrance": {
-                "name": "Cửa vào",
-                "terms": "cửa vào, lối vào, cua vao, loi vao"
+                "name": "Lối Ra vào",
+                "terms": "lối vào, cửa ra vào, cửa ra, cửa vào, cổng vào, loi vao, cua ra vao, cua ra, cua vao, cong vao"
             },
             "footway/crossing": {
                 "name": "Lối Băng qua Đường",
@@ -1649,6 +1704,10 @@
                 "name": "Lề đường",
                 "terms": "lề đường, vỉa hè, đường đi bộ, đường dạo, le duong, vie he, duong di bo, duong dao"
             },
+            "ford": {
+                "name": "Nơi Lội qua Sông",
+                "terms": "nơi lội qua sông, chỗ lội qua sông, nơi lội qua suối, chỗ lội qua suối, nơi cạn, chỗ cạn, noi loi qua song, cho loi qua song, noi lo qua suoi, cho loi qua suoi, noi can, cho can"
+            },
             "golf/bunker": {
                 "name": "Bẫy Cát",
                 "terms": "bẫy cát, hố cát, boongke, boong-ke, boong ke, bunker, bay cat, ho cat"
@@ -1881,6 +1940,10 @@
                 "name": "Nghĩa địa",
                 "terms": "nghĩa địa, nghĩa trang, bãi tha ma, mộ, nghia dia, nghia trang, bai tha ma, mo"
             },
+            "landuse/churchyard": {
+                "name": "Sân Nhà thờ",
+                "terms": "sân nhà thờ, khu đất nhà thờ, sân nhà thờ chính tòa, khu đất nhà thờ chính tòa, sân nhà thờ chính toà, khu đất nhà thờ chính toà, sân nhà thờ chánh tòa, khu đất nhà thờ chánh tòa, sân nhà thờ chánh toà, khu đất nhà thờ chánh tòa, san nha tho, khu dat nha tho, san nha tho chinh toa, khu dat nha tho chinh toa, san nha tho chanh toa, khu dat nha tho chanh toa"
+            },
             "landuse/commercial": {
                 "name": "Thương mại",
                 "terms": "thương mại, văn phòng, công ty, công ti, buôn bán, thuong mai, van phong, cong ty, cong ti, buon ban"
@@ -1921,6 +1984,10 @@
                 "name": "Đồng cỏ",
                 "terms": "đồng cỏ, bãi cỏ, dong co, bai co"
             },
+            "landuse/military": {
+                "name": "Quân đội",
+                "terms": "quân đội, căn cứ quân đội, không quân, căn cứ không quân, hải quân, căn cứ hải quân, quân sự, lính, bộ đội, quan doi, can cu quan doi, khong quan, can cu khong quan, hai quan, can cu hai quan, quan su, linh, bo doi"
+            },
             "landuse/orchard": {
                 "name": "Vườn Cây",
                 "terms": "vườn cây, vườn trồng cây, vườn cây ăn trái, vườn cây ăn quả, vườn trái cây, vuon cay, vuon trong cay, vuon cay an trai, vuon cay an qua, vuon trai cay"
@@ -2673,6 +2740,10 @@
                 "name": "Tiệm Phim",
                 "terms": "tiệm bán phim, tiệm bán video, tiệm mướn phim, tiệm mướn video, chỗ bán phim, chỗ mướn phim, cửa hàng phim, cửa hiệu phim, quầy bán phim, tiem ban phim, tiem ban video, tiem muon phim, tiem muon video, cho ban phim, cho muon phim, cua hang phim, cua hieu phim, quay ban phim"
             },
+            "shop/wine": {
+                "name": "Tiệm Rượu vang",
+                "terms": "tiệm rượu vang, nơi bán rượu vang, chỗ bán rượu vang, quầy bán rượu vang, cửa hàng rượu vang, cửa hàng bán rượu vang, tiệm bán rượu vang, tiem ruou vang, noi ban ruou vang, cho ban ruou vang, quay ban ruou vang, cua hang ruou vang, cua hang ban ruou vang, tiem ban ruou vang"
+            },
             "tourism": {
                 "name": "Du lịch",
                 "terms": "du lịch, máy bay, xe lửa, chuyến bay, nghỉ hè, du lich, may bay, xe lua, chuyen bay, nghi he"

diff --git a/vendor/assets/iD/iD/locales/yue.json b/vendor/assets/iD/iD/locales/yue.json
index a67d33e2e8cac487e6fd786ae4187498da2ec80c..8ce43978e785fc768baf120efaf7e1268ae4ea8f 100644 (file)
--- a/vendor/assets/iD/iD/locales/yue.json
+++ b/vendor/assets/iD/iD/locales/yue.json
@@ -1187,10 +1187,6 @@
                 "name": "商業樓宇",
                 "terms": "Commercial Building,商業建築物,商業樓宇"
             },
-            "building/entrance": {
-                "name": "入口",
-                "terms": "Entrance,入口"
-            },
             "building/garage": {
                 "name": "車庫",
                 "terms": "Garage,車庫"
@@ -1235,10 +1231,6 @@
                 "name": "求助電話",
                 "terms": "Emergency Phone,求助電話,緊急電話"
             },
-            "entrance": {
-                "name": "入口",
-                "terms": "Entrance,入口"
-            },
             "footway/crossing": {
                 "name": "路口",
                 "terms": "Crossing,路口"

diff --git a/vendor/assets/iD/iD/locales/zh-CN.json b/vendor/assets/iD/iD/locales/zh-CN.json
index d79159804be9c2512f98c433756c69301fd3dcc0..8cb1ec929d00f0ed661484d64964c2d3e4ad2f42 100644 (file)
--- a/vendor/assets/iD/iD/locales/zh-CN.json
+++ b/vendor/assets/iD/iD/locales/zh-CN.json
@@ -265,6 +265,7 @@
         "percent_brightness": "{opacity}%不透明度",
         "none": "空",
         "custom": "自定义",
+        "custom_button": "编辑自定义背景",
         "fix_misalignment": "修复对齐",
         "reset": "重置"
     },
@@ -772,6 +773,9 @@
             "sport": {
                 "label": "运动"
             },
+            "sport_ice": {
+                "label": "体育"
+            },
             "structure": {
                 "label": "结构",
                 "placeholder": "未知种类",
@@ -1232,10 +1236,6 @@
             "building/construction": {
                 "name": "在建建筑"
             },
-            "building/entrance": {
-                "name": "入口",
-                "terms": "入口"
-            },
             "building/garage": {
                 "name": "车库",
                 "terms": "车库"
@@ -1282,6 +1282,16 @@
                 "name": "仓库",
                 "terms": "仓库,货栈"
             },
+            "craft/beekeeper": {
+                "name": "养蜂人"
+            },
+            "craft/blacksmith": {
+                "name": "铁匠"
+            },
+            "craft/bookbinder": {
+                "name": "装订工人",
+                "terms": "书籍钉装员,装订商,装订工,钉书匠"
+            },
             "craft/brewery": {
                 "name": "酿酒厂",
                 "terms": "酒厂,酿酒厂,酒坊"
@@ -1322,10 +1332,6 @@
                 "name": "紧急电话",
                 "terms": "紧急电话"
             },
-            "entrance": {
-                "name": "入口",
-                "terms": "入口"
-            },
             "footway/crossing": {
                 "name": "路口",
                 "terms": "路口"
@@ -1349,6 +1355,9 @@
                 "name": "开球区",
                 "terms": "开球区,发球台"
             },
+            "golf/water_hazard": {
+                "name": "障碍水池"
+            },
             "highway": {
                 "name": "道路",
                 "terms": "公路"
@@ -1637,6 +1646,9 @@
                 "name": "公园",
                 "terms": "公园"
             },
+            "leisure/picnic_table": {
+                "name": "野餐桌"
+            },
             "leisure/pitch": {
                 "name": "体育场",
                 "terms": "运动场,运动场所"
@@ -2260,6 +2272,9 @@
                 "name": "照相馆",
                 "terms": "照相馆"
             },
+            "shop/seafood": {
+                "name": "海鲜店"
+            },
             "shop/shoes": {
                 "name": "鞋店",
                 "terms": "鞋店"

diff --git a/vendor/assets/iD/iD/locales/zh-HK.json b/vendor/assets/iD/iD/locales/zh-HK.json
index f203f4192bd1c107fa8dad9d436006def2110eb6..d69f82078975acc056ec22bebbfb408a07ad7722 100644 (file)
--- a/vendor/assets/iD/iD/locales/zh-HK.json
+++ b/vendor/assets/iD/iD/locales/zh-HK.json
@@ -1125,10 +1125,6 @@
                 "name": "商業樓宇",
                 "terms": "Commercial Building,商業建築物,商業樓宇"
             },
-            "building/entrance": {
-                "name": "入口",
-                "terms": "Entrance,入口"
-            },
             "building/garage": {
                 "name": "車庫",
                 "terms": "Garage,車庫"
@@ -1165,10 +1161,6 @@
                 "name": "求助電話",
                 "terms": "Emergency Phone,求助電話,緊急電話"
             },
-            "entrance": {
-                "name": "入口",
-                "terms": "Entrance,入口"
-            },
             "footway/crossing": {
                 "name": "路口",
                 "terms": "Crossing,路口"

diff --git a/vendor/assets/iD/iD/locales/zh-TW.json b/vendor/assets/iD/iD/locales/zh-TW.json
index 69dbc1aa2ba8c6359b02cec88099c19d910a3419..6428bad2f775910cd1962d96a3168c77fa1f8d5d 100644 (file)
--- a/vendor/assets/iD/iD/locales/zh-TW.json
+++ b/vendor/assets/iD/iD/locales/zh-TW.json
@@ -1207,9 +1207,6 @@
             "building/commercial": {
                 "name": "商用樓宇"
             },
-            "building/entrance": {
-                "name": "入口"
-            },
             "building/garage": {
                 "name": "車庫"
             },
@@ -1414,9 +1411,6 @@
             "emergency/phone": {
                 "name": "緊急電話"
             },
-            "entrance": {
-                "name": "入口"
-            },
             "footway/crossing": {
                 "name": "行人過路線"
             },

diff --git a/vendor/assets/iD/iD/locales/zh.json b/vendor/assets/iD/iD/locales/zh.json
index 77d17009ef287dbc7cfd1b7170a5a843da896c60..a656a4adb5b664221f5ff1feeea52c6e5071fc93 100644 (file)
--- a/vendor/assets/iD/iD/locales/zh.json
+++ b/vendor/assets/iD/iD/locales/zh.json
@@ -872,18 +872,12 @@
             "building/apartments": {
                 "name": "酒店公寓"
             },
-            "building/entrance": {
-                "name": "入口"
-            },
             "building/house": {
                 "name": "房屋"
             },
             "emergency/phone": {
                 "name": "紧急电话"
             },
-            "entrance": {
-                "name": "入口"
-            },
             "highway": {
                 "name": "公路"
             },