Update to iD v1.1.5

diff --git a/app/views/site/id.html.erb b/app/views/site/id.html.erb
index 1b4cdf1bbb778f3bd6a76d27d543ed452c8ca1d9..6000b7da06dfd437518402740f6dfe6bcab9292c 100644 (file)
--- a/app/views/site/id.html.erb
+++ b/app/views/site/id.html.erb
@@ -68,16 +68,6 @@
       }, 0);
     });
 
-    var maximized = false;
-    id.on('toggleFullscreen.embed', function() {
-      if (maximized) {
-        parent.minimiseMap();
-      } else {
-        parent.maximiseMap();
-      }
-      maximized = !maximized;
-    });
-
     d3.select('#id-container')
       .call(id.ui());
   }

diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb
index 6463f2f1cbed5a44ddb0863888f6205283a32609..388dc8111d33c5955d3a11dc4bb1b1f75ed68d54 100644 (file)
--- a/vendor/assets/iD/iD.css.erb
+++ b/vendor/assets/iD/iD.css.erb
@@ -3488,11 +3488,11 @@ img.wiki-image {
 ------------------------------------------------------- */
 
 .modal-actions .restore:before {
-    background-position: -500px -220px;
+    background-position: -600px -220px;
 }
 
 .modal-actions .reset:before {
-    background-position: -600px -220px;
+    background-position: -700px -220px;
 }
 
 /* Success Modal
@@ -3506,16 +3506,28 @@ img.wiki-image {
     padding-top: 15px;
 }
 
+.save-success .button.social {
+    height: 80px;
+}
+
+.save-success .button.social:before {
+    height: 50px;
+}
+
 .save-success .button.osm:before {
     background-position: 0px -220px;
 }
 
 .save-success .button.twitter:before {
-    background-position: -100px -220px;
+    background-position: -100px -245px;
 }
 
 .save-success .button.facebook:before {
-    background-position: -200px -220px;
+    background-position: -200px -245px;
+}
+
+.save-success .button.google:before {
+    background-position: -300px -245px;
 }
 
 /* Splash Modal
@@ -3523,11 +3535,11 @@ img.wiki-image {
 
 .modal-actions .walkthrough:before,
 .walkthrough a:before {
-    background-position: -300px -220px;
+    background-position: -400px -220px;
 }
 
 .modal-actions .start:before {
-    background-position: -400px -220px;
+    background-position: -500px -220px;
 }
 
 /* Commit Modal

diff --git a/vendor/assets/iD/iD.js b/vendor/assets/iD/iD.js
index aeb16e7a4d968f7d6de52252bc37fe19447bbb40..873868e9578db69d7a6507d616a29088a262be33 100644 (file)
--- a/vendor/assets/iD/iD.js
+++ b/vendor/assets/iD/iD.js
@@ -15044,7 +15044,7 @@ window.iD = function () {
     };
 
     var history = iD.History(context),
-        dispatch = d3.dispatch('enter', 'exit', 'toggleFullscreen'),
+        dispatch = d3.dispatch('enter', 'exit'),
         mode,
         container,
         ui = iD.ui(context),
@@ -15232,18 +15232,22 @@ window.iD = function () {
         return context;
     };
 
-    context.imagePath = function(_) {
-        return assetPath + 'img/' + _;
+    var assetMap = {};
+    context.assetMap = function(_) {
+        if (!arguments.length) return assetMap;
+        assetMap = _;
+        return context;
     };
 
-    context.toggleFullscreen = function() {
-        dispatch.toggleFullscreen();
+    context.imagePath = function(_) {
+        var asset = 'img/' + _;
+        return assetMap[asset] || assetPath + asset;
     };
 
     return d3.rebind(context, dispatch, 'on');
 };
 
-iD.version = '1.1.4';
+iD.version = '1.1.5';
 
 (function() {
     var detected = {};
@@ -19071,11 +19075,11 @@ iD.operations.Delete = function(selectedIDs, context) {
 
     var operation = function() {
         var annotation,
-            mode;
+            nextSelectedID;
 
         if (selectedIDs.length > 1) {
             annotation = t('operations.delete.annotation.multiple', {n: selectedIDs.length});
-            mode = iD.modes.Browse(context);
+
         } else {
             var id = selectedIDs[0],
                 entity = context.entity(id),
@@ -19084,7 +19088,6 @@ iD.operations.Delete = function(selectedIDs, context) {
                 parent = parents[0];
 
             annotation = t('operations.delete.annotation.' + geometry);
-            mode = iD.modes.Browse(context);
 
             // Select the next closest node in the way.
             if (geometry === 'vertex' && parents.length === 1 && parent.nodes.length > 2) {
@@ -19101,7 +19104,7 @@ iD.operations.Delete = function(selectedIDs, context) {
                     i = a < b ? i - 1 : i + 1;
                 }
 
-                mode = iD.modes.Select(context, [nodes[i]]);
+                nextSelectedID = nodes[i];
             }
         }
 
@@ -19109,8 +19112,11 @@ iD.operations.Delete = function(selectedIDs, context) {
             action,
             annotation);
 
-        context.enter(mode);
-
+        if (nextSelectedID && context.hasEntity(nextSelectedID)) {
+            context.enter(iD.modes.Select(context, [nextSelectedID]));
+        } else {
+            context.enter(iD.modes.Browse(context));
+        }
     };
 
     operation.available = function() {
@@ -19129,7 +19135,7 @@ iD.operations.Delete = function(selectedIDs, context) {
     };
 
     operation.id = "delete";
-    operation.keys = [iD.ui.cmd('â\8c«'), iD.ui.cmd('⌦')];
+    operation.keys = [iD.ui.cmd('â\8c\98â\8c«'), iD.ui.cmd('â\8c\98⌦')];
     operation.title = t('operations.delete.title');
 
     return operation;
@@ -21269,21 +21275,19 @@ iD.Background = function(context) {
         if (source.sourcetag === 'Bing') {
             return iD.BackgroundSource.Bing(source, dispatch);
         } else {
-            return iD.BackgroundSource.template(source);
+            return iD.BackgroundSource(source);
         }
     });
 
-    backgroundSources.push(iD.BackgroundSource.Custom);
-
     function findSource(sourcetag) {
         return _.find(backgroundSources, function(d) {
-            return d.data.sourcetag && d.data.sourcetag === sourcetag;
+            return d.sourcetag && d.sourcetag === sourcetag;
         });
     }
 
     function updateImagery() {
-        var b = background.baseLayerSource().data,
-            o = overlayLayers.map(function (d) { return d.source().data.sourcetag; }).join(','),
+        var b = background.baseLayerSource(),
+            o = overlayLayers.map(function (d) { return d.source().sourcetag; }).join(','),
             q = iD.util.stringQs(location.hash.substring(1));
 
         var tag = b.sourcetag;
@@ -21313,7 +21317,10 @@ iD.Background = function(context) {
         }
 
         overlayLayers.forEach(function (d) {
-            imageryUsed.push(d.source().data.sourcetag || d.source().data.name);
+            var source = d.source();
+            if (!source.isLocatorOverlay()) {
+                imageryUsed.push(source.sourcetag || source.name);
+            }
         });
 
         if (background.showsGpxLayer()) {
@@ -21341,7 +21348,7 @@ iD.Background = function(context) {
         gpx.call(gpxLayer);
 
         var overlays = selection.selectAll('.overlay-layer')
-            .data(overlayLayers, function(d) { return d.source().data.name });
+            .data(overlayLayers, function(d) { return d.source().name });
 
         overlays.enter().insert('div', '.layer-data')
             .attr('class', 'layer-layer overlay-layer');
@@ -21355,11 +21362,8 @@ iD.Background = function(context) {
     }
 
     background.sources = function(extent) {
-        return backgroundSources.filter(function(layer) {
-            return !layer.data.extents ||
-                layer.data.extents.some(function(layerExtent) {
-                    return iD.geo.Extent(layerExtent).intersects(extent);
-                });
+        return backgroundSources.filter(function(source) {
+            return source.intersects(extent);
         });
     };
 
@@ -21408,7 +21412,7 @@ iD.Background = function(context) {
 
     background.showsLayer = function(d) {
         return d === baseLayer.source() ||
-            (d.data.name === 'Custom' && baseLayer.source().data.name === 'Custom') ||
+            (d.name === 'Custom' && baseLayer.source().name === 'Custom') ||
             overlayLayers.some(function(l) { return l.source() === d; });
     };
 
@@ -21425,7 +21429,7 @@ iD.Background = function(context) {
             }
         }
 
-        layer = iD.TileLayer('overlay')
+        layer = iD.TileLayer()
             .source(d)
             .projection(context.projection)
             .dimensions(baseLayer.dimensions());
@@ -21436,14 +21440,14 @@ iD.Background = function(context) {
     };
 
     background.nudge = function(d, zoom) {
-        baseLayer.nudge(d, zoom);
+        baseLayer.source().nudge(d, zoom);
         dispatch.change();
         return background;
     };
 
     background.offset = function(d) {
-        if (!arguments.length) return baseLayer.offset();
-        baseLayer.offset(d);
+        if (!arguments.length) return baseLayer.source().offset();
+        baseLayer.source().offset(d);
         dispatch.change();
         return background;
     };
@@ -21452,7 +21456,7 @@ iD.Background = function(context) {
         chosen = q.background || q.layer;
 
     if (chosen && chosen.indexOf('custom:') === 0) {
-        background.baseLayerSource(iD.BackgroundSource.template({
+        background.baseLayerSource(iD.BackgroundSource({
             template: chosen.replace(/^custom:/, ''),
             name: 'Custom'
         }));
@@ -21460,6 +21464,14 @@ iD.Background = function(context) {
         background.baseLayerSource(findSource(chosen) || findSource("Bing"));
     }
 
+    var locator = _.find(backgroundSources, function(d) {
+        return d.overlay && d.default;
+    });
+
+    if (locator) {
+        background.toggleOverlayLayer(locator);
+    }
+
     var overlays = (q.overlays || '').split(',');
     overlays.forEach(function(overlay) {
         overlay = findSource(overlay);
@@ -21468,12 +21480,25 @@ iD.Background = function(context) {
 
     return d3.rebind(background, dispatch, 'on');
 };
-iD.BackgroundSource = {};
+iD.BackgroundSource = function(data) {
+    var source = _.clone(data),
+        offset = [0, 0];
 
-// derive the url of a 'quadkey' style tile from a coordinate object
-iD.BackgroundSource.template = function(data) {
+    source.scaleExtent = data.scaleExtent || [0, 20];
 
-    function generator(coord) {
+    source.offset = function(_) {
+        if (!arguments.length) return offset;
+        offset = _;
+        return source;
+    };
+
+    source.nudge = function(_, zoomlevel) {
+        offset[0] += _[0] / Math.pow(2, zoomlevel);
+        offset[1] += _[1] / Math.pow(2, zoomlevel);
+        return source;
+    };
+
+    source.url = function(coord) {
         var u = '';
         for (var zoom = coord[2]; zoom > 0; zoom--) {
             var b = 0;
@@ -21498,19 +21523,33 @@ iD.BackgroundSource.template = function(data) {
                 var subdomains = r.split(':')[1].split(',');
                 return subdomains[coord[2] % subdomains.length];
             });
-    }
+    };
 
-    generator.data = data;
-    generator.copyrightNotices = function() {};
+    source.intersects = function(extent) {
+        return !data.extents || data.extents.some(function(ex) {
+            return iD.geo.Extent(ex).intersects(extent);
+        });
+    };
 
-    return generator;
+    source.validZoom = function(z) {
+        return source.scaleExtent[0] <= z &&
+            (!source.isLocatorOverlay() || source.scaleExtent[1] > z);
+    };
+
+    source.isLocatorOverlay = function() {
+        return source.name === 'Locator Overlay';
+    };
+
+    source.copyrightNotices = function() {};
+
+    return source;
 };
 
 iD.BackgroundSource.Bing = function(data, dispatch) {
     // http://msdn.microsoft.com/en-us/library/ff701716.aspx
     // http://msdn.microsoft.com/en-us/library/ff701701.aspx
 
-    var bing = iD.BackgroundSource.template(data),
+    var bing = iD.BackgroundSource(data),
         key = 'Arzdiw4nlOJzRwOz__qailc8NiR31Tt51dN2D7cm57NrnceZnCpgOkmJhNpGoppU', // Same as P2 and JOSM
         url = 'http://dev.virtualearth.net/REST/v1/Imagery/Metadata/Aerial?include=ImageryProviders&key=' +
             key + '&jsonp={callback}',
@@ -21546,18 +21585,6 @@ iD.BackgroundSource.Bing = function(data, dispatch) {
 
     return bing;
 };
-
-iD.BackgroundSource.Custom = function() {
-    var template = window.prompt('Enter a tile template. ' +
-        'Valid tokens are {z}, {x}, {y} for Z/X/Y scheme and {u} for quadtile scheme.');
-    if (!template) return null;
-    return iD.BackgroundSource.template({
-        template: template,
-        name: 'Custom'
-    });
-};
-
-iD.BackgroundSource.Custom.data = { 'name': 'Custom' };
 iD.GpxLayer = function(context, dispatch) {
     var projection,
         gj = {},
@@ -22063,16 +22090,11 @@ iD.Map = function(context) {
 
     return d3.rebind(map, dispatch, 'on');
 };
-iD.TileLayer = function(backgroundType) {
-
-    backgroundType = backgroundType || 'background';
-
+iD.TileLayer = function() {
     var tileSize = 256,
         tile = d3.geo.tile(),
         projection,
         cache = {},
-        offset = [0, 0],
-        offsets = {},
         tileOrigin,
         z,
         transformProp = iD.util.prefixCSSProperty('Transform'),
@@ -22093,7 +22115,7 @@ iD.TileLayer = function(backgroundType) {
     function lookUp(d) {
         for (var up = -1; up > -d[2]; up--) {
             var tile = atZoom(d, up);
-            if (cache[source(tile)] !== false) {
+            if (cache[source.url(tile)] !== false) {
                 return tile;
             }
         }
@@ -22111,7 +22133,7 @@ iD.TileLayer = function(backgroundType) {
     }
 
     function addSource(d) {
-        d.push(source(d));
+        d.push(source.url(d));
         return d;
     }
 
@@ -22135,7 +22157,7 @@ iD.TileLayer = function(backgroundType) {
     function render(selection) {
         var requests = [];
 
-        if (tile.scaleExtent()[0] <= z) {
+        if (source.validZoom(z)) {
             tile().forEach(function(d) {
                 addSource(d);
                 requests.push(d);
@@ -22151,8 +22173,8 @@ iD.TileLayer = function(backgroundType) {
         }
 
         var pixelOffset = [
-            Math.round(offset[0] * Math.pow(2, z)),
-            Math.round(offset[1] * Math.pow(2, z))
+            Math.round(source.offset()[0] * Math.pow(2, z)),
+            Math.round(source.offset()[1] * Math.pow(2, z))
         ];
 
         function load(d) {
@@ -22209,19 +22231,6 @@ iD.TileLayer = function(backgroundType) {
             .classed('tile-removing', false);
     }
 
-    background.offset = function(_) {
-        if (!arguments.length) return offset;
-        offset = _;
-        if (source.data) offsets[source.data.name] = offset;
-        return background;
-    };
-
-    background.nudge = function(_, zoomlevel) {
-        offset[0] += _[0] / Math.pow(2, zoomlevel);
-        offset[1] += _[1] / Math.pow(2, zoomlevel);
-        return background;
-    };
-
     background.projection = function(_) {
         if (!arguments.length) return projection;
         projection = _;
@@ -22237,13 +22246,8 @@ iD.TileLayer = function(backgroundType) {
     background.source = function(_) {
         if (!arguments.length) return source;
         source = _;
-        if (source.data) {
-            offset = offsets[source.data.name] = offsets[source.data.name] || [0, 0];
-        } else {
-            offset = [0, 0];
-        }
         cache = {};
-        tile.scaleExtent((source.data && source.data.scaleExtent) || [1, 20]);
+        tile.scaleExtent(source.scaleExtent);
         return background;
     };
 
@@ -23571,8 +23575,7 @@ iD.ui = function(context) {
             .on('←', pan([pa, 0]))
             .on('↑', pan([0, pa]))
             .on('→', pan([-pa, 0]))
-            .on('↓', pan([0, -pa]))
-            .on('M', function() { context.toggleFullscreen(); });
+            .on('↓', pan([0, -pa]));
 
         d3.select(document)
             .call(keybinding);
@@ -23674,22 +23677,22 @@ iD.ui.Attribution = function(context) {
         }
 
         var attribution = selection.selectAll('.provided-by')
-            .data([context.background().baseLayerSource()], function(d) { return d.data.name; });
+            .data([context.background().baseLayerSource()], function(d) { return d.name; });
 
         attribution.enter()
             .append('span')
             .attr('class', 'provided-by')
             .each(function(d) {
-                var source = d.data.sourcetag || d.data.name;
+                var source = d.sourcetag || d.name;
 
-                if (d.data.logo) {
-                    source = '<img class="source-image" src="' + context.imagePath(d.data.logo) + '">';
+                if (d.logo) {
+                    source = '<img class="source-image" src="' + context.imagePath(d.logo) + '">';
                 }
 
-                if (d.data.terms_url) {
+                if (d.terms_url) {
                     d3.select(this)
                         .append('a')
-                        .attr('href', d.data.terms_url)
+                        .attr('href', d.terms_url)
                         .attr('target', '_blank')
                         .html(source);
                 } else {
@@ -23759,7 +23762,7 @@ iD.ui.Background = function(context) {
                 return context.background().showsLayer(d);
             }
 
-            content.selectAll('label.layer')
+            content.selectAll('label.layer, label.custom_layer')
                 .classed('active', active)
                 .selectAll('input')
                 .property('checked', active);
@@ -23767,18 +23770,24 @@ iD.ui.Background = function(context) {
 
         function clickSetSource(d) {
             d3.event.preventDefault();
-            if (d.data.name === 'Custom') {
-                var configured = d();
-                if (!configured) {
-                    selectLayer();
-                    return;
-                }
-                d = configured;
-            }
             context.background().baseLayerSource(d);
             selectLayer();
         }
 
+        function clickCustom() {
+            d3.event.preventDefault();
+            var template = window.prompt(t('background.custom_prompt'));
+            if (!template) {
+                selectLayer();
+                return;
+            }
+            context.background().baseLayerSource(iD.BackgroundSource({
+                template: template,
+                name: 'Custom'
+            }));
+            selectLayer();
+        }
+
         function clickSetOverlay(d) {
             d3.event.preventDefault();
             context.background().toggleOverlayLayer(d);
@@ -23796,29 +23805,27 @@ iD.ui.Background = function(context) {
                 .filter(filter);
 
             var layerLinks = layerList.selectAll('label.layer')
-                .data(sources, function(d) { return d.data.name; });
+                .data(sources, function(d) { return d.name; });
 
             var layerInner = layerLinks.enter()
-                .append('label')
+                .insert('label', '.custom_layer')
                 .attr('class', 'layer');
 
             // only set tooltips for layers with tooltips
             layerInner
-                .filter(function(d) { return d.data.description; })
+                .filter(function(d) { return d.description; })
                 .call(bootstrap.tooltip()
-                    .title(function(d) { return d.data.description; })
-                    .placement('left')
-                );
+                    .title(function(d) { return d.description; })
+                    .placement('left'));
 
             layerInner.append('input')
                 .attr('type', type)
                 .attr('name', 'layers')
-                .attr('value', function(d) { return d.data.name; })
+                .attr('value', function(d) { return d.name; })
                 .on('change', change);
 
-            layerInner.insert('span').text(function(d) {
-                return d.data.name;
-            });
+            layerInner.append('span')
+                .text(function(d) { return d.name; });
 
             layerLinks.exit()
                 .remove();
@@ -23827,13 +23834,8 @@ iD.ui.Background = function(context) {
         }
 
         function update() {
-            backgroundList.call(drawList, 'radio', clickSetSource, function(d) {
-                return !d.data.overlay;
-            });
-
-            overlayList.call(drawList, 'checkbox', clickSetOverlay, function(d) {
-                return d.data.overlay;
-            });
+            backgroundList.call(drawList, 'radio', clickSetSource, function(d) { return !d.overlay; });
+            overlayList.call(drawList, 'checkbox', clickSetOverlay, function(d) { return d.overlay; });
 
             var hasGpx = context.background().hasGpxLayer(),
                 showsGpx = context.background().showsGpxLayer();
@@ -23950,6 +23952,19 @@ iD.ui.Background = function(context) {
             .append('div')
             .attr('class', 'toggle-list layer-list');
 
+        var custom = backgroundList
+            .append('label')
+            .attr('class', 'custom_layer')
+            .datum({name: 'Custom'});
+
+        custom.append('input')
+            .attr('type', 'radio')
+            .attr('name', 'layers')
+            .on('change', clickCustom);
+
+        custom.append('span')
+            .text(t('background.custom'));
+
         var overlayList = content
             .append('div')
             .attr('class', 'toggle-list layer-list');
@@ -24104,9 +24119,9 @@ iD.ui.Commit = function(context) {
 
         header.append('button')
             .attr('class', 'fr')
+            .on('click', event.cancel)
             .append('span')
-            .attr('class', 'icon close')
-            .on('click', event.cancel);
+            .attr('class', 'icon close');
 
         header.append('h3')
             .text(t('commit.title'));
@@ -24867,7 +24882,8 @@ iD.ui.Help = function(context) {
                 'help.imagery',
                 'help.addresses',
                 'help.inspector',
-                'help.buildings'];
+                'help.buildings',
+                'help.relations'];
 
             function one(f) { return function(x) { return f(x); }; }
             var docs = docKeys.map(one(t)).map(function(text) {
@@ -25786,6 +25802,7 @@ iD.ui.PresetList = function(context) {
                 list.call(drawList, results);
             } else {
                 list.call(drawList, context.presets().defaults(geometry, 36));
+                message.text(t('inspector.choose'));
             }
         }
 
@@ -26951,31 +26968,29 @@ iD.ui.Success = function(context) {
         body.append('p')
             .html(t('success.help_html'));
 
+        var changesetURL = context.connection().changesetURL(changeset.id);
+
         body.append('a')
             .attr('class', 'button col12 osm')
             .attr('target', '_blank')
-            .attr('href', function() {
-                return context.connection().changesetURL(changeset.id);
-            })
+            .attr('href', changesetURL)
             .text(t('success.view_on_osm'));
 
-        body.append('a')
-            .attr('class', 'button col12 twitter')
-            .attr('target', '_blank')
-            .attr('href', function() {
-                return 'https://twitter.com/intent/tweet?source=webclient&text=' +
-                    encodeURIComponent(message);
-            })
-            .text(t('success.tweet'));
+        var sharing = {
+            facebook: 'https://facebook.com/sharer/sharer.php?u=' + encodeURIComponent(changesetURL),
+            twitter: 'https://twitter.com/intent/tweet?source=webclient&text=' + encodeURIComponent(message),
+            google: 'https://plus.google.com/share?url=' + encodeURIComponent(changesetURL)
+        };
 
-        body.append('a')
-            .attr('class', 'button col12 facebook')
+        body.selectAll('.button.social')
+            .data(d3.entries(sharing))
+            .enter().append('a')
+            .attr('class', function(d) { return 'button social col4 ' + d.key; })
             .attr('target', '_blank')
-            .attr('href', function() {
-                return 'https://facebook.com/sharer/sharer.php?u=' +
-                    encodeURIComponent(context.connection().changesetURL(changeset.id));
-            })
-            .text(t('success.facebook'));
+            .attr('href', function(d) { return d.value; })
+            .call(bootstrap.tooltip()
+                .title(function(d) { return t('success.' + d.key); })
+                .placement('bottom'));
     }
 
     success.changeset = function(_) {
@@ -29105,7 +29120,11 @@ iD.presets.Preset = function(id, preset, fields) {
         tags = _.clone(tags);
 
         for (var k in applyTags) {
-            if (applyTags[k] !== '*') tags[k] = applyTags[k];
+            if (applyTags[k] === '*') {
+                tags[k] = 'yes';
+            } else {
+                tags[k] = applyTags[k];
+            }
         }
 
         for (var f in preset.fields) {
@@ -29361,12 +29380,29 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "2",
                 "3"
             ],
-            "default": "yes",
+            "default": true,
             "sourcetag": "Bing",
             "logo": "bing_maps.png",
             "logo_url": "http://www.bing.com/maps",
             "terms_url": "http://opengeodata.org/microsoft-imagery-details"
         },
+        {
+            "name": "Locator Overlay",
+            "template": "http://{t}.tiles.mapbox.com/v3/openstreetmap.map-btyhiati/{z}/{x}/{y}.png",
+            "description": "Shows major features to help orient you.",
+            "overlay": true,
+            "default": true,
+            "scaleExtent": [
+                0,
+                16
+            ],
+            "subdomains": [
+                "a",
+                "b",
+                "c"
+            ],
+            "terms_url": "http://mapbox.com/tos/"
+        },
         {
             "name": "MapBox Satellite",
             "template": "http://{t}.tiles.mapbox.com/v3/openstreetmap.map-4wvf9l0l/{z}/{x}/{y}.png",
@@ -32321,6 +32357,27 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "terms": [],
                 "name": "Pub"
             },
+            "amenity/ranger_station": {
+                "fields": [
+                    "building_area",
+                    "opening_hours",
+                    "operator",
+                    "phone"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "visitor center",
+                    "permit center",
+                    "backcountry office"
+                ],
+                "tags": {
+                    "amenity": "ranger_station"
+                },
+                "name": "Ranger Station"
+            },
             "amenity/restaurant": {
                 "icon": "restaurant",
                 "fields": [
@@ -32472,8 +32529,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "amenity/toilets": {
                 "fields": [
+                    "toilets/disposal",
                     "operator",
-                    "building_area"
+                    "building_area",
+                    "access"
                 ],
                 "geometry": [
                     "point",
@@ -32482,7 +32541,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "terms": [
                     "bathroom",
-                    "restroom"
+                    "restroom",
+                    "outhouse",
+                    "privy",
+                    "head",
+                    "lavatory",
+                    "latrine",
+                    "water closet",
+                    "WC",
+                    "W.C."
                 ],
                 "tags": {
                     "amenity": "toilets"
@@ -35911,6 +35978,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "tags": {
                     "tourism": "artwork"
                 },
+                "terms": [
+                    "mural",
+                    "sculpture",
+                    "statue"
+                ],
                 "name": "Artwork"
             },
             "tourism/attraction": {
@@ -37261,6 +37333,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "type": "combo",
                 "label": "Surface"
             },
+            "toilets/disposal": {
+                "key": "toilets:disposal",
+                "type": "combo",
+                "label": "Disposal"
+            },
             "tourism": {
                 "key": "tourism",
                 "type": "combo",
@@ -49209,6 +49286,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "title": "Background",
             "description": "Background settings",
             "percent_brightness": "{opacity}% brightness",
+            "custom": "Custom",
+            "custom_prompt": "Enter a tile template. Valid tokens are {z}, {x}, {y} for Z/X/Y scheme and {u} for quadtile scheme.",
             "fix_misalignment": "Fix misalignment",
             "reset": "reset"
         },
@@ -49231,7 +49310,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "just_edited": "You just edited OpenStreetMap!",
             "view_on_osm": "View on OSM",
             "facebook": "Share on Facebook",
-            "tweet": "Tweet",
+            "twitter": "Share on Twitter",
+            "google": "Share on Google+",
             "help_html": "Your changes should appear in the \"Standard\" layer in a few minutes. Other layers, and certain features, may take longer\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map'>details</a>).\n"
         },
         "confirm": {
@@ -49279,7 +49359,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "imagery": "# Imagery\n\nAerial imagery is an important resource for mapping. A combination of\nairplane flyovers, satellite views, and freely-compiled sources are available\nin the editor under the 'Background Settings' menu on the left.\n\nBy default a [Bing Maps](http://www.bing.com/maps/) satellite layer is\npresented in the editor, but as you pan and zoom the map to new geographical\nareas, new sources will become available. Some countries, like the United\nStates, France, and Denmark have very high-quality imagery available for some areas.\n\nImagery is sometimes offset from the map data because of a mistake on the\nimagery provider's side. If you see a lot of roads shifted from the background,\ndon't immediately move them all to match the background. Instead you can adjust\nthe imagery so that it matches the existing data by clicking 'Fix alignment' at\nthe bottom of the Background Settings UI.\n",
             "addresses": "# Addresses\n\nAddresses are some of the most useful information for the map.\n\nAlthough addresses are often represented as parts of streets, in OpenStreetMap\nthey're recorded as attributes of buildings and places along streets.\n\nYou can add address information to places mapped as building outlines\nas well as those mapped as single points. The optimal source of address\ndata is from an on-the-ground survey or personal knowledge - as with any\nother feature, copying from commercial sources like Google Maps is strictly\nforbidden.\n",
             "inspector": "# Using the Inspector\n\nThe inspector is the user interface element on the right-hand side of the\npage that appears when a feature is selected and allows you to edit its details.\n\n### Selecting a Feature Type\n\nAfter you add a point, line, or area, you can choose what type of feature it\nis, like whether it's a highway or residential road, supermarket or cafe.\nThe inspector will display buttons for common feature types, and you can\nfind others by typing what you're looking for in the search box.\n\nClick the 'i' in the bottom-right-hand corner of a feature type button to\nlearn more about it. Click a button to choose that type.\n\n### Using Forms and Editing Tags\n\nAfter you choose a feature type, or when you select a feature that already\nhas a type assigned, the inspector will display fields with details about\nthe feature like its name and address.\n\nBelow the fields you see, you can click icons to add other details,\nlike [Wikipedia](http://www.wikipedia.org/) information, wheelchair\naccess, and more.\n\nAt the bottom of the inspector, click 'Additional tags' to add arbitrary\nother tags to the element. [Taginfo](http://taginfo.openstreetmap.org/) is a\ngreat resource for learn more about popular tag combinations.\n\nChanges you make in the inspector are automatically applied to the map.\nYou can undo them at any time by clicking the 'Undo' button.\n\n### Closing the Inspector\n\nYou can close the inspector by clicking the close button in the top-right,\npressing the 'Escape' key, or clicking on the map.\n",
-            "buildings": "# Buildings\n\nOpenStreetMap is the world's largest database of buildings. You can create\nand improve this database.\n\n### Selecting\n\nYou can select a building by clicking on its border. This will highlight the\nbuilding and open a small tools menu and a sidebar showing more information\nabout the building.\n\n### Modifying\n\nSometimes buildings are incorrectly placed or have incorrect tags.\n\nTo move an entire building, select it, then click the 'Move' tool. Move your\nmouse to shift the building, and click when it's correctly placed.\n\nTo fix the specific shape of a building, click and drag the nodes that form\nits border into better places.\n\n### Creating\n\nOne of the main questions around adding buildings to the map is that\nOpenStreetMap records buildings both as shapes and points. The rule of thumb\nis to _map a building as a shape whenever possible_, and map companies, homes,\namenities, and other things that operate out of buildings as points placed\nwithin the building shape.\n\nStart drawing a building as a shape by clicking the 'Area' button in the top\nleft of the interface, and end it either by pressing 'Return' on your keyboard\nor clicking on the first node drawn to close the shape.\n\n### Deleting\n\nIf a building is entirely incorrect - you can see that it doesn't exist in satellite\nimagery and ideally have confirmed locally that it's not present - you can delete\nit, which removes it from the map. Be cautious when deleting features -\nlike any other edit, the results are seen by everyone and satellite imagery\nis often out of date, so the building could simply be newly built.\n\nYou can delete a building by clicking on it to select it, then clicking the\ntrash can icon or pressing the 'Delete' key.\n"
+            "buildings": "# Buildings\n\nOpenStreetMap is the world's largest database of buildings. You can create\nand improve this database.\n\n### Selecting\n\nYou can select a building by clicking on its border. This will highlight the\nbuilding and open a small tools menu and a sidebar showing more information\nabout the building.\n\n### Modifying\n\nSometimes buildings are incorrectly placed or have incorrect tags.\n\nTo move an entire building, select it, then click the 'Move' tool. Move your\nmouse to shift the building, and click when it's correctly placed.\n\nTo fix the specific shape of a building, click and drag the nodes that form\nits border into better places.\n\n### Creating\n\nOne of the main questions around adding buildings to the map is that\nOpenStreetMap records buildings both as shapes and points. The rule of thumb\nis to _map a building as a shape whenever possible_, and map companies, homes,\namenities, and other things that operate out of buildings as points placed\nwithin the building shape.\n\nStart drawing a building as a shape by clicking the 'Area' button in the top\nleft of the interface, and end it either by pressing 'Return' on your keyboard\nor clicking on the first node drawn to close the shape.\n\n### Deleting\n\nIf a building is entirely incorrect - you can see that it doesn't exist in satellite\nimagery and ideally have confirmed locally that it's not present - you can delete\nit, which removes it from the map. Be cautious when deleting features -\nlike any other edit, the results are seen by everyone and satellite imagery\nis often out of date, so the building could simply be newly built.\n\nYou can delete a building by clicking on it to select it, then clicking the\ntrash can icon or pressing the 'Delete' key.\n",
+            "relations": "# Relations\n\nA relation is a special type of feature in OpenStreetMap that groups together\nother features. For example, two common types of relations are *route relations*,\nwhich group together sections of road that belong to a specific freeway or\nhighway, and *multipolygons*, which group together several lines that define\na complex area (one with several pieces or holes in it like a donut).\n\nThe group of features in a relation are called *members*. In the sidebar, you can\nsee which relations a feature is a member of, and click on a relation there\nto select the it. When the relation is selected, you can see all of its\nmembers listed in the sidebar and highlighted on the map.\n\nFor the most part, iD will take care of maintaining relations automatically\nwhile you edit. The main thing you should be aware of is that if you delete a\nsection of road to redraw it more accurately, you should make sure that the\nnew section is a member of the same relations as the original.\n\n## Editing Relations\n\nIf you want to edit relations, here are the basics.\n\nTo add a feature to a relation, select the feature, click the \"+\" button in the\n\"All relations\" section of the sidebar, and select or type the name of the relation.\n\nTo create a new relation, select the first feature that should be a member,\nclick the \"+\" button in the \"All relations\" section, and select \"New relation...\".\n\nTo remove a feature from a relation, select the feature and click the trash\nbutton next to the relation you want to remove it from.\n\nYou can create multipolygons with holes using the \"Merge\" tool. Draw two areas (inner\nand outer), hold the Shift key and click on each of them to select them both, and then\nclick the \"Merge\" (+) button.\n"
         },
         "intro": {
             "navigation": {
@@ -49663,6 +49744,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "surface": {
                     "label": "Surface"
                 },
+                "toilets/disposal": {
+                    "label": "Disposal"
+                },
                 "tourism": {
                     "label": "Type"
                 },
@@ -49887,6 +49971,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Pub",
                     "terms": ""
                 },
+                "amenity/ranger_station": {
+                    "name": "Ranger Station",
+                    "terms": "visitor center,permit center,backcountry office"
+                },
                 "amenity/restaurant": {
                     "name": "Restaurant",
                     "terms": "bar,cafeteria,café,canteen,chophouse,coffee shop,diner,dining room,dive*,doughtnut shop,drive-in,eatery,eating house,eating place,fast-food place,greasy spoon,grill,hamburger stand,hashery,hideaway,hotdog stand,inn,joint*,luncheonette,lunchroom,night club,outlet*,pizzeria,saloon,soda fountain,watering hole"
@@ -49913,7 +50001,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "amenity/toilets": {
                     "name": "Toilets",
-                    "terms": "bathroom,restroom"
+                    "terms": "bathroom,restroom,outhouse,privy,head,lavatory,latrine,water closet,WC,W.C."
                 },
                 "amenity/townhall": {
                     "name": "Town Hall",
@@ -50833,7 +50921,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "tourism/artwork": {
                     "name": "Artwork",
-                    "terms": ""
+                    "terms": "mural,sculpture,statue"
                 },
                 "tourism/attraction": {
                     "name": "Tourist Attraction",

diff --git a/vendor/assets/iD/iD/img/sprite.svg b/vendor/assets/iD/iD/img/sprite.svg
index 771354c8b5d500daacfd9e644418d216ebc0ef06..760579c351c50b827901fc722df0e762e6e00aed 100644 (file)
--- a/vendor/assets/iD/iD/img/sprite.svg
+++ b/vendor/assets/iD/iD/img/sprite.svg
@@ -10,10 +10,10 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
-   width="700"
+   width="800"
    height="560"
    id="svg12393"
-   inkscape:version="0.48.2 r9819"
+   inkscape:version="0.48.4 r9939"
    sodipodi:docname="sprite.svg">
   <sodipodi:namedview
      pagecolor="#ffffff"
@@ -27,18 +27,24 @@
      inkscape:window-width="1920"
      inkscape:window-height="1032"
      id="namedview392"
-     showgrid="false"
-     inkscape:zoom="4"
-     inkscape:cx="102.22866"
-     inkscape:cy="524.0189"
+     showgrid="true"
+     inkscape:zoom="1.4142136"
+     inkscape:cx="239.3439"
+     inkscape:cy="322.32003"
      inkscape:window-x="0"
      inkscape:window-y="0"
      inkscape:window-maximized="0"
      inkscape:current-layer="layer12"
-     showguides="true">
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="false">
     <inkscape:grid
        type="xygrid"
-       id="grid6326" />
+       id="grid6326"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
   </sodipodi:namedview>
   <defs
      id="defs12395">
@@ -47,7 +53,8 @@
       <path
          d="m -130.5,657.36216 c 3.04349,0 5.5,2.45651 5.5,5.5 0,3.04349 -2.45651,5.5 -5.5,5.5 -3.04349,0 -5.5,-2.45651 -5.5,-5.5 0,-3.04349 2.45651,-5.5 5.5,-5.5 z"
          id="path9143-8"
-         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:#ff00ff;fill-opacity:1;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+         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:#ff00ff;fill-opacity:1;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+         inkscape:connector-curvature="0" />
     </clipPath>
   </defs>
   <metadata
@@ -58,19 +65,20 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
      transform="translate(-25,3.0624999e-6)"
      id="layer12"
-     style="display:inline;opacity:1">
+     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.99999905000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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"
@@ -96,7 +104,7 @@
     <g
        transform="translate(-321,-62.36218)"
        id="g16215"
-       style="opacity:0.25000000000000000;fill:#000000;fill-opacity:1;display:inline" />
+       style="opacity:0.25;fill:#000000;fill-opacity:1;display:inline" />
     <g
        transform="matrix(-0.70710678,0.70710679,0.70710679,0.70710678,877.1436,-601.56033)"
        id="g16306-5"
@@ -131,7 +139,8 @@
          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="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" />
+         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
          clip-path="url(#clipPath9141-6)"
          id="g9595"
@@ -150,28 +159,34 @@
              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.20000000000000001;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" />
+             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.10000000000000001;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" />
+             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.40000000000000002;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" />
+             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.59999999999999998;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" />
+             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.10000000000000001;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" />
+             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.10000000000000001;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" />
+             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>
       </g>
     </g>
@@ -179,39 +194,44 @@
        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"
-       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" />
+       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 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" />
+       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 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.50000000000000000;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="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" />
     <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" />
+       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" />
     <g
        transform="translate(-511.00001,-44)"
        id="g44379"
-       style="opacity:0.50000000000000000;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="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">
       <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.55555558000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
+         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">
         <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.55555558000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+           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" />
       </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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         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
        transform="translate(-656,73.637817)"
@@ -221,29 +241,34 @@
          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" />
+         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" />
     </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" />
+       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" />
+       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" />
+       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
        transform="translate(505,-613.36218)"
        id="g9693"
-       style="opacity:0.50000000000000000;fill:#000000;fill-opacity:1;display:inline">
+       style="opacity:0.5;fill:#000000;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="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" />
+         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"
@@ -262,62 +287,73 @@
              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.20000000000000001;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="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.10000000000000001;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="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.40000000000000002;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="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.59999999999999998;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="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.10000000000000001;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="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.10000000000000001;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="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>
     </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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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
        transform="translate(-656,113.63782)"
        id="g47761"
-       style="opacity:0.50000000000000000;fill:#000000;fill-opacity:1;display:inline">
+       style="opacity:0.5;fill:#000000;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="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" />
+         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" />
     </g>
     <g
        transform="translate(-635,113.63782)"
        id="g47765"
-       style="opacity:0.50000000000000000;fill:#000000;fill-opacity:1;display:inline">
+       style="opacity:0.5;fill:#000000;fill-opacity:1;display:inline">
       <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" />
+         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" />
     </g>
     <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.50000000000000000;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" />
+       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" />
     <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.50000000000000000;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="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" />
     <g
        transform="translate(505,-633.36218)"
        id="g33295"
@@ -326,7 +362,8 @@
          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" />
+         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
          clip-path="url(#clipPath9141-6)"
          id="g33299"
@@ -345,206 +382,254 @@
              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.20000000000000001;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" />
+             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.10000000000000001;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" />
+             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.40000000000000002;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" />
+             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.59999999999999998;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" />
+             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.10000000000000001;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" />
+             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.10000000000000001;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" />
+             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>
       </g>
     </g>
     <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.55555558000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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" />
+       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 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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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" />
     <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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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" />
     <path
        d="m 191,144 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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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" />
     <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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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" />
     <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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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" />
     <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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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" />
     <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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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" />
     <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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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" />
     <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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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" />
     <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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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" />
     <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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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" />
     <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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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 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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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 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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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 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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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" />
     <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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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 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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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" />
     <path
        d="m 191,152 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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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" />
     <path
        d="m 199,152 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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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" />
     <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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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" />
     <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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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" />
     <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.50000124999999995;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+       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" />
     <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" />
+       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" />
+       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" />
+       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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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" />
+       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" />
+       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" />
+       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" />
+       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" />
+       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" />
+       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" />
+       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" />
+       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" />
+       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" />
+       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" />
+       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" />
+       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" />
+       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" />
+       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"
@@ -553,7 +638,7 @@
        x="28.5"
        y="83.499992"
        id="rect19454"
-       style="color:#000000;fill:#e06d5f;fill-opacity:0.15686275000000000;stroke:#e06d5f;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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"
@@ -562,7 +647,7 @@
        x="88.5"
        y="83.499992"
        id="rect20224"
-       style="color:#000000;fill:#77d3de;fill-opacity:0.19215686000000001;stroke:#77d3de;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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"
@@ -571,7 +656,7 @@
        x="148.5"
        y="83.499992"
        id="rect20237"
-       style="color:#000000;fill:#8cd05f;fill-opacity:0.15686275000000000;stroke:#8cd05f;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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"
@@ -580,7 +665,7 @@
        x="208.5"
        y="83.499992"
        id="rect20239"
-       style="color:#000000;fill:#aaaaaa;fill-opacity:0.15686275000000000;stroke:#aaaaaa;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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">
@@ -591,12 +676,14 @@
            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.20000000000000001;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="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" />
+           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
@@ -609,12 +696,14 @@
            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.20000000000000001;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="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" />
+           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
@@ -627,12 +716,14 @@
            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.20000000000000001;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="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" />
+           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
@@ -645,12 +736,14 @@
            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.20000000000000001;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="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" />
+           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
@@ -663,12 +756,14 @@
            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.20000000000000001;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="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" />
+           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
@@ -681,12 +776,14 @@
            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.20000000000000001;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="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" />
+           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
@@ -699,12 +796,14 @@
            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.20000000000000001;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="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" />
+           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
@@ -717,12 +816,14 @@
            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.20000000000000001;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="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" />
+           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
@@ -735,12 +836,14 @@
            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.20000000000000001;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="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" />
+           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
@@ -753,12 +856,14 @@
            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.20000000000000001;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="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" />
+           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
@@ -771,12 +876,14 @@
            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.20000000000000001;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="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" />
+           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
@@ -789,12 +896,14 @@
            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.20000000000000001;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="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" />
+           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
@@ -807,12 +916,14 @@
            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.20000000000000001;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="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" />
+           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
@@ -825,12 +936,14 @@
            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.20000000000000001;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="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" />
+           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
@@ -843,12 +956,14 @@
            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.20000000000000001;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="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" />
+           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
@@ -861,18 +976,21 @@
            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.20000000000000001;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="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" />
+           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" />
+       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"
@@ -881,7 +999,7 @@
        x="268.5"
        y="83.499992"
        id="rect7068"
-       style="opacity:0.14999999999999999;color:#000000;fill:#000000;fill-opacity:0.15686275000000000;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" />
+       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">
@@ -892,12 +1010,14 @@
            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.20000000000000001;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="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" />
+           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
@@ -910,12 +1030,14 @@
            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.20000000000000001;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="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" />
+           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
@@ -928,12 +1050,14 @@
            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.20000000000000001;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="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" />
+           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
@@ -946,12 +1070,14 @@
            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.20000000000000001;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="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" />
+           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
@@ -971,11 +1097,12 @@
            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" />
+           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="translate(-810.00001,-19.000003)"
+       transform="matrix(0.5,0,0,0.5,-317.5001,125.49999)"
        id="g8629">
       <rect
          width="100.00001"
@@ -983,11 +1110,12 @@
          x="935"
          y="238.99998"
          id="rect8627"
-         style="opacity:0.14999999999999999;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         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" />
+         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)"
@@ -997,7 +1125,8 @@
          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" />
+         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)"
@@ -1006,7 +1135,8 @@
          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" />
+         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)"
@@ -1021,15 +1151,16 @@
        x="225"
        y="220"
        id="rect6623-9"
-       style="opacity:0.14999999999999999;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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(475,-25.000003)"
+       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" />
+         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"
@@ -1037,19 +1168,22 @@
        x="325"
        y="220"
        id="rect6623-9-2"
-       style="opacity:0.14999999999999999;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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 492.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 493,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"
+       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" />
+       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 508.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 481.96849,294.13591 481.25557,294 480.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 507.03151,280.86409 507.74443,281 508.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"
+       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" />
+       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 441.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 461.65625,255 448.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"
+       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" />
+       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
@@ -1073,37 +1207,40 @@
        x="425"
        y="220"
        id="rect6623-9-2-3"
-       style="opacity:0.14999999999999999;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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.14999999999999999;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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.14999999999999999;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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(195,5)"
+       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" />
+         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" />
+         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 575,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 595.3012,253.17882 600,260.99881 600,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"
+       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.66666507999999958;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+       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"
@@ -1114,43 +1251,53 @@
     <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" />
+       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.05500000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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" />
+       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" />
+       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" />
+       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" />
+       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" />
+       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" />
+       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" />
+       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" />
+       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">
@@ -1168,7 +1315,8 @@
         <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" />
+           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"
@@ -1213,22 +1361,26 @@
            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" />
+           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" />
+           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" />
+           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" />
+           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)"
@@ -1237,7 +1389,8 @@
         <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" />
+           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"
@@ -1253,22 +1406,26 @@
              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" />
+             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" />
+             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" />
+             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" />
+             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>
@@ -1283,39 +1440,47 @@
        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" />
+       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" />
+       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" />
+       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" />
+       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" />
+         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" />
+         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" />
+       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" />
+       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"
@@ -1327,15 +1492,18 @@
     <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" />
+       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" />
+       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" />
+       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">
@@ -1349,129 +1517,158 @@
       <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" />
+         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.50000000000000000;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" />
+         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.50000000000000000;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" />
+         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.50000000000000000;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" />
+         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.50000000000000000;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" />
+         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" />
+         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" />
+         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" />
+         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" />
+         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" />
+       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" />
+       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.25000000000000000;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" />
+       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.25000000000000000;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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.25000000000000000;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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.25000000000000000;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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.25000000000000000;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" />
+       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.25000000000000000;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.50000124999999995;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+       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.25000000000000000;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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.25000000000000000;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" />
+       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.25000000000000000;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" />
+       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.25000000000000000;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" />
+       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.25000000000000000;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" />
+       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 191,164 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 0,8 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 8,0 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"
-       style="opacity:0.25000000000000000;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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 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.25000000000000000;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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.25000000000000000;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" />
+       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.25000000000000000;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" />
+       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" />
+       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" />
+       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" />
+       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"
@@ -1480,20 +1677,24 @@
          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" />
+         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" />
+       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" />
+       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 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"
-       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" />
+       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="2"
        height="2"
@@ -1501,14 +1702,14 @@
        y="153"
        transform="translate(25,-3.0624999e-6)"
        id="rect4769"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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="190"
        y="149"
        id="rect4769-6"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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"
@@ -1516,110 +1717,130 @@
        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.99999905000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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.99999905000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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 190,169 2,0 c 0,0.66667 0,1.33333 0,2 l -2,0 z"
        id="path4863"
-       style="opacity:0.25000000000000000;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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 194,173 2,0 c 0,0.66667 0,1.33333 0,2 l -2,0 z"
        id="path4863-8"
-       style="opacity:0.25000000000000000;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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.50000000000000000;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" />
+       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.50000000000000000;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" />
+       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.25000000000000000;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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"
        transform="translate(25,-3.0624999e-6)"
        id="path5237"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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 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.25000000000000000;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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 215,230 c -2.77,0 -5,2.23 -5,5 l 0,75 c 0,2.77 2.23,5 5,5 l 40,0 0.21875,-40 -10.21875,0 0,-10 10,0 0,-3 c 0,-3.65643 0.3507,-6.22294 1,-8 0.88848,-2.39203 2.77875,-4.53049 5,-6 2.2554,-1.50353 4.96758,-2.99992 9,-3 5,0 8.38939,1.74483 10.91952,4.06295 l -3.27206,7.27177 C 275.73375,255.99306 272.70862,255.00007 271,255 c -2.8022,7e-5 -3.57892,0.032 -4.74078,1.22797 C 265.09733,257.42409 265,257.71947 265,261 l 0,4 13,0 0,10 -13,0 0,40 20,0 c 2.77,0 5,-2.23 5,-5 l 0,-75 c 0,-2.77 -2.23,-5 -5,-5 z"
-       transform="translate(25,-3.0624999e-6)"
+       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" />
+       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.14999999999999999;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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.49651146000000068px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:120.00000476999998966%;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.99999994000000003;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Avenir;-inkscape-font-specification:Avenir" />
+       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" />
     <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.71258354000000068px;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" />
+       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" />
     <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.71258354000000068px;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.50000000000000000;color:#000000;fill:#000000;fill-rule:nonzero;enable-background:accumulate;font-family:Helvetica Neue" />
+       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" />
     <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.71258354000000068px;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" />
+       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" />
     <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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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 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.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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" />
     <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.50000000000000000;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       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" />
     <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" />
+       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" />
     <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" />
+       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">
@@ -1627,15 +1848,18 @@
          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" />
+         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.50000000000000000;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" />
+         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.50000000000000000;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" />
+         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)"
@@ -1643,11 +1867,13 @@
       <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" />
+         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.50000000000000000;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" />
+         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)"
@@ -1655,31 +1881,38 @@
       <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" />
+         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.50000000000000000;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" />
+         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.50000000000000000;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" />
+         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.50000000000000000;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" />
+         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.50000000000000000;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" />
+         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.50000000000000000;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" />
+         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.50000000000000000;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" />
+         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)"
@@ -1689,15 +1922,18 @@
          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" />
+         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.50000000000000000;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" />
+         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.50000000000000000;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" />
+         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)"
@@ -1706,11 +1942,13 @@
       <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" />
+         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.50000000000000000;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" />
+         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)"
@@ -1719,98 +1957,117 @@
       <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" />
+         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.50000000000000000;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" />
+         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.50000000000000000;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" />
+         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.50000000000000000;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" />
+         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.50000000000000000;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" />
+         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.50000000000000000;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" />
+         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.50000000000000000;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" />
+         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.50000000000000000">
+       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" />
+         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.50000000000000000;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" />
+         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.50000000000000000;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" />
+         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.50000000000000000">
+       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" />
+         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.50000000000000000;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" />
+         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.50000000000000000">
+       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" />
+         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.50000000000000000;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" />
+         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.50000000000000000;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" />
+         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.50000000000000000;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" />
+         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.50000000000000000;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" />
+         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.50000000000000000;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" />
+         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.50000000000000000;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" />
+         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>
     <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       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" />
@@ -1833,5 +2090,13 @@
        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" />
+    <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>
 </svg>

diff --git a/vendor/assets/iD/iD/locales/ast.json b/vendor/assets/iD/iD/locales/ast.json
index 0a242678227d38a116a8aa55c5ed93cb652caf90..05fbe0f98c95856b72625ca65f65e340f16d435b 100644 (file)
--- a/vendor/assets/iD/iD/locales/ast.json
+++ b/vendor/assets/iD/iD/locales/ast.json
@@ -184,8 +184,7 @@
         "edited_osm": "¡Editáu OSM!",
         "just_edited": "¡Acaba d'editar OpenStreetMap!",
         "view_on_osm": "Ver en OSM",
-        "facebook": "Compartir en Facebook",
-        "tweet": "Tuitear"
+        "facebook": "Compartir en Facebook"
     },
     "confirm": {
         "okay": "Aceutar"

diff --git a/vendor/assets/iD/iD/locales/bg-BG.json b/vendor/assets/iD/iD/locales/bg-BG.json
index 58f21b20a26c092f2c909e5d74f7026b1fdf46b1..d9d8601867849ddb4ce20f23caacffb82c71f2f1 100644 (file)
--- a/vendor/assets/iD/iD/locales/bg-BG.json
+++ b/vendor/assets/iD/iD/locales/bg-BG.json
@@ -252,8 +252,7 @@
         "edited_osm": "Редактирахте OSM!",
         "just_edited": "Вие редактирахте OpenStreetMap!",
         "view_on_osm": "Вижте в OSM",
-        "facebook": "Споделете във Facebook",
-        "tweet": "Tweet"
+        "facebook": "Споделете във Facebook"
     },
     "confirm": {
         "okay": "Окей"

diff --git a/vendor/assets/iD/iD/locales/bs.json b/vendor/assets/iD/iD/locales/bs.json
index ce94246dfcd3a9055f88c9879a3a373382fd7bab..9b4374c06b61dad5d4ec51bb78c40757e66a4f90 100644 (file)
--- a/vendor/assets/iD/iD/locales/bs.json
+++ b/vendor/assets/iD/iD/locales/bs.json
@@ -167,9 +167,11 @@
         }
     },
     "undo": {
+        "tooltip": "Poništiti: {action}",
         "nothing": "Ništa za poništiti."
     },
     "redo": {
+        "tooltip": "Obnoviti: {action}",
         "nothing": "Ništa za vratiti."
     },
     "tooltip_keyhint": "Prečica:",
@@ -261,7 +263,7 @@
         "just_edited": "Upravo ste uredili OpenStreetMap kartu!",
         "view_on_osm": "Pogledajte na OSM-u",
         "facebook": "Podijeliti na Facebooku",
-        "tweet": "Podijeliti na Twitteru"
+        "help_html": "Vaše promjene bi se trebale pojaviti u \"standardnom\" sloju za nekoliko minuta. Drugi slojevi, i određene značajke, mogu uzeti više vremena\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map'>details</a>).\n"
     },
     "confirm": {
         "okay": "Uredu"
@@ -517,9 +519,21 @@
             "fee": {
                 "label": "Provizija"
             },
+            "fire_hydrant/type": {
+                "label": "Vrsta"
+            },
             "fixme": {
                 "label": "Popravi me"
             },
+            "generator/method": {
+                "label": "Način"
+            },
+            "generator/source": {
+                "label": "Izvor"
+            },
+            "generator/type": {
+                "label": "Vrsta"
+            },
             "highway": {
                 "label": "Vrsta"
             },
@@ -678,6 +692,9 @@
             "surface": {
                 "label": "Površina"
             },
+            "toilets/disposal": {
+                "label": "Način odlaganja otpada iz toaleta"
+            },
             "tourism": {
                 "label": "Vrsta"
             },
@@ -1058,6 +1075,10 @@
                 "name": "Stanica hitne pomoći",
                 "terms": "stanica hitne pomoći,hitna pomoć,hitna medicinska pomoć"
             },
+            "emergency/fire_hydrant": {
+                "name": "Hidrant za požar",
+                "terms": "hidrant,hidrant za požar"
+            },
             "emergency/phone": {
                 "name": "Telefon za hitne slučajeve",
                 "terms": "telefon za hitne slučajeve,hitna telefonska linija"
@@ -1374,6 +1395,10 @@
                 "name": "Bazen",
                 "terms": "bazen,bazen za plivanje,plivački bazen"
             },
+            "leisure/track": {
+                "name": "Staza za utrku",
+                "terms": "staza za utrku,trkaća staza"
+            },
             "line": {
                 "name": "Linija",
                 "terms": "linija"
@@ -1542,6 +1567,10 @@
                 "name": "Energija",
                 "terms": "enegija,napajanje"
             },
+            "power/generator": {
+                "name": "Generator električne energije",
+                "terms": "generator el. energije,generator "
+            },
             "power/line": {
                 "name": "Energetski vod",
                 "terms": "energetski vod,naponski vod,elektroenergetska linija"

diff --git a/vendor/assets/iD/iD/locales/ca.json b/vendor/assets/iD/iD/locales/ca.json
index 79e5bfa30c3aab6e129942fe051da1c858283481..f4163bd3af17dcadea9a1c5bae414046a93e43c6 100644 (file)
--- a/vendor/assets/iD/iD/locales/ca.json
+++ b/vendor/assets/iD/iD/locales/ca.json
@@ -263,7 +263,6 @@
         "just_edited": "Acabes d'editar l'OpenStreetMap!",
         "view_on_osm": "Mostra-ho a OSM",
         "facebook": "Comparteix a Facebook",
-        "tweet": "Tuiteja-ho",
         "help_html": "Els canvis haurien d'aparèxier a la capa \"Estàndard\" en pocs minuts. Altres capes i algunes característiques, poden trigar més temps.\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map'>detalls</a>).\n"
     },
     "confirm": {
@@ -693,6 +692,9 @@
             "surface": {
                 "label": "Superfície"
             },
+            "toilets/disposal": {
+                "label": "Contenidor"
+            },
             "tourism": {
                 "label": "Tipus"
             },

diff --git a/vendor/assets/iD/iD/locales/cs.json b/vendor/assets/iD/iD/locales/cs.json
index 5a34449416aaba71e6f85f1a16e0d95b869962d5..b3eef9af7fa58b95e44c1766c28492cf8f10bfc6 100644 (file)
--- a/vendor/assets/iD/iD/locales/cs.json
+++ b/vendor/assets/iD/iD/locales/cs.json
@@ -263,7 +263,6 @@
         "just_edited": "Právě jste upravil OpenStreetMap!",
         "view_on_osm": "Zobrazit na OSM",
         "facebook": "Sdílet na Facebooku",
-        "tweet": "Tweet",
         "help_html": "Vaše úpravy by se obvykle měly objevit na \"Standardní\" vrstvě během několika minut. U některých objektů a ostatních vrstev to může trvat déle⏎\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map'>detaily anglicky</a>).⏎\n"
     },
     "confirm": {
@@ -810,32 +809,40 @@
                 "terms": "kino,film,cinema,multikino,bio,biograf,kinematograf"
             },
             "amenity/college": {
-                "name": "College"
+                "name": "College",
+                "terms": "Vysoká škola,univerzita,akademie"
             },
             "amenity/courthouse": {
-                "name": "Soud"
+                "name": "Soud",
+                "terms": "soud,soudní budova,soudní dvůr"
             },
             "amenity/drinking_water": {
                 "name": "Pitná voda",
                 "terms": "pítko,fontána,fontánka"
             },
             "amenity/embassy": {
-                "name": "Velvyslanectví"
+                "name": "Velvyslanectví",
+                "terms": "velvyslanectví,vyslanectví,ambasáda,zastupitelství"
             },
             "amenity/fast_food": {
-                "name": "Rychlé občerstvení"
+                "name": "Rychlé občerstvení",
+                "terms": "rychlé občerstvení"
             },
             "amenity/fire_station": {
-                "name": "Hasiči"
+                "name": "Hasiči",
+                "terms": "požární stanice,hasičská stanice"
             },
             "amenity/fountain": {
-                "name": "Fontána, vodotrysk"
+                "name": "Fontána, vodotrysk",
+                "terms": "vodotrysk,fontána,fontánka,kašna"
             },
             "amenity/fuel": {
-                "name": "Čerpací stanice"
+                "name": "Čerpací stanice",
+                "terms": "benzinová pumpa,čerpací stanice,pumpa"
             },
             "amenity/grave_yard": {
-                "name": "Pohřebiště"
+                "name": "Pohřebiště",
+                "terms": "hřbitov,pohřebiště"
             },
             "amenity/hospital": {
                 "name": "Nemocnice",
@@ -846,16 +853,20 @@
                 "terms": "jesle,školka,kindergarten,předškolní"
             },
             "amenity/library": {
-                "name": "Knihovna"
+                "name": "Knihovna",
+                "terms": "knihovna"
             },
             "amenity/marketplace": {
-                "name": "Trhoviště"
+                "name": "Trhoviště",
+                "terms": "tržiště,trh"
             },
             "amenity/parking": {
-                "name": "Parkoviště"
+                "name": "Parkoviště",
+                "terms": "parkoviště,parkování,parkovací stání"
             },
             "amenity/pharmacy": {
-                "name": "Lékárna"
+                "name": "Lékárna",
+                "terms": "lékárna,apatyka"
             },
             "amenity/place_of_worship": {
                 "name": "Chrám",
@@ -886,10 +897,12 @@
                 "terms": "schránka,poštovní schránka,schránka na dopisy"
             },
             "amenity/post_office": {
-                "name": "Pošta"
+                "name": "Pošta",
+                "terms": "pošta,poštovní úřad,hlavní pošta"
             },
             "amenity/pub": {
-                "name": "Hospoda"
+                "name": "Hospoda",
+                "terms": "hospoda,hostinec,hospůdka,pivnice,výčep,lokál"
             },
             "amenity/restaurant": {
                 "name": "Restaurace",
@@ -900,14 +913,16 @@
                 "terms": "univerzita,universita,fakulta,vysoká škola,univerzitní,universitní,katedra,ústav,college"
             },
             "amenity/swimming_pool": {
-                "name": "Plavecký bazén"
+                "name": "Plavecký bazén",
+                "terms": "koupaliště,bazén,plovárna"
             },
             "amenity/taxi": {
                 "name": "Stanoviště taxi",
                 "terms": "taxi,taxi stání,drožka"
             },
             "amenity/telephone": {
-                "name": "Telefon"
+                "name": "Telefon",
+                "terms": "telefon"
             },
             "amenity/theatre": {
                 "name": "Divadlo",
@@ -930,32 +945,40 @@
                 "terms": "popelnice,kontejner,odpadkový koš,odpadky"
             },
             "area": {
-                "name": "Plocha"
+                "name": "Plocha",
+                "terms": "území,oblast,plocha,prostor"
             },
             "barrier": {
-                "name": "Zábrana"
+                "name": "Zábrana",
+                "terms": "zábrana,ohrada,bariéra"
             },
             "barrier/block": {
-                "name": "Masivní blok"
+                "name": "Masivní blok",
+                "terms": "betonový blok,beton,zátaras,překážka"
             },
             "barrier/bollard": {
-                "name": "Sloupek"
+                "name": "Sloupek",
+                "terms": "patník,sloupek"
             },
             "barrier/cattle_grid": {
-                "name": "Přejezdový rošt"
+                "name": "Přejezdový rošt",
+                "terms": "Mříž proti pohybu dobytka,mříž,příkop,krávy"
             },
             "barrier/city_wall": {
                 "name": "Hradby",
                 "terms": "hradby"
             },
             "barrier/cycle_barrier": {
-                "name": "Zábrana proti kolům"
+                "name": "Zábrana proti kolům",
+                "terms": "zábrana pro cyklisty"
             },
             "barrier/ditch": {
-                "name": "Příkop"
+                "name": "Příkop",
+                "terms": "příkop,járek,jáma,strouha,škarpa,stoka"
             },
             "barrier/entrance": {
-                "name": "Vchod"
+                "name": "Vchod",
+                "terms": "vstup,vchod,přístup,vjezd"
             },
             "barrier/fence": {
                 "name": "Plot",
@@ -966,10 +989,12 @@
                 "terms": "brána"
             },
             "barrier/hedge": {
-                "name": "Živý plot"
+                "name": "Živý plot",
+                "terms": "živý plot,keříky,křoví,okrasný plot"
             },
             "barrier/kissing_gate": {
-                "name": "Turniket"
+                "name": "Turniket",
+                "terms": "Zábrana pro dobytek,krávy"
             },
             "barrier/lift_gate": {
                 "name": "Závora",
@@ -980,41 +1005,67 @@
                 "terms": "opěrná zeď"
             },
             "barrier/stile": {
-                "name": "Schůdky přes ohradu"
+                "name": "Schůdky přes ohradu",
+                "terms": "schůdky,žebřík"
             },
             "barrier/toll_booth": {
-                "name": "Mýtná brána"
+                "name": "Mýtná brána",
+                "terms": "budka pro výběr mýta,mýtnice,výběr mýta,mýto,myto,poplatek,vstupné,kasa,pokladna"
             },
             "barrier/wall": {
                 "name": "Zeď",
                 "terms": "zděný plot, zeď"
             },
             "boundary/administrative": {
-                "name": "Administrativní hranice"
+                "name": "Administrativní hranice",
+                "terms": "administrativní hranice,stát,kraj,okres"
             },
             "building": {
                 "name": "Budova",
                 "terms": "budova"
             },
             "building/apartments": {
-                "name": "Byty"
+                "name": "Byty",
+                "terms": "bytovka,obytná budova,panelák,věžák,barák,činžák"
+            },
+            "building/commercial": {
+                "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í"
+            },
             "building/house": {
                 "name": "Dům",
                 "terms": "dům"
             },
+            "building/hut": {
+                "name": "Chata",
+                "terms": "chatka,dřevěnice"
+            },
+            "building/industrial": {
+                "name": "Průmyslová budova",
+                "terms": "průmyslová budova,industriální,výroba"
+            },
+            "building/residential": {
+                "name": "Obytná budova",
+                "terms": "obytná budova,ubytování,bývání,byt"
+            },
             "emergency/ambulance_station": {
                 "name": "Zdravotní pohotovost"
             },
             "emergency/phone": {
-                "name": "Tísňový telefon"
+                "name": "Tísňový telefon",
+                "terms": "nouzový telefon,SOS,tísňová linka"
             },
             "entrance": {
-                "name": "Vchod"
+                "name": "Vchod",
+                "terms": "vchod,východ,únikový východ,brána,dveře,vrata"
             },
             "highway": {
                 "name": "Pozemní komunikace",
@@ -1157,53 +1208,68 @@
                 "terms": "historické místo"
             },
             "historic/archaeological_site": {
-                "name": "Archeologické naleziště"
+                "name": "Archeologické naleziště",
+                "terms": "archeologické naleziště,vykopávky,archeologický průzkum"
             },
             "historic/boundary_stone": {
-                "name": "Hraniční káme"
+                "name": "Hraniční káme",
+                "terms": "hraniční kámen,hranice,značka"
             },
             "historic/castle": {
-                "name": "Hrad, zámek"
+                "name": "Hrad, zámek",
+                "terms": "hradiště,zámek,král,sídlo,ruina,zřícenina"
             },
             "historic/memorial": {
-                "name": "Památník"
+                "name": "Památník",
+                "terms": "pamětihodnost,památník,pomník,hrdina"
             },
             "historic/monument": {
-                "name": "Monument"
+                "name": "Monument",
+                "terms": "pamětihodnost,památník,pomník,hrdina"
             },
             "historic/ruins": {
-                "name": "Zřícenina, ruiny"
+                "name": "Zřícenina, ruiny",
+                "terms": "zříceniny,zřícenina"
             },
             "historic/wayside_cross": {
-                "name": "Kříž"
+                "name": "Kříž",
+                "terms": "boží muka,křesťanský,kříž při cestě,krucifix"
             },
             "historic/wayside_shrine": {
-                "name": "Boží muka"
+                "name": "Boží muka",
+                "terms": "svatostánek u cesty,svatyně,svatostánek"
             },
             "landuse": {
-                "name": "Užití krajiny"
+                "name": "Užití krajiny",
+                "terms": "využití území,využití,les,louka,hora,pole"
             },
             "landuse/allotments": {
-                "name": "Zahrádky"
+                "name": "Zahrádky",
+                "terms": "zahradkářská osada,zahrádky,zahrady,zahradkářská kolonie"
             },
             "landuse/basin": {
-                "name": "Umělá vodní plocha"
+                "name": "Umělá vodní plocha",
+                "terms": "zdrž,nádrž,voda,jezero,rybník"
             },
             "landuse/cemetery": {
                 "name": "Hřbitov",
                 "terms": "hřbitov,pohřebiště"
             },
             "landuse/commercial": {
-                "name": "Obchody"
+                "name": "Obchody",
+                "terms": "obchodní,komerční"
             },
             "landuse/construction": {
-                "name": "Výstavba"
+                "name": "Výstavba",
+                "terms": "stavba,konstrukce,výstavba"
             },
             "landuse/farm": {
-                "name": "Zemědělská půda"
+                "name": "Zemědělská půda",
+                "terms": "pole,farma,dobytek,zahrady,pěstitelská plocha"
             },
             "landuse/farmyard": {
-                "name": "Farma"
+                "name": "Farma",
+                "terms": "pole,farma,dobytek,zahrady,pěstitelská plocha"
             },
             "landuse/forest": {
                 "name": "Les",
@@ -1214,110 +1280,144 @@
                 "terms": "tráva"
             },
             "landuse/industrial": {
-                "name": "Průmysl"
+                "name": "Průmysl",
+                "terms": "průmyslové,výroba,industriální"
             },
             "landuse/meadow": {
-                "name": "Louka"
+                "name": "Louka",
+                "terms": "louka,pastviny,tráva"
             },
             "landuse/orchard": {
-                "name": "Sad"
+                "name": "Sad",
+                "terms": "sad,stromy,ovoce,ovocné stromy,ovocný sad"
             },
             "landuse/quarry": {
-                "name": "Lom"
+                "name": "Lom",
+                "terms": "kamenolom,lom,důl,skála,kameny,štěrk"
             },
             "landuse/residential": {
-                "name": "Rezidenční oblast"
+                "name": "Rezidenční oblast",
+                "terms": "obytné,domy"
             },
             "landuse/retail": {
-                "name": "Obchody"
+                "name": "Obchody",
+                "terms": "obchod,maloobchodní"
             },
             "landuse/vineyard": {
-                "name": "Vinice"
+                "name": "Vinice",
+                "terms": "vinice,vinohrad,hrozny,víno"
             },
             "leisure": {
-                "name": "Volný čas"
+                "name": "Volný čas",
+                "terms": "oddech,volno,volná chvíle,odpočinek,volný čas"
+            },
+            "leisure/dog_park": {
+                "name": "Psí park",
+                "terms": "park pro psy,psí park"
             },
             "leisure/garden": {
                 "name": "Zahrada",
                 "terms": "zahrada"
             },
             "leisure/golf_course": {
-                "name": "Golfové hřiště"
+                "name": "Golfové hřiště",
+                "terms": "golfové hřiště,golf"
             },
             "leisure/marina": {
-                "name": "Přístaviště"
+                "name": "Přístaviště",
+                "terms": "přístav,jachta,jachty,loď"
             },
             "leisure/park": {
                 "name": "Park",
                 "terms": "les,prales,louka,trávník,park,hřiště,parčík,zeleň,lesní,strom,křoví"
             },
             "leisure/pitch": {
-                "name": "Hřiště"
+                "name": "Hřiště",
+                "terms": "sportovní kurt,hřiště,dvorec,kurt,stadion"
             },
             "leisure/pitch/american_football": {
-                "name": "Hřiště pro americký fotbal"
+                "name": "Hřiště pro americký fotbal",
+                "terms": "hřiště amerického fotbalu,americký fotbal"
             },
             "leisure/pitch/baseball": {
-                "name": "Baseballové hřiště"
+                "name": "Baseballové hřiště",
+                "terms": "basebalové hřiště,basebal"
             },
             "leisure/pitch/basketball": {
-                "name": "Basketbalové hřiště"
+                "name": "Basketbalové hřiště",
+                "terms": "basketbalové hřiště,basketbal"
             },
             "leisure/pitch/soccer": {
-                "name": "Fotbalové hřiště"
+                "name": "Fotbalové hřiště",
+                "terms": "fotbalové hřiště,fotbal"
             },
             "leisure/pitch/tennis": {
-                "name": "Tenisové kurty"
+                "name": "Tenisové kurty",
+                "terms": "tenisové hřiště,tenis,kurt,dvorec"
             },
             "leisure/pitch/volleyball": {
-                "name": "Volejbalové hřiště"
+                "name": "Volejbalové hřiště",
+                "terms": "volejbalové hřiště,volejbal"
             },
             "leisure/playground": {
                 "name": "Dětské hřiště",
                 "terms": "hřiště,dětské hřiště,prolézačky,prolézačka,pískoviště,houpačky,houpačka,skluzavky,skluzavka"
             },
             "leisure/slipway": {
-                "name": "Vodní skluz"
+                "name": "Vodní skluz",
+                "terms": "spouštění lodi,dok,loděnice,skluz v loděnici,skluzavka"
             },
             "leisure/stadium": {
-                "name": "Stadion"
+                "name": "Stadion",
+                "terms": "stadion,fotbal,fotbalový stadión,hřiště"
             },
             "leisure/swimming_pool": {
-                "name": "Plavecký bazén"
+                "name": "Plavecký bazén",
+                "terms": "plovárna,koupaliště"
             },
             "line": {
-                "name": "Cesta"
+                "name": "Cesta",
+                "terms": "čára,cesta,trať,kanál,trasa"
             },
             "man_made": {
-                "name": "Umělý objekt"
+                "name": "Umělý objekt",
+                "terms": "lidský výtvor,artefakt,konstrukce,dílo,stavba,objekt,mechanizmus"
             },
             "man_made/breakwater": {
-                "name": "Vlnolam"
+                "name": "Vlnolam",
+                "terms": "pobřežní hráz,násep,kameny,molo,zábrana"
             },
             "man_made/cutline": {
-                "name": "Průsek"
+                "name": "Průsek",
+                "terms": "lesní průsek,holina"
             },
             "man_made/lighthouse": {
-                "name": "Maják"
+                "name": "Maják",
+                "terms": "maják,světlo"
             },
             "man_made/pier": {
-                "name": "Molo"
+                "name": "Molo",
+                "terms": "molo,sloupy,pilíř,vlnolam,hráz,kotva,kotvení,ukotvení,lodě,promenáda,lávka,promenáda a přístaviště,přístavní hráz"
             },
             "man_made/pipeline": {
-                "name": "Dálkové potrubí"
+                "name": "Dálkové potrubí",
+                "terms": "rouura,roury,transport,vodovod,ropovod,plynovod,kanál,rozvod"
             },
             "man_made/survey_point": {
-                "name": "Triangulační bod"
+                "name": "Triangulační bod",
+                "terms": "triangulační bod,nivelizační bod,nivelace,referenční bod"
             },
             "man_made/tower": {
-                "name": "Věž"
+                "name": "Věž",
+                "terms": "věž,sloup,stožár,bašta,pevnost,hrad"
             },
             "man_made/wastewater_plant": {
                 "name": "Čistička odpadních vod",
                 "terms": "čistírna,čistička,čistírna odpadních vod,ČOV,čovka"
             },
             "man_made/water_tower": {
-                "name": "Vodárenská věž"
+                "name": "Vodárenská věž",
+                "terms": "vodojem,věž s vodojemem,věž,vodárenská věž"
             },
             "man_made/water_well": {
                 "name": "Studna"
@@ -1431,7 +1531,8 @@
                 "name": "Transformátorová stanice"
             },
             "power/tower": {
-                "name": "Elektrický stožár"
+                "name": "Elektrický stožár",
+                "terms": "sloup vysokého napětí,vysoké napětí"
             },
             "power/transformer": {
                 "name": "Transformátor"

diff --git a/vendor/assets/iD/iD/locales/da.json b/vendor/assets/iD/iD/locales/da.json
index c4ab891681b2605b5b91ca3fccdaaf63e52be0f7..bdbb7187a29a8b09bef7e3af486d5f0202da28f9 100644 (file)
--- a/vendor/assets/iD/iD/locales/da.json
+++ b/vendor/assets/iD/iD/locales/da.json
@@ -241,6 +241,8 @@
         "title": "Baggrund",
         "description": "Baggrundsindstillinger",
         "percent_brightness": "{opacity}% lysstyrke",
+        "custom": "Brugerdefineret",
+        "custom_prompt": "Angiv en tile skabelon. Valide værdier er {z}, {x}, {y} for Z/X/Y skemaer og {u} for quadtile skema. ",
         "fix_misalignment": "Ret fejljustering",
         "reset": "nulstil"
     },
@@ -263,7 +265,8 @@
         "just_edited": "Du har lige redigeret OpenStreetMap!",
         "view_on_osm": "Vis på OSM",
         "facebook": "Del på Facebook",
-        "tweet": "Tweet",
+        "twitter": "Del på Twitter",
+        "google": "Del på Google+",
         "help_html": "Dine ændringer skulle blive synlige om nogle få minutter i \"Standard\" laget. Andre lag og specielle objekter kan tage længere tid\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map'>mere information</a>).\n"
     },
     "confirm": {
@@ -693,6 +696,9 @@
             "surface": {
                 "label": "Overflade"
             },
+            "toilets/disposal": {
+                "label": "Bortskaffelse affald"
+            },
             "tourism": {
                 "label": "Type"
             },

diff --git a/vendor/assets/iD/iD/locales/de.json b/vendor/assets/iD/iD/locales/de.json
index e739923186fa14135459f196038ddadbafda325d..58146f04118682391300dbecf31d9e3d5a33f3f3 100644 (file)
--- a/vendor/assets/iD/iD/locales/de.json
+++ b/vendor/assets/iD/iD/locales/de.json
@@ -167,9 +167,11 @@
         }
     },
     "undo": {
+        "tooltip": "Rückgängig: {action}",
         "nothing": "Nichts zum Rückgängigmachen."
     },
     "redo": {
+        "tooltip": "Wiederherstellen: {action}",
         "nothing": "Nichts zum Wiederherstellen."
     },
     "tooltip_keyhint": "Tastenkürzel:",
@@ -215,7 +217,7 @@
         "title": "Zeige meine Position"
     },
     "inspector": {
-        "no_documentation_combination": "Für dieses Attribut ist keine Dokumentation verfügbar.",
+        "no_documentation_combination": "Für dieses Attribut-Kombination ist keine Dokumentation verfügbar.",
         "no_documentation_key": "Für dieses Schlüsselwort ist keine Dokumentation verfügbar",
         "show_more": "Zeige mehr",
         "view_on_osm": "Auf openstreetmap.org ansehen",
@@ -239,6 +241,8 @@
         "title": "Hintergrund",
         "description": "Hintergrundeinstellungen",
         "percent_brightness": "{opacity}% Helligkeit",
+        "custom": "Benutzerdefiniert",
+        "custom_prompt": "Geben Sie eine Kachel-Vorlage ein. Gültige Token sind {z}, {x}, {y} für das Z/X/Y Schema und {u} für das 'quadtile'-Schema.",
         "fix_misalignment": "Fehlerhafte Ausrichtung korrigieren",
         "reset": "Zurücksetzen"
     },
@@ -261,7 +265,9 @@
         "just_edited": "Sie haben gerade OpenStreetMap editiert!",
         "view_on_osm": "auf OpenStreetMap ansehen",
         "facebook": "Auf Facebook teilen",
-        "tweet": "Twittern"
+        "twitter": "Auf Twitter teilen",
+        "google": "Auf Google+ teilen",
+        "help_html": "Deine Änderungen sollten in ein paar Minuten in der \"Standard\"-Ebene erscheinen. Auf anderen Kartenebenen und bei bestimmten Eigenschaften kann das auch länger dauern. (<a href='https://help.openstreetmap.org/questions/11179/wie-haufig-wird-die-standard-karte-auf-osmorg-aktualisiert'>Details</a>).\n"
     },
     "confirm": {
         "okay": "OK"
@@ -302,9 +308,9 @@
     "help": {
         "title": "Hilfe",
         "help": "#Hilfe\n\nDies ist ein Editor für [OpenStreetMap](http://www.openstreetmap.org/), der freien und editierbaren Weltkarte. Du kannst ihn verwenden, um Daten in deiner Umgebung hinzuzufügen oder zu verändern und so diese Karte mit freien Quellen und freien Daten für jeden verbessern.\n\nVeränderungen werden für alle Nutzer von OpenStreetMap sichtbar. Um Veränderungen vornehmen zu können, musst du ein [kostenloses OpenStreetMap Profil](https://www.openstreetmap.org/user/new) anlegen.\n\nDer [iD editor](http://ideditor.com/) ist ein Gemeinschaftsprojekt dessen [Quellcode\nauf GitHub verfügbar ist](https://github.com/systemed/iD).\n\n",
-        "editing_saving": "# Editieren & Speichern\n\nDieser Editor wurde entworfen, um online zu arbeiten und du erreichst ihn über diese Webseite.\n\n###Objekte auswählen\n\nUm ein Kartenobjekt wie eine Straße oder ein Sonderziel (POI) auszuwählen, klicke auf der Karte darauf. Dadurch wird das Objekt hervorgehoben und ein Bedienfeld mit Details und Möglichkeiten zur Veränderung aufgerufen. \n\nMehrere Objekte kannst du auswählen indem du die Shift-Taste (Umschaltaste) drückst und die Objekte einzeln anklickst oder klickst und einen Rahmen darum ziehst.\nSo können mehrere Objekte gleichzeitig geändert werden.\n\n### Speichern der Änderungen\n\nWenn du Änderungen an einer Straße, einem Gebäude oder einem Platz vorgenommen hast sind diese lokal gespeichert, bis du sie auf dem Server speicherst. Keine Sorge falls du einen Fehler machen solltest: Du kannst Änderungen jederzeit über den Rückgängig-Knopf rückgängig machen oder über den Wiederherstellen-Knopf noch einmal ausführen.\n\nKlicke auf \"Speichern\", um eine Gruppe von Änderungen zu speichern. Zum Beispiel, wenn du in einem Stadtteil fertig bist und in einer neuen Gegend editieren willst.\nDu bekommst dann die Möglichkeit noch einmal zu überprüfen, was du gerade getan hast und der Editor zeigt dir nützliche Hinweise oder mögliche Fehler, wenn etwas nicht in Ordnung zu sein scheint.\n\nWenn alles gut aussieht kannst du einen kurzen Kommentar schreiben, der erklärt, was du gemacht hast. Drücke nun \"Speichern\", um die Änderungen auf dem Server zu speichern.\nNun können es alle auf [OpenStreetMap.org](http://www.openstreetmap.org/) sehen und darauf aufbauen.\n\nWenn du es zeitlich nicht schaffst, kannst du das Editor-Fenster einfach schließen. Wenn du  die Seite wieder aufrufst (mit dem gleichen Browser und Computer) wird dir angeboten, die letzte Sitzung wiederherzustellen. \n",
-        "roads": "# Straßen\n\nMit dem Editor kannst du Wege erstellen, verändern und löschen. Wege können alles möglich sein, zum Beispiel Pfade, Straßen, Schienen, Fahrradwege und anderes.\n\n### Auswählen\n\nKlicke auf einem Weg, um ihn auszuwählen. Er sollte nun hervorgehoben werden. Außerdem erscheint ein kleines Werkzeugmenü und eine Seitenleiste mit den Eigenschaften des Weges.\n\n### Modifizieren\n\nOft sieht man, dass Wege nicht mit dem Luftbild oder einer GPS-Spur übereinstimmen. Du kannst den Weg aber so anpassen, das er an der richtigen Stelle ist. Beachte jedoch, dass Luftbilder einen Versatz aufweisen können.\n\nAls Erstes wählst du einen Weg aus. Dieser wird nun hervorgehoben und es werden die Knoten des Weges angezeigt. Diese kannst du verschieben, bis sie an der richtigen Stelle sind. Wenn du einen neuen Knoten hinzufügen möchtest, klicke doppelt zwischen bestehenden Knoten auf der Linie und es wird ein neuer Punkt erzeugt.\n\nWenn zwei Wege in Wirklichkeit mit einander verbunden sind aber auf der Karte nicht, kannst du sie verbinden, indem du einen Knoten des einen Weges auf den anderen Weg ziehst. Dass Wege verbunden sind, ist wichtig für die Karte und essentiell für die Nutzung von Routenführung.\n\nDu kannst auch das \"Bewegen\"-Werkzeug nutzen oder \"M\" drücken, um den kompletten Weg zu verschieben. Beende die Aktion mit einem Klick.\n\n### Löschen\n\nWenn du weißt, dass ein Weg nicht existiert, kannst du ihn löschen, um ihn von der Karte zu entfernen. Sei beim Löschen von Objekten besonders vorsichtig, da diese Änderungen von jedem gesehen werden können und Luftbilder oft veraltet sind. Das heißt, dass ein Weg, der im Luftbild nicht zusehen ist, vielleicht einfach neu gebaut wurde.\n\nDu kannst Wege löschen, indem du sie anklickst und das Papierkorbsymbol auswählst oder die \"Entfernen\"-Taste drückst.\n\n### Erstellen\n\nDu kennst einen Weg der nicht eingezeichnet ist? Dann klicke auf das \"Linien\"-Symbol oben links im Editor oder drücke die Taste \"2\" und beginne mit dem Zeichnen einer Linie.\n\nKlick dort hin, wo die Straße anfängt. Sollte sie von einer bereits existierenden Straße abzweigen, klicke an der entsprechenden Stelle auf diese Straße.\n\nZeichne nun den Weg, indem du Punkte anhand der Luftaufnahme oder der GPS-Spur entlang des Weges setzt. Sollte der Weg einen anderen kreuzen, klicke auf den Kreuzungspunkt, um sie zu verbinden. Wenn du mit dem Zeichnen fertig bist, klicke doppelt oder drücke \"Enter\" auf der Tastatur, um den Weg abzuschließen.\n",
-        "gps": "# GPS\n\nGPS Daten sind die vertrauenswürdigste Quelle für OpenStreetMap.\nDieser Editor unterstützt lokale GPS-Spuren - \".gpx\" Dateien auf deinem Computer. \nDu kannst diese GPS-Spuren mit Hilfe diverser Smartphone-Apps oder anderen GPS-Geräten aufnehmen.\n\nFür Informationen über das Sammeln von GPS-Daten kannst du dir folgende Anleitung durchlesen: [Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/) (bis jetzt nur auf Englisch)\n\nUm einen GPX-Track zu verwenden, ziehe ihn einfach in den Karteneditor.\nWenn er erkannt wurde, wird dieser Track als leuchtend grüne Linie auf der Karte dargestellt.\nKlicke auf \"Hintergrundeinstellungen\", um sie zu deaktivieren und zu aktivieren, oder zum Gebiet des Tracks zu gelangen (Lupe).\n\nDer GPX-Track wird nicht automatisch direkt zu OpenStreetMap hochgeladen. Am besten verwendest du ihn, um neue Wege hinzuzufügen. \nMöchtest du den GPX-Track jedem zugänglich machen, kannst du ihn über die [Track-Upload-Seite](http://www.openstreetmap.org/trace/create) hochladen.\n",
+        "editing_saving": "# Editieren & Speichern\n\nDieser Editor wurde entworfen, um online zu arbeiten und du erreichst ihn über diese Webseite.\n\n###Objekte auswählen\n\nUm ein Kartenobjekt wie eine Straße oder ein Sonderziel (POI) auszuwählen, klicke auf der Karte darauf. Dadurch wird das Objekt hervorgehoben und ein Bedienfeld mit Details und Möglichkeiten zur Veränderung aufgerufen. \n\nMehrere Objekte kannst du auswählen indem du die Shift-Taste (Umschalttaste) drückst und die Objekte einzeln anklickst oder klickst und einen Rahmen darum ziehst.\nSo können mehrere Objekte gleichzeitig geändert werden.\n\n### Speichern der Änderungen\n\nWenn du Änderungen an einer Straße, einem Gebäude oder einem Platz vorgenommen hast sind diese lokal gespeichert, bis du sie auf dem Server speicherst. Keine Sorge falls du einen Fehler machen solltest: Du kannst Änderungen jederzeit über den Rückgängig-Knopf rückgängig machen oder über den Wiederherstellen-Knopf noch einmal ausführen.\n\nKlicke auf \"Speichern\", um eine Gruppe von Änderungen zu speichern. Zum Beispiel, wenn du in einem Stadtteil fertig bist und in einer neuen Gegend editieren willst.\nDu bekommst dann die Möglichkeit noch einmal zu überprüfen, was du gerade getan hast und der Editor zeigt dir nützliche Hinweise oder mögliche Fehler, wenn etwas nicht in Ordnung zu sein scheint.\n\nWenn alles gut aussieht kannst du einen kurzen Kommentar schreiben, der erklärt, was du gemacht hast. Drücke nun \"Speichern\", um die Änderungen auf dem Server zu speichern.\nNun können es alle auf [OpenStreetMap.org](http://www.openstreetmap.org/) sehen und darauf aufbauen.\n\nWenn du es zeitlich nicht schaffst, kannst du das Editor-Fenster einfach schließen. Wenn du  die Seite wieder aufrufst (mit dem gleichen Browser und Computer) wird dir angeboten, die letzte Sitzung wiederherzustellen. \n",
+        "roads": "# Straßen\n\nMit dem Editor kannst du Wege erstellen, verändern und löschen. Wege können alles mögliche sein, zum Beispiel Pfade, Straßen, Schienen, Fahrradwege und anderes.\n\n### Auswählen\n\nKlicke auf einen Weg, um ihn auszuwählen. Er sollte nun hervorgehoben werden. Außerdem erscheint ein kleines Werkzeugmenü und eine Seitenleiste mit den Eigenschaften des Weges.\n\n### Modifizieren\n\nOft sieht man, dass Wege nicht mit dem Luftbild oder einer GPS-Spur übereinstimmen. Du kannst den Weg aber so anpassen, dass er an der richtigen Stelle ist. Beachte jedoch, dass Luftbilder einen Versatz aufweisen können.\n\nAls Erstes wählst du einen Weg aus. Dieser wird nun hervorgehoben und es werden die Knoten des Weges angezeigt. Diese kannst du verschieben, bis sie an der richtigen Stelle sind. Wenn du neue Knoten hinzufügen möchtest, klicke doppelt zwischen den Knoten auf die Linie und es wird ein neuer Punkt erzeugt.\n\nWenn zwei Wege in Wirklichkeit mit einander verbunden sind, aber auf der Karte nicht, kannst du sie verbinden, indem du einen Knoten des einen Weges auf den anderen Weg ziehst. Dass Wege verbunden sind, ist wichtig für die Karte und essentiell für die Nutzung von Routenführung.\n\nDu kannst auch das \"Bewegen\"-Werkzeug nutzen oder \"M\" drücken, um den kompletten Weg zu verschieben. Beende die Aktion mit einem Klick.\n\n### Löschen\n\nWenn du weißt, dass ein Weg nicht existiert, kannst du ihn löschen, um ihn von der Karte zu entfernen. Sei beim Löschen von Objekten besonders vorsichtig, da diese Änderungen von jedem gesehen werden können und Luftbilder oft veraltet sind. Das heißt, dass ein Weg, der im Luftbild nicht zu sehen ist, vielleicht einfach neu gebaut wurde.\n\nDu kannst Wege löschen, indem du sie anklickst und das Mülltonnensymbol auswählst oder die \"Entfernen\"-Taste drückst.\n\n### Erstellen\n\nDu kennst einen Weg der nicht eingezeichnet ist? Dann klicke auf das \"Linien\"-Symbol oben links im Editor oder drücke die Taste \"2\" und beginne mit dem Zeichnen einer Linie.\n\nKlicke dort hin, wo die Straße anfängt. Sollte sie von einer bereits existierenden Straße abzweigen, klicke an der entsprechenden Stelle auf diese Straße.\n\nZeichne nun den Weg, indem du Punkte anhand der Luftaufnahme oder der GPS-Spur entlang des Weges setzt. Sollte der Weg einen anderen kreuzen, klicke auf den  Kreuzungspunkt, um beide Wege zu verbinden. Wenn du mit dem Zeichnen fertig bist, klicke doppelt oder drücke \"Enter\" auf der Tastatur, um den Weg abzuschließen.\n",
+        "gps": "# GPS\n\nGPS-Daten sind die vertrauenswürdigste Quelle für OpenStreetMap.\nDieser Editor unterstützt lokale GPS-Spuren - \".gpx\"-Dateien auf deinem Computer. \nDu kannst diese GPS-Spuren mit Hilfe diverser Smartphone-Apps oder anderen GPS-Geräten aufnehmen.\n\nFür Informationen über das Sammeln von GPS-Daten kannst du dir folgende Anleitung durchlesen: [Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/) (zur Zeit nur auf Englisch)\n\nUm einen GPX-Track zu verwenden, ziehe ihn einfach in den Karteneditor.\nWenn er erkannt wurde, wird dieser Track als leuchtend grüne Linie auf der Karte dargestellt.\nKlicke auf \"Hintergrundeinstellungen\", um sie zu deaktivieren und zu aktivieren, oder zum Gebiet des Tracks zu gelangen (Lupe).\n\nDer GPX-Track wird nicht automatisch direkt zu OpenStreetMap hochgeladen. Am besten verwendest du ihn, um neue Wege hinzuzufügen.\n",
         "imagery": "# Bildmaterial\n\nLuftbilder sind eine wichtige Quelle für das Kartografieren. Eine Kombination aus Luftbildern von Flugzeugen, Satellitenbilder und freien Quellen sind im Editor über das \"Hintergrundeinstellungen\"- Menü auf der linken Seite verfügbar. \n\nAls Standard ist der [Bing Maps](http://www.bing.com/maps/) Satelliten-Layer ausgewählt. Je nach Gegend werden dir verschiedene andere Quellen angezeigt.\nIn einigen Länder wie den USA, Frankreich, Deutschland und Dänemark stehen zum Teil sehr hochauflösende Luftbilder zur Verfügung.\n\nLuftbilder sind manchmal durch Fehler der Luftbild-Anbieter verschoben. \nWenn du feststellst, dass viele  Straßen gegenüber dem Hintergrund verschoben sind, dann verschiebe nicht die Straßen sondern das Luftbild, bis sie übereinstimmen. Um das Luftbild zu korrigieren, klicke auf \"Fehlerhafte Ausrichtung korrigieren\" in den Hintergrundeinstellungen.\n\n",
         "addresses": "# Adressen\n\nAdressen sind eine der wichtigsten Informationen einer Karte.\n\nObwohl Adressen oft als Teil einer Straße repräsentiert werden, werden sie in OpenStreetMap  als Attribute von Gebäuden oder Objekten neben der Straße eingetragen.\n\nDu kannst Adressinformationen sowohl zu Flächen die als Gebäudegrundriss gezeichnet sind, als auch zu einzelnen Punkten hinzufügen. Adressen musst du über eine Stadtbegehung oder dein eigenes Wissen herausfinden, da die Nutzung kommerzieller Quellen wie Google Maps strikt verboten ist.\n",
         "inspector": "# Den Inspektor benutzen\n \nDer Inspektor ist das Bedienelement, das rechts im Editor erscheint, wenn du ein Objekt auswählst. Mit dem Inspektor kannst du die Details des Objektes bearbeiten.\n\n ### Eine Eigenschaft auswählen\n \nNachdem du einen Punkt, eine Linie oder eine Fläche hinzugefügt hast kannst du auswählen, welche Eigenschaft das Objekt hat - ob es eine Autobahn oder eine Wohnstraße; ein Supermarkt oder ein Café ist.\nDer Inspektor wird Knöpfe für die am häufigsten verwendeten Eigenschaften zeigen. Andere Eigenschaften findest du, indem du im Suchfeld eingibst wonach du suchst. \n \nKlicke auf den 'i'-Knopf in der Ecke rechts unten in einem Eigenschaften-Knopf, um mehr darüber zu erfahren. \n\n ### Vorlagen verwenden und Tags editieren\n \nNachdem du ein Objekt mit einer Eigenschaft versehen oder ausgewählt hast, zeigt der Inspektor Felder mit Details zu der Eigenschaft wie Name und Adresse an.\n\nUnter diesen Feldern kannst du Icons anklicken, um weitere Details hinzuzufügen wie zum Beispiel einen [Wikipedia](http://www.wikipedia.org/)-Link, Zugänglichkeit für Rollstühle und anderes.\n\nGanz unten im Inspektor kannst du auf 'Weitere Merkmale' klicken, um das Objekt mit beliebigen anderen Tags zu versehen.\n[Taginfo](http://taginfo.openstreetmap.org/) ist eine gute Quelle, um oft genutzte Kombinationen von Eigenschaften zu finden.\n\nÄnderungen die du im Inspektor vornimmst, werden automatisch auf die ausgewählten Objekte angewendet. Durch Klicken auf den 'Rückgängig'-Knopf kannst du sie rückgängig machen.\n\n ### Den Inspektor schließen\n\nDu kannst den Inspektor schließen, indem du auf den Schließen-Knopf oben rechts klickst, den 'Escape'-Knopf auf der Tastatur drückst oder in die Karte klickst.\n",
@@ -706,10 +712,12 @@
         },
         "presets": {
             "address": {
-                "name": "Adresse"
+                "name": "Adresse",
+                "terms": "Adresse"
             },
             "aeroway": {
-                "name": "Luftfahrt"
+                "name": "Luftfahrt",
+                "terms": "Flugplatz, Flughafen"
             },
             "aeroway/aerodrome": {
                 "name": "Flughafen",
@@ -720,10 +728,12 @@
                 "terms": "Ramp,Apron"
             },
             "aeroway/gate": {
-                "name": "Flugsteig"
+                "name": "Flugsteig",
+                "terms": "Flugsteig, Gate am Flughafen"
             },
             "aeroway/hangar": {
-                "name": "Hangar"
+                "name": "Hangar",
+                "terms": "Hangar, Flugzeughalle"
             },
             "aeroway/helipad": {
                 "name": "Hubschrauberlandeplatz",
@@ -734,7 +744,8 @@
                 "terms": "Start-/Landebahn,Startbahn,Landebahn"
             },
             "aeroway/taxiway": {
-                "name": "Rollweg"
+                "name": "Rollweg",
+                "terms": "Rollweg"
             },
             "aeroway/terminal": {
                 "name": "Flughafenterminal",
@@ -744,36 +755,43 @@
                 "name": "Einrichtungen"
             },
             "amenity/atm": {
-                "name": "Geldautomat"
+                "name": "Geldautomat",
+                "terms": "Geldautomat"
             },
             "amenity/bank": {
                 "name": "Bank",
                 "terms": "Kasse,Kontor,Kreditgenossenschaft,Lagerstelle,Fiskus,Fonds,Vermögen,Investmentfirma,Register,Rücklage,Vorrat,Tresor,Rücklagen,Grundkapital,Vorrat,Lager,Lagerhaus,Sparkasse,Schatz,Treuhandgesellschaft,Tresorraum"
             },
             "amenity/bar": {
-                "name": "Bar"
+                "name": "Bar",
+                "terms": "Bar"
             },
             "amenity/bench": {
-                "name": "Bank"
+                "name": "Bank",
+                "terms": "Bank, Sitzbank"
             },
             "amenity/bicycle_parking": {
-                "name": "Fahrradparkplatz"
+                "name": "Fahrradparkplatz",
+                "terms": "Fahrrad-Parkplatz, Fahrradständer"
             },
             "amenity/bicycle_rental": {
-                "name": "Fahrradverleih"
+                "name": "Fahrradverleih",
+                "terms": "Fahrrad-Verleih"
             },
             "amenity/cafe": {
                 "name": "Café",
                 "terms": "Kaffee,Tee,Kaffeehandlung"
             },
             "amenity/car_rental": {
-                "name": "Autovermietung"
+                "name": "Autovermietung",
+                "terms": "Autovermietung, Kfz-Verleih"
             },
             "amenity/car_sharing": {
                 "name": "Carsharing"
             },
             "amenity/car_wash": {
-                "name": "Autowäsche"
+                "name": "Autowäsche",
+                "terms": "Auto-Waschanlage, Waschanlage"
             },
             "amenity/childcare": {
                 "name": "Kindertagesbetreuung",
@@ -787,29 +805,36 @@
                 "name": "Hochschule"
             },
             "amenity/courthouse": {
-                "name": "Gericht"
+                "name": "Gericht",
+                "terms": "Gericht, Amtsgericht"
             },
             "amenity/drinking_water": {
                 "name": "Trinkwasserstelle",
                 "terms": "Brunnen,Trinkwasser,Trinkwasserbrunnen,Wasserhahn"
             },
             "amenity/embassy": {
-                "name": "Botschaft"
+                "name": "Botschaft",
+                "terms": "Botschaft"
             },
             "amenity/fast_food": {
-                "name": "Fast Food"
+                "name": "Fast Food",
+                "terms": "Fast Food, Imbiss"
             },
             "amenity/fire_station": {
-                "name": "Feuerwehr"
+                "name": "Feuerwehr",
+                "terms": "Feuerwehr, Feuerwehrstation"
             },
             "amenity/fountain": {
-                "name": "Brunnen"
+                "name": "Brunnen",
+                "terms": "Springbrunnen"
             },
             "amenity/fuel": {
-                "name": "Tankstelle"
+                "name": "Tankstelle",
+                "terms": "Tankstelle"
             },
             "amenity/grave_yard": {
-                "name": "Friedhof"
+                "name": "Friedhof",
+                "terms": "Friedhof"
             },
             "amenity/hospital": {
                 "name": "Krankenhaus",
@@ -820,16 +845,20 @@
                 "terms": "Kindergarten,Kindertagesstätte,Hort"
             },
             "amenity/library": {
-                "name": "Bibliothek"
+                "name": "Bibliothek",
+                "terms": "Bibliothek, Bücherei"
             },
             "amenity/marketplace": {
-                "name": "Marktplatz"
+                "name": "Marktplatz",
+                "terms": "Marktplatz"
             },
             "amenity/parking": {
-                "name": "Parkplatz"
+                "name": "Parkplatz",
+                "terms": "Parkmöglichkeit"
             },
             "amenity/pharmacy": {
-                "name": "Apotheke"
+                "name": "Apotheke",
+                "terms": "Apotheke"
             },
             "amenity/place_of_worship": {
                 "name": "Gebetsort",
@@ -852,24 +881,28 @@
                 "terms": "muslimisch,Moschee"
             },
             "amenity/police": {
-                "name": "Polizei"
+                "name": "Polizei",
+                "terms": "Polizei, Polizeistation, Polizeirevier"
             },
             "amenity/post_box": {
                 "name": "Briefkasten",
                 "terms": "Briefkasten,Postkasten,Postbriefkasten"
             },
             "amenity/post_office": {
-                "name": "Poststelle"
+                "name": "Poststelle",
+                "terms": "Post, Postamt"
             },
             "amenity/pub": {
-                "name": "Pub"
+                "name": "Pub",
+                "terms": "Kneipe, Pub"
             },
             "amenity/restaurant": {
                 "name": "Restaurant",
                 "terms": "Bar,Cafeteria,Café,Kantine,Speisehaus,Coffee-Shop,Kaffeehaus,Imbiss,Speisesaal,Kneipe,Donut Shop,Drive-In,Restaurant,Speiserestaurant,Wirtschaft,Fast-Food-Restaurant,Grill,Hamburgerstand,Hotdogstand,Gasthaus,Gasthof,Wirtshaus,Imbissstube,Imbiss,Pizzeria,Lokal"
             },
             "amenity/school": {
-                "name": "Schule"
+                "name": "Schule",
+                "terms": "Schule"
             },
             "amenity/swimming_pool": {
                 "name": "Schwimmbecken"
@@ -879,7 +912,8 @@
                 "terms": "Taxi"
             },
             "amenity/telephone": {
-                "name": "Telefon"
+                "name": "Telefon",
+                "terms": "Telefonzelle, Telefon"
             },
             "amenity/theatre": {
                 "name": "The­a­ter",
@@ -905,61 +939,74 @@
                 "name": "Fläche"
             },
             "barrier": {
-                "name": "Barrieren"
+                "name": "Barrieren",
+                "terms": "Barriere, Hindernis"
             },
             "barrier/block": {
                 "name": "Steinblock"
             },
             "barrier/bollard": {
-                "name": "Poller"
+                "name": "Poller",
+                "terms": "Poller, Pfosten"
             },
             "barrier/cattle_grid": {
                 "name": "Weiderost"
             },
             "barrier/city_wall": {
-                "name": "Stadtmauer"
+                "name": "Stadtmauer",
+                "terms": "Stadtmauer"
             },
             "barrier/cycle_barrier": {
-                "name": "Umlaufgitter"
+                "name": "Umlaufgitter",
+                "terms": "Drängelgitter, Umlaufsperre"
             },
             "barrier/ditch": {
                 "name": "Graben"
             },
             "barrier/entrance": {
-                "name": "Eingang"
+                "name": "Eingang",
+                "terms": "Graben"
             },
             "barrier/fence": {
-                "name": "Zaun"
+                "name": "Zaun",
+                "terms": "Zaun"
             },
             "barrier/gate": {
-                "name": "Tor"
+                "name": "Tor",
+                "terms": "Tor, Gatter"
             },
             "barrier/hedge": {
-                "name": "Hecke"
+                "name": "Hecke",
+                "terms": "Hecke"
             },
             "barrier/kissing_gate": {
                 "name": "Schwinggatter"
             },
             "barrier/lift_gate": {
-                "name": "Schlagbaum"
+                "name": "Schlagbaum",
+                "terms": "Schranke, Schlagbaum"
             },
             "barrier/retaining_wall": {
-                "name": "Stützmauer"
+                "name": "Stützmauer",
+                "terms": "Stützmauer"
             },
             "barrier/stile": {
                 "name": "Zaunübertritt"
             },
             "barrier/toll_booth": {
-                "name": "Mautstation"
+                "name": "Mautstation",
+                "terms": "Mautstelle"
             },
             "barrier/wall": {
-                "name": "Mauer"
+                "name": "Mauer",
+                "terms": "Mauer"
             },
             "boundary/administrative": {
                 "name": "Administrative Grenze"
             },
             "building": {
-                "name": "Gebäude"
+                "name": "Gebäude",
+                "terms": "Gebäude"
             },
             "building/apartments": {
                 "name": "Wohnungen"
@@ -972,7 +1019,8 @@
                 "name": "Eingang"
             },
             "building/garage": {
-                "name": "Garage"
+                "name": "Garage",
+                "terms": "Garage"
             },
             "building/house": {
                 "name": "Haus"
@@ -988,11 +1036,21 @@
                 "name": "Wohngebäude",
                 "terms": "Wohnhaus,Einfamilienhaus,Mehrfamilienhaus"
             },
+            "emergency/ambulance_station": {
+                "name": "Rettungswache",
+                "terms": "Rettungswache"
+            },
+            "emergency/fire_hydrant": {
+                "name": "Hydrant",
+                "terms": "Hydrant"
+            },
             "emergency/phone": {
-                "name": "Notruftelefon"
+                "name": "Notruftelefon",
+                "terms": "Notruf-Telefon, Notrufsäule, Notfallsäule"
             },
             "entrance": {
-                "name": "Eingang"
+                "name": "Eingang",
+                "terms": "Eingang"
             },
             "highway": {
                 "name": "Straße/Weg"
@@ -1002,29 +1060,36 @@
                 "terms": "Reitweg"
             },
             "highway/bus_stop": {
-                "name": "Bushaltestelle"
+                "name": "Bushaltestelle",
+                "terms": "Bushaltestelle"
             },
             "highway/crossing": {
                 "name": "Fußgängerüberweg",
                 "terms": "Zebrastreifen"
             },
             "highway/cycleway": {
-                "name": "Radweg"
+                "name": "Radweg",
+                "terms": "Radweg"
             },
             "highway/footway": {
-                "name": "Fußweg"
+                "name": "Fußweg",
+                "terms": "Fußweg"
             },
             "highway/living_street": {
-                "name": "Verkehrsberuhigter Bereich (\"Spielstraße\")"
+                "name": "Verkehrsberuhigter Bereich (\"Spielstraße\")",
+                "terms": "Verkehrsberuhigter Bereich, Wohnstraße, Spielstraße"
             },
             "highway/mini_roundabout": {
-                "name": "Mini-Kreisverkehr"
+                "name": "Mini-Kreisverkehr",
+                "terms": "Kreisverkehr mit befahrbarer Mitte, Mini-Kreisverkehr"
             },
             "highway/motorway": {
-                "name": "Autobahn"
+                "name": "Autobahn",
+                "terms": "Autobahn"
             },
             "highway/motorway_junction": {
-                "name": "Autobahnausfahrt"
+                "name": "Autobahnausfahrt",
+                "terms": "Autobahn-Anschlussstelle, Autobahn-Abfahrt"
             },
             "highway/motorway_link": {
                 "name": "Autobahnanschluss",
@@ -1034,7 +1099,8 @@
                 "name": "Pfad"
             },
             "highway/pedestrian": {
-                "name": "Fußgängerzone"
+                "name": "Fußgängerzone",
+                "terms": "Fußgängerzone"
             },
             "highway/primary": {
                 "name": "Hauptverbindungsstraße"
@@ -1060,7 +1126,8 @@
                 "name": "Erschließungsweg"
             },
             "highway/service/alley": {
-                "name": "Gasse"
+                "name": "Gasse",
+                "terms": "Gasse"
             },
             "highway/service/drive-through": {
                 "name": "Drive-in"
@@ -1069,10 +1136,12 @@
                 "name": "Zufahrtsstraße"
             },
             "highway/service/emergency_access": {
-                "name": "Zufahrtsstraße für Rettungskräfte"
+                "name": "Zufahrtsstraße für Rettungskräfte",
+                "terms": "Rettungszufahrt, Feuerwehrzufahrt"
             },
             "highway/service/parking_aisle": {
-                "name": "Parkplatzweg"
+                "name": "Parkplatzweg",
+                "terms": "Fahrweg auf Parkplatz"
             },
             "highway/steps": {
                 "name": "Treppen",
@@ -1100,7 +1169,8 @@
                 "terms": "Auffahrt"
             },
             "highway/turning_circle": {
-                "name": "Wendestelle"
+                "name": "Wendestelle",
+                "terms": "Wendekreis, Wendeplatz, Wendehammer, Wendestelle"
             },
             "highway/unclassified": {
                 "name": "Nebenstraße"
@@ -1112,43 +1182,52 @@
                 "name": "Archeologische Stätte"
             },
             "historic/boundary_stone": {
-                "name": "Grenzstein"
+                "name": "Grenzstein",
+                "terms": "Grenzstein"
             },
             "historic/castle": {
-                "name": "Burg"
+                "name": "Burg",
+                "terms": "Burg, Schloss, Festung, Kastell"
             },
             "historic/memorial": {
-                "name": "Denkmal"
+                "name": "Denkmal",
+                "terms": "Denkmal, Mahnmal"
             },
             "historic/monument": {
                 "name": "Monument"
             },
             "historic/ruins": {
-                "name": "Ruine"
+                "name": "Ruine",
+                "terms": "Ruine, Ruinen"
             },
             "historic/wayside_cross": {
-                "name": "Wegkreuz"
+                "name": "Wegkreuz",
+                "terms": "Wegkreuz"
             },
             "historic/wayside_shrine": {
-                "name": "Bildstock"
+                "name": "Bildstock",
+                "terms": "Bildstock, Betsäule, Marterl"
             },
             "landuse": {
                 "name": "Landnutzung"
             },
             "landuse/allotments": {
-                "name": "Kleigartenanlage"
+                "name": "Kleigartenanlage",
+                "terms": "Schrebergärten, Kleingärten, Kleingartenanlage"
             },
             "landuse/basin": {
                 "name": "Becken"
             },
             "landuse/cemetery": {
-                "name": "Friedhof"
+                "name": "Friedhof",
+                "terms": "Friedhof, Friedwald"
             },
             "landuse/commercial": {
                 "name": "Geschäfte"
             },
             "landuse/construction": {
-                "name": "Baustelle"
+                "name": "Baustelle",
+                "terms": "Baugebiet, Baustelle, Großbaustelle"
             },
             "landuse/farm": {
                 "name": "Bauernhof"
@@ -1157,31 +1236,39 @@
                 "name": "Bauernhof"
             },
             "landuse/forest": {
-                "name": "Wald"
+                "name": "Wald",
+                "terms": "Forst, bewirtschafteter Wald"
             },
             "landuse/grass": {
-                "name": "Gras"
+                "name": "Gras",
+                "terms": "Grünfläche, Wiese"
             },
             "landuse/industrial": {
-                "name": "Industrie"
+                "name": "Industrie",
+                "terms": "Industriegebiet, Gewerbegebiet"
             },
             "landuse/meadow": {
-                "name": "Weide"
+                "name": "Weide",
+                "terms": "Wiese, Weide"
             },
             "landuse/orchard": {
-                "name": "Obstplantage"
+                "name": "Obstplantage",
+                "terms": "Obstplantage, Streuobstwiese"
             },
             "landuse/quarry": {
-                "name": "Steinbruch"
+                "name": "Steinbruch",
+                "terms": "Steinbruch, Kiesgrube, Sandgrube, Tongrube"
             },
             "landuse/residential": {
-                "name": "Wohngebiet"
+                "name": "Wohngebiet",
+                "terms": "Wohngebiet"
             },
             "landuse/retail": {
                 "name": "Einzelhandel"
             },
             "landuse/vineyard": {
-                "name": "Weinberg"
+                "name": "Weinberg",
+                "terms": "Weinberg"
             },
             "leisure": {
                 "name": "Erholung"
@@ -1191,38 +1278,47 @@
                 "terms": "Hundefreilaufzone,Hundeauslaufzone,Hundezone,Hundeauslaufplatz"
             },
             "leisure/garden": {
-                "name": "Garten"
+                "name": "Garten",
+                "terms": "Garten"
             },
             "leisure/golf_course": {
-                "name": "Golfplatz"
+                "name": "Golfplatz",
+                "terms": "Golfplatz"
             },
             "leisure/marina": {
-                "name": "Yachthafen"
+                "name": "Yachthafen",
+                "terms": "Yachthafen, Marina"
             },
             "leisure/park": {
                 "name": "Park",
                 "terms": "Promenade,Esplanade,Gut,Wald,Garten,Gras,Grün,Außenanlagen,Rasen,Land,Wiese,Park,Platz,Spielplatz,Piazza,Lustgarten,Erholungsgebiet,Dorfanger,Dorfwiese,Waldgelände"
             },
             "leisure/pitch": {
-                "name": "Sportplatz"
+                "name": "Sportplatz",
+                "terms": "Sportplatz, Sportfeld, Spielfeld"
             },
             "leisure/pitch/american_football": {
                 "name": "American Football Feld"
             },
             "leisure/pitch/baseball": {
-                "name": "Baseballfeld"
+                "name": "Baseballfeld",
+                "terms": "Baseball-Platz, Baseball-Feld"
             },
             "leisure/pitch/basketball": {
-                "name": "Basketballfeld"
+                "name": "Basketballfeld",
+                "terms": "Basketball-Platz, Basketball-Feld"
             },
             "leisure/pitch/soccer": {
-                "name": "Fußballplatz"
+                "name": "Fußballplatz",
+                "terms": "Fußballplatz"
             },
             "leisure/pitch/tennis": {
-                "name": "Tennisplatz"
+                "name": "Tennisplatz",
+                "terms": "Tennisplatz"
             },
             "leisure/pitch/volleyball": {
-                "name": "Volleyballplatz"
+                "name": "Volleyballplatz",
+                "terms": "Volleyballplatz, Volleyballfeld"
             },
             "leisure/playground": {
                 "name": "Spielplatz",
@@ -1232,10 +1328,12 @@
                 "name": "Gleitbahn"
             },
             "leisure/stadium": {
-                "name": "Stadium"
+                "name": "Stadium",
+                "terms": "Stadion, Arena"
             },
             "leisure/swimming_pool": {
-                "name": "Schwimmbecken"
+                "name": "Schwimmbecken",
+                "terms": "Schwimmbecken"
             },
             "line": {
                 "name": "Linie"
@@ -1244,63 +1342,78 @@
                 "name": "Zivilbauten"
             },
             "man_made/breakwater": {
-                "name": "Wellenbrecher"
+                "name": "Wellenbrecher",
+                "terms": "Mole"
             },
             "man_made/cutline": {
-                "name": "Schneise"
+                "name": "Schneise",
+                "terms": "Schneise"
             },
             "man_made/lighthouse": {
-                "name": "Leuchtturm"
+                "name": "Leuchtturm",
+                "terms": "Leuchtturm"
             },
             "man_made/pier": {
-                "name": "Steg"
+                "name": "Steg",
+                "terms": "Anleger, Pier"
             },
             "man_made/pipeline": {
-                "name": "Pipeline"
+                "name": "Pipeline",
+                "terms": "Pipeline, Rohrleitung"
             },
             "man_made/survey_point": {
-                "name": "Vermessungspunkt"
+                "name": "Vermessungspunkt",
+                "terms": "Trigonometrischer Punkt, Geodätischer Festpunkt"
             },
             "man_made/tower": {
-                "name": "Turm"
+                "name": "Turm",
+                "terms": "Turm"
             },
             "man_made/wastewater_plant": {
                 "name": "Kläranlage",
                 "terms": "Kläranlage,Abwasseranlage,Abwasserreinigungsanlage,Wasseraufbereitungsanlage,Wasserrückgewinnungsanlage"
             },
             "man_made/water_tower": {
-                "name": "Wasserturm"
+                "name": "Wasserturm",
+                "terms": "Wasserturm"
             },
             "man_made/water_well": {
-                "name": "Brunnen"
+                "name": "Brunnen",
+                "terms": "Tiefbrunnen, Brunnen"
             },
             "man_made/water_works": {
-                "name": "Wasserkraftwerk"
+                "name": "Wasserkraftwerk",
+                "terms": "Wasserwerk"
             },
             "natural": {
                 "name": "Natur"
             },
             "natural/bay": {
-                "name": "Bucht"
+                "name": "Bucht",
+                "terms": "Bucht"
             },
             "natural/beach": {
-                "name": "Strand"
+                "name": "Strand",
+                "terms": "Strand"
             },
             "natural/cliff": {
-                "name": "Klippe"
+                "name": "Klippe",
+                "terms": "Klippe, Kliff"
             },
             "natural/coastline": {
                 "name": "Küstenlinie",
                 "terms": "Ufer"
             },
             "natural/glacier": {
-                "name": "Gletscher"
+                "name": "Gletscher",
+                "terms": "Gletscher"
             },
             "natural/grassland": {
                 "name": "Grasland"
             },
             "natural/heath": {
-                "name": "Heide"
+                "name": "Heide",
+                "terms": "Heide"
             },
             "natural/peak": {
                 "name": "Gipfel",
@@ -1310,13 +1423,16 @@
                 "name": "Gestrüpp"
             },
             "natural/spring": {
-                "name": "Quelle"
+                "name": "Quelle",
+                "terms": "Quelle"
             },
             "natural/tree": {
-                "name": "Baum"
+                "name": "Baum",
+                "terms": "Baum"
             },
             "natural/water": {
-                "name": "Wasser"
+                "name": "Wasser",
+                "terms": "Wasser, Wasserfläche"
             },
             "natural/water/lake": {
                 "name": "See",
@@ -1330,10 +1446,12 @@
                 "name": "Speicherbecken"
             },
             "natural/wetland": {
-                "name": "Feuchtgebiet"
+                "name": "Feuchtgebiet",
+                "terms": "Feuchtgebiet, Sumpf, Moor, Ried, Marsch, Aue, Röhricht, Watt, Salzwiese, Mangrove"
             },
             "natural/wood": {
-                "name": "Wald"
+                "name": "Wald",
+                "terms": "Urwald, Naturwald"
             },
             "office": {
                 "name": "Büro"
@@ -1361,7 +1479,8 @@
                 "name": "Kleinstadt"
             },
             "place/village": {
-                "name": "Dorf"
+                "name": "Dorf",
+                "terms": "Dorf"
             },
             "point": {
                 "name": "Punkt"
@@ -1382,38 +1501,47 @@
                 "name": "Hochspannungsmast"
             },
             "power/transformer": {
-                "name": "Transformator"
+                "name": "Transformator",
+                "terms": "Transformator"
             },
             "railway": {
-                "name": "Eisenbahn"
+                "name": "Eisenbahn",
+                "terms": "Eisenbahn"
             },
             "railway/abandoned": {
-                "name": "Stillgelegte Eisenbahnstrecke"
+                "name": "Stillgelegte Eisenbahnstrecke",
+                "terms": "stillgelegte Eisenbahn"
             },
             "railway/disused": {
-                "name": "ungenutzte Eisenbahnstrecke"
+                "name": "ungenutzte Eisenbahnstrecke",
+                "terms": "ungenutzte Eisenbahn"
             },
             "railway/level_crossing": {
                 "name": "Bahnübergang",
                 "terms": "Bahnübergang"
             },
             "railway/monorail": {
-                "name": "Einschienenbahn"
+                "name": "Einschienenbahn",
+                "terms": "Einschienenbahn"
             },
             "railway/platform": {
                 "name": "Bahnsteig"
             },
             "railway/rail": {
-                "name": "Eisenbahn"
+                "name": "Eisenbahn",
+                "terms": "Eisenbahnschienen"
             },
             "railway/station": {
-                "name": "Bahnhof"
+                "name": "Bahnhof",
+                "terms": "Bahnhof"
             },
             "railway/subway": {
-                "name": "U-Bahn"
+                "name": "U-Bahn",
+                "terms": "Untergrundbahn, U-Bahn"
             },
             "railway/subway_entrance": {
-                "name": "U-Bahn-Eingang"
+                "name": "U-Bahn-Eingang",
+                "terms": "U-Bahn-Eingang, Eingang zur U-Bahn"
             },
             "railway/tram": {
                 "name": "Straßenbahn",
@@ -1423,123 +1551,154 @@
                 "name": "Relation"
             },
             "route/ferry": {
-                "name": "Fährenroute"
+                "name": "Fährenroute",
+                "terms": "Fährlinie"
             },
             "shop": {
-                "name": "Laden"
+                "name": "Laden",
+                "terms": "Geschäft, Ladenlokal"
             },
             "shop/alcohol": {
                 "name": "Spirituosenladen",
                 "terms": "Alkohol"
             },
             "shop/bakery": {
-                "name": "Bäcker"
+                "name": "Bäcker",
+                "terms": "Bäckerei"
             },
             "shop/beauty": {
-                "name": "Kosmetikladen"
+                "name": "Kosmetikladen",
+                "terms": "Schönheits-Salon, Nagelstudio"
             },
             "shop/beverages": {
-                "name": "Getränkeladen"
+                "name": "Getränkeladen",
+                "terms": "Getränkehandlung"
             },
             "shop/bicycle": {
-                "name": "Fahrradladen"
+                "name": "Fahrradladen",
+                "terms": "Fahrradladen, Fahrrad-Geschäft, Fahrrad-Handlung"
             },
             "shop/books": {
-                "name": "Buchhandlung"
+                "name": "Buchhandlung",
+                "terms": "Buchhandlung, Buchladen"
             },
             "shop/boutique": {
-                "name": "Boutique"
+                "name": "Boutique",
+                "terms": "Boutique"
             },
             "shop/butcher": {
-                "name": "Fleischer"
+                "name": "Fleischer",
+                "terms": "Fleischer, Schlachter"
             },
             "shop/car": {
                 "name": "Autohändler"
             },
             "shop/car_parts": {
-                "name": "Autoteilehandel"
+                "name": "Autoteilehandel",
+                "terms": "Kfz-Teile-Handlung, Autoteile-Geschäft, Auto-Zubehör-Handlung"
             },
             "shop/car_repair": {
-                "name": "Autowerkstatt"
+                "name": "Autowerkstatt",
+                "terms": "Autowerkstatt, Kfz-Werkstatt, Autoreparatur"
             },
             "shop/chemist": {
-                "name": "Apotheke"
+                "name": "Apotheke",
+                "terms": "Drogerie"
             },
             "shop/clothes": {
-                "name": "Bekleidungsgeschäft"
+                "name": "Bekleidungsgeschäft",
+                "terms": "Bekleidungs-Geschäft, Klamottenladen"
             },
             "shop/computer": {
                 "name": "Computerfachhandel"
             },
             "shop/confectionery": {
-                "name": "Konditor"
+                "name": "Konditor",
+                "terms": "Süßwarenladen, Süßigkeiten-Laden"
             },
             "shop/convenience": {
                 "name": "Gemischtwarenhandel"
             },
             "shop/deli": {
-                "name": "Feinkostladen"
+                "name": "Feinkostladen",
+                "terms": "Feinkost-Geschäft, Delikatessen-Laden"
             },
             "shop/department_store": {
-                "name": "Kaufhaus"
+                "name": "Kaufhaus",
+                "terms": "Kaufhaus"
             },
             "shop/doityourself": {
-                "name": "Heimwerkerladen"
+                "name": "Heimwerkerladen",
+                "terms": "Baumarkt, Heimwerker-Markt"
             },
             "shop/dry_cleaning": {
-                "name": "Chemische Reinigung"
+                "name": "Chemische Reinigung",
+                "terms": "Chemische Reinigung"
             },
             "shop/electronics": {
-                "name": "Elektronikfachgeschäft"
+                "name": "Elektronikfachgeschäft",
+                "terms": "Elektro-Geschäft, Elektronik-Geschäft"
             },
             "shop/farm": {
                 "name": "Obst- und Gemüsestand",
                 "terms": "Hofladen"
             },
             "shop/fishmonger": {
-                "name": "Fischhändler"
+                "name": "Fischhändler",
+                "terms": "Fischgeschäft, Fischhandlung, Fischladen"
             },
             "shop/florist": {
-                "name": "Blumenhändler"
+                "name": "Blumenhändler",
+                "terms": "Florist, Blumenladen, Blumengeschäft"
             },
             "shop/furniture": {
-                "name": "Möbelhaus"
+                "name": "Möbelhaus",
+                "terms": "Möbelladen, Möbelgeschäft, Einrichtungsgeschäft"
             },
             "shop/garden_centre": {
-                "name": "Gartenzentrum"
+                "name": "Gartenzentrum",
+                "terms": "Gartenzentrum, Gartencenter"
             },
             "shop/gift": {
-                "name": "Geschenkladen"
+                "name": "Geschenkladen",
+                "terms": "Geschenkeladen, Geschenkehandlung"
             },
             "shop/greengrocer": {
-                "name": "Obst- u. Gemüsehändler"
+                "name": "Obst- u. Gemüsehändler",
+                "terms": "Obsthandlung, Gemüsehandlung, Obst- und Gemüsehandlung"
             },
             "shop/hairdresser": {
-                "name": "Friseur"
+                "name": "Friseur",
+                "terms": "Friseur, Barbier"
             },
             "shop/hardware": {
-                "name": "Eisenwarenhandel"
+                "name": "Eisenwarenhandel",
+                "terms": "Baustoffmarkt, Baustoff-Handlung"
             },
             "shop/hifi": {
                 "name": "Hifi-Laden"
             },
             "shop/jewelry": {
-                "name": "Juwelier"
+                "name": "Juwelier",
+                "terms": "Juwelier, Schmuckgeschäft"
             },
             "shop/kiosk": {
                 "name": "Kiosk"
             },
             "shop/laundry": {
-                "name": "Wäscherei"
+                "name": "Wäscherei",
+                "terms": "Wäscherei"
             },
             "shop/mall": {
-                "name": "Einkaufzentrum"
+                "name": "Einkaufzentrum",
+                "terms": "Einkaufszentrum, Mall"
             },
             "shop/mobile_phone": {
                 "name": "Handy-Laden"
             },
             "shop/motorcycle": {
-                "name": "Motorradhändler"
+                "name": "Motorradhändler",
+                "terms": "Motorrad-Handlung, Motorradladen"
             },
             "shop/music": {
                 "name": "Musikgeschäft"
@@ -1548,34 +1707,43 @@
                 "name": "Zeitschriftenladen"
             },
             "shop/optician": {
-                "name": "Optiker"
+                "name": "Optiker",
+                "terms": "Optiker"
             },
             "shop/outdoor": {
-                "name": "Outdoor-Geschäft"
+                "name": "Outdoor-Geschäft",
+                "terms": "Outdoor-Laden"
             },
             "shop/pet": {
-                "name": "Tierhandlung"
+                "name": "Tierhandlung",
+                "terms": "Tierhandlung, Zoohandlung"
             },
             "shop/shoes": {
-                "name": "Schuhgeschäft"
+                "name": "Schuhgeschäft",
+                "terms": "Schuhgeschäft"
             },
             "shop/sports": {
-                "name": "Sportgeschäft"
+                "name": "Sportgeschäft",
+                "terms": "Sporthandlung"
             },
             "shop/stationery": {
                 "name": "Schreibwarengeschäft"
             },
             "shop/supermarket": {
-                "name": "Supermarkt"
+                "name": "Supermarkt",
+                "terms": "Supermarkt"
             },
             "shop/toys": {
-                "name": "Spielwarengeschäft"
+                "name": "Spielwarengeschäft",
+                "terms": "Spielwarengeschäft, Spielzeughandlung, Spielzeugladen, Spielzeuggeschäft"
             },
             "shop/travel_agency": {
-                "name": "Reisebüro"
+                "name": "Reisebüro",
+                "terms": "Reisebüro"
             },
             "shop/tyres": {
-                "name": "Reifenhandel"
+                "name": "Reifenhandel",
+                "terms": "Reifenhandlung"
             },
             "shop/vacant": {
                 "name": "Freistehendes Geschäft"
@@ -1599,7 +1767,8 @@
                 "name": "Touristenattracktion"
             },
             "tourism/camp_site": {
-                "name": "Campingplatz"
+                "name": "Campingplatz",
+                "terms": "Campingplatz, Zeltplatz"
             },
             "tourism/caravan_site": {
                 "name": "Wohnmobilstellplatz"
@@ -1612,16 +1781,19 @@
                 "terms": "Frühstückspension"
             },
             "tourism/hostel": {
-                "name": "Hostel"
+                "name": "Hostel",
+                "terms": "Hostel"
             },
             "tourism/hotel": {
-                "name": "Hotel"
+                "name": "Hotel",
+                "terms": "Hotel"
             },
             "tourism/information": {
                 "name": "Information"
             },
             "tourism/motel": {
-                "name": "Motel"
+                "name": "Motel",
+                "terms": "Motel"
             },
             "tourism/museum": {
                 "name": "Museum",
@@ -1631,16 +1803,20 @@
                 "name": "Picknickplatz"
             },
             "tourism/theme_park": {
-                "name": "Themenpark"
+                "name": "Themenpark",
+                "terms": "Themenpark, Freizeitpark"
             },
             "tourism/viewpoint": {
-                "name": "Aussichtspunkt"
+                "name": "Aussichtspunkt",
+                "terms": "Aussichtspunkt"
             },
             "tourism/zoo": {
-                "name": "Zoo"
+                "name": "Zoo",
+                "terms": "Zoo"
             },
             "type/boundary": {
-                "name": "Grenze"
+                "name": "Grenze",
+                "terms": "Grenze"
             },
             "type/boundary/administrative": {
                 "name": "Administrative Grenze"
@@ -1655,22 +1831,27 @@
                 "name": "Route"
             },
             "type/route/bicycle": {
-                "name": "Radweg"
+                "name": "Radweg",
+                "terms": "Radroute"
             },
             "type/route/bus": {
-                "name": "Buslinie"
+                "name": "Buslinie",
+                "terms": "Buslinie"
             },
             "type/route/detour": {
                 "name": "Bedarfsumleitungsroute"
             },
             "type/route/ferry": {
-                "name": "Fährenroute"
+                "name": "Fährenroute",
+                "terms": "Fähr-Linie"
             },
             "type/route/foot": {
-                "name": "Wanderweg"
+                "name": "Wanderweg",
+                "terms": "Wanderweg, Spazierweg"
             },
             "type/route/pipeline": {
-                "name": "Pipelinenetz"
+                "name": "Pipelinenetz",
+                "terms": "Pipeline"
             },
             "type/route/power": {
                 "name": "Stromnetz"
@@ -1679,10 +1860,12 @@
                 "name": "Straßennetz"
             },
             "type/route/train": {
-                "name": "Bahnlinie"
+                "name": "Bahnlinie",
+                "terms": "Eisenbahn-Linie"
             },
             "type/route/tram": {
-                "name": "Tramlinie"
+                "name": "Tramlinie",
+                "terms": "Straßenbahn-Linie"
             },
             "type/route_master": {
                 "name": "Hauptroute"
@@ -1691,31 +1874,39 @@
                 "name": "Andere"
             },
             "waterway": {
-                "name": "Wasserweg"
+                "name": "Wasserweg",
+                "terms": "Wasserweg"
             },
             "waterway/canal": {
-                "name": "Kanal"
+                "name": "Kanal",
+                "terms": "Kanal"
             },
             "waterway/dam": {
-                "name": "Damm"
+                "name": "Damm",
+                "terms": "Staudamm, Staumauer"
             },
             "waterway/ditch": {
-                "name": "Graben"
+                "name": "Graben",
+                "terms": "Entwässerungsgraben"
             },
             "waterway/drain": {
                 "name": "Ablauf"
             },
             "waterway/river": {
-                "name": "Fluss"
+                "name": "Fluss",
+                "terms": "Fluss"
             },
             "waterway/riverbank": {
-                "name": "Flussufer"
+                "name": "Flussufer",
+                "terms": "Fluss (als Fläche)"
             },
             "waterway/stream": {
-                "name": "Bach"
+                "name": "Bach",
+                "terms": "Bach"
             },
             "waterway/weir": {
-                "name": "Wehr"
+                "name": "Wehr",
+                "terms": "Wehr"
             }
         }
     }

diff --git a/vendor/assets/iD/iD/locales/el.json b/vendor/assets/iD/iD/locales/el.json
index f2b8066d2cfbe0f79a39a0b06d2d0202e5658845..fd793c428e389a7a971b2694ed2fa13173ec2b8a 100644 (file)
--- a/vendor/assets/iD/iD/locales/el.json
+++ b/vendor/assets/iD/iD/locales/el.json
@@ -1,74 +1,345 @@
 {
     "modes": {
         "add_area": {
-            "title": "Περιοχή"
+            "title": "Περιοχή",
+            "description": "Προσθήκη πάρκων, λιμνών ή άλλων περιοχών στο χάρτη.",
+            "tail": "Πατήστε στο χάρτη για να αρχίσετε τη σχεδίαση μιας περιοχής, όπως πάρκο, λίμνη ή κτήριο."
+        },
+        "add_line": {
+            "title": "Γραμμή",
+            "description": "Προσθήκη λεωφόρων, οδών, πεζόδρομων, καναλιών ή άλλων γραμμών στο χάρτη.",
+            "tail": "Πατήστε στο χάρτη για να αρχίσετε τη σχεδίαση ενός δρόμου, μονοπατιού ή διαδρομής."
         },
         "add_point": {
-            "title": "Σημείο"
+            "title": "Σημείο",
+            "description": "Προσθήκη εστιατορίων, μνημείων, γραμματοκιβωτίων ή άλλων σημείων στο χάρτη.",
+            "tail": "Πατήστε στο χάρτη για να προσθέσετε ένα σημείο."
+        },
+        "browse": {
+            "title": "Επισκόπηση",
+            "description": "Μετακίνηση και εστίαση του χάρτη."
         }
     },
     "operations": {
+        "add": {
+            "annotation": {
+                "point": "Προστέθηκε ένα σημείο.",
+                "vertex": "Προστέθηκε κόμβος σε διαδρομή.",
+                "relation": "Προστέθηκε μια σχέση."
+            }
+        },
+        "start": {
+            "annotation": {
+                "line": "Άρχησε μια γραμμή.",
+                "area": "Άρχισε μια περιοχή."
+            }
+        },
+        "continue": {
+            "annotation": {
+                "line": "Συνέχιση μιας γραμμής.",
+                "area": "Συνέχιση μιας περιοχής."
+            }
+        },
+        "cancel_draw": {
+            "annotation": "Ακύρωση σχεδίασης."
+        },
+        "change_role": {
+            "annotation": "Αλλάχτηκε ο ρόλος ενός μέλους σχέσης."
+        },
+        "change_tags": {
+            "annotation": "Αλάχτικαν ετικέτες."
+        },
+        "circularize": {
+            "title": "Σχηματισμός κύκλου",
+            "description": {
+                "line": "Κάντε αυτή τη γραμμή κυκλική.",
+                "area": "Κάντε αυτή την περιοχή κυκλική."
+            },
+            "key": "Ο",
+            "annotation": {
+                "line": "Κάντε μια γραμμή κυκλική.",
+                "area": "Κάντε μια περιοχή κυκλική."
+            },
+            "not_closed": "Αυτό δεν μπορεί να γίνει κυκλικό επειδή δεν είναι βρόγχος."
+        },
+        "orthogonalize": {
+            "title": "Ορθογωνισμός",
+            "description": "Τετραγωνισμός των γωνιών",
+            "key": "Q",
+            "annotation": {
+                "line": "Τετραγωνισμός των γωνιών μιας γραμμής.",
+                "area": "Τετραγωνίστηκαν οι γωνίες μιας περιοχής"
+            },
+            "not_closed": "Αυτό δεν μπορεί να γίνει τετράγωνο επειδή δεν είναι βρόγχος."
+        },
+        "delete": {
+            "title": "Διαγραφή",
+            "description": "Αφαιρέστε αυτό από το χάρτη.",
+            "annotation": {
+                "point": "Διαγραφή ενός σημείου.",
+                "vertex": "Διαγράφηκε ένας κόμβος από μια διαδρομή.",
+                "line": "Διαγράφηκε μια γραμμή.",
+                "area": "Διαγράφηκε μια περιοχή.",
+                "relation": "Διαγράφηκε μια σχέση.",
+                "multiple": "Διαγράφηκαν {n} αντικείμενα."
+            }
+        },
+        "add_member": {
+            "annotation": "Προστέθηκε ένα μέλος σε μία σχέση."
+        },
+        "delete_member": {
+            "annotation": "Αφαιρέθηκε ένα μέλος από μια σχέση."
+        },
+        "connect": {
+            "annotation": {
+                "point": "Συνδέθηκε μια διαδρομή σε ένα σημείο.",
+                "vertex": "Συνδέθηκε μια διαδρομή σε μια άλλη.",
+                "line": "Συνδέθηκε μια διαδρομή σε μια γραμμή.",
+                "area": "Συνδέθηκε μια διαδρομή σε μια περιοχή."
+            }
+        },
+        "disconnect": {
+            "title": "Αποσύνδεση",
+            "key": "D",
+            "not_connected": "Δεν υπάρχουν αρκετές γραμμές/περιοχές εδώ για αποσύνδεση."
+        },
+        "merge": {
+            "title": "Συγχώνευση",
+            "description": "Συγχώνευση αυτών των γραμμών.",
+            "key": "C",
+            "annotation": "Συγχωνεύτηκαν {n} γραμμές.",
+            "not_adjacent": "Αυτές οι γραμμές δεν μπορούν να συγχωνευτούν επειδή δεν είναι ενωμένες."
+        },
         "move": {
-            "title": "Μετακίνησε"
+            "title": "Μετακίνηση",
+            "description": "Μετακίνηση σε διαφορετική τοποθεσία.",
+            "key": "M",
+            "annotation": {
+                "point": "Μετακινήθηκε ένα σημείο.",
+                "vertex": "Μετακινήθηκε ένας κόμβος σε μια διαδρομή.",
+                "line": "Μετακινήθηκε μια γραμμή.",
+                "area": "Μετακινήθηκε μια περιοχή.",
+                "multiple": "Μετακινήθηκαν πολλαπλά αντικείμενα."
+            }
+        },
+        "rotate": {
+            "title": "Περιστροφή",
+            "description": "Περιστρέψτε αυτό το αντικείμενο γύρω από το κέντρο του.",
+            "key": "R",
+            "annotation": {
+                "line": "Περιστράφηκε μια γραμμή.",
+                "area": "Περιστράφηκε μια περιοχή."
+            }
+        },
+        "reverse": {
+            "title": "Αντιστροφή",
+            "description": "Κάντε αυτή τη γραμμή να πάει προς την αντίθετη κατεύθυνση.",
+            "key": "V",
+            "annotation": "Αντιστράφηκε μια γραμμή."
+        },
+        "split": {
+            "title": "Διαχωρισμός",
+            "key": "X"
         }
     },
+    "undo": {
+        "tooltip": "Αναίρεση: {action}",
+        "nothing": "Τίποτα προς αναίρεση."
+    },
+    "redo": {
+        "tooltip": "Επαναφορά: {action}",
+        "nothing": "Τίποτα προς επαναφορά."
+    },
+    "browser_notice": "Αυτός ο επεξεργαστής υποστηρίζεται στον Firefox, Chrome, Safari, Opera, και Internet Explorer 9 ή νεότερο. Παρακαλώ αναβαθμίστε τον φυλλομετρητή σας ή χρησιμοποιήστε το Potlatch 2 για να επεξεργαστείτε το χάρτη.",
+    "translate": {
+        "translate": "Μεταφράστε",
+        "localized_translation_language": "Επιλογή γλώσσας",
+        "localized_translation_name": "Όνομα"
+    },
+    "zoom_in_edit": "Μεγεθύνετε για να Επεξεργαστείτε",
+    "logout": "Αποσύνδεση",
+    "loading_auth": "Σύνδεση στο OpenStreetMap...",
+    "report_a_bug": "αναφορά σφάλματος",
     "commit": {
+        "title": "Αποθήκευση Αλλαγών",
+        "description_placeholder": "Σύντομη περιγραφή των συνεισφορών σας",
+        "message_label": "Υποβολή μηνύματος",
         "save": "Αποθήκευση",
-        "cancel": "Ακύρωση"
+        "cancel": "Ακύρωση",
+        "warnings": "Προειδοποιήσεις",
+        "modified": "Τροποποιήθηκε",
+        "deleted": "Διαγράφηκε",
+        "created": "Δημιουργήθηκε"
+    },
+    "contributors": {
+        "list": "Επεξεργασίες από {users}",
+        "truncated_list": "Επεξεργασίες από {users} και {count} άλλους"
+    },
+    "geocoder": {
+        "no_results_worldwide": "Δεν βρέθηκαν αποτελέσματα"
+    },
+    "geolocate": {
+        "title": "Εμφάνισε την Τοποθεσία μου"
+    },
+    "inspector": {
+        "no_documentation_combination": "Δεν υπάρχει διαθέσιμη τεκμηρίωση για αυτό το συνδυασμό ετικετών",
+        "no_documentation_key": "Δεν υπάρχει διαθέσιμη τεκμηρίωση για αυτό το κλειδί",
+        "show_more": "Εμφάνιση Περισσότερων",
+        "all_members": "Όλα τα μέλη",
+        "all_relations": "Όλες οι σχέσεις",
+        "new_relation": "Νέα σχέση",
+        "role": "Ρόλος",
+        "choose": "Επιλογή τύπου χαρακτηριστικού",
+        "results": "{n} αποτελέσματα για {search}",
+        "remove": "Αφαίρεση",
+        "search": "Αναζήτηση",
+        "unknown": "Άγνωστο"
+    },
+    "background": {
+        "title": "Παρασκήνιο",
+        "description": "Ρυθμίσεις παρασκηνίου",
+        "percent_brightness": "{opacity}% φωτεινότητα",
+        "fix_misalignment": "Διόρθωση ευθυγράμμισης",
+        "reset": "Μηδενισμός"
+    },
+    "restore": {
+        "heading": "Έχετε μη αποθηκευμένες αλλαγές",
+        "restore": "Επαναφορά"
+    },
+    "save": {
+        "title": "Αποθήκευση",
+        "help": "Αποθήκευση των αλλαγών στο OpenStreetMap, κάντε τες ορατές στου άλλους χρήστες.",
+        "no_changes": "Δεν υπάρχουν αλλαγές για αποθήκευση.",
+        "error": "Παρουσιάστηκε ένα σφάλμα κατά την προσπάθεια αποθήκευσης",
+        "uploading": "Αποστολή αλλαγών στο OpenStreetMap.",
+        "unsaved_changes": "Έχετε μη αποθηκευμένες αλλαγές"
+    },
+    "success": {
+        "just_edited": "Μόλις επεξεργαστήκατε το OpenStreetMap!"
+    },
+    "splash": {
+        "welcome": "Καλώς ήλθατε στον iD, επεξεργαστή για το OpenStreetMap",
+        "start": "Επεξεργασία Τώρα"
+    },
+    "source_switch": {
+        "lose_changes": "Έχετε μη αποθηκευμένες αλλαγές. Αλλάζοντας τον διακομιστή χάρτη θα τις απορρίψετε. Είστε σίγουρος ότι θέλετε να αλλάξετε διακομιστή;"
+    },
+    "tag_reference": {
+        "description": "Περιγραφή",
+        "on_wiki": "{tag} στο wiki.osm.org"
+    },
+    "validations": {
+        "untagged_line": "Γραμμή χωρίς ετικέτα",
+        "untagged_area": "Περιοχή χωρίς ετικέτα",
+        "many_deletions": "Διαγράφετε {n} αντικείμενα. Είστε σίγουρος ότι θέλετε να το κάνετε αυτό; Αυτό θα τα διαγράψει από το χάρτη πού όλοι οι άλλοι βλέπουν στο openstreetmap.org.",
+        "tag_suggests_area": "Η ετικέτα {tag} προτείνει η γραμμή πρέπει να είναι περιοχή, αλλά δεν είναι περιοχή",
+        "deprecated_tags": "Παρωχημένες ετικέτες: {tags}"
+    },
+    "zoom": {
+        "in": "Μεγέθυνση",
+        "out": "Σμίκρυνση"
+    },
+    "gpx": {
+        "local_layer": "Τοπικό αρχείο GPX"
     },
     "help": {
-        "title": "Βοήθεια"
+        "title": "Βοήθεια",
+        "help": "# Βοήθεια\n\nΑυτός είναι ένας επεξεργαστής για το [OpenStreetMap](http://www.openstreetmap.org/),\n τον ελεύθερο και επεξεργάσιμο παγκόσμιο χάρτη. Μπορείτε να τον χρησιμοποιήσετε για\n προσθήκη ή ενημέρωση δεδομένων στην περιοχή σας, φτιάχνοντας έναν ανοικτού-κώδικα\n και ανοικτών-δεδομένων παγκόσμιο χάρτη καλύτερο για όλους.\n\nΟι διορθώσεις που κάνετε σε αυτό το χάρτη θα είναι ορατές σε όλους όσους \nχρησιμοποιούν το OpenStreetMap. Για να είναι δυνατόν να κάνετε κάποια \nδιόρθωση, χρειάζεστε ένα \n[δωρεάν λογαριασμό OpenStreetMap](https://www.openstreetmap.org/user/new).\n\nΟ [iD editor](http://ideditor.com/) είναι ένα συνεργατικό έργο με τον [πηγαίο κώδικα\nδιαθέσιμο στο GitHub](https://github.com/systemed/iD).\n"
+    },
+    "intro": {
+        "points": {
+            "title": "Σημεία"
+        },
+        "areas": {
+            "title": "Περιοχές",
+            "search": "**Αναζήτηση για '{name}'.**"
+        },
+        "lines": {
+            "title": "Γραμμές"
+        },
+        "startediting": {
+            "title": "Εκκίνηση Επεξεργασίας",
+            "start": "Αρχίστε να χαρτογραφείτε!"
+        }
     },
     "presets": {
         "categories": {
+            "category-landuse": {
+                "name": "Χρήση Γης"
+            },
             "category-rail": {
                 "name": "Σιδηροδρομική Γραμμή"
             },
             "category-road": {
                 "name": "Δρόμος"
             },
+            "category-route": {
+                "name": "Διαδρομή"
+            },
             "category-water": {
                 "name": "Νερό"
             }
         },
         "fields": {
             "access": {
+                "label": "Πρόσβαση",
+                "placeholder": "Άγνωστο",
                 "types": {
                     "access": "Γενική",
                     "foot": "Πεζοί",
-                    "motor_vehicle": "Î\9cηÏ\87ανάκια",
-                    "bicycle": "Î\9cοÏ\84οÏ\83ικλέÏ\84εÏ\82",
+                    "motor_vehicle": "Î\9cηÏ\87ανοκίνηÏ\84α",
+                    "bicycle": "ΠοδήλαÏ\84α",
                     "horse": "Άλογα"
                 },
                 "options": {
                     "yes": {
-                        "title": "Επιτρέπεται"
+                        "title": "Επιτρέπεται",
+                        "description": "Η πρόσβαση επιτρέπεται νόμιμα, Δικαίωμα διέλευσης"
                     },
                     "no": {
-                        "title": "Απαγορεύεται"
+                        "title": "Απαγορεύεται",
+                        "description": "Η πρόσβαση δεν επιτρέπεται στο ευρύ κοινό"
+                    },
+                    "permissive": {
+                        "title": "Ανεκτική",
+                        "description": "Η πρόσβαση επιτρέπεται μέχρι ο ιδιοκτήτης αναιρέσει την άδεια"
                     },
                     "private": {
-                        "title": "Ιδιωτική"
+                        "title": "Ιδιωτική",
+                        "description": "Η πρόσβαση επιτρέπεται μόνο με άδεια από τον ιδιοκτήτη σε ατομική βάση"
+                    },
+                    "designated": {
+                        "title": "Καθορισμένο",
+                        "description": "Η πρόσβαση επιτρέπεται βάσει πινακίδων ή συγκεκριμένων τοπικών νόμων"
                     },
                     "destination": {
-                        "title": "Προορισμός"
+                        "title": "Προορισμός",
+                        "description": "Η πρόσβαση επιτρέπεται μόνο για για να φτάσετε σε κάποιο προορισμό"
                     }
                 }
             },
             "address": {
                 "label": "Διεύθυνση",
                 "placeholders": {
+                    "housename": "Όνομα Σπιτιού",
+                    "number": "123",
                     "street": "Οδός",
                     "city": "Πόλη",
                     "postcode": "Ταχυδρομικός Κώδικας"
                 }
             },
+            "admin_level": {
+                "label": "Δοιηκητική Βαθμίδα"
+            },
             "aeroway": {
                 "label": "Είδος"
             },
             "amenity": {
                 "label": "Είδος"
             },
+            "atm": {
+                "label": "ATM"
+            },
             "barrier": {
                 "label": "Είδος"
             },
@@ -85,6 +356,7 @@
                 "label": "Κτίριο"
             },
             "capacity": {
+                "label": "Χωρητικότητα",
                 "placeholder": "50, 100, 200..."
             },
             "cardinal_direction": {
@@ -106,8 +378,17 @@
             "crossing": {
                 "label": "Είδος"
             },
+            "cuisine": {
+                "label": "Κουζίνα"
+            },
+            "denomination": {
+                "label": "Δόγμα"
+            },
+            "description": {
+                "label": "Περιγραφή"
+            },
             "emergency": {
-                "label": "Επείγον"
+                "label": "Επείγοντα"
             },
             "entrance": {
                 "label": "Είδος"
@@ -115,16 +396,38 @@
             "fax": {
                 "placeholder": "+31 42 123 4567"
             },
+            "fee": {
+                "label": "Αμοιβή"
+            },
+            "fire_hydrant/type": {
+                "label": "Τύπος"
+            },
+            "generator/method": {
+                "label": "Μέθοδος"
+            },
+            "generator/source": {
+                "label": "Πηγή"
+            },
+            "generator/type": {
+                "label": "Τύπος"
+            },
             "highway": {
                 "label": "Είδος"
             },
             "historic": {
                 "label": "Είδος"
             },
+            "iata": {
+                "label": "IATA"
+            },
+            "incline": {
+                "label": "Κλήση"
+            },
             "internet_access": {
                 "label": "Πρόσβαση Στο Διαδίκτυο",
                 "options": {
                     "wlan": "Ασύρματο Δίκτυο",
+                    "wired": "Ενσύρματο δύκτυο",
                     "terminal": "Τερματικό"
                 }
             },
@@ -132,10 +435,14 @@
                 "label": "Λωρίδες",
                 "placeholder": "1, 2, 3..."
             },
+            "layer": {
+                "label": "Στρώση"
+            },
             "leisure": {
                 "label": "Είδος"
             },
             "levels": {
+                "label": "Επίπεδα",
                 "placeholder": "2, 4, 6..."
             },
             "location": {
@@ -149,7 +456,8 @@
                 "placeholder": "40, 50, 60..."
             },
             "name": {
-                "label": "Όνομα"
+                "label": "Όνομα",
+                "placeholder": "Κοινό Όνομα (αν υπάρχει)"
             },
             "natural": {
                 "label": "Φυσικό"
@@ -220,13 +528,22 @@
             "shelter": {
                 "label": "Καταφύγιο"
             },
+            "shop": {
+                "label": "Είδος"
+            },
             "source": {
                 "label": "Πηγή"
             },
+            "sport": {
+                "label": "Άθλημα"
+            },
             "structure": {
+                "placeholder": "Άγνωστο",
                 "options": {
                     "bridge": "Γέφυρα",
-                    "tunnel": "Τούνελ"
+                    "tunnel": "Σήραγγα",
+                    "embankment": "Ανάχωμα",
+                    "cutting": "Ανασκαφή"
                 }
             },
             "supervised": {
@@ -235,9 +552,15 @@
             "surface": {
                 "label": "Επιφάνεια"
             },
+            "towertype": {
+                "label": "Τύπος Πύργου"
+            },
             "tracktype": {
                 "label": "Είδος"
             },
+            "trail_visibility": {
+                "label": "Ορατότητα Μονοπατιού"
+            },
             "water": {
                 "label": "Είδος"
             },
@@ -252,7 +575,10 @@
                 "label": "Είδος"
             },
             "wheelchair": {
-                "label": "Πρόσβαση Σε Αναπήρικο Καροτσάκι"
+                "label": "Πρόσβαση Σε Αναπηρικό Καροτσάκι"
+            },
+            "wikipedia": {
+                "label": "Wikipedia"
             },
             "wood": {
                 "label": "Είδος"
@@ -268,11 +594,23 @@
             "aeroway/aerodrome": {
                 "name": "Αεροδρόμιο"
             },
+            "aeroway/gate": {
+                "name": "Πύλη Αεροδρομίου"
+            },
+            "aeroway/hangar": {
+                "name": "Υπόστεγο Αεροσκαφών"
+            },
             "aeroway/helipad": {
                 "name": "Ελικοδρόμιο"
             },
+            "aeroway/runway": {
+                "name": "Διάδρομος"
+            },
             "aeroway/taxiway": {
-                "name": "Πιάτσα Ταξί"
+                "name": "Τροχιόδρομος"
+            },
+            "amenity/atm": {
+                "name": "ATM"
             },
             "amenity/bank": {
                 "name": "Τράπεζα"
@@ -284,10 +622,10 @@
                 "name": "Παγκάκι"
             },
             "amenity/bicycle_parking": {
-                "name": "ΧÏ\8eÏ\81οÏ\82 ΣÏ\84αÏ\8dθμεσης Ποδηλάτων"
+                "name": "ΧÏ\8eÏ\81οÏ\82 ΣÏ\84άθμεÏ\85σης Ποδηλάτων"
             },
             "amenity/bicycle_rental": {
-                "name": "Î\9aαÏ\84άÏ\83Ï\84ημα Î\95νοικίαÏ\83ηÏ\82 Ποδηλάτων"
+                "name": "Î\95νοικίαÏ\83η Ποδηλάτων"
             },
             "amenity/cafe": {
                 "name": "Καφετέρια"
@@ -298,6 +636,9 @@
             "amenity/car_wash": {
                 "name": "Πλυντήριο Αυτοκινήτων"
             },
+            "amenity/childcare": {
+                "name": "Φροντίδα Παιδιών"
+            },
             "amenity/cinema": {
                 "name": "Κινηματογράφος"
             },
@@ -307,6 +648,9 @@
             "amenity/courthouse": {
                 "name": "Δικαστήριο"
             },
+            "amenity/drinking_water": {
+                "name": "Πόσιμο Νερό"
+            },
             "amenity/embassy": {
                 "name": "Πρεσβεία"
             },
@@ -328,6 +672,9 @@
             "amenity/hospital": {
                 "name": "Νοσοκομείο"
             },
+            "amenity/kindergarten": {
+                "name": "Νηπιαγωγείο"
+            },
             "amenity/library": {
                 "name": "Βιβλιοθήκη"
             },
@@ -335,7 +682,7 @@
                 "name": "Αγορά"
             },
             "amenity/parking": {
-                "name": "ΧÏ\8eÏ\81οÏ\82 ΣÏ\84αÏ\8dθμεσης"
+                "name": "ΧÏ\8eÏ\81οÏ\82 ΣÏ\84άθμεÏ\85σης"
             },
             "amenity/pharmacy": {
                 "name": "Φαρμακείο"
@@ -343,6 +690,9 @@
             "amenity/place_of_worship": {
                 "name": "Χώρος Λατρείας"
             },
+            "amenity/place_of_worship/buddhist": {
+                "name": "Βουδιστικός Ναός"
+            },
             "amenity/place_of_worship/christian": {
                 "name": "Εκκλησία"
             },
@@ -361,6 +711,9 @@
             "amenity/post_office": {
                 "name": "Ταχυδρομείο"
             },
+            "amenity/pub": {
+                "name": "Παμπ"
+            },
             "amenity/restaurant": {
                 "name": "Εστιατόριο"
             },
@@ -394,9 +747,21 @@
             "area": {
                 "name": "Περιοχή"
             },
+            "barrier": {
+                "name": "Εμπόδιο"
+            },
+            "barrier/bollard": {
+                "name": "Στύλος"
+            },
             "barrier/cattle_grid": {
                 "name": "Συρματόπλεγμα"
             },
+            "barrier/city_wall": {
+                "name": "Τείχη Πόλης"
+            },
+            "barrier/cycle_barrier": {
+                "name": "Κυκλικός Φράκτης"
+            },
             "barrier/ditch": {
                 "name": "Χαντάκι"
             },
@@ -412,6 +777,12 @@
             "barrier/hedge": {
                 "name": "Περίφραξη"
             },
+            "barrier/lift_gate": {
+                "name": "Ανυψούμενη Πύλη"
+            },
+            "barrier/retaining_wall": {
+                "name": "Διατηρητέα Τείχη"
+            },
             "barrier/stile": {
                 "name": "Στύλος"
             },
@@ -421,18 +792,39 @@
             "barrier/wall": {
                 "name": "Τοίχος"
             },
+            "boundary/administrative": {
+                "name": "Δοιηκητικό Όριο"
+            },
             "building": {
                 "name": "Κτίριο"
             },
             "building/apartments": {
                 "name": "Διαμερίσματα"
             },
+            "building/commercial": {
+                "name": "Εμπορικό Κτίριο"
+            },
             "building/entrance": {
                 "name": "Είσοδος"
             },
             "building/house": {
                 "name": "Σπίτι"
             },
+            "building/hut": {
+                "name": "Καλύβα"
+            },
+            "building/industrial": {
+                "name": "Βιομηχανικό Κτήριο"
+            },
+            "building/residential": {
+                "name": "Κτίριο Κατοικιών"
+            },
+            "emergency/ambulance_station": {
+                "name": "Σταθμός Ασθενοφόρων"
+            },
+            "emergency/fire_hydrant": {
+                "name": "Πυροσβεστικός Κρουνός"
+            },
             "emergency/phone": {
                 "name": "Τηλέφωνο Ανάγκης"
             },
@@ -442,8 +834,11 @@
             "highway": {
                 "name": "Αυτοκινητόδρομος"
             },
+            "highway/bridleway": {
+                "name": "Μονοπάτι Αλόγων"
+            },
             "highway/bus_stop": {
-                "name": "Στάση Λεοφορείων"
+                "name": "Στάση Λεωφορείων"
             },
             "highway/crossing": {
                 "name": "Διασταύρωση"
@@ -454,48 +849,114 @@
             "highway/footway": {
                 "name": "Μονοπάτι"
             },
+            "highway/mini_roundabout": {
+                "name": "Μικρός Κυκλικός Κόμβος"
+            },
             "highway/motorway": {
                 "name": "Αυτοκινητόδρομος"
             },
+            "highway/motorway_junction": {
+                "name": "Διασταύρωση Αυτοκινητόδρομου"
+            },
+            "highway/motorway_link": {
+                "name": "Σύνδεση Αυτοκινητόδρομου"
+            },
+            "highway/path": {
+                "name": "Μονοπάτι"
+            },
+            "highway/pedestrian": {
+                "name": "Πεζόδρομος"
+            },
+            "highway/primary": {
+                "name": "Πρωτεύων Δρόμος"
+            },
+            "highway/primary_link": {
+                "name": "Σύνδεση Πρωτεύοντος"
+            },
+            "highway/residential": {
+                "name": "Οικιστική Οδός"
+            },
             "highway/road": {
                 "name": "Άγνωστος Δρόμος"
             },
+            "highway/secondary": {
+                "name": "Δευτερεύων Δρόμος"
+            },
+            "highway/secondary_link": {
+                "name": "Σύνδεση Δευτερεύοντος"
+            },
+            "highway/service/alley": {
+                "name": "Δρομάκι"
+            },
             "highway/service/emergency_access": {
-                "name": "Πρόσβαση Εκτακτού Αναγκής"
+                "name": "Πρόσβαση Εκτάκτου Ανάγκης"
+            },
+            "highway/service/parking_aisle": {
+                "name": "Διάδρομος Στάθμευσης"
             },
             "highway/steps": {
                 "name": "Σκαλοπάτια"
             },
+            "highway/tertiary": {
+                "name": "Τριτεύων Δρόμος"
+            },
             "highway/track": {
-                "name": "Î\91γÏ\81οÏ\84ικÏ\8cÏ\82 Î\94Ï\81Ï\8cμος"
+                "name": "ΧÏ\89μαÏ\84Ï\8cδÏ\81ομος"
             },
             "highway/traffic_signals": {
                 "name": "Φανάρια"
             },
+            "highway/unclassified": {
+                "name": "Μη κατηγοριοποιημένος Δρόμος"
+            },
+            "historic": {
+                "name": "Ιστορική τοποθεσία"
+            },
             "historic/archaeological_site": {
                 "name": "Αρχαιολογικός Χώρος"
             },
+            "historic/boundary_stone": {
+                "name": "Βράχος Ορόσημο"
+            },
             "historic/castle": {
                 "name": "Κάστρο"
             },
+            "historic/memorial": {
+                "name": "Μνημείο"
+            },
             "historic/monument": {
                 "name": "Μνημείο"
             },
             "historic/ruins": {
                 "name": "Ερείπια"
             },
+            "landuse": {
+                "name": "Χρήση γης"
+            },
             "landuse/basin": {
                 "name": "Κανάλι Αποστράγγισης"
             },
             "landuse/cemetery": {
                 "name": "Κοιμητήριο"
             },
+            "landuse/commercial": {
+                "name": "Εμπορική"
+            },
+            "landuse/construction": {
+                "name": "Κατασκευές"
+            },
             "landuse/farm": {
                 "name": "Αγρο"
             },
+            "landuse/farmyard": {
+                "name": "Αγροτεμάχιο"
+            },
             "landuse/forest": {
                 "name": "Δάσος"
             },
+            "landuse/grass": {
+                "name": "Γρασίδι"
+            },
             "landuse/industrial": {
                 "name": "Βιομηχανική"
             },
@@ -503,17 +964,29 @@
                 "name": "Λιβάδι"
             },
             "landuse/orchard": {
-                "name": "Î\94ενδÏ\81Ï\8eναÏ\82"
+                "name": "ΠεÏ\81ιβÏ\8cλι"
             },
             "landuse/quarry": {
                 "name": "Λατομείο"
             },
+            "landuse/residential": {
+                "name": "Οικιστική"
+            },
+            "landuse/retail": {
+                "name": "Λιανικό Εμπόριο"
+            },
             "landuse/vineyard": {
                 "name": "Αμπελώνας"
             },
             "leisure": {
                 "name": "Αναψυχή"
             },
+            "leisure/dog_park": {
+                "name": "Πάρκο Σκύλων"
+            },
+            "leisure/garden": {
+                "name": "Κήπος"
+            },
             "leisure/golf_course": {
                 "name": "Γήπεδο Γκολφ"
             },
@@ -523,11 +996,14 @@
             "leisure/park": {
                 "name": "Πάρκο"
             },
+            "leisure/pitch": {
+                "name": "Γήπεδο"
+            },
             "leisure/pitch/american_football": {
                 "name": "Γήπεδο Αμερικάνικου Ποδοσφαίρου"
             },
             "leisure/pitch/baseball": {
-                "name": "Γήπεδο Μπέϊζμπολ"
+                "name": "Γήπεδο Μπέιζμπολ"
             },
             "leisure/pitch/basketball": {
                 "name": "Γήπεδο Μπάσκετ"
@@ -539,26 +1015,53 @@
                 "name": "Γήπεδο Τέννις"
             },
             "leisure/pitch/volleyball": {
-                "name": "Î\93ήÏ\80εδο Î\92Ï\8cλλεÏ\85"
+                "name": "Î\93ήÏ\80εδο Î\92Ï\8cλεÏ\8b"
             },
             "leisure/playground": {
                 "name": "Παιδική Χαρά"
             },
+            "leisure/slipway": {
+                "name": "Γλύστρα"
+            },
             "leisure/stadium": {
                 "name": "Στάδιο"
             },
             "leisure/swimming_pool": {
                 "name": "Πισίνα"
             },
+            "leisure/track": {
+                "name": "Πίστα Αγώνων"
+            },
+            "line": {
+                "name": "Γραμμή"
+            },
+            "man_made": {
+                "name": "Ανθρώπινες Κατασκευές"
+            },
+            "man_made/breakwater": {
+                "name": "Κυματοθραύστης"
+            },
             "man_made/lighthouse": {
                 "name": "Φάρος"
             },
             "man_made/pier": {
                 "name": "Αποβάθρα"
             },
+            "man_made/tower": {
+                "name": "Πύργος"
+            },
+            "man_made/wastewater_plant": {
+                "name": "Βιολογικός Καθαρισμός"
+            },
             "man_made/water_tower": {
                 "name": "Δεξαμενή Νερού"
             },
+            "man_made/water_well": {
+                "name": "Πηγάδι Νερού"
+            },
+            "natural": {
+                "name": "Φυσικό"
+            },
             "natural/bay": {
                 "name": "Κόλπος"
             },
@@ -566,7 +1069,7 @@
                 "name": "Παραλία"
             },
             "natural/cliff": {
-                "name": "Î\92Ï\81άÏ\87ος"
+                "name": "Î\93κÏ\81εμÏ\8cς"
             },
             "natural/coastline": {
                 "name": "Ακτογραμμή"
@@ -577,8 +1080,11 @@
             "natural/grassland": {
                 "name": "Χορτολιβαδική Έκταση"
             },
+            "natural/peak": {
+                "name": "Κορυφή"
+            },
             "natural/scrub": {
-                "name": "Î\98άμνος"
+                "name": "Î\98αμνÏ\8cÏ\84οÏ\80ος"
             },
             "natural/spring": {
                 "name": "Πηγή"
@@ -592,9 +1098,24 @@
             "natural/water/lake": {
                 "name": "Λίμνη"
             },
+            "natural/water/pond": {
+                "name": "Λιμνούλα"
+            },
+            "natural/water/reservoir": {
+                "name": "Ταμιευτήρας"
+            },
+            "natural/wetland": {
+                "name": "Έλος"
+            },
+            "natural/wood": {
+                "name": "Δάσος"
+            },
             "office": {
                 "name": "Γραφείο"
             },
+            "place": {
+                "name": "Τόπος"
+            },
             "place/city": {
                 "name": "Πόλη"
             },
@@ -604,20 +1125,38 @@
             "place/island": {
                 "name": "Νησί"
             },
+            "place/isolated_dwelling": {
+                "name": "Απομονωμένες Κατοικίες"
+            },
+            "place/locality": {
+                "name": "Τοποθεσία"
+            },
+            "place/town": {
+                "name": "Κωμόπολη"
+            },
             "place/village": {
                 "name": "Χωριό"
             },
+            "point": {
+                "name": "Σημείο"
+            },
+            "power": {
+                "name": "Ενέργεια"
+            },
+            "power/generator": {
+                "name": "Γενήτρια Ρεύματος"
+            },
             "power/line": {
                 "name": "Καλώδιο Ρεύματος"
             },
             "power/pole": {
-                "name": "Î\9aολÏ\8eνα Ρεύματος"
+                "name": "Î\9aολÏ\8cνα Ρεύματος"
             },
             "power/sub_station": {
-                "name": "Υπόγειος Σταθμός "
+                "name": "Υποσταθμός "
             },
             "power/tower": {
-                "name": "Î\9aολÏ\8eνα Υψηλής Τάσης"
+                "name": "Î\9aολÏ\8cνα Υψηλής Τάσης"
             },
             "power/transformer": {
                 "name": "Μετασχηματιστής"
@@ -626,7 +1165,16 @@
                 "name": "Σιδηροδρομικός Διάδρομος"
             },
             "railway/abandoned": {
-                "name": "Εγκατελείμενη Σιδηροδρομική Γραμμή"
+                "name": "Εγκαταλελειμμένη Σιδηροδρομική Γραμμή"
+            },
+            "railway/disused": {
+                "name": "Σιδηροτροχιά εκτός Χρήσης"
+            },
+            "railway/level_crossing": {
+                "name": "Ισόπεδη διάβαση"
+            },
+            "railway/platform": {
+                "name": "Σιδηροδρομική Αποβάθρα"
             },
             "railway/rail": {
                 "name": "Σιδηροδρομική Γραμμή"
@@ -643,8 +1191,11 @@
             "railway/tram": {
                 "name": "Τραμ"
             },
+            "relation": {
+                "name": "Σχέση"
+            },
             "route/ferry": {
-                "name": "Î\93Ï\81αμμή ΠλοίÏ\89ν"
+                "name": "Î\94ιαδÏ\81ομή ΠοÏ\81θμείοÏ\85"
             },
             "shop": {
                 "name": "Κατάστημα"
@@ -655,6 +1206,9 @@
             "shop/bakery": {
                 "name": "Αρτοποιείο"
             },
+            "shop/beauty": {
+                "name": "Κατάστημα Ομορφιάς"
+            },
             "shop/beverages": {
                 "name": "Αναψυκτήριο"
             },
@@ -664,12 +1218,18 @@
             "shop/books": {
                 "name": "Βιβλιοπωλείο"
             },
+            "shop/boutique": {
+                "name": "Μπουτίκ"
+            },
             "shop/butcher": {
-                "name": "ΧαÏ\83άÏ\80ικο"
+                "name": "Î\9aÏ\81εοÏ\80Ï\89λείο"
             },
             "shop/car": {
                 "name": "Εμπορία Αυτοκινήτων"
             },
+            "shop/car_parts": {
+                "name": "Ανταλακτικά Αυτοκινήτων"
+            },
             "shop/car_repair": {
                 "name": "Συνεργείο Αυτοκινήτων"
             },
@@ -682,9 +1242,21 @@
             "shop/computer": {
                 "name": "Κατάστημα Υπολογιστών"
             },
+            "shop/confectionery": {
+                "name": "Ζαχαροπλαστείο"
+            },
+            "shop/convenience": {
+                "name": "Παντοπωλείο"
+            },
+            "shop/department_store": {
+                "name": "Πολυκατάστημα"
+            },
             "shop/dry_cleaning": {
                 "name": "Στεγνοκαθαριστήριο"
             },
+            "shop/electronics": {
+                "name": "Κατάστημα Ηλεκτρονικών"
+            },
             "shop/fishmonger": {
                 "name": "Ψαράδικο"
             },
@@ -695,7 +1267,7 @@
                 "name": "Κατάστημα Επίπλων"
             },
             "shop/gift": {
-                "name": "Î\9aαÏ\84αÏ\83Ï\84ημά Δώρων"
+                "name": "Î\9aαÏ\84άÏ\83Ï\84ημα Δώρων"
             },
             "shop/greengrocer": {
                 "name": "Οπωροπωλείο"
@@ -703,6 +1275,12 @@
             "shop/hairdresser": {
                 "name": "Κομμωτήριο"
             },
+            "shop/hardware": {
+                "name": "Σιδηροπωλείο"
+            },
+            "shop/hifi": {
+                "name": "Κατάστημα Hifi"
+            },
             "shop/jewelry": {
                 "name": "Κοσμηματοπωλείο"
             },
@@ -716,10 +1294,25 @@
                 "name": "Εμπορικό Κέντρο"
             },
             "shop/mobile_phone": {
-                "name": "Κατάστημα Κινητής Τηλεφωνείας"
+                "name": "Κατάστημα Κινητής Τηλεφωνίας"
+            },
+            "shop/motorcycle": {
+                "name": "Εμπόριο Μοτοσυκλετών"
+            },
+            "shop/music": {
+                "name": "Κατάστημα Μουσικής"
+            },
+            "shop/newsagent": {
+                "name": "Πρακτορείο τύπου"
             },
             "shop/optician": {
-                "name": "Οπτικό Κέντρο"
+                "name": "Οπτικός"
+            },
+            "shop/outdoor": {
+                "name": "Κατάστημα Υπαίθριων"
+            },
+            "shop/pet": {
+                "name": "Κατάστημα Κατοικίδιων"
             },
             "shop/shoes": {
                 "name": "Κατάστημα Υπόδησης"
@@ -727,6 +1320,9 @@
             "shop/sports": {
                 "name": "Κατάστημα Αθλητικών Ειδών"
             },
+            "shop/stationery": {
+                "name": "Κατάστημα Γραφικής Ύλης"
+            },
             "shop/toys": {
                 "name": "Κατάστημα Παιχνιδιών"
             },
@@ -746,7 +1342,10 @@
                 "name": "Τ"
             },
             "tourism/camp_site": {
-                "name": "Κατασκήνωση"
+                "name": "Χώρος Κατασκήνωσης"
+            },
+            "tourism/caravan_site": {
+                "name": "Πάρκο τροχόσπιτων"
             },
             "tourism/chalet": {
                 "name": "Σαλέ"
@@ -766,17 +1365,38 @@
             "tourism/museum": {
                 "name": "Μουσείο"
             },
+            "tourism/picnic_site": {
+                "name": "Χώρος πικ νικ"
+            },
             "tourism/theme_park": {
                 "name": "Θεματικό Πάρκο"
             },
+            "tourism/viewpoint": {
+                "name": "Σημείο θέασης"
+            },
             "tourism/zoo": {
                 "name": "Ζωολογικός Κήπος"
             },
+            "type/boundary": {
+                "name": "Όριο"
+            },
+            "type/boundary/administrative": {
+                "name": "Διοικητικό Όριο"
+            },
+            "type/multipolygon": {
+                "name": "Πολύ-Πολύγωνο"
+            },
+            "type/restriction": {
+                "name": "Περιορισμός"
+            },
+            "type/route": {
+                "name": "Δρομολόγιο"
+            },
             "type/route/bus": {
-                "name": "Î\93Ï\81αμμή Î\9bεοφορείων"
+                "name": "Î\94ιαδÏ\81ομή Î\9bεÏ\89φορείων"
             },
             "type/route/ferry": {
-                "name": "Î\93Ï\81αμμή ΠλοίÏ\89ν"
+                "name": "Î\94ιαδÏ\81ομή ΠοÏ\81θμείοÏ\85"
             },
             "type/route/train": {
                 "name": "Γραμμή Τραίνων"
@@ -784,17 +1404,29 @@
             "vertex": {
                 "name": "Άλλο"
             },
+            "waterway": {
+                "name": "Διαδρομή νερού"
+            },
             "waterway/canal": {
                 "name": "Κανάλι"
             },
             "waterway/dam": {
                 "name": "Φράγμα"
             },
+            "waterway/ditch": {
+                "name": "Χαντάκι"
+            },
             "waterway/river": {
                 "name": "Ποταμός"
             },
             "waterway/riverbank": {
                 "name": "Όχθη Ποταμιού"
+            },
+            "waterway/stream": {
+                "name": "Ρέμα"
+            },
+            "waterway/weir": {
+                "name": "Υδατοφράκτης"
             }
         }
     }

diff --git a/vendor/assets/iD/iD/locales/en.json b/vendor/assets/iD/iD/locales/en.json
index e63f7775e26c028001078b98d9e748091c83e77d..8fa572e250ddea2213f5f3fe941f041ef2615e5e 100644 (file)
--- a/vendor/assets/iD/iD/locales/en.json
+++ b/vendor/assets/iD/iD/locales/en.json
@@ -241,6 +241,8 @@
         "title": "Background",
         "description": "Background settings",
         "percent_brightness": "{opacity}% brightness",
+        "custom": "Custom",
+        "custom_prompt": "Enter a tile template. Valid tokens are {z}, {x}, {y} for Z/X/Y scheme and {u} for quadtile scheme.",
         "fix_misalignment": "Fix misalignment",
         "reset": "reset"
     },
@@ -263,7 +265,8 @@
         "just_edited": "You just edited OpenStreetMap!",
         "view_on_osm": "View on OSM",
         "facebook": "Share on Facebook",
-        "tweet": "Tweet",
+        "twitter": "Share on Twitter",
+        "google": "Share on Google+",
         "help_html": "Your changes should appear in the \"Standard\" layer in a few minutes. Other layers, and certain features, may take longer\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map'>details</a>).\n"
     },
     "confirm": {
@@ -311,7 +314,8 @@
         "imagery": "# Imagery\n\nAerial imagery is an important resource for mapping. A combination of\nairplane flyovers, satellite views, and freely-compiled sources are available\nin the editor under the 'Background Settings' menu on the left.\n\nBy default a [Bing Maps](http://www.bing.com/maps/) satellite layer is\npresented in the editor, but as you pan and zoom the map to new geographical\nareas, new sources will become available. Some countries, like the United\nStates, France, and Denmark have very high-quality imagery available for some areas.\n\nImagery is sometimes offset from the map data because of a mistake on the\nimagery provider's side. If you see a lot of roads shifted from the background,\ndon't immediately move them all to match the background. Instead you can adjust\nthe imagery so that it matches the existing data by clicking 'Fix alignment' at\nthe bottom of the Background Settings UI.\n",
         "addresses": "# Addresses\n\nAddresses are some of the most useful information for the map.\n\nAlthough addresses are often represented as parts of streets, in OpenStreetMap\nthey're recorded as attributes of buildings and places along streets.\n\nYou can add address information to places mapped as building outlines\nas well as those mapped as single points. The optimal source of address\ndata is from an on-the-ground survey or personal knowledge - as with any\nother feature, copying from commercial sources like Google Maps is strictly\nforbidden.\n",
         "inspector": "# Using the Inspector\n\nThe inspector is the user interface element on the right-hand side of the\npage that appears when a feature is selected and allows you to edit its details.\n\n### Selecting a Feature Type\n\nAfter you add a point, line, or area, you can choose what type of feature it\nis, like whether it's a highway or residential road, supermarket or cafe.\nThe inspector will display buttons for common feature types, and you can\nfind others by typing what you're looking for in the search box.\n\nClick the 'i' in the bottom-right-hand corner of a feature type button to\nlearn more about it. Click a button to choose that type.\n\n### Using Forms and Editing Tags\n\nAfter you choose a feature type, or when you select a feature that already\nhas a type assigned, the inspector will display fields with details about\nthe feature like its name and address.\n\nBelow the fields you see, you can click icons to add other details,\nlike [Wikipedia](http://www.wikipedia.org/) information, wheelchair\naccess, and more.\n\nAt the bottom of the inspector, click 'Additional tags' to add arbitrary\nother tags to the element. [Taginfo](http://taginfo.openstreetmap.org/) is a\ngreat resource for learn more about popular tag combinations.\n\nChanges you make in the inspector are automatically applied to the map.\nYou can undo them at any time by clicking the 'Undo' button.\n\n### Closing the Inspector\n\nYou can close the inspector by clicking the close button in the top-right,\npressing the 'Escape' key, or clicking on the map.\n",
-        "buildings": "# Buildings\n\nOpenStreetMap is the world's largest database of buildings. You can create\nand improve this database.\n\n### Selecting\n\nYou can select a building by clicking on its border. This will highlight the\nbuilding and open a small tools menu and a sidebar showing more information\nabout the building.\n\n### Modifying\n\nSometimes buildings are incorrectly placed or have incorrect tags.\n\nTo move an entire building, select it, then click the 'Move' tool. Move your\nmouse to shift the building, and click when it's correctly placed.\n\nTo fix the specific shape of a building, click and drag the nodes that form\nits border into better places.\n\n### Creating\n\nOne of the main questions around adding buildings to the map is that\nOpenStreetMap records buildings both as shapes and points. The rule of thumb\nis to _map a building as a shape whenever possible_, and map companies, homes,\namenities, and other things that operate out of buildings as points placed\nwithin the building shape.\n\nStart drawing a building as a shape by clicking the 'Area' button in the top\nleft of the interface, and end it either by pressing 'Return' on your keyboard\nor clicking on the first node drawn to close the shape.\n\n### Deleting\n\nIf a building is entirely incorrect - you can see that it doesn't exist in satellite\nimagery and ideally have confirmed locally that it's not present - you can delete\nit, which removes it from the map. Be cautious when deleting features -\nlike any other edit, the results are seen by everyone and satellite imagery\nis often out of date, so the building could simply be newly built.\n\nYou can delete a building by clicking on it to select it, then clicking the\ntrash can icon or pressing the 'Delete' key.\n"
+        "buildings": "# Buildings\n\nOpenStreetMap is the world's largest database of buildings. You can create\nand improve this database.\n\n### Selecting\n\nYou can select a building by clicking on its border. This will highlight the\nbuilding and open a small tools menu and a sidebar showing more information\nabout the building.\n\n### Modifying\n\nSometimes buildings are incorrectly placed or have incorrect tags.\n\nTo move an entire building, select it, then click the 'Move' tool. Move your\nmouse to shift the building, and click when it's correctly placed.\n\nTo fix the specific shape of a building, click and drag the nodes that form\nits border into better places.\n\n### Creating\n\nOne of the main questions around adding buildings to the map is that\nOpenStreetMap records buildings both as shapes and points. The rule of thumb\nis to _map a building as a shape whenever possible_, and map companies, homes,\namenities, and other things that operate out of buildings as points placed\nwithin the building shape.\n\nStart drawing a building as a shape by clicking the 'Area' button in the top\nleft of the interface, and end it either by pressing 'Return' on your keyboard\nor clicking on the first node drawn to close the shape.\n\n### Deleting\n\nIf a building is entirely incorrect - you can see that it doesn't exist in satellite\nimagery and ideally have confirmed locally that it's not present - you can delete\nit, which removes it from the map. Be cautious when deleting features -\nlike any other edit, the results are seen by everyone and satellite imagery\nis often out of date, so the building could simply be newly built.\n\nYou can delete a building by clicking on it to select it, then clicking the\ntrash can icon or pressing the 'Delete' key.\n",
+        "relations": "# Relations\n\nA relation is a special type of feature in OpenStreetMap that groups together\nother features. For example, two common types of relations are *route relations*,\nwhich group together sections of road that belong to a specific freeway or\nhighway, and *multipolygons*, which group together several lines that define\na complex area (one with several pieces or holes in it like a donut).\n\nThe group of features in a relation are called *members*. In the sidebar, you can\nsee which relations a feature is a member of, and click on a relation there\nto select the it. When the relation is selected, you can see all of its\nmembers listed in the sidebar and highlighted on the map.\n\nFor the most part, iD will take care of maintaining relations automatically\nwhile you edit. The main thing you should be aware of is that if you delete a\nsection of road to redraw it more accurately, you should make sure that the\nnew section is a member of the same relations as the original.\n\n## Editing Relations\n\nIf you want to edit relations, here are the basics.\n\nTo add a feature to a relation, select the feature, click the \"+\" button in the\n\"All relations\" section of the sidebar, and select or type the name of the relation.\n\nTo create a new relation, select the first feature that should be a member,\nclick the \"+\" button in the \"All relations\" section, and select \"New relation...\".\n\nTo remove a feature from a relation, select the feature and click the trash\nbutton next to the relation you want to remove it from.\n\nYou can create multipolygons with holes using the \"Merge\" tool. Draw two areas (inner\nand outer), hold the Shift key and click on each of them to select them both, and then\nclick the \"Merge\" (+) button.\n"
     },
     "intro": {
         "navigation": {
@@ -695,6 +699,9 @@
             "surface": {
                 "label": "Surface"
             },
+            "toilets/disposal": {
+                "label": "Disposal"
+            },
             "tourism": {
                 "label": "Type"
             },
@@ -919,6 +926,10 @@
                 "name": "Pub",
                 "terms": ""
             },
+            "amenity/ranger_station": {
+                "name": "Ranger Station",
+                "terms": "visitor center,permit center,backcountry office"
+            },
             "amenity/restaurant": {
                 "name": "Restaurant",
                 "terms": "bar,cafeteria,café,canteen,chophouse,coffee shop,diner,dining room,dive*,doughtnut shop,drive-in,eatery,eating house,eating place,fast-food place,greasy spoon,grill,hamburger stand,hashery,hideaway,hotdog stand,inn,joint*,luncheonette,lunchroom,night club,outlet*,pizzeria,saloon,soda fountain,watering hole"
@@ -945,7 +956,7 @@
             },
             "amenity/toilets": {
                 "name": "Toilets",
-                "terms": "bathroom,restroom"
+                "terms": "bathroom,restroom,outhouse,privy,head,lavatory,latrine,water closet,WC,W.C."
             },
             "amenity/townhall": {
                 "name": "Town Hall",
@@ -1865,7 +1876,7 @@
             },
             "tourism/artwork": {
                 "name": "Artwork",
-                "terms": ""
+                "terms": "mural,sculpture,statue"
             },
             "tourism/attraction": {
                 "name": "Tourist Attraction",

diff --git a/vendor/assets/iD/iD/locales/es.json b/vendor/assets/iD/iD/locales/es.json
index aff09f25c083f3bd43b3c2d1e63ec305fd855755..e26cb11eb803058549a582c103a064ab17ae262e 100644 (file)
--- a/vendor/assets/iD/iD/locales/es.json
+++ b/vendor/assets/iD/iD/locales/es.json
@@ -228,7 +228,7 @@
         "role": "Rol",
         "choose": "Selecciona tipo de elemento",
         "results": "{n} resultados para {search}",
-        "reference": "Ver en la wiki de OpenStreetMap",
+        "reference": "Ver más información en la wiki de OpenStreetMap",
         "back_tooltip": "Cambiar tipo de elemento",
         "remove": "Eliminar",
         "search": "Buscar",
@@ -263,7 +263,7 @@
         "just_edited": "¡Acaba de editar OpenStreetMap!",
         "view_on_osm": "Ver en OSM",
         "facebook": "Compartir en Facebook",
-        "tweet": "Tweet"
+        "help_html": "Tus cambios deberán aparecer en la capa \"Estándar\" en unos pocos minutos. Otras capas, y algunos determinados elementos del mapa, pueden tomar más tiempo en actualizarse (<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map'>más detalles acerca de esto</a>).\n"
     },
     "confirm": {
         "okay": "De acuerdo"
@@ -692,6 +692,9 @@
             "surface": {
                 "label": "Superficie"
             },
+            "toilets/disposal": {
+                "label": "Disponible"
+            },
             "tourism": {
                 "label": "Tipo"
             },
@@ -747,16 +750,20 @@
                 "name": "Puerta de embarque"
             },
             "aeroway/hangar": {
-                "name": "Hangar"
+                "name": "Hangar",
+                "terms": "hangar"
             },
             "aeroway/helipad": {
-                "name": "Helipuerto"
+                "name": "Helipuerto",
+                "terms": "helisuperficie,plataforma para helicópteros,helipad"
             },
             "aeroway/runway": {
-                "name": "Pista de aeropuerto"
+                "name": "Pista de aeropuerto",
+                "terms": "pista,pista de aterrizaje,pista de despegue"
             },
             "aeroway/taxiway": {
-                "name": "Pista de rodaje"
+                "name": "Pista de rodaje",
+                "terms": "pista de carreteo,pista de rodaje,pista de taxeo,calle de rodaje"
             },
             "aeroway/terminal": {
                 "name": "Terminal de aeropuerto"
@@ -765,10 +772,12 @@
                 "name": "Servicios"
             },
             "amenity/atm": {
-                "name": "Cajero automático"
+                "name": "Cajero automático",
+                "terms": "cajero automático,redbanc,ATM,ATH"
             },
             "amenity/bank": {
-                "name": "Banco"
+                "name": "Banco",
+                "terms": "banco,banca,bancario,cooperativa de ahorro y crédito,cooperativa de crédito,SACCO"
             },
             "amenity/bar": {
                 "name": "Bar"
@@ -801,7 +810,8 @@
                 "terms": "canguro,cuidadora"
             },
             "amenity/cinema": {
-                "name": "Cine"
+                "name": "Cine",
+                "terms": "cinematógrafo,cine"
             },
             "amenity/college": {
                 "name": "Universidad",
@@ -820,7 +830,8 @@
                 "terms": "embajada,consulado,consul"
             },
             "amenity/fast_food": {
-                "name": "Comida rápida"
+                "name": "Comida rápida",
+                "terms": "comida rápida,platos preparados"
             },
             "amenity/fire_station": {
                 "name": "Parque de bomberos",
@@ -842,7 +853,8 @@
                 "terms": "clínica, sanatorio, policlínica, manicomio,hospital"
             },
             "amenity/kindergarten": {
-                "name": "Jardín de infancia"
+                "name": "Jardín de infancia",
+                "terms": "parvulario,jardín de infancia,jardín infantil,kínder,educación inicial,parvulos,jardín de infantes,educación preescolar"
             },
             "amenity/library": {
                 "name": "Biblioteca",
@@ -886,7 +898,8 @@
                 "name": "Buzón de correos"
             },
             "amenity/post_office": {
-                "name": "Oficina de correos"
+                "name": "Oficina de correos",
+                "terms": "correos,casa de correos,oficina de correos,oficina postal"
             },
             "amenity/pub": {
                 "name": "Pub",
@@ -955,14 +968,16 @@
                 "name": "Zanja"
             },
             "barrier/entrance": {
-                "name": "Entrada"
+                "name": "Entrada",
+                "terms": "puerta, portal, vestíbulo, umbral, soportal, pórtico, abertura, acceso, boca, embocadura, agujero, hueco, entrada, llegada"
             },
             "barrier/fence": {
                 "name": "Cerca",
                 "terms": "valla, vallado, cercado, seto, muro, empalizada, barrera, tapia, verja, estacada, alambrada"
             },
             "barrier/gate": {
-                "name": "Puerta"
+                "name": "Puerta",
+                "terms": "portón, abertura, pórtico, portillo, cancela, entrada, salida, paso, puerta"
             },
             "barrier/hedge": {
                 "name": "Seto"
@@ -1151,7 +1166,8 @@
                 "name": "Mojón"
             },
             "historic/castle": {
-                "name": "Castillo"
+                "name": "Castillo",
+                "terms": "castillo,castro,fuerte"
             },
             "historic/memorial": {
                 "name": "Monumento"
@@ -1210,7 +1226,8 @@
                 "name": "Huerta"
             },
             "landuse/quarry": {
-                "name": "Cantera"
+                "name": "Cantera",
+                "terms": "cantera"
             },
             "landuse/residential": {
                 "name": "Urbano"
@@ -1235,7 +1252,8 @@
                 "name": "Campo de golf"
             },
             "leisure/marina": {
-                "name": "Marina"
+                "name": "Marina",
+                "terms": "marina"
             },
             "leisure/park": {
                 "name": "Parque"
@@ -1268,11 +1286,16 @@
                 "name": "Grada"
             },
             "leisure/stadium": {
-                "name": "Estadio"
+                "name": "Estadio",
+                "terms": "estadio,cancha"
             },
             "leisure/swimming_pool": {
                 "name": "Piscina"
             },
+            "leisure/track": {
+                "name": "Pista de carreras",
+                "terms": "circuito, pista"
+            },
             "line": {
                 "name": "Línea"
             },
@@ -1286,7 +1309,8 @@
                 "name": "Cortafuegos"
             },
             "man_made/lighthouse": {
-                "name": "Faro"
+                "name": "Faro",
+                "terms": "faro"
             },
             "man_made/pier": {
                 "name": "Embarcadero"
@@ -1373,7 +1397,8 @@
                 "name": "Lugar"
             },
             "place/city": {
-                "name": "Ciudad"
+                "name": "Ciudad",
+                "terms": "urbe, capital, metrópoli, ciudad, núcleo urbano, localidad, villa"
             },
             "place/hamlet": {
                 "name": "Aldea",
@@ -1401,6 +1426,10 @@
             "power": {
                 "name": "Electricidad"
             },
+            "power/generator": {
+                "name": "Generador de energía",
+                "terms": "energía, potencia, electricidad, subestación "
+            },
             "power/line": {
                 "name": "Línea de alta tensión"
             },
@@ -1674,7 +1703,8 @@
                 "name": "Vista panorámica"
             },
             "tourism/zoo": {
-                "name": "Zoo"
+                "name": "Zoo",
+                "terms": "zoo, zoológico "
             },
             "type/boundary": {
                 "name": "Límite"
@@ -1729,10 +1759,12 @@
                 "name": "Otro"
             },
             "waterway": {
-                "name": "Vía fluvial"
+                "name": "Vía fluvial",
+                "terms": "canal, cauce, acueducto, fluvial"
             },
             "waterway/canal": {
-                "name": "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"
@@ -1747,10 +1779,12 @@
                 "name": "Río"
             },
             "waterway/riverbank": {
-                "name": "Ribera de un río"
+                "name": "Ribera de un río",
+                "terms": "borde, orilla, ribazo, riba, ribera"
             },
             "waterway/stream": {
-                "name": "Arroyo"
+                "name": "Arroyo",
+                "terms": "torrente, riachuelo, arroyuelo, regato, reguero, torrentera, rivera, corriente, afluente, brazo, toma, río, arroyo"
             },
             "waterway/weir": {
                 "name": "Vertedero"

diff --git a/vendor/assets/iD/iD/locales/et.json b/vendor/assets/iD/iD/locales/et.json
index ac811d8c130d10d0d1f4513a10212f059df56db7..81dad6781afafe551cbb9a9992e68efaecde0807 100644 (file)
--- a/vendor/assets/iD/iD/locales/et.json
+++ b/vendor/assets/iD/iD/locales/et.json
@@ -5,19 +5,25 @@
             "description": "Lisa kaardile parke, hooneid, järvi ja muid alasid."
         },
         "add_line": {
-            "title": "Joon"
+            "title": "Joon",
+            "description": "Lisa teid, tänavaid, jalgteid, ojasid ja teisi jooni kaardile."
         },
         "add_point": {
             "title": "Punkt",
             "description": "Lisa kaardile restorane, monumente, postkaste ja muid punkte.",
             "tail": "Klõpsa kaardil punkti lisamiseks."
+        },
+        "browse": {
+            "title": "Sirvi",
+            "description": "Nihuta ja suumi kaarti."
         }
     },
     "operations": {
         "add": {
             "annotation": {
                 "point": "Punkt lisatud.",
-                "vertex": "Joonele lisatud punkt."
+                "vertex": "Joonele lisatud punkt.",
+                "relation": "Relatsioon lisatud."
             }
         },
         "start": {
@@ -35,6 +41,9 @@
         "cancel_draw": {
             "annotation": "Joonistamine katkestatud."
         },
+        "change_role": {
+            "annotation": "Relatsiooni liikme roll on muudetud."
+        },
         "change_tags": {
             "annotation": "Muudetud silte."
         },
@@ -52,6 +61,7 @@
             "not_closed": "Seda ei saa teha ringikujuliseks kuna see ei ole silmus."
         },
         "orthogonalize": {
+            "title": "Nurgad täisnurkseks",
             "description": "Täisnurgasta need nurgad.",
             "key": "Q",
             "annotation": {
@@ -72,10 +82,18 @@
                 "multiple": "{n} objekti kustutatud."
             }
         },
+        "add_member": {
+            "annotation": "Lisatud relatsiooni liige."
+        },
+        "delete_member": {
+            "annotation": "Relatsiooni liige kustutatud."
+        },
         "connect": {
             "annotation": {
                 "point": "Joon ühendatud punktiga.",
-                "vertex": "Joon ühendatud teise joonega."
+                "vertex": "Joon ühendatud teise joonega.",
+                "line": "Tee on ühendatud jooneks.",
+                "area": "Tee on ühendatud alaks."
             }
         },
         "disconnect": {
@@ -112,7 +130,10 @@
             }
         },
         "reverse": {
-            "key": "V"
+            "title": "Pööra",
+            "description": "Pööra tee vastassuunda.",
+            "key": "V",
+            "annotation": "Tee on pööratud."
         },
         "split": {
             "title": "Tükelda",
@@ -139,6 +160,9 @@
     "report_a_bug": "teata veast",
     "commit": {
         "title": "Salvesta muudatused",
+        "message_label": "Salvestuse kommentaar",
+        "upload_explanation": "Su salvestatavad muudatused on nähtaval kõikidel kaartidel mis kasutavad OpenStreetMap-i andmeid.",
+        "upload_explanation_with_user": "Su kasutajana {user} salvestatavad muudatused on nähtaval kõikidel kaartidel, mis kasutavad OpenStreetMap-i andmeid.",
         "save": "Salvesta",
         "cancel": "Tühista",
         "warnings": "Hoiatused",
@@ -152,14 +176,19 @@
     "inspector": {
         "show_more": "Näita rohkem",
         "all_tags": "Kõik sildid",
+        "all_relations": "Kõik relatsioonid",
+        "new_relation": "Uus relatsioon...",
         "results": "{n} tulemust otsingule {search}",
         "remove": "Eemalda",
-        "search": "Otsi"
+        "search": "Otsi",
+        "feature_list": "Otsi objekte",
+        "edit": "Muuda objekti"
     },
     "background": {
         "title": "Taust",
         "description": "Tausta seaded",
-        "percent_brightness": "{opacity}% heledus"
+        "percent_brightness": "{opacity}% heledus",
+        "fix_misalignment": "Korrigeeri nihet"
     },
     "save": {
         "title": "Salvesta",
@@ -215,6 +244,12 @@
     },
     "presets": {
         "categories": {
+            "category-landuse": {
+                "name": "Maakasutus"
+            },
+            "category-path": {
+                "name": "Rada (path)"
+            },
             "category-rail": {
                 "name": "Raudtee"
             },
@@ -226,6 +261,9 @@
             }
         },
         "fields": {
+            "access": {
+                "label": "Ligipääs"
+            },
             "address": {
                 "label": "Aadress",
                 "placeholders": {
@@ -236,9 +274,18 @@
                     "postcode": "Postiindeks"
                 }
             },
+            "aeroway": {
+                "label": "Tüüp"
+            },
+            "amenity": {
+                "label": "Tüüp"
+            },
             "atm": {
                 "label": "Pangaautomaat"
             },
+            "bicycle_parking": {
+                "label": "Tüüp"
+            },
             "building": {
                 "label": "Hoone"
             },
@@ -260,6 +307,12 @@
             "collection_times": {
                 "label": "Tühjendusajad"
             },
+            "construction": {
+                "label": "Tüüp"
+            },
+            "crossing": {
+                "label": "Tüüp"
+            },
             "cuisine": {
                 "label": "Köök"
             },
@@ -270,7 +323,8 @@
                 "label": "Kõrgus merepinnast"
             },
             "fax": {
-                "label": "Faks"
+                "label": "Faks",
+                "placeholder": "+372 123 4567"
             },
             "iata": {
                 "label": "IATA"
@@ -285,6 +339,9 @@
                     "terminal": "Terminal"
                 }
             },
+            "lanes": {
+                "label": "Sõiduread"
+            },
             "levels": {
                 "label": "Korruseid"
             },
@@ -338,13 +395,17 @@
                 "label": "Torni tüüp"
             },
             "website": {
-                "label": "Veebileht"
+                "label": "Veebileht",
+                "placeholder": "http://näidis24.ee/"
             },
             "wikipedia": {
                 "label": "Wikipeedia"
             }
         },
         "presets": {
+            "address": {
+                "name": "Aadress"
+            },
             "aeroway/aerodrome": {
                 "name": "Lennujaam"
             },
@@ -378,6 +439,9 @@
             "amenity/cafe": {
                 "name": "Kohvik"
             },
+            "amenity/car_rental": {
+                "name": "Autorent"
+            },
             "amenity/car_wash": {
                 "name": "Autopesula"
             },
@@ -468,6 +532,9 @@
             "amenity/waste_basket": {
                 "name": "Prügikast"
             },
+            "area": {
+                "name": "Ala"
+            },
             "barrier": {
                 "name": "Barjäär"
             },
@@ -528,6 +595,9 @@
             "highway/footway": {
                 "name": "Kõnnitee"
             },
+            "highway/living_street": {
+                "name": "Majadevaheline tänav"
+            },
             "highway/mini_roundabout": {
                 "name": "Mini-ringtee"
             },
@@ -537,6 +607,9 @@
             "highway/path": {
                 "name": "Rada"
             },
+            "highway/pedestrian": {
+                "name": "Jalajäija"
+            },
             "highway/primary": {
                 "name": "Põhimaantee"
             },
@@ -642,6 +715,9 @@
             "leisure/swimming_pool": {
                 "name": "Ujumisbassein"
             },
+            "line": {
+                "name": "Joon"
+            },
             "man_made/cutline": {
                 "name": "Siht"
             },
@@ -729,6 +805,9 @@
             "place/village": {
                 "name": "Küla"
             },
+            "point": {
+                "name": "Punkt"
+            },
             "power": {
                 "name": "Elekter"
             },
@@ -774,6 +853,12 @@
             "railway/tram": {
                 "name": "Tramm"
             },
+            "relation": {
+                "name": "Relatsioon"
+            },
+            "route/ferry": {
+                "name": "Praamitee"
+            },
             "shop": {
                 "name": "Pood"
             },
@@ -912,6 +997,9 @@
             "tourism/zoo": {
                 "name": "Loomaaed"
             },
+            "type/boundary/administrative": {
+                "name": "Administratiivpiir"
+            },
             "waterway/canal": {
                 "name": "Kanal"
             },

diff --git a/vendor/assets/iD/iD/locales/fi.json b/vendor/assets/iD/iD/locales/fi.json
index 5bb9d6906637db17d730dcf525f6b04e75688d5f..226e83297a6a6d3668ad70e5ffefe77315d40772 100644 (file)
--- a/vendor/assets/iD/iD/locales/fi.json
+++ b/vendor/assets/iD/iD/locales/fi.json
@@ -261,7 +261,7 @@
         "just_edited": "Muokkasit juuri OpenStreetMapia!",
         "view_on_osm": "Näytä OSM-kartalla",
         "facebook": "Jaa Facebookissa",
-        "tweet": "Twiittaa"
+        "help_html": "Muutokset tulevat näkyviin Perinteisessä karttanäkymässä muutaman minuutin kuluessa. Muissa karttanäkymissä ja -sovelluksissa ja hieman erikoisempien karttaominaisuuksien ilmestyminen kartalle voi viedä pidempään. Lue <a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map'>lisätietoja</a> englanniksi.\n"
     },
     "confirm": {
         "okay": "OK"
@@ -696,43 +696,58 @@
                 "name": "Osoite"
             },
             "aeroway": {
-                "name": "Kiitorata"
+                "name": "Kiitorata",
+                "terms": "kiitorata, kiitotie, lentokone, lentoonlähtörata, lentoonlähtötie, rullaustie, lentokenttätie, lentokonetie, lentokoneväylä"
             },
             "aeroway/aerodrome": {
-                "name": "Lentokenttä"
+                "name": "Lentokenttä",
+                "terms": "lentokenttä, lentoasema, terminaali, lentokone, lentoterminaali"
+            },
+            "aeroway/apron": {
+                "name": "Asemataso",
+                "terms": "asemataso, lentoterminaali, lentokenttä, lentokone, lentoasema"
             },
             "aeroway/gate": {
-                "name": "Lähtöportti"
+                "name": "Lähtöportti",
+                "terms": "lähtöportti, lentoportti, lentokenttä, lentoasema, lähtöputki, portti"
             },
             "aeroway/hangar": {
-                "name": "Lentokonehalli"
+                "name": "Lentokonehalli",
+                "terms": "hangaari, lentokonehalli, lentohalli, lentosuoja, lentokonesuoja, lentoasema, lentokenttä, lentokone"
             },
             "aeroway/helipad": {
-                "name": "Helikopterikenttä"
+                "name": "Helikopterikenttä",
+                "terms": "helikopterikenttä, helikopteri"
             },
             "aeroway/runway": {
-                "name": "Kiitorata"
+                "name": "Kiitorata",
+                "terms": "kiitorata, kiitotie, lentokone, lentoonlähtörata, lentoonlähtötie"
             },
             "aeroway/taxiway": {
-                "name": "Rullaustie"
+                "name": "Rullaustie",
+                "terms": "rullaustie, lentokone, lentokenttä, lentoasema, siirtymätie"
             },
             "aeroway/terminal": {
-                "name": "Lentokenttäterminaali"
+                "name": "Lentokenttäterminaali",
+                "terms": "lentoterminaali, lentokenttäterminaali, lentoasematerminaali, terminaali, lentokenttä, lentoasema"
             },
             "amenity": {
                 "name": "Palvelu"
             },
             "amenity/atm": {
-                "name": "Pankkiautomaatti"
+                "name": "Pankkiautomaatti",
+                "terms": "otto, pankkiautomaatti, rahannostoautomaatti, pankki"
             },
             "amenity/bank": {
-                "name": "Pankki"
+                "name": "Pankki",
+                "terms": "pankki, pankkikonttori, pankkitoimisto, pankkitoimipiste"
             },
             "amenity/bar": {
                 "name": "Baari"
             },
             "amenity/bench": {
-                "name": "Penkki"
+                "name": "Penkki",
+                "terms": "penkki, tuoli, istuin"
             },
             "amenity/bicycle_parking": {
                 "name": "Pyöräpysäköinti",
@@ -746,7 +761,8 @@
                 "name": "Kahvila"
             },
             "amenity/car_rental": {
-                "name": "Auton vuokraus"
+                "name": "Auton vuokraus",
+                "terms": "autovuokraamo, autonvuokraus, auton vuokraus, auto, vuokra-auto"
             },
             "amenity/car_sharing": {
                 "name": "KImppakyyti"
@@ -755,11 +771,17 @@
                 "name": "Autopesula",
                 "terms": "autopesu, automaattipesu, pesula, pesukone, pesuhalli, auto, autot"
             },
+            "amenity/childcare": {
+                "name": "Esikoulu",
+                "terms": "esikoulu, eskari, leikkikoulu"
+            },
             "amenity/cinema": {
-                "name": "Elokuvateatteri"
+                "name": "Elokuvateatteri",
+                "terms": "leffa, leffateatteri, elokuva, elokuvateatteri"
             },
             "amenity/college": {
-                "name": "Ammattikorkeakoulu"
+                "name": "Ammattikorkeakoulu",
+                "terms": "college, ammattikorkeakoulu, amk"
             },
             "amenity/courthouse": {
                 "name": "Käräjäoikeus",
@@ -775,34 +797,42 @@
                 "name": "Pikaruokaravintola"
             },
             "amenity/fire_station": {
-                "name": "Paloasema"
+                "name": "Paloasema",
+                "terms": "paloasema, palokeskus, vpk, vapaapalokunta"
             },
             "amenity/fountain": {
                 "name": "Suihkulähde"
             },
             "amenity/fuel": {
-                "name": "Huoltoasema"
+                "name": "Huoltoasema",
+                "terms": "huoltoasema, bensa-asema, liikennemyymälä, huoltamo, bensis, tankkausasema, bensapiste, tankkauspiste, kylmäasema"
             },
             "amenity/grave_yard": {
-                "name": "Hautausmaa"
+                "name": "Hautausmaa",
+                "terms": "hautausmaa, kalmisto, luutarha"
             },
             "amenity/hospital": {
-                "name": "Sairaala"
+                "name": "Sairaala",
+                "terms": "sairaala, terveyskeskus, hoitokoti, hoitolaitos, klinikka, parantola, sanatorio, lasaretti, hospitaali"
             },
             "amenity/kindergarten": {
-                "name": "Päiväkoti"
+                "name": "Päiväkoti",
+                "terms": "päiväkoti, päivähoito, lastenhoito, lastenvahti"
             },
             "amenity/library": {
-                "name": "Kirjasto"
+                "name": "Kirjasto",
+                "terms": "kirjasto, kirjalainaamo, kirjanlainaus, kirjan lainaus, kirja, kirjan lainaaminen"
             },
             "amenity/marketplace": {
                 "name": "Tori"
             },
             "amenity/parking": {
-                "name": "Pysäköintialue"
+                "name": "Pysäköintialue",
+                "terms": "pysäköinti, parkkipaikka, pysäköintipaikka, parkki, pysäköintitalo, parkkitalo"
             },
             "amenity/pharmacy": {
-                "name": "Apteekki"
+                "name": "Apteekki",
+                "terms": "apteekki, lääke, lääkkeet, lääkemyymälä, lääkkeenmyynti, farmasia, farmaseutti"
             },
             "amenity/place_of_worship": {
                 "name": "Rukoilupaikka"
@@ -823,10 +853,12 @@
                 "name": "Poliisiasema"
             },
             "amenity/post_box": {
-                "name": "Postilaatikko"
+                "name": "Postilaatikko",
+                "terms": "postilaatikko, postinlähetys, oranssi laatikko, kirjeenlähetys, posti, kirje"
             },
             "amenity/post_office": {
-                "name": "Postitoimisto"
+                "name": "Postitoimisto",
+                "terms": "postitoimisto, postikonttori, posti, kirje, paketti, postipiste"
             },
             "amenity/pub": {
                 "name": "Pubi"
@@ -860,7 +892,8 @@
                 "name": "Yliopisto"
             },
             "amenity/waste_basket": {
-                "name": "Roskakori"
+                "name": "Roskakori",
+                "terms": "roska-astia, roskis, roskapönttö, jäte-astia, kierrätyspiste, kierrätyslaatikko, roska, kierrätys, jäte, jätteet"
             },
             "area": {
                 "name": "Alue"
@@ -973,7 +1006,8 @@
                 "name": "Pihakatu"
             },
             "highway/mini_roundabout": {
-                "name": "Pienliikenneympyrä"
+                "name": "Pieni liikenneympyrä",
+                "terms": "pienliikenneympyrä, pieni liikenneympyrä, liikenneympyrä, ympyrä"
             },
             "highway/motorway": {
                 "name": "Moottoritie"

diff --git a/vendor/assets/iD/iD/locales/fr.json b/vendor/assets/iD/iD/locales/fr.json
index 88f07132174908d8b8579210f88e3de63f53bcd1..bf77b3e6e89728ae76582f1362ba3726c0640353 100644 (file)
--- a/vendor/assets/iD/iD/locales/fr.json
+++ b/vendor/assets/iD/iD/locales/fr.json
@@ -260,8 +260,7 @@
         "edited_osm": "OSM Edité!",
         "just_edited": "Vous venez de participer à OpenStreetMap !",
         "view_on_osm": "Visualiser sur OSM",
-        "facebook": "Partager sur Facebook",
-        "tweet": "Tweeter"
+        "facebook": "Partager sur Facebook"
     },
     "confirm": {
         "okay": "OK"

diff --git a/vendor/assets/iD/iD/locales/hr.json b/vendor/assets/iD/iD/locales/hr.json
index 4357e6d80f6166450e82d1058fdae3e54883a4bf..511ba21d59c2371f8166959a784952e4417820e6 100644 (file)
--- a/vendor/assets/iD/iD/locales/hr.json
+++ b/vendor/assets/iD/iD/locales/hr.json
@@ -241,6 +241,8 @@
         "title": "Pozadina",
         "description": "Postavke pozadine",
         "percent_brightness": "{opacity}% svjetline",
+        "custom": "Podesivo",
+        "custom_prompt": "Unesi predložak za popločavanje. Ispravni znakovi su {z}, {x}, {y} za Z/X/Y shemu i {u} za quadtile shemu.",
         "fix_misalignment": "Popravi odstupanje",
         "reset": "resetiraj"
     },
@@ -262,8 +264,9 @@
         "edited_osm": "Uređen OSM!",
         "just_edited": "Upravo si uredio/la OpenStreetMap!",
         "view_on_osm": "Pogledaj na OSM",
-        "facebook": "Podijeli na Facebook-u.",
-        "tweet": "Tweet",
+        "facebook": "Podijeli na mreži Facebook",
+        "twitter": "Podijeli na mreži Twitter",
+        "google": "Podijeli na mreži Google+",
         "help_html": "Tvoje promjene bi se trebale pojaviti u sloju \"Standard\" kroz par minuta. Za druge slojeve i određena svojstva trebati će više vremena.⏎\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map'>detalji</a>).⏎\n"
     },
     "confirm": {
@@ -685,6 +688,9 @@
             "surface": {
                 "label": "Površina"
             },
+            "toilets/disposal": {
+                "label": "Vrsta odvoda"
+            },
             "tourism": {
                 "label": "Vrsta"
             },
@@ -773,7 +779,8 @@
                 "name": "Najam bicikla"
             },
             "amenity/cafe": {
-                "name": "Kafić"
+                "name": "Kafić",
+                "terms": "Kafić,Cafe,Caffee,Kafeterija,Caffe bar"
             },
             "amenity/car_rental": {
                 "name": "Iznajmljivanje vozila"
@@ -862,7 +869,7 @@
             },
             "amenity/pub": {
                 "name": "Pivnica",
-                "terms": "Pivnica"
+                "terms": "Pivnica,Birtija,Birc,Bircuz"
             },
             "amenity/restaurant": {
                 "name": "Restoran",
@@ -1047,7 +1054,7 @@
                 "name": "Pristupna cesta državne ceste"
             },
             "highway/residential": {
-                "name": "Gradska cesta"
+                "name": "Ulica"
             },
             "highway/road": {
                 "name": "Nepoznata cesta"
@@ -1224,7 +1231,8 @@
                 "name": "Igralište"
             },
             "leisure/slipway": {
-                "name": "Navoz za brodove"
+                "name": "Navoz za brodove",
+                "terms": "Istezalište"
             },
             "leisure/stadium": {
                 "name": "Stadion"
@@ -1338,7 +1346,8 @@
                 "name": "Grad s više od 100 000 stanovnika"
             },
             "place/hamlet": {
-                "name": "Zaseok"
+                "name": "Zaseok",
+                "terms": "Zaseok,Seoce"
             },
             "place/island": {
                 "name": "Otok"

diff --git a/vendor/assets/iD/iD/locales/hu.json b/vendor/assets/iD/iD/locales/hu.json
index 162cb99c776daf70d836df62bd24f09023f2ef77..dae9986ca7148682e3c19a962db99d33f79d796f 100644 (file)
--- a/vendor/assets/iD/iD/locales/hu.json
+++ b/vendor/assets/iD/iD/locales/hu.json
@@ -260,8 +260,7 @@
         "edited_osm": "OSM szerkesztve!",
         "just_edited": "Szerkesztetted az OpenStreetMap-et!",
         "view_on_osm": "Megtekintés OSM-en",
-        "facebook": "Megosztás Facebookon",
-        "tweet": "Twittelés"
+        "facebook": "Megosztás Facebookon"
     },
     "confirm": {
         "okay": "Oké"

diff --git a/vendor/assets/iD/iD/locales/id.json b/vendor/assets/iD/iD/locales/id.json
index 1daff474519f620b051cb3cbd17ea3810e2e7cb7..b4c7b7437e9b00e2c39b58cd7c4aa15cddfb8d62 100644 (file)
--- a/vendor/assets/iD/iD/locales/id.json
+++ b/vendor/assets/iD/iD/locales/id.json
@@ -247,8 +247,7 @@
         "edited_osm": "OSM tersunting!",
         "just_edited": "Anda baru saja menyunting OpenStreetMap!",
         "view_on_osm": "Lihat di OSM",
-        "facebook": "Bagikan di Facebook",
-        "tweet": "Tweet"
+        "facebook": "Bagikan di Facebook"
     },
     "confirm": {
         "okay": "Baiklah"

diff --git a/vendor/assets/iD/iD/locales/is.json b/vendor/assets/iD/iD/locales/is.json
index babdc3372ed8754c76c97a34dec75a484944ce16..9188970f428d81855a8c87c0858aa447c3b3adac 100644 (file)
--- a/vendor/assets/iD/iD/locales/is.json
+++ b/vendor/assets/iD/iD/locales/is.json
@@ -260,8 +260,7 @@
         "edited_osm": "Þú breyttir OSM!",
         "just_edited": "Þú hefur breytt OpenStreetMap!",
         "view_on_osm": "Skoða á OSM",
-        "facebook": "Deila á Facebook",
-        "tweet": "Tísta"
+        "facebook": "Deila á Facebook"
     },
     "confirm": {
         "okay": "Í lagi"

diff --git a/vendor/assets/iD/iD/locales/it.json b/vendor/assets/iD/iD/locales/it.json
index 579f3c92d8e1e7e60f0556d4fc89aef877257f65..c4743b6db3eb1d78065535ff7db945479ae8553b 100644 (file)
--- a/vendor/assets/iD/iD/locales/it.json
+++ b/vendor/assets/iD/iD/locales/it.json
@@ -167,9 +167,11 @@
         }
     },
     "undo": {
+        "tooltip": "Annulla: {action}",
         "nothing": "Niente da ripristinare."
     },
     "redo": {
+        "tooltip": "Ripeti: {action}",
         "nothing": "Niente da rifare."
     },
     "tooltip_keyhint": "Scorciatoia da tastiera:",
@@ -239,6 +241,8 @@
         "title": "Sfondo",
         "description": "Impostazioni dello sfondo",
         "percent_brightness": "{opacity}% luminosità",
+        "custom": "Personalizzato",
+        "custom_prompt": "Inserisci lo schema dei tasselli. I valori validi sono {z}, {x}, {y} per lo schema Z/X/Y e {u} per lo schema QuadTile.",
         "fix_misalignment": "Allinea",
         "reset": "reset"
     },
@@ -261,7 +265,9 @@
         "just_edited": "Hai appena modificato OpenStreetMap!",
         "view_on_osm": "Mostra su OSM",
         "facebook": "Condividi su Facebook",
-        "tweet": "Condividi su Twitter"
+        "twitter": "Condividi su Twitter",
+        "google": "Condividi su Google+",
+        "help_html": "Le tue modifiche appariranno nel livello \"Standard\" tra qualche minuto. Per gli altri livelli e per certi elementi potrebbe essere necessario più tempo.\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map'>dettagli</a>).\n"
     },
     "confirm": {
         "okay": "Okay"
@@ -308,7 +314,8 @@
         "imagery": "# Immagini satellitari\n\nLe immagini satellitari sono una risorsa importante per le lavorare con le mappe. Tramite il menu sulla sinistra 'Impostazioni dello sfondo' sono disponibili varie immagini, ad es. quelle dei voli a bassa quota, le viste satellitari e altre sorgenti combinate liberamente.\n\nNell'editor viene visualizzato, per impostazione predefinita, il livello satellitare di [Bing Maps](http://www.bing.com/maps/) , ma non appena vi muoverete sulla mappa ed effettuerete degli zoom in altre aree, saranno disponibili nuove sorgenti. Alcuni paesi, come ad esempio gli Stati Uniti, la Francia e la Danimarca dispongono di immagini di altissima qualità in alcune aree.\n\nLe immagini talvolta non sono ben allineate ai dati della mappa a causa di errori compiuti dal fornitore di immagini. Se vedete molte strade spostate rispetto allo sfondo, non muovetele immediatamente per allinearle allo sfondo. Piuttosto potete allineare le immagini in modo che combacino con i dati esistenti facendo clic su 'Allinea' nella parte bassa del riquardo delle 'Impostazioni dello sfondo'.\n",
         "addresses": "# Indirizzi stradali\n\nGli indirizzi sono tra le informazioni più utili per una mappa.\n\nNonostante gli indirizzi siano spesso rappresentati come parte delle strade, in OpenStreetMap\nvengono memorizzati come attributi degli edifici e dei luoghi lungo le strade.\n\nPotrai aggiungere informazioni sull'indirizzo a dei luoghi mappati come contorni di edificio\ncosì come a quelli mappati come singoli punti. La sorgente ottimale dei dati degli indirizzi\nè un rilevamento per strada o la conoscenza personale dato che copiare da sorgenti\ncommerciali come ad es. Google Maps è severamente vietato.\n",
         "inspector": "# Utilizzo dell'inspector\n\nL'inspector è quell'elemento dell'interfaccia utente sulla parte destra della pagina che appare quando viene selezionata una funzionalità e che consente di modificarne i dettagli.\n\n### Selezione di un tipo di funzionalità\n\nDopo che è stato aggiunto un punto, una linea o un'area, è possibile scegliere quale tipo di caratteristica abbia, come ad esempio se si tratta di una strada principale o una strada residenziale, di un supermarket o di un caffè.\nL'inspector visualizzerà i pulsanti per le caratteristiche più comuni e sarà possibile trovarne altre semplicemente digitando la caratteristica voluta nella casella di ricerca.\n\nFare clic sulla 'i' che si trova nell'angolo in basso a destra del pulsante per saperne di più. Fare clic su un pulsante per scegliere quel tipo.\n\n### Utilizzo di Form e di Tag di modifica\n\nDopo aver scelto un tipo di caratteristica o quando si è selezionato una caratteristica per la quale è già stato assegnato un tipo, l'inspector mostrerà i campi con i dettagli come ad esempio il nome e l'indirizzo.\n\nAl di sotto dei campi è possibile fare clic sulle icone per aggiungere ulteriori dettagli come ad es. informazioni [Wikipedia](http://www.wikipedia.org/), accesso consentito alle carrozzine, e altro.\n\nSotto l'inspector è possibile fare clic su 'Tag aggiuntivi' per aggiungere arbitrariamente altri tag all'elemento. [Taginfo](http://taginfo.openstreetmap.org/) è una buona risorsa per imparare qualcosa sulle combinazioni di tag più comuni.\n\nLe modifiche effettuate nell'inspector vengono applicate automaticamente alla mappa.\nE' possibile annullarle in ogni momento cliccando semplicemente sul pulsante 'Ripristina'.\n\n### Chiusura dell'inspector\n\nE' possibile chiudere l'inspector sia facendo clic sul pulsante chiudi posizionato in alto a destra, sia premendo il tasto 'Esc', che facendo clic sulla mappa.\n\\n",
-        "buildings": "# Edifici\n\nOpenStreetMap è il più grande database online di edifici. Puoi creare e migliorare questo database.\n\n### Selezione\n\nPuoi selezionare un edificio cliccando sul suo bordo. Ciò evidenzierà l'edificio e aprirà un piccolo menu degli strumenti ed una barra laterale contenente ulteriori informazioni sull'edificio.\n\n### Modifica\n\nTalvolta gli edifici sono posizionati in maniera errata o hanno tag incorretti.\n\nPer spostare un edificio, selezionalo, quindi clicca sullo strumento 'Sposta'. Sposta il mouse per traslare l'edificio, clicca nuovamente quando è nel posto giusto.\n\nPer migliorare la forma di un edificio, clicca e sposta i nodi che formano il suo contorno in una posizione corretta.\n\n### Creazione\n\nUna delle principali diatribe sulla aggiunta degli edifici alla mappa riguarda il fatto che OpenStreetMap permette di creare edifici come aree o come singoli punti. La regola generale in questi casi è di _mappare un edificio come un'area quando possibile_, e di mappare compagnie, case, amenità e altri oggetti che operano nell'edificio come punti all'interno della forma dell'edificio.\n\nInizia a disegnare un edificio come una forma cliccando sul pulsante 'Area' nella parte alta a sinistra dell'interfaccia, e termina premendo 'Invio' sulla tastiera o cliccando sul primo nodo che hai disegnato per chiudere la forma.\n\n### Eliminazione\n\nSe un edificio è completamente sbagliato - non è presente nelle immagini satellitari e possibilmente hai controllato di persona che esso non esista davvero - puoi eliminarlo, in modo da toglierlo dalla mappa. Sii cauto quando elimini un elemento - come ogni modifica, i risultati sono visibili a tutti e le immagini satellitari sono spesso datate, perciò l'edificio potrebbe essere stato costruito nel frattempo.\n\nPuoi eliminare un edificio cliccandoci sopra per selezionarlo, quindi cliccando sull'icona del cestino o premendo il tasto 'Canc' sulla tastiera.\n\n"
+        "buildings": "# Edifici\n\nOpenStreetMap è il più grande database online di edifici. Puoi creare e migliorare questo database.\n\n### Selezione\n\nPuoi selezionare un edificio cliccando sul suo bordo. Ciò evidenzierà l'edificio e aprirà un piccolo menu degli strumenti ed una barra laterale contenente ulteriori informazioni sull'edificio.\n\n### Modifica\n\nTalvolta gli edifici sono posizionati in maniera errata o hanno tag incorretti.\n\nPer spostare un edificio, selezionalo, quindi clicca sullo strumento 'Sposta'. Sposta il mouse per traslare l'edificio, clicca nuovamente quando è nel posto giusto.\n\nPer migliorare la forma di un edificio, clicca e sposta i nodi che formano il suo contorno in una posizione corretta.\n\n### Creazione\n\nUna delle principali diatribe sulla aggiunta degli edifici alla mappa riguarda il fatto che OpenStreetMap permette di creare edifici come aree o come singoli punti. La regola generale in questi casi è di _mappare un edificio come un'area quando possibile_, e di mappare compagnie, case, amenità e altri oggetti che operano nell'edificio come punti all'interno della forma dell'edificio.\n\nInizia a disegnare un edificio come una forma cliccando sul pulsante 'Area' nella parte alta a sinistra dell'interfaccia, e termina premendo 'Invio' sulla tastiera o cliccando sul primo nodo che hai disegnato per chiudere la forma.\n\n### Eliminazione\n\nSe un edificio è completamente sbagliato - non è presente nelle immagini satellitari e possibilmente hai controllato di persona che esso non esista davvero - puoi eliminarlo, in modo da toglierlo dalla mappa. Sii cauto quando elimini un elemento - come ogni modifica, i risultati sono visibili a tutti e le immagini satellitari sono spesso datate, perciò l'edificio potrebbe essere stato costruito nel frattempo.\n\nPuoi eliminare un edificio cliccandoci sopra per selezionarlo, quindi cliccando sull'icona del cestino o premendo il tasto 'Canc' sulla tastiera.\n\n",
+        "relations": "# Relazioni\n\nUna relazione è un particolare elemento di OpenStreetMap che raggruppa altri\nelementi. Per esempio due tipi comuni di relazione sono le *relazioni percorso*,\nche raggruppano pezzi di strada che appartengono alla stessa via o autostrada,\ne i *multipoligoni*, che raggruppano diverse linee componenti aree complesse\n(un'area con più pezzi o con dei buchi in essa come una ciambella).\n\nGli elementi di una relazione sono chiamati *membri*. Nella barra laterale puoi\nvedere di quale relazione un elemento è membro e cliccare sulla relazione per\nselezionarla. Quando una relazione viene selezionata puoi vedere l'elenco di\ntutti i suoi membri nella barra laterale e gli stessi selezionati nella mappa.\n\nNella maggior parte dei casi iD si occuperà delle relazioni automaticamente\ndurante la modifica. Controlla solo che quando cancelli un elemento per\nridisegnarlo più accuratamente, il nuovo elemento sia un membro della stessa\nrelazione dell'originale.\n\n## Modificare le Relazioni\n\nSe vuoi modificare le relazioni, ecco le basi.\n\nPer aggiungere un elemento ad una relazione seleziona l'elemento, clicca il\ntasto \"+\" nella sezione \"Tutte le relazioni\" della barra laterale e quindi seleziona\nla relazione o digita il suo nome.\n\nPer creare una nuova relazione seleziona il primo elemento che diventerà\nmembro, clicca il tasto \"+\" nella sezione \"Tutte le relazioni\" della barra laterale\ne seleziona \"Nuova relazione...\".\n\nPer rimuovere un elemento da una relazione seleziona l'elemento e clicca sul\ncestino vicino alla relazione da cui vuoi rimuoverlo.\n\nPuoi creare dei multipoligoni con dei buchi usando lo strumento \"Unisci\".\nDisegna due aree (quella esterna e quella interna), tenendo premuto il tasto\nMaiusc della tastiera clicca su ognuno di loro per selezionarli entrambi e quindi\nclicca sul tasto \"Unisci\" (+).\n"
     },
     "intro": {
         "navigation": {
@@ -517,9 +524,21 @@
             "fee": {
                 "label": "Tariffa"
             },
+            "fire_hydrant/type": {
+                "label": "Tipo"
+            },
             "fixme": {
                 "label": "Sistemare"
             },
+            "generator/method": {
+                "label": "Metodo"
+            },
+            "generator/source": {
+                "label": "Fonte"
+            },
+            "generator/type": {
+                "label": "Tipo"
+            },
             "highway": {
                 "label": "Tipo"
             },
@@ -678,6 +697,9 @@
             "surface": {
                 "label": "Superficie"
             },
+            "toilets/disposal": {
+                "label": "Smaltimento"
+            },
             "tourism": {
                 "label": "Tipo"
             },
@@ -721,10 +743,12 @@
                 "name": "Pista aeroportuale"
             },
             "aeroway/aerodrome": {
-                "name": "Aeroporto"
+                "name": "Aeroporto",
+                "terms": "aeroplano,aeroporto,aerodromo"
             },
             "aeroway/apron": {
-                "name": "Area di sosta per aeromobili"
+                "name": "Area di sosta per aeromobili",
+                "terms": "rampa"
             },
             "aeroway/gate": {
                 "name": "Gate dell'aeroporto"
@@ -733,16 +757,19 @@
                 "name": "Hangar"
             },
             "aeroway/helipad": {
-                "name": "Elisuperficie"
+                "name": "Elisuperficie",
+                "terms": "elicottero,elisuperficie,eliporto"
             },
             "aeroway/runway": {
-                "name": "Pista di decollo/atterraggio"
+                "name": "Pista di decollo/atterraggio",
+                "terms": "pista di atterraggio"
             },
             "aeroway/taxiway": {
                 "name": "Pista di rullaggio"
             },
             "aeroway/terminal": {
-                "name": "Terminale di aeroporto"
+                "name": "Terminale di aeroporto",
+                "terms": "aeroporto,aerodromo"
             },
             "amenity": {
                 "name": "Servizi"
@@ -751,7 +778,8 @@
                 "name": "ATM"
             },
             "amenity/bank": {
-                "name": "Banca"
+                "name": "Banca",
+                "terms": "ufficio contabile,cooperativa di credito,deposito,erario,fondo,tesoro,società di investimento,archivio,riserva,cassetta di sicurezza,risparmi,azioni,negozio,sconto,tesoreria, società fiduciaria,cassaforte"
             },
             "amenity/bar": {
                 "name": "Bar"
@@ -766,7 +794,8 @@
                 "name": "Stazione del Bike Sharing"
             },
             "amenity/cafe": {
-                "name": "Caffè"
+                "name": "Caffè",
+                "terms": "caffè,te,bar"
             },
             "amenity/car_rental": {
                 "name": "Noleggio auto"
@@ -777,8 +806,12 @@
             "amenity/car_wash": {
                 "name": "Autolavaggio"
             },
+            "amenity/childcare": {
+                "name": "Doposcuola"
+            },
             "amenity/cinema": {
-                "name": "Cinema"
+                "name": "Cinema",
+                "terms": "cinema,cine,film,cinematografo,proiezione"
             },
             "amenity/college": {
                 "name": "College"
@@ -787,7 +820,8 @@
                 "name": "Tribunale"
             },
             "amenity/drinking_water": {
-                "name": "Fontanella"
+                "name": "Fontanella",
+                "terms": "fontana,fontanella,acqua potabile,nasone"
             },
             "amenity/embassy": {
                 "name": "Ambasciata"
@@ -808,10 +842,12 @@
                 "name": "Cimitero"
             },
             "amenity/hospital": {
-                "name": "Ospedale"
+                "name": "Ospedale",
+                "terms": "clinica,pronto soccorso,servizio sanitario,salute,hospice,ospizio,infermeria,istituzione,casa di cura,casa di riposo,sanatorio,ambulatorio,chirurgia,reparto"
             },
             "amenity/kindergarten": {
-                "name": "Scuola d'infanzia"
+                "name": "Scuola d'infanzia",
+                "terms": "scuola di infanzia,asilo,assistenza all'infanzia,asilo d'infanzia"
             },
             "amenity/library": {
                 "name": "Biblioteca"
@@ -826,25 +862,32 @@
                 "name": "Farmacia"
             },
             "amenity/place_of_worship": {
-                "name": "Luogo di culto"
+                "name": "Luogo di culto",
+                "terms": "abbazia,basilica,sinagoga,cattedrale,presbiterio,cappella,chiesa,casa di Dio,luogo di preghiera,luogo di culto,missione,moschea,oratorio,parrocchia,sacello,edicola votiva,tabernacolo,tempio"
             },
             "amenity/place_of_worship/buddhist": {
-                "name": "Tempio Buddista"
+                "name": "Tempio Buddista",
+                "terms": "stupa,vihara,monastero,tempio,pagoda,zendo,dojo"
             },
             "amenity/place_of_worship/christian": {
-                "name": "Chiesa"
+                "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"
             },
             "amenity/place_of_worship/jewish": {
-                "name": "Sinagoga"
+                "name": "Sinagoga",
+                "terms": "ebreo,ebrea,sinagoga,ebraismo,sionismo"
             },
             "amenity/place_of_worship/muslim": {
-                "name": "Moschea"
+                "name": "Moschea",
+                "terms": "musulmana,islamismo,moschea,islam"
             },
             "amenity/police": {
-                "name": "Forze di polizia"
+                "name": "Forze di polizia",
+                "terms": "poliziotto,sbirro,investigatore privato,piedipiatti,divisa,ispettore,gendarme,agente di polizia"
             },
             "amenity/post_box": {
-                "name": "Buca delle lettere"
+                "name": "Buca delle lettere",
+                "terms": "cassetta postale"
             },
             "amenity/post_office": {
                 "name": "Ufficio Postale"
@@ -853,34 +896,42 @@
                 "name": "Pub"
             },
             "amenity/restaurant": {
-                "name": "Ristorante"
+                "name": "Ristorante",
+                "terms": "bar,caffetteria,caffè,ristorante self-service,braceria,trattoria,negozio di ciambelle,bettola,griglieria,venditore di hamburger,venditore di hotdog,pizzeria"
             },
             "amenity/school": {
-                "name": "Scuola"
+                "name": "Scuola",
+                "terms": "accademia,alma mater,lavagna,collegio,dipartimento,disciplina,classe,facoltà,aula,istituto,istituzione,riformatorio,scuola,edificio scolastico,seminario,università"
             },
             "amenity/swimming_pool": {
                 "name": "Piscina"
             },
             "amenity/taxi": {
-                "name": "Posteggio Taxi"
+                "name": "Posteggio Taxi",
+                "terms": "taxi"
             },
             "amenity/telephone": {
                 "name": "Telefono"
             },
             "amenity/theatre": {
-                "name": "Teatro"
+                "name": "Teatro",
+                "terms": "teatro,spettacoli,giochi,musical"
             },
             "amenity/toilets": {
-                "name": "Bagni"
+                "name": "Bagni",
+                "terms": "bagno,bagni pubblici,toilette"
             },
             "amenity/townhall": {
-                "name": "Municipio"
+                "name": "Municipio",
+                "terms": "sala del comune,palazzo di governo,tribunale,munipio"
             },
             "amenity/university": {
-                "name": "Università"
+                "name": "Università",
+                "terms": "college"
             },
             "amenity/waste_basket": {
-                "name": "Cestino della spazzatura"
+                "name": "Cestino della spazzatura",
+                "terms": "sacchetto della spazzatura,cestino della spazzatura,cassonetto della spazzatura,cassonetto,cestino"
             },
             "area": {
                 "name": "Area"
@@ -898,7 +949,8 @@
                 "name": "grata blocca-bestiame"
             },
             "barrier/city_wall": {
-                "name": "Mura cittadine"
+                "name": "Mura cittadine",
+                "terms": "mura,cinta,mura cittadine,cinta muraria,muro"
             },
             "barrier/cycle_barrier": {
                 "name": "Barriera per veicoli a due ruote"
@@ -945,9 +997,15 @@
             "building/apartments": {
                 "name": "Appartamenti"
             },
+            "building/commercial": {
+                "name": "Edificio commerciale"
+            },
             "building/entrance": {
                 "name": "Entrata"
             },
+            "building/garage": {
+                "name": "Garage"
+            },
             "building/house": {
                 "name": "Casa"
             },
@@ -963,6 +1021,9 @@
             "emergency/ambulance_station": {
                 "name": "Stazione ambulanze"
             },
+            "emergency/fire_hydrant": {
+                "name": "Idrante"
+            },
             "emergency/phone": {
                 "name": "Telefono di Emergenza"
             },
@@ -973,19 +1034,22 @@
                 "name": "Strada"
             },
             "highway/bridleway": {
-                "name": "Ippovia"
+                "name": "Ippovia",
+                "terms": "ippovia, percorso per cavalli, percorso equestre"
             },
             "highway/bus_stop": {
                 "name": "Fermata dell'autobus"
             },
             "highway/crossing": {
-                "name": "Attraversamento"
+                "name": "Attraversamento",
+                "terms": "attraversamento pedonale,strisce pedonali,attraversamento,dosso"
             },
             "highway/cycleway": {
                 "name": "Percorso ciclabile"
             },
             "highway/footway": {
-                "name": "Percorso pedonale"
+                "name": "Percorso pedonale",
+                "terms": "percorso battuto,viale,pista pedonale,strada,corsia,percorso,sentiero,cammino,strada,rotta,via,traiettoria,camminata"
             },
             "highway/living_street": {
                 "name": "Strada residenziale prevalentemente pedonale"
@@ -1000,7 +1064,8 @@
                 "name": "Svincolo da o verso Autostrada"
             },
             "highway/motorway_link": {
-                "name": "Raccordo autostradale"
+                "name": "Raccordo autostradale",
+                "terms": "svincolo,rampa"
             },
             "highway/path": {
                 "name": "Sentiero"
@@ -1012,7 +1077,8 @@
                 "name": "Strada di importanza nazionale"
             },
             "highway/primary_link": {
-                "name": "Svincolo da o verso una strada di importanza nazionale"
+                "name": "Svincolo da o verso una strada di importanza nazionale",
+                "terms": "svincolo,rampa"
             },
             "highway/residential": {
                 "name": "Strada residenziale"
@@ -1024,7 +1090,8 @@
                 "name": "Strada di importanza regionale"
             },
             "highway/secondary_link": {
-                "name": "Svincolo da o verso una strada di importanza regionale"
+                "name": "Svincolo da o verso una strada di importanza regionale",
+                "terms": "svincolo,rampa"
             },
             "highway/service": {
                 "name": "Strada di servizio"
@@ -1045,25 +1112,29 @@
                 "name": "Corsia di un parcheggio"
             },
             "highway/steps": {
-                "name": "Scale"
+                "name": "Scale",
+                "terms": "scale,scalinata,gradini"
             },
             "highway/tertiary": {
                 "name": "Strada di importanza locale"
             },
             "highway/tertiary_link": {
-                "name": "Svincolo da o verso una strada di importanza comunale"
+                "name": "Svincolo da o verso una strada di importanza comunale",
+                "terms": "svincolo,rampa"
             },
             "highway/track": {
                 "name": "Strada ad uso agricolo / forestale"
             },
             "highway/traffic_signals": {
-                "name": "Semaforo"
+                "name": "Semaforo",
+                "terms": "semaforo,luce semaforica,lanterna semaforica"
             },
             "highway/trunk": {
                 "name": "Superstrada"
             },
             "highway/trunk_link": {
-                "name": "Svincolo da o verso una superstrada"
+                "name": "Svincolo da o verso una superstrada",
+                "terms": "svincolo,rampa"
             },
             "highway/turning_circle": {
                 "name": "Slargo per inversione"
@@ -1165,7 +1236,8 @@
                 "name": "Marina"
             },
             "leisure/park": {
-                "name": "Parco"
+                "name": "Parco",
+                "terms": "lungomare,tenuta,foresta,giardino,prato,verde,terreni,lotto,pascolo,parco,parco giochi,area ricreativa,piazza,giardino pubblico,bosco"
             },
             "leisure/pitch": {
                 "name": "Campo da gioco"
@@ -1189,7 +1261,8 @@
                 "name": "Campo di Pallavolo"
             },
             "leisure/playground": {
-                "name": "Parco giochi"
+                "name": "Parco giochi",
+                "terms": "area giochi,scivolo,parco,giochi"
             },
             "leisure/slipway": {
                 "name": "Scivolo per barche"
@@ -1200,6 +1273,9 @@
             "leisure/swimming_pool": {
                 "name": "Piscina"
             },
+            "leisure/track": {
+                "name": "Pista"
+            },
             "line": {
                 "name": "Linea"
             },
@@ -1228,7 +1304,8 @@
                 "name": "Torre"
             },
             "man_made/wastewater_plant": {
-                "name": "Impianto di depurazione delle acque"
+                "name": "Impianto di depurazione delle acque",
+                "terms": "fognatura, impianto di trattamento delle acque nere, impianto di purificazione dell'acqua,impianto di trattamento delle acque reflue,depuratore"
             },
             "man_made/water_tower": {
                 "name": "Torre Idrica"
@@ -1252,7 +1329,8 @@
                 "name": "Scogliera"
             },
             "natural/coastline": {
-                "name": "Linea di costa"
+                "name": "Linea di costa",
+                "terms": "riva,linea di costa,costiera,costa"
             },
             "natural/glacier": {
                 "name": "Ghiacciaio"
@@ -1264,7 +1342,8 @@
                 "name": "Brughiera"
             },
             "natural/peak": {
-                "name": "Picco"
+                "name": "Picco",
+                "terms": "culmine,guglia,alpe,apice,cresta,sommità,cima,cocuzzolo,collina,monte,montagna,pinnacolo,estremità,vertice,vetta,piz"
             },
             "natural/scrub": {
                 "name": "Macchia mediterranea"
@@ -1279,10 +1358,12 @@
                 "name": "Specchio d'acqua"
             },
             "natural/water/lake": {
-                "name": "Lago"
+                "name": "Lago",
+                "terms": "stagno,lago,laghetto"
             },
             "natural/water/pond": {
-                "name": "Stagno"
+                "name": "Stagno",
+                "terms": "laghetto,gora,pozza"
             },
             "natural/water/reservoir": {
                 "name": "Bacino idrico"
@@ -1306,7 +1387,8 @@
                 "name": "Paese"
             },
             "place/island": {
-                "name": "Isola"
+                "name": "Isola",
+                "terms": "arcipelago,atollo,banco,isola,isolotto,scoglio"
             },
             "place/isolated_dwelling": {
                 "name": "Case Sparse"
@@ -1326,6 +1408,9 @@
             "power": {
                 "name": "Energia"
             },
+            "power/generator": {
+                "name": "Generatore di energia"
+            },
             "power/line": {
                 "name": "Linea elettrica"
             },
@@ -1351,7 +1436,8 @@
                 "name": "Ferrovia in disuso"
             },
             "railway/level_crossing": {
-                "name": "Passaggio a livello"
+                "name": "Passaggio a livello",
+                "terms": "passaggio a livello,incrocio ferroviario"
             },
             "railway/monorail": {
                 "name": "Monorotaia"
@@ -1372,7 +1458,8 @@
                 "name": "Entrata di metropolitana"
             },
             "railway/tram": {
-                "name": "Tram"
+                "name": "Tram",
+                "terms": "tram,rotaia,trasporto pubblico"
             },
             "relation": {
                 "name": "Relazione"
@@ -1384,7 +1471,8 @@
                 "name": "Negozio"
             },
             "shop/alcohol": {
-                "name": "Negozio di liquori"
+                "name": "Negozio di liquori",
+                "terms": "alcool,liquori,grappa,rum,vodka"
             },
             "shop/bakery": {
                 "name": "Panificio"
@@ -1447,7 +1535,8 @@
                 "name": "Negozio di elettronica"
             },
             "shop/farm": {
-                "name": "Banchetto Alimentari Freschi"
+                "name": "Banchetto Alimentari Freschi",
+                "terms": "negozio agricolo,banchetto agricolo,banchetto"
             },
             "shop/fishmonger": {
                 "name": "Pescivendolo"
@@ -1519,7 +1608,8 @@
                 "name": "Negozio di cancelleria"
             },
             "shop/supermarket": {
-                "name": "Supermercato"
+                "name": "Supermercato",
+                "terms": "bazar,boutique,negozio,discount,mercato delle pulci,galleria,centro commerciale,mercato,outlet,chiosco,supermercato,negozio dell'usato"
             },
             "shop/toys": {
                 "name": "Negozio di giocattoli"
@@ -1540,10 +1630,12 @@
                 "name": "Videoteca"
             },
             "tourism": {
-                "name": "Turismo"
+                "name": "Turismo",
+                "terms": "turismo,attrazione,turistica,interesse,turisti,escursionismo,viaggio,gita"
             },
             "tourism/alpine_hut": {
-                "name": "Rifugio"
+                "name": "Rifugio",
+                "terms": "rifugio,bivacco,dormitorio,malga"
             },
             "tourism/artwork": {
                 "name": "Opera d'arte"
@@ -1561,7 +1653,8 @@
                 "name": "Chalet"
             },
             "tourism/guest_house": {
-                "name": "Affittacamere"
+                "name": "Affittacamere",
+                "terms": "B&B,Bed & Breakfast,Bed and Breakfast"
             },
             "tourism/hostel": {
                 "name": "Ostello"
@@ -1576,7 +1669,8 @@
                 "name": "Motel"
             },
             "tourism/museum": {
-                "name": "Museo"
+                "name": "Museo",
+                "terms": "esibizione,mostra,esposizione,fondazione,galleria,archivio,istituzione,serraglio,sala,salone,tesoreria,pinacoteca,magazzino,caveau,palazzo"
             },
             "tourism/picnic_site": {
                 "name": "Area picnic"
@@ -1657,13 +1751,15 @@
                 "name": "Canale di scolo"
             },
             "waterway/river": {
-                "name": "Fiume"
+                "name": "Fiume",
+                "terms": "ruscello,affluente,corso d'acqua,torrente,estuario,rivolo,rigagnolo,immissario"
             },
             "waterway/riverbank": {
                 "name": "Argine"
             },
             "waterway/stream": {
-                "name": "Torrente"
+                "name": "Torrente",
+                "terms": "fiumiciattolo,ramo,ruscello,corso,torrente,corrente,deriva,flusso,rivolo,rigagnolo"
             },
             "waterway/weir": {
                 "name": "Sbarramento"

diff --git a/vendor/assets/iD/iD/locales/ja.json b/vendor/assets/iD/iD/locales/ja.json
index bad6b5bc41882acb5dc1845b82a37ddb41f23637..2c6fe12d16f1b9dea93581be622c2ee33c2e2e6d 100644 (file)
--- a/vendor/assets/iD/iD/locales/ja.json
+++ b/vendor/assets/iD/iD/locales/ja.json
@@ -167,9 +167,11 @@
         }
     },
     "undo": {
+        "tooltip": "もとに戻す: {action}",
         "nothing": "やり直す変更点がありません"
     },
     "redo": {
+        "tooltip": "再実行: {action}",
         "nothing": "やり直した変更点がありません"
     },
     "tooltip_keyhint": "ショートカット",
@@ -239,6 +241,8 @@
         "title": "背景画像",
         "description": "背景画像設定",
         "percent_brightness": "明度 {opacity}%",
+        "custom": "カスタム",
+        "custom_prompt": "タイル表示のテンプレートを入力。Z/X/Y スキーマに対して {z}, {x}, {y} を与え、 quadtile schemeには {u} を与える記法で記述します。",
         "fix_misalignment": "背景画像をずらす",
         "reset": "設定リセット"
     },
@@ -261,7 +265,9 @@
         "just_edited": "OpenStreetMap編集完了！",
         "view_on_osm": "詳細情報確認",
         "facebook": "Facebookでシェア",
-        "tweet": "Tweet"
+        "twitter": "Twitterでシェア",
+        "google": "Google+でシェア",
+        "help_html": "あなたが投稿した内容は数分で\"標準\"レイヤーに反映されます。その他のレイヤーへの適用や、記述した地物によっては反映にさらに時間がかかる場合があります。\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map'>詳細</a>)\n"
     },
     "confirm": {
         "okay": "OK"
@@ -308,7 +314,8 @@
         "imagery": "# 背景画像\n\n地図を作成するにあたって、航空写真は重要なリソースのひとつです。上空からの撮影、衛星写真、自由な利用が認められた情報源などは、画面左側の'背景画像設定'メニューから表示させることが可能です。\n\nデフォルト設定では[Bing Maps](http://www.bing.com/maps/)の衛星写真レイヤーが表示されていますが、地図のズームレベル変更などで新しい場所を表示する際に別のリソースを表示させることが可能です。英国やフランス、デンマークでは、特定の地域に限り非常に細密な画像が利用可能です。\n\n画像提供側の間違いが原因で、背景画像と地図データの位置がずれていることがあります。既存道路の多くが一方向にずれている場合、すべての地物の位置を一度に移動させてしまう前に背景画像の表示位置を調整し、オフセットがされていないか確認を行なってください。位置の調整は、背景画像設定の一番下に表示されている'背景画像をずらす'という項目から行うことができます。\n",
         "addresses": "# 住所\n\n住所情報は地図において最も有用な情報のひとつです。\n\n住所情報は街路の付帯情報として扱われることがほとんどですが、OpenStreetMapにおける住所情報は、街路にそって配置されている建物の属性として記録されます。\n\n住所情報は建物を表す輪郭に付与しても構いませんし、独立したポイントとして配置してもかまいません。また、住所データの最適な情報源は現地調査、あるいは個人の記憶によるものです。GoogleMapsなど、他の地図からの転載は特別な許諾がない限り固く禁止されています。\n\n注: 日本では住所システムの体系が異なるため、街路を基とする上記の方法を適用することはできません。\n",
         "inspector": "# 地物情報表示ウィンドウ\n\n地図上の地物を選択すると、画面右側に入力ウィンドウが表示されます。地物に関する詳細情報の編集はこのウィンドウから行います。\n\n### 地物種別の選択\n\nポイントやライン、エリアを描画する際、描いた地物の種別を選択することができます。これによって、ラインが高速道路なのか住宅道路なのか、ポイントがスーパーマーケットなのか喫茶店なのか、などを表現します。地物情報表示ウィンドウには、よく利用される地物が表示されています。その他の地物を表示させたい場合は、検索ボックスから検索を行なってください。\n\n地物種別が表示されている右下にある'i'ボタンをクリックすることで、その種別の詳細情報を表示させることができます。アイコンをクリックすることで、種別を確定させることができます。\n\n### フォームを利用したタグ編集\n\n地物の種別を選択した後、あるいは既になんらかの種別が割り当て済の対象を選択した際には、その地物の名称や住所などの詳細情報がウィンドウ内に表示されます。\n\n表示中のフィールドの下部にあるアイコンをクリックすると、追加の入力フィールドが表示されます。例えば[Wikipedia](http://www.wikipedia.org/)情報や、車椅子の利用可否などです。\n\n入力ウィンドウの一番下に配置されている 'タグ項目を追加'をクリックすると、要素に対する自由記入フォームが表示されます。利用されることが多いタグの組み合わせは[Taginfo](http://taginfo.openstreetmap.org/)から検索が可能です。\n\n入力ウィンドウに記入した内容は、エディタ上の地図に即座に反映されます。'やり直し'ボタンをクリックすることで、いつでも入力内容を取り消すことが可能です。\n\n### 地物情報表示ウィンドウを閉じる\n\nウィンドウを閉じるには、ウィンドウ右上のXボタンをクリックするか、キーボードの'Escape'キーを押すか、地図上のどこかをクリックしてください。\n",
-        "buildings": "# 建物\n\nOpenStreetMapは世界でも有数の建物情報データベースです。このデータベースへの情報追加や改善は誰しもが参加可能です。\n\n### 選択\n\n建物の輪郭をクリックすると、その建物を選択することができます。建物はハイライト表示され、小さなツール項目と、画面右側にその建物の詳細情報が表示されます。\n\n### 修正\n\n建物の位置や、付与されているタグが誤っていることがあります。\n\n建物全体の位置を移動させるには、'移動'ツールのアイコンをクリックしてください。マウスを動かして建物を正しい位置へ移動させ、もう一度クリックして位置を確定させます。\n\n同様に、建物を形成しているポイントをクリックして正しい位置へ移動させることで、建物の形状を修正することができます。\n\n### 新規作成\n\nOpenStreetMapで建物を描く場合によくあがる質問として、建物をエリアとポイントのどちらで描いたほうがよいか、というものがあります。最善の方法では _できる限り、建物はエリアとして描き_  、会社や個人宅、施設など、建物から独立した情報は別途ポイントとして、エリアとして描かれた建物の内側に配置します。\n\n画面左上に表示されている項目から'エリア'ボタンをクリックして、建物をエリアとして描いてみましょう。エリアの描画を終了するにはキーボードの'Return'キーを押すか、エリアを描き始めたポイントをもう一度クリックしてください。\n\n### 削除\n\nもし建物の情報が完全に間違っている場合 - 衛星写真に映っておらず、より理想としては実際に現地で建物が無いことを確認できた場合 - その建物データそのものを削除し、地図から消去することが可能です。地物を削除する際の注意として、編集結果は他の編集と同様すべての利用者の目に触れること、また、衛星写真は撮影日時が古い可能性があり、建物が新しく建設されているかもしれないことを意識してください。\n\n建物を削除するには、対象をクリックして選択し、ツール項目からゴミ箱アイコンをクリックするか、'Delete'キーを押してください。\n"
+        "buildings": "# 建物\n\nOpenStreetMapは世界でも有数の建物情報データベースです。このデータベースへの情報追加や改善は誰しもが参加可能です。\n\n### 選択\n\n建物の輪郭をクリックすると、その建物を選択することができます。建物はハイライト表示され、小さなツール項目と、画面右側にその建物の詳細情報が表示されます。\n\n### 修正\n\n建物の位置や、付与されているタグが誤っていることがあります。\n\n建物全体の位置を移動させるには、'移動'ツールのアイコンをクリックしてください。マウスを動かして建物を正しい位置へ移動させ、もう一度クリックして位置を確定させます。\n\n同様に、建物を形成しているポイントをクリックして正しい位置へ移動させることで、建物の形状を修正することができます。\n\n### 新規作成\n\nOpenStreetMapで建物を描く場合によくあがる質問として、建物をエリアとポイントのどちらで描いたほうがよいか、というものがあります。最善の方法では _できる限り、建物はエリアとして描き_  、会社や個人宅、施設など、建物から独立した情報は別途ポイントとして、エリアとして描かれた建物の内側に配置します。\n\n画面左上に表示されている項目から'エリア'ボタンをクリックして、建物をエリアとして描いてみましょう。エリアの描画を終了するにはキーボードの'Return'キーを押すか、エリアを描き始めたポイントをもう一度クリックしてください。\n\n### 削除\n\nもし建物の情報が完全に間違っている場合 - 衛星写真に映っておらず、より理想としては実際に現地で建物が無いことを確認できた場合 - その建物データそのものを削除し、地図から消去することが可能です。地物を削除する際の注意として、編集結果は他の編集と同様すべての利用者の目に触れること、また、衛星写真は撮影日時が古い可能性があり、建物が新しく建設されているかもしれないことを意識してください。\n\n建物を削除するには、対象をクリックして選択し、ツール項目からゴミ箱アイコンをクリックするか、'Delete'キーを押してください。\n",
+        "relations": "# リレーション\n\nリレーションとはOpenStreetMapで地物を表現する際の特殊な記法で、複数の地物をひとつのグループとして扱うことが可能です。例えばリレーションでよく使われるものは、特定の高速道路や有料道路を複数のウェイを使って表現する *route リレーション* 、そして複数のラインをグループ化することによって分割されたエリアやドーナツ型の空洞部分などの複雑な表現を行う *マルチポリゴン* があげられます。\n\nリレーションを構成する地物は *メンバー* と呼ばれます。OSM上の地物がどのリレーションのメンバーになっているかはサイドバーに表示され、選択することが可能です。リレーションを選択するとその所属メンバーがすべてサイドバーにリストアップされ、地図上にその位置がハイライト表示されます。\n\niDでは編集中のリレーション情報はほとんどの場合、自動的に補完されます。ただし、例えば位置が間違っている道路をいったん削除して新しく書き直す際などは、書き直した道路ウェイが削除したウェイと同じリレーションに再度所属するように編集するべきです。\n\n## リレーションの編集\n\nリレーションを編集する場合、基本の形は以下のとおりです。\n\nリレーションに地物を追加してメンバーにする場合、まず対象の地物を選択した状態で、サイドバーの \"すべてのリレーション\" に表示されている \"+\" ボタンをクリックします。クリックしたら、リレーションの名称を入力するか、一覧から選んでください。\n\nリレーションを新しく作成する場合は、メンバーとして所属することになる最初の地物を選択した状態で \"すべてのリレーション\" に表示されている \"+\" ボタンをクリックし、\"新しいリレーション\"を選択してください。\n\nリレーションから地物を除外する場合は、対象の地物を選択し、除外を行いたいリレーションの隣に表示されているゴミ箱アイコンをクリックします。\n\nまた、\"結合\"機能を使うことで、空洞部分をもつマルチポリゴンを作成することができます。2つのエリアを描き、それぞれを内側(inner)と外側(outer)とします。次に、キーボードのShiftキーを押しながらそれぞれの地物をクリックし、両方を選択状態にしてから \"結合\" (+) ボタンをクリックしてください。\n"
     },
     "intro": {
         "navigation": {
@@ -690,6 +697,9 @@
             "surface": {
                 "label": "路面種別"
             },
+            "toilets/disposal": {
+                "label": "汚物処理"
+            },
             "tourism": {
                 "label": "タイプ"
             },

diff --git a/vendor/assets/iD/iD/locales/lv.json b/vendor/assets/iD/iD/locales/lv.json
index 7fadcff05b633ede802539d51c0e3f35803ee395..4e86ede1848635ea949e740d62f900dbf1962930 100644 (file)
--- a/vendor/assets/iD/iD/locales/lv.json
+++ b/vendor/assets/iD/iD/locales/lv.json
@@ -207,8 +207,7 @@
     "success": {
         "just_edited": "Jūs nupat rediģējāt OpenStreetMap",
         "view_on_osm": "Apskatīt OSM",
-        "facebook": "Dalīties Facebook",
-        "tweet": "Dalīties Twitter"
+        "facebook": "Dalīties Facebook"
     },
     "confirm": {
         "okay": "Labi"

diff --git a/vendor/assets/iD/iD/locales/nl.json b/vendor/assets/iD/iD/locales/nl.json
index d40e603241f23683db356592fbee75949fda829b..b3bd30c761963373c0baedb2b1c8fa610df302fb 100644 (file)
--- a/vendor/assets/iD/iD/locales/nl.json
+++ b/vendor/assets/iD/iD/locales/nl.json
@@ -260,8 +260,7 @@
         "edited_osm": "OSM aangepast!",
         "just_edited": "Je hebt zojuist OpenStreetMap aangepast!",
         "view_on_osm": "Bekijk op OSM",
-        "facebook": "Deel op Facebook",
-        "tweet": "Tweet"
+        "facebook": "Deel op Facebook"
     },
     "confirm": {
         "okay": "OK"

diff --git a/vendor/assets/iD/iD/locales/pl.json b/vendor/assets/iD/iD/locales/pl.json
index d05f14c1f4f682aab448b3bea7060bdef25e70bd..5d944f88516659a1190c5c30e87adf57da051dc8 100644 (file)
--- a/vendor/assets/iD/iD/locales/pl.json
+++ b/vendor/assets/iD/iD/locales/pl.json
@@ -241,6 +241,7 @@
         "title": "Tło",
         "description": "Ustawienia tła",
         "percent_brightness": "jasność {opacity}%",
+        "custom": "Własne",
         "fix_misalignment": "Wyrównaj podkład",
         "reset": "resetuj"
     },
@@ -263,7 +264,8 @@
         "just_edited": "Właśnie wprowadziłeś zmiany w OpenStreetMap!",
         "view_on_osm": "Zobacz na OSM",
         "facebook": "Podziel się na Facebooku",
-        "tweet": "Tweetnij",
+        "twitter": "Podziel się na Twitterze",
+        "google": "Podziel się na Google+",
         "help_html": "Twoje zmiany powinny się pojawić w przeciągu kilku minut na standardowej warstwie mapy. Odświeżenie innych warstw może potrwać nieco dłużej (<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map'>szczegóły</a>).\n"
     },
     "confirm": {

diff --git a/vendor/assets/iD/iD/locales/pt-BR.json b/vendor/assets/iD/iD/locales/pt-BR.json
index b254445a8ec85f0975298921000efb5ed9c2bba6..829f19780fc497418f701725a39df7e769af4047 100644 (file)
--- a/vendor/assets/iD/iD/locales/pt-BR.json
+++ b/vendor/assets/iD/iD/locales/pt-BR.json
@@ -260,8 +260,7 @@
         "edited_osm": "OSM editado!",
         "just_edited": "Você acaba de editar o OpenStreetMap!",
         "view_on_osm": "Ver no OSM",
-        "facebook": "Compartilhar no Facebook",
-        "tweet": "Tuitar"
+        "facebook": "Compartilhar no Facebook"
     },
     "confirm": {
         "okay": "O.K."

diff --git a/vendor/assets/iD/iD/locales/pt.json b/vendor/assets/iD/iD/locales/pt.json
index 71d9cf06ee2800018e50d4c19b229935e00b5962..6ed7372f0d83e1831e553b48ecfdfd4a5918c024 100644 (file)
--- a/vendor/assets/iD/iD/locales/pt.json
+++ b/vendor/assets/iD/iD/locales/pt.json
@@ -260,8 +260,7 @@
         "edited_osm": "Acabou de editar o OSM!",
         "just_edited": "Acaba de editar o OpenStreetMap!",
         "view_on_osm": "Ver em OSM",
-        "facebook": "Partilhar no Facebook",
-        "tweet": "Partilhar no Twitter"
+        "facebook": "Partilhar no Facebook"
     },
     "confirm": {
         "okay": "OK"

diff --git a/vendor/assets/iD/iD/locales/ru.json b/vendor/assets/iD/iD/locales/ru.json
index ae5ac0b41508ac47faad99832663c8f1f6e5f646..62107632b30fc1ed3fbf35f90467b606750fe293 100644 (file)
--- a/vendor/assets/iD/iD/locales/ru.json
+++ b/vendor/assets/iD/iD/locales/ru.json
@@ -250,8 +250,7 @@
         "edited_osm": "ОСМ отредактирована!",
         "just_edited": "Вы только что отредактировали карту OpenStreetMap!",
         "view_on_osm": "Посмотреть в OSM",
-        "facebook": "Поделиться на Facebook",
-        "tweet": "Затвитить"
+        "facebook": "Поделиться на Facebook"
     },
     "confirm": {
         "okay": "Ок"

diff --git a/vendor/assets/iD/iD/locales/sk.json b/vendor/assets/iD/iD/locales/sk.json
index bb09f09037923837deb7591ad2ab312523de2ecb..5602a96dddeb3c18a168fb7bb590ffef65bcdea2 100644 (file)
--- a/vendor/assets/iD/iD/locales/sk.json
+++ b/vendor/assets/iD/iD/locales/sk.json
@@ -263,7 +263,6 @@
         "just_edited": "Práve ste upravili OpenStreetMap!",
         "view_on_osm": "Zobraz na OSM",
         "facebook": "Zdieľaj na Facebooku",
-        "tweet": "Tweetuj",
         "help_html": "Vaše zmeny by sa mali objaviť na \"Základnej\" vrstve v priebehu niekoľkých minút. Ostatným vrstvám a niektorým objektom to môže trvať dlhšie.\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map'>detaily</a>).\n"
     },
     "confirm": {

diff --git a/vendor/assets/iD/iD/locales/sr.json b/vendor/assets/iD/iD/locales/sr.json
index cc88bdb1d99ece850abbc30d71ac055d5260c44f..6edf05511e9682ce273dab4e015ec3224afabb80 100644 (file)
--- a/vendor/assets/iD/iD/locales/sr.json
+++ b/vendor/assets/iD/iD/locales/sr.json
@@ -241,6 +241,8 @@
         "title": "Позадина",
         "description": "Подешавања позадине",
         "percent_brightness": "{opacity}% прозирност",
+        "custom": "Прилагођена",
+        "custom_prompt": "Унесите образац плочица. Важеће вредности су {z}, {x}, {y} за Z/X/Y шему и {u} за квадратну шему.",
         "fix_misalignment": "Поправи поравнање",
         "reset": "ресетовање"
     },
@@ -263,7 +265,9 @@
         "just_edited": "Управо сте уређивали OpenStreetMap!",
         "view_on_osm": "Преглед на OSM",
         "facebook": "Подели на Фејсбуку",
-        "tweet": "Твитуј"
+        "twitter": "Подели на Твитеру",
+        "google": "Подели на Гугл+",
+        "help_html": "Ваше измене би требало да се појаве у „стандардном“ слоју за неколико минута. За остале слојеви, и још неке могућности, може потрајати дуже\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map'>детаљи</a>).\n"
     },
     "confirm": {
         "okay": "У реду"
@@ -310,7 +314,8 @@
         "imagery": "# Снимци\n\nСнимци из ваздуха су важан ресурс за мапирање. Комбинација \nавионских прелета, сателитских приказа и слободно састављених извора су на \nрасполагању у уређивачу испод менија 'Подешавања позадине' са леве стране.\n\nПодразумевано је представљен [Bing Maps] (http://www.bing.com/maps/) слој \nсателитских снимака у уређивачу, али као померате и увећавате мапу на нова географска \nподручја, нови извори ће постати доступни. Неке земље, попут Сједињених \nДржава, Француске и Данске имају веома квалитетне снимке доступна за неке области.\n\nСнимак је некада померен у односу на податке на мапи због грешке од страни \nдобављача снимака. Ако видите много путева померених у односу на позадину, \nнемојте их одмах преместити све да одговарају позадини. Уместо тога можете подесити \nслике тако да одговарају постојећим подацима кликом на 'Поправи поравнање' на \nдну интерфејса Подешавање позадине.\n",
         "addresses": "# Адресе\n\nАдресе су једне од најкориснијих информација на мапи.\n\nИако су адресе често представљене као делови улица, у Опенстреетмап\nсу забележене као атрибути објеката и места дуж улица.\n\nМожете да додате информације о адреси на местима мапираним као основе зграде\nкао и оних мапираних као појединачне тачке. Оптимални извор података  адреса\nје од премеравања на терену или лично знање - као и са било којим \nдругим објектом, копирање са комерцијалних извора, као што су Гугл мапе је строго\nзабрањено.\n",
         "inspector": "# Коришћење инспектора\n\nИнспектор је елемент корисничког интерфејса на десној страни странице \nкоја се појављује када је објекат изабран и омогућава вам да измените његове детаље.\n\n### Избор врсте карактеристика\n\nНакон што додате чвор, линију, или област, можете да изаберете врсту карактеристика, \nредимо да ли је аутопут или стамбени пут, супермаркет или кафе.\nИнспектор ће приказати иконице за најчешће врсте карактеристика, а друге можете\nпронаћи куцањем оног што тражите у поље за претрагу.\n\nКликните на 'i' у доњем десном углу дугмета врсте могућности како бисте\nсазнали више о томе. Кликните на дугме како бисте изабрали дату врсту.\n\n### Коришћење образаца и уређивање ознака\n\nНакон што одаберете посебну врсту, или када изаберете објекат која већ\nима додељену врсту, инспектор ће приказати поља са детаљима о\nкарактеристикама као што су име и адреса.\n\nИспод поља које видите, можете да кликнете на иконе да бисте додали друге детаље,\nкао што су информације са [Википедије] (http://www.wikipedia.org/), приступ инвалидским \nколицима, и више од тога.\n\nНа дну инспектора, кликните на 'Додатне ознаке' да бисте произвољно додали \nдруге ознаке елементу. [Taginfo](http://taginfo.openstreetmap.org/) је\nобиман ресурс ако желите да за сазнате више о популарним комбинацијама ознака.\n\nПромене које направите у инспектора ће се аутоматски применити на мапи.\nМожете их опозвати у било ком тренутку тако што ћете кликнути на дугме 'Опозови'.\n\n### Затварање инспектора\n\nМожете да затворите инспектор кликом на дугме за затварање на врху десно,\nпритиском на тастер 'Escape', или кликом на мапу.\n",
-        "buildings": "# Грађевине\n\nОпенстреетмап је највећа база података грађевина на свету. Можете правити \nи побољшати ову базу података.\n\n### Избор\n\nМожете изабрати грађевину кликом на њене оквире. То ће истаћи\nграђевину и отворити мали мени са алатима и траку са стране која приказује више \nинформација о грађевини.\n\n### Измена\n\nПонекад су зграде погрешно постављене или имају погрешне ознаке.\n\nДа бисте преместили читав објекат, изаберите га, а затим кликните на алат 'Премести'. Померите\nмиша да бисте преместили грађевину, и кликните поново када је правилно поставите.\n\nДа бисте поправили одређени облик грађевине, кликните и превуците чворове који чине\nњене границе на праве локације.\n\n### Прављење\n\nЈедно од главних недоумица око додавања грађевине на мапу јесте да\nОпенстреетмап заправо чува грађевине и као облик и као тачке. Правило\nје да се _мапирају грађевине као облик кад год је то могуће_, а да се мапирају предузећа, куће,\nпогодности, као и друге ствари које функционишу унутар грађевина као тачке постављене\nунутар облика зграде.\n\nПочните цртање грађевине као облика тако што ћете кликнути на дугме 'Област' на врху\nлево интерфејса, и завршите је било притиском на тастер 'Return' на тастатури\nили кликом на први исцртани чвор којим се затвара облик.\n\n### Брисање\n\nАко је грађевина потпуно неисправна - можете видети да она не постоји на сателитским\nснимцима и у најбољем случају потврђено је локално да није присутан - можете је избрисати, \nчиме се уклања са мапе. Будите опрезни приликом брисања објеката -\nкао и све друге измене, резултате виде сви, а сателитски снимци\nсу често застарели, тако да објекат може бити у новије време изграђен.\n\nМожете обрисати грађевину кликом на њу да бисте је изабрали, затим кликните\nна икону канте за смеће или притиском на тастер 'Delete'.\n"
+        "buildings": "# Грађевине\n\nОпенстреетмап је највећа база података грађевина на свету. Можете правити \nи побољшати ову базу података.\n\n### Избор\n\nМожете изабрати грађевину кликом на њене оквире. То ће истаћи\nграђевину и отворити мали мени са алатима и траку са стране која приказује више \nинформација о грађевини.\n\n### Измена\n\nПонекад су зграде погрешно постављене или имају погрешне ознаке.\n\nДа бисте преместили читав објекат, изаберите га, а затим кликните на алат 'Премести'. Померите\nмиша да бисте преместили грађевину, и кликните поново када је правилно поставите.\n\nДа бисте поправили одређени облик грађевине, кликните и превуците чворове који чине\nњене границе на праве локације.\n\n### Прављење\n\nЈедно од главних недоумица око додавања грађевине на мапу јесте да\nОпенстреетмап заправо чува грађевине и као облик и као тачке. Правило\nје да се _мапирају грађевине као облик кад год је то могуће_, а да се мапирају предузећа, куће,\nпогодности, као и друге ствари које функционишу унутар грађевина као тачке постављене\nунутар облика зграде.\n\nПочните цртање грађевине као облика тако што ћете кликнути на дугме 'Област' на врху\nлево интерфејса, и завршите је било притиском на тастер 'Return' на тастатури\nили кликом на први исцртани чвор којим се затвара облик.\n\n### Брисање\n\nАко је грађевина потпуно неисправна - можете видети да она не постоји на сателитским\nснимцима и у најбољем случају потврђено је локално да није присутан - можете је избрисати, \nчиме се уклања са мапе. Будите опрезни приликом брисања објеката -\nкао и све друге измене, резултате виде сви, а сателитски снимци\nсу често застарели, тако да објекат може бити у новије време изграђен.\n\nМожете обрисати грађевину кликом на њу да бисте је изабрали, затим кликните\nна икону канте за смеће или притиском на тастер 'Delete'.\n",
+        "relations": "# Односи\n\nОднос је посебна врста обележја у Опенстреетмапама која групише друга обележја. На пример, две основне врсте односа су *односи путева* којим се групишу заједно деонице пута које припадају одређеном аутопуту или магистралном путу, и * вишеструки полигони* којим се групише заједно неколико линија које дефинишу сложену област (један полигон од више делова или са рупом у себи попут крофне).\n\nГрупа обележја у односу се називају *чланови*. На бочној траци, можете видети којем односу припада обележје, и ту кликнути на релацију да бисте је изабрали. Када је однос изабран, можете видети све његове чланове наведени у бочној траци и означене на мапи.\n\nУ већини случајева, iD ће се побринути о одржавању односа аутоматски док правите измене. Најважнија ствар које би требало да будете свесни јесте да ако избришете део пута да бисте га прецизније исцртали, требало би да се уверите и да је нови одељак члан истог односа као и оригинал.\n\n## Уређивање односа\n\nАко желите да измените односе, овде су дате основе.\n\nДа бисте додали обележје у однос, изаберите обележје, кликните на дугме „+“ у одељку „Сви односи“ бочне траке, и изаберите или упишите име односа.\n\nДа бисте креирали нови однос, изаберите прво обележје које би требало да буде члан,\nкликните на дугме „+“ у одељку „Сви односи“, и одаберите „Нови однос...“.\n\nДа бисте уклонили обележје из односа, изаберите обележје и кликните на иконицу смеће\nпоред односа из којег желите да га уклоните.\n\nМожете да креирате вишеструке полигоне са рупама помоћу алат „Споји“. Нацртајте две области (унутрашњу и спољашњу), држите тастер Шифт и кликните на сваки од њих да бисте изабрали обоје, а затим кликните на дугме „Споји“ (+) дугме.\n"
     },
     "intro": {
         "navigation": {

diff --git a/vendor/assets/iD/iD/locales/sv.json b/vendor/assets/iD/iD/locales/sv.json
index 1d511b31700c0932fa865c77bcebd4ae107c63c0..3d7e1ac168c0407c4ff8f381d6faff7e3f53a3f5 100644 (file)
--- a/vendor/assets/iD/iD/locales/sv.json
+++ b/vendor/assets/iD/iD/locales/sv.json
@@ -254,8 +254,7 @@
         "edited_osm": "Redigerat OSM!",
         "just_edited": "Du har nu redigerat OpenStreetMap!",
         "view_on_osm": "Visa på OSM",
-        "facebook": "Dela på Facebook",
-        "tweet": "Tweet"
+        "facebook": "Dela på Facebook"
     },
     "confirm": {
         "okay": "Ok"

diff --git a/vendor/assets/iD/iD/locales/te.json b/vendor/assets/iD/iD/locales/te.json
index fea34da84962916a7a1b1992132d8cd061447e91..4c3d7058df44253bf5b5fe8d7aa212f9397328b2 100644 (file)
--- a/vendor/assets/iD/iD/locales/te.json
+++ b/vendor/assets/iD/iD/locales/te.json
@@ -69,8 +69,7 @@
         "unsaved_changes": "భద్రపరచని మార్పులు ఉన్నాయి"
     },
     "success": {
-        "facebook": "ఫేస్‌బుక్‌లో పంచుకోండి",
-        "tweet": "ట్వీటండి"
+        "facebook": "ఫేస్‌బుక్‌లో పంచుకోండి"
     },
     "confirm": {
         "okay": "సరే"

diff --git a/vendor/assets/iD/iD/locales/uk.json b/vendor/assets/iD/iD/locales/uk.json
index fd33075f4e3e0e738b0ebf73974e2f0c9fd58305..02f7ccf444d372969338eb32eedaa71e59620065 100644 (file)
--- a/vendor/assets/iD/iD/locales/uk.json
+++ b/vendor/assets/iD/iD/locales/uk.json
@@ -261,10 +261,9 @@
     "success": {
         "edited_osm": "Відредаговано OSM!",
         "just_edited": "Ви щойно відредагували мапу OpenStreetMap!",
-        "view_on_osm": "Подивтись в OSM",
+        "view_on_osm": "Подивитись в OSM",
         "facebook": "Поділитись на Facebook",
-        "tweet": "у Твітер",
-        "help_html": "Ваші зміни повинні з’явитись в «Стандартному» шарі через кілька хвилин. Зміни інших шарів, та певниї об’єктів,\nможуть відбуватись довше (<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map'>подробиці</a>).\n"
+        "help_html": "Ваші зміни повинні з’явитись в «Стандартному» шарі за кілька хвилин. Зміни інших шарів та певних об’єктів\nможуть відбуватись довше (<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map'>подробиці</a>).\n"
     },
     "confirm": {
         "okay": "Готово"
@@ -520,9 +519,18 @@
             "fee": {
                 "label": "Плата"
             },
+            "fire_hydrant/type": {
+                "label": "Тип"
+            },
             "fixme": {
                 "label": "Потребує виправлення"
             },
+            "generator/source": {
+                "label": "Джерело"
+            },
+            "generator/type": {
+                "label": "Тип"
+            },
             "highway": {
                 "label": "Тип"
             },
@@ -1035,6 +1043,9 @@
                 "name": "Станція швидкої медичної допомоги",
                 "terms": "перша допомога"
             },
+            "emergency/fire_hydrant": {
+                "name": "Пожежний гідрант"
+            },
             "emergency/phone": {
                 "name": "Телефон виклику екстрених служб"
             },
@@ -1423,6 +1434,9 @@
             "power": {
                 "name": "Енергетика"
             },
+            "power/generator": {
+                "name": "Електростанція"
+            },
             "power/line": {
                 "name": "Лінія електропередач"
             },

diff --git a/vendor/assets/iD/iD/locales/vi.json b/vendor/assets/iD/iD/locales/vi.json
index 79547109878489a11466538fcb8debbc6a53c98a..9d6ebd9e1de1d66ffc3ba4345b36c7e994f976ad 100644 (file)
--- a/vendor/assets/iD/iD/locales/vi.json
+++ b/vendor/assets/iD/iD/locales/vi.json
@@ -241,6 +241,8 @@
         "title": "Hình nền",
         "description": "Tùy chọn Hình nền",
         "percent_brightness": "Độ sáng {opacity}%",
+        "custom": "Tùy biến",
+        "custom_prompt": "Đưa vào định dạng URL của các mảnh bản đồ. Bạn có thể sử dụng các dấu hiệu {z}, {x}, {y} cho định dạng Z/X/Y hoặc {u} cho định dạng quadtile.",
         "fix_misalignment": "Chỉnh lại hình nền bị chệch",
         "reset": "đặt lại"
     },
@@ -263,7 +265,8 @@
         "just_edited": "Bạn vừa sửa đổi OpenStreetMap!",
         "view_on_osm": "Xem tại OSM",
         "facebook": "Chia sẻ trên Facebook",
-        "tweet": "Tweet",
+        "twitter": "Chia sẻ trên Twitter",
+        "google": "Chia sẻ trên Google+",
         "help_html": "Các thay đổi của bạn sẽ xuất hiện trên lớp “Chuẩn” trong vòng vài phút. Các lớp và tính năng kia có thể được cập nhật chậm hơn \n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map'>chi tiết</a>).\n"
     },
     "confirm": {
@@ -311,7 +314,8 @@
         "imagery": "# Hình ảnh\n\nẢnh hàng không (chụp từ máy bay, vệ tinh) là tài nguyên quan trọng trong việc vẽ bản đồ. Có sẵn một số nguồn hình ảnh từ máy bay, vệ tinh, và dịch vụ mở trong trình vẽ này, dưới trình đơn “Tùy chọn Hình nền” ở bên trái.\n\nTheo mặc định, trình vẽ hiển thị lớp trên không của [Bản đồ Bing](http://www.bing.com/maps/), nhưng có sẵn nguồn khác tùy theo vị trí đang xem trong trình duyệt. Ngoài ra có hình ảnh rất rõ tại nhiều vùng ở một số quốc gia như Hoa Kỳ, Pháp, và Đan Mạch.\n\nHình ảnh đôi khi bị chệch đối với dữ liệu bản đồ vì dịch vụ hình ảnh có lỗi. Nếu bạn nhận thấy nhiều con đường bị chệch đối với hình nền, xin đừng di chuyển các đường này để trùng hợp với hình ảnh. Thay vì di chuyển các con đường, hãy chỉnh lại hình ảnh để phù hợp với dữ liệu tồn tại bằng cách nhấn “Chỉnh lại hình nền bị chệch” ở cuối hộp Tùy chọn Hình nền.\n",
         "addresses": "# Địa chỉ\n\nĐịa chỉ là những thông tin rất cần thiết trên bản đồ.\n\nTuy bản đồ thường trình bày các địa chỉ như một thuộc tính của đường sá, nhưng OpenStreetMap liên kết các địa chỉ với các tòa nhà hoặc miếng đất dọc đường.\n\nBạn có thể thêm thông tin địa chỉ vào các hình dạng tòa nhà hoặc các địa điểm quan tâm. Tốt nhất là lấy thông tin địa chỉ từ kinh nghiệm cá nhân, thí dụ đi dạo trên phố và ghi chép các địa chỉ hoặc nhớ lại những chi tiết từ hoạt động hàng ngày của bạn. Cũng như bất cứ chi tiết nào, dự án này hoàn toàn cấm sao chép từ các nguồn thương mại như Bản đồ Google.\n",
         "inspector": "# Biểu mẫu\n\nBiểu mẫu là hộp xuất hiện ở bên phải của trang khi nào một đối tượng được chọn. Biểu mẫu này cho phép sửa đổi các chi tiết của các đối tượng được chọn.\n\n### Chọn Thể loại\n\nSau khi thêm địa điểm, đường kẻ, hoặc vùng vào bản đồ, bạn có thể cho biết đối tượng này tượng trưng cho gì, chẳng hạn con đường, siêu thị, hoặc quán cà phê. Biểu mẫu trình bày các nút tiện để chọn các thể loại đối tượng thường gặp, hoặc bạn có thể gõ một vài chữ mô tả vào hộp tìm kiếm để tìm ra các thể loại khác.\n\nNhấn vào hình dấu trang ở phía dưới bên phải của một nút thể loại để tìm hiểu thêm về thể loại đó. Nhấn vào nút để chọn thể loại đó.\n\n### Điền đơn và Gắn thẻ\n\nSau khi bạn chọn thể loại, hoặc nếu chọn một đối tượng đã có thể loại, biểu mẫu trình bày các trường văn bản và điều khiển để xem và sửa các thuộc tính của đối tượng như tên và địa chỉ.\n\nỞ dưới các điều khiển có một số hình tượng có thể nhấn để thêm chi tiết, chẳng hạn tên bài [Wikipedia](http://www.wikipedia.org/) và mức hỗ trợ xe lăn.\n\nNhấn vào “Các thẻ năng cao” ở cuối biểu mẫu để gắn bất cứ thẻ nào vào đối tượng. [Taginfo](http://taginfo.openstreetmap.org/) là một công cụ rất hữu ích để tìm ra những phối hợp thẻ phổ biến.\n\nCác thay đổi trong biểu mẫu được tự động áp dụng vào bản đồ. Bạn có thể nhấn vào nút “Hoàn tác” vào bất cứ lúc nào để hoàn tác các thay đổi.\n\n### Đóng Biểu mẫu\n\nĐể đóng biểu mẫu, nhấn vào nút Đóng ở phía trên bên phải, nhấn phím Esc, hoặc nhấn vào một khoảng trống trên bản đồ.\n",
-        "buildings": "# Tòa nhà\n\nOpenStreetMap là cơ sở dữ liệu tòa nhà lớn nhất trên thế giới. Mời bạn cùng xây dựng và cải tiến cơ sở dữ liệu này.\n\n### Lựa chọn\n\nNhấn vào một vùng tòa nhà để lựa chọn nó. Đường biên của vùng sẽ được tô sáng, một trình đơn giống bảng màu của họa sĩ sẽ xuất hiện gần con trỏ, và thanh bên sẽ trình bày các chi tiết về tòa nhà.\n\n### Sửa đổi\n\nĐôi khi vị trí hoặc các thẻ của một tòa nhà không chính xác.\n\nĐể di chuyển toàn bộ tòa nhà cùng lúc, lựa chọn vùng, rồi nhấn vào công cụ “Di chuyển”. Chuyển con trỏ sang vị trí mới và nhấn chuột để hoàn thành việc di chuyển.\n\nĐể sửa hình dạng của một tòa nhà, kéo các nốt của đường biên sang các vị trí chính xác.\n\n### Vẽ mới\n\nMột trong những điều gây nhầm lẫn là một tòa nhà có thể là vùng hoặc có thể là địa điểm. Nói chung, khuyên bạn _vẽ tòa nhà là vùng nếu có thể_. Nếu tòa nhà chứa hơn một công ty, chỗ ở, hoặc gì đó có địa chỉ, hãy đặt một địa điểm riêng cho mỗi địa chỉ đó và đưa mỗi địa điểm vào trong vùng của tòa nhà.\n\nĐể bắt đầu vẽ tòa nhà, nhấn vào nút “Vùng” ở phía trên bên trái của trình vẽ. Nhấn chuột tại các góc tường, rồi “đóng” vùng bằng cách nhấn phím Return hay Enter hoặc nhấn vào nốt đầu tiên.\n\n### Xóa\n\nHãy tưởng tượng bạn gặp một tòa nhà hoàn toàn sai: bạn không thấy được tòa nhà trong hình ảnh trên không và, theo lý tưởng, cũng đã ghé vào chỗ đó để xác nhận rằng nó không tồn tại. Nếu trường hợp này, bạn có thể xóa tòa nhà hoàn toàn khỏi bản đồ. Xin cẩn thận khi xóa đối tượng: giống như mọi sửa đổi khác, mọi người sẽ thấy được kết quả. Ngoài ra, hình ảnh trên không nhiều khi lỗi thời – có thể mới xây tòa nhà – thành thử tốt nhất là ghé vào chỗ đó để quan sát chắc chắn, nếu có thể.\n\nĐể xóa một tòa nhà, lựa chọn nó bằng cách nhấn vào nó, rồi nhấn vào hình thùng rác hoặc nhấn phím Delete.\n"
+        "buildings": "# Tòa nhà\n\nOpenStreetMap là cơ sở dữ liệu tòa nhà lớn nhất trên thế giới. Mời bạn cùng xây dựng và cải tiến cơ sở dữ liệu này.\n\n### Lựa chọn\n\nNhấn vào một vùng tòa nhà để lựa chọn nó. Đường biên của vùng sẽ được tô sáng, một trình đơn giống bảng màu của họa sĩ sẽ xuất hiện gần con trỏ, và thanh bên sẽ trình bày các chi tiết về tòa nhà.\n\n### Sửa đổi\n\nĐôi khi vị trí hoặc các thẻ của một tòa nhà không chính xác.\n\nĐể di chuyển toàn bộ tòa nhà cùng lúc, lựa chọn vùng, rồi nhấn vào công cụ “Di chuyển”. Chuyển con trỏ sang vị trí mới và nhấn chuột để hoàn thành việc di chuyển.\n\nĐể sửa hình dạng của một tòa nhà, kéo các nốt của đường biên sang các vị trí chính xác.\n\n### Vẽ mới\n\nMột trong những điều gây nhầm lẫn là một tòa nhà có thể là vùng hoặc có thể là địa điểm. Nói chung, khuyên bạn _vẽ tòa nhà là vùng nếu có thể_. Nếu tòa nhà chứa hơn một công ty, chỗ ở, hoặc gì đó có địa chỉ, hãy đặt một địa điểm riêng cho mỗi địa chỉ đó và đưa mỗi địa điểm vào trong vùng của tòa nhà.\n\nĐể bắt đầu vẽ tòa nhà, nhấn vào nút “Vùng” ở phía trên bên trái của trình vẽ. Nhấn chuột tại các góc tường, rồi “đóng” vùng bằng cách nhấn phím Return hay Enter hoặc nhấn vào nốt đầu tiên.\n\n### Xóa\n\nHãy tưởng tượng bạn gặp một tòa nhà hoàn toàn sai: bạn không thấy được tòa nhà trong hình ảnh trên không và, theo lý tưởng, cũng đã ghé vào chỗ đó để xác nhận rằng nó không tồn tại. Nếu trường hợp này, bạn có thể xóa tòa nhà hoàn toàn khỏi bản đồ. Xin cẩn thận khi xóa đối tượng: giống như mọi sửa đổi khác, mọi người sẽ thấy được kết quả. Ngoài ra, hình ảnh trên không nhiều khi lỗi thời – có thể mới xây tòa nhà – thành thử tốt nhất là ghé vào chỗ đó để quan sát chắc chắn, nếu có thể.\n\nĐể xóa một tòa nhà, lựa chọn nó bằng cách nhấn vào nó, rồi nhấn vào hình thùng rác hoặc nhấn phím Delete.\n",
+        "relations": "# Quan hệ\n\nQuan hệ là loại dữ liệu đặc biệt trong OpenStreetMap có khả năng nhóm lại nhiều đối tượng. Có hai loại quan hệ phổ biến nhất: các *quan hệ tuyến đường* nhóm lại các khúc đường trên một xa lộ, còn các *tổ hợp đa giác* (multipolygon) ghép lại một vài đường kẻ định rõ hình dạng của một khu vực có nhiều đa giác riêng hoặc một khu vực có lỗ.\n\nCác đối tượng trực thuộc quan hệ là các *thành viên*. Trong thanh bên, bạn có thể xem đối tượng trực thuộc những quan hệ nào. Nhấn chuột vào một quan hệ ở đấy để chọn nó. Khi nào quan hệ được chọn, các thành viên sẽ được liệt kê trong thanh bên và tô đậm trên bản đồ.\n\nNói chung, iD sẽ tự động quản lý các quan hệ trong lúc sửa đổi. Bạn chỉ cần chú ý rằng, khi nào bạn xóa một khúc đường để vẽ chính xác hơn, bạn phải chắc chắn rằng khúc đường mới cũng trực thuộc cùng quan hệ với khúc đường cũ.\n\n## Sửa đổi Quan hệ\n\niD cho phép sửa đổi các chi tiết cơ bản của quan hệ.\n\nĐể đưa một đối tượng vào quan hệ, chọn đối tượng, bấm nút “+” trong phần “Tất cả các quan hệ” của thanh bên, và chọn quan hệ từ trình đơn hoặc nhập tên của quan hệ.\n\nĐể tạo một quan hệ mới, chọn đối tượng đầu tiên để đưa vào quan hệ, bấm nút “+” trong phần “Tất cả các quan hệ” của thanh bên, và chọn “Quan hệ mới…”.\n\nĐể tháo gỡ một đối tượng khỏi quan hệ, chọn đối tượng vào nhấn chuột vào hình thùng rác bên cạnh quan hệ mà bạn không muốn bao gồm đối tượng.\n\nDùng công cụ “Gộp” để vẽ tổ hợp đa giác, tức thủng lỗ vào một vùng. Vẽ hai vùng (ứng với cạnh bên trong và bên ngoài), giữ phím Shift trong khi nhấn chuột vào các vùng để chọn chúng, và bấm nút “Gộp” (hình +).\n\n"
     },
     "intro": {
         "navigation": {
@@ -693,6 +697,9 @@
             "surface": {
                 "label": "Mặt"
             },
+            "toilets/disposal": {
+                "label": "Phương pháp thải"
+            },
             "tourism": {
                 "label": "Loại"
             },

diff --git a/vendor/assets/iD/iD/locales/zh-TW.json b/vendor/assets/iD/iD/locales/zh-TW.json
index 9f768b9dbf2b783694c16803150987ca9dffaf3c..588d367048ad75c12c9cf68c860221d23a248c80 100644 (file)
--- a/vendor/assets/iD/iD/locales/zh-TW.json
+++ b/vendor/assets/iD/iD/locales/zh-TW.json
@@ -253,7 +253,8 @@
         "just_edited": "您剛剛編輯了OpenStreetMap！",
         "view_on_osm": "於OSM上顯示",
         "facebook": "在 Facebook 上分享",
-        "tweet": "發Tweet"
+        "twitter": "分享到 Twitter",
+        "google": "分享到 Google+"
     },
     "confirm": {
         "okay": "確定"

diff --git a/vendor/assets/iD/iD/locales/zh.json b/vendor/assets/iD/iD/locales/zh.json
index d77e927e2b647f0ec6bd53a4bbd7c62698f99483..388e19081e6dc9886c5c8642297a2ea8bbb2d62d 100644 (file)
--- a/vendor/assets/iD/iD/locales/zh.json
+++ b/vendor/assets/iD/iD/locales/zh.json
@@ -251,8 +251,7 @@
         "edited_osm": "编辑OSM！",
         "just_edited": "你正在编辑的OpenStreetMap！",
         "view_on_osm": "在OSM上查看",
-        "facebook": "在Facebook上分享",
-        "tweet": "Tweet"
+        "facebook": "在Facebook上分享"
     },
     "confirm": {
         "okay": "确定"