diff --git a/Gemfile b/Gemfile
index 8203be230..0cdf8ce7f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 # Require rails
-gem 'rails', '4.0.4'
+gem 'rails', '4.0.5'
 
 # Require things which have moved to gems in ruby 1.9
 gem 'bigdecimal', "~> 1.1.0", :platforms => :ruby_19
diff --git a/Gemfile.lock b/Gemfile.lock
index f095d624f..fc2d4f54b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,34 +2,33 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    actionmailer (4.0.4)
-      actionpack (= 4.0.4)
+    actionmailer (4.0.5)
+      actionpack (= 4.0.5)
       mail (~> 2.5.4)
-    actionpack (4.0.4)
-      activesupport (= 4.0.4)
+    actionpack (4.0.5)
+      activesupport (= 4.0.5)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
     actionpack-page_caching (1.0.2)
       actionpack (>= 4.0.0, < 5)
-    activemodel (4.0.4)
-      activesupport (= 4.0.4)
+    activemodel (4.0.5)
+      activesupport (= 4.0.5)
       builder (~> 3.1.0)
-    activerecord (4.0.4)
-      activemodel (= 4.0.4)
+    activerecord (4.0.5)
+      activemodel (= 4.0.5)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.4)
+      activesupport (= 4.0.5)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.4)
+    activesupport (4.0.5)
       i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     arel (4.0.2)
-    atomic (1.1.15)
     bigdecimal (1.1.0)
     builder (3.1.4)
     capybara (2.2.1)
@@ -41,7 +40,7 @@ GEM
     climate_control (0.0.3)
       activesupport (>= 3.0)
     cliver (0.3.2)
-    cocaine (0.5.3)
+    cocaine (0.5.4)
       climate_control (>= 0.0.3, < 1.0)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
@@ -50,10 +49,10 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.7.0)
-    colorize (0.7.0)
-    composite_primary_keys (6.0.1)
+    colorize (0.7.2)
+    composite_primary_keys (6.0.3)
       activerecord (>= 4.0.0)
-    dalli (2.7.0)
+    dalli (2.7.1)
     deadlock_retry (1.2.0)
     dynamic_form (1.1.4)
     erubis (2.7.0)
@@ -75,10 +74,10 @@ GEM
     jsonify-rails (0.3.2)
       actionpack
       jsonify (< 0.4.0)
-    jwt (0.1.11)
+    jwt (0.1.13)
       multi_json (>= 1.5)
     kgio (2.9.2)
-    konacha (3.2.0)
+    konacha (3.2.2)
       actionpack (>= 3.1, < 5)
       capybara
       colorize
@@ -89,9 +88,9 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
-    mini_portile (0.5.2)
+    mini_portile (0.5.3)
     minitest (4.7.5)
-    multi_json (1.9.0)
+    multi_json (1.10.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     nokogiri (1.6.1)
@@ -124,8 +123,8 @@ GEM
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
     polyglot (0.3.4)
-    psych (2.0.4)
-    r2 (0.2.2)
+    psych (2.0.5)
+    r2 (0.2.3)
     rack (1.5.2)
     rack-cors (0.2.9)
     rack-openid (1.4.2)
@@ -133,34 +132,34 @@ GEM
       ruby-openid (>= 2.1.8)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.4)
-      actionmailer (= 4.0.4)
-      actionpack (= 4.0.4)
-      activerecord (= 4.0.4)
-      activesupport (= 4.0.4)
+    rails (4.0.5)
+      actionmailer (= 4.0.5)
+      actionpack (= 4.0.5)
+      activerecord (= 4.0.5)
+      activesupport (= 4.0.5)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.4)
+      railties (= 4.0.5)
       sprockets-rails (~> 2.0.0)
-    rails-i18n (4.0.1)
+    rails-i18n (4.0.2)
       i18n (~> 0.6)
-      rails (~> 4.0)
-    railties (4.0.4)
-      actionpack (= 4.0.4)
-      activesupport (= 4.0.4)
+      rails (>= 4.0)
+    railties (4.0.5)
+      actionpack (= 4.0.5)
+      activesupport (= 4.0.5)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.1)
+    rake (10.3.1)
     redcarpet (3.1.1)
     rinku (1.7.3)
     ruby-openid (2.5.0)
     sanitize (2.1.0)
       nokogiri (>= 1.4.4)
-    sass (3.2.15)
-    sass-rails (4.0.2)
+    sass (3.2.19)
+    sass-rails (4.0.3)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.2.0)
       sprockets (~> 2.8, <= 2.11.0)
-      sprockets-rails (~> 2.0.0)
+      sprockets-rails (~> 2.0)
     soap4r-ruby1.9 (2.0.5)
     sprockets (2.11.0)
       hike (~> 1.2)
@@ -171,21 +170,20 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    thor (0.18.1)
-    thread_safe (0.2.0)
-      atomic (>= 1.1.7, < 2)
+    thor (0.19.1)
+    thread_safe (0.3.3)
     tilt (1.4.1)
     timecop (0.7.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.39)
-    uglifier (2.4.0)
+    uglifier (2.5.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     validates_email_format_of (1.5.3)
-    vendorer (0.1.14)
-    websocket-driver (0.3.2)
+    vendorer (0.1.15)
+    websocket-driver (0.3.3)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -221,7 +219,7 @@ DEPENDENCIES
   psych
   r2
   rack-cors
-  rails (= 4.0.4)
+  rails (= 4.0.5)
   rails-i18n (~> 4.0.0)
   redcarpet
   rinku (>= 1.2.2)
diff --git a/Vendorfile b/Vendorfile
index 0cca4055c..c2267a6d8 100644
--- a/Vendorfile
+++ b/Vendorfile
@@ -11,13 +11,13 @@ folder 'vendor/assets' do
   end
 
   folder 'leaflet' do
-    file 'leaflet.js', 'http://cdn.leafletjs.com/leaflet-0.7.2/leaflet-src.js'
-    file 'leaflet.css', 'http://cdn.leafletjs.com/leaflet-0.7.2/leaflet.css'
+    file 'leaflet.js', 'http://cdn.leafletjs.com/leaflet-0.7.3/leaflet-src.js'
+    file 'leaflet.css', 'http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css'
 
     [ 'layers.png', 'layers-2x.png',
       'marker-icon.png', 'marker-icon-2x.png',
       'marker-shadow.png' ].each do |image|
-      file "images/#{image}", "http://cdn.leafletjs.com/leaflet-0.7.2/images/#{image}"
+      file "images/#{image}", "http://cdn.leafletjs.com/leaflet-0.7.3/images/#{image}"
     end
 
     from 'git://github.com/kajic/leaflet-locationfilter.git' do
diff --git a/app/assets/images/browse/caravan_park.n.16.png b/app/assets/images/browse/caravan_park.n.16.png
new file mode 100644
index 000000000..a4b35a433
Binary files /dev/null and b/app/assets/images/browse/caravan_park.n.16.png differ
diff --git a/app/assets/images/browse/caravan_park.p.24.png b/app/assets/images/browse/caravan_park.p.24.png
deleted file mode 100644
index 751f5204b..000000000
Binary files a/app/assets/images/browse/caravan_park.p.24.png and /dev/null differ
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 6ac398fc5..09ae367f4 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -22,19 +22,22 @@ var querystring = require('querystring-component');
 
 function remoteEditHandler(bbox, object) {
   var loaded = false,
-      query = {
-          left: bbox.getWest() - 0.0001,
-          top: bbox.getNorth() + 0.0001,
-          right: bbox.getEast() + 0.0001,
-          bottom: bbox.getSouth() - 0.0001
-      };
+    url = document.location.protocol === "https:" ?
+            "https://127.0.0.1:8112/load_and_zoom?" :
+            "http://127.0.0.1:8111/load_and_zoom?",
+    query = {
+        left: bbox.getWest() - 0.0001,
+        top: bbox.getNorth() + 0.0001,
+        right: bbox.getEast() + 0.0001,
+        bottom: bbox.getSouth() - 0.0001
+    };
 
   if (object) query.select = object.type + object.id;
 
   var iframe = $('<iframe>')
     .hide()
     .appendTo('body')
-    .attr("src", "http://127.0.0.1:8111/load_and_zoom?" + querystring.stringify(query))
+    .attr("src", url + querystring.stringify(query))
     .on('load', function() {
       $(this).remove();
       loaded = true;
diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 54ccb88ed..236ed44fc 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -342,9 +342,10 @@ $(document).ready(function () {
 
   $(".describe_location").on("click", function(e) {
     e.preventDefault();
-    var precision = OSM.zoomPrecision(map.getZoom());
+    var center = map.getCenter().wrap(),
+      precision = OSM.zoomPrecision(map.getZoom());
     OSM.router.route("/search?query=" + encodeURIComponent(
-      map.getCenter().lat.toFixed(precision) + "," +
-      map.getCenter().lng.toFixed(precision)));
+      center.lat.toFixed(precision) + "," + center.lng.toFixed(precision)
+    ));
   });
 });
diff --git a/app/assets/javascripts/index/notes.js.erb b/app/assets/javascripts/index/notes.js.erb
index 841ae1f7b..4e45cbe05 100644
--- a/app/assets/javascripts/index/notes.js.erb
+++ b/app/assets/javascripts/index/notes.js.erb
@@ -34,7 +34,9 @@ function initializeNotes(map) {
   });
 
   noteLayer.on('click', function(e) {
-    OSM.router.route('/note/' + e.layer.id);
+    if (e.layer.id) {
+      OSM.router.route('/note/' + e.layer.id);
+    }
   });
 
   function updateMarker(marker, feature) {
diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js
index 81b96635b..61f4a3558 100644
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -1,3 +1,5 @@
+//= require jquery.simulate
+
 OSM.Search = function(map) {
   $(".search_form input[name=query]")
     .on("input", function(e) {
@@ -10,7 +12,18 @@ OSM.Search = function(map) {
 
   $("#sidebar_content")
     .on("click", ".search_more a", clickSearchMore)
-    .on("click", ".search_results_entry a.set_position", clickSearchResult);
+    .on("mouseover", "p.search_results_entry:has(a.set_position)", showSearchResult)
+    .on("mouseout", "p.search_results_entry:has(a.set_position)", hideSearchResult)
+    .on("mousedown", "p.search_results_entry:has(a.set_position)", function () {
+      var moved = false;
+      $(this).one("click", function (e) {
+        if (!moved && !$(e.target).is('a')) {
+          clickSearchResult(this, e);
+        }
+      }).one("mousemove", function () {
+        moved = true;
+      });
+    });
 
   function clickSearchMore(e) {
     e.preventDefault();
@@ -26,8 +39,35 @@ OSM.Search = function(map) {
     });
   }
 
-  function clickSearchResult(e) {
-    var data = $(this).data(),
+  function showSearchResult(e) {
+    var marker = $(this).data("marker");
+
+    if (!marker) {
+      var data = $(this).find("a.set_position").data();
+
+      marker = L.marker([data.lat, data.lon]);
+
+      $(this).data("marker", marker);
+    }
+
+    map.addLayer(marker);
+
+    $(this).closest("li").addClass("selected");
+  }
+
+  function hideSearchResult(e) {
+    var marker = $(this).data("marker");
+
+    if (marker) {
+      map.removeLayer(marker);
+    }
+
+    $(this).closest("li").removeClass("selected");
+  }
+
+  function clickSearchResult(result, e) {
+    var link = $(result).find("a.set_position"),
+      data = link.data(),
       center = L.latLng(data.lat, data.lon);
 
     if (data.minLon && data.minLat && data.maxLon && data.maxLat) {
@@ -36,13 +76,15 @@ OSM.Search = function(map) {
       map.setView(center, data.zoom);
     }
 
-    // Let clicks to object browser links propagate.
-    if (data.type && data.id) return;
-
-    marker.setLatLng(center).addTo(map);
-
     e.preventDefault();
     e.stopPropagation();
+
+    // Let clicks to object browser links propagate.
+    if (data.type && data.id) {
+      link.simulate("click", e);
+    } else {
+      marker.setLatLng(center).addTo(map);
+    }
   }
 
   var marker = L.marker([0, 0], {icon: getUserIcon()});
diff --git a/app/assets/javascripts/leaflet.map.js.erb b/app/assets/javascripts/leaflet.map.js.erb
index 496e29858..f02f9beda 100644
--- a/app/assets/javascripts/leaflet.map.js.erb
+++ b/app/assets/javascripts/leaflet.map.js.erb
@@ -250,8 +250,7 @@ L.Icon.Default.imagePath = "/images";
 L.Icon.Default.imageUrls = {
   "/images/marker-icon.png": "<%= asset_path("images/marker-icon.png") %>",
   "/images/marker-icon-2x.png": "<%= asset_path("images/marker-icon-2x.png") %>",
-  "/images/marker-shadow.png": "<%= asset_path("images/marker-shadow.png") %>",
-  "/images/marker-shadow-2x.png": "<%= asset_path("images/marker-shadow-2x.png") %>"
+  "/images/marker-shadow.png": "<%= asset_path("images/marker-shadow.png") %>"
 };
 
 L.extend(L.Icon.Default.prototype, {
diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 9e614f906..d3268f43b 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -977,7 +977,9 @@ header .search_form {
 .search_results_entry {
   ul li {
     border-bottom: $keyline;
+    cursor: pointer;
     &:first-child { border-top: $keyline; }
+    &.selected { background: #FFFFE6; }
   }
 
   .search_details {
@@ -2439,13 +2441,6 @@ input.richtext_title[type="text"] {
   background-size: cover;
   background-attachment: fixed;
 
-  &.photo-0 { background-image: image-url('about/0.jpg'); .photo-0 { display: block; } }
-  &.photo-1 { background-image: image-url('about/1.jpg'); .photo-1 { display: block; } }
-  &.photo-2 { background-image: image-url('about/2.jpg'); .photo-2 { display: block; } }
-  &.photo-3 { background-image: image-url('about/4.jpg'); .photo-3 { display: block; } }
-  &.photo-4 { background-image: image-url('about/4.jpg'); .photo-4 { display: block; } }
-  &.photo-5 { background-image: image-url('about/5.jpg'); .photo-5 { display: block; } }
-
   .caption {
     max-width: 200px;
     font: 13px/20px Helvetica, Arial, sans-serif;
diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 76c97ba5b..acd88be04 100644
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -53,6 +53,9 @@ class NotesController < ApplicationController
   ##
   # Create a new note
   def create
+    # Check the ACLs
+    raise OSM::APIAccessDenied if Acl.no_note_comment(request.remote_ip)
+
     # Check the arguments are sane
     raise OSM::APIBadUserInput.new("No lat was given") unless params[:lat]
     raise OSM::APIBadUserInput.new("No lon was given") unless params[:lon]
@@ -86,6 +89,9 @@ class NotesController < ApplicationController
   ##
   # Add a comment to an existing note
   def comment
+    # Check the ACLs
+    raise OSM::APIAccessDenied if Acl.no_note_comment(request.remote_ip)
+
     # Check the arguments are sane
     raise OSM::APIBadUserInput.new("No id was given") unless params[:id]
     raise OSM::APIBadUserInput.new("No text was given") if params[:text].blank?
diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 5597fd4ae..e9ec292e8 100644
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -6,7 +6,7 @@ class SiteController < ApplicationController
   before_filter :set_locale
   before_filter :redirect_browse_params, :only => :index
   before_filter :redirect_map_params, :only => [:index, :edit, :export]
-  before_filter :require_user, :only => [:edit, :welcome]
+  before_filter :require_user, :only => [:welcome]
   before_filter :require_oauth, :only => [:index]
 
   def index
@@ -63,6 +63,8 @@ class SiteController < ApplicationController
       require_oauth
       render :action => :index, :layout => map_layout
       return
+    else
+      require_user
     end
 
     if params[:node]
diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index b192a63d5..e70ec204e 100644
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -13,14 +13,20 @@ module BrowseHelper
     # don't look at object tags if redacted, so as to avoid giving
     # away redacted version tag information.
     unless object.redacted?
-      if object.tags.include? "name:#{I18n.locale}"
-        name = t 'printable_name.with_name',  :name => object.tags["name:#{I18n.locale}"].to_s, :id => name
+      locale = I18n.locale.to_s
+
+      while locale =~ /-[^-]+/ and not object.tags.include? "name:#{I18n.locale}"
+        locale = locale.sub(/-[^-]+/, "")
+      end
+
+      if object.tags.include? "name:#{locale}"
+        name = t 'printable_name.with_name_html', :name => content_tag(:bdi, object.tags["name:#{locale}"].to_s ), :id => content_tag(:bdi, name)
       elsif object.tags.include? 'name'
-        name = t 'printable_name.with_name',  :name => object.tags['name'].to_s, :id => name
+        name = t 'printable_name.with_name_html', :name => content_tag(:bdi, object.tags['name'].to_s ), :id => content_tag(:bdi, name)
       end
     end
 
-    return name
+    name
   end
 
   def link_class(type, object)
@@ -57,6 +63,8 @@ module BrowseHelper
       link_to h(wp[:title]), wp[:url], :title => t('browse.tag_details.wikipedia_link', :page => wp[:title])
     elsif url = wiki_link("tag", "#{key}=#{value}")
       link_to h(value), url, :title => t('browse.tag_details.wiki_link.tag', :key => key, :value => value)
+    elsif url = telephone_link(key, value)
+      link_to h(value), url, :title => t('browse.tag_details.telephone_link', :phone_number => value)
     else
       linkify h(value)
     end
@@ -140,4 +148,15 @@ private
       :title => value + section
     }
   end
+
+  def telephone_link(key, value)
+    # does it look like a phone number? eg "+1 (234) 567-8901 " ?
+    return nil unless value =~ /^\s*\+[\d\s\(\)\/\.-]{6,25}\s*$/
+
+    # remove all whitespace instead of encoding it http://tools.ietf.org/html/rfc3966#section-5.1.1
+    # "+1 (234) 567-8901 " -> "+1(234)567-8901"
+    valueNoWhitespace = value.gsub(/\s+/, '')
+
+    return "tel:#{valueNoWhitespace}"
+  end
 end
diff --git a/app/helpers/title_helper.rb b/app/helpers/title_helper.rb
index da4ad8967..8cacdf208 100644
--- a/app/helpers/title_helper.rb
+++ b/app/helpers/title_helper.rb
@@ -1,6 +1,11 @@
 module TitleHelper
   def set_title(title = false)
-    response.headers["X-Page-Title"] = t('layouts.project_name.title') + (title ? ' | ' + title : '')
-    @title = title
+    if title
+      @title = title.gsub("<bdi>", "\u202a").gsub("</bdi>", "\u202c")
+      response.headers["X-Page-Title"] = t('layouts.project_name.title') + ' | ' + @title
+    else
+      @title = title
+      response.headers["X-Page-Title"] = t('layouts.project_name.title')
+    end
   end
 end
diff --git a/app/models/acl.rb b/app/models/acl.rb
index 2db7fb765..e2f163ea5 100644
--- a/app/models/acl.rb
+++ b/app/models/acl.rb
@@ -11,6 +11,10 @@ class Acl < ActiveRecord::Base
     self.match(address, domain).where(:k => "no_account_creation").exists?
   end
 
+  def self.no_note_comment(address, domain = nil)
+    self.match(address, domain).where(:k => "no_note_comment").exists?
+  end
+
   def self.no_trace_download(address, domain = nil)
     self.match(address, domain).where(:k => "no_trace_download").exists?
   end
diff --git a/app/models/way.rb b/app/models/way.rb
index 1da048c96..e78d0df0b 100644
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -12,7 +12,7 @@ class Way < ActiveRecord::Base
   has_many :old_ways, -> { order(:version) }
 
   has_many :way_nodes, -> { order(:sequence_id) }
-  has_many :nodes, -> { order("sequence_id") }, :through => :way_nodes
+  has_many :nodes, :through => :way_nodes
 
   has_many :way_tags
 
diff --git a/app/views/browse/_node.html.erb b/app/views/browse/_node.html.erb
index 581c49b09..873360bb2 100644
--- a/app/views/browse/_node.html.erb
+++ b/app/views/browse/_node.html.erb
@@ -14,7 +14,7 @@
       <h4><%= t 'browse.part_of' %></h4>
       <ul>
         <% node.ways.uniq.each do |way| %>
-          <li><%= link_to h(printable_name(way)), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
+          <li><%= link_to printable_name(way), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
         <% end %>
         <%= render :partial => "containing_relation", :collection => node.containing_relation_members.uniq %>
       </ul>
diff --git a/app/views/browse/_relation_member.html.erb b/app/views/browse/_relation_member.html.erb
index 2673df3c3..0d17de349 100644
--- a/app/views/browse/_relation_member.html.erb
+++ b/app/views/browse/_relation_member.html.erb
@@ -1,6 +1,6 @@
 <%
   member_class = link_class(relation_member.member_type.downcase, relation_member.member)
-  linked_name = link_to h(printable_name(relation_member.member)), { :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, :title => link_title(relation_member.member)
+  linked_name = link_to printable_name(relation_member.member), { :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, :title => link_title(relation_member.member)
   type_str = t'browse.relation_member.type.' + relation_member.member_type.downcase
 %>
   <li class="<%= member_class %>"><%=
@@ -9,4 +9,4 @@
     else
       raw t'browse.relation_member.entry_role', :type => type_str, :name => linked_name, :role => h(relation_member.member_role)
     end
-  %></li>
\ No newline at end of file
+  %></li>
diff --git a/app/views/browse/_way.html.erb b/app/views/browse/_way.html.erb
index aff405dde..b1dffb9ef 100644
--- a/app/views/browse/_way.html.erb
+++ b/app/views/browse/_way.html.erb
@@ -15,10 +15,10 @@
       <ul>
         <% way.way_nodes.each do |wn| %>
           <li>
-            <%= link_to h(printable_name(wn.node)), { :action => "node", :id => wn.node_id.to_s }, :class => link_class('node', wn.node), :title => link_title(wn.node) %>
+            <%= link_to printable_name(wn.node), { :action => "node", :id => wn.node_id.to_s }, :class => link_class('node', wn.node), :title => link_title(wn.node) %>
             <% related_ways = wn.node.ways.reject { |w| w.id == wn.way_id } %>
             <% if related_ways.size > 0 then %>
-              (<%= raw t 'browse.way.also_part_of', :count => related_ways.size, :related_ways => related_ways.map { |w| link_to(h(printable_name(w)), { :action => "way", :id => w.id.to_s }, :class => link_class('way', w), :title => link_title(w) ) }.to_sentence %>)
+              (<%= raw t 'browse.way.also_part_of', :count => related_ways.size, :related_ways => related_ways.map { |w| link_to(printable_name(w), { :action => "way", :id => w.id.to_s }, :class => link_class('way', w), :title => link_title(w) ) }.to_sentence %>)
             <% end %>
           </li>
         <% end %>
diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 31799f0e9..84d85df3c 100644
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -18,7 +18,7 @@
     </h4>
     <ul>
       <% @ways.each do |way| %>
-        <li><%= link_to h(printable_name(way, true)), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
+        <li><%= link_to printable_name(way, true), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
       <% end %>
     </ul>
   <% end %>
@@ -30,7 +30,7 @@
     </h4>
     <ul>
       <% @relations.each do |relation| %>
-        <li><%= link_to h(printable_name(relation, true)), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %></li>
+        <li><%= link_to printable_name(relation, true), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %></li>
       <% end %>
     </ul>
   <% end %>
@@ -42,7 +42,7 @@
     </h4>
     <ul>
       <% @nodes.each do |node| %>
-        <li><%= link_to h(printable_name(node, true)), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %></li>
+        <li><%= link_to printable_name(node, true), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %></li>
       <% end %>
     </ul>
   <% end %>
diff --git a/app/views/browse/feature.html.erb b/app/views/browse/feature.html.erb
index 1e0f118d8..38657f4d1 100644
--- a/app/views/browse/feature.html.erb
+++ b/app/views/browse/feature.html.erb
@@ -2,7 +2,7 @@
 
 <h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-  <%= t("browse.#{@type}.title", :name => printable_name(@feature)) %>
+  <%= raw t("browse.#{@type}.title", :name => printable_name(@feature)) %>
 </h2>
 
 <%= render :partial => @type, :object => @feature %>
diff --git a/app/views/browse/history.html.erb b/app/views/browse/history.html.erb
index fa483bfb0..5f5dd4db3 100644
--- a/app/views/browse/history.html.erb
+++ b/app/views/browse/history.html.erb
@@ -2,7 +2,7 @@
 
 <h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-  <%= t("browse.#{@type}.history_title", :name => printable_name(@feature)) %>
+  <%= raw t("browse.#{@type}.history_title", :name => printable_name(@feature)) %>
 </h2>
 
 <%= render :partial => @type, :collection => @feature.send("old_#{@type}s").reverse %>
diff --git a/app/views/site/_id.html.erb b/app/views/site/_id.html.erb
index f88942669..db611f428 100644
--- a/app/views/site/_id.html.erb
+++ b/app/views/site/_id.html.erb
@@ -26,9 +26,13 @@
       params.background = hashParams.background;
     }
 
+<% if params[:gpx] -%>
+    params.gpx = '<%= trace_data_url(params[:gpx]) %>';
+<% else -%>
     if (hashParams.gpx) {
       params.gpx = hashParams.gpx;
     }
+<% end -%>
 
     $('#id-embed').attr('src', '<%= id_url :locale => params[:locale] %>#' + querystring.stringify(params));
   </script>
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 8cb03ae17..d4164814b 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -15,6 +15,7 @@
 # Author: TTMTT
 # Author: Zaher kadour
 # Author: ترجمان05
+# Author: عبد الرحمان أيمن
 ar: 
   activerecord: 
     attributes: 
@@ -51,7 +52,7 @@ ar:
         languages: اللغات
         pass_crypt: كلمة السر
     models: 
-      acl: قائمة تحكم الوصول
+      acl: لائحة التحكم بالوصول
       changeset: حزمة التغييرات
       changeset_tag: سمة حزمة التغييرات
       country: البلد/الدولة
@@ -105,7 +106,7 @@ ar:
     location: "الموقع:"
     no_comment: (لا تعليق)
     not_found: 
-      sorry: عفوًا، لم يتم العثور على %{type} بالمعرّف %{id}.
+      sorry: "عفوًا، تعذر العثور على %{type} #%{id}."
       type: 
         changeset: حزمة التغييرات
         node: عقدة
@@ -113,9 +114,9 @@ ar:
         way: طريق
     note: 
       closed_title: "ملاحظات محلولة: %{note_name}"
-      description: "الوصف:"
+      description: الوصف
       open_title: "ملاحظة لم يتم حلها: %{note_name}"
-      title: ملاحظة
+      title: "ملاحظة: %{id}"
     redacted: 
       redaction: التنقيح %{id}
       type: 
@@ -132,7 +133,7 @@ ar:
       load_data: تحميل البيانات
       loading: جاري التحميل...
     tag_details: 
-      tags: "الوسوم:"
+      tags: الوسوم
       wikipedia_link: الـ%{page} مقالة على ويكيبيديا
     timeout: 
       sorry: عذرًا، بيانات %{type} بالمعرّف %{id} استغرقت وقتًا طويلا للاسترداد.
@@ -817,7 +818,7 @@ ar:
   layouts: 
     community_blogs: مدونات المجتمع
     community_blogs_title: مدونات لأعضاء من مجتمع خريطة الشارع المفتوحة
-    copyright: حقوق النشر والترخيص
+    copyright: حقوق النسخ
     data: البيانات
     donate: ادعم خريطة الشارع المفتوحة ب%{link} لتمويل ترقية العتاد.
     edit: تعديل
@@ -832,11 +833,11 @@ ar:
     history: تاريخ
     home: اذهب إلى الصفحة الرئيسية
     intro_2_create_account: أنشئ حساب مستخدم
-    log_in: تسجيل الدخول
+    log_in: لِج
     log_in_tooltip: سجّل الدخول مع حساب موجود
     logo: 
       alt_text: شعار خريطة الشارع المفتوحة
-    logout: اخرج
+    logout: سجل خروج
     make_a_donation: 
       text: تبرع
       title: ادعم خريطة الشارع المفتوحة بهبة نقدية
@@ -845,7 +846,7 @@ ar:
     partners_html: الضيافة مدعومة من %{ucl}, %{ic} و %{bytemark}, و %{partners} آخرون.
     partners_ic: كلية امبراطورية لندن
     partners_partners: الشركاء
-    sign_up: أنشئ حسابًا
+    sign_up: إنشئ حساباً
     sign_up_tooltip: أنشئ حسابًا كي تستطيع المساهمة
     tag_line: ويكي خريطة العالم الحرة
     user_diaries: يوميات المستخدمين
@@ -964,7 +965,7 @@ ar:
       header: "%{from_user} قام بإرسال رسالة لك عبر خريطة الشارع المفتوحة بالعنوان %{subject}:"
       hi: مرحبًا %{to_user}،
     signup_confirm: 
-      subject: "[خريطة الشارع المفتوحة] أكّد عنوان بريدك الإلكتروني"
+      subject: "[خرائط اوبن ستريت] مرحباً بك في خرائط اوبن ستريت"
   oauth: 
     oauthorize: 
       allow_read_gpx: قراءة آثار جي بي أس الخاصة بك.
@@ -1218,7 +1219,7 @@ ar:
     trace_paging_nav: 
       newer: الآثار الحديثة
       older: الآثار القديمة
-      showing_page: إظهار الصفحة %{page}
+      showing_page: الصفحة %{page}
     view: 
       delete_track: احذف هذا الأثر
       description: "الوصف:"
@@ -1309,6 +1310,7 @@ ar:
       hide: إخفاء المستخدمين المحددين
       title: المستخدمون
     login: 
+      account not active: عذراً، حسابك غير نشط حتى الآن.<br />يُرجى إستخدام الرابط الذي اُرسِلَ إليك فى رسالة تأكيد البريد الإلكتروني، كما <a href="%{reconfirm}">يُمكنك طلب رسالة تأكيد جديدة فى حالة عدم إستلام الاولى</a>.
       auth failure: آسف، لا يمكن الدخول بتلك التفاصيل.
       create account minute: أنشئ حساباّ. تحتاج فقط إلى دقيقة.
       email or username: "عنوان البريد الإلكتروني أو اسم المستخدم:"
@@ -1342,7 +1344,7 @@ ar:
       confirm email address: "تأكيد عنوان البريد الإلكتروني:"
       confirm password: "تأكيد كلمة المرور:"
       contact_webmaster: يرجى الاتصال <a href="mailto:webmaster@openstreetmap.org">بمسؤول الموقع</a> لترتيب الحساب المراد إنشاؤه - وسنحاول التعامل مع هذا الطلب بأسرع وقت ممكن.
-      continue: استمرار
+      continue: إنشئ حساباً
       display name: "اسم المستخدم:"
       display name description: اسم المستخدم الخاص بك الظاهر علنًا. يمكنك تغيير هذه التفضيلات في وقت لاحق.
       email address: "عنوان البريد الإلكتروني:"
@@ -1351,7 +1353,7 @@ ar:
       not displayed publicly: لا يعرض علنًا (انظر <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="ويكي سياسة الخصوصية المتضمنة قسم عن عناوين البريد الإلكتروني">سياسة الخصوصية</a>)
       password: "كلمة السر:"
       terms accepted: نشكرك على قبول شروط المساهم الجديدة!
-      title: أنشئ حسابا
+      title: إنشئ حساباً
     no_such_user: 
       body: عذرًا، لا يوجد مستخدم بالاسم %{user}. يرجى تدقيق الاسم، أو ربما يكون الرابط الذي تم النقر عليه خاطئ.
       heading: المستخدم %{user} غير موجود
@@ -1422,10 +1424,10 @@ ar:
       m away: على بعد %{count}متر
       mapper since: "مُخطط منذ:"
       moderator_history: اعرض العرقلات المعطاة
-      my comments: تعليقاتي
-      my diary: يوميتي
-      my edits: مساهماتي
-      my settings: إعداداتي
+      my comments: التعليقات
+      my diary: اليوميات
+      my edits: المُساهمات
+      my settings: الإعدادات
       my traces: آثاري
       nearby users: "مستخدمين أيضًا بالجوار:"
       nearby_changesets: تصفح كل حزم التغييرات من قبل المستخدمين في المقربة
@@ -1444,7 +1446,7 @@ ar:
         revoke: 
           administrator: ابطل وصول إداري
           moderator: ابطل وصول وسيط
-      send message: أرسل رسالة
+      send message: إرسل رسالة
       settings_link_text: إعدادات
       status: "الحالة:"
       traces: آثار
@@ -1512,7 +1514,7 @@ ar:
       revoke: ابطل!
       revoker_name: مُبطل بواسطة
       show: اعرض
-      showing_page: جاري عرض الصفحة %{page}
+      showing_page: الصفحة %{page}
       status: الحالة
     period: 
       few: "%{count} ساعات"
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 205fc5c1a..999444e18 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1,9 +1,17 @@
-# Messages for Belarusian (Беларуская)
+# Messages for Belarusian (беларуская)
 # Exported from translatewiki.net
 # Export driver: syck-pecl
 # Author: Jim-by
+# Author: Unomano
+# Author: Дзяніс Тутэйшы
 # Author: Тест
+# Author: Чаховіч Уладзіслаў
 be: 
+  about_page: 
+    copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
+    next: Далей
+    open_data_title: Адкрытыя дадзеныя
+    partners_title: Партнёры
   activerecord: 
     attributes: 
       diary_comment: 
@@ -35,12 +43,13 @@ be:
         active: Актыўны
         description: Апісанне
         display_name: Бачнае імя
+        email: Эл.пошта
         languages: Мовы
         pass_crypt: Пароль
     models: 
       acl: Спіс правоў доступу
-      changeset: Набор зменаў
-      changeset_tag: Цэтлік набору зменаў
+      changeset: Набор змен
+      changeset_tag: Цэтлік набору змен
       country: Краіна
       diary_comment: Каментар дзённіка
       diary_entry: Запіс дзённіка
@@ -55,9 +64,9 @@ be:
       old_relation: Старая сувязь
       old_relation_member: Стары ўдзельнік сувязі
       old_relation_tag: Стары цэтлік сувязі
-      old_way: Стары шлях
+      old_way: Старая крывая
       old_way_node: Стары вузел шляху
-      old_way_tag: Стары цэтлік шляху
+      old_way_tag: Цэтлік старой крывой
       relation: Сувязь
       relation_member: Удзельнік сувязі
       relation_tag: Цэтлік сувязі
@@ -68,145 +77,149 @@ be:
       user: Карыстальнік
       user_preference: Настаўленне карыстальніка
       user_token: Адметка карыстальніка
-      way: Шлях
+      way: Крывая
       way_node: Вузел шляху
-      way_tag: Цэтлік шляху
+      way_tag: Цэтлік крывой
+  application: 
+    require_moderator: 
+      not_a_moderator: Вам неабходна быць мадэратарам для выканання гэтага дзеяння.
   browse: 
+    anonymous: ананімны
     changeset: 
-      changeset: "Набор зменаў:"
-      download: Сцягнуць %{changeset_xml_link} ці %{osmchange_xml_link}
-      title: Набор зменаў
-    changeset_details: 
-      belongs_to: "Належыць:"
-      bounding_box: "Межы:"
-      box: мяжа
-      closed_at: "Закрыты:"
-      created_at: "Створаны:"
-      has_nodes: "Складаецца з %{count} вузлоў:"
-      has_relations: "Складаецца з %{count} сувязей:"
-      has_ways: "Складаецца з %{count} шляхоў:"
-      no_bounding_box: Межы гэтага набора зменаў не вызначаны.
-      show_area_box: Паказаць мяжу мясцовасці
-    common_details: 
-      edited_at: "Зменена:"
-      edited_by: "Карыстальнікам:"
-      in_changeset: "У наборы зменаў:"
-      version: "Версія:"
-    map: 
-      deleted: Выдалены
-      loading: Загрузка...
+      belongs_to: Аўтар
+      changesetxml: Набор змен у XML
+      feed: 
+        title: Набор змен %{id}
+        title_comment: Набор змен %{id} - %{comment}
+      node: Вузлы (%{count})
+      node_paginated: Вузлы (%{x}-%{y} з %{count})
+      osmchangexml: osmChange XML
+      relation: Сувязі (%{count})
+      relation_paginated: Сувязі (%{x}-%{y} з %{count})
+      title: "Набор змен: %{id}"
+      way: Крывыя (%{count})
+      way_paginated: Лініі (%{x}-%{y} з %{count})
+    closed: Зачынены
+    closed_by_html: Закрыты <abbr title='%{title}'>%{time} таму</abbr> %{user}'ам
+    closed_html: Закрыты <abbr title='%{title}'>%{time} таму</abbr>
+    containing_relation: 
+      entry: Сувязь %{relation_name}
+      entry_role: Сувязь %{relation_name} (як %{relation_role})
+    created: Створаны
+    created_by_html: Створаны <abbr title='%{title}'>%{time} таму</abbr> %{user}'ам
+    created_html: Створаны <abbr title='%{title}'>%{time} таму</abbr>
+    deleted_by_html: Выдалены <abbr title='%{title}'>%{time} таму</abbr> %{user}'ам
+    download_xml: Сцягнуць XML
+    edited_by_html: Зменены <abbr title='%{title}'>%{time} таму</abbr> %{user}'ам
+    in_changeset: Набор змен
+    location: "Месца:"
+    no_comment: (без каментароў)
     node: 
-      download: "%{download_xml_link} ці %{view_history_link}"
-      download_xml: Сцягнуць XML
-      node: Вузел
-      node_title: "Вузел: %{node_name}"
-      view_history: прагледзіць гісторыю
-    node_details: 
-      coordinates: "Каардынаты:"
-      part_of: "Частка:"
-    node_history: 
-      download: "%{download_xml_link} ці %{view_details_link}"
-      download_xml: Сцягнуць XML
-      node_history: Гісторыя вузла
-      view_details: прагледзіць дэталі
+      history_title: "Гісторыя вузла: %{name}"
+      title: "Вузел: %{name}"
     not_found: 
       sorry: Прабачце, %{type} з нумарам %{id} не знойдзены.
       type: 
+        changeset: набор змен
         node: вузел
-        relation: адносіны
-        way: лінія
-    paging_nav: 
-      of: з
-      showing_page: Паказ старонкі
+        relation: сувязь
+        way: крывая
+    note: 
+      closed_by: Вырашана %{user} <abbr title='%{exact_time}'>%{when} таму</abbr>
+      closed_title: "Вырашаная заўвага #%{note_name}"
+      commented_by: Каментар ад %{user} <abbr title='%{exact_time}'>%{when} таму</abbr>
+      commented_by_anonymous: Ананінмы каментар <abbr title='%{exact_time}'>%{when} таму</abbr>
+      description: Апісанне
+      hidden_by: Схавана %{user} <abbr title='%{exact_time}'>%{when} таму</abbr>
+      hidden_title: "Схаваная заўвага #%{note_name}"
+      new_note: Новая заўвага
+      open_title: "Нявырашаная заўвага #%{note_name}"
+      reopened_by: Паўторна актывавана %{user} <abbr title='%{exact_time}'>%{when} таму</abbr>
+      title: "Заўвага: %{id}"
+    part_of: Частка
+    redacted: 
+      redaction: Рэдакцыя %{id}
+      type: 
+        node: вузел
+        relation: сувязь
+        way: крывая
     relation: 
-      download: "%{download_xml_link} ці %{view_history_link}"
-      download_xml: Сцягнуць XML
-      relation: Сувязь
-      relation_title: "Сувязь: %{relation_name}"
-      view_history: прагледзець гісторыю
-    relation_details: 
-      members: "Удзельнікі:"
-      part_of: "Частка:"
-    relation_history: 
-      relation_history: Гісторыя сувязі
-      relation_history_title: "Гісторыя сувязі: %{relation_name}"
-    start: 
-      manually_select: Выбраць іншую мясцовасць
-      view_data: Прагледзець дадзеныя па бягучым аглядзе
+      history_title: "Гісторыя сувязі: %{name}"
+      members: Удзельнікі
+      title: "Сувязь: %{name}"
+    relation_member: 
+      entry_role: "%{type} %{name} як %{role}"
+      type: 
+        node: Вузел
+        relation: Сувязь
+        way: Крывая
     start_rjs: 
-      data_frame_title: Дадзеныя
-      data_layer_name: Дадзеныя
-      details: Падрабязней
-      drag_a_box: Расцягніце рамку на карце для выбара іншай мясцовасці
-      edited_by_user_at_timestamp: Зменена %{user} у %{timestamp}
-      history_for_feature: Гісторыя %{feature}
       load_data: Загрузіць дадзеныя
-      loaded_an_area_with_num_features: Вы загрузілі мясцовасць, што змяшчае %{num_features} элементаў.  Увогуле, некаторыя вандроўнікі могуць не здолець апрацаваць гэтакую колькасць дадзеных. Звычайна, найлепшы рэзультат назіраецца, калі элементаў менш за 100, пры большай колькасці вандроўнік можа згубіць хуткасць. Калі вы ўпэўненыя, што хочаце паглядзець на гэтыя дадзеныя, націсніце кнопку ніжэй.
       loading: Загрузка...
-      manually_select: Выбраць іншую мясцовасць
-      object_list: 
-        api: Атрымаць гэтую вобласць з API
-        back: Адлюстраваць спіс аб'ектаў
-        details: Дэталі
-        heading: Спіс аб'ектаў
-        selected: 
-          type: 
-            node: Вузел %{id}
-            way: Лінія %{id}
-        type: 
-          node: Вузел
-          way: Лінія
-      private_user: таемны карыстальнік
-      show_history: Паказаць гісторыю
-      unable_to_load_size: "Нельга загрузіць: парем мяжы %{bbox_size} занадта вялікі (павінен быць не больш як %{max_bbox_size})"
-      wait: Пачакайце...
-      zoom_or_select: Наблізьцеся ці выберыце іншую мясцовасць для агляду
     tag_details: 
-      tags: "Цэтлікі:"
+      tags: Цэтлікі
+      wiki_link: 
+        key: Вікі-старонка апісання тэгу %{key}
+        tag: Вікі-старонка апісання тэгу %{key}=%{value}
+      wikipedia_link: Артыкул %{page} на Вікіпедыі
+    timeout: 
+      type: 
+        changeset: набор змен
+        node: вузел
+        relation: сувязь
+        way: крывая
+    version: Версія
+    view_details: Прагляд звестак
+    view_history: Прагляд гісторыі
     way: 
-      download: "%{download_xml_link} ці %{view_history_link}"
-      download_xml: Сцягнуць XML
-      view_history: прагледзець гісторыю
-      way: Шлях
-      way_title: "Шлях: %{way_name}"
-    way_details: 
-      also_part_of: 
-        one: таксама частка шляху %{related_ways}
-        other: таксама частка шляхоў %{related_ways}
-      nodes: "Вузлы:"
-      part_of: "Частка:"
-    way_history: 
-      download: "%{download_xml_link} ці %{view_details_link}"
-      download_xml: Сцягнуць XML
-      view_details: прагледзць падрабязней
-      way_history: Гісторыя шляху
-      way_history_title: "Гісторыя шляху: %{way_name}"
+      history_title: "Гісторыя шляху: %{name}"
+      nodes: Вузлы
+      title: "Крывая: %{name}"
   changeset: 
     changeset: 
       anonymous: Ананімна
-      big_area: (вялікая)
-      no_comment: (няма)
-      no_edits: (без зменаў)
-      show_area_box: паказаць мяжу мясцовасці
-      still_editing: (у працэсе рэдагавання)
-      view_changeset_details: Падрабязней пра набор зменаў
+      no_edits: (без змен)
+      view_changeset_details: Падрабязней пра набор змен
     changeset_paging_nav: 
-      showing_page: Паказваецца старонка
+      next: Далей »
+      previous: « Назад
+      showing_page: Старонка %{page}
     changesets: 
       area: Мясцовасць
       comment: Каментар
       id: ID
       saved_at: Запісаны
       user: Карыстальнік
+    list: 
+      empty: Змены не знойдзены.
+      load_more: Загрузіць больш
+      no_more: Больш ніякіх зменаў не знойдзена.
+      title: Наборы зменаў
+      title_friend: Наборы зменаў ад вашых сяброў
+      title_nearby: Наборы зменаў ад карыстальнікаў паблізу
+      title_user: Набор зменаў ад %{user}
   diary_entry: 
+    comments: 
+      ago: "%{ago} таму"
+      comment: Каментар
+      has_commented_on: "%{display_name} пракаментаваў наступныя дзеннікавыя запісы"
+      newer_comments: Навейшыя каментары
+      older_comments: Старэйшыя каментары
+      post: Апублікаваць
+      when: Калі
     diary_comment: 
       comment_from: Каментар %{link_user} у %{comment_created_at}
+      confirm: Пацвердзіць
+      hide_link: Схаваць гэты каментар
     diary_entry: 
       comment_count: 
         one: 1 каментар
-        other: "Каментараў: %{count}"
+        other: "Каментароў: %{count}"
+        zero: Каментароў няма
       comment_link: Каментаваць гэты запіс
+      confirm: Пацвердзіць
       edit_link: Змяніць гэты запіс
+      hide_link: Схаваць гэты запіс
       posted_by: Напісана %{link_user} у %{created} на %{language_link}
       reply_link: Адказаць на гэты запіс
     edit: 
@@ -220,6 +233,9 @@ be:
       subject: "Тэма:"
       title: Змяніць запіс дзённіку
       use_map_link: карыстацца картай
+    feed: 
+      all: 
+        description: Апошнія дзеннікавыя запісы карыстальнікаў OpenStreetMap
     list: 
       in_language_title: Дзённік запісаў у %{language}
       new: Новы запіс дзённіку
@@ -227,18 +243,21 @@ be:
       newer_entries: Навейшыя запісы
       no_entries: Няма запісаў
       older_entries: Старэйшыя запісы
-      recent_entries: "Нядаўнія запісы ў дзённіку:"
+      recent_entries: Нядаўнія запісы ў дзённіку
       title: Дзённікі карыстальнікаў
+      title_friends: Дзеннікі сяброў
+      title_nearby: Дзённікі карыстальнікаў паблізу
       user_title: Дзённік %{user}
+    location: 
+      edit: Рэдагаваць
+      location: "Месца:"
+      view: Прагляд
     new: 
       title: Новы запіс дзённіку
     no_such_entry: 
       body: Прабаце, не існуе запісу ў дзённіку ці каментара з нумарам %{id}. Праверце свой правапіс, ці, магчыма, вам далі няправільную спасылку.
       heading: "Няма запісу з нумарам: %{id}"
-    no_such_user: 
-      body: Прабачце, не існуе карыстальніка %{user}. Праверце свой правапіс, ці, магчыма, вам далі няправільную спасылку.
-      heading: Карыстальнік %{user} не існуе
-      title: Няма такога карыстача
+      title: Няма такіх запісаў у дзенніку
     view: 
       leave_a_comment: Пакінуць каментар
       login: Логін
@@ -246,13 +265,25 @@ be:
       save_button: Запісаць
       title: Дзённік карыстальніка | %{user}
       user_title: Дзённік %{user}
+  editor: 
+    id: 
+      description: iD (браўзэрны рэдактар)
+      name: iD
+    potlatch: 
+      description: Potlatch 1 (браўзэрны рэдактар)
+      name: Potlatch 1
+    potlatch2: 
+      description: Potlatch 2 (браўзэрны рэдактар)
+      name: Potlatch 2
+    remote: 
+      name: Дыстанцыйнае кіраванне
   export: 
     start: 
       add_marker: Дадаць маркер на карту
       area_to_export: Экспартаваць мясцовасць
       embeddable_html: HTML для ўстаўкі
       export_button: Экспарт
-      export_details: Дадзеныя праекту OpenStreetMap распаўсюджваюцца па ліцэнзіі <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a>.
+      export_details: Дадзеныя праекту OpenStreetMap распаўсюджваюцца па ліцэнзіі <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL).
       format: "Фармат:"
       format_to_export: Фармат для экспарту
       image_size: Памер выявы
@@ -260,98 +291,667 @@ be:
       licence: Ліцэнзія
       longitude: "Даў:"
       manually_select: Выбраць іншую мясцовасць
-      mapnik_image: выява Mapnik
       max: макс
-      options: Настаўленні
+      options: Настройкі
       osm_xml_data: OpenStreetMap XML
-      osmarender_image: выява Osmarender
       output: Вывад
       paste_html: Уставіць HTML для ўбудовы у вэб-сайт
       scale: Маштаб
+      too_large: 
+        geofabrik: 
+          description: Пастаянна абнаўляемыя выняткі кантынентаў, краінаў і асобных гарадоў
+        metro: 
+          title: Выняткі метро
+        other: 
+          description: Дадатковыя крыніцы, пералічаныя на Вікі OpenStreetMap
+          title: Іншыя крыніцы
+        planet: 
+          description: Рэгулярна абнаўляемыя копіі поўнай базы дадзеных OpenStreetMap
+          title: Планета OSM
       zoom: маштаб
-    start_rjs: 
-      add_marker: Дадаць маркер на карту
-      change_marker: Змяніць пазіцыю маркера
-      click_add_marker: Націсніце на карце, каб дадаць маркер
-      drag_a_box: Расцягніце рамку на карце для выбара мясцовасці
-      export: Экспарт
-      manually_select: Выбраць іншую мясцовасць
-      view_larger_map: Прагледзець большую карту
+    title: Экспарт
+  fixthemap: 
+    how_to_help: 
+      join_the_community: 
+        title: Далучыцца да супольнасці
+      title: Як дапамагчы
+    other_concerns: 
+      title: Іншыя перасцярогі
   geocoder: 
+    description: 
+      title: 
+        geonames: Месцазнаходжанне з <a href="http://www.geonames.org/">GeoNames</a>
+        osm_nominatim: Месцазнаходжанне з <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
+      types: 
+        cities: Гарады
+        places: Месцы
+        towns: Мястэчкі
+    direction: 
+      east: усходн.
+      north: паўночн.
+      north_east: паўночна-ўсходн.
+      north_west: паўднева-заходн.
+      south: паўдн.
+      south_east: паўднёва-ўсходн.
+      south_west: паўднёва-заходн.
+      west: заходн.
+    distance: 
+      one: прыкладна 1 км
+      other: прыкладна %{count} км
+      zero: менш 1 км
     results: 
+      more_results: Больш вынікаў
       no_results: Нічога не знойдзена
+    search: 
+      title: 
+        ca_postcode: Вынікі з <a href="http://geocoder.ca/">Geocoder.CA</a>
+        geonames: Вынікі з <a href="http://www.geonames.org/">GeoNames</a>
+        geonames_reverse: Вынікі з <a href="http://www.geonames.org/">GeoNames</a>
+        osm_nominatim: Вынікі з <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
+        osm_nominatim_reverse: Вынікі з <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
+        uk_postcode: Вынінкі з <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
+        us_postcode: Вынікі з <a href="http://geocoder.us/">Geocoder.us</a>
+    search_osm_nominatim: 
+      admin_levels: 
+        level10: Мяжа прыгараду
+        level2: Мяжа краіны
+        level4: Дзяржаўная мяжа
+        level8: Мяжа горада
+        level9: Мяжа вёскі
+      prefix: 
+        aerialway: 
+          chair_lift: Крэсельны пад'ёмнік
+          drag_lift: Бугельны пад'емнік
+          station: Станцыя канатнай дарогі
+        aeroway: 
+          aerodrome: Аэрадром
+          apron: Перон
+          gate: Вароты
+          helipad: Верталетная пляцоўка
+          runway: Узлётна-пасадачная паласа
+          taxiway: Рулёжныя дарожкі
+          terminal: Тэрмінал
+        amenity: 
+          WLAN: Wi-Fi доступ
+          airport: Аэрапорт
+          arts_centre: Цэнтр мастацтваў
+          artwork: Інсталяцыя
+          atm: Банкамат
+          auditorium: Аўдыторыя
+          bank: Банк
+          bar: Бар
+          bbq: Барбекю
+          bench: Лаўка
+          bicycle_parking: Веласіпедная паркоўка
+          bicycle_rental: Пракат ровараў
+          biergarten: Рэстаранны падворак
+          brothel: Бардэль
+          bureau_de_change: Абмен валют
+          bus_station: Аўтобусны вакзал
+          cafe: Кафэ
+          car_rental: Пракат аўтамабіляў
+          car_wash: Аўтамыйка
+          casino: Казіно
+          charging_station: Зарадная станцыя
+          cinema: Кіно
+          clinic: Клініка
+          club: Клуб
+          college: Каледж
+          community_centre: Грамадскі цэнтр
+          courthouse: Суд
+          crematorium: Крэматорый
+          dentist: Стаматолагія
+          dormitory: Інтэрнат
+          drinking_water: Пітная вада
+          driving_school: Аўташкола
+          embassy: Амбасада
+          fast_food: Фаст-Фуд
+          ferry_terminal: Паромны тэрмінал
+          fire_hydrant: Пажарны гідрант
+          fire_station: Пажарная станцыя
+          fountain: Фантан
+          fuel: АЗС
+          grave_yard: Могілкі
+          gym: Фітнес-цэнтр ці Трэнажорная зала
+          hall: Зала
+          health_centre: Медыцынскі цэнтр
+          hospital: Бальніца
+          hotel: Гатэль
+          ice_cream: Марозіва
+          kindergarten: Дзіцячы сад
+          library: Бібліятэка
+          market: Рынак
+          mountain_rescue: Выратавальная служба ў гарах
+          nightclub: Начны клуб
+          nursery: Яслі
+          nursing_home: Прыватная лякарня
+          office: Офіс
+          park: Парк
+          parking: Паркоўка
+          pharmacy: Аптэка
+          place_of_worship: Культавы будынак
+          police: Паліцыя
+          post_box: Паштовая скрыня
+          post_office: Паштовае аддзяленне
+          preschool: Дашкольная установа
+          prison: Турма
+          pub: Паб
+          public_building: Грамадскі будынак
+          public_market: Адкрыты рынак
+          reception_area: Зона прыёму
+          recycling: Пункт перапрацоўкі
+          restaurant: Рэстаран
+          retirement_home: Дом састарэлых
+          sauna: Сауна
+          school: Школа
+          shelter: Укрыццё
+          shop: Крама
+          shopping: Шопінг
+          shower: Душ
+          social_centre: Сацыяльны цэнтр
+          social_club: Грамадскі клуб
+          social_facility: Сацыяльны аб'ект
+          studio: Студыя
+          supermarket: Супермаркет
+          swimming_pool: Плавальны басейн
+          taxi: Таксі
+          telephone: Грамадскі тэлефон
+          theatre: Тэатр
+          toilets: Прыбіральні
+          townhall: Ратуша
+          university: Універсітэт
+          vending_machine: Гандлевы аўтамат
+          veterinary: Ветэрынарная хірургія
+          village_hall: Вясковая зала
+          waste_basket: Кош для смецця
+          wifi: Wi-Fi доступ
+          youth_centre: Маладзежны цэнтр
+        boundary: 
+          administrative: Адміністрацыйная мяжа
+          census: Межы перапісу
+          national_park: Нацыянальны парк
+          protected_area: Абаронены раён
+        bridge: 
+          aqueduct: Акведук
+          suspension: Падвясны мост
+          swing: Развадны мост
+          viaduct: Віядук
+          "yes": Мост
+        building: 
+          "yes": Будынак
+        emergency: 
+          fire_hydrant: Пажарны гідрант
+          phone: Тэлефон экстранай сувязі
+        highway: 
+          bus_stop: Аўтобусны прыпынак
+          cycleway: Веласіпедная дарожка
+          footway: Сцяжынка
+          living_street: Жылая вуліца
+          milestone: Веха
+          minor: Дробная дарога
+          motorway: Аўтамабільная дарога
+          motorway_junction: Аўтамабільная развязка
+          motorway_link: Аўтамабільная дарога
+          path: Сцежка
+          pedestrian: Пешаходная дарожка
+          platform: Платформа
+          primary: Першасная дарога
+          primary_link: Першасная дарога
+          proposed: Плануемая дарога
+          raceway: Гоначная траса
+          residential: Жылая
+          rest_area: Зона адпачынку
+          road: Дарога
+          secondary: Другасная дарога
+          secondary_link: Другасная дарога
+          service: Службовая дарога
+          services: Прыдарожны сэрвіс
+          speed_camera: Фотарадар
+          steps: Прыступкі
+          stile: Турнікет
+          street_lamp: Вулічны ліхтар
+          tertiary: Трэцясная дарога
+          tertiary_link: Трэцясная дарога
+          track: Каляя
+          trail: След
+          trunk: Магістраль
+          trunk_link: Магістраль
+          unclassified: Некласіфікаваная дарога
+          unsurfaced: Дарога без пакрыцця
+        historic: 
+          archaeological_site: Археалагічныя раскопы
+          battlefield: Поле бою
+          boundary_stone: Пагранічны камень
+          building: Будынак
+          castle: Замак
+          church: Царква
+          citywalls: Гарадскія сцены
+          fort: Форт
+          house: Дом
+          icon: Ікона
+          manor: Сядзіба
+          memorial: Мемарыял
+          mine: Шахта
+          monument: Помнік
+          museum: Музей
+          ruins: Руіны
+          tomb: Магіла
+          tower: Вежа
+          wayside_cross: Прыдарожны крыж
+          wayside_shrine: Прыдарожная каплічка
+          wreck: Месца аварыі
+        landuse: 
+          allotments: Надзелы
+          basin: Вадаём
+          brownfield: Ачышчанае месца для забудовы
+          cemetery: Могілкі
+          commercial: Камерцыйная зона
+          conservation: Запаведнік
+          construction: Будаўніцтва
+          farm: Ферма
+          farmland: Сельскагаспадарчыя землі
+          farmyard: Двор фермы
+          forest: Лес
+          garages: Гаражы
+          grass: Трава
+          greenfield: Новае месца для забудовы
+          industrial: Прамысловая зона
+          landfill: Звалка
+          meadow: Луг
+          military: Ваенная зона
+          mine: Шахта
+          nature_reserve: Запаведнік
+          orchard: Фруктовы сад
+          park: Парк
+          piste: Лыжная траса
+          quarry: Кар'ер
+          railway: Чыгунка
+          recreation_ground: Пляцоўка для гульняў
+          reservoir: Вадасховішча
+          residential: Жылы раен
+          retail: Рознічны гандаль
+          road: Прыдарожная паласа
+          vineyard: Вінаграднік
+          wood: Дзікі лес
+        leisure: 
+          beach_resort: Пляжны курорт
+          fishing: Раён рыбалоўства
+          fitness_station: Спартыўная пляцоўка
+          garden: Сад
+          golf_course: Поле для гольфа
+          ice_rink: Каток
+          marina: Гавань для катэраў
+          miniature_golf: Міні-Гольф
+          nature_reserve: Запаведнік
+          park: Парк
+          pitch: Спартыўная пляцоўка
+          playground: Дзіцячая пляцоўка
+          recreation_ground: Зона адпачынку
+          sauna: Сауна
+          slipway: Стапель
+          sports_centre: Спартыўны цэнтр
+          stadium: Стадыен
+          swimming_pool: Плавальны басейн
+          track: Бегавая дарожка
+          water_park: Аквапарк
+        military: 
+          airfield: Ваенны аэрадром
+          barracks: Казармы
+          bunker: Бункер
+        mountain_pass: 
+          "yes": Перавал
+        natural: 
+          bay: Заліў
+          beach: Пляж
+          cape: Мыс
+          cave_entrance: Уваход у пячору
+          channel: Канал
+          cliff: Мяжа скалы
+          crater: Кратэр
+          dune: Дзюна
+          fell: Неапрацаваная зямля
+          fjord: Фіёрд
+          forest: Лес
+          geyser: Гейзер
+          glacier: Ляднік
+          heath: Здароўе
+          hill: Пагорак
+          island: Востраў
+          land: Зямля
+          marsh: Марш
+          moor: Швартоўка
+          mud: Бруд
+          peak: Пік
+          point: Кропка
+          reef: Рыф
+          ridge: Хрыбет
+          river: Рака
+          rock: Скала
+          scree: Абсып
+          scrub: Кустарнік
+          shoal: Мелкаводдзе
+          spring: Крыніца
+          stone: Камень
+          strait: Праліў
+          tree: Дрэва
+          valley: Даліна
+          volcano: Вулкан
+          water: Вада
+          wetland: Забалочаны ўчастак
+          wetlands: Водна-балотныя ўгоддзі
+          wood: Дзікі лес
+        office: 
+          accountant: Бухгалтар
+          architect: Архітэктар
+          company: Кампанія
+          employment_agency: Агенцтва занятасці
+          estate_agent: Агент па нерухомасці
+          government: Дзяржаўная ўстанова
+          insurance: Страхавая кантора
+          lawyer: Юрыст
+          ngo: Офіс НДА
+          telecommunication: Аддзяленне сувязі
+          travel_agent: Турыстычнае агенцтва
+          "yes": Офіс
+        place: 
+          airport: Аэрапорт
+          city: Горад
+          country: Краіна
+          county: Акруга
+          farm: Ферма
+          hamlet: Паселішча
+          house: Дом
+          houses: Дамы
+          island: Востраў
+          islet: Астравок
+          isolated_dwelling: Ізаляванае жыллё
+          locality: Мясцовасць
+          moor: Швартоўка
+          municipality: Муніцыпалітэт
+          neighbourhood: Наваколле
+          postcode: Паштовы індэкс
+          region: Рэгіен
+          sea: Мора
+          state: Дзяржава
+          subdivision: Падраздзяленне
+          suburb: Прыгарад
+          town: Горад
+          village: Вёска
+        railway: 
+          abandoned: Закінутая чыгунка
+          construction: Будаўніцтва чыгункі
+          disused: Закінутая чыгунка
+          disused_station: Закінуты чыгуначны вакзал
+          funicular: Фунікулер
+          halt: Чыгуначны прыпынак
+          historic_station: Гістарычны чыгуначны вакзал
+          junction: Чыгуначны вузел
+          monorail: Манарэйка
+          narrow_gauge: Вузкакалейная чыгунка
+          platform: Чыгуначная платформа
+          station: Чыгуначны вакзал
+          stop: Чыгуначны прыпынак
+          subway: Станцыя метро
+          subway_entrance: Уваход у метро
+          tram: Трамвай
+          tram_stop: Трамвайны прыпынак
+          yard: Сартавальная станцыя
+        shop: 
+          antiques: Антыкварыят
+          art: Арт-Крама
+          bakery: Пякарня
+          beauty: Салон прыгажосці
+          beverages: Крама напояў
+          bicycle: Крама ровараў
+          books: Кнігарня
+          boutique: Буцік
+          butcher: Мяснік
+          car: Аўтамабільная крама
+          car_parts: Аўтазапчасткі
+          car_repair: Рамонт аўтамабіляў
+          carpet: Крама дываноў
+          chemist: Аптэкар
+          clothes: Крама вопраткі
+          computer: Крама кампутарнай тэхнікі
+          confectionery: Кандытарская крама
+          convenience: Крама крокавай даступнасці
+          copyshop: Капіравальны цэнтр
+          cosmetics: Крама касметыкі
+          deli: Гастраном
+          department_store: Універмаг
+          discount: Крама тавараў са зніжкай
+          doityourself: Крама будаўнічых матэр'ялаў
+          dry_cleaning: Хімчыстка
+          electronics: Крама электронікі
+          estate_agent: Агент па нерухомасці
+          fish: Рыбная крама
+          florist: Фларыст
+          food: Прадуктовая крама
+          furniture: Мэбля
+          gallery: Галерэя
+          garden_centre: Садовы цэнтр
+          gift: Крама падарункаў
+          hairdresser: Цырульнік
+          hardware: Гаспадарчая крама
+          hifi: Аўдыётэхніка
+          insurance: Страхаванне
+          jewelry: Ювелірная крама
+          laundry: Пральня
+          mall: Гандлевы цэнтр
+          market: Рынак
+          mobile_phone: Салон мабільнай сувязі
+          motorcycle: Крама матацыклаў
+          music: Музычная крама
+          optician: Оптыка
+          pharmacy: Аптэка
+          photo: Фота майстэрня
+          shoes: Абутковая крама
+          shopping_centre: Гандлёвы цэнтр
+          sports: Спартыўная крама
+          supermarket: Супермаркет
+          toys: Крама цацак
+          travel_agency: Турыстычнае агенцтва
+          video: Відэа крама
+          "yes": Крама
+        tourism: 
+          alpine_hut: Альпійская хатка
+          bed_and_breakfast: Ложак і сняданак
+          camp_site: Турбаза
+          chalet: Шале
+          guest_house: Гасцявы дом
+          hostel: Хостэл
+          hotel: Гатэль
+          information: Інфармацыя
+          motel: Матэль
+          museum: Музей
+          picnic_site: Месца для пікніка
+          theme_park: Тэматычны парк
+          valley: Даліна
+          zoo: Заапарк
+        tunnel: 
+          "yes": Тунэль
+        waterway: 
+          canal: Канал
+          dam: Плаціна
+          dock: Док
+          mineral_spring: Мінеральная крыніца
+          river: Рака
+          waterfall: Вадаспад
+  help_page: 
+    help: 
+      title: help.openstreetmap.org
+      url: https://help.openstreetmap.org/
+    title: Атрыманне дапамогі
+    welcome: 
+      title: Вітаем у OSM
+      url: /welcome
+    wiki: 
+      title: wiki.openstreetmap.org
+      url: http://wiki.openstreetmap.org/
+  javascripts: 
+    close: Зачыніць
+    edit_help: Перамясціце карту і наблізце месца, якое вы хочаце рэдагаваць, затым націсніце тут.
+    key: 
+      title: Легенда карты
+      tooltip: Легенда карты
+      tooltip_disabled: Легенда карты даступная толькі для стандартнага слою
+    map: 
+      base: 
+        cycle_map: Веласіпедная карта
+        hot: Гуманітарная
+        standard: Стандартны
+        transport_map: Транспартная карта
+      copyright: © <a href='%{copyright_url}'>OpenStreetMap contributors</a>
+      donate_link_text: <a class='donate-attr' href='%{donate_url}'>Зрабіць ахвяраванне</a>
+      layers: 
+        data: Картаграфічныя дадзеныя
+        header: Слаі карты
+        notes: Заўвагі на карце
+        overlays: Уключыць накладкі для ліквідацыі няспраўнасцяў карты
+        title: Слаі
+      locate: 
+        popup: Вы знаходзіцеся ў межах {distance} {unit} ад гэтай кропкі
+        title: Паказаць маё месцазнаходжанне
+      zoom: 
+        in: Павялічыць
+        out: Паменшыць
+    notes: 
+      new: 
+        add: Дадаць заўвагу
+      show: 
+        anonymous_warning: Гэтая нататка змяшчае каментары ад ананімных карыстальнікаў, што павінны быць незалежна правераны.
+        comment: Каментаваць
+        comment_and_resolve: Каментаваць і вырашыць
+        hide: Схаваць
+        reactivate: Актываваць паўторна
+        resolve: Вырашыць
+    share: 
+      cancel: Скасаваць
+      center_marker: Цэнтраваць карту па маркеры
+      download: Загрузіць
+      embed: HTML
+      format: "Фармат:"
+      image: Выява
+      include_marker: Дадаць маркер
+      link: Спасылка ці HTML
+      long_link: Спасылка
+      paste_html: Уставіць HTML для ўбудовы ў вэб-сайт
+      scale: "Маштаб:"
+      short_link: Кароткая спасылка
+      short_url: Кароткі URL-адрас
+      view_larger_map: Праглядзець большую карту
+    site: 
+      createnote_disabled_tooltip: Наблізце, каб дадаць заўвагу на карту
+      createnote_tooltip: Дадаць заўвагу на карту
+      edit_disabled_tooltip: Наблізце, каб рэдагаваць карту
+      edit_tooltip: Рэдагаваць карту
+      map_notes_zoom_in_tooltip: Наблізце, каб убачыць заўвагі на карце
   layouts: 
+    about: Пра нас
+    community: Супольнасьць
+    community_blogs: Блогі супольнасці
+    community_blogs_title: Блогі ўдзельнікаў супольнасці OpenStreetMap
+    copyright: Аўтарскае права
+    data: Дадзеныя
     donate: Падтрымайце OpenStreetMap %{link} у фонд абнаўлення тэхнікі.
-    donate_link_text: ахвяраваннем
     edit: Змяніць
+    edit_with: Правіць з дапамогаю %{editor}
     export: Экспарт
-    export_tooltip: Экспартаваць данныя карты
+    export_data: Экспарт дадзеных
+    foundation: Фонд
+    foundation_title: Фонд OpenStreetMap
     gps_traces: GPS Трэкі
-    gps_traces_tooltip: Працаваць з трэкамі
+    gps_traces_tooltip: Кіраваць GPS-трэкамі
+    help: Даведка
     history: Гісторыя
-    home: дамоў
-    home_tooltip: Паказаць маю хату
-    inbox: уваходныя (%{count})
-    inbox_tooltip: 
-      one: У вашай скрыні ёсць 1 новае паведамленне
-      other: У вашай скрыні ёсць %{count} новых паведамленій
-      zero: У вашай скрыні няма непрачытаных паведамленняў
-    intro_1: OpenStreetMap - свабодная для рэдагавання карта усяго свету. Яе ствараюць такія ж людзі, як вы.
-    intro_2: OpenStreetMap дазваляе вам прагледзець, рэдагаваць і карыстацца геаграфічнымі звесткамі ў любым пункце планеты.
-    intro_3: "Хостынг для OpenStreetMap: %{ucl} і %{bytemark}."
-    intro_3_ucl: Цэнтр UCL VR
-    log_in: увайсці
+    home: Дамоў
+    intro_2_create_account: Стварыць рахунак удзельніка
+    intro_header: Вітаем у OpenStreetMap!
+    intro_text: OpenStreetMap - гэта карта свету, створаная людзьмі, як вы, і бясплатная для выкарыстання на ўмовах адкрытай ліцэнзіі.
+    learn_more: Даведацца больш
+    log_in: Увайсці
     log_in_tooltip: Увайсці з акаўнтам, які існуе
     logo: 
       alt_text: Лагатып OpenStreetMap
-    logout: выйсці
-    logout_tooltip: выйсці
+    logout: Выйсці
     make_a_donation: 
       text: Зрабіць ахвяраванне
+      title: Падтрымаць OpenStreetMap грашовым ахвяраваннем
+    more: Больш падрабязна
     osm_offline: База дадзеных OpenStreetMap зараз па-за сецівам, таму што праходзіць неабходная тэхнічная праца.
     osm_read_only: База дадзеных OpenStreetMap зараз даступная толькі для чытання, таму што праходзіць неабходная тэхнічная праца.
+    partners_bytemark: Bytemark Hosting
+    partners_ic: Imperial College London
+    partners_partners: партнёры
+    partners_ucl: UCL VR-цэнтр
     sign_up: Зарэгістравацца
     sign_up_tooltip: Стварыць акаўнт для рэдагавання
+    start_mapping: Пачаць маляваць карту
     tag_line: Свабодная Wiki-карта свету
     user_diaries: Дзённікі карыстальнікаў
     user_diaries_tooltip: Дзённікі карыстальнікаў
-    view: Карта
-    view_tooltip: Паглядзець карты
-    welcome_user: Вітаем, %{user_link}
-    welcome_user_link_tooltip: Ваша старонка карыстача
+  license_page: 
+    foreign: 
+      english_link: Ангельскі арыгінал
+      text: У выпадку супярэчнасці паміж гэтай перакладзенай старонкай і %{english_original_link}, ангельская старонка павінна мець прыярытэт
+      title: Пра гэты пераклад
+    legal_babble: 
+      attribution_example: 
+        title: Прыклад спасылкі
+      credit_1_html: "Мы патрабуем, каб выкарыстоўвалася спасылка &ldquo;&copy; OpenStreetMap\ncontributors&rdquo;."
+      credit_title_html: Як спасылацца на OpenStreetMap
+      intro_1_html: Дадзеныя праекту OpenStreetMap распаўсюджваюцца па ліцэнзіі <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL).
+      more_title_html: Даведацца больш
+      title_html: Аўтарскія правы і ліцэнзія
+    native: 
+      mapping_link: пачаць маляваць карту
+      native_link: беларуская версія
+      title: Пра гэтую старонку
   message: 
+    delete: 
+      deleted: Паведамленне выдалена
     inbox: 
       date: Дата
       from: Ад
       my_inbox: Мае уваходныя
+      new_messages: 
+        one: "%{count} новае паведамленне"
+        other: "%{count} новых паведамленняў"
       no_messages_yet: У вас пакуль няма паведамленняў. Чаму б не зкаардэнавацца з  %{people_mapping_nearby_link}?
+      old_messages: 
+        one: "%{count} старое паведамленне"
+        other: "%{count} старых паведамленняў"
       outbox: зыходныя
       people_mapping_nearby: людзьмі, што жывуць непадалёку
       subject: Тэма
       title: Уваходныя
-      you_have: У вас %{new_count} новых і %{old_count} старых паведамленняў
     mark: 
       as_read: Паведамленне адмечана прачытаным
       as_unread: Паведамленне адмечана нечытаным
     message_summary: 
+      delete_button: Выдаліць
       read_button: Адзначыць як прачытанае
       reply_button: Адказаць
       unread_button: Адзначыць як нечытанае
     new: 
       back_to_inbox: Вярнуцца да уваходных
       body: Тэкст
+      limit_exceeded: Вы адправілі шмат паведамленняў нядаўна. Калі ласка, пачакайце некаторы час, перш чым спрабаваць адаслаць наступныя.
       message_sent: Паведамленне адпраўлена
       send_button: Даслаць
       send_message_to: Даслаць новае паведамленне %{name}
       subject: Тэма
       title: Даслаць паведамленне
-    no_such_user: 
-      body: Нажаль, не атрымалася знайсці карыстача або паведамленне з такім імем або ідэнтыфікатарам
-      heading: Няма такога карыстальніка/паведамленні
-      title: Няма такога карыстальніка/паведамленні
+    no_such_message: 
+      body: Шкада, паведамлення з гэтым ідэнтыфікатарам няма.
+      heading: Няма такога паведамлення
+      title: Няма такога паведамлення
     outbox: 
       date: Дата
       inbox: уваходныя
+      messages: 
+        one: Вы адаслалі %{count} паведамленне
+        other: Вы адаслалі %{count} паведамленняў
       my_inbox: Мае %{inbox_link}
       no_sent_messages: У вас пакуль няма дасланых паведамленняў. Чаму б не зкаардэнавацца з %{people_mapping_nearby_link}?
       outbox: зыходныя
@@ -359,19 +959,45 @@ be:
       subject: Тэма
       title: Зыходныя
       to: Каму
-      you_have_sent_messages: У вас %{count} дасланых паведамленняў
     read: 
-      back_to_inbox: Вярнуцца да ўваходных
-      back_to_outbox: Вярнуцца да зыходных
+      back: Назад
       date: Дата
       from: Ад
-      reading_your_messages: Чытанне вашых паведамленняў
-      reading_your_sent_messages: Чытанне вашых дасланых паведамленняў
       reply_button: Адказаць
       subject: Тэма
       title: Прачытаць паведамленне
-      to: Камууу
+      to: Каму
       unread_button: Адзначыць, як непрачытанае
+    sent_message_summary: 
+      delete_button: Выдаліць
+  note: 
+    description: 
+      closed_at_by_html: Вырашаны %{when} таму %{user}
+      closed_at_html: Вырашана %{when} таму
+      commented_at_by_html: Абноўлена %{when} таму %{user}
+      commented_at_html: Абноўлена %{when} таму
+      opened_at_by_html: Створана %{when} таму %{user}
+      opened_at_html: Створана %{when} таму
+      reopened_at_by_html: Пераадкрыта %{when} таму %{user}
+      reopened_at_html: Пераадкрыта %{when} таму
+    entry: 
+      comment: Каментар
+      full: Тлумачэнне
+    mine: 
+      ago_html: "%{when} таму"
+      created_at: Створаны ў
+      creator: Стваральнік
+      description: Апісанне
+      heading: Заўвагі %{user}'а
+      id: Id
+      last_changed: Апошнія змены
+    rss: 
+      closed: закрытая заўвага (каля %{place})
+      commented: новы каментар (каля %{place})
+      description_item: RSS-стужка заўваг %{id}
+      opened: новая заўвага (каля %{place})
+      reopened: пераадкрытая заўвага (каля %{place})
+      title: Заўвагі OpenStreetMap
   notifier: 
     diary_comment_notification: 
       footer: Вы можаце прагледзець каментар на %{readurl} і пракаментаваць на %{commenturl} ці адказаць на %{replyurl}
@@ -387,8 +1013,6 @@ be:
     email_confirm_plain: 
       click_the_link: Калі гэта вы, то перайдзіце па спасылцы, размешчанай ніжэй, каб пацвердзіць змену.
       greeting: Добры дзень,
-      hopefully_you_1: Хтосьці (спадзяемся, што вы) жадае змяніць свой адрас электроннай пошты ў
-      hopefully_you_2: "%{server_url} на адрас: %{new_address}."
     friend_notification: 
       had_added_you: "%{user} дадаў вас, як сябра, на OpenStreetMap."
       see_their_profile: Вы можаце прагледзець профіль на %{userurl} і дадаць, як сябра, у адказ, калі хочаце.
@@ -403,7 +1027,7 @@ be:
         subject: "[OpenStreetMap] Збой імпарту GPX"
       greeting: Прывітанне,
       success: 
-        loaded_successfully: " |"
+        loaded_successfully: паспяхова загружаны %{trace_points} з магчымых %{possible_points} кропак.
         subject: "[OpenStreetMap] Імпарт GPX мінуў паспяхова"
       with_description: з апісаннем
       your_gpx_file: Гэта выглядае як ваш файл GPX
@@ -416,96 +1040,214 @@ be:
     lost_password_plain: 
       click_the_link: Калі гэта вы, калі ласка, перайдзіце па спасылцы, паказанай ніжэй, каб змяніць ваш пароль.
       greeting: Прывітанне,
-      hopefully_you_1: Хтосьці (спадзяемся, што вы) запытаў змену пароля для гэтага
-      hopefully_you_2: адраса электроннай пошты, зарэгістраванага на openstreetmap.org.
     message_notification: 
-      footer1: Вы можаце таксама прачытаць паведамленне - %{readurl}
-      footer2: і вы можаце адказаць на %{replyurl}
       header: "%{from_user} адправіў вам паведамленне з тэмай %{subject} праз OpenStreetMap:"
       hi: Прывітанне, %{to_user},
+    note_comment_notification: 
+      anonymous: Ананімны карыстальнік
+      greeting: Прывітанне,
     signup_confirm: 
-      subject: "[OpenStreetMap] Пацвердзіце ваш адрас электроннай пошты"
-    signup_confirm_html: 
-      click_the_link: Калі гэта вы, вітаем! Калі ласка, націсніце спасылку ніжэй, каб пацвердзіць ваш рахунак і прачытаць больш пра OpenStreetMap
-      current_user: Спіс бягучых карыстальнікаў па катэгорыях іх геаграфічнага знаходжання даступны на  <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
-      get_reading: Пачытайце пра OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">на wiki</p> ці  <a href="http://www.opengeodata.org/">блогу opengeodata</a>, на якім таксама ёсць <a href="http://www.opengeodata.org/?cat=13">подкасты</a>!
-      greeting: Вітанні!
-      hopefully_you: Нехта (спадзяемся, вы) хоча стварць рахунак
-      introductory_video: Вы можаце прагледзець %{introductory_video_link}.
-      more_videos: Яшчэ больш %{more_videos_link}.
-      more_videos_here: відэа тут
-      user_wiki_page: Рэкамендуем стварыць старонку карыстальніка на wiki, якая будзе уключаць цэтлікі катэгорый, якія адзначаюць, дзе вы знаходзіцеся, напрыклад <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.
-      video_to_openstreetmap: уводнае відэа пра OpenStreetMap
-      wiki_signup: Вы таксама можаце захацець <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">зарэгістравацца на  OpenStreetMap wiki</a>.
-    signup_confirm_plain: 
-      click_the_link_1: Калі гэта вы, вітаем! Калі ласка, націсніце спасылку ніжэй, каб
-      click_the_link_2: пацвердзіць ваш рахунак і прачытаць больш пра OpenStreetMap.
-      current_user_1: Спіс бягучых карыстальнікаў па катэгорыях іх геаграфічнага знаходжання
-      current_user_2: "даступны на:"
-      greeting: Вітанні!
-      hopefully_you: Нехта (спадзяемся, вы) хоча стварць рахунак
-      introductory_video: "Вы можаце прагледзець уводнае відэа пра OpenStreetMap тут:"
-      more_videos: "І яшчэ больш відэа тут:"
-      opengeodata: "OpenGeoData.org - афіцыйны блог OpenStreetMap, і таксама мае подкасты:"
-      the_wiki: "Пачытайце пра OpenStreetMap на wiki:"
-      the_wiki_url: http://wiki.openstreetmap.org/wiki/RU:Beginners_Guide
-      user_wiki_1: Рэкамендуем стварыць старонку карыстальніка на wiki, якая будзе уключаць цэтлікі катэгорый,
-      user_wiki_2: якія адзначаюць, дзе вы знаходзіцеся, напрыклад [[Category:Users_in_London]].
-      wiki_signup: "Вы таксама можаце захацець зарэгістравацца на  OpenStreetMap wiki на:"
-      wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&type=signup&returnto=RU%3AMain_Page
+      greeting: Прывітанне!
+      subject: "[OpenStreetMap] Сардэчна запрашаем у OpenStreetMap"
+  oauth: 
+    oauthorize: 
+      allow_read_gpx: чытаць уласныя GPS-сляды.
+      allow_write_api: змяняць карту.
+      allow_write_gpx: адаслаць GPS-сляды.
+      allow_write_notes: змяняць заўвагі.
+    oauthorize_failure: 
+      title: Не ўдалося выканаць запыт аўтарызацыі
+    oauthorize_success: 
+      verification: "Праверачны код: %{code}."
+  oauth_clients: 
+    edit: 
+      submit: Рэдагаваць
+    form: 
+      allow_write_gpx: адсылаць GPS-сляды.
+      allow_write_notes: змяняць заўвагі.
+      name: Імя
+    index: 
+      issued_at: "Выпісаны:"
+      revoke: Адазваны!
+    new: 
+      submit: Зарэгістравацца
+    show: 
+      allow_write_gpx: адаслаць GPS-сляды.
+      allow_write_notes: змяняць заўвагі.
+      confirm: Вы ўпэўненыя?
+      title: Падрабязнасьці OAuth для %{app_name}
+  redaction: 
+    create: 
+      flash: Рэдакцыя створана.
+    destroy: 
+      error: Адбылася памылка пры знішчэнні гэтай рэдакцыі.
+      flash: Рэдакцыя знішчана.
+    edit: 
+      description: Апісанне
+      heading: Праўка рэдакцыі
+      submit: Захаваць рэдакцыю
+      title: Праўка рэдакцыі
+    index: 
+      empty: Няма рэдакцый для прагляду.
+      heading: Спіс рэдакцый
+      title: Спіс рэдакцый
+    new: 
+      description: Апісанне
+      heading: Калі ласка, увядзіце інфармацыю для новай рэдакцыі
+      submit: Стварыць рэдакцыю
+      title: Стварэнне новай рэдакцыі
+    show: 
+      confirm: Вы ўпэўненыя?
+      description: "Апісанне:"
+      destroy: Выдаліць гэтую рэдакцыю
+      edit: Рэдагаваць гэтую рэдакцыю
+      heading: Паказваецца рэдакцыя "%{title}"
+      title: Паказваецца рэдакцыя
+      user: "Стваральнік:"
+    update: 
+      flash: Змены былі захаваныя.
   site: 
     edit: 
       not_public: Вы не дазволілі зрабіць усе вашыя змены публічнымі.
       potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you should deselect the current шлях ці point, if editing in list mode, ці click save if you have a save button.)
+      user_page_link: старонка карыстальніка
     index: 
+      createnote: Дадаць заўвагу
       js_1: Вы карыстаецеся вандроўнікам без падтрымкі JavaScript.
       js_2: OpenStreetMap выкарыстоўвае JavaScript для адлюстравання карты на сайце.
-      js_3: Вы можаце паспрабаваць выкарыстаць <a href="http://tah.openstreetmap.org/Browse/">статычны агляд Tiles@Home</a> калі не можаце уключыць JavaScript.
-      license: 
-        notice: Ліцэнзіруецца на ўмовах %{license_name} праектам %{project_name} і яго карыстальнікамі.
-        project_name: OpenStreetMap
       permalink: Спасылка сюды
+      shortlink: Кароткая спасылка
     key: 
-      map_key: Ключ карты
-      map_key_tooltip: Легенда для рэндэрынгу mapnik на гэтым узроўні маштабу
+      table: 
+        entry: 
+          admin: Адміністрацыйная мяжа
+          allotments: Надзелы
+          apron: 
+            - Перон аэрапорта
+            - тэрмінал
+          brownfield: Ачышчаная пляцоўка для забудовы
+          building: Значны будынак
+          cemetery: Могілкі
+          centre: Спартыўны цэнтр
+          commercial: Камерцыйная зона
+          common: 
+            1: луг
+          construction: Дарогі ў стадыі будаўніцтва
+          farm: Ферма
+          footway: Пешаходная дарожка
+          forest: Лес
+          golf: Поле для гольфа
+          heathland: Пустка
+          industrial: Прамысловая зона
+          lake: 
+            - Возера
+            - вадасховішча
+          military: Ваенная зона
+          motorway: Аўтамабільная дарога
+          park: Парк
+          permissive: Доступ з дазволу
+          pitch: Спартыўная пляцоўка
+          primary: Першасная дарога
+          private: Прыватны доступ
+          rail: Чыгунка
+          reserve: Запаведнік
+          resident: Жылы раён
+          runway: 
+            - Узлетна-пасадачная паласа
+            - рулёжная дарожка
+          school: 
+            - Школа
+            - універсітэт
+          secondary: Другасная дарога
+          station: Чыгуначны вакзал
+          subway: Метро
+          summit: 
+            - Саміт
+            - пік
+          tourist: Турыстычная славутасць
+          track: Трэк
+          tram: 
+            1: трамвай
+          trunk: Магістраль
+          unclassified: Некласіфікаваная дарога
+          unsurfaced: Дарога без пакрыцця
+          wood: Дзікі лес
+    markdown_help: 
+      alt: Альтэрнатыўны тэкст
+      first: Першы элемент
+      heading: Загаловак
+      headings: Загалоўкі
+      image: Выява
+      link: Спасылка
+      ordered: Спарадкаваны спіс
+      second: Другі элемент
+      subheading: Падзагаловак
+      text: Тэкст
+      unordered: Неспарадкаваны спіс
+      url: URL-адрас
+    richtext_area: 
+      edit: Рэдагаваць
+      preview: Папярэдні прагляд
     search: 
       search: Пошук
-      search_help: "напрыклад: 'Мінск', 'Regent Street, Cambridge', 'CB2 5AQ', ці 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>больш прыкладаў...</a>"
       submit_text: =>
       where_am_i: Дзе я?
+      where_am_i_title: Апісаць бягучае месцазнаходжанне з дапамогай пошукавай сістэмы
+    sidebar: 
+      close: Зачыніць
+      search_results: Вынікі пошуку
+  time: 
+    formats: 
+      friendly: "%e %B %Y у %H:%M"
   trace: 
     create: 
       trace_uploaded: Ваш GPX-файл быў зацягнуты і чакае ўстаўкі ў базу дадзеных. Гэта звычайна робіцца не больш за паўгадзіны. Вы атрымаеце працврджанне аб заканчэнні працэсу па электроннай пошце
       upload_trace: Зацягнуць GPS-трэк
     delete: 
       scheduled_for_deletion: Трэк запланаваны на выдаленне
+    description: 
+      description_with_count: 
+        one: GPX-файл з %{count} кропкай ад %{user}
+        other: GPX-файл з %{count} кропкамі ад %{user}
+      description_without_count: GPX-файл ад %{user}
     edit: 
       description: "Апісанне:"
+      download: сцягнуць
       edit: змяніць
       filename: "Назва файла:"
+      heading: Рэдагаванне следу %{name}
+      map: карта
       owner: "Уладальнік:"
       points: "Пунктаў:"
       save_button: Запісаць змены
       start_coord: "Каардынаты пачатку:"
       tags: "Цэтлікі:"
+      title: Рэдагаванне следу %{name}
       uploaded_at: "Зацягнуты:"
+      visibility: "Бачнасць:"
+      visibility_help: што гэта значыць?
+    georss: 
+      title: GPS-сляды OpenStreetMap
     list: 
+      description: Агляд нядаўна дададзеных GPS-слядоў
       public_traces: Публічныя GPS-трэкі
       public_traces_from: Публічныя GPS-трэкі карыстальніка %{user}
       tagged_with: " адмечана як %{tags}"
       your_traces: Вашыя GPS-трэкі
     make_public: 
       made_public: Трэк зроблены публічным
-    no_such_user: 
-      body: Выбачыце, карыстальніка з імем %{user} не існуе. Калі ласка, праверце правільнасць напісання. Магчыма спасылка, па якой вы дашлі, няслушная.
-      heading: Карыстач %{user} не існуе
-      title: Няма такога карыстальніка
+    offline: 
+      heading: Сховішча GPX-файлаў адключана
+      message: Сховішча і сістэма загрузкі GPX-файлаў ў бягучы момант недаступныя
+    offline_warning: 
+      message: Сістэма загрузкі GPX-файлаў ў бягучы момант недаступная
     trace: 
       ago: "%{time_in_words_ago} таму"
       by: з дапамогай
       count_points: "%{count} пунктаў"
       edit: змяніць
       edit_map: Змяніць карту
+      identifiable: IDENTIFIABLE
       in: у
       map: карта
       more: яшчэ
@@ -513,20 +1255,28 @@ be:
       private: ПРЫВАТНЫ
       public: ПУБЛІЧНЫ
       trace_details: Прагледзець уласцівасці трэку
+      trackable: TRACKABLE
       view_map: Прагледзець карту
     trace_form: 
-      description: Апісанне
-      help: Дапамога
+      description: "Апісанне:"
+      help: Даведка
       help_url: http://wiki.openstreetmap.org/wiki/RU:Upload
-      tags: Цэтлікі
+      tags: "Тэгі:"
       upload_button: Зацягнуць
-      upload_gpx: Зацягнуць GPX-файл
+      upload_gpx: "Адаслаць GPX-файл:"
+      visibility: "Бачнасць:"
+      visibility_help: што гэта значыць?
     trace_header: 
       see_all_traces: Бачыць усе трэкі
       see_your_traces: Бачыць усе свае трэкі
       traces_waiting: У вас %{count} трэкаў у чарзе. Калі ласка, пачакайце, пакуль яны будуць апрацаваныя, каб не блакірваць чаргу для астатніх карстальнікаў.
+      upload_trace: Адаслаць GPS-след
     trace_optionals: 
       tags: Цэтлікі
+    trace_paging_nav: 
+      newer: Навейшыя сляды
+      older: Старэйшыя сляды
+      showing_page: Старонка %{page}
     view: 
       delete_track: Выдаліць гэты трэк
       description: "Апісанне:"
@@ -534,6 +1284,7 @@ be:
       edit: змяніць
       edit_track: Змяніць бягучы трэк
       filename: "Назва файла:"
+      heading: Прагляд следу %{name}
       map: карта
       none: Няма
       owner: "Уладальнік:"
@@ -541,19 +1292,47 @@ be:
       points: "Пункты:"
       start_coordinates: "Каардынаты пачатку:"
       tags: Цэтлікі
+      title: Прагляд следу %{name}
       trace_not_found: Трэк не знойдзены!
       uploaded: "Зацягнуты:"
+      visibility: "Бачнасць:"
+    visibility: 
+      identifiable: Ідэнтыфікуемы (паказваецца ў сьпісе слядоў як ідэнтыфікуемы са спарадкаванымі кропкамі і меткамі часу)
+      private: Прыватны (ананімны з неспарадкаванымі кропкамі)
+      public: Агульны (паказваецца ў сьпісе слядоў як ананімны з неспарадкаванымі кропкамі)
+      trackable: Адсочвальны (ананімны са спарадкаванымі кропкамі і меткамі часу)
   user: 
     account: 
+      contributor terms: 
+        agreed: Вы пагадзіліся на новыя ўмовы ўдзелу.
+        agreed_with_pd: Вы таксама заявілі, што лічыце, што змены павінны знаходзіцца ў агульнай уласнасці.
+        heading: "Умовы ўдзелу:"
+        link text: што гэта?
+        not yet agreed: Вы яшчэ не пагадзіліся на новыя ўмовы ўдзелу.
+        review link text: Калі ласка, прайдзіце па гэтай спасылцы для Вашай зручнасці, каб разгледзець і прыняць новыя ўмовы ўдзелу.
+      current email address: "Бягучы адрас электроннай пошты:"
+      delete image: Выдаліць бягучую выяву
       email never displayed publicly: (ніколі нікому не паказваецца)
       flash update success: Звесткі аб карыстальніку паспяхова абноўленыя.
       flash update success confirm needed: Звесткі аб карыстальніку паспяхова абноўленыя. Праверце сваю пошту, вам павінны прыйсці запыт на пацверджанне змены адрасу.
+      gravatar: 
+        gravatar: Выкарыстоўваць Gravatar
+        link text: што гэта?
       home location: "Ваша месцазнаходжанне:"
+      image: "Выява:"
+      keep image: Захаваць бягучую выяву
       latitude: "Шырата:"
       longitude: "Даўгата:"
       make edits public button: Зрабіць усе мае змены публічнымі
-      my settings: Мае настаўленні
+      my settings: Мае настройкі
+      new email address: "Новы адрас электроннай пошты:"
+      new image: Дадаць выяву
       no home location: Вы не выбралі вашае асноўнае месцазнаходжанне.
+      openid: 
+        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link text: што гэта?
+        openid: "OpenID:"
+      preferred editor: "Любімы рэдактар:"
       preferred languages: "Абраныя мовы:"
       profile description: "Апісанне профілю:"
       public editing: 
@@ -563,32 +1342,78 @@ be:
         enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
         enabled link text: што гэта?
         heading: "Публічнае рэдагаванне:"
+      public editing note: 
+        heading: Агульнае рэдагаванне
+      replace image: Замяніць бягучую выяву
       return to profile: Вярнуцца да профілю
       save changes button: Запісаць змены
       title: Змяніць рахунак
       update home location on click: Абнавіць каардэнаты, калі я пстрыкну па карце?
     confirm: 
+      already active: Гэты ўліковы рахунак ужо пацверджаны.
       button: Пацвердзіць
-      heading: Пацверджанне рахунку
+      heading: Праверце вашу электронную пошту!
+      introduction_1: Мы адправілі вам ліст з пацверджаннем.
+      introduction_2: Пацвердзіць Ваш рахунак, націснуўшы на адпаведную спасылку ў лісце і вы зможаце пачаць маляваць карту.
       press confirm button: Націсніце кнопку, каб актывізаваць рахунак.
-      success: Рахунак пацверджаны, дзякуй за рэгістрацыю!
+      reconfirm_html: Калі вам трэба зноў даслаць пацверджанне па электроннай пошце, <a href="%{reconfirm}"><a href="%{пацвердзіць}">націсніце тут</a>.
     confirm_email: 
       button: Пацвердзіць
       failure: Паштовы адрас ужо быў пацверджаны гэтым ключом.
       heading: Пацвердзіць змену паштовага адрасу
       press confirm button: Націсніце кнопку, каб пацвердзіць ваш новы паштовы адрас.
       success: Ваш адрас пацверджаны, дзякуй за рэгістрацыю!
+    confirm_resend: 
+      failure: Карыстальнік %{name} не знойдзены.
+    filter: 
+      not_an_administrator: Вам неабходна мець правы адміністратара для выканання гэтага дзеяння.
     go_public: 
       flash success: Усе вашыя змены цяпер публічныя, і вам цяпер дазволена рэдагаванне
+    list: 
+      heading: Удзельнікі
+      showing: 
+        one: Старонка %{page} (%{first_item} з %{items})
+        other: Старонка %{page} (%{first_item}-%{last_item} з %{items})
+      summary: "%{name} створана з %{ip_address} %{date}"
+      summary_no_ip: "%{name} створаны %{date}"
+      title: Удзельнікі
     login: 
-      account not active: Прабачце, ваш рахунак пакуль не актывізаваны.<br />Калі ласка, націсніце на адпаведную спасылку ў лісце пацверджання рахунку, каб актывізаваць яго.
+      account not active: Прабачце, ваш рахунак пакуль не актывізаваны.<br />Калі ласка, націсніце на адпаведную спасылку ў лісце пацверджання рахунку, каб актывізаваць яго, ці <a href="%{reconfirm}">запытаць новы ліст-пацверджанне на электронную пошту</a>.
       auth failure: Прабачце, немагчыма увайсці з такім адрасам і паролем.
+      create account minute: Стварыце рахунак. Гэта зойме ўсяго адну хвіліну.
       email or username: "Пошта ці імя карыстальніка:"
       heading: Уваход
       login_button: Увайсці
       lost password link: Згубліл пароль?
+      new to osm: Упершыню на OpenStreetMap?
+      no account: Не маеце асабістага рахунку?
+      openid_logo_alt: Увайсці з дапамогай OpenID
+      openid_providers: 
+        aol: 
+          alt: Увайсці з дапамогай AOL OpenID
+          title: Уваход праз AOL
+        google: 
+          alt: Уваход праз Google OpenID
+          title: Уваход праз Google
+        myopenid: 
+          alt: Уваход праз myOpenID OpenID
+          title: Уваход праз myOpenID
+        openid: 
+          alt: Увайсці з дапамогай OpenID URL
+          title: Уваход праз OpenID
+        wordpress: 
+          alt: Уваход праз Wordpress OpenID
+          title: Уваход праз Wordpress
+        yahoo: 
+          title: Уваход праз Yahoo
       password: "Пароль:"
+      remember: Памятаць мяне
       title: Уваход
+      to make changes: Каб змяняць дадзеныя OpenStreetMap, вы павінны мець асабісты рахунак.
+    logout: 
+      heading: Выйсці з OpenStreetMap
+      logout_button: Выйсці
+      title: Выйсці
     lost_password: 
       email address: "Паштовы адрас:"
       heading: Забылі пароль?
@@ -598,57 +1423,128 @@ be:
       title: згублены пароль
     make_friend: 
       already_a_friend: Вы ўжо сябруеце з %{name}.
+      button: Пасябраваць
       failed: Прабачце, немагчыма дадаць %{name} у якасці сябра.
-      success: "%{name} цяпер ваш сябар."
+      heading: Пасябраваць з %{user}?
+      success: "%{name} пасябраваў з вамі."
     new: 
       confirm email address: "Пацверджанне паштовага адрасу:"
       confirm password: "Пацверджанне паролю:"
       contact_webmaster: Калі ласка, спішыцеся з <a href="mailto:webmaster@openstreetmap.org">вэм-майстрам</a> каб стварыць вам рахунак - мы паспрабуем выдаць вам рахунак як мага хутчэй.
+      continue: Зарэгістравацца
       display name: "Бачнае імя:"
       email address: "Паштовы адрас:"
-      fill_form: Запоўніце форму, і мы вышлем вам ліст для актывізацыі рахунка.
-      flash create success message: Карыстальнік паспяхова створаны. Праверце сваю паштовую скрыню - у ёй павыінен быць код пацверджання, і вы зможаце пачаць маляваць наваі зараз! :-)<br /><br />Калі ласка, заўважце, што вы не можаце увайсці, пакуль вы не пацвердзілі свой паштовы адрас.<br /><br />Калі вы карыстаецеся супрацьспамавай сістэмай, якая рассылае запыты на пацверджанне, калі ласка, унясіце ў белы спіс webmaster@openstreetmap.org, бо мы не можам адказваць на запыты пацверджанняў.
-      heading: Стварыць рахунак карыстальніка
-      license_agreement: Ствараючы рахунак, вы згаджаецеся, што ўсё, што вы зацягнеце на openstreetmap.org і ўсе дадзеныя, створаныя пры выкарыстанні любой утыліты, што звязваецца з openstreetmap.org будуць ліцэнзіравацца (невыключна) на ўмовах <a href="http://creativecommons.org/licenses/by-sa/2.0/">гэтай ліцэнзіі Creative Commons (by-sa)</a>.
+      license_agreement: Ствараючы рахунак, вы згаджаецеся з <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">умовамі удзелу</a>.
       no_auto_account_create: На жаль, мы не можам стварыць для вас рахунак аўтаматычна.
       not displayed publicly: Не паказваецца астатнім (глядзіце <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="палітыка неразглашэння на wiki, у тым ліку секцыя пра паштовыя адрасы">палітыку неразглашэння</a>)
+      openid: "%{logo} OpenID:"
       password: "Пароль:"
+      terms accepted: Дзякуй за прыняцце новых умоў ўдзелу!
       title: Стварыць рахунак
     no_such_user: 
       body: Прабачце, карыстальнік %{user} не знойдзены. Please check your spelling, Калі ласка, праверце свой правапіс, ці, магчыма, вам далі няправільную спасылку.
       heading: Карыстальнік %{user} не існуе
       title: Няма такога карыстальніка
     popup: 
+      friend: Сябар
       nearby mapper: Карыстальнік
       your location: Ваша месцазнаходжанне
     remove_friend: 
+      button: Выдаліць з сяброў
       not_a_friend: "%{name} не з'яўляецца вашым сябрам."
       success: "%{name} выдалены са спіса сяброў."
     reset_password: 
+      confirm password: "Пацвердзіце пароль:"
+      flash changed: Ваш пароль быў зменены.
       flash token bad: Не знайшоў такі ключ, можа, праверце URL?
+      password: "Пароль:"
+      reset: "Скінуць пароль:"
       title: скінуць пароль
     set_home: 
       flash success: Дамашняе месцазнаходжанне паспяхова запісана
+    suspended: 
+      heading: Рахунак замарожаны
+      title: Рахунак замарожаны
+      webmaster: вэбмайстар
+    terms: 
+      agree: Згодны
+      heading: Умовы ўдзелу
+      legale_names: 
+        france: Францыя
+        italy: Італія
+        rest_of_world: Астатні свет
+      title: Умовы ўдзелу
     view: 
-      add as friend: дадаць у сябры
+      activate_user: актывацыя гэтага карыстальніка
+      add as friend: Пасябраваць
       ago: (%{time_in_words_ago} таму)
+      comments: Каментары
+      confirm: Пацвердзіць
+      create_block: заблякаваць гэтага карыстальніка
+      ct status: "Умовы ўдзелу:"
+      deactivate_user: адключыць гэтага карыстальніка
+      delete_user: выдаліць гэтага карыстальніка
       description: Апісанне
-      diary: дзённік
-      edits: змены
-      if set location: Калі вы вызначыце сваё месцазнаходжанне, ніжэй з'явіцца прыгожая карта і ўсё такое. Вы можаце вызначыць сваё месцазнаходжанне на старонцы %{settings_link}.
+      diary: Дзённік
+      edits: Змены
+      email address: "Адрас электроннай пошты:"
+      hide_user: схаваць гэтага карыстальніка
+      if set location: Вы можаце адзначыць сваё месцазнаходжанне на старонцы %{settings_link}, каб бачыць карыстальнікаў паблізу.
       km away: "%{count} км ад вас"
+      latest edit: "Апошняе рэдагаваньне %{ago}:"
       mapper since: "Малюе карту з:"
-      my diary: мой дзённік
-      my edits: мае змены
-      my settings: мае настаўленні
-      my traces: мае трэкі
-      nearby users: "Карыстальнікі непадалёку:"
+      my comments: Мае каментары
+      my diary: Мой дзённік
+      my edits: Мае змены
+      my messages: Мае паведамленні
+      my notes: Мае заўвагі
+      my profile: Мой профіль
+      my settings: Мае настройкі
+      my traces: Мае трэкі
+      nearby users: "Карыстальнікі паблізу:"
       new diary entry: новы запіс у дзённіку
       no friends: Вы пакуль не дадалі нікога ў сябры.
-      no nearby users: Пакуль няма карыстальнікаў, што адмецілі сваё месцазнаходжанне непадалёку.
-      remove as friend: выдаліць з сяброў
-      send message: даслаць паведамленне
+      no nearby users: Пакуль што няма карыстальнікаў, якія пазначылі сваё месцазнаходжанне паблізу.
+      remove as friend: Выдаліць з сяброў
+      role: 
+        administrator: Гэты карыстальнік з'яўляецца адміністратарам
+        moderator: Гэты карыстальнік з'яўляецца мадэратарам
+        revoke: 
+          administrator: Адклікаць доступ з правамі адміністратара
+      send message: Адаслаць паведамленне
       settings_link_text: настаўленняў
-      traces: трэкі
+      traces: Трэкі
       user location: Месцазнаходжанне
       your friends: Вашыя сябры
+  user_block: 
+    helper: 
+      time_future: Заканчваецца праз %{time}.
+    not_found: 
+      back: Вярнуцца да пераліку
+    partial: 
+      next: Далей »
+      not_revoked: (не адкліканы)
+      previous: « Назад
+      revoker_name: Адкліканы
+      showing_page: Старонка %{page}
+      status: Статус
+    show: 
+      back: Праглядзець усе блакіроўкі
+      confirm: Вы ўпэўненыя?
+      edit: Рэдагаваць
+      reason: "Прычына блакіроўкі:"
+      revoke: Адазваць!
+      show: Паказаць
+      status: Статус
+      time_future: Заканчваецца праз %{time}
+      time_past: Скончылася %{time} таму
+  user_role: 
+    grant: 
+      confirm: Пацвердзіць
+    revoke: 
+      confirm: Пацвердзіць
+  welcome_page: 
+    questions: 
+      title: Ёсць пытанні?
+    start_mapping: Пачаць маляваць карту
+    title: Вітаем!
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 332514dd2..d73fcc96e 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -9,12 +9,14 @@
 # Author: Y-M D
 br: 
   about_page: 
+    community_driven_html: "Liesseurt hag entanet eo kumuniezh OpenStreetMap. O kreskiñ emañ bemdez. E-mesk hor c'henlabourerien ez eus kartennourien entanet, tud a-vicher eus ar GIS, ijinourien hag a laka servijerien OSM da vont en-dro, denegourien hag a sav kartennoù eus an takadoù gwastet gant gwallreuzioù ha kalz re all.\nEvit gouzout hiroc'h diwar-benn ar gumuniezh, sellit ouzh <a href='%{diary_path}'>deizlevrioù an implijerien</a>, <a href='http://blogs.openstreetmap.org/'>blogoù ar gumuniezh</a>, hag lec'hienn web <a href='http://www.osmfoundation.org/'>Diazezadur OSM</a>."
     community_driven_title: Renet gant ar gumuniezh
     copyright_html: <span>&copy;</span>OpenStreetMap<br>kenlabourerien
     lede_text: Savet eo OpenStreetMap gant ur gumuniezh gartennerien a-youl vat a genlabour hag a gempenn roadennoù diwar-benn hentoù, gwenodennoù, kafedioù, tiez-gar, ha muioc'h c'hoazh, er bed a-bezh.
     local_knowledge_html: OpenStreetMap a laka ar pouez war an anaoudegezh eus an dachenn. Implijout a ra ar genlabourerien skeudennoù tapet diwar nij, mekanikoù GPS ha kartennoù klasel abalamour da wiriañ ez eo reizh ha hizivaet OSM.
     local_knowledge_title: Gouiziegezh lec'hel
     next: War-lerc'h
+    open_data_html: "OpenStreetMap zo <i>open data</i>: gallout a rit implijout anezhañ evit forzh pseeurt pal keit ha ma roit kred da OpenStreetMap ha d'ar re a labour warnañ. Ma cheñchit ar roadennoù pe ma harpit warno e doareoù zo, e c'hallit skignañ an disoc'h dindan ar memes aotre-implij hepken. Sellit ouzh <a href='%{copyright_path}'>Aotre-eilañ ha pajenn an aotre-implij</a> evit gouzout hiroc'h."
     open_data_title: Roadennoù digor
     partners_title: Kevelerien
     used_by: "%{name} a bourchas kartennoù da gantadoù a lec'hiennoù web, da arloadoù hezoug ha da vekanikoù"
@@ -141,7 +143,7 @@ br:
       closed_title: "Notenn diskoulmet : %{note_name}"
       commented_by: Addispleg gant %{user} <abbr title='%{exact_time}'>%{when} zo</abbr>
       commented_by_anonymous: Addispleg gant un den dianv <abbr title='%{exact_time}'>%{when} zo</abbr>
-      description: "Deskrivadur :"
+      description: Deskrivadur
       hidden_by: Kuzhet gant %{user} <abbr title='%{exact_time}'>%{when} zo</abbr>
       hidden_title: "Notenn kuzhet #%{note_name}"
       new_note: Notenn nevez
@@ -347,6 +349,7 @@ br:
           description: Mamennoù all a gaver o roll er wiki OpenStreetMap
           title: Tarzhioù all
         overpass: 
+          description: Pellgargañ ar voest engronnus-mañ diwar ur melezour eus diaz roadennoù OpenStreetMap
           title: API Treuzell
         planet: 
           description: Eilennoù hizivaet ingal eus diaz roadennoù klok OpenStreetMap
@@ -355,11 +358,14 @@ br:
     title: Ezporzhiañ
   fixthemap: 
     how_to_help: 
+      add_a_note: 
+        instructions_html: "Klikit war <a class='icon note'></a> pe war ar memes arlun war ar gartenn.\nEvel-se e vo ouzhpennet ur merker d'ar gartenn, ha gallout a reoc'h riklañ anezhañ. Ouzhpennit ho kemennadenn, neuze klikit war enrollañ, ha studiet e vo gant ar gartennaouerien all."
       join_the_community: 
         explanation_html: M'ho peus merzet ez eus ur gudenn gant roadennoù hor c'hartennoù, da skouer un hent diank pe ho chomlec'h, an doare d'ober gwellañ eo mont d'ar gumuniezh OpenStreetMap hag ouzhpennañ pe dresañ ar roadennoù hoc'h-unan.
         title: Mont er gumuniezh-mañ
       title: Penaos sikour
     other_concerns: 
+      explanation_html: Ma'z oc'h chalet gant an doare ma vez implijet hor roadennoù pe gant an endalc'hadoù, sellit ouzh hor <a href='/copyright'>pajenn gwir-eilañ</a> evit muioc'h a ditouroù lezennel, pe kit e darempred gant ar <a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>strollad-labour OSMF</a> a zere.
       title: Prederioù all
     title: " Diskouez ez eus ur gudenn / Reizhañ ar gartenn"
   geocoder: 
@@ -896,6 +902,7 @@ br:
       description: Ober ur goulenn pe klask respontoù e lec'hienn goulennoù-respontoù OSM
       title: help.openstreetmap.org
       url: https://help.openstreetmap.org/
+    introduction: OpenStreetMap zo gantañ meur a zoare da c'houzout hiroc'h diwar-benn ar raktres, d'ober goulennoù ha da respont da c'houlennoù, ha da gendivizout ha da deuliaduriñ sujedoù ar c'hartennoù.
     title: Tapout sikour
     welcome: 
       description: Krogit gant ar sturlevr-mañ evit deskiñ diazezoù OpenStreetMap
@@ -936,7 +943,7 @@ br:
     notes: 
       new: 
         add: Ouzhpennañ un notenn
-        intro: Evit gwellaat ar gartenn e tiskouezer ar roadennoù a ebarzhit d'ar gartennaouerien all, setu displegit fraezh an traoù ha bezit resis kement ha ma c'hallit, mar plij, pa zilec'hiit ar merker d'ul lec'h mat ha pa ebarzhit ho notenn amañ dindan.
+        intro: Gwelet ho peus ur fazi pe un dra a vank ? Roit an dra-se da c'houzout d'ar gartennaouerien all evit ma vo renket. Lakait ar merker el lec'h mat ha skrivet un notenn da zisplegañ ar gudenn. (Arabat skrivañ titouroù personel amañ, mar plij.)
       show: 
         anonymous_warning: En notenn-mañ ez eus evezhiadennoù gant implijerien dianav hag a zlefe bezañ gwiriekaet unan-ha-unan.
         comment: Evezhiadenn
@@ -1025,6 +1032,7 @@ br:
         title: Skouer deverkadur
       contributors_at_html: "<strong>Aostria</strong> : Ennañ roadennoù eus\n<a href=\"http://data.wien.gv.at/\">Stadt Wien</a> (dindan\n<a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>.</li> \t\n<a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>), \n<a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg</a> ha\nLand Tirol (dindan <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT gant enkemmadoù</a>)."
       contributors_ca_html: "<strong>Kanada</strong> : Ennañ roadennoù eus\n   GeoBase&reg;, GeoGratis (&copy; Department of Natural\n   Resources Canada), CanVec (&copy; Department of Natural\n   Resources Canada), ha StatCan (Geography Division,\n   Statistics Canada)."
+      contributors_fi_html: "<strong>Finland</strong>: Ennañ ez eus roadennoù eus diaz roadennoù Ensellerezh Broadel Tiriad hag holladoù roadennoù all, dindan an\n<a href=\"http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501\">aotre-implij NLSFI</a>."
       contributors_footer_1_html: "↓Evit muioc'h a vunudoù diwar-benn ar re-se, hag ar mammennoù all a zo bet implijet da sikour da wellaat OpenStreetMap, sellit ouzh ar <a\nhref=\"http://wiki.openstreetmap.org/wiki/Contributors\">Bajenn Skoazellerien</a> e Wiki OpenStreetMap."
       contributors_footer_2_html: Enlakaat roadennoù e OpenStreetMap ne empleg ket ez aprou ar bourchaserien orin a endalc'had OpenStreetMap, na ne bourchasont, na ne waratomp pe na ne zegemeront ne vern pe atebegezh e vefe.
       contributors_fr_html: "<strong>Frañs</strong> : Ennañ roadennoù eus Renerezh Hollek an Tailhoù."
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 857f6e0d1..c8517d6fd 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -813,11 +813,35 @@ bs:
     welcome: 
       url: /dobrodošlica
   javascripts: 
+    close: Zatvori
     map: 
       base: 
         cycle_map: Biciklistička karta
         standard: Standardni/a
         transport_map: Transportna karta
+    notes: 
+      show: 
+        comment: Komentiraj
+        comment_and_resolve: Komentiraj i riješi
+        hide: Sakrij
+        reactivate: Reaktiviraj
+        resolve: Riješi
+    share: 
+      cancel: Odustani
+      center_marker: Centriraj kartu na oznaku
+      custom_dimensions: Postavi prilagođene dimenzije
+      download: Preuzmi
+      embed: HTML
+      format: "Format:"
+      image: Slika
+      include_marker: Uključi oznaku
+      link: Veza ili HTML
+      long_link: Veza
+      paste_html: Zalijepi HTML za umetanje na web stranicu
+      short_link: Kratki link
+      short_url: Kratki URL
+      title: Podijeli
+      view_larger_map: Prikaži veću kartu
     site: 
       edit_disabled_tooltip: Uvećati za uređivanje karte
       edit_tooltip: Urediti kartu
@@ -970,6 +994,13 @@ bs:
       wrong_user: "Prijavljeni ste kao: `%{user}', ali poruka za koju ste zamoljeni da odgovorite nije poslana tom korisniku. Molimo, prijavite se kao ispravan korisnik kako bi odgovorili."
     sent_message_summary: 
       delete_button: Izbrisati
+  note: 
+    mine: 
+      ago_html: prije %{when}
+      created_at: "Napravljeno:"
+      description: Opis
+      id: Id
+      last_changed: Zadnji put promijenjeno
   notifier: 
     diary_comment_notification: 
       footer: Možete pročitati komentare na %{readurl} i komentirati na %{commenturl} ili odgovoriti na %{replyurl}
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 323f5617d..593e108f9 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -159,7 +159,7 @@ ca:
       closed_title: "Nota resolta #%{note_name}"
       commented_by: Comentari de %{user} fa <abbr title='%{exact_time}'>%{when}</abbr>
       commented_by_anonymous: Comentari d'un anònim fa <abbr title='%{exact_time}'>%{when}</abbr>
-      description: "Descripció:"
+      description: Descripció
       hidden_by: Ocultat per %{user} fa <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_title: "Nota oculta #%{note_name}"
       new_note: Nova nota
@@ -364,6 +364,9 @@ ca:
         other: 
           description: Fonts addicionals llistades al wiki d'OpenStreetMap
           title: Altres fonts
+        overpass: 
+          description: Descarrega aquest requadre des d'una rèplica de la base de dades d'OpenStreetMap
+          title: API Overpass
         planet: 
           description: Còpies actualitzades regularment de la base de dades d'OpenStreetMap al complet
           title: Planeta OSM
@@ -371,6 +374,8 @@ ca:
     title: Exportar
   fixthemap: 
     how_to_help: 
+      add_a_note: 
+        instructions_html: Feu clic a <a class='icon note'></a> o a la mateixa icona sobre el mapa. Això afegirà un marcador al mapa, que podeu desplaçar arrossegant-lo. Afegiu el vostre missatge, deseu-lo i els altres usuaris ho investigaran.
       join_the_community: 
         explanation_html: Si heu trobat un problema amb les nostres dades del mapa, com per exemple l'omissió d'una carretera o bé de la vostra adreça, la millor forma d'arreglar-ho és unint-se a la comunitat d'OpenStreetMap i afegir o bé corregir les dades vós mateix.
         title: Afegiu-vos a la comunitat
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 83cbe22b1..9793b984d 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -153,7 +153,7 @@ da:
       closed_title: "Løst bemærkning #%{note_name}"
       commented_by: Kommentar fra %{user} for <abbr title='%{exact_time}'>%{when} siden</abbr>
       commented_by_anonymous: Kommentar fra en anonym for <abbr title='%{exact_time}'>%{when} siden</abbr>
-      description: "Beskrivelse:"
+      description: Beskrivelse
       hidden_by: Skjult af %{user} for <abbr title='%{exact_time}'>%{when} siden</abbr>
       hidden_title: "Skjult bemærkning #%{note_name}"
       new_note: Ny bemærkning
diff --git a/config/locales/de.yml b/config/locales/de.yml
index d8b670b0a..74a8be050 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -14,6 +14,7 @@
 # Author: Dieterdreist
 # Author: Drolbr
 # Author: Fujnky
+# Author: Geitost
 # Author: Grille chompa
 # Author: Holger
 # Author: Inkowik
@@ -1084,7 +1085,7 @@ de:
       infringement_title_html: Urheberrechtsverletzung
       intro_1_html: OpenStreetMap sind <i>„Open Data“</i>, die gemäß der <a href="http://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database Lizenz</a> (ODbL) verfügbar sind.
       intro_2_html: "Es steht dir frei unsere Daten zu kopieren, weiterzugeben,\nzu übermitteln sowie anzupassen, sofern du OpenStreetMap\nund die Mitwirkenden als Quelle angibst. Für den Fall, dass\ndu auf Basis unserer Daten Anpassungen vornimmst, oder sie\nals Grundlage für weitere Bearbeitungen verwendest, kannst\ndu das Ergebnis auch nur gemäß der selben Lizenz weitergeben.\nDer vollständige Lizenztext ist unter\n<a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">Lizenz</a>\neinsehbar und erläutert deine Rechte und Pflichten."
-      intro_3_html: "Die Kartografie in unseren Kartenkacheln und unsere Dokumentation sind unter der Lizenz <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative \nCommons „Namensnennung, Weitergabe unter gleichen Bedingungen“ 2.0</a> (CC BY-SA) verfügbar."
+      intro_3_html: Die Kartografie in unseren Kartenkacheln und unsere Dokumentation sind unter der ''Creative-Commons''-Lizenz <a href="http://creativecommons.org/licenses/by-sa/2.0/">„Namensnennung – Weitergabe unter gleichen Bedingungen“ 2.0</a> (CC BY-SA) verfügbar.
       more_1_html: Mehr Informationen dazu, wie unsere Daten verwendet werden können und wie man auf unsere Urheberschaft hinweist, kann man unter <a href="http://wiki.openstreetmap.org/wiki/DE:Legal_FAQ">Häufige rechtliche Fragen (Legal FAQ)</a> nachlesen.
       more_2_html: "Obwohl OpenStreetMap „Open Data“ ist, können wir keine \nunentgeltliche Karten-API für Drittparteienentwickler bereitstellen.\nSiehe unsere <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">API-Verwendungsrichtlinie</a>,\n<a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Kachelverwendungsrichtlinie</a>\nund <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Nominatim-Verwendungsrichtlinie</a>."
       more_title_html: Weitere Informationen
diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 74e388e14..12a06533b 100644
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -14,7 +14,7 @@ diq:
         language: Zıwan
         latitude: Heralem
         longitude: Lemen
-        title: Sername
+        title: Mewzu
         user: Karber
       friend: 
         friend: Embaz
@@ -23,7 +23,7 @@ diq:
         body: Mesac
         recipient: Grotker
         sender: Rıster
-        title: Sername
+        title: Mewzu
       trace: 
         description: Şınasnayış
         latitude: Heralem
@@ -76,7 +76,8 @@ diq:
       way_tag: Etikete ray
   browse: 
     changeset: 
-      title: Seta vurnayışan
+      belongs_to: Nuştekar
+      title: "Koma vurnayışi: %{id}"
     containing_relation: 
       entry: Eleqe %{relation_name}
       entry_role: Eleqe %{relation_name} (%{relation_role} deye)
@@ -86,12 +87,16 @@ diq:
         node: qedyin
         relation: eleqe
         way: ray
+    note: 
+      description: Şınasnayış
     redacted: 
       redaction: Temamey %{id}
       type: 
         node: qedyin
         relation: eleqe
         way: ray
+    relation: 
+      members: Ezay
     relation_member: 
       type: 
         node: Qedyin
@@ -108,6 +113,7 @@ diq:
         node: qedyin
         relation: eleqe
         way: ray
+    version: Versiyon
   changeset: 
     changeset: 
       no_edits: (vurnayış çıniyo)
@@ -129,7 +135,7 @@ diq:
       comment: Vatış
       newer_comments: Vatışê Tewr Newey
       older_comments: Vatışo Tewr Kehan
-      post: Nusne
+      post: Bırışe
       when: Key
     diary_comment: 
       confirm: Testiq ke
@@ -146,7 +152,7 @@ diq:
       save_button: Qeyd ke
       subject: "Mewzu:"
     location: 
-      edit: Timar ke
+      edit: Bıvurne
       location: "Herun:"
       view: Bıvin
     view: 
@@ -171,7 +177,7 @@ diq:
       max: maks
       options: Weçinegi
       output: Vıcyaen
-      scale: Senceg
+      scale: Sence
       zoom: Nezdı fi
   geocoder: 
     description: 
@@ -455,10 +461,10 @@ diq:
   layouts: 
     community: Cemaet
     community_blogs: Blogê Cemaeti
-    edit: Timar ke
+    edit: Bıvurne
     export: Tebergroten
     help: Peşti
-    history: Ravêrden
+    history: Tarix
     log_in: cı kewe
     logout: veciyayış
     sign_up: qeyd be
@@ -475,7 +481,7 @@ diq:
       reply_button: Cewab bıde
     new: 
       body: Vêrey mesaci
-      send_button: Bırşê
+      send_button: Bırışe
       subject: Mewzu
     outbox: 
       date: Deme
@@ -524,7 +530,7 @@ diq:
     edit: 
       description: Şınasnayış
     new: 
-      description: Sılasnayış
+      description: Şınasnayış
     show: 
       confirm: Vac welay?
       description: "Şınasiyen:"
@@ -566,7 +572,7 @@ diq:
       text: Metın
       url: GRE
     richtext_area: 
-      edit: Timar ke
+      edit: Bıvurne
       preview: Verqayt
     search: 
       search: Cı geyre
@@ -660,7 +666,7 @@ diq:
       public editing note: 
         heading: "Pêron rê akerde vurnayış:"
       return to profile: Peyser şo profil
-      save changes button: Vurnayîşa qeyd ke
+      save changes button: Vurnayışan qeyd ke
       title: Hesabi timar ke
     confirm: 
       button: Testiq ke
@@ -831,7 +837,7 @@ diq:
       confirm: Vac welay?
       creator_name: Vıraştoğ
       display_name: Karberê kılitbiyayey
-      edit: Timar ke
+      edit: Bıvurne
       next: Peyên »
       not_revoked: (nê terkiyayo)
       previous: « Verên
diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index 884f86c3a..cc05d6006 100644
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -1719,7 +1719,7 @@ dsb:
     new: 
       about: 
         header: Lichy a wobźěłujobny
-        html: "<p>Na rozdźěl wót drugich kórtow, twóri se dopołnje  OpenStreetMap dospołnje wót luźi ako ty, a kuždy móžo ju korigěrowaś, aktualizěrowaś, ześěgnuś a wužywaś.</p>\n<p>Zregistrěruj se a cyń sobu. Buźomy śi e-mailku słaś, aby my twójo konto wobkšuśili."
+        html: "<p>Na rozdźěl wót drugich kórtow, twóri se dopołnje  OpenStreetMap dospołnje wót luźi ako ty, a kuždy móžo ju korigěrowaś, aktualizěrowaś, ześěgnuś a wužywaś.</p>\n<p>Zregistrěruj se a cyń sobu. Buźomy śi e-mailku słaś, aby my twójo konto wobkšuśili.</p>"
       confirm email address: "E-mailowu adresu wobkšuśiś:"
       confirm password: "Gronidło wobkšuśiś:"
       contact_webmaster: Pšosym staj so z <a href="mailto:webmaster@openstreetmap.org">webmasterom</a> do zwiska, aby se śi konto załožyło - buźomy napšašowanje tak spěšnje ako móžno wobźěłowaś.
diff --git a/config/locales/el.yml b/config/locales/el.yml
index c8fad57b0..06cf0763e 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -148,7 +148,7 @@ el:
       closed_title: "Επιλυμένη σημείωση: #%{note_name}"
       commented_by: Σχόλιο από τον %{user} <abbr title='%{exact_time}'>πριν από %{when}</abbr>
       commented_by_anonymous: Σχόλιο από ανώνυμο χρήστη <abbr title='%{exact_time}'>πριν από %{when}</abbr>
-      description: "Περιγραφή:"
+      description: Περιγραφή
       hidden_by: Έγινε κρυφή από τον %{user} <abbr title='%{exact_time}'>πριν από %{when}</abbr>
       hidden_title: "Κρυφή σημείωση #%{note_name}"
       new_note: Νέα Σημείωση
@@ -251,12 +251,12 @@ el:
         one: "%{count} σχόλιο"
         other: "%{count} σχόλια"
         zero: Κανένα σχόλιο
-      comment_link: Σχόλιο για τη καταχώρηση
+      comment_link: Σχολιάστε την καταχώρηση
       confirm: Επιβεβαίωση
       edit_link: Επεξεργασία καταχώρησης
       hide_link: Απόκρυψη αυτής της καταχώρησης
       posted_by: Γράφτηκε από το χρήστη %{link_user} στις %{created} στα %{language_link}
-      reply_link: Απάντηση στη καταχώρηση
+      reply_link: Απαντήστε στην καταχώρηση
     edit: 
       body: "Κείμενο:"
       language: "Γλώσσα:"
@@ -363,6 +363,8 @@ el:
     title: Εξαγωγή
   fixthemap: 
     how_to_help: 
+      add_a_note: 
+        instructions_html: "Απλά κάντε κλικ στο <a class='icon note'></a> ή στο ίδιο εικονίδιο στην οθόνη του χάρτη.\nΈτσι θα προστεθεί δείκτης στον χάρτη, τον οποίο μπορείτε να μετακινήσετε σέρνοντάς τον.\nΠροσθέστε το μήνυμά σας και, στη συνέχεια, κάντε κλικ στο κουμπί αποθήκευσης, ώστε να μπορούν άλλοι χαρτογράφοι να ερευνήσουν το πρόβλημα."
       join_the_community: 
         explanation_html: Αν έχετε παρατηρήσει ένα πρόβλημα με τα δεδομένα του χάρτη μας, παραδείγματος χάριν ένας δρόμος που λείπει στη διεύθυνσή σας, ο καλύτερος τρόπος να προχωρήσετε είναι να ενταχθείτε στην κοινότητα του OpenStreetMap και να προσθέσετε ή να επισκευάσετε τα δεδομένα από μόνοι σας.
         title: Γνωρίστε την κοινότητα
@@ -892,6 +894,7 @@ el:
       description: Κάνετε ένα ερώτημα ή αναζητήσετε απαντήσεις στην ιστοσελίδα ερωτήσεων και απαντήσεων του OSM.
       title: help.openstreetmap.org
       url: https://help.openstreetmap.org/
+    introduction: "OpenStreetMap έχει πολλαπλούς πόρους για να μάθετε σχετικά με το έργο, να κάνετε\nερωτήματα, και να λάβετε μέρος σε συλλογικές συζητήσεις και να βρείτε τεκμηρίωση για θέματα χαρτογράφησης."
     title: Βρίσκοντας Βοήθεια
     welcome: 
       description: Ξεκινήστε με αυτές τις γρήγορες οδηγίες που καλύπτουν τα βασικά OpenStreetMap.
@@ -984,7 +987,7 @@ el:
     history: Ιστορικό
     home: Μετάβαση στην Τοποθεσία Σπιτιού
     intro_2_create_account: Δημιουργήστε ένα λογαριασμό χρήστη
-    intro_header: Καλώς ήλθατε στο OpenStreetMap!
+    intro_header: Καλώς ήρθατε στο OpenStreetMap!
     intro_text: Το OpenStreetMap είναι χάρτης του κόσμου, που δημιουργήθηκε από ανθρώπους σαν κι εσάς και είναι δωρεάν, υπό άδεια ελεύθερης χρήσης.
     learn_more: Μάθετε Περισσότερα
     log_in: Είσοδος
@@ -1018,11 +1021,13 @@ el:
       attribution_example: 
         alt: Παράδειγμα του πως αναφέρεται το OpenStreetMap σε μια ιστοσελίδα
         title: Παράδειγμα αναφοράς δημιουργού
+      contributors_at_html: "<strong>Αυστρία</strong>: Περιέχει δεδομένα από τα\n<a href=\"http://data.wien.gv.at/\">Stadt Wien</a> (υπό  <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>),\n<a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg</a> και\nLand Tirol (υπό <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC BY AT με τροποποιήσεις</a>)."
       contributors_footer_1_html: "Για περισσότερες λεπτομέρειες σχετικά με αυτές, και άλλες πηγές που χρησιμοποιήθηκαν\nγια να βελτιώσουν το OpenStreetMap, παρακαλούμε δείτε τη σελίδα <a href=\"http://wiki.openstreetmap.org/wiki/Contributors\">Συνεισφέροντες</a> στο OpenStreetMap Wiki."
       contributors_fr_html: "<strong>Γαλλία</strong>: Περιέχει δεδομένα που προέρχονται από το Direction Générale des Impôts."
       contributors_intro_html: "Οι συνεισφέροντες μας είναι χιλιάδες άτομα. Επίσης έχουμε περιλάβει δεδομένα ανοικτής άδειας από εθνικές υπηρεσίες χαρτογράφησης και άλλες πηγές, μεταξύ αυτών:"
       contributors_nl_html: "<strong>Ολλανδία</strong>: Περιέχει δεδομένα που προέρχονται από το AND &copy; 2007 (<a href=\"http://www.and.com\">www.and.com</a>)"
       contributors_title_html: Οι συνεισφέροντές μας
+      contributors_za_html: "<strong>Νότια Αφρική</strong>: Περιεχέι δεδομένα που προέρχονται από το\n<a href=\"http://www.ngi.gov.za/\">Chief Directorate:\nNational Geo-Spatial Information</a>, Πνευματικό δικαίωμα χώρας κατοχυρωμένο."
       credit_1_html: "Απαιτείται να χρησιμοποιείτε την αναφορά στο &ldquo;&copy; Συνεισφέροντες του\nOpenStreetMap&rdquo;."
       credit_2_html: "Επίσης πρέπει να κάνετε σαφές ότι τα δεδομένα διατίθενται υπό την άδεια Open\nDatabase License, και αν χρησιμοποιείτε τα πλακίδια χάρτη, ότι η χαρτογραφία είναι υπό την άδεια CC-BY-SA. Μπορείτε να το κάνετε αυτό με σύνδεσμο σε <a href=\"http://www.openstreetmap.org/copyright\">αυτήν τη σελίδα δικαιωμάτων</a>.\nΕναλλακτικά, και σαν προαπαιτούμενο εάν διαμοιράζετε δεδομένα OSM, μπορείτε να δώσετε απευθείας σύνδεσμο προς τις άδειες. Σε μέσα στα οποία οι σύνδεσμοι δεν είναι εφικτοί (π.χ. εκτυπώσεις), προτείνουμε να κατευθύνετε τους αναγνώστες σας στο openstreetmap.org (ίσως επεκτείνοντας το «OpenStreetMap» σε αυτήν τη πλήρη διεύθυνση), προς opendatacommons.org, και αναλόγως στο creativecommons.org."
       credit_3_html: "Για έναν ηλεκτρονικά εμφανιζόμενο χάρτη, η αναφορά θα πρέπει να εμφανίζεται στη γωνία του χάρτη.\nΓια παράδειγμα:"
@@ -1547,7 +1552,7 @@ el:
       public editing: 
         disabled: Απενεργοποιήθηκε και δεν μπορείτε να επεξεργαστείτε δεδομένα, όλες οι προηγούμενες επεξεργασίες είναι ανώνυμες.
         disabled link text: γιατί δεν μπορώ να επεξεργαστώ τον χάρτη;
-        enabled: Ενεργοποιήθηκε. Δεν είστε πια ανώνυμος και μπορείτε να επεξεργαστείτε δεδομένα.
+        enabled: Ενεργοποιήθηκε. Δεν είστε πια ανώνυμοι και μπορείτε να επεξεργαστείτε δεδομένα.
         enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: τι είναι αυτό;
         heading: "Δημόσια επεξεργασία:"
@@ -1872,7 +1877,7 @@ el:
       way_html: Οι <strong>διαδρομές</strong> είναι γραμμές ή περιοχές, όπως δρόμοι, ρέματα, λίμνες ή κτήρια.
     introduction_html: Σας καλωσορίζουμε στο OpenStreetMap, τον ελεύθερο και επεξεργάσιμο χάρτη του κόσμου. Τώρα που έχετε εγγραφεί, είστε πανέτοιμοι να αρχίσετε τη χαρτογράφηση. Εδώ είναι ένας γρήγορος οδηγός με τα πιο σημαντικά πράγματα που πρέπει να ξέρετε.
     questions: 
-      paragraph_1_html: "OpenStreetMap έχει πολλαπλους πόρους για να μάθετε σχετικά με το έργο, ερώτηση και απάντηση\nερωτημάτων, και συλλογικές συζητήσης και τεκμηρίωση θεμάτων χαρτογράφησης.\n<a href='%{help_url}'>Λάβετε βοήθεια εδώ</a>."
+      paragraph_1_html: "OpenStreetMap έχει πολλαπλούς πόρους για να μάθετε σχετικά με το έργο, να κάνετε\nερωτήματα, και να λάβετε μέρος σε συλλογικές συζητήσεις και να βρείτε τεκμηρίωση για θέματα χαρτογράφησης.\n<a href='%{help_url}'>Λάβετε βοήθεια εδώ</a>."
       title: Ερωτήσεις;
     start_mapping: Ξεκινήστε τη Χαρτογράφηση
     title: Καλώς ήρθατε!
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3e452571b..eb2991d4e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -79,7 +79,7 @@ en:
   printable_name:
     with_id: "%{id}"
     with_version: "%{id}, v%{version}"
-    with_name: "%{name} (%{id})"
+    with_name_html: "%{name} (%{id})"
   editor:
     default: "Default (currently %{name})"
     potlatch:
@@ -181,6 +181,7 @@ en:
         key: "The wiki description page for the %{key} tag"
         tag: "The wiki description page for the %{key}=%{value} tag"
       wikipedia_link: "The %{page} article on Wikipedia"
+      telephone_link: "Call %{phone_number}"
     note:
       title: "Note: %{id}"
       new_note: "New Note"
@@ -2112,7 +2113,7 @@ en:
       queryfeature_disabled_tooltip: Zoom in to query features
     notes:
       new:
-        intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem. (Please don't enter personal information here.)"
+        intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem. (Please don't enter personal information or information from copyrighted maps or directory listings.)"
         add: Add Note
       show:
         anonymous_warning: This note includes comments from anonymous users which should be independently verified.
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 16a3ccaca..49d3f53b0 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -168,7 +168,7 @@ es:
       description: Descripción
       hidden_by: Oculto por %{user} <abbr title='%{exact_time}'>%{when} atrás</abbr>
       hidden_title: "Nota oculta #%{note_name}"
-      new_note: Nueva nota
+      new_note: Nota nueva
       open_by: Creado por %{user} <abbr title='%{exact_time}'>hace %{when}</abbr>
       open_by_anonymous: Creado por un anónimo <abbr title='%{exact_time}'>hace %{when}</abbr>
       open_title: "Nota sin resolver #%{note_name}"
@@ -352,7 +352,7 @@ es:
       longitude: "Lon:"
       manually_select: Seleccionar manualmente un área diferente
       map_image: Imagen de mapa (muestra una capa normal)
-      max: max
+      max: máx.
       options: Opciones
       osm_xml_data: Datos OpenStreetMap en formato XML
       output: Resultado
@@ -376,7 +376,7 @@ es:
         planet: 
           description: Copias actualizadas regularmente de la base de datos completa de OpenStreetMap
           title: Planeta OSM
-      zoom: Zoom
+      zoom: Ampliación
     title: Exportar
   fixthemap: 
     how_to_help: 
@@ -409,9 +409,9 @@ es:
       south_west: suroeste
       west: oeste
     distance: 
-      one: aproximadamente 1Km
-      other: aproximadamente %{count}km
-      zero: menos de 1Km
+      one: aproximadamente 1 km
+      other: aproximadamente %{count} km
+      zero: menos de 1 km
     results: 
       more_results: Más resultados
       no_results: No se han encontrado resultados
@@ -448,7 +448,7 @@ es:
           taxiway: Calle de rodaje
           terminal: Terminal
         amenity: 
-          WLAN: Acceso WiFi
+          WLAN: Punto de acceso wifi
           airport: Aeropuerto
           arts_centre: Centro artístico
           artwork: Ilustración
@@ -546,7 +546,7 @@ es:
           veterinary: Clínica veterinaria
           village_hall: Sala del pueblo
           waste_basket: Papelera
-          wifi: Acceso WiFi
+          wifi: Punto de acceso wifi
           youth_centre: Centro juvenil
         boundary: 
           administrative: Frontera administrativa
@@ -834,7 +834,7 @@ es:
           florist: Floristería
           food: Tienda de alimentación
           funeral_directors: Funeraria
-          furniture: Tienda de muebles
+          furniture: Mueblería
           gallery: Galería
           garden_centre: Vivero
           general: Tienda de artículos generales
@@ -846,14 +846,14 @@ es:
           hifi: Hi-Fi
           insurance: Aseguradora
           jewelry: Joyería
-          kiosk: Kiosko
+          kiosk: Quiosco
           laundry: Lavandería
           mall: Centro comercial
           market: Mercado
           mobile_phone: Tienda de telefonía
           motorcycle: Tienda de motocicletas
           music: Tienda de música
-          newsagent: Kiosko de prensa
+          newsagent: Quiosco de periódicos
           optician: Óptica
           organic: Tienda de alimentos orgánicos
           outdoor: Tienda de deportes de aventura
@@ -1039,9 +1039,9 @@ es:
     partners_ucl: el centro de UCL VR
     partners_url: http://wiki.openstreetmap.org/wiki/Partners
     sign_up: Registrarse
-    sign_up_tooltip: Cree una cuenta para editar
-    start_mapping: Comenzar a mapear
-    tag_line: El WikiMapaMundi libre
+    sign_up_tooltip: Crea una cuenta para editar
+    start_mapping: Comenzar a cartografiar
+    tag_line: El wikimapamundi libre
     user_diaries: Diarios de usuario
     user_diaries_tooltip: Ver diarios de usuario
   license_page: 
@@ -1080,7 +1080,7 @@ es:
       more_title_html: Para saber más...
       title_html: Derechos de autor y licencia
     native: 
-      mapping_link: comenzar a mapear
+      mapping_link: comenzar a cartografiar
       native_link: Versión en español
       text: Está viendo la versión en inglés de la página de copyright. Puede ir a la %{native_link} de esta página o puede dejar de leer acerca de copyrights y %{mapping_link}.
       title: Acerca de esta página
@@ -1989,7 +1989,7 @@ es:
       paragraph_1_html: "OpenStreetMap tiene varios recursos para aprender sobre el proyecto, preguntando y contestando preguntas, y colaborativamente discutir y documentar temas de cartografía.\n<a href='%{help_url}'>Obtenga ayuda aquí</a>."
       title: ¿Alguna pregunta?
     start_mapping: Comenzar a mapear
-    title: Bienvenido!
+    title: ¡Bienvenido!
     whats_on_the_map: 
       off_html: Lo que <em>no</em> se incluyen son datos obstinados como clasificaciones, características históricas o hipotéticas, y datos procedentes de fuentes con derechos de autor. A menos que tenga un permiso especial, no copie de mapas en línea o en papel.
       on_html: OpenStreetMap es un lugar para el mapeo de las cosas que son <em>reales y actuales</em> - esto incluye millones de edificios, carreteras, y otros detalles acerca de lugares. Puede mapear cualquier característica de la vida real que es interesante para usted.
diff --git a/config/locales/et.yml b/config/locales/et.yml
index def623137..a6253cc47 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1549,7 +1549,7 @@ et:
     new: 
       about: 
         header: Vaba ja muudetav
-        html: "<p>Erinevalt teistest kaartidest on OpenStreetMap loodud samade inimeste poolt nagu sina ja igaüks võib seda parandada, täiendada, alla laadida ja kasutada.</p>\n<p>Registreeru, et alustada kaardi täiendamist. Me saadama sulle meili, et saaksid kinnitada oma kasutajakonto.</p>"
+        html: "<p>Erinevalt teistest kaartidest on OpenStreetMap loodud samade inimeste poolt nagu sina ja igaüks võib seda parandada, täiendada, alla laadida ja kasutada.</p>\n<p>Registreeru, et alustada kaardi täiendamist. Me saadame sulle meili, et saaksid kinnitada oma kasutajakonto.</p>"
       confirm email address: "Kinnita e-posti aadress:"
       confirm password: "Kinnita parool:"
       contact_webmaster: Palun võta ühendust <a href="mailto:webmaster@openstreetmap.org">veebimeistriga</a>, et kasutajakonto luua - me üritame tegeleda selle taotlusega nii kiiresti kui võimalik.
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 031f824a8..9fb0c9ac4 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -183,7 +183,7 @@ fa:
         relation: ارتباط
         way: راه
     start_rjs: 
-      feature_warning: در حال بارگزاری %{num_features} ویژگی، که ممکن است مرورگرتان را کند یا بدون واکنش سازد. مطمئنید میخواهید این داده ها نمایش داده شوند؟
+      feature_warning: در حال بارگذاری %{num_features} ویژگی، که ممکن است مرورگرتان را کند یا بدون واکنش سازد. مطمئنید می‌خواهید این داده‌ها نمایش داده شوند؟
       load_data: بارگیری داده‌ها
       loading: در حال بارگیری...
     tag_details: 
@@ -360,7 +360,7 @@ fa:
           description: منابع اضافی ذکر شده در ویکی OpenStreetMap
           title: سایر منابع
         overpass: 
-          description: دانلود این جعبه محدوده از یکی از لینک های کمکی دیتابیس OpenStreetMap
+          description: دریافت این جعبه محدوده از یکی از پیوندهای کمکی پایگاه داده‌های OpenStreetMap
           title: روگذر API
         planet: 
           description: کپی منظم از دیتابیس کامل OpenStreetMap
@@ -956,27 +956,27 @@ fa:
         add: افزودن یادداشت
         intro: چیزی مشکل دارد؟ به نقشه‌کش‌های دیگر اصلاع دهید تا آن را اصلاح کنند. علامت موشواره را بر روی محلی که مشکل دارد قرار دهید و مشکل را شرح دهید (لطفاً اطلاعات شخصی در این بخش ننویسید)
       show: 
-        anonymous_warning: این یادداشت شامل نظرات کاربران ناشناس است که باید بطور مستقل تایید شوند.
+        anonymous_warning: این یادداشت شامل نظرات کاربران ناشناس است که باید به‌طور مستقل تأیید شوند.
         comment: نظر
         comment_and_resolve: نظر و راه حل
-        hide: پنهان کردن
+        hide: نهفتن
         reactivate: فعال سازی مجدد
         resolve: برطرف کردن
     share: 
       cancel: لغو
       center_marker: مرکز نقشه در نشانگر
       custom_dimensions: تنظیم ابعاد سفارشی
-      download: دانلود
+      download: دریافت
       embed: HTML
       format: "قالب:"
       image: تصویر
       image_size: تصویر لایه ی استاندارد را نشان می دهد در
       include_marker: شامل نشانگر
-      link: لینک یا HTML
+      link: پیوند یا اچ‌تی‌ام‌ال
       long_link: پیوند
       paste_html: برای درج در وب سایت HTML را جایگذاری کنید
       scale: "مقیاس:"
-      short_link: لینک کوتاه
+      short_link: پیوند کوتاه
       short_url: آدرس کوتاه
       title: به‌اشتراک‌گذاری
       view_larger_map: نمایش نقشه بزرگتر
@@ -1045,7 +1045,7 @@ fa:
       contributors_ca_html: "<strong>Canada</strong>: Contains data from\nGeoBase&reg;, GeoGratis (&copy; Department of Natural\nResources Canada), CanVec (&copy; Department of Natural\nResources Canada), and StatCan (Geography Division,\nStatistics Canada)."
       contributors_fi_html: "<strong>Finland</strong>: Contains data from the\nNational Land Survey of Finland's Topographic Database\nand other datasets, under the\n<a href=\"http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501\">NLSFI License</a>."
       contributors_footer_1_html: برای اطلاعات بیشتر درباره این منابع و سایر منابع مورد استفاده برای پیشرفت اوپن‌استریت‌مپ، لطفاً این پیوند را نگاه کنید.
-      contributors_footer_2_html: ورود داده ها در OpenStreetMap به این معنی نیست که ارائه دهنده ی اصلی داده ها توسط OpenStreetMap تایید شده، هر گونه ضمانتی فراهم میکند، یا هر گونه مسئولیت را میپذیرد.
+      contributors_footer_2_html: ورود داده‌ها در OpenStreetMap به این معنی نیست که ارائه‌دهندهٔ اصلی داده‌ها توسط OpenStreetMap تأییدشده، هر گونه ضمانتی فراهم می‌کند، یا هر گونه مسئولیت را می‌پذیرد.
       contributors_fr_html: "<strong>France</strong>: Contains data sourced from\nDirection Générale des Impôts."
       contributors_gb_html: "<strong>United Kingdom</strong>: Contains Ordnance\nSurvey data &copy; Crown copyright and database right\n2010-12."
       contributors_intro_html: "شرکای ما هزاران شخص هستند. ما همچنین جواز علنی داده از سازمان نقشه برداری ملی و دیگر منابع را شامل میشویم، در بین آنها:"
@@ -1054,7 +1054,7 @@ fa:
       contributors_title_html: همکاران ما
       contributors_za_html: "<strong>South Africa</strong>: Contains data sourced from\n<a href=\"http://www.ngi.gov.za/\">Chief Directorate:\nNational Geo-Spatial Information</a>, State copyright reserved."
       credit_1_html: ما نیاز داریم که شما استفاده کنید از اعتبار &ldquo;&copy; همکاران OpenStreetMap&rdquo;.
-      credit_2_html: همچنین مطمئن باشید که پاک کردن داده ها تحت یک مجوز دیتابیس باز است، و اگر از کاشی های نقشه ی ما استفاده میکنید، نقشه برداری تحت  مجوز CC BY-SA است. میتوانید با لینک دادن به <a href="http://www.openstreetmap.org/copyright">این صفحه حق نشر</a> متناوبا آنرا انجام دهید، و بعنوان یک درخواست اگر شما توزیع کننده ی نوع داده های OSM هستید، میتوانید نام و لینک را بطور مستقیم به مجوز بدهید. در رسانه ها جاهایی که لینک ها مقدور نیستند(مثل کارهای چاپی)، پیشنهاد میکنیم  خوانندگان تان را به openstreetmap.org راهنمایی کنید(شاید با گسترش 'OpenStreetMap' به این آدرس کامل)، به opendatacommons.org، و اگر مناسب باشد، به creativecommons.org.
+      credit_2_html: همچنین مطمئن باشید که پاک کردن داده ها تحت یک مجوز دیتابیس باز است، و اگر از کاشی‌های نقشهٔ ما استفاده می‌کنید، نقشه‌برداری تحت  مجوز CC BY-SA است. میتوانید با پیونددادن به <a href="http://www.openstreetmap.org/copyright">این صفحه حق نشر</a> متناوبا آن را انجام دهید، و به‌عنوان یک درخواست اگر شما توزیع کنندهٔ نوع داده‌های OSM هستید، می‌توانید نام و پیوند را بطور مستقیم به مجوز بدهید. در رسانه‌ها جاهایی که پیوندها مقدور نیستند(مثل کارهای چاپی)، پیشنهاد می‌کنیم خوانندگان‌تان را به openstreetmap.org راهنمایی کنید(شاید با گسترش 'OpenStreetMap' به این نشانی کامل)، به opendatacommons.org، و اگر مناسب باشد، به creativecommons.org.
       credit_3_html: "برای یک نقشه الکترونیکی قابل مرور، اعتبار باید در گوشه ای از نقشه ظاهر شود.\nبرای مثال:"
       credit_title_html: چگونه از OpenStreetMap اعتبار بگیریم
       infringement_1_html: شرکای OSM یادآوری میکنند هرگز داده ای را از منابع حق نشر اضافه نکنید(مثلا نقشه های گوگل یا نقشه های چاپ شده) بدون اجازه صریح از دارندگان حق تکثیر.
@@ -1183,7 +1183,7 @@ fa:
       greeting: سلام ،
       hopefully_you: کسی (امیدواریم شما) میخواهد آدرس ایمیلش را تغییر دهد از %{server_url} به %{new_address}.
     email_confirm_plain: 
-      click_the_link: اگر این شمایید، برای تایید تغییر روی لینک زیر کلیک کنید.
+      click_the_link: اگر این شمایید، برای تأیید تغییر روی پیوند زیر کلیک کنید.
       greeting: سلام ،
       hopefully_you: کسی (امیدواریم شما) میخواهد آدرس ایمیلش را تغییر دهد از %{server_url} به %{new_address}.
     friend_notification: 
@@ -1243,7 +1243,7 @@ fa:
       created: کسی (امیدواریم شما) یک حساب در %{site_url} ایجاد کرد.
       greeting: ‎سلام،
       subject: "[OpenStreetMap] به OpenStreetMap خوش آمدید"
-      welcome: بعد از اینکه حسابتان را تایید کردید، ما به شما برخی از اطلاعات اضافی را ارائه میدهیم تا بتوانید شروع کنید.
+      welcome: بعد از اینکه حسابتان را تأیید کردید، ما به شما برخی از اطلاعات اضافی را ارائه میدهیم تا بتوانید شروع کنید.
   oauth: 
     oauthorize: 
       allow_read_gpx: خواندن پیگیری های GPS شخصی شما.
@@ -1251,7 +1251,7 @@ fa:
       allow_to: "برنامه سرویس گیرنده اجازه میدهد به:"
       allow_write_api: تغییر نقشه.
       allow_write_diary: ایجاد یادداشت روزانه، نظر و ایجاد دوستان.
-      allow_write_gpx: بارگزاری پیگیری های GPS.
+      allow_write_gpx: بارگذاری پیگیری‌های GPS.
       allow_write_notes: تغییر یادداشت ها.
       allow_write_prefs: تغییر ترجیحات کاربری شما.
       request_access: برنامهٔ %{app_name}%{app_name} درخواست دسترسی به حسابتان %{user} را دارد. لطفاً بررسی کنید که می‌خواهید برنامه به قابلیت‌های زیر دسترسی داشته باشد. ممکن است چند تا یا فقط تعدادی را که دوست دارید انتخاب کنید.
@@ -1263,7 +1263,7 @@ fa:
     oauthorize_success: 
       allowed: شما به برنامه ی %{app_name} اجازه ی دسترسی به حسابتان را دادید.
       title: درخواست اجازه دادن مجاز است
-      verification: کد تایید %{code} است.
+      verification: کد تأیید %{code} است.
     revoke: 
       flash: شما نشانه را برای %{application} باطل کردید
   oauth_clients: 
@@ -1279,7 +1279,7 @@ fa:
       allow_read_prefs: خواندن ترجیحات کاربرانشان.
       allow_write_api: تغییر نقشه.
       allow_write_diary: ایجاد یادداشت های روزانه، نظر و ایجاد دوستان.
-      allow_write_gpx: بارگزاری پیگیری های GPS.
+      allow_write_gpx: بارگذاری پیگیری‌های GPS.
       allow_write_notes: تغییر یادداشت ها.
       allow_write_prefs: تغییر ترجیحات کاربرانشان.
       callback_url: آدرس پاسخ به تماس
@@ -1310,7 +1310,7 @@ fa:
       allow_read_prefs: خواندن ترجیحات کاربرانشان.
       allow_write_api: تغییر نقشه.
       allow_write_diary: ایجاد یادداشت های روزانه، نظر و ایجاد دوستان.
-      allow_write_gpx: بارگزاری پیگیری های GPS.
+      allow_write_gpx: بارگذاری پیگیری‌های GPS.
       allow_write_notes: تغییر یادداشت ها.
       allow_write_prefs: تغییر ترجیحات کاربرانشان.
       authorize_url: "آدرس authorise:"
@@ -1374,9 +1374,9 @@ fa:
       js_2: OpenStreetMap برای لیز خوردن نقشه هایش از جاوا اسکریپت استفاده می کند.
       license: 
         copyright: حق نشر OpenStreetMap و شرکا، تحت یک مجوز باز است
-      permalink: لینک ثابت
+      permalink: پیوند ثابت
       remote_failed: ویرایش ناموفق - مطمئن شوید JOSM یا Merkaartor لوذ شده و گزینه ی کنترل از راه دور فعال است
-      shortlink: لینک کوتاه
+      shortlink: پیوند کوتاه
     key: 
       table: 
         entry: 
@@ -1475,7 +1475,7 @@ fa:
   trace: 
     create: 
       trace_uploaded: پروندهٔ GPX شما بارگذاری شده است و در انتظار درج در پایگاه داده است. این کار معمولاً نیم ساعت طول می‌کشد و در صورت تکمیل، رایانامه‌ای به شما فرستاده خواهد شد.
-      upload_trace: بارگزاری پیگیری GPS
+      upload_trace: بارگذاری پیگیری GPS
     delete: 
       scheduled_for_deletion: پی‌گیری برای حذف برنامه ریزی شده
     description: 
@@ -1485,7 +1485,7 @@ fa:
       description_without_count: پرونده GPX از %{user}
     edit: 
       description: "شرح:"
-      download: دانلود
+      download: دریافت
       edit: ویرایش
       filename: "نام پرونده:"
       heading: ویرایش پیگیری %{name}
@@ -1557,7 +1557,7 @@ fa:
     view: 
       delete_track: حذف این پیگیری
       description: "شرح:"
-      download: دانلود
+      download: دریافت
       edit: ویرایش
       edit_track: ویرایش این پیگیری
       filename: "نام پرونده:"
@@ -1630,13 +1630,13 @@ fa:
       update home location on click: وقتی روی نقشه کلیک میکنم موقعیت خانه بروز شود؟
     confirm: 
       already active: این حساب کاربری در حال حاضر تأیید شده است.
-      button: تایید
+      button: تأیید
       heading: رایانامه‌یتان را بررسی کنید!
       introduction_1: یک رایانامه تأیید به شما ارسال کردیم.
       introduction_2: حسابتان را با کلیک روی پیوندی که در رایانامه‌یتان بود تأیید کنید و قادر خواهید بود نقشه‌کشی را شروع کنید.
-      press confirm button: برای فعالسازی حساب تان روی دکمه ی تایید زیر کلیک کنید.
+      press confirm button: برای فعالسازی حساب تان روی دکمه ی تأیید زیر کلیک کنید.
       reconfirm_html: اگر نیاز دارید رایانامه تأیید را دوباره بفرستیم، <a href="%{reconfirm}">اینجا کلیک کنید</a>.
-      unknown token: کد تایید منقضی شده یا وجود ندارد.
+      unknown token: کد تأیید منقضی شده یا وجود ندارد.
     confirm_email: 
       button: تأیید
       failure: یک نشانی رایانامه در حال حاضر با این نشانه تأیید شده‌است.
@@ -1645,16 +1645,16 @@ fa:
       success: نشانی رایانامه‌یتان تأیید شد، با تشکر از شما برای ثبت نام!
     confirm_resend: 
       failure: کاربر %{name} یافت نشد.
-      success: ما نکته ی تایید جدیدی به %{email} فرستادیم و به محض اینکه شما حسابتان را تایید کنید شما قابلیت نقشه کشی را خواهید داشت.<br /><br />اگر شما از یک سیتم ضد هرزنامه استفاده میکنید که درخواست های تایید را میفرستد مطمئن شوید webmaster@openstreetmap.org را در لیست سفید گذاشته اید که ما قادر به پاسخ به هیچ درخواست تاییدی نیستیم.
+      success: ما نکتهٔ تأیید جدیدی به %{email} فرستادیم و به محض اینکه شما حسابتان را تأیید کنید شما قابلیت نقشه کشی را خواهید داشت.<br /><br />اگر شما از یک سیتم ضد هرزنامه استفاده میکنید که درخواست های تأیید را میفرستد مطمئن شوید webmaster@openstreetmap.org را در لیست سفید گذاشته‌اید که ما قادر به پاسخ به هیچ درخواست تأییدی نیستیم.
     filter: 
       not_an_administrator: برای انجام آن عملیات نیاز هست که سرپرست باشید
     go_public: 
       flash success: تمام ویرایش‌های شما اکنون عمومی اند، و شما برای ویرایش مجاز هستید.
     list: 
-      confirm: تایید کاربران انتخاب شده
+      confirm: تأیید کاربران انتخاب‌شده
       empty: هیچ کاربر مشابهی یافت نشد
       heading: کاربران
-      hide: پنهان کردن کاربران انتخاب شده
+      hide: پنهان‌کردن کاربران انتخاب شده
       showing: 
         one: صفحه %{page} (%{first_item} از %{items})
         other: صفحه %{page} (%{first_item}-%{last_item} از %{items})
@@ -1709,7 +1709,7 @@ fa:
     lost_password: 
       email address: "نشانی رایانامه:"
       heading: کلمه عبور خود را فراموش کرده‌اید؟
-      help_text: ایمیلی را که هنگام ثبت نام استفاده کرده اید وارد کنید، ما لینکی به آن می فرستیم تا بتوانید بوسیله ی آن کلمه عبورتان را مجدد تنظیم کنید.
+      help_text: ایمیلی را که هنگام ثبت نام استفاده کرده‌اید وارد کنید، ما پیوندی به آن می‌فرستیم تا بتوانید به وسیلهٔ آن رمز عبورتان را مجدد تنظیم کنید.
       new password button: تنظیم مجدد کلمه عبور
       notice email cannot find: نشانی رایانامه یافت نشد، متأسفیم.
       notice email on way: متاسفیم که آنرا گم کرده اید :-( اما ایمیلی در راه است که میتوانید بزودی آنرا مجدد تنظیم کنید.
@@ -1725,7 +1725,7 @@ fa:
         header: رایگان و قابل ویرایش
         html: "<p>بر خلاف سایر نقشه‌ها، OpenStreetMap کاملاً توسط افرادی مثل شما ساخته‌شده و برای تعمیر، به‌روزرسانی، دریافت و استفاده برای هر کسی آزاد است.</p>\n<p>برای شروع کمک ثبت نام کنید. برای تأیید حساب‌تان رایانامه‌ای می‌فرستیم.</p>"
       confirm email address: "تأیید نشانی رایانامه:"
-      confirm password: "تایید کلمه عبور:"
+      confirm password: "تأیید گذرواژه:"
       contact_webmaster: لطفاً با <a href="mailto:webmaster@openstreetmap.org">مدیر سایت</a> برای ساختن حساب کاربری هماهنگی  کنید و تماس بگیرید - ما سعی می‌کنیم به درخواست ‌ها به سرعت پاسخ دهیم.
       continue: ثبت نام
       display name: "نام نمایشی:"
@@ -1756,7 +1756,7 @@ fa:
       not_a_friend: "%{name} یکی از دوستان شما نیست."
       success: "%{name} از دوستان شما حذف شده‌است."
     reset_password: 
-      confirm password: "تایید کلمه عبور:"
+      confirm password: "تأیید گذرواژه:"
       flash changed: کلمه عبور شما تغییر کرده است.
       flash token bad: نشانه را نیافتید؟ آدرس را برسی کنید شاید یافتید.
       heading: تنظیم مجدد کلمه عبور برای %{user}
@@ -1794,7 +1794,7 @@ fa:
       blocks on me: بلوک های بر من
       comments: نظرات
       confirm: تأیید
-      confirm_user: تایید این کاربر
+      confirm_user: تأیید این کاربر
       create_block: بلوک کردن این کاربر
       created from: "ایجادشده از:"
       ct accepted: پذیرفته شده %{ago} قبل
@@ -1951,14 +1951,14 @@ fa:
       are_you_sure: آیا اطمینان دارید که می خواهید نقش '%{role}' را به کاربر '%{name}' اعطا  کنید؟
       confirm: تأیید
       fail: "%{name} نمی‌توان نقش %{role} کاربر %{name} را اعطا کرد . لطفاً از معتبربودن کاربر و نقش اطمینان حاصل نمایید."
-      heading: تایید اعطای نقش
-      title: تایید اعطای نقش
+      heading: تأیید اعطای نقش
+      title: تأیید اعطای نقش
     revoke: 
       are_you_sure: آیا شما اطمینان دارید که می خواهید نقش `%{role}' را از کاربر '%{name}' لغو  نمایید؟
       confirm: تأیید
       fail: نمی‌توان نقش %{role} کاربر %{name} را لغو کرد. لطفاً از معتبربودن کاربر و نقش اطمینان حاصل نمایید.
-      heading: تایید ابطال نقش
-      title: تایید ابطال نقش
+      heading: تأیید ابطال نقش
+      title: تأیید ابطال نقش
   welcome_page: 
     add_a_note: 
       paragraph_1_html: "اگر فقط چیزهای کوچکی را میخواهید ترمیم کنید و زمانی برای ثبت نام و یادگیری ویرایش ندارید، \nافزودن یک یادداشت خیلی ساده است."
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 66a42445b..445d622fc 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -21,6 +21,7 @@
 # Author: McDutchie
 # Author: Metroitendo
 # Author: Momo50WM
+# Author: Mulcyber
 # Author: Nemo bis
 # Author: Od1n
 # Author: Olasd
@@ -79,7 +80,7 @@ fr:
       user: 
         active: Actif
         description: Description
-        display_name: Nom affiché
+        display_name: Afficher le nom
         email: Courriel
         languages: Langues
         pass_crypt: Mot de passe
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index e7b328110..1ee55abe0 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -137,7 +137,7 @@ gl:
       closed_title: Nota resolta nº%{note_name}
       commented_by: Comentado por %{user} <abbr title='%{exact_time}'>hai %{when}</abbr>
       commented_by_anonymous: Comentado por un anónimo <abbr title='%{exact_time}'>hai %{when}</abbr>
-      description: "Descrición:"
+      description: Descrición
       hidden_by: Agochado por %{user} <abbr title='%{exact_time}'>hai %{when}</abbr>
       hidden_title: Nota agochada nº%{note_name}
       new_note: Nova nota
@@ -1516,7 +1516,7 @@ gl:
       help: Axuda
       tags: "Etiquetas:"
       tags_help: separadas por comas
-      upload_button: Cargar
+      upload_button: Subir
       upload_gpx: "Cargar un ficheiro GPX:"
       visibility: "Visibilidade:"
       visibility_help: que significa isto?
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 87f09c629..b9074392f 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -19,9 +19,17 @@
 # Author: תומר ט
 he: 
   about_page: 
+    community_driven_html: "קהילת OpenStreetMap מגוונת, בעלת תשוקה, וגדלה מיום ליום.\nבקרב התורמים שלנו יש ממפים נלהבים, מקצועני מערכות מידע גאוגרפיות (GIS), מהנדסים\nשמריצים את שרתי OSM, פעילי סיוע הומניטרי שממפים אזורי מוכי־אסון,\nורבים אחרים.\nלמידע נוסף על הקהילה ר' את <a href='%{diary_path}'>יומני המשתמשים</a>,\nאת <a href='http://blogs.openstreetmap.org/'>הבלוגים של הקהילה</a>, ואת האתר של <a href='http://www.osmfoundation.org/'>קרן OSM</a>."
+    community_driven_title: מונהג על־ידי הקהילה
+    copyright_html: <span>&copy;</span>תורמי<br>OpenStreetMap
+    lede_text: את OpenStreetMap בונה קהילת ממפים שתורמים ומתחזקים נתונים על דרכים, שבילים, בתי־קפה, תחנות רכבת ועוד הרבה יותר, מסביב לעולם.
+    local_knowledge_html: "OpenStreetMap מדגישה ידע מקומי. התורמים משתמשים\nבתמונות מהאוויר, מכשירי GPS, ומפות שדה „לואו־טק” כדי לוודא ש־OSM\nמדויקת ומעודכנת."
     local_knowledge_title: ידע מקומי
     next: הבא
+    open_data_html: "OpenStreetMap היא <strong>נתונים פתוחים</strong>: יש לך הופש להשתמש בה לכל מטרה,\nכל עוד ניתן ייחוס ל־OpenStreetMap ולתורמיה. מותר לשנות את הנתונים\nולבנות על גביהם דברים מסוימים, אך יש להפיץ את התוצאות של זה\nלפי התנאים של אותו הרישיון. ר' את <a href='%{copyright_path}'>דף הרישיון וזכויות היוצרים</a> לפרטים נוספים."
+    open_data_title: נתונים פתוחים
     partners_title: שותפים
+    used_by: "%{name} מפעילה את נתוני המפה במאות אתרי אינטרנט, יישומים ומכשירים שונים"
   activerecord: 
     attributes: 
       diary_comment: 
@@ -85,7 +93,7 @@ he:
       tracepoint: נקודת מסלול
       tracetag: תג מסלול
       user: משתמש
-      user_preference: העדפות המשתמש
+      user_preference: העדפת המשתמש
       user_token: אסימון משתמש
       way: דרך
       way_node: צומת דרך
@@ -115,17 +123,17 @@ he:
       way: דרכים (%{count})
       way_paginated: דרכים (%{x}–%{y} מתוך %{count})
     closed: נסגר
-    closed_by_html: נסגר <abbr title='%{title}'> לפני %{time}</abbr> על ידי %{user}
+    closed_by_html: נסגר <abbr title='%{title}'> לפני %{time}</abbr> על־ידי %{user}
     closed_html: נסגר <abbr title='%{title}'> לפני %{time}</abbr>
     containing_relation: 
       entry: יחס %{relation_name}
       entry_role: יחס %{relation_name} (בתור %{relation_role})
     created: נוצר
-    created_by_html: נוצר <abbr title='%{title}'> לפני %{time}</abbr> על ידי %{user}
+    created_by_html: נוצר <abbr title='%{title}'> לפני %{time}</abbr> על־ידי %{user}
     created_html: נוצר <abbr title='%{title}'> לפני %{time}</abbr>
-    deleted_by_html: נמחק <abbr title='%{title}'> לפני %{time}</abbr> על ידי %{user}
+    deleted_by_html: נמחק <abbr title='%{title}'> לפני %{time}</abbr> על־ידי %{user}
     download_xml: הורדת XML
-    edited_by_html: נערך <abbr title='%{title}'> לפני %{time}</abbr> על ידי %{user}
+    edited_by_html: נערך <abbr title='%{title}'> לפני %{time}</abbr> על־ידי %{user}
     in_changeset: ערכת שינויים
     location: "מיקום:"
     no_comment: (אין הערות)
@@ -140,12 +148,20 @@ he:
         relation: יחס
         way: דרך
     note: 
+      closed_by: נפתר על־ידי %{user} <abbr title='%{exact_time}'>לפני %{when}</abbr>
+      closed_by_anonymous: נפתר על־ידי אלמוני <abbr title='%{exact_time}'>לפני %{when}</abbr>
       closed_title: הערה פתורה מס' %{note_name}
+      commented_by: הערה מ־%{user} <abbr title='%{exact_time}'>לפני %{when}</abbr>
+      commented_by_anonymous: הערה מאלמוני <abbr title='%{exact_time}'>לפני %{when}</abbr>
       description: תיאור
+      hidden_by: הוסתר על־ידי %{user} <abbr title='%{exact_time}'>לפני %{when}</abbr>
       hidden_title: הערה מוסתרת מס' %{note_name}
       new_note: הערה חדשה
-      open_by: נוצר על ידי %{user} <abbr title='%{exact_time}'> לפני %{when} </abbr>
+      open_by: נוצר על־ידי %{user} <abbr title='%{exact_time}'> לפני %{when} </abbr>
+      open_by_anonymous: נוצר על־ידי אלמוני <abbr title='%{exact_time}'>לפני %{when}</abbr>
       open_title: הערה שלא נפתרה מס' %{note_name}
+      reopened_by: הופעל מחדש על־ידי %{user} <abbr title='%{exact_time}'>לפני %{when}</abbr>
+      reopened_by_anonymous: הופעל מחדש על־ידי אלמוני <abbr title='%{exact_time}'>לפני %{when}</abbr>
       title: "הערה: %{id}"
     part_of: חלק מתוך
     redacted: 
@@ -208,10 +224,10 @@ he:
       saved_at: "נשמרו ב:"
       user: משתמש
     list: 
-      empty: לא נמצאה סדרת שינויים
+      empty: לא נמצאה שום ערכת שינויים.
       empty_area: אין ערכות שינויים באזור הזה.
       empty_user: אין ערכות שינויים מאת המשתמש הזה.
-      load_more: טען עוד
+      load_more: לטעון עוד
       no_more: לא נמצאו עוד ערכות שינויים.
       no_more_area: אין עוד ערכות שינויים באזור הזה.
       no_more_user: אין עוד ערכות שינויים מאת המשתמש הזה.
@@ -232,15 +248,15 @@ he:
       when: מתי
     diary_comment: 
       comment_from: תגובה מ־%{link_user} ב־%{comment_created_at}
-      confirm: לאישור
-      hide_link: להסתרת הערה זו
+      confirm: אישור
+      hide_link: הסתרת הערה זו
     diary_entry: 
       comment_count: 
         one: תגובה אחת
         other: "%{count} תגובות"
         zero: אין תגובות
       comment_link: הערות לרשומה הזאת
-      confirm: לאישור
+      confirm: אישור
       edit_link: עריכת רשומה
       hide_link: הסתרת רשומה
       posted_by: נשלח על־ידי %{link_user} ב־%{created} ב%{language_link}
@@ -252,7 +268,7 @@ he:
       location: "מיקום:"
       longitude: "קו אורך:"
       marker_text: מיקום רשומת היומן
-      save_button: לשמירה
+      save_button: שמירה
       subject: "נושא:"
       title: עריכת רשומת יומן
       use_map_link: להשתמש במפה
@@ -279,15 +295,15 @@ he:
       title_nearby: יומנים של משתמשים בסביבה
       user_title: היומן של %{user}
     location: 
-      edit: לעריכה
+      edit: עריכה
       location: "מיקום:"
-      view: לצפייה
+      view: הצגה
     new: 
       title: רשומת יומן חדשה
     no_such_entry: 
       body: סליחה, עדיין אין רשומת יומן או תגובה עם המזהה %{id}. אולי האיות לא נכון ואולי לחצת על קישור שגוי.
       heading: "אין רשומה עם המזהה: %{id}"
-      title: אין כזו רשומה ביומן
+      title: אין רשומה כזאת ביומן
     view: 
       leave_a_comment: הוספת תגובה
       login: להיכנס
@@ -311,13 +327,13 @@ he:
       name: שליטה מרחוק
   export: 
     start: 
-      add_marker: להוספת סמן למפה
+      add_marker: הוספת סמן למפה
       area_to_export: האזור לייצוא
       embeddable_html: HTML שניתן להטמעה
       export_button: ייצוא
       export_details: המידע ב־OpenStreetMap מוגש בכפוף ל<a href="href="http://opendatacommons.org/licenses/odbl/1.0/">רישיון Open Data Commons לנתונים פתוחים</a> (ODbL).
-      format: פורמט
-      format_to_export: תבנית לייצוא
+      format: תסדיר
+      format_to_export: תסדיר לייצוא
       image_size: גודל התמונה
       latitude: "קווי אורך:"
       licence: רישיון
@@ -343,6 +359,7 @@ he:
           description: מקורות נוספים רשומים בוויקי של OpenStreetMap
           title: מקורות אחרים
         overpass: 
+          description: הורדת התיבה התוחמת הזאת מאתר מראה של מסד הנתונים של OpenStreetMap
           title: Overpass API
         planet: 
           description: עותקים מעודכנים באופן קבוע של כל מסד הנתונים של OpenStreetMap
@@ -351,12 +368,16 @@ he:
     title: ייצוא
   fixthemap: 
     how_to_help: 
+      add_a_note: 
+        instructions_html: "צריך פשוט ללחוץ על <a class='icon note'></a> או על אותו הסמל בתצוגת המפה.\nזה יוסיף למפה סמן שאפשר להזיז\nבאמצעות גרירה. יש להוסיף שם הערה ולשמור אותה וממפים אחרים יחקרו את זה."
       join_the_community: 
+        explanation_html: "אם שמת לב לבעיה על נתוני המפה שלנו, למשל שדרך או שכתובת שלך חסרה, הדרך הטובה ביותר\nלהמשיך היא להצטרף לקהילת OpenStreetMap ולתקן את הנתונים בעצמך."
         title: להצטרף לקהילה
-      title: איך ניתן לעזור
+      title: איך אפשר לעזור
     other_concerns: 
+      explanation_html: אם יש לך דאגות לגבי איך שהנתונים שלנו משמשים או על התוכן, נא לקרוא את <a href='/copyright'>דף זכויות היוצרים</a> שלנו למידע משפטי נוסף, או ליצור קשר עם <a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>קבוצת העבודה המתאימה ב־OSMF</a>.
       title: דאגות אחרות
-    title: דווח על בעיה / תקן את המפה
+    title: לדווח על בעיה / לתקן את המפה
   geocoder: 
     description: 
       title: 
@@ -377,7 +398,7 @@ he:
       west: מערב
     distance: 
       one: בערך קילומטר
-      other: בערך %{count} ק"מ
+      other: בערך %{count} ק״מ
       zero: פחות מקילומטר
     results: 
       more_results: תוצאות נוספות
@@ -387,14 +408,14 @@ he:
         ca_postcode: תוצאות מאתר <a href="http://geocoder.ca/">Geocoder.CA</a>
         geonames: תוצאות מאתר <a href="http://www.geonames.org/">GeoNames</a>
         geonames_reverse: תוצאות מ־<a href="http://www.geonames.org/">GeoNames</a>
-        latlon: תוצאות מ<a href="http://openstreetmap.org/">אתר זה</a>
+        latlon: תוצאות <a href="http://openstreetmap.org/">מתוך האתר הזה</a>
         osm_nominatim: תוצאות מאתר <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
         osm_nominatim_reverse: תוצאות מ־<a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
         uk_postcode: תוצאות מאתר <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: תוצאות מאתר <a href="http://geocoder.us/">Geocoder.us</a>
     search_osm_nominatim: 
       admin_levels: 
-        level10: גבול הפרבר
+        level10: גבול הפרוור
         level2: גבול המדינה
         level4: גבול המדינה
         level5: גבול האזור
@@ -536,23 +557,23 @@ he:
           bus_guideway: נתיב תחבורה ציבורית מונחית
           bus_stop: תחנת אוטובוס
           byway: דרך צדית
-          construction: דרך ראשית בבנייה
+          construction: כביש מהיר בבנייה
           cycleway: נתיב אופניים
           emergency_access_point: נקודת גישה לשירותי חירום
           footway: שביל להולכי רגל
-          ford: מעברה (נקודת חציית נהר)
-          living_street: רחוב
+          ford: מעברה בנחל
+          living_street: רחוב מגורים
           milestone: אבן דרך
-          minor: דרך צדית
+          minor: דרך משנית
           motorway: כביש
           motorway_junction: צומת כבישים
-          motorway_link: כביש
+          motorway_link: כביש מכוניות
           path: נתיב
-          pedestrian: נתיב להולכי רגל
+          pedestrian: דרך להולכי רגל
           platform: פלטפורמה
           primary: דרך ראשית
-          primary_link: כביש ראשי
-          proposed: כביש מוצע
+          primary_link: דרך ראשית
+          proposed: דרך מוצעת
           raceway: מסלול מרוצים
           residential: מגורים
           rest_area: אזור מנוחה
@@ -565,14 +586,14 @@ he:
           steps: מדרגות
           stile: מעבר מעל גדר
           street_lamp: פנס רחוב
-          tertiary: דרך צדית
+          tertiary: דרך שלישונית
           tertiary_link: דרך שלישונית
           track: מסלול מרוצים
           trail: שביל
           trunk: דרך ראשית
           trunk_link: דרך ראשית
-          unclassified: כביש לא מסווג
-          unsurfaced: כביש לא סלול
+          unclassified: דרך לא מסווגת
+          unsurfaced: דרך בלתי־סלולה
         historic: 
           archaeological_site: אתר ארכאולוגי
           battlefield: שדה קרב
@@ -585,7 +606,7 @@ he:
           house: בית
           icon: איקונין
           manor: אחוזה
-          memorial: אנדרטה
+          memorial: אנדרטה זיכרון
           mine: מכרה
           monument: אנדרטה
           museum: מוזיאון
@@ -662,7 +683,7 @@ he:
           "yes": מעבר הררי
         natural: 
           bay: מפרץ
-          beach: חוף רחצה
+          beach: חוף
           cape: כף
           cave_entrance: כניסה למערה
           channel: תעלה
@@ -670,7 +691,7 @@ he:
           crater: מכתש
           dune: חולית
           feature: תכונה
-          fell: הר המתנשא מעל היערות סביבו
+          fell: תל
           fjord: פיורד
           forest: יער
           geyser: גייזר
@@ -689,7 +710,7 @@ he:
           river: נהר
           rock: סלע
           scree: ערמת סלעים
-          scrub: ערבה
+          scrub: סבך
           shoal: שרטון
           spring: מעיין
           stone: אבן
@@ -744,7 +765,7 @@ he:
           construction: מסילת ברזל בבנייה
           disused: מסילת ברזל שאינה בשימוש
           disused_station: תחנת רכבת שאינה בשימוש
-          funicular: רכבל
+          funicular: פוניקולר
           halt: תחנת רכבת
           historic_station: תחנת רכבת היסטורית
           junction: מפגש מסילות ברזל
@@ -766,7 +787,7 @@ he:
           tram_stop: תחנת חשמלית
           yard: מוסך רכבות
         shop: 
-          alcohol: חנות לממכר משקאות אלכוהוליים
+          alcohol: חנות אלכוהול
           antiques: עתיקות
           art: חנות חפצי אמנות
           bakery: מאפייה
@@ -810,7 +831,7 @@ he:
           grocery: מכולת
           hairdresser: מעצב שער
           hardware: חנות חומרי בניין
-          hifi: ציוד אלקטרוני
+          hifi: ציוד מוזיקה
           insurance: ביטוח
           jewelry: חנות תכשיטים
           kiosk: קיוסק
@@ -838,7 +859,7 @@ he:
           toys: חנות צעצועים
           travel_agency: סוכנות נסיעות
           video: ספריית וידאו
-          wine: חנות לממכר משקאות אלכוהוליים
+          wine: חנות אלכוהול
           "yes": חנות
         tourism: 
           alpine_hut: בקתה אלפינית
@@ -891,17 +912,21 @@ he:
       description: לשאול שאלה או לחפש תשובות באתר השאלות והתשובות של OSM.
       title: help.openstreetmap.org
       url: https://help.openstreetmap.org/
+    introduction: "ב־OpenStreetMap יש מספר משאבים ללימוד על המיזם, לשאלות ותשובות,\nולדיון ותיעוד שיתופי של נושאי מיפוי."
     title: קבלת עזרה
     welcome: 
-      title: ברוכים הבאים ל-OSM
+      description: תחילת היכרות בעזרת מדריך מהיר שסוקר את היסודות של OpenStreetMap.
+      title: ברוכים הבאים ל־OSM
+      url: /welcome
     wiki: 
+      description: לעיין בוויקי לתיעוד מעמיק על OSM.
       title: wiki.openstreetmap.org
       url: http://wiki.openstreetmap.org/
   html: 
     dir: rtl
   javascripts: 
     close: סגירה
-    edit_help: עליך להזיז את המפה ולהתמקד על מיקום שברצונך לערוך ואז ללחוץ כאן.
+    edit_help: יש להזיז את המפה ולהתמקד על מיקום שברצונך לערוך ואז ללחוץ כאן.
     key: 
       title: מפת מפתח
       tooltip: מפת מפתח
@@ -961,6 +986,7 @@ he:
       edit_disabled_tooltip: להתקרב כדי לערוך את המפה
       edit_tooltip: עריכת המפה
       map_data_zoom_in_tooltip: יש לקרב את המפה כדי לראות נתוני מפה
+      map_notes_zoom_in_tooltip: התקרבות כדי לראות הערות על המפה
   layouts: 
     about: אודות
     community: קהילה
@@ -981,8 +1007,8 @@ he:
     history: היסטוריה
     home: מעבר למיקום הבית
     intro_2_create_account: נא ליצור חשבון משתמש
-    intro_header: ברוכים הבאים ל-OpenStreetMap!
-    intro_text: OpenStreetMap הוא מפה של העולם, נוצר על ידי אנשים כמוך, וחופשי לשימוש תחת רשיון פתוח.
+    intro_header: ברוכים הבאים ל־OpenStreetMap!
+    intro_text: OpenStreetMap הוא מפה של העולם, נוצר על־ידי אנשים כמוך, וחופשי לשימוש תחת רשיון פתוח.
     learn_more: מידע נוסף
     log_in: כניסה לחשבון
     log_in_tooltip: כניסה עם חשבון קיים
@@ -1044,7 +1070,7 @@ he:
       title_html: זכויות יוצרים ורישיון
     native: 
       mapping_link: להתחיל למפות
-      native_link: גרסה העברית
+      native_link: גרסה עברית
       text: זהו עמוד זכויות היוצרים בגרסתו באנגלית. אפשר לחזור ל%{native_link} של עמוד זה, ואפשר גם להפסיק לקרוא על זכויות יוצרים ו%{mapping_link}.
       title: אודות דף זה
   message: 
@@ -1071,18 +1097,18 @@ he:
       as_unread: ההודעה סומנה כהודעה שלא נקראה
     message_summary: 
       delete_button: מחיקה
-      read_button: לסימון כ„נקרא”
+      read_button: סימון כ„נקרא”
       reply_button: תשובה
-      unread_button: לסימון כ„לא נקרא”
+      unread_button: סימון כ„לא נקרא”
     new: 
-      back_to_inbox: לחזרה לתיבת הדואר הנכנס
+      back_to_inbox: חזרה לתיבת הדואר הנכנס
       body: תוכן ההודעה
       limit_exceeded: שלחת הודעות רבות לאחרונה. נא להמתין לפני שליחת הודעות נוספות.
       message_sent: הודעה נשלחה
-      send_button: לשליחה
+      send_button: שליחה
       send_message_to: לשליחת הודעה חדשה אל %{name}
       subject: נושא
-      title: לשליחת הודעה
+      title: שליחת הודעה
     no_such_message: 
       body: אנו מצטערים, אין הודעה עם מזהה זה.
       heading: אין הודעה כזו
@@ -1152,7 +1178,7 @@ he:
       hi: שלום %{to_user},
       subject: "[אופן סטריט מאפ OpenStreetMap] תגובה מאת %{user} נוספה לרשומת יומן שלך"
     email_confirm: 
-      subject: "[אופן סטריט מאפ OpenStreetMap] נא לאמת את כתובת הדוא\"ל שלך"
+      subject: "[אופן סטריט מאפ OpenStreetMap] נא לאמת את כתובת הדוא״ל שלך"
     email_confirm_html: 
       click_the_link: אם באמת עשית את זה, נא ללחוץ על הקישור להלן כדי לאשר את השינוי.
       greeting: שלום,
@@ -1209,10 +1235,10 @@ he:
       details: אפשר למצוא פרטים נוספים על ההערה בכתובת %{url}
       greeting: שלום,
       reopened: 
-        commented_note: הערה במפה שהגבת עליה הופעלה מחדש ע״י %{commenter}. ההערה היא ליד %{place}.
-        subject_other: "[OpenStreetMap] הערה שמעניינת אותך הופעלה מחדש ע״י %{commenter}"
+        commented_note: הערה במפה שהגבת עליה הופעלה מחדש על־ידי %{commenter}. ההערה היא ליד %{place}.
+        subject_other: "[OpenStreetMap] הערה שמעניינת אותך הופעלה מחדש על־ידי %{commenter}"
         subject_own: "[OpenStreetMap] אחת ההערות שלך הופעלה מחדש ע״י %{commenter}"
-        your_note: הערה שהוספת ליד %{place} הופעלה מחדש ע״י %{commenter}.
+        your_note: הערה שהוספת ליד %{place} הופעלה מחדש על־ידי %{commenter}.
     signup_confirm: 
       confirm: "לפני שאנחנו ממשיכים, אנחנו צריכים לוודא שהבקשה הגיעה ממך, אז אם באמת עשית את זה, צריך ללחוץ כאן כדי לאמת את החשבון שלך:"
       created: מישהו (בתקווה את או אתה) יצר חשבון באתר %{site_url}.
@@ -1230,10 +1256,13 @@ he:
       allow_write_notes: לשנות הערות
       allow_write_prefs: לשנות את העדפות המשתמש שלך.
       request_access: היישום %{app_name} דורש גישה לחשבונך, %{user}. נא לבדוק האם מתאים לך שהיישום יקבל את היכולות האלו. אפשר לבחור או לא לבחור את כל מה שמתאים לך.
+      title: אישור הגישה לחשבון שלך
     oauthorize_failure: 
+      denied: שללת מהיישום %{app_name} את הגישה לחשבון שלך.
       invalid: האסימון האישור אינו תקף.
       title: בקשת אישור נכשלה
     oauthorize_success: 
+      allowed: נתת ליישום %{app_name} גישה לחשבונך.
       title: בקשת אישור אושרה
       verification: קוד האימות הוא %{code}.
     revoke: 
@@ -1323,26 +1352,26 @@ he:
       description: "תיאור:"
       destroy: הסרת החיתוך הזה
       edit: עריכת החיתוך הזה
-      heading: הצגת החיתוך "%{title}"
+      heading: הצגת החיתוך „%{title}”
       title: הצגת חיתוך
       user: "יוצר:"
     update: 
       flash: השינויים שנשמרו.
   site: 
     edit: 
-      anon_edits_link_text: גלה מדוע זה כך.
+      anon_edits_link_text: ר' הסבר מדוע זה כך.
       flash_player_required: יש צורך בנגן פלאש כדי להשתמש ב־Potlatch, ערוך הפלאש של OpenStreetMap. אפשר <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">להוריד נגן פלאש מאתר Adobe.com</a>. יש <a href="http://wiki.openstreetmap.org/wiki/Editing">אפשרויות נוספות</a> לעריכת OpenStreetMap.
       id_not_configured: לא התבצעו הגדרות של iD
       no_iframe_support: הדפדפן שלך אינו תומך באלמנטים מסוג iframe של HTML, ואלו חיוניים עבור תכונה זו.
-      not_public: לא הגדרת את עריכותיך כציבוריות.
-      not_public_description: לא תוכל להמשיך לערוך את המפה בטרם תעשה זאת. באפשרותך להגדיר את עריכותיך כציבוריות דרך %{user_page} שלך.
+      not_public: לא הגדרת את העריכות שלך כציבוריות.
+      not_public_description: לא תהיה לך אפשרות להמשיך לערוך את המפה לפני שזה ייעשה. באפשרותך להגדיר את העריכות שלך כציבוריות דרך %{user_page} שלך.
       potlatch2_not_configured: Potlatch 2 לא הוגדר – ר׳ http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 למידע נוסף
       potlatch2_unsaved_changes: יש לך שינויים שלא נשמרו. (כדי לשמור ב־Potlatch 2, יש ללחוץ „שמירה”.)
-      potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)
+      potlatch_unsaved_changes: יש לך שינויים שלא נשמרו. (כדי לשמור ב־Potlatch, יש לבטל את הבחירה של הדרך או הנקודה הנוכחים במצב עריכה חיה, או לשמור אם כפתור השמירה זמין.)
       user_page_link: דף המשתמש
     index: 
       createnote: הוספת הערה
-      js_1: הדפדפן שבו אתה משתמש אינו תומך ב־JavaScript, או שהשבתת את השימוש ב־JavaScript.
+      js_1: הדפדפן שבו אתה משתמש אינו תומך ב־JavaScript, או שכיבית את השימוש ב־JavaScript.
       js_2: אתר OpenStreetMap משתמש ב־JavaScript למפה המחליקה.
       license: 
         copyright: "זכויות היוצרים: מיזם OpenStreetMap ותורמיו, בכפוף לרישיון פתוח"
@@ -1395,7 +1424,7 @@ he:
           resident: אזור מגורים
           retail: אזור קמעונאי
           runway: 
-            - דרך למוניות
+            - מסלול נחיתה
             - דרך למוניות
           school: 
             - בית ספר
@@ -1434,7 +1463,7 @@ he:
       edit: עריכה
       preview: תצוגה מקדימה
     search: 
-      search: לחיפוש
+      search: חיפוש
       submit_text: מעבר
       where_am_i: איפה אני?
       where_am_i_title: נא לתאר את מיקומך הנוכחי באמצעות מנוע החיפוש
@@ -1509,10 +1538,10 @@ he:
       help: עזרה
       tags: "תגים:"
       tags_help: מופרד בפסיקים
-      upload_button: טעינה
+      upload_button: העלאה
       upload_gpx: "העלאת קובץ GPX:"
       visibility: "נִראוּת:"
-      visibility_help: מה זאת אומרת?
+      visibility_help: מה זה אומר?
     trace_header: 
       see_all_traces: הצגת כל המסלולים
       see_your_traces: הצגת המסלולים שלך
@@ -1543,7 +1572,7 @@ he:
       title: הצגת מסלול %{name}
       trace_not_found: המסלול לא נמצא!
       uploaded: "הועלה:"
-      visibility: "גלוי:"
+      visibility: "נראוּת:"
     visibility: 
       identifiable: בר זיהוי (מוצג ברשימת המסלולים וכמזוהה, נקודות סדורות עם חותמי זמן)
       private: פרטי (משותף רק כאלמוני, נקודות לא ממוינות)
@@ -1558,11 +1587,11 @@ he:
         link text: מה זה?
         not yet agreed: עדיין לא הסכמת לתנאי התרומה החדשים.
         review link text: נא לעבור לקישור הזה בזמנך הפנוי כדי לסקור ולקבל את תנאי התרומה החדשים.
-      current email address: "כתובת דוא\"ל נוכחית:"
+      current email address: "כתובת דוא״ל נוכחית:"
       delete image: להסרת התמונה הנוכחית
       email never displayed publicly: (לעולם לא מוצגת בפומבי)
-      flash update success: פרטי המשתמש/ת עודכנו בהצלחה.
-      flash update success confirm needed: מידע המשתמש/ת עודכן בהצלחה. נא בדקו את תיבת הדוא"ל על מנת לאשרר את הדוא"ל החדש.
+      flash update success: פרטי המשתמש עודכנו בהצלחה.
+      flash update success confirm needed: מידע על המשתמש עודכן בהצלחה. נא לבדוק את תיבת הדוא"ל כדי לאמת את הדוא"ל החדש.
       gravatar: 
         gravatar: להשתמש ב־Gravatar
         link: http://wiki.openstreetmap.org/wiki/Gravatar
@@ -1573,9 +1602,9 @@ he:
       keep image: לשמירה על התמונה הנוכחית
       latitude: "קו רוחב:"
       longitude: "קו אורך:"
-      make edits public button: הפוך את כל עריכותיי לציבוריות
+      make edits public button: להפוך את כל עריכותיי לציבוריות
       my settings: ההגדרות שלי
-      new email address: "כתובת דוא\"ל חדשה:"
+      new email address: "כתובת דוא״ל חדשה:"
       new image: הוספת תמונה
       no home location: לא הזנת את מיקומך הראשי.
       openid: 
@@ -1589,7 +1618,7 @@ he:
         disabled: לא מופעלת, אין אפשרות לערוך נתונים וכל העריכות הקודמות אלמוניות.
         disabled link text: מדוע איני יכול לערוך?
         enabled: מופעלת. לא אלמוני ויכול לערוך מידע.
-        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: מה זה?
         heading: "עריכה ציבורית:"
       public editing note: 
@@ -1758,30 +1787,30 @@ he:
       title: תנאי תרומה
       you need to accept or decline: נא לקרוא ולקבל או לדחות את תנאי התרומה החדשים כדי להמשיך.
     view: 
-      activate_user: להפעלת משתמש זה
+      activate_user: הפעלת משתמש זה
       add as friend: הוספה כחבר
       ago: (לפני %{time_in_words_ago})
       block_history: חסימות שהתקבלו
       blocks by me: מתי חסמתי
       blocks on me: מתי חסמו אותי
       comments: הערות
-      confirm: לאישור
-      confirm_user: לאישור משתמש זה
-      create_block: לחסימת משתמש זה
+      confirm: אישור
+      confirm_user: אישור משתמש זה
+      create_block: חסימת משתמש זה
       created from: "נוצר מתוך:"
       ct accepted: אושרו לפני %{ago}
       ct declined: נדחו
       ct status: "תנאי תרומה:"
       ct undecided: עוד אין החלטה
-      deactivate_user: לביטול הפעלת משתמש זה
-      delete_user: למחיקת משתמש זה
+      deactivate_user: ביטול הפעלת משתמש זה
+      delete_user: מחיקת משתמש זה
       description: תיאור
       diary: יומן
       edits: עריכות
-      email address: "כתובת דוא\"ל:"
+      email address: "כתובת דוא״ל:"
       friends_changesets: ערכות שינויים של חברים
       friends_diaries: רשומות יומן של חברים
-      hide_user: להסתרת משתמש זה
+      hide_user: הסתרת משתמש זה
       if set location: הגדרה של מיקום הבית שלך בדף %{settings_link} תאפשר לך לראות משתמשים בסביבתך.
       km away: במרחק %{count} ק״מ
       latest edit: "עריכה אחרונה %{ago}:"
@@ -1800,7 +1829,7 @@ he:
       nearby_changesets: ערכות השינויים של משתמשים בסביבה
       nearby_diaries: רשומות יומן של משתמשים בסביבה
       new diary entry: רשומה חדשה ביומן
-      no friends: עדיין לא הוספת חברים כלל.
+      no friends: עדיין לא הוספת חברים.
       no nearby users: אין עדיין עוד משתמשים שמודים שהם מיפו בסביבה.
       notes: הערות מפה
       oauth settings: הגדרות oauth
@@ -1819,7 +1848,7 @@ he:
       spam score: "דירוג זיבול:"
       status: "מצב:"
       traces: מסלולים
-      unhide_user: לבטל הסתרת משתמש זה
+      unhide_user: ביטול הסתרת משתמש זה
       user location: מיקום המשתמש
       your friends: החברים שלך
   user_block: 
@@ -1848,7 +1877,7 @@ he:
       block_expired: ייתכן שהחסימה כבר פקעה ואי־אפשר לערוך אותה.
       block_period: תקופת החסימה צריכה להיות אחד הערכים שאפשר לבחור ברשימה הנפתחת.
     helper: 
-      time_future: יסתיים תוך %{time}
+      time_future: תסתיים בעוד %{time}
       time_past: הסתיימה לפני %{time}.
       until_login: פעילה עד שהמשתמש ייכנס לחשבון.
     index: 
@@ -1872,7 +1901,7 @@ he:
       back: חזרה למפתח
       sorry: סליחה, החסימה עם המזהה %{id} לא נמצאה.
     partial: 
-      confirm: האם אתה בטוח?
+      confirm: באמת?
       creator_name: יוצר
       display_name: משתמש חסום
       edit: עריכה
@@ -1907,8 +1936,8 @@ he:
       revoker: "מבטל:"
       show: הצגה
       status: סטטוס
-      time_future: יסתיים תוך %{time}
-      time_past: הסתיים לפני %{time}
+      time_future: תסתיים בעוד %{time}
+      time_past: הסתיימה לפני %{time}
       title: החשבון של %{block_on} נחסם על־ידי %{block_by}
     update: 
       only_creator_can_edit: רק המנהל שיצר את החסימה הזאת יכול לערוך אותה.
@@ -1945,7 +1974,7 @@ he:
       way_html: <strong>נתיב</strong> הוא קו או אזור כמו דרך, זרם, אגם או מבנה.
     introduction_html: ברוך בואך ל־OpenStreetMap, מפה חופשית של העולם, שאפשר לערוך. עכשיו שנרשמת, הכול מוכן ואפשר להתחיל לצייר מפות. הנה מדריך קצת שייתן לך את הדברים החשובים שכדאי לך לדעת.
     questions: 
-      paragraph_1_html: "ל-OpenStreetMap מספר מקורות ללמידה על הפרויקט, לשאול ולענות על שאלות, דיונם לשיתוף פעולה ותיעוד נושאי המיפוי. \n\n<a href='%{help_url}'>לקבל עזרה</a>."
+      paragraph_1_html: "ב־OpenStreetMap יש מספר משאבים ללימוד על המיזם, לשאלות ותשובות,\nולדיון ותיעוד שיתופי של נושאי מיפוי.\n<a href='%{help_url}'>מקום לקבל עזרה</a>."
       title: יש שאלות?
     start_mapping: להתחיל למפות
     title: ברוך בואך!
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 60f5dba9f..613e160d1 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -12,10 +12,12 @@
 hr: 
   about_page: 
     copyright_html: <span>&copy;</span>OpenStreetMap<br>doprinositelji
+    local_knowledge_html: OpenStreetMap pridodaje posebnu važnost lokalnom znanju. Doprinositelji koriste zračne snimke, GNSS uređaje i vlastito novo-prikupljene podatke za provjeru točnosti i ažurnosti OSM podataka.
     local_knowledge_title: Lokalno znanje
     next: Dalje
     open_data_html: "OpenStreetMap sadrži <i>slobodne podatke</i>: možeš ih slobodno koristiti za bilo koju svrhu dok god su uz podatke naznačene zasluge OpenStreetMap-a i njegovih doprinositelja. Ako izmjenjuješ podatke ili stvaraš nove na temelju preuzetih podataka, te podatke možeš distribuirati samo pod istom licencom.  Vidi stranicu:<a href='%{copyright_path}'>Autorska prava i licenca</a> za detalje."
     open_data_title: Otvoreni podaci
+    partners_title: Partneri
   activerecord: 
     attributes: 
       diary_comment: 
@@ -136,6 +138,7 @@ hr:
       closed_title: Riješena bilješka broj %{note_name}
       commented_by: Komentirao/la %{user} <abbr title='%{exact_time}'>prije %{when}</abbr>
       commented_by_anonymous: Komentirano anonimno <abbr title='%{exact_time}'>prije %{when}</abbr>
+      description: Opis
       hidden_by: Sakrio/la %{user} <abbr title='%{exact_time}'>prije %{when}</abbr>
       hidden_title: Skrivena bilješka broj %{note_name}
       new_note: Nova bilješka
@@ -901,6 +904,7 @@ hr:
     community_blogs: Blogovi zajednice
     community_blogs_title: Blogovi članova OpenStreetMap zajednice
     copyright: Autorska prava
+    data: Podaci
     donate: Podržite OpenStreetMap sa %{link} Hardware Upgrade Fond.
     edit: Uredi
     edit_with: Uredi s %{editor}
@@ -908,8 +912,8 @@ hr:
     export_data: Izvezi podatke
     foundation: Zaklada
     foundation_title: OpenStreetMap zaklada
-    gps_traces: GPS tragovi
-    gps_traces_tooltip: Upravljaj GPS tragovima
+    gps_traces: GNSS tragovi
+    gps_traces_tooltip: Upravljaj GNSS tragovima
     help: Pomoć
     history: Povijest
     home: Pokaži moj dom
@@ -1113,12 +1117,12 @@ hr:
       subject: "[OpenStreetMap] Dobrodošli na OpenStreetMap"
   oauth: 
     oauthorize: 
-      allow_read_gpx: čitaj svoje privatne GPS tragove.
+      allow_read_gpx: čitaj svoje privatne GNSS tragove.
       allow_read_prefs: pročitajte svoje korisničke postavke
       allow_to: "Dozvoli klijentskoj aplikaciji da:"
       allow_write_api: izmijeni kartu
       allow_write_diary: Zapište u dnevnik, komentirajte i stvorite prijatelje.
-      allow_write_gpx: Pošalji GPS trase.
+      allow_write_gpx: postavi GNSS tragove.
       allow_write_notes: izmijeni bilješke.
       allow_write_prefs: izmjeni korisničke postavke
       request_access: Aplikacija %{app_name} zahtjeva pristup vašem korisničkom računu (%{user}). Provjerite želite li da aplikacija ima te mogućnosti, te odaberite koliko joj želite dopustiti.
@@ -1133,11 +1137,11 @@ hr:
       submit: Uredi
       title: Uredi svoju aplikaciju
     form: 
-      allow_read_gpx: čitaj njihove privatne GPS tragove.
+      allow_read_gpx: čitaj njihove privatne GNSS tragove.
       allow_read_prefs: pročitaj njihove korisničke postavke
       allow_write_api: izmjeni kartu.
       allow_write_diary: Napravi zapise u dnevnik, komentiraj i sprijatelji se.
-      allow_write_gpx: Pošalji GPS trase
+      allow_write_gpx: postavi GNSS tragove.
       allow_write_notes: izmijeni bilješke.
       allow_write_prefs: Izmjeni njihove koriničke postavke.
       callback_url: Callback URL
@@ -1164,11 +1168,11 @@ hr:
       sorry: Žao mi je, da se %{type} ne može naći.
     show: 
       access_url: "Access Token URL:"
-      allow_read_gpx: čitaj njihove privatne GPS tragove.
+      allow_read_gpx: čitaj njihove privatne GNSS tragove.
       allow_read_prefs: pročitaj njihove korisničke postavke
       allow_write_api: Izmjeni kartu.
       allow_write_diary: Napravi zapise u dnevnik, komentiraj i sprijatelji se.
-      allow_write_gpx: Otpremi GPS trase.
+      allow_write_gpx: postavi GNSS tragove.
       allow_write_notes: izmijeni bilješke.
       allow_write_prefs: izmjeni njihove korisničke postavke
       authorize_url: "Authorise URL:"
@@ -1280,8 +1284,11 @@ hr:
           unsurfaced: Neasfaltirana cesta
           wood: Šume (prirodne, neodržavane)
     markdown_help: 
+      alt: Alternativni tekst
       image: Slika
       link: Poveznica
+      text: Tekst
+      url: URL
     richtext_area: 
       edit: Uredi
     search: 
@@ -1297,10 +1304,12 @@ hr:
       friendly: "%e %B %Y u %H:%M"
   trace: 
     create: 
-      trace_uploaded: Vaša GPS datoteka je spremljena na server i čeka ubacivanje u bazu. Ovo se obično dogodi za pola sata i prije, a e-mail-om će te dobiti obavijest o završetku.
-      upload_trace: Pošalji GPS trasu
+      trace_uploaded: Vaša GPX datoteka je spremljena na server i čeka ubacivanje u bazu. Ovo se obično dogodi za pola sata i prije, a e-mail-om će te dobiti obavijest o završetku.
+      upload_trace: Pošalji GNSS trag
     delete: 
       scheduled_for_deletion: Trase raspoređene za brisanje
+    description: 
+      description_without_count: GPX datoteka od %{user}
     edit: 
       description: "Opis:"
       download: preuzmi
@@ -1319,13 +1328,14 @@ hr:
       visibility: "Vidljivost:"
       visibility_help: Što ovo znači?
     georss: 
-      title: OpenStreetMap GPS tragovi
+      title: OpenStreetMap GNSS tragovi
     list: 
-      empty_html: Ovdje zasad nema ničega. <a href='%{upload_link}'>Učitaj novi trag</a> ili nauči više o GPS tragovima na <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki stranici</a>.
-      public_traces: Javni GPS tragovi
-      public_traces_from: Javni GPS tragovi korisnika %{user}
+      description: Pretraži nedavno objavljene GNSS tragove
+      empty_html: Ovdje zasad nema ničega. <a href='%{upload_link}'>Učitaj novi trag</a> ili nauči više o GNSS tragovima na <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki stranici</a>.
+      public_traces: Javni GNSS tragovi
+      public_traces_from: Javni GNSS tragovi korisnika %{user}
       tagged_with: " označeni sa %{tags}"
-      your_traces: Vaše GPS trase
+      your_traces: Tvoji GNSS tragovi
     make_public: 
       made_public: Trag je postao javan
     offline: 
@@ -1364,10 +1374,11 @@ hr:
       traces_waiting: 
         one: Imaš %{count} trag na čekanju za učitavanje. Molim pričekaj da se ti tragovi učitaju prije nego počneš slati nove, tako da ne blokiraš učitavanje tragova drugih korisnika.
         other: Imaš %{count} tragova na čekanju za učitavanje. Molim pričekaj da se ti tragovi učitaju prije nego počneš slati nove, tako da ne blokiraš učitavanje drugih korisnika.
-      upload_trace: Pošalji GPS trag
+      upload_trace: Postavi GNSS trag
     trace_optionals: 
       tags: Oznake
     trace_paging_nav: 
+      newer: Noviji tragovi
       older: Stariji tragovi
       showing_page: Stranica %{page}
     view: 
diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index d05e7e551..6d1170cf3 100644
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -365,6 +365,7 @@ hsb:
         title: Do zhromadźenstwa zastupić
       title: Kak móžeš pomhać
     other_concerns: 
+      explanation_html: Jeli maš wobmyslenja wo tym, kak so naše daty wužiwaja abo nastupajo wobsah, wopytaj našu <a href='/copyright'>stronu awtorstwa</a> za dalše zakonjowe informacije abo staj so z wotpowědnej <a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>dźěłowej skupinu</a> do zwiska.
       title: Druhe naležnosće
     title: Problem zdźělić / Kartu poprawić
   geocoder: 
@@ -1721,7 +1722,7 @@ hsb:
     new: 
       about: 
         header: Swobodny a wobdźěłujomny
-        html: "<p>Na rozdźěl wot druhich kartow, so OpenStreetMap dospołnje wot ludźi kaž ty twori, a kóždy móže ju korigować, aktualizować, sćahnyć a wužiwać.</p>\n<p>Zregistruj so a skutkuj sobu. Budźemy ći e-mejlku słać, zo bychmy twoje konto wobkrućili."
+        html: "<p>Na rozdźěl wot druhich kartow, so OpenStreetMap dospołnje wot ludźi kaž ty twori, a kóždy móže ju korigować, aktualizować, sćahnyć a wužiwać.</p>\n<p>Zregistruj so a skutkuj sobu. Budźemy ći e-mejlku słać, zo bychmy twoje konto wobkrućili.</p>"
       confirm email address: "E-mejlowu adresu wobkrućić:"
       confirm password: "Hesło wobkrućić:"
       contact_webmaster: Prošu staj so z <a href="mailto:webmaster@openstreetmap.org">webmasterom</a> do zwiska, zo by so konto załožiło - budźemy pospytać naprašowanje tak spěšnje kaž móžno wobdźěłać.
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 421b46cc7..2a2073dd2 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -12,12 +12,16 @@
 # Author: Misibacsi
 # Author: Nemo bis
 # Author: R-Joe
+# Author: Samat
 # Author: Sucy
 # Author: Tacsipacsi
 hu: 
   about_page: 
     copyright_html: <span>&copy;</span>OpenStreetMap<br />közreműködők
+    local_knowledge_title: Helyi tudásbázis
     next: Következő
+    open_data_title: Szabad adatok
+    partners_title: Partnerek
   activerecord: 
     attributes: 
       diary_comment: 
@@ -111,17 +115,17 @@ hu:
       way: Vonalak (%{count})
       way_paginated: Vonalak (%{x}-%{y} összesen %{count})
     closed: Lezárva
-    closed_by_html: Lezárva <abbr title='%{title}'>%{time}</abbr> %{user} által
+    closed_by_html: Lezárta %{user} <abbr title='%{title}'>%{time}</abbr>
     closed_html: Lezárva <abbr title='%{title}'>%{time}</abbr>
     containing_relation: 
       entry: "Kapcsolat: %{relation_name}"
       entry_role: "Kapcsolat: %{relation_name} (mint %{relation_role})"
     created: Létrehozva
-    created_by_html: Létrehozve <abbr title='%{title}'>%{time}</abbr> %{user} által
+    created_by_html: Létrehozta %{user} <abbr title='%{title}'>%{time}</abbr>
     created_html: Létrehozva <abbr title='%{title}'>%{time}</abbr>
-    deleted_by_html: Törölve <abbr title='%{title}'>%{time}</abbr> %{user} által
+    deleted_by_html: Törölte %{user} <abbr title='%{title}'>%{time}</abbr>
     download_xml: XML letöltése
-    edited_by_html: Szerkesztve <abbr title='%{title}'>%{time}</abbr> %{user} által
+    edited_by_html: Szerkesztette %{user} <abbr title='%{title}'>%{time}</abbr>
     in_changeset: Módosításcsomag
     location: "Hely:"
     no_comment: (nincs hozzászólás)
@@ -136,21 +140,22 @@ hu:
         relation: kapcsolat
         way: vonal
     note: 
-      closed_by: Megoldva %{user} által <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous: Megoldva ismeretlen által <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by: Megoldotta %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous: Megoldva névtelenül <abbr title='%{exact_time}'>%{when}</abbr>
       closed_title: "Megoldott jegyzet: %{note_name}"
       commented_by: "%{user} megjegyzése <abbr title='%{exact_time}'>%{when}</abbr>"
       commented_by_anonymous: Névtelen felhasználó megjegyzése <abbr title='%{exact_time}'>%{when}</abbr>
-      description: "Leírás:"
-      hidden_by: Elrejtve %{user} által <abbr title='%{exact_time}'>%{when}</abbr>
+      description: Leírás
+      hidden_by: Elrejtette %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_title: Rejtett jegyzet %{note_name}
       new_note: Új jegyzet
-      open_by: Létrehozva %{user} által <abbr title='%{exact_time}'>%{when}</abbr>
-      open_by_anonymous: Létrehozva ismeretlen által <abbr title='%{exact_time}'>%{when}</abbr>
+      open_by: Létrehozta %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      open_by_anonymous: Létrehozva névtelenül <abbr title='%{exact_time}'>%{when}</abbr>
       open_title: "Megoldatlan jegyzet: %{note_name}"
-      reopened_by: Újraaktiválva %{user} által <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous: Újraaktiválva ismeretlen által <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by: Újraaktiválta %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous: Újraaktiválva névtelenül <abbr title='%{exact_time}'>%{when}</abbr>
       title: "Jegyzet: %{id}"
+    part_of: Része ennek
     redacted: 
       message_html: A %{type} %{version} verzióját nem lehet megjeleníteni, mert el lett távolítva. További részletekért lásd %{redaction_link}
       redaction: Eltávolítás %{id}
@@ -337,15 +342,29 @@ hu:
         advice: Ha a fenti exportálás sikertelen lenne, próbáld meg az alábbi listából valamelyik lehetőséget.
         body: Ez a terület túl nagy ahhoz, hogy exportálásra kerüljön OpenStreetMap XML adatként. Közelíts, vagy jelölj ki kisebb területet. Esetleg használd az alábbi listából valamelyik nagy adatmennyiségek letöltését támogató módszert.
         geofabrik: 
+          description: Kontinensek, országok és kiválasztott városok rendszeresen frissített kivonata
           title: Geofabrik letöltések
         other: 
           title: Más források
         overpass: 
           description: A megjelenített befoglaló keret letöltése egy OpenStreetMap tükörserverről
+          title: Overpass API
         planet: 
           description: A teljes OpenStreetMap adatbázis rendszeresen frissített másolatai
+          title: Planet OSM
       zoom: Nagyítási szint
     title: Exportálás
+  fixthemap: 
+    how_to_help: 
+      add_a_note: 
+        instructions_html: Csak kattints a <a class='icon note'></a> ikonra a térképnézetben. Ez felrak egy helyjelölőt a térképre, amit húzással tudsz a megfelelő helyre mozgatni. Írd meg hozzá az üzeneted, majd kattints a mentésre, és a többi térképész meg fogja vizsgálni.
+      join_the_community: 
+        explanation_html: Ha bármilyen hibát találtál a térképadatokban, például hiányzik egy út vagy cím, a legjobb, ha csatlakozol az OpenStreetMap közösséghez és kijavítod az adatot saját magad.
+        title: Csatlakozás a közösséghez
+      title: Hogyan segíthetsz
+    other_concerns: 
+      title: Egyéb aggályok
+    title: Hibabejelentés / Térkép javítása
   geocoder: 
     description: 
       title: 
@@ -383,11 +402,13 @@ hu:
         us_postcode: Eredmények a <a href="http://geocoder.us/">Geocoder.us</a>-ról
     search_osm_nominatim: 
       admin_levels: 
+        level10: Városrészhatár
         level2: Országhatár
         level4: Államhatár
         level5: Régióhatár
         level6: Megyehatár
         level8: Városhatár
+        level9: Faluhatár
       prefix: 
         aerialway: 
           chair_lift: Libegő
@@ -742,6 +763,7 @@ hu:
           proposed: Tervezett vasút
           spur: Vasúti szárnyvonal
           station: Vasútállomás
+          stop: Vasúti megálló
           subway: Metróállomás
           subway_entrance: Metrókijárat
           switch: Vasúti váltó
@@ -869,7 +891,18 @@ hu:
           water_point: Vízi fordítópont
           waterfall: Vízesés
           weir: Bukógát
+  help_page: 
+    help: 
+      title: help.openstreetmap.org
+      url: https://help.openstreetmap.org/
+    welcome: 
+      title: Üdvözlünk az OSM-en
+      url: /welcome
+    wiki: 
+      title: wiki.openstreetmap.org
+      url: https://wiki.openstreetmap.org/wiki/Hu:Main_Page
   javascripts: 
+    close: Bezárás
     key: 
       title: Jelmagyarázat
       tooltip: Jelmagyarázat
@@ -877,6 +910,7 @@ hu:
     map: 
       base: 
         cycle_map: Kerékpártérkép
+        hot: Humanitáriánus
         mapquest: MapQuest Open
         standard: Alapértelmezett
         transport_map: Tömegközlekedési térkép
@@ -900,13 +934,28 @@ hu:
         intro: Hibát találtál vagy valami hiányzik? Tudasd a többi térképezővel hogy javítani tudjuk. Mozgasd a jelölőt a megfelelő helyre és minél pontosabban írd le a problémát. (Kérjük itt ne adj meg személyes adatokat.)
       show: 
         anonymous_warning: Ez a jegyzet anonim felhasználók megjegyzéseit is tartalmazza melyeket ellenőrizni szükséges.
+        comment: Hozzászólás
+        comment_and_resolve: Hozzászólás és lezárás
+        hide: Elrejtés
+        reactivate: Újraaktiválás
+        resolve: Megoldás
     share: 
+      cancel: Mégsem
+      center_marker: Térkép középpontja a helyjelölő
+      custom_dimensions: Kiterjedés megadása
       download: Letöltés
       embed: HTML
       format: "Formátum:"
+      image: Kép
+      image_size: "A kép az alapértelmezett réteget fogja tartalmazni ekkora méretben:"
+      include_marker: Helyjelölővel
+      link: Link vagy HTML
       long_link: Link
+      paste_html: Weboldalba beágyazáshoz illeszd be ezt a HTML-t
+      scale: "Méretarány:"
       short_link: Rövid link
       short_url: Rövid URL
+      title: Megosztás
       view_larger_map: Nagyobb térkép
     site: 
       createnote_disabled_tooltip: Nagyíts térképes jegyzet hozzáadásához
@@ -936,6 +985,7 @@ hu:
     home: Ugrás az otthonodhoz
     intro_2_create_account: Felhasználói fiók létrehozása
     intro_header: Üdvözöljük az OpenStreetMap-en!
+    intro_text: Az OpenStreetMap egy világtérkép, amelyet hozzád hasonló emberek készítenek és szabad licenc alatt elérhető.
     learn_more: További info
     log_in: Bejelentkezés
     log_in_tooltip: Bejelentkezés egy meglévő felhasználói fiókkal
@@ -945,6 +995,7 @@ hu:
     make_a_donation: 
       text: Adományozz
       title: Támogasd az OpenStreetMapot pénzadománnyal
+    more: Több
     osm_offline: Az OpenStreetMap-adatbázis jelenleg offline, miközben alapvető adatbázis-karbantartási munkát végzeznek.
     osm_read_only: Az OpenStreetMap-adatbázis jelenleg csak olvasható, miközben alapvető adatbázis-karbantartási munkát végzeznek.
     partners_bytemark: Bytemark Hosting
@@ -1068,16 +1119,29 @@ hu:
     description: 
       closed_at_by_html: "Megoldva: %{when} (%{user})"
       closed_at_html: "Megoldva: %{when}"
+      commented_at_by_html: Frissítette %{user} %{when}
       commented_at_html: "Frissítve: %{when}"
+      opened_at_by_html: Létrehozta %{user} %{when}
       opened_at_html: Létrehozva %{when}
+      reopened_at_by_html: Újraaktiválta %{user} %{when}
       reopened_at_html: "Újra aktiválva: %{when}"
     entry: 
+      comment: Hozzászólás
       full: Teljes jegyzet
     mine: 
       ago_html: "%{when}"
+      created_at: Létrehozva ekkor
+      creator: Létrehozta
+      description: Leírás
       heading: "%{user} jegyzetei"
+      id: ID
+      last_changed: Utoljára módosítva
     rss: 
+      closed: Lezárt megjegyzés (%{place} közelében)
+      commented: Új hozzászólás (%{place} közelében)
       description_item: RSS hírcsatorna a %{id} jegyzethez
+      opened: Új megjegyzés (%{place} közelében)
+      reopened: újraaktivált megjegyzés (%{place} közelében)
       title: OpenStreetMap jegyzetek
   notifier: 
     diary_comment_notification: 
@@ -1164,6 +1228,10 @@ hu:
       allow_write_notes: jegyzet módosítása
       allow_write_prefs: felhasználói beállítások módosítása.
       request_access: A(z) %{app_name} alkalmazás hozzáférést kér a felhasználói fiókodhoz, %{user}. Kérlek, jelöld, ha azt szeretnéd, hogy az alkalmazás rendelkezzen a következő képességekkel. Választhatsz olyan sokat vagy keveset, amennyit szeretnél.
+    oauthorize_failure: 
+      title: Az azonosítás sikertelen.
+    oauthorize_success: 
+      verification: "Az ellenőrző kód: %{code}."
     revoke: 
       flash: Visszavontad az utalványt a(z) %{application} alkalmazáshoz
   oauth_clients: 
@@ -1358,6 +1426,9 @@ hu:
       upload_trace: GPS nyomvonal feltöltése
     delete: 
       scheduled_for_deletion: A nyomvonal törlésre kijelölve
+    description: 
+      description_with_count: GPX fájl %{count} ponttal %{user} felhasználótól
+      description_without_count: GPX fájl %{user} felhasználótól
     edit: 
       description: "Leírás:"
       download: letöltés
@@ -1375,6 +1446,8 @@ hu:
       uploaded_at: "Feltöltve:"
       visibility: "Láthatóság:"
       visibility_help: Mit jelent ez?
+    georss: 
+      title: OpenStreetMap GPS nyomvonalak
     list: 
       description: Legfrissebb GPS nyomvonalak tallózása
       empty_html: Még nincs mit megjeleníteni. <a href='%{upload_link}'>Tölts fel új nyomvonalat</a>, vagy olvass bővebben a GPS nyomvonalrögzítésről a <a href='http://wiki.openstreetmap.org/wiki/HU:Beginners_Guide_1.2'>wiki lapon</a>.
@@ -1690,7 +1763,9 @@ hu:
       my comments: Saját megjegyzések
       my diary: Naplóm
       my edits: Szerkesztéseim
+      my messages: Üzeneteim
       my notes: Saját jegyzeteim
+      my profile: Profilom
       my settings: Beállításaim
       my traces: Saját nyomvonalak
       nearby users: Egyéb közeli felhasználók
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 0869ae618..2542dd999 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -974,7 +974,7 @@ ia:
       contributors_title_html: Nostre contributores
       contributors_za_html: "<strong>Africa del Sud</strong>: Contine datos proveniente del\n   <a href=\"http://www.ngi.gov.za/\">Chief Directorate:\n   National Geo-Spatial Information</a>, copyright del Stato reservate."
       credit_1_html: "Nos require que vos usa le recognoscentia &ldquo;&copy; OpenStreetMap\ncontributors&rdquo;."
-      credit_2_html: Vos debe anque clarificar que le datos es disponibile sub Open Database License, e si vos usa nostre tegulas cartographic, que le cartographia es licentiate sub CC-BY-SA. Vos pote facer isto con un ligamine a <a href="http://www.openstreetmap.org/copyright">iste pagina de copyright</a>. Alternativemente, e obligatorimente si vos distribue OSM in forma de datos, vos pote nominar e ligar directemente al licentia(s). Si vos usa un medio de communication in le qual le ligamines non es possibile (p.ex. un obra imprimite), nos suggere que vos dirige vostre lectores a www.openstreetmap.org (forsan per inserer iste adresse complete in loco del parola &lsquo;OpenStreetMap&rsquo;), a www.opendatacommosn.org, e (si relevante) a www.creativecommons.org.
+      credit_2_html: "Vos debe anque clarificar que le datos es disponibile sub Open Database License, e si vos usa nostre tegulas cartographic, que le cartographia es licentiate sub CC-BY-SA. Vos pote facer isto con un ligamine a <a href=\"http://www.openstreetmap.org/copyright\">iste pagina de copyright</a>.\nAlternativemente, e obligatorimente si vos distribue OSM in forma de datos, vos pote mentionar le licentia(s) e ligar directemente a illo(s). Si vos usa un medio de communication in le qual le ligamines non es possibile (p.ex. un obra imprimite), nos suggere que vos dirige vostre lectores a openstreetmap.org (forsan per inserer iste adresse complete in loco del parola &lsquo;OpenStreetMap&rsquo;), a opendatacommons.org, e (si relevante) a creativecommons.org."
       credit_3_html: "Pro un carta electronic navigabile, le recognoscentia debe apparer in le angulo del carta. Per exemplo:"
       credit_title_html: Como dar recognoscentia a OpenStreetMap
       infringement_1_html: "  Nos rememora al contributores de OSM de nunquam adder datos de alcun\n  fonte sub derecto de autor (p.ex. Google Maps o cartas imprimite)\n  sin explicite permission del titulares del derecto de autor."
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 40769081b..91fabaaaf 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1,6 +1,7 @@
 # Messages for Indonesian (Bahasa Indonesia)
 # Exported from translatewiki.net
 # Export driver: syck-pecl
+# Author: C5st4wr6ch
 # Author: Dewisulistio
 # Author: Emirhartato
 # Author: Farras
@@ -11,6 +12,9 @@
 # Author: Wulankhairunisa
 # Author: 아라
 id: 
+  about_page: 
+    open_data_html: "OpenStreetMap adalah <i>data terbuka</i>: Anda bebas untuk menggunakannya untuk tujuan apapun selama Anda memberi penghargaan pada OpenStreetMap dan kontributornya. Jika Anda mengubah atau membangun dari data dengan cara tertentu, Anda dapat menyebarkan hasilnya hanya di bawah lisensi yang sama. Lihat <a href='%{copyright_path}'>halaman Hak Cipta dan Lisensi</a> untuk perinciannya."
+    partners_title: Rekan
   activerecord: 
     attributes: 
       diary_comment: 
@@ -28,7 +32,7 @@ id:
         body: Isi
         recipient: Penerima
         sender: Pengirim
-        title: Judul
+        title: Subyek
       trace: 
         description: Deskripsi
         latitude: Garis Lintang
@@ -94,12 +98,13 @@ id:
         title: Set Perubahan %{id}
         title_comment: Set Perubahan %{id} - %{comment}
       osmchangexml: osmChange XML
-      title: Set Perubahan
+      title: "Set Perubahan: %{id}"
     containing_relation: 
       entry: Relasi %{relation_name}
       entry_role: Relasi %{relation_name} (as %{relation_role})
+    download_xml: Unduh XML
     not_found: 
-      sorry: Maaf, %{type} dengan id %{id}, tidak dapat ditemukan.
+      sorry: "Maaf, %{type} #%{id} tidak dapat ditemukan."
       type: 
         changeset: Set perubahan
         node: node/titik
@@ -107,9 +112,12 @@ id:
         way: way/garis
     note: 
       closed_title: "Catatan diselesaikan: %{note_name}"
-      description: "Deskripsi:"
+      commented_by: Komentar dari %{user} <abbr title='%{exact_time}'>%{when} yang lalu</abbr>
+      commented_by_anonymous: Komentar dari anonim <abbr title='%{exact_time}'>%{when} yang lalu</abbr>
+      description: Deskripsi
+      open_by: Dibuat oleh %{user} <abbr title='%{exact_time}'>%{when} yang lalu</abbr>
       open_title: "Catatan belum terselesaikan: %{note_name}"
-      title: Catatan
+      title: "Catatan: %{id}"
     redacted: 
       message_html: Versi %{version} %{type} ini tidak dapat ditampilkan karena telah diedit. Silahkan lihat %{redaction_link} untuk rincian.
       redaction: Redaksi %{id}
@@ -124,10 +132,11 @@ id:
         relation: Relasi
         way: Way/Garis
     start_rjs: 
+      feature_warning: Memuat %{num_features} fitur, yang dapat membuat peramban Anda lambat atau tidak responsif. Apakah Anda yakin ingin menampilkan data ini?
       load_data: Memuat Data
       loading: Memuat...
     tag_details: 
-      tags: "Tag:"
+      tags: Tanda
       wiki_link: 
         key: Deskripsi halaman wiki untuk tag %{key}
         tag: Deskripsi halaman wiki untuk  %{key}=%{value} tag
@@ -155,6 +164,7 @@ id:
       saved_at: Disimpan di
       user: Pengguna
     list: 
+      empty: Tidak ada set perubahan yang ditemukan.
       title: Set perubahan
       title_friend: Set perubahan oleh teman Anda
       title_nearby: Set perubahan oleh pengguna terdekat
@@ -271,6 +281,7 @@ id:
       paste_html: Salin HTML untuk menyimpan di website
       scale: Skala
       too_large: 
+        advice: "Jika ekspor di atas gagal, silakan pertimbangkan untuk menggunakan satu dari sumber yang tercantum di bawah ini:"
         body: Wilayah ini terlalu besar untuk diekspor sebagai data XML OpenStreetMap. Silahkan perbesar atau pilih wilayah yang lebih kecil.
       zoom: Perbesar
   geocoder: 
@@ -822,7 +833,7 @@ id:
     community: Komunitas
     community_blogs: Blog Komunitas
     community_blogs_title: Blog dari anggota komunitas OpenStreetMap
-    copyright: Hak Cipta & Lisensi
+    copyright: Hak cipta
     donate: Dukung OpenStreetMap %{link} untuk biaya upgrade Hardware.
     edit: Edit
     edit_with: Edit menggunakan %{editor}
@@ -835,11 +846,12 @@ id:
     history: Riwayat
     home: Halaman Utama
     intro_2_create_account: Buat Akun
-    log_in: Masuk
+    intro_text: OpenStreetMap adalah peta dunia, diciptakan oleh orang-orang seperti Anda dan bebas untuk digunakan di bawah lisensi terbuka.
+    log_in: Masuk Log
     log_in_tooltip: Masuk dengan akun yang sudah ada
     logo: 
       alt_text: logo OpenStreetMap
-    logout: Keluar
+    logout: Keluar Log
     make_a_donation: 
       text: Menyumbang
       title: Dukung OpenStreetMap dengan donasi finansial
@@ -1063,7 +1075,7 @@ id:
       created: Seseorang (mudah-mudahan Anda) baru saja membuat sebuah akun pada %{site_url}.
       greeting: Halo!
       subject: "[OpenStreetMap] Selamat datang di OpenStreetMap"
-      welcome: Kami ingin menyambut Anda dan memberikan Anda beberapa informasi tambahan agar Anda dapat segera memulainya.
+      welcome: Setelah Anda mengkonfirmasi akun Anda, kami akan memberikan Anda beberapa informasi tambahan agar Anda dapat segera memulainya.
   oauth: 
     oauthorize: 
       allow_read_gpx: baca trek GPS pribadi Anda.
@@ -1075,6 +1087,9 @@ id:
       allow_write_notes: memodifikasi catatan.
       allow_write_prefs: modifikasi pengaturan pengguna anda.
       request_access: Aplikasi %{app_name} akan meminta akses ke akun, %{user}. Periksa apakah Anda ingin aplikasi untuk memiliki kemampuan berikut. Anda dapat memilih sebanyak atau sesedikit yang Anda inginkan.
+    oauthorize_success: 
+      allowed: Anda telah memberikan aplikasi %{app_name} akses ke akun Anda.
+      verification: Kode verifikasi adalah %{code}.
     revoke: 
       flash: Anda telah menolak token untuk %(application}
   oauth_clients: 
@@ -1437,6 +1452,7 @@ id:
       button: Konfirmasi
       heading: Konfirmasi akun pengguna
       press confirm button: Tekan tombol konfirmasi di bawah ini untuk mengaktifkan akun Anda.
+      reconfirm_html: Jika Anda membutuhkan kami mengirimkan ulang surel konfirmasi, <a href="%{reconfirm}">klik di sini</a>.
       unknown token: Token tersebut tampaknya tidak ada.
     confirm_email: 
       button: Konfirmasi
@@ -1602,7 +1618,7 @@ id:
       deactivate_user: nonaktifkan pengguna ini
       delete_user: hapus pengguna ini
       description: Deskripsi
-      diary: catatan harian
+      diary: Catatan Harian
       edits: hasil edit
       email address: "Alamat email:"
       friends_changesets: Telusuri semua set perubahan yang dibuat oleh teman-teman
@@ -1616,10 +1632,10 @@ id:
       moderator_history: blok yang diberikan
       my comments: komentar saya
       my diary: catatan harian saya
-      my edits: hasil edit saya
+      my edits: Suntingan Saya
       my notes: Catatan peta saya
       my settings: pengaturan saya
-      my traces: trek saya
+      my traces: Pelacakan Saya
       nearby users: Pengguna lain terdekat
       nearby_changesets: Telusuri seluruh set perubahan oleh pengguna terdekat
       nearby_diaries: Telurusi seluruh entri catatan harian oleh pengguna terdekat
@@ -1755,3 +1771,14 @@ id:
       fail: Tidak dapat mencabut peran `%{role}' dari pengguna `%{name}'. Silahkan periksa bahwa pengguna dan perannya valid.
       heading: Konfirmasi pencabutan peran
       title: Konfirmasi pencabutan peran
+  welcome_page: 
+    basic_terms: 
+      node_html: Sebuah <strong>node</strong> adalah sebuah titik pada peta, seperti sebuah restoran tunggal atau sebuah pohon.
+      title: Istilah-Istilah Dasar untuk Pemetaan
+    introduction_html: Selamat datang di OpenStreetMap, peta dunia gratis dan dapat disunting. Kini setelah Anda mendaftar, Anda sudah siap untuk memulai pemetaan. Berikut ini adalah panduan cepat dengan hal-hal terpenting yang perlu Anda ketahui.
+    questions: 
+      title: Ada pertanyaan?
+    title: Selamat datang!
+    whats_on_the_map: 
+      off_html: Apa yang <em>tidak</em> termasuk adalah data pendapat seperti peringkat, fitur sejarah atau hipotesis, dan data dari sumber berhak cipta. Kecuali Anda mempunyai izin khusus, jangan menyalin dari peta online atau kertas.
+      on_html: OpenStreetMap adalah tempat untuk memetakan hal-hal, baik <em>nyata dan saat ini</em> - ini mencakup jutaan bangunan, jalan, dan rincian lainnya tentang tempat-tempat. Anda dapat memetakan fitur dunia-nyata apapun yang menarik untuk Anda.
diff --git a/config/locales/it.yml b/config/locales/it.yml
index c2950583f..8c08bff8c 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -9,6 +9,7 @@
 # Author: Davio
 # Author: Dieterdreist
 # Author: Efred
+# Author: Frammm
 # Author: Gianfranco
 # Author: Isiond
 # Author: Kaitu
@@ -379,9 +380,15 @@ it:
     title: Esporta
   fixthemap: 
     how_to_help: 
+      add_a_note: 
+        instructions_html: Basta cliccare <a class='icon note'></a> o la stessa icona visualizzata sulla mappa. Questo aggiungerà un marker alla mappa che puoi muovere trascinando. Aggiungi un messaggio, poi fai clic su Salva e altri mappers indagheranno.
       join_the_community: 
+        explanation_html: Se avete notato un problema fra i nostri dati della mappa, per esempio manca una strada o il tuo indirizzo, il modo migliore per procedere è quello di unirsi alla comunità di OpenStreetMap e aggiungere o riparare quel dato da te.
         title: Entra nella comunità
       title: Come aiutare
+    other_concerns: 
+      explanation_html: Se hai dubbi su come i nostri dati vengono utilizzati consulta la nostra <a href='/copyright'>pagina sulle licenze</a> per ulteriori informazioni legali, oppure contatta <a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>il gruppo di lavoro OSMF</a>.
+      title: Ulteriori dubbi
     title: Segnala un problema / Correggi la mappa
   geocoder: 
     description: 
@@ -958,7 +965,7 @@ it:
     notes: 
       new: 
         add: Aggiungi la nota
-        intro: Per migliorare la mappa, le informazioni che inserisci vengono mostrate agli altri mappatori. Sei pregato di essere il più possibile preciso e descrittivo nello spostare il puntatore sulla posizione corretta e nell'inserire la nota qui sotto.
+        intro: Ti sei accorto di un errore o di qualcosa che manca? Fallo sapere agli altri mappers così possono correggerlo. Sposta il puntatore nella posizione esatta e inserisci una nota per spiegare il problema. (Per favore non inserire le tue informazioni personali qui)
       show: 
         anonymous_warning: Questa nota include commenti da parte di utenti anonimi che devono essere verificati in modo indipendente.
         comment: Commenta
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index e2c5993f2..79db22cd1 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -14,6 +14,7 @@
 # Author: Nabetaro
 # Author: Nazotoko
 # Author: OKANO Takayoshi
+# Author: Rxy
 # Author: Schu
 # Author: Shirayuki
 # Author: Tombi-aburage
@@ -93,11 +94,11 @@ ja:
       relation_tag: リレーションのタグ
       session: セッション
       trace: トレース
-      tracepoint: トレース ポイント
+      tracepoint: トレースポイント
       tracetag: トレースのタグ
       user: ユーザー
       user_preference: ユーザー設定
-      user_token: ユーザーのトークン
+      user_token: ユーザートークン
       way: ウェイ
       way_node: ウェイのノード
       way_tag: ウェイのタグ
@@ -135,7 +136,7 @@ ja:
     created_by_html: "%{user}さんが<abbr title='%{title}'>%{time}前</abbr>に作成"
     created_html: <abbr title='%{title}'>%{time}前</abbr>に作成
     deleted_by_html: "%{user}さんが<abbr title='%{title}'>%{time}前</abbr>に削除"
-    download_xml: XML をダウンロード
+    download_xml: XMLをダウンロード
     edited_by_html: "%{user}さんが<abbr title='%{title}'>%{time}前</abbr>に編集"
     in_changeset: 変更セット
     location: "場所:"
@@ -419,9 +420,9 @@ ja:
       admin_levels: 
         level10: 街区境
         level2: 国境
-        level4: 道州境
+        level4: 都道府県・州境
         level5: 行政境界
-        level6: 都道府県境
+        level6: 郡境
         level8: 市区町村境
         level9: 村境
       prefix: 
@@ -1468,7 +1469,7 @@ ja:
       search_results: 検索結果
   time: 
     formats: 
-      friendly: "%Y年%B月%e日 %H:%M"
+      friendly: "%Y年%B%e日 %H:%M"
   trace: 
     create: 
       trace_uploaded: GPX ファイルをアップロードしました。データベースへの登録に多少時間がかかります。通常この作業は 30 分以内に完了し、それをお知らせするメールをお送りします。
@@ -1663,7 +1664,7 @@ ja:
     login: 
       account is suspended: 申し訳ありませんが、不審な活動のため、あなたのアカウントは一時停止されております。<br />本件についてご相談がある場合は <a href="%{webmaster}">ウェブマスター</a>にご連絡ください。
       account not active: 申し訳ありませんが、あなたのアカウントはまだ有効ではありません。<br />アカウント確認メール内のリンクをクリックするか、<a href="%{reconfirm}">新しい確認メールを要求</a>をしてください。
-      auth failure: 申し訳ありませんが、以下の理由によりログインできませんでした。
+      auth failure: 申し訳ありませんが、入力した情報でログインできませんでした。
       create account minute: アカウントを作成します。1分でできます。
       email or username: "メール アドレスまたはユーザー名:"
       heading: ログイン
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 180b28eee..dd5a13cc2 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -145,7 +145,7 @@ ko:
       closed_title: "해결된 참고 #%{note_name}"
       commented_by: "%{user} 사용자가 <abbr title='%{exact_time}'>%{when} 전</abbr>에 덧글을 남김"
       commented_by_anonymous: 익명이 <abbr title='%{exact_time}'>%{when} 전</abbr>에 덧글을 남김
-      description: "설명:"
+      description: 설명
       hidden_by: "%{user} 사용자가 <abbr title='%{exact_time}'>%{when} 전</abbr>에 숨김"
       hidden_title: "숨겨진 참고 #%{note_name}"
       new_note: 새 참고
@@ -184,7 +184,7 @@ ko:
         tag: "%{key}=%{value} 태그에 대한 위키 설명 문서"
       wikipedia_link: 위키백과의 %{page} 문서
     timeout: 
-      sorry: 죄송합니다, %{id} id와 %{type}에 대한 데이터를 얻는데 너무 오래 걸립니다.
+      sorry: 죄송합니다, %{id} id인 %{type}에 대한 데이터를 얻는데 너무 오래 걸립니다.
       type: 
         changeset: 바뀜집합
         node: 노드
@@ -211,9 +211,9 @@ ko:
       showing_page: 페이지 %{page}
     changesets: 
       area: 지역
-      comment: 설명
+      comment: 덧글
       id: ID
-      saved_at: 저장 시간
+      saved_at: 저장된 시간
       user: 사용자
     list: 
       empty: 찾은 바뀜집합이 없습니다.
@@ -249,7 +249,7 @@ ko:
         zero: 덧글 없음
       comment_link: 이 항목에 덧글 남기기
       confirm: 확인
-      edit_link: 이 항목 수정
+      edit_link: 이 항목 편집
       hide_link: 이 항목 숨기기
       posted_by: "%{link_user} 사용자가 %{language_link}로 %{created}에 게시함"
       reply_link: 이 항목에 답변하기
@@ -304,7 +304,7 @@ ko:
       title: "%{user}의 일기 | %{title}"
       user_title: "%{user}의 일기"
   editor: 
-    default: 기본 값 (현재 %{name})
+    default: 기본값 (현재 %{name})
     id: 
       description: iD (브라우저 내 편집기)
       name: iD
@@ -330,7 +330,7 @@ ko:
       latitude: "위도:"
       licence: 라이선스
       longitude: "경도:"
-      manually_select: 다른 지역 선택
+      manually_select: 수동으로 다른 지역 선택
       map_image: 지도 그림 (표준 레이어 보이기)
       max: 최대
       options: 설정
@@ -360,12 +360,16 @@ ko:
     title: 내보내기
   fixthemap: 
     how_to_help: 
+      add_a_note: 
+        instructions_html: "<a class='icon note'></a>나 보이는 지도에 같은 아이콘을 클릭하세요.\n끌어서 움직일 수 있는, 지도에 표시를 추가할 것입니다.\n메시지를 추가하고 나서, 저장을 클릭하면, 다른 매퍼가 조사할 것입니다."
       join_the_community: 
-        title: 이 공동체에 가입하기
+        explanation_html: "우리의 지도 데이터에, 예를 들어 도로가 없거나 여러분의 주소에 문제가 있음을 보았다면, 진행하는 가장 좋은 방법은\nOpenStreetMap 공동체에 가입하고 스스로 데이터를 추가하거나 고치는 것입니다."
+        title: 공동체에 가입하기
       title: 돕는 방법
     other_concerns: 
+      explanation_html: "우리의 데이터가 사용되는 방법이나 내용에 대한 문제가 있다면 더 많은 법률\n정보에 대한 우리의 <a href='/copyright'>저작권 문서</a>를 참조하거나 해당\n<a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF 작업 그룹</a>에 문의하시기 바랍니다."
       title: 기타 문제
-    title: 문제 보고/지도 수정
+    title: 문제 보고 / 지도 고치기
   geocoder: 
     description: 
       title: 
@@ -385,11 +389,11 @@ ko:
       south_west: 남서
       west: 서
     distance: 
-      one: 다음 1km
-      other: 다음 %{count}km
-      zero: 1km보다 가까움
+      one: 약 1km
+      other: 약 %{count}km
+      zero: 1km보다 적음
     results: 
-      more_results: 더 많은 결과 보기
+      more_results: 더 많은 결과
       no_results: 결과가 없습니다
     search: 
       title: 
@@ -648,7 +652,7 @@ ko:
           fitness_station: 피트니스 스테이션
           garden: 정원
           golf_course: 골프장
-          ice_rink: 아이스링크
+          ice_rink: 아이스 링크
           marina: 마리나
           miniature_golf: 미니어처 골프
           nature_reserve: 자연 보호구
@@ -865,7 +869,7 @@ ko:
           lean_to: 오두막
           motel: 모텔
           museum: 박물관
-          picnic_site: 피크닉 사이트
+          picnic_site: 피크닉장
           theme_park: 테마 파크
           valley: 골짜기
           viewpoint: 경승지
@@ -994,7 +998,7 @@ ko:
     home: 집 위치로 가기
     intro_2_create_account: 사용자 계정을 만드세요
     intro_header: OpenStreetMap에 오신 것을 환영합니다!
-    intro_text: OpenStreetMap은 여러분과 같은 사람이 만들고 자유롭게 오픈 라이선스에 따라 사용할 수 있는, 세계 지도입니다.
+    intro_text: OpenStreetMap은 여러분과 같은 사람들이 만들고 자유롭게 오픈 라이선스에 따라 사용할 수 있는, 세계 지도입니다.
     learn_more: 더 알아보기
     log_in: 로그인
     log_in_tooltip: 기존 계정으로 로그인
@@ -1063,7 +1067,7 @@ ko:
       deleted: 메시지가 삭제됨
     inbox: 
       date: 날짜
-      from: 보낸 사람
+      from: 보낸이
       messages: "%{new_messages}와 %{old_messages}가 있습니다"
       my_inbox: 내 받은 쪽지함
       new_messages: 
@@ -1110,15 +1114,15 @@ ko:
       people_mapping_nearby: 근처에 매핑한 사람
       subject: 제목
       title: 보낸 쪽지함
-      to: 받는 사람
+      to: 받는이
     read: 
       back: 뒤로
       date: 날짜
-      from: 보낸 사람
+      from: 보낸이
       reply_button: 답글
       subject: 제목
       title: 메시지 읽기
-      to: 받는 사람
+      to: 받는이
       unread_button: 읽지 않음으로 표시
       wrong_user: "'%{user}' 사용자로 로그인하고 있지만 읽기를 요청한 메시지가 해당 사용자에게 보내지지 않았습니다. 읽으려면 올바른 사용자로 로그인하세요."
     reply: 
@@ -1160,7 +1164,7 @@ ko:
     diary_comment_notification: 
       footer: "%{readurl}에서도 덧글을 확인할 수 있습니다. %{commenturl}에서 덧글을 남기거나 %{replyurl}에서 답글을 남길 수 있습니다."
       header: "%{from_user}님이 %{subject} 제목의 OpenStreetMap 일기 항목에 덧글을 남겼습니다:"
-      hi: "%{to_user}님 안녕하세요."
+      hi: 안녕하세요 %{to_user}님,
       subject: "[OpenStreetMap] %{user}님이 당신의 일기 항목에 덧글을 남겼습니다"
     email_confirm: 
       subject: "[OpenStreetMap] 이메일 주소 확인"
@@ -1175,7 +1179,7 @@ ko:
     friend_notification: 
       befriend_them: 또한 %{befriendurl}에서 친구로 추가할 수 있습니다.
       had_added_you: "%{user}님이 당신을 OpenStreetMap 친구로 추가했습니다."
-      see_their_profile: "%{userurl} 에서 프로필을 확인하고 원하면 친구로 등록할 수 있습니다."
+      see_their_profile: "%{userurl} 에서 그들의 프로필을 볼 수 있습니다."
       subject: "[OpenStreetMap] %{user}님이 당신을 친구로 추가했습니다"
     gpx_notification: 
       and_no_tags: 태그가 없습니다.
@@ -1204,7 +1208,7 @@ ko:
     message_notification: 
       footer_html: 또한 %{readurl}에서 메시지를 읽을 수 있고 %{replyurl}에서 회신할 수 있습니다.
       header: "%{from_user}님이 OpenStreetMap을 통해 %{subject} 제목으로 된 메시지를 보냈습니다:"
-      hi: "%{to_user}님 안녕하세요."
+      hi: 안녕하세요 %{to_user}님,
     note_comment_notification: 
       anonymous: 익명 사용자
       closed: 
@@ -1275,19 +1279,19 @@ ko:
       support_url: 지원 URL
       url: 주요 애플리케이션 URL
     index: 
-      application: 응용 프로그램 이름
+      application: 애플리케이션 이름
       issued_at: 발행
       list_tokens: "다음 토큰이 내 이름으로 애플리케이션에 발급했습니다:"
       my_apps: 내 클라이언트 애플리케이션
       my_tokens: 내 인증한 애플리케이션
       no_apps: "%{oauth} 표준을 사용하여 OpenStreetMap과 함께 사용하기 위해 등록할 애플리케이션이 있습니까? 이 서비스에 OAuth를 요청하기 전에 웹 애플리케이션을 등록해야 합니다."
       register_new: 내 애플리케이션 등록
-      registered_apps: "등록한 다음 클라이언트 응용 프로그램이 있습니다:"
+      registered_apps: "등록된 다음 클라이언트 애플리케이션이 있습니다:"
       revoke: 해제!
       title: 내 OAuth 자세한 정보
     new: 
       submit: 등록
-      title: 새 응용 프로그램 등록
+      title: 새 애플리케이션 등록
     not_found: 
       sorry: 죄송합니다, 해당 %{type}(을)를 찾을 수 없습니다.
     show: 
@@ -1478,14 +1482,14 @@ ko:
       map: 지도
       owner: "소유자:"
       points: "지점:"
-      save_button: 바뀐 사항 저장
+      save_button: 바뀜 저장
       start_coord: "시작 좌표:"
       tags: "태그:"
       tags_help: 쉼표로 구분
       title: "%{name} 경로 편집"
       uploaded_at: "올려짐:"
       visibility: "공개 여부:"
-      visibility_help: 이게 무슨 의미입니까?
+      visibility_help: 이게 무슨 뜻입니까?
     georss: 
       title: OpenStreetMap GPS 추적
     list: 
@@ -1526,7 +1530,7 @@ ko:
       upload_button: 올리기
       upload_gpx: "GPX 파일 올리기:"
       visibility: "공개 여부:"
-      visibility_help: 이게 무슨 의미입니까?
+      visibility_help: 이게 무슨 뜻입니까?
     trace_header: 
       see_all_traces: 모든 추적 보기
       see_your_traces: 내 추적 보기
@@ -1574,7 +1578,7 @@ ko:
         not yet agreed: 아직 새 기여자 약관에 동의하지 않았습니다.
         review link text: 검토할 사용자의 편의에 이 링크를 따르고 새 기여자 약관에 동의하세요.
       current email address: "현재 이메일 주소:"
-      delete image: 현재 이미지 제거
+      delete image: 현재 그림 제거
       email never displayed publicly: (절대 공개하지 않습니다)
       flash update success: 사용자 정보를 성공적으로 업데이트했습니다.
       flash update success confirm needed: 사용자 정보를 성공적으로 업데이트했습니다. 새 이메일 주소를 확인하기 위해 이메일을 확인하세요.
@@ -1584,7 +1588,7 @@ ko:
       home location: "집 위치:"
       image: "그림:"
       image size hint: (100x100 이하의 정사각형 그림이 최적)
-      keep image: 현재 이미지를 유지
+      keep image: 현재 그림 유지
       latitude: "위도:"
       longitude: "경도:"
       make edits public button: 내 편집을 공개하기
@@ -1603,15 +1607,15 @@ ko:
         disabled: 바활성화되어 데이터를 편집할 수 없으며, 모든 이전 편집은 익명으로 됩니다.
         disabled link text: 왜 편집할 수 없나요?
         enabled: 활성화했습니다. 익명이 아닌 사용자는 데이터를 편집할 수 있습니다.
-        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: 이게 뭐죠?
         heading: "공개 편집:"
       public editing note: 
         heading: 공개 편집
         text: 현재 편집은 익명이고 사람이 당신에게 메시지를 보내거나 위치를 볼 수 없습니다. 당신이 편집한 것으로 나타내고 사람이 웹 사이트를 통해 연락을 허용하려면 아래 버튼을 클릭하세요. <b>0.6 API 역전 이후 공개 새용자만 지도 데이터를 편집할 수 있습니다</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">이유 알아보기</a>).<ul><li>이메일 주소는 공개함으로서 추가로 공개하지 않습니다.</li><li>이 작업을 되돌릴 수 없고 모든 새 사용자는 지금 기본값으로 공개입니다.</li></ul>
-      replace image: 현재 이미지 대체
+      replace image: 현재 그림 바꾸기
       return to profile: 프로필로 돌아가기
-      save changes button: 바뀐 사항 저장
+      save changes button: 바뀜 저장
       title: 계정 편집
       update home location on click: 지도에서 클릭하면 집 위치로 업데이트할까요?
     confirm: 
@@ -1650,7 +1654,7 @@ ko:
     login: 
       account is suspended: 죄송합니다, 의심스러운 활동으로 인해 계정이 일시 중지되었습니다.<br />이 문제를 토론하려면 <a href="%{webmaster}">웹마스터</a>에게 문의하세요.
       account not active: 죄송합니다, 계정을 아직 활성화하지 않았습니다.<br />계정을 활성화하려면 계정 확인 이메일에 있는 링크를 사용하거나 <a href="%{reconfirm}">새 확인 이메일을 요청하세요</a>.
-      auth failure: 죄송합니다, 다음 이유로 로그인할 수 없습니다.
+      auth failure: 죄송합니다, 입력한 정보로 로그인할 수 없습니다.
       create account minute: 계정을 만듭니다. 1분도 걸리지 않습니다.
       email or username: "이메일 주소 또는 사용자 이름:"
       heading: 로그인
@@ -1709,7 +1713,7 @@ ko:
     new: 
       about: 
         header: 자유롭고 편집 가능
-        html: "<p>다른 지도와는 달리, OpenStreetMap은 완전히 여러분과 같은 사람이 만들고,\n누구나 자유롭게 고치고, 업데이트하고, 다운로드하고 사용할 수 있습니다.</p>\n<p>기여를 시작하려면 가입하세요. 계정을 확인하는 이메일을 보내드립니다.</p>"
+        html: "<p>다른 지도와는 달리, OpenStreetMap은 완전히 여러분과 같은 사람들이 만들고,\n누구나 자유롭게 고치고, 업데이트하고, 다운로드하고 사용할 수 있습니다.</p>\n<p>기여를 시작하려면 가입하세요. 계정을 확인하는 이메일을 보내드립니다.</p>"
       confirm email address: "이메일 주소 확인:"
       confirm password: "비밀번호 확인:"
       contact_webmaster: 계정을 만들 수 있도록 <a href="mailto:webmaster@openstreetmap.org">웹마스터</a>에게 문의하세요. 희망에 대응하기 위해 노력하고 가능한 빨리 요청을 처리합니다.
@@ -1767,7 +1771,7 @@ ko:
         france: 프랑스
         italy: 이탈리아
         rest_of_world: 나머지 국가
-      legale_select: "거주 국가를 선택하세요:"
+      legale_select: "거주 국가:"
       read and accept: 아래의 계약을 읽고 기존 및 앞으로의 기여가 계약 약관에 동의했는지 확인하려면 동의 버튼을 누르세요.
       title: 기여자 약관
       you need to accept or decline: 계속하려면 새 기여자 약관을 읽고 나서 동의나 거부하세요.
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 8fd2620a0..d068d497d 100644
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -532,6 +532,8 @@ lb:
     sent_message_summary: 
       delete_button: Läschen
   note: 
+    mine: 
+      description: Beschreiwung
     rss: 
       title: OpenStreetMap Notizen
   notifier: 
@@ -554,6 +556,7 @@ lb:
       footer_html: Dir kënnt de Message och op %{readurl} liesen an Dir kënnt op %{replyurl} äntwerten
       hi: Salut %{to_user},
     note_comment_notification: 
+      anonymous: En anonyme Benotzer
       greeting: Salut,
     signup_confirm: 
       greeting: Bonjour !
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index d4bc201ff..ad33851fe 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -33,7 +33,7 @@ lv:
         language: Valoda
         latitude: Platums
         longitude: Garums
-        title: Virsraksts
+        title: Temats
         user: Lietotājs
       friend: 
         friend: Draugs
@@ -42,7 +42,7 @@ lv:
         body: Teksts
         recipient: Saņēmējs
         sender: Sūtītājs
-        title: Nosaukums
+        title: Temats
       trace: 
         description: Apraksts
         latitude: Platums
@@ -148,7 +148,7 @@ lv:
       closed_title: "Atrisināta piezīme: #%{note_name}"
       commented_by: Komentārs no %{user} <abbr title='%{exact_time}'>%{when} atpakaļ</abbr>
       commented_by_anonymous: Komentārs no anonīma <abbr title='%{exact_time}'>%{when} atpakaļ</abbr>
-      description: "Apraksts:"
+      description: Apraksts
       hidden_by: Paslēpa %{user} <abbr title='%{exact_time}'>%{when} atpakaļ</abbr>
       hidden_title: "Paslēpta piezīme #%{note_name}"
       new_note: Jauna piezīme
@@ -361,6 +361,12 @@ lv:
           title: OSM Planēta
       zoom: Palielināt
     title: Eksportēt
+  fixthemap: 
+    how_to_help: 
+      join_the_community: 
+        title: Pievienojies kopienai
+      title: Kā palīdzēt
+    title: Ziņot par problēmu / Labot karti
   geocoder: 
     description: 
       title: 
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 71f4f3c33..d1dfdc373 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -74,7 +74,7 @@ mk:
       relation: Однос
       relation_member: Член на однос
       relation_tag: Ознака за однос
-      session: Сесија
+      session: Седница
       trace: Трага
       tracepoint: Точка на трага
       tracetag: Ознака за трага
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 6ca14f8ca..7c338ea2a 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -16,6 +16,7 @@
 # Author: 6400
 nb: 
   about_page: 
+    community_driven_title: Fellesskapsdrevet
     copyright_html: <span>&copy;</span>OpenStreetMap<br>bidragsytere
     lede_text: OpenStreetMap er bygd av et fellesskap av kartleggere som oppretter og vedlikeholder data om veier, stier, kafeer, jernbanestasjoner og diverse annet, over hele verdien.
     local_knowledge_html: OpenStreetMap understreker viktigheten av lokalkunnskap. Bidragsytere bruker flyfotografier, GPS-enheter og enkle feltkart for å gå god for at OSM er nøyaktig og oppdatert.
@@ -50,7 +51,7 @@ nb:
         user: Bruker
         visible: Synlig
       user: 
-        active: Aktive
+        active: Aktiv
         description: Beskrivelse
         display_name: Visningsnavn
         email: E-post
@@ -74,7 +75,7 @@ nb:
       old_relation: Gammel relasjon
       old_relation_member: Gammelt relasjonsmedlem
       old_relation_tag: Gammel relasjonsmerkelapp
-      old_way: Gammelvei
+      old_way: Gammel vei
       old_way_node: Gammel veinode
       old_way_tag: Gammel veimerkelapp
       relation: Relasjon
@@ -108,25 +109,25 @@ nb:
         title_comment: "Endringssett: %{id} - %{comment}"
       node: Noder (%{count})
       node_paginated: Noder (%{x}-%{y} av %{count})
-      osmchangexml: osmChange XML
+      osmchangexml: osmChange-XML
       relation: Forbindelser (%{count})
       relation_paginated: Forbindelser (%{x}-%{y} av %{count})
       title: "Endringssett: %{id}"
       way: Strekninger (%{count})
       way_paginated: Strekninger (%{x}-%{y} av %{count})
     closed: Lukket
-    closed_by_html: Lukket <abbr title='%{title}'>%{time} siden</abbr> av %{user}
-    closed_html: Lukket <abbr title='%{title}'>%{time} siden</abbr>
+    closed_by_html: Lukket for <abbr title='%{title}'>%{time} siden</abbr> av %{user}
+    closed_html: Lukket for <abbr title='%{title}'>%{time} siden</abbr>
     containing_relation: 
       entry: Relasjon %{relation_name}
       entry_role: Relasjon %{relation_name} (som %{relation_role})
     created: Opprettet
-    created_by_html: Opprettet <abbr title='%{title}'>%{time} siden</abbr> av %{user}
-    created_html: Opprettet <abbr title='%{title}'>%{time} siden</abbr>
-    deleted_by_html: Slettet <abbr title='%{title}'>%{time} siden</abbr> av %{user}
+    created_by_html: Opprettet for <abbr title='%{title}'>%{time} siden</abbr> av %{user}
+    created_html: Opprettet for <abbr title='%{title}'>%{time} siden</abbr>
+    deleted_by_html: Slettet for <abbr title='%{title}'>%{time} siden</abbr> av %{user}
     download_xml: Last ned XML
-    edited_by_html: Redigert <abbr title='%{title}'>%{time} siden</abbr> av %{user}
-    in_changeset: Endringer
+    edited_by_html: Redigert for <abbr title='%{title}'>%{time} siden</abbr> av %{user}
+    in_changeset: Endringssett
     location: "Posisjon:"
     no_comment: (ingen kommentar)
     node: 
@@ -145,7 +146,7 @@ nb:
       closed_title: "Avklart merknad: #%{note_name}"
       commented_by: Kommentar fra %{user} <abbr title='%{exact_time}'>%{when} siden</abbr>
       commented_by_anonymous: Kommentar fra anonym bruker <abbr title='%{exact_time}'>%{when} siden</abbr>
-      description: "Beskrivelse:"
+      description: Beskrivelse
       hidden_by: Skjult av %{user} <abbr title='%{exact_time}'>%{when} siden</abbr>
       hidden_title: "Skjult notis #%{note_name}"
       new_note: Ny notis
@@ -306,13 +307,13 @@ nb:
   editor: 
     default: Standard (nåværende %{name})
     id: 
-      description: iD (nettlesers egen editor)
+      description: iD (redigering i nettleseren)
       name: iD
     potlatch: 
-      description: Potlatch 1 (rediger i nettleseren)
+      description: Potlatch 1 (redigering i nettleseren)
       name: Potlatch 1
     potlatch2: 
-      description: Potlatch 2 (rediger i nettleseren)
+      description: Potlatch 2 (redigering i nettleseren)
       name: Potlatch 2
     remote: 
       description: Lokalt installert program (JOSM eller Merkaartor)
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index e10017dbd..6ba68fad6 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -80,6 +80,9 @@ oc:
       way: Camin
       way_node: Nosèl del camin
       way_tag: Balisa del camin
+  application: 
+    require_moderator: 
+      not_a_moderator: Vos cal èsser moderator per efectuar aquesta accion.
   browse: 
     anonymous: anonim
     changeset: 
@@ -140,7 +143,7 @@ oc:
     part_of: Partida de
     redacted: 
       message_html: La version %{version} d'aqueste(-a) %{type} pòt pas èsser afichada perque es estada amagada. Consultatz %{redaction_link} per mai d'informacions.
-      redaction: Amagatge %{id}
+      redaction: Redaccion %{id}
       type: 
         node: nosèl
         relation: relacion
@@ -880,11 +883,13 @@ oc:
           weir: Barratge
   help_page: 
     help: 
+      description: Pausar una question o cercar de responsas sul site questions-e-responsas d'OSM.
       title: help.openstreetmap.org
       url: https://help.openstreetmap.org/
     introduction: OpenStreetMap a mantuna ressorsas per aprene lo projècte, per pausar e respondre a de questions, e respondre a de questions, e per discutir en collaboracion amb d’autres e documentar los subjèctes de cartografia.
     title: Obténer d’ajuda
     welcome: 
+      description: Començar amb aqueste guida rapid que cobrís las basas d'OpenStreetMap.
       title: Benvenguda a OSM
       url: /welcome
     wiki: 
@@ -896,6 +901,7 @@ oc:
     key: 
       title: Legenda
       tooltip: Legenda
+      tooltip_disabled: La legenda es pas disponibla que pel jaç estandard
     map: 
       base: 
         cycle_map: Mapa ciclista
@@ -908,8 +914,10 @@ oc:
         data: Donadas de mapa
         header: Jaces de mapa
         notes: Nòtas de la mapa
+        overlays: Autorizar las superposicions per reparar la mapa
         title: Jaces
       locate: 
+        popup: Sètz a {distance} {unit} d'aqueste punt
         title: Afichar mon emplaçament
       zoom: 
         in: Zoom avant
@@ -1004,6 +1012,8 @@ oc:
         title: Exemple d'atribucion
       contributors_fr_html: "<strong>França</strong> : conten de donadas de la\n   <em>Direccion generala dels impòts</em>."
       contributors_title_html: Nòstres contributors
+      credit_1_html: Demandam que vòstre crèdit compòrta la mencion « © los contributors d’OpenStreetMap ».
+      credit_3_html: "Per una mapa electronica navigabla, lo crèdit deuriá aparéisser dins lo canton de la mapa.\nPer exemple :"
       credit_title_html: Cossí creditar OpenStreetMap
       infringement_title_html: Violacion dels dreches d'autor
       intro_1_html: "OpenStreetMap es un ensemble de <i>donadas dobèrtas</i>, disponiblas jos la licéncia <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data Commons Open Database License</a> (ODbL)."
@@ -1046,6 +1056,7 @@ oc:
     new: 
       back_to_inbox: Tornar a la bóstia de recepcion
       body: Còs
+      limit_exceeded: Avètz enviat tròp de messatges recentament, esperatz un moment abans d'ensajar de ne mandar de novèls.
       message_sent: Messatge mandat
       send_button: Mandar
       send_message_to: Mandar un messatge novèl a %{name}
@@ -1062,6 +1073,7 @@ oc:
         one: Avètz %{count} messatge mandat
         other: Avètz %{count} messatges mandats
       my_inbox: Ma %{inbox_link}
+      no_sent_messages: Avètz pas encara mandat cap de messatge. Perqué entrar pas en contacte amb qualques %{people_mapping_nearby_link} ?
       outbox: bóstia de mandadís
       people_mapping_nearby: personas pròcha de vos
       subject: Subjècte
@@ -1076,6 +1088,9 @@ oc:
       title: Legir lo messatge
       to: A
       unread_button: Marcar coma pas legit
+      wrong_user: Sètz identificat(-ada) coma « %{user} » mas lo messatge qu'ensajatz de legir es pas estat enviat a vos o a aqueste utilizaire. Connectatz-vos amb l'identificant corrècte per lo poder legir.
+    reply: 
+      wrong_user: Sètz identificat(-ada) coma « %{user} » mas lo messatge al qual volètz respondre es pas estat enviat a aqueste utilizaire. Connectatz-vos amb l'identificant corrècte per poder respondre.
     sent_message_summary: 
       delete_button: Suprimir
   note: 
@@ -1099,6 +1114,7 @@ oc:
       heading: Nòtas de %{user}
       id: Id
       last_changed: Darrièr cambiament
+      subheading: Nòtas somesas o comentadas per %{user}
       title: Nòtas somesas o comentadas per %{user}
     rss: 
       closed: nòta tampada (prèp de %{place})
@@ -1114,8 +1130,10 @@ oc:
     email_confirm: 
       subject: "[OpenStreetMap] Confirmacion de vòstra adreça de corrièr electronic"
     email_confirm_html: 
+      click_the_link: Se sètz vos, clicatz sul ligam çaijós per confirmar aquesta la modificacion.
       greeting: Bonjorn,
     email_confirm_plain: 
+      click_the_link: Se sètz a l'origina d'aquesta requèsta, clicatz sul ligam çaijós per confirmar aquesta modificacion.
       greeting: Bonjorn,
     friend_notification: 
       befriend_them: "Tanben, lo podètz apondre coma amic aicí : %{befriendurl}."
@@ -1132,25 +1150,42 @@ oc:
         subject: "[OpenStreetMap] Error al moment de l'impòrt GPX"
       greeting: Bonjorn,
       success: 
+        loaded_successfully: s'es cargat corrèctament amb %{trace_points} punts sus %{possible_points}.
         subject: "[OpenStreetMap] Impòrt GPX capitat"
       with_description: amb la descripcion
       your_gpx_file: Sembla que vòstre fichièr GPX
     lost_password: 
       subject: "[OpenStreetMap] Demanda de reïnicializacion del senhal"
     lost_password_html: 
+      click_the_link: Se sètz vos, clicatz sul ligam çaijós per reïnicializar vòstre senhal.
       greeting: Bonjorn,
     lost_password_plain: 
+      click_the_link: Se sètz a l'origina d'aquesta requèsta, clicatz sul ligam çaijós per reïnicializar vòstre senhal.
       greeting: Bonjorn,
     message_notification: 
+      footer_html: Podètz tanben legir lo messatge a %{readurl} e i podètz respondre a %{replyurl}
       hi: Bonjorn %{to_user},
     note_comment_notification: 
       anonymous: Un utilizaire anonim
+      closed: 
+        commented_note: "%{commenter} a resolgut una nòta de mapa qu'avètz comentada. La nòta es pròcha de %{place}."
+        subject_other: "[OpenStreetMap] %{commenter} que vis i interessàvetz."
+        subject_own: "[OpenStreetMap] %{commenter} a resolgut una de vòstras nòtas"
+        your_note: "[OpenStreetMap] %{commenter} a resolgut una de vòstras nòtas prèp de %{place}."
       commented: 
+        commented_note: "%{commenter} a daissat un comentari sus una de vòstras nòtas de mapa qu'avètz comentada. La nòta es pròcha de %{place}."
         subject_other: "[OpenStreetMap] %{commenter} a comentat una nòta a la quala vos interessatz"
         subject_own: "[OpenStreetMap] %{commenter} a comentat una de vòstras nòtas"
+        your_note: "%{commenter} a daissat un comentari sus una de vòstras nòtas de mapa prèp de %{place}."
       details: Mai de detalh sus la nòta pòt èsser obtengut a %{url}.
       greeting: Bonjorn,
+      reopened: 
+        commented_note: "%{commenter} a reactivat una nòta de mapa qu'avètz comentada. La nòta se tròba prèp de %{place}."
+        subject_other: "[OpenStreetMap] %{commenter} a reactivat una nòta a que vos i interessàvetz"
+        subject_own: "[OpenStreetMap] %{commenter} a reactivat una de vòstras nòtas"
+        your_note: "%{commenter} a reactivat una de vòstras nòtas de mapa prèp de %{place}."
     signup_confirm: 
+      created: Qualqu'un (vos, amb un pauc d'astre) ven juste de crear un compte sus %{site_url}.
       greeting: Bonjorn !
       subject: "[OpenStreetMap] Benvenguda dins OpenStreetMap"
   oauth: 
@@ -1165,9 +1200,11 @@ oc:
       allow_write_prefs: modificar vòstras preferéncias d'utilizaire.
       title: Autorizar l’accès a vòstre compte
     oauthorize_failure: 
+      denied: Avètz refusat a l’aplicacion %{app_name} l’accès a vòstre compte.
       invalid: Lo geton d’autorizacion es invalid.
       title: La demanda d’autorizacion a fracassat
     oauthorize_success: 
+      allowed: Avètz acordat a l’aplicacion %{app_name} l’accès a vòstre compte.
       title: La demanda d’autorizacion es estada acceptada
       verification: Lo còde de verificacion es %{code}.
     revoke: 
@@ -1197,6 +1234,7 @@ oc:
     index: 
       application: Nom de l'aplicacion
       issued_at: Emés lo
+      list_tokens: "Los getons seguents son estats emeses a las aplicacions en vòstre nom :"
       my_apps: Mas aplicacions clientas
       my_tokens: Mas aplicacions enregistradas
       register_new: Enregistratz vòstra aplicacion
@@ -1222,27 +1260,40 @@ oc:
       delete: Suprimir lo client
       edit: Modificar los detalhs
       key: "Clau de l'utilizaire :"
+      requests: "Demanda las permissions seguentas a l'utilizaire :"
       secret: "Secret de l'utilizaire :"
+      support_notice: Suportam las signaturas HMAC-SHA1 (recomandat) e RSA-SHA1.
       title: Detalhs OAuth per %{app_name}
       url: "URL del geton de requèsta :"
     update: 
       flash: Informacions del client enregistradas amb succès
   redaction: 
+    create: 
+      flash: Redaccion creada.
+    destroy: 
+      error: I a agut una error en suprimissent aquesta redaccion.
+      flash: Redaccion suprimida.
     edit: 
       description: Descripcion
       heading: Modificar la redaccion
-      submit: Enregistrar l'amagatge
+      submit: Enregistrar la redaccion
       title: Modificar la redaccion
     index: 
-      empty: Pas cap d'amagatge d'afichar.
+      empty: Pas cap de redaccion d'afichar.
       heading: Lista de redaccions
       title: Lista de redaccions
     new: 
       description: Descripcion
-      submit: Crear l'amagatge
+      heading: Picatz las informacions sus la novèla redaccion
+      submit: Crear la redaccion
+      title: Crear una redaccion novèla
     show: 
       confirm: Sètz segur ?
       description: "Descripcion :"
+      destroy: Suprimir aquesta redaccion
+      edit: Modificar aquesta redaccion
+      heading: Afichatge de la redaccion "%{title}"
+      title: Afichatge de la redaccion
       user: "Creator :"
     update: 
       flash: Modificacions enregistradas.
@@ -1251,9 +1302,13 @@ oc:
       anon_edits_link_text: Trobatz perqué aicí.
       id_not_configured: iD es pas estat configurat
       not_public: Avètz pas reglat vòstras modificacions per que sián publicas.
+      potlatch2_unsaved_changes: Avètz de modificacions pas salvadas. (Per salvar vòstras modificacions dins Potlach2, clicar sus "enregistrar".)
       user_page_link: pagina d'utilizaire
     index: 
       createnote: Apondre una nòta
+      js_2: OpenStreetMap utiliza Javascript per sas mapas lisantas.
+      license: 
+        copyright: Copyright OpenStreetMap e sos contributors, jos una licéncia dobèrta
       permalink: Ligam permanent
       shortlink: Ligam cort
     key: 
@@ -1391,6 +1446,7 @@ oc:
       made_public: Pista renduda publica
     offline: 
       heading: Emmagazinatge GPX fòra linha
+      message: Lo sistèma d'emmagazinatge GPX es actualament indisponible.
     offline_warning: 
       message: Lo sistèma de mandadís GPX es actualament indisponible
     trace: 
@@ -1449,12 +1505,15 @@ oc:
       visibility: "Visibilitat :"
     visibility: 
       private: Privat (partejat anonimament, punts pas ordenats)
+      public: Public (afichat dins la lista de las traças e anonim, punts pas ordenats)
+      trackable: Pistable (partejat unicament d'un biais anonim, punts ordenats amb las datas)
   user: 
     account: 
       contributor terms: 
         agreed: Avètz acceptat los novèls tèrmes del contributor.
         heading: "Tèrmes del contributor :"
         link text: qu’es aquò ?
+        not yet agreed: Avètz pas encara acceptat los novèls tèrmes del contributor.
       current email address: "Adreça de corrièr electronic actuala:"
       delete image: Suprimir l'imatge actual
       email never displayed publicly: (pas jamai afichat publicament)
@@ -1499,10 +1558,12 @@ oc:
       button: Confirmar
       heading: Verificatz vòstre corrièr electronic !
       introduction_1: Vos avèm mandat un corrièl de confirmacion.
+      press confirm button: Quichar lo boton confirmar çaijós per activar vòstre compte.
       unknown token: Lo còde de confirmacion a expirat o existís pas.
     confirm_email: 
       button: Confirmar
       heading: Confirmar lo cambiament de vòstra adreça e-mail
+      success: Adreça email confirmada, mercé de vos èsser enregistrat !
     confirm_resend: 
       failure: L’utilizaire %{name} es introbable.
     filter: 
@@ -1554,6 +1615,7 @@ oc:
       register now: S'inscriure ara
       remember: Se remembrar de ieu
       title: Se connectar
+      to make changes: Per aportar de modificacions a las donadas OpenStreetMap, vos cal possedir un compte.
       with openid: "Tanben podètz utilizar OpenID per vos connectar :"
     logout: 
       heading: Desconnexion d'OpenStreetMap
@@ -1580,6 +1642,7 @@ oc:
       contact_webmaster: Contactatz lo <a href='mailto:webmaster@openstreetmap.org'>webmaster</a> per que vos crèe un compte - ensajarem de tractar vòstra demanda lo mai rapidament possible.
       continue: S’inscriure
       display name: "Nom afichat :"
+      display name description: Vòstre nom d'utilizaire afichat publicament. Podètz cambiar aquò ulteriorament dins las preferéncias.
       email address: "Adreça de corrièr electronic :"
       openid: "%{logo} OpenID :"
       password: "Senhal :"
@@ -1666,6 +1729,7 @@ oc:
       nearby_diaries: Entradas de jornal dels utilizaires a proximitat
       new diary entry: novèla entrada dins lo jornal
       no friends: Avètz pas encara apondut cap d'amic
+      no nearby users: Cap d'utilizaire a pas encara senhalat que cartografiava a proximitat.
       notes: Nòtas de mapa
       oauth settings: paramètres OAuth
       remove as friend: Suprimir en tant qu'amic
@@ -1714,14 +1778,17 @@ oc:
       title: Blocatges utilizaire
     model: 
       non_moderator_revoke: Vos cal èsser moderator per revocar un blocatge.
+      non_moderator_update: Vos cal èsser moderator per crear o modificar un blocatge.
     new: 
       back: Veire totes los blocatges
       heading: Creat un blocatge sus %{name}
       reason: Rason per la quala %{name} es blocat. Mercé d'èsser tant suau e rasonable com possible, e de balhar tant de detalhs coma possible sus la situacion. Doblidetz pas qu'aqueste messatge serà visible per totes. Sapiatz que tot lo monde compren pas lo girgon de la comunautat, alara utilizatz de tèrmes simples e precises.
       submit: Crear un blòt
       title: Creat un blocatge sus %{name}
+      tried_contacting: Ai contactat l'utilizaire e li ai demandat d'arrestar.
     not_found: 
       back: Retorn a l'indèx
+      sorry: O planhèm, lo blocatge utilizaire numèro %{id}  es pas estat trobat.
     partial: 
       confirm: Sètz segur ?
       creator_name: Creator
@@ -1781,6 +1848,7 @@ oc:
     basic_terms: 
       editor_html: Un <strong>editor</strong> es un programa o site web que vos permet d'editar la mapa.
       node_html: Un <strong>nosèl</strong> es un punt sus la mapa, coma un restaurant o un arbre individual.
+      paragraph_1_html: OpenStreetMap a son pròpri girgon. Aquí qualques mots claus que vos seràn utiles.
       tag_html: "Un <strong>tag</strong> es una informacion a prepaus d'un nosèl o d'un camin, coma\nlo nom d'un restaurant o la velocitat limita d'una carrièra."
       title: Vocabulari de basa de cartografia
       way_html: "Un <strong>camin</strong es una linha o una susfàcia, coma per exemple una carrièra, un\nriu, un lac, o un bastiment."
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 68ca65283..c2247f60d 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -161,7 +161,7 @@ pl:
       closed_title: "Rozwiązana uwaga #%{note_name}"
       commented_by: Komentarz od %{user} <abbr title='%{exact_time}'>%{when} temu</abbr>
       commented_by_anonymous: Skomentowana anonimowo <abbr title='%{exact_time}'>%{when} temu</abbr>
-      description: "Opis:"
+      description: Opis
       hidden_by: Ukryte przez %{user} <abbr title='%{exact_time}'>%{when} temu</abbr>
       hidden_title: "Ukryta uwaga #%{note_name}"
       new_note: Nowa uwaga
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index adaa53a54..1ea20d030 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1,6 +1,7 @@
 # Messages for Brazilian Portuguese (português do Brasil)
 # Exported from translatewiki.net
 # Export driver: syck-pecl
+# Author: Amgauna
 # Author: BraulioBezerra
 # Author: Diego Queiroz
 # Author: Fmca
@@ -21,11 +22,17 @@
 # Author: 555
 pt-BR: 
   about_page: 
+    community_driven_html: "A comunidade do OpenStreetMap é diversa, apaixonada, e aumenta diariamente.\nEntre os nossos colaboradores encontra-se mapeadores entusiastas,\nprofissionais das áreas de sistemas geográficos, engenheiros que utilizam\nos servidores do OpenStreetMap, voluntários a mapear áreas afetadas\npor grandes desastres, e muitos mais.\nPara saber mais sobre a nossa comunidade, veja os <a href='%{diary_path}'>diários dos editores</a>,\n<a href='http://blogs.openstreetmap.org/'>blogues da comunidade</a>, e o site da <a href='http://www.osmfoundation.org/'>OSM Foundation</a>."
     community_driven_title: Dirigido pela comunidade
     copyright_html: <span>&copy;</span>Colaboradores<br>do OpenStreetMap
+    lede_text: O OpenStreetMap é desenvolvido por uma comunidade voluntária de mapeadores que contribuem e mantêm atualizados os dados sobre estradas, trilhos, cafés, estações ferroviárias e muito mais por todo o mundo.
+    local_knowledge_html: O OpenStreetMap valoriza o conhecimento local. Os colaboradores utilizam fotografias aéreas, dispositivos GPS, e mapas do terreno para verificar que a informação no OpenStreetMap é rigorosa e atualizada.
     local_knowledge_title: Conhecimento local
     next: Próximo
+    open_data_html: "O OpenStreetMap é constituído por <i>dados abertos</i>: qualquer\npessoa tem a liberdade de usar os dados para qualquer fim desde\ncredite a autoria do OpenStreetMap e os seus colaboradores.\nSe você alterar os dados ou criar algo com os dados, pode distribuir\no produto resultante apenas sob a mesma licença. Consulte <a href='%{copyright_path}'>a página sobre direitos de autor e licenciamento</a> para mais informações."
+    open_data_title: Data de Abertura
     partners_title: Parceiros
+    used_by: O %{name} fornece dados a centenas de sites na internet, aplicações de celular e outros dispositivos
   activerecord: 
     attributes: 
       diary_comment: 
@@ -149,7 +156,7 @@ pt-BR:
       closed_title: "Nota resolvida #%{note_name}"
       commented_by: Comentado por %{user} há <abbr title='%{exact_time}'>%{when} atrás</abbr>
       commented_by_anonymous: Comentado por um usuário anônimo há <abbr title='%{exact_time}'>%{when} atrás</abbr>
-      description: "Descrição:"
+      description: Descrição
       hidden_by: Ocultado por %{user} há <abbr title='%{exact_time}'>%{when} atrás</abbr>
       hidden_title: "Nota oculta #%{note_name}"
       new_note: Nova nota
@@ -185,7 +192,7 @@ pt-BR:
     tag_details: 
       tags: Etiquetas
       wiki_link: 
-        key: A página no wiki com a descrição da etiqueta %{key}
+        key: A página no wiki com a descrição da chave %{key}
         tag: A página no wiki com a descrição da etiqueta %{key}=%{value}
       wikipedia_link: O artigo %{page} na Wikipedia
     timeout: 
@@ -225,6 +232,9 @@ pt-BR:
       empty_area: Nenhum conjunto de alterações nesta área.
       empty_user: Nenhum conjunto de alterações por este usuário.
       load_more: Carregar mais
+      no_more: Nenhum conjunto de alterações foi encontrado.
+      no_more_area: Não há mais conjunto de alterações nesta área.
+      no_more_user: Não há mais conjunto de alterações para este usuário.
       title: Conjuntos de alterações
       title_friend: Conjuntos de alterações dos seus amigos
       title_nearby: Conjuntos de alterações de usuários próximos
@@ -352,6 +362,9 @@ pt-BR:
         other: 
           description: Fontes adicionais listadas na wiki do OpenStreetMap
           title: Outras fontes
+        overpass: 
+          description: Fazer o download desta caixa delimitadora através de um espelho do banco de dados do OpenStreetMap
+          title: Overpass API
         planet: 
           description: Cópias regularmente atualizadas da base de dados completa do OpenStreetMap
           title: Planeta OSM
@@ -359,9 +372,15 @@ pt-BR:
     title: Exportar
   fixthemap: 
     how_to_help: 
+      add_a_note: 
+        instructions_html: "Apenas clique em <a class='icon note'></a> ou no mesmo ícone na interface do mapa.\nIsto irá adicionar um marcador ao mapa, o qual pode mover arrastando. Adicione a sua mensagem, clique em salvar, e outros utilizadores como você irão investigar."
       join_the_community: 
+        explanation_html: Se você reparou num problema com os dados do nosso mapa, como por exemplo uma estrada ou o seu adereço em falta, a melhor maneira de proceder é juntando-se à comunidade do OpenStreetMap e adicionando ou reparando os dados por si mesmo.
         title: Junte-se à comunidade
       title: Como ajudar
+    other_concerns: 
+      explanation_html: Se você tem preocupações sobre o modo como os nossos dados estão a ser usados ou sobre os conteúdos, por favor consulte a nossa <a href='/copyright'>página de direitos de autor</a> para mais informações legais, ou contacte o <a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>grupo de trabalho OSMF</a> apropriado.
+      title: Outras preocupações
     title: Reportar um problema / Corrigir o mapa
   geocoder: 
     description: 
@@ -596,6 +615,7 @@ pt-BR:
           monument: Monumento
           museum: Museu
           ruins: Ruínas
+          tomb: Tumba
           tower: Torre histórica
           wayside_cross: Cruz de beira-de-estrada
           wayside_shrine: Túmulo de beira-de-estrada
@@ -894,14 +914,19 @@ pt-BR:
       prefix_format: "%{name}"
   help_page: 
     help: 
+      description: Faça uma pergunta ou procure por respostas no fórum de perguntas e respostas do OpenStreetMap.
       title: help.openstreetmap.org
+      url: http://help.openstreetmap.org/
+    introduction: O OpenStreetMap tem vários recursos para saber mais sobre o projeto, perguntar e responder a questões, e colaborativamente discutir e documentar vários tópicos sobre o mapa.
+    title: Obtendo Ajuda
     welcome: 
+      description: Comece por este guia rápido sobre os princípios básicos do OpenStreetMap.
       title: Bem vindo ao OSM
       url: /welcome
     wiki: 
       description: Navegue na wiki para ver a documentação do OSM com mais detalhes.
       title: wiki.openstreetmap.org/Pt-br:Main_Page
-      url: http://wiki.openstreetmap.org/wiki/Pt-br:Main_Page
+      url: http://wiki.openstreetmap.org/wiki/Pt-br:Main_Page?setlang=pt
   html: 
     dir: ltr
   javascripts: 
@@ -942,7 +967,7 @@ pt-BR:
         comment_and_resolve: Comentar e resolver
         hide: Esconder
         reactivate: Reativar
-        resolve: Resolver
+        resolve: Marcar como Resolvido
     share: 
       cancel: Cancelar
       center_marker: Centralizar o mapa no marcador
@@ -966,6 +991,8 @@ pt-BR:
       createnote_tooltip: Adicionar uma nota ao mapa
       edit_disabled_tooltip: Aumente o zoom para editar o mapa
       edit_tooltip: Edite o mapa
+      map_data_zoom_in_tooltip: Zoom para ver dados do mapa
+      map_notes_zoom_in_tooltip: Zoom para ver notas no mapa
   layouts: 
     about: Sobre
     community: Comunidade
@@ -1025,7 +1052,8 @@ pt-BR:
         title: Exemplo de atribuição
       contributors_at_html: "<strong>Áustria</strong>: Contém dados de \n   <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> (sob licença\n   <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.pt_BR\">CC BY</a>), \n<a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg</a> e \nLand Tirol (sob a licença <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT com emendas</a>)."
       contributors_ca_html: "<strong>Canadá</strong>: Contém dados do\n   GeoBase&reg;, GeoGratis (&copy; Departamento de Recursos\n   Naturais do Canadá), CanVec (&copy; Departamento de Recursos\n   Naturais do Canadá), and StatCan (Divisão de Geografia e \n   Estatística do Canada)."
-      contributors_footer_1_html: "  A inclusão de dados no OpenStreetMap não implica em endosso do provedor dos dados \n  ao OpenStreetMap, nem em qualquer garantia, ou\n  aceitação de qualquer responsabilidade."
+      contributors_fi_html: "<strong>Finlândia</strong>: Dados do Continente do National Land Survey da Finland´s Topographic Database\ne outras bases de dados, em <a href=\"http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501\">NLSFI Licença</a>."
+      contributors_footer_1_html: Para mais informações sobre estas e outras fontes utilizadas para melhorar o OpenStreetMap, consulte a <a href="http://wiki.openstreetmap.org/wiki/Contributors?setlang=pt">página de contribuidores</a> (em inglês) no wiki do OpenStreetMap.
       contributors_footer_2_html: "A inclusão de dados no OpenStreetMap não implica que fornecedor \noriginal apoie o OpenStreetMap, ou dê qualquer garantia, ou \naceite qualquer responsabilidade."
       contributors_fr_html: "<strong>França</strong>: Contém dados da\n   Direction Générale des Impôts."
       contributors_gb_html: "<strong>Reino Unido</strong>: Contém dados da Ordnance\n   Survey &copy; Crown copyright e direitos da base de dados 2010."
@@ -1044,8 +1072,8 @@ pt-BR:
       intro_1_html: "O OpenStreetMap possui <i>dados abertos</i>, licenciados sob a <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
       intro_2_html: "Você é livre para copiar, distribuir, transmitir e adaptar nossos dados,\ndesde que você referencie o OpenStreetMap e seus \ncontribuidores. Se você alterar ou inovar a partir de nossos mapas, você\ndeve distribuir o resultado somente sob a mesma licença. O\n<a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">texto\nlegal</a> completo explica seus direitos e responsabilidades."
       intro_3_html: "Nosso acervo cartográfico, bem como nossa documentação, são\nlicenciados sob a licença <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons Atribuição – Compartilhamento pela mesma Licença 2.0</a> (CC-BY-SA)."
-      more_1_html: "Leia mais sobre o uso de nossos dados, e como nos dar crédito, em <a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Legal\nFAQ</a>."
-      more_2_html: "  Embora o OpenStreetMap tenha dados abertos, nós não podemos prover uma\n  API de mapas livre de encargos para desenvolvedores de terceiros.\n\n  Veja nossa <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Política de uso da API</a>,\n  <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Política de Uso de Imagens</a>\n  e <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Política de Uso do Nominatim</a>."
+      more_1_html: "Leia mais sobre o uso de nossos dados, e como nos dar crédito, em <a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ?setlang=pt\">Legal\nFAQ</a>."
+      more_2_html: "  Embora o OpenStreetMap tenha dados abertos, nós não podemos prover uma\n  API de mapas livre de encargos para desenvolvedores de terceiros.\n\n  Veja nossa <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Política de uso da API</a>,\n  <a href=\"http://wiki.openstreetmap.org/wiki/Pt-br:Tile_usage_policy\">Política de Uso de Imagens</a>\n  e <a href=\"http://wiki.openstreetmap.org/wiki/Pt-br:Nominatim#Pol.C3.ADtica_de_uso\">Política de Uso do Nominatim</a>."
       more_title_html: Descobrir mais
       title_html: Direitos Autorais e Licença
     native: 
@@ -1240,8 +1268,12 @@ pt-BR:
       request_access: A aplicação %{app_name} está pedindo acesso à sua conta, %{user}. Por favor verifique se você deseja que a aplicação tenha as capacidades a seguir. Você pode escolher quaisquer que quiser.
       title: Autorizar acesso à sua conta
     oauthorize_failure: 
+      denied: Anulou o acesso do programa %{app_name} à sua conta.
+      invalid: O token de autorização não é válido.
       title: O pedido de autorização falhou
     oauthorize_success: 
+      allowed: Forneceu ao programa %{app_name} o acesso à sua conta.
+      title: Pedido de autorização permitido
       verification: O código de verificação é %{code}.
     revoke: 
       flash: Você cancelou o token para %{application}
@@ -1341,7 +1373,7 @@ pt-BR:
     edit: 
       anon_edits: (%{link})
       anon_edits_link_text: Descubra se é esse o seu caso.
-      flash_player_required: Você precisa de um tocador Flash para usar o Potlatch, o editor Flash do OpenStreetMap. Você pode <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">baixar o Flash Player da Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Pt-br:Editing">Outras opções</a> estão disponíveis para editar o OpenStreetMap.
+      flash_player_required: Você precisa de um tocador Flash para usar o Potlatch, o editor Flash do OpenStreetMap. Você pode <a href="http://get.adobe.com/br/flashplayer/">baixar o Flash Player da Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Pt-br:Editing?setlang=pt">Outras opções</a> estão disponíveis para editar o OpenStreetMap.
       id_not_configured: iD não foi configurado
       no_iframe_support: Seu navegador não suporta iframes HTML, que são necessários para que esse recurso.
       not_public: Você não configurou suas edições para serem públicas.
@@ -1461,6 +1493,9 @@ pt-BR:
     delete: 
       scheduled_for_deletion: Trilha marcada para ser apagada
     description: 
+      description_with_count: 
+        one: Ficheiro GPX com %{count} ponto de %{user}
+        other: Ficheiro GPX com %{count} pontos de %{user}
       description_without_count: Arquivo GPX de %{user}
     edit: 
       description: "Descrição:"
@@ -1484,7 +1519,7 @@ pt-BR:
       title: Trilhas de GPS do OpenStreetMap
     list: 
       description: Consultar últimos carregamentos de trilhas de GPS
-      empty_html: Nada aqui por enquanto. <a href='%{upload_link}'>Carregue uma nova trilha</a> ou aprenda mais sobre trilhas de GPS na <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>página wiki</a> (em inglês).
+      empty_html: Nada aqui por enquanto. <a href='%{upload_link}'>Carregue uma nova trilha</a> ou aprenda mais sobre trilhas de GPS na <a href='http://wiki.openstreetmap.org/wiki/Pt-br:Beginners_Guide_1.2?setlang=pt'>página wiki</a> (em inglês).
       public_traces: Trilhas Públicas de GPS
       public_traces_from: Trilhas de GPS públicas de %{user}
       tagged_with: " etiquetadas com %{tags}"
@@ -1597,7 +1632,7 @@ pt-BR:
         disabled: Desativado e não pode editar dados, todas as edições anteriores são anônimas.
         disabled link text: porque não posso editar?
         enabled: Ativado. Não é permitido edição anônima.
-        enabled link: http://wiki.openstreetmap.org/wiki/Pt-br:Disabling_anonymous_edits
+        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits?setlang=pt
         enabled link text: o que é isso?
         heading: "Edição pública:"
       public editing note: 
@@ -1843,7 +1878,7 @@ pt-BR:
       title: Bloqueios em %{name}
     create: 
       flash: Bloquear o usuário %{name}.
-      try_contacting: Por favor, tente contactar o usuário e dê a ele um tempo razoável antes de bloqueá-lo
+      try_contacting: Por favor, tente contatar o usuário e dê a ele um tempo razoável antes de bloqueá-lo.
       try_waiting: Por favor, tente dar ao usuário um tempo razoável para responder antes de bloqueá-lo.
     edit: 
       back: Ver todos bloqueios
@@ -1955,7 +1990,7 @@ pt-BR:
       way_html: Um <strong>caminho</strong> é uma linha ou área, como uma estrada, córrego, lago ou edifício.
     introduction_html: Bem vindo ao OpenStreetMap, o mapa livre e editável do mundo. Agora que você se inscreveu, você está pronto para começar a mapear. Aqui está um guia rápido com as coisas mais importantes que você precisa saber.
     questions: 
-      paragraph_1_html: Precisa de ajuda para mapear, ou não está claro como usar o OpenStreetMap? Tenha suas perguntas respondidas no <a href='http://help.openstreetmap.org/'>website de ajuda</a>.
+      paragraph_1_html: "O OpenStreetMap tem vários recursos para saber mais sobre o projeto, perguntar e responder a questões, e colaborativamente discutir e documentar vários tópicos sobre o mapa.\n<a href='%{help_url}'>Obtenha ajuda aqui</a>"
       title: Alguma pergunta?
     start_mapping: Iniciando Mapeamento
     title: Bem-vindo(a)!
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 0d41c89f1..32ee10e61 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -14,7 +14,7 @@ ro:
         language: Limbă
         latitude: Latitudine
         longitude: Longitudine
-        title: Titlu
+        title: Subiect
         user: Utilizator
       friend: 
         friend: Prieten
@@ -23,7 +23,7 @@ ro:
         body: Corp
         recipient: Destinatar
         sender: Expeditor
-        title: Titlu
+        title: Subiect
       trace: 
         description: Descriere
         latitude: Latitudine
@@ -74,23 +74,31 @@ ro:
       way_node: Nod cale
       way_tag: Etichetă cale
   browse: 
+    anonymous: anonim
     changeset: 
+      belongs_to: Autor
       changesetxml: Set de modificări XML
       feed: 
         title: "Set de modificări: %{id}"
         title_comment: Set de modificări %{id} — %{comment}
+      node: Noduri (%{count})
+      node_paginated: Noduri (%{x}-%{y} din %{count})
       osmchangexml: XML osmChange
-      title: Set de modificări
+      title: "Set de modificări: %{id}"
     containing_relation: 
       entry: Relația %{relation_name}
       entry_role: Relația %{relation_name} (ca %{relation_role})
+    in_changeset: Set de modificări
+    no_comment: (niciun comentariu)
     not_found: 
-      sorry: Ne pare rău, dar %{type} cu identificatorul %{id} nu a fost găsit.
+      sorry: "Ne pare rău, dar %{type} #%{id} nu s-a putut găsi."
       type: 
         changeset: set de modificări
         node: nod
         relation: relație
         way: drum
+    note: 
+      title: "Notă: %{id}"
     redacted: 
       message_html: Nu se poate afișa versiunea %{version} a acestui/acestei %{type} pentru că a fost redactată. Vă rugăm să consultați %{redaction_link} pentru detalii.
       redaction: Redactarea %{id}
@@ -108,7 +116,7 @@ ro:
       load_data: Încărcare date
       loading: Se încarcă...
     tag_details: 
-      tags: "Etichete:"
+      tags: Etichete
       wiki_link: 
         key: Pagina de pe wiki pentru tagul %{key}
         tag: Pagina de pe wiki pentru tagul %{key}=%{value}
@@ -120,6 +128,9 @@ ro:
         node: nodul
         relation: relația
         way: calea
+    version: Versiune
+    way: 
+      nodes: Noduri
   changeset: 
     changeset: 
       anonymous: Anonim
@@ -128,7 +139,7 @@ ro:
     changeset_paging_nav: 
       next: Următoarea »
       previous: « Precedenta
-      showing_page: Se afișează pagina %{page}
+      showing_page: Pagina %{page}
     changesets: 
       area: Zonă
       comment: Comentariu
@@ -136,6 +147,13 @@ ro:
       saved_at: Salvat la
       user: Utilizator
     list: 
+      empty: Niciun set de modificări găsit.
+      empty_area: Niciun set de modificări în această zonă.
+      empty_user: Niciun set de modificări de la acest utilizator.
+      load_more: Încarcă mai multe
+      no_more: Nu s-au mai găsit seturi de modificări.
+      no_more_area: Nu s-au mai găsit seturi de modificări în această zonă.
+      no_more_user: Nu s-au mai găsit seturi de modificări de la acest utilizator.
       title: Set de modificări
       title_friend: Seturi de modificări de la prietenii dv.
       title_nearby: Modificări de la utilizatori din apropiere
@@ -157,8 +175,9 @@ ro:
       hide_link: Ascunde acest comentariu
     diary_entry: 
       comment_count: 
-        one: un comentariu
+        one: "%{count} comentariu"
         other: "%{count} comentarii"
+        zero: niciun comentariu
       comment_link: Comentează la această înregistrare
       confirm: Confirmă
       edit_link: Editează această înregistrare
@@ -193,7 +212,7 @@ ro:
       newer_entries: Înregistrări mai noi
       no_entries: Nu există înregistrări în jurnal
       older_entries: Înregistrări mai vechi
-      recent_entries: "Înregistrări recente din jurnal:"
+      recent_entries: Înregistrări recente din jurnal
       title: Jurnalele utilizatorilor
       title_friends: Jurnalele prietenilor
       title_nearby: Jurnalele utilizatorilor aflați în apropiere
@@ -243,6 +262,11 @@ ro:
       output: Date de ieșire
       scale: Scară
       zoom: Zoom
+    title: Exportare
+  fixthemap: 
+    how_to_help: 
+      join_the_community: 
+        title: Alăturați-vă comunității
   geocoder: 
     description: 
       types: 
@@ -629,24 +653,38 @@ ro:
           waterfall: Cascadă
           weir: Stăvilar
   layouts: 
-    copyright: Drepturi de autor și licență
+    about: Despre
+    community: Comunitate
+    community_blogs: Bloguri ale comunității
+    community_blogs_title: Bloguri ale membrilor comunității OpenStreetMap
+    copyright: Drepturi de autor
     edit: Modificare
     edit_with: Modificare cu %{editor}
+    foundation: Fundația
+    foundation_title: Fundația OpenStreetMap
     help: Ajutor
     history: Istoric
     home: acasă
-    log_in: autentificare
+    learn_more: Aflați mai multe
+    log_in: Autentificare
     log_in_tooltip: Autentificare cu un cont existent
     logo: 
       alt_text: Logoul OpenStreetMap
-    logout: închide sesiunea
+    logout: Închide sesiunea
     make_a_donation: 
       text: Faceți o donație
-    sign_up: înregistrare
+      title: Sprijiniți OpenStreetMap printr-o donație în bani
+    more: Mai multe
+    partners_partners: parteneri
+    sign_up: Înregistrare
     sign_up_tooltip: Creați un cont pentru editare
+    start_mapping: Start la cartografiere
   license_page: 
     foreign: 
       title: Despre această traducere
+    legal_babble: 
+      infringement_title_html: Încălcarea drepturilor de autor
+      title_html: Drepturi de autor și licență
     native: 
       title: Despre această pagină
   message: 
@@ -727,3 +765,7 @@ ro:
       flash changed: Parola dumneavoastră a fost schimbată.
       password: "Parola:"
       reset: Resetează parola
+  welcome_page: 
+    questions: 
+      title: Întrebări?
+    title: Bun venit!
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index b04969c9b..091c36a23 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -135,7 +135,7 @@ sk:
         way: cesta
     note: 
       closed_title: "Vyriešená chyba #%{note_name}"
-      description: "Popis:"
+      description: Popis
       new_note: Nová poznámka
       open_title: "Nevyriešená chyba #%{note_name}"
       title: "Poznámka: %{id}"
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 78e7831e9..c09fb475c 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1497,7 +1497,7 @@ sl:
       current email address: "E-poštni naslov:"
       delete image: Odstrani trenutno sliko
       email never displayed publicly: (nikoli javno objavljen)
-      flash update success: Podatki o uporabniku so bili uspešno posodobljeni.
+      flash update success: Podatki o uporabniku so uspešno posodobljeni.
       flash update success confirm needed: Podatki o uporabniku so bili uspešno posodobljeni. Preverite svojo e-pošto in potrdite spremembo e-poštnega naslova.
       gravatar: 
         gravatar: Uporabi Gravatar
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index f32646533..2256ded53 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1055,7 +1055,7 @@ sv:
       attribution_example: 
         alt: Exempel på hur en webbsida kan ange OpenStreetMap som källa
         title: Exempel på källhänvisning.
-      contributors_at_html: "<strong>Österrike</strong>: Innehåller data från\n<a href=\"http://data.wien.gv.at/\">Stadt Wien</a> (under licensen\n<a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>),\n<a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg</a> och\nLand Tirol (under licensen <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT med ändringar</a>)."
+      contributors_at_html: "<strong>Österrike</strong>: Innehåller data från\n<a href=\"http://data.wien.gv.at/\">Stadt Wien</a> (under licensen\n<a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>),\n<a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg</a> och\nLand Tirol (under licensen <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC BY AT med ändringar</a>)."
       contributors_ca_html: "<strong>Kanada</strong>: Innehåller data från\n   GeoBase&reg;, GeoGratis (&copy; Department of Natural\n   Resources Canada), CanVec (&copy; Department of Natural\n   Resources Canada), och StatCan (Geography Division,\n   Statistics Canada)."
       contributors_fi_html: "<strong>Finland</strong>: Innehåller data från Lantmäteriverket i Finlands topografiska databas och andra dataset, under licensen <a href=\"http://www.maanmittauslaitos.fi/sv/Licens_till_avgiftsfria_datamaterial_version1_20120501\">NLSFI</a>."
       contributors_footer_1_html: "För ytterligare detaljer om dessa och andra källor som använts\nför att förbättra OpenStreetMap, se <a\nhref=\"http://wiki.openstreetmap.org/wiki/Contributors\">sidan om bidragsgivare</a>\npå OpenStreetMaps wiki."
@@ -1068,7 +1068,7 @@ sv:
       contributors_title_html: Våra bidragsgivare
       contributors_za_html: "<strong>Sydafrika</strong>: Innehåller data från\n<a href=\"http://www.ngi.gov.za/\">Chief Directorate:\nNational Geo-Spatial Information</a>, State copyright reserved."
       credit_1_html: "Vi kräver att din källhänvisning består av &ldquo;&copy; OpenStreetMaps\nbidragsgivare&rdquo;."
-      credit_2_html: "Du måste också göra klart att datan är tillgänglig under licensen\nOpen Database License, och om du använder våra kartrutor, att kartografin är\ntillgänglig under licensen CC-BY-SA. Du kan göra detta genom att länka till\n<a href=\"http://www.openstreetmap.org/copyright\">denna sida om upphovsrätt</a>.\nAlternativt, och som krav om du distribuerar OSM i dataform, kan du namnge\noch länka direkt till licenserna. I media där länkar ej är möjliga\n(t.ex. tryckt material), förslår vi att du hänvisar dina läsare till openstreetmap.org\n(förslagsvis genom att expandera 'OpenStreetMap' till hela denna adress), till opendatacommons.org, och om relevant till creativecommons.org."
+      credit_2_html: "Du måste också göra klart att datan är tillgänglig under licensen\nOpen Database License, och om du använder våra kartrutor, att kartografin är\ntillgänglig under licensen CC BY-SA. Du kan göra detta genom att länka till\n<a href=\"http://www.openstreetmap.org/copyright\">denna sida om upphovsrätt</a>.\nAlternativt, och som krav om du distribuerar OSM i dataform, kan du namnge\noch länka direkt till licenserna. I media där länkar ej är möjliga\n(t.ex. tryckt material), förslår vi att du hänvisar dina läsare till openstreetmap.org\n(förslagsvis genom att expandera 'OpenStreetMap' till hela denna adress), till opendatacommons.org, och om relevant till creativecommons.org."
       credit_3_html: "För en navigerbar elektronisk karta, ska källhänvisningen synas i ena hörnet av kartan.\nTill exempel:"
       credit_title_html: Hur du anger OpenStreetMap som källa
       infringement_1_html: "Bidragsgivare till OSM påminns om att aldrig lägga till data från\nupphovsrättsskyddade källor (t.ex. Google Maps och tryckta kartor) utan\nuttryckligt tillstånd från upphovsrättsinnehavarna."
@@ -1076,7 +1076,7 @@ sv:
       infringement_title_html: Upphovsrättsintrång
       intro_1_html: "OpenStreetMap är <i>öppen data</i>, gjord tillgänglig under licensen <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
       intro_2_html: "Du är fri att kopiera, distribuera, överföra och anpassa vår data,\nså länge du anger OpenStreetMap och dess bidragsgivare som källa.\nOm du ändrar eller bygger vidare på vår data kan du\nendast distribuera resultatet under samma licens. Den\nfullständiga <a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">juridiska\ntexten</a> förklarar dina rättigheter och skyldigheter."
-      intro_3_html: "Kartografin i våra kartrutor, och vår dokumentation, är\ntillgängliga under licensen <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons Attribution-ShareAlike 2.0</a> (CC-BY-SA)."
+      intro_3_html: "Kartografin i våra kartrutor, och vår dokumentation, är\ntillgängliga under licensen <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons Attribution-ShareAlike 2.0</a> (CC BY-SA)."
       more_1_html: "Läs mer om användning av vår data, och hur du anger oss som källa, på vår <a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">juridiska\nFAQ</a>."
       more_2_html: "Även om OpenStreetMap är öppen data, kan vi inte tillhandahålla något gratis kart-API för tredjepartsutvecklare.\nSe vår <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">användningspolicy för API</a>,\n<a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">användningspolicy för kartrutor</a>\noch <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">användningspolicy för Nominatim</a>."
       more_title_html: Mer information
diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index c28fa4963..b19dfe7bf 100644
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -4,6 +4,7 @@
 # Author: AnakngAraw
 # Author: Ianlopez1115
 # Author: Jewel457
+# Author: Jojit fb
 # Author: 아라
 tl: 
   activerecord: 
@@ -14,7 +15,7 @@ tl:
         language: Wika
         latitude: Latitud
         longitude: Longhitud
-        title: Pamagat
+        title: Paksa
         user: Tagagamit
       friend: 
         friend: Kaibigan
@@ -23,7 +24,7 @@ tl:
         body: Katawan
         recipient: Tumatanggap
         sender: Nagpadala
-        title: Pamagat
+        title: Paksa
       trace: 
         description: Paglalarawan
         latitude: Latitud
@@ -39,7 +40,7 @@ tl:
         display_name: Ipakita ang Pangalan
         email: E-liham
         languages: Mga wika
-        pass_crypt: Hudyat
+        pass_crypt: Password
     models: 
       acl: Talaan ng Pantaban sa Pagpunta
       changeset: Pangkat ng pagbabago
@@ -83,16 +84,21 @@ tl:
       blocked: Hinadlangan ang pagpunta mo sa API. Mangyaring lumagda sa ugnayang-mukha ng web upang makaalam ng marami pa.
       need_to_see_terms: Pansamantalang inantala ang pagpunta mo sa API. Mangyaring lumagda sa ugnayang-mukha ng web upang tingnan ang mga Tuntunin ng Tagapag-ambag. Hindi mo kailangan sumang-ayon, subalit dapat mong tingnan ang mga ito.
   browse: 
+    anonymous: Hindi nagpapakilala (anonimo)
     changeset: 
+      belongs_to: May-akda
       changesetxml: XML ng pangkat ng pagbabago
       feed: 
         title: "%{id} ng pangkat ng pagbabago"
         title_comment: "%{id} ng angkat ng pagbabago - %{comment}"
       osmchangexml: XML ng osmChange
-      title: Pangkat ng pagbabago
+      title: "Pangkat ng pagbabago: %{id}"
     containing_relation: 
       entry: Kaugnayan %{relation_name}
       entry_role: Kaugnayan %{relation_name} (bilang %{relation_role})
+    download_xml: Ikargang paibaba ang XML
+    location: Pook (lokasyon)
+    no_comment: (walang mga puna)
     not_found: 
       sorry: Paumanhin, ang %{type} na may ID na %{id}, ay hindi matagpuan.
       type: 
@@ -100,6 +106,9 @@ tl:
         node: buko
         relation: kaugnayan
         way: daan
+    note: 
+      description: Paglalarawan
+    part_of: Bahagi ng
     redacted: 
       message_html: Ang bersiyong %{version} ng %{type} ito ay hindi maipapakita dahil sumailalim na ito sa redaksiyon. Pakitingnan ang %{redaction_link} para sa mga detalye.
       redaction: Redaksiyon %{id}
@@ -130,6 +139,9 @@ tl:
         node: buko
         relation: kaugnayan
         way: daan
+    version: Bersyon
+    view_details: Tingnan ang mga detalye
+    view_history: Tingnan ang kasaysayan
   changeset: 
     changeset: 
       anonymous: Hindi nagpapakilala (anonimo)
@@ -138,7 +150,7 @@ tl:
     changeset_paging_nav: 
       next: Kasunod »
       previous: « Nakaraan
-      showing_page: Ipinapakita ang pahinang %{page}
+      showing_page: Ika-%{page} na pahina
     changesets: 
       area: Pook
       comment: Puna/Kumento
@@ -146,6 +158,7 @@ tl:
       saved_at: Sinagip sa
       user: Tagagamit
     list: 
+      load_more: Magkarga pa
       title: Mga pangkat ng pagbabago
       title_friend: Mga pangkat ng pagbabago ng mga kaibigan mo
       title_nearby: Mga pangkat ng pagbabago ng kalapit na mga tagagamit
@@ -203,7 +216,7 @@ tl:
       newer_entries: Mas bagong mga Pagpapasok
       no_entries: Walang mga pagpapasok sa talaarawan
       older_entries: Mas lumang mga Pagpapasok
-      recent_entries: "Kamakailang mga pagpapasok sa talaarawan:"
+      recent_entries: Kamakailang mga pagpapasok sa talaarawan
       title: Mga talaarawan ng mga tagagamit
       title_friends: Mga talaarawan ng mga kaibigan
       title_nearby: Mga talaarawan ng Kanugnog na mga Tagagamit
@@ -259,6 +272,8 @@ tl:
       scale: Sukat
       too_large: 
         body: Masyadong malaki ang lugar na ito upang mailuwas bilang Dato ng XML ng OpenStreetMap. Mangyaring lumapit o pumili ng isang mas maliit na pook.
+        other: 
+          title: Iba pang mga Pinagmulan
       zoom: Lapitan
   fixthemap: 
     how_to_help: 
@@ -293,8 +308,10 @@ tl:
       title: 
         ca_postcode: Mga kinalabasan mula sa <a href="http://geocoder.ca/">Geocoder.CA</a>
         geonames: Mga kinalabasan mula sa <a href="http://www.geonames.org/">GeoNames</a>
+        geonames_reverse: Mga kinalabasan mula sa <a href="http://www.geonames.org/">GeoNames</a>
         latlon: Mga kinalabasan mula sa <a href="http://openstreetmap.org/">Panloob</a>
         osm_nominatim: Mga kinalabasan mula sa <a href="http://nominatim.openstreetmap.org/">Nominatim ng OpenStreetMap</a>
+        osm_nominatim_reverse: Mga kinalabasan mula sa <a href="http://nominatim.openstreetmap.org/">Nominatim ng OpenStreetMap</a>
         uk_postcode: Mga kinalabasan mula sa  <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Mga kinalabasan mula sa <a href="http://geocoder.us/">Geocoder.us</a>
     search_osm_nominatim: 
@@ -420,6 +437,9 @@ tl:
           "yes": Tulay
         building: 
           "yes": Gusali
+        emergency: 
+          fire_hydrant: Panubig ng Bumbero
+          phone: Teleponong Pangsakuna
         highway: 
           bridleway: Daanan ng Kabayo
           bus_guideway: Daanan ng Ginagabayang Bus
@@ -476,6 +496,7 @@ tl:
           monument: Bantayog
           museum: Museo
           ruins: Mga Guho
+          tomb: Nitso/Puntod
           tower: Tore
           wayside_cross: Krus sa Gilid ng Kalsada
           wayside_shrine: Dambana sa Gilid ng Kalsada
@@ -703,6 +724,7 @@ tl:
           organic: Tindahan ng Pagkaing Organiko
           outdoor: Tindahang Panlabas
           pet: Tindahan ng Alagang Hayop
+          pharmacy: Botika
           photo: Tindahan ng Litrato
           salon: Salon
           shoes: Tindahan ng Sapatos
@@ -763,16 +785,25 @@ tl:
   html: 
     dir: ltr
   javascripts: 
+    close: Isara
     map: 
       base: 
         cycle_map: Mapa ng Ikot
         mapquest: Bukas ang MapQuest
         standard: Pamantayan
         transport_map: Mapa ng Biyahe
+    notes: 
+      show: 
+        hide: Itago
+    share: 
+      cancel: Huwag ituloy
+      short_url: Maiksing URL
+      title: Ibahagi
     site: 
       edit_disabled_tooltip: Lumapit upang baguhin ang mapa
       edit_tooltip: Baguhin ang mapa
   layouts: 
+    about: Patungkol
     community: Pamayanan
     community_blogs: Mga Blog ng Pamayanan
     community_blogs_title: Mga blog mula sa mga kasapi ng pamayanan ng OpenStreetMap
@@ -789,6 +820,7 @@ tl:
     history: Kasaysayan
     home: tahanan
     intro_2_create_account: Lumikha ng isang akawnt ng tagagamit
+    intro_header: Maligayang pagdating sa OpenStreetMap!
     log_in: lumagda
     log_in_tooltip: Lumagdang papasok sa umiiral na akawnt
     logo: 
@@ -819,6 +851,8 @@ tl:
       text: Kung sakaling maganap ang isang salungatan sa pagitan ng isinalinwikang pahinang ito at ng %{english_original_link}, mangingibabaw ang pahinang nasa Ingles
       title: Tungkol sa salinwikang ito
     legal_babble: 
+      attribution_example: 
+        title: Halimbawa ng Atribusyon
       contributors_at_html: "<strong>Austria</strong>: Naglalaman ng dato magmula sa \n<a href=\"http://data.wien.gv.at/\">Stadt Wien</a> (na nasa ilalim ng \n<a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>),\n<a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg</a> at ng\nLand Tirol (na nasa ilalim ng <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT na mayroong mga susog</a>)."
       contributors_ca_html: "<strong>Canada</strong>: Naglalaman ng dato mula sa\nGeoBase&reg;, GeoGratis (&copy; Kagawaran ng Likas na Yaman ng \nCanada), CanVec (&copy; Kagawaran ng Likas na Yaman ng Canada), at StatCan \n(Dibisyon ng Heograpiya, Estadistika ng Canada)."
       contributors_footer_1_html: "Para sa karagdagang mga detalye ng mga ito, at iba pang pinanggalingan na ginamit \nupang mapainam ang OpenStreetMap, paki tingnan ang <a\nhref=\"http://wiki.openstreetmap.org/wiki/Contributors\">Pahina ng \ntagapag-ambag</a> na nasa ibabaw ng Wiki ng OpenStreetMap."
@@ -833,7 +867,7 @@ tl:
       credit_1_html: "Kinakailangan namin na gamitin ang kredito na &ldquo;&copy; mga tagapag-ambag ng \nOpenStreetMap&rdquo;."
       credit_2_html: "Kung saan maaari, dapat na ikawing nang labis (lagyan ng hyperlink) ang OpenStreetMap\nna papunta sa <a\nhref=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\nat CC BY-SA sa <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Kung\ngumagamit ka ng isang midyum o kasangkapan kung saan hindi maaari ang mga kawing (iyong isang\nakdang nakalimbag), iminumungkahi namin na ituro ang mga mambabasa mo sa \nwww.openstreetmap.org (marahil sa pamamagitan ng pagpapalawak ng &lsquo;OpenStreetMap&rsquo;\nupang maging tumuturo sa buong tirahan na ito) at sa www.creativecommons.org."
       credit_title_html: Paano babanggitin ang OpenStreetMap
-      intro_1_html: "OpenStreetMap is <i>open data</i>, licensed under the <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
+      intro_1_html: "Ang OpenStreetMap ay <i>open data</i>, nakalisensiya sa ilalim ng lisensiyang <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
       intro_2_html: "Malaya mong makokopya, maipapamahagi, maipahahatid at mahahalaw ang aming mga dato,\nbasta't babanggitin mo ang OpenStreetMap at ang mga tagapag-ambag\nnito. Kapag binago mo o nagbuo sa pamamagitan ng aming mga dato, maaari\nmong ipamahagi ang resulta sa ilalim lamang ng katulad na lisensiya. Ipinapaliwanag \nng buong <a\nhref=\"http://opendatacommons.org/licenses/odbl/1.0/\">kodigong pambatas</a> \nang mga karapatan at mga pananagutan mo."
       intro_3_html: "Ang kartograpya sa aming mga tile na mapa at ang aming dokumentasyon ay lisensyado sa ilalim ng <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/\">lisensiyang Creative\nCommons Attribution-ShareAlike 2.0</a> (CC BY-SA)."
       more_1_html: "Magbasa ng mas marami pa hinggil sa paggamit ng dato namin doon sa <a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Mga Palaging Itinatanong \nna Makabatas</a>."
@@ -899,6 +933,7 @@ tl:
       title: Kahong-labasan
       to: Para kay
     read: 
+      back: Bumalik
       date: Petsa
       from: Mula sa
       reply_button: Tumugon
@@ -911,6 +946,10 @@ tl:
       wrong_user: Lumagda ka bilang si `%{user}' ngunit ang mensaheng hiniling mong tugunin ay hindi naipadala sa tagagamit na iyan. Mangyaring lumagda bilang ang tamang tagagamit upang makatugon.
     sent_message_summary: 
       delete_button: Burahin
+  note: 
+    mine: 
+      created_at: Nilikha Noong
+      description: Paglalarawan
   notifier: 
     diary_comment_notification: 
       footer: Mababasa mo rin ang puna roon sa %{readurl} at maaari kang pumuna roon sa %{commenturl} o tumugon doon sa %{replyurl}
@@ -959,8 +998,11 @@ tl:
       header: "Nagpadala sa iyo si %{from_user} ng isang mensahe sa pamamagitan ng OpenStreetMap na may paksang %{subject}:"
       hi: Kumusta %{to_user},
       subject_header: "[OpenStreetMap] %{subject}"
+    note_comment_notification: 
+      greeting: Kumusta,
     signup_confirm: 
-      subject: "[OpenStreetMap] Tiyakin ang iyong tirahan ng e-liham"
+      greeting: Kamusta!
+      subject: "[OpenStreetMap] Maligayang pagdating sa OpenStreetMap"
   oauth: 
     oauthorize: 
       allow_read_gpx: basahin ang iyong pribadong mga bakas ng GPS.
@@ -1250,7 +1292,7 @@ tl:
     trace_paging_nav: 
       newer: Mas Bagong mga Bakas
       older: Mas Lumang mga Bakas
-      showing_page: Ipinapakita ang pahinang %{page}
+      showing_page: Ika-%{page} na pahina
     view: 
       delete_track: Burahin ang bakas na ito
       description: "Paglalarawan:"
@@ -1290,6 +1332,9 @@ tl:
       email never displayed publicly: (hindi kailanman ipinapakita sa madla)
       flash update success: Matagumpay na naisapanahon ang kabatiran sa tagagamit.
       flash update success confirm needed: Matagumpay na naisapanahon ang kabatiran sa tagagamit. Suriin ang e-liham mo para sa isang tala upang matiyak ang bago mong tirahan ng e-liham.
+      gravatar: 
+        gravatar: Gamitin ang Gravatar
+        link text: ano ba ito?
       home location: "Kinalalagyan ng Tahanan:"
       image: "Larawan:"
       image size hint: (pinakamahusay ang parisukat na mga larawan na hindi bababa sa 100x100)
@@ -1326,7 +1371,7 @@ tl:
     confirm: 
       already active: Natiyak na ang akawnt na ito.
       button: Tiyakin
-      heading: Tiyakin ang isang akawnt ng tagagamit
+      heading: Tingnan ang iyong e-liham!
       press confirm button: Pindtuin ang pindutan ng pagtitiyak na nasa ibaba upang buhayin ang akawnt mo.
       unknown token: Tila hindi yata umiiral ang kahalip na iyan.
     confirm_email: 
@@ -1387,7 +1432,7 @@ tl:
         yahoo: 
           alt: Lumagda sa pamamagitan ng OpenID ng Yahoo
           title: Lumagda sa pamamagitan ng Yahoo
-      password: "Hudyat:"
+      password: "Password:"
       register now: Magpatala na ngayon
       remember: "Tandaan ako:"
       title: Lumagda
@@ -1400,12 +1445,12 @@ tl:
       title: Umalis sa pagkakalagda
     lost_password: 
       email address: "Tirahan ng e-liham:"
-      heading: Nakalimutang Hudyat?
+      heading: Nakalimutang Password?
       help_text: Ipasok ang tirahan ng e-liham na ginamit mo upang magpatala, ipapadala namin ang isang kawing papunta rito na magagamit mo upang muling maitakda mo ang iyong hudyat.
       new password button: Itakda uli ang hudyat
       notice email cannot find: Hindi matagpuan ang ganyang tirahan ng e-liham, paumanhin.
       notice email on way: Ikinalulungkot na naiwala mo iyan :-( ngunit darating na ang isang e-liham upang maitakda mong muli iyan kaagad.
-      title: Naiwalang hudyat
+      title: Naiwalang password
     make_friend: 
       already_a_friend: Kaibigan ka na ni %{name}.
       button: idagdag bilang kaibigan
@@ -1426,7 +1471,7 @@ tl:
       openid: "%{logo} OpenID:"
       openid association: "<p>Ang OpenID mo ay hindi pa nakaugnay sa isang akawnt ng OpenStreetMap.</p>\n<ul>\n  <li>Kung bago ka pa lang sa OpenStreetMap, mangyaring lumikha ng isang bagong akawnt sa pamamagitan ng pormularyong nasa ibaba.</li>\n  <li>\n    Kung mayroon ka nang akawnt, makakalagda ka na sa akawnt mo\n    sa pamamagitan ng iyong pangalan ng tagagamit at hudyat at pagkaraan ay iugnay ang akawnt \n    sa OpenID mo doon sa loob ng mga katakdaan mo na pangtagagamit.\n  </li>\n</ul>"
       openid no password: Hindi kailangan ang hudyat sa OpenID, subalit ang ilan sa dagdag na mga kagamitan o tagapaghain ay maaaring mangailangan ng isa.
-      password: "Hudyat:"
+      password: "Password:"
       terms accepted: Salamat sa pagtanggap ng bagong mga tuntunin ng tagapag-ambag!
       terms declined: Ikinalulungkot namin na nagpasya kang huwag tanggapin ang bagong mga Tuntunin ng Tagapag-ambag. Para sa mas marami pang kabatiran, pakitingnan ang <a href="%{url}">pahinang ito ng wiki</a>.
       terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
@@ -1450,7 +1495,7 @@ tl:
       flash changed: Napalitan na ang hudyat mo.
       flash token bad: Hindi natagpuan ang ganyang kahalip, suriin kaya ang URL?
       heading: Muling itakda ang Hudyat para kay %{user}
-      password: "Hudyat:"
+      password: "Password:"
       reset: Muling Itakda ang Hudyat
       title: Muling itakda ang hudyat
     set_home: 
@@ -1599,7 +1644,7 @@ tl:
       revoke: Bawiin!
       revoker_name: Binawi ni
       show: Ipakita
-      showing_page: Ipinapakita ang pahinang %{page}
+      showing_page: Ika-%{page} na pahina
       status: Kalagayan
     period: 
       one: 1 oras
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index ef8cc6b1a..afa70d1f4 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -11,6 +11,7 @@
 # Author: Katpatuka
 # Author: Meelo
 # Author: SalihB
+# Author: Sucsuzz
 # Author: Szoszv
 # Author: Talha Samil Cakir
 # Author: Tarikozket
@@ -1159,6 +1160,8 @@ tr:
           wood: Orman
     markdown_help: 
       first: İlk öğe
+      heading: Başlık
+      headings: Başlıklar
       image: Görsel
       link: Bağlantı
       ordered: Sıralı liste
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index f9e554f2f..66a86502d 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -195,7 +195,7 @@ uk:
         tag: Сторінка вікі, що описує теґ %{key}=%{value}
       wikipedia_link: Стаття %{page} у Вікіпедії
     timeout: 
-      sorry: На жаль, дані для %{type} з ідентифікатором %{id}, занадто великі для отримання.
+      sorry: На жаль, %{type} з ідентифікатором %{id}, має занадто багато даних, щоб їх отримати.
       type: 
         changeset: набір змін
         node: точка
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 03bf32076..4e4698557 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -11,6 +11,7 @@
 # Author: Liuxinyu970226
 # Author: Mmyangfl
 # Author: Nemo bis
+# Author: NigelSoft
 # Author: PhiLiP
 # Author: Qiyue2001
 # Author: Shizhao
@@ -74,10 +75,10 @@ zh-CN:
       diary_entry: 日记文章
       friend: 朋友
       language: 语言
-      message: 信息
+      message: 消息
       node: 节点
       node_tag: 节点标签
-      notifier: 通知人
+      notifier: 通知者
       old_node: 旧节点
       old_node_tag: 旧节点标签
       old_relation: 旧关系
@@ -117,21 +118,24 @@ zh-CN:
         title_comment: 变更集%{id} - %{comment}
       node: 节点（%{count}）
       node_paginated: 节点（%{x}-%{y}，总计%{count}）
-      osmchangexml: osmChange XML
+      osmchangexml: osm变更XML
+      relation: 关系（%{count}）
+      relation_paginated: 关系（%{count}的%{x}-%{y}）
       title: 变更集：%{id}
       way: 路径 (%{count})
+      way_paginated: 路径（%{count}的%{x}-%{y}）
     closed: 关闭于
-    closed_by_html: 关闭于<abbr title='%{title}'>%{time}前</abbr>，由%{user}
-    closed_html: 关闭于<abbr title='%{title}'>%{time}前</abbr>
+    closed_by_html: 由%{user}于<abbr title='%{title}'>%{time}前</abbr>关闭
+    closed_html: 于<abbr title='%{title}'>%{time}前</abbr>关闭
     containing_relation: 
       entry: 关系%{relation_name}
       entry_role: 关系%{relation_name}（作为%{relation_role}）
     created: 创建于
-    created_by_html: 创建于<abbr title='%{title}'>%{time}前</abbr>，由%{user}
-    created_html: 创建于<abbr title='%{title}'>%{time}前</abbr>
-    deleted_by_html: 删除于<abbr title='%{title}'>%{time}前</abbr>，由%{user}
+    created_by_html: 由%{user}于<abbr title='%{title}'>%{time}前</abbr>创建
+    created_html: 于<abbr title='%{title}'>%{time}前</abbr>创建
+    deleted_by_html: 由%{user}于<abbr title='%{title}'>%{time}前</abbr>删除
     download_xml: 下载XML
-    edited_by_html: 编辑于<abbr title='%{title}'>%{time}前</abbr>，由%{user}
+    edited_by_html: 由%{user}于<abbr title='%{title}'>%{time}前</abbr>编辑
     in_changeset: 变更集
     location: 位置：
     no_comment: （无评论）
@@ -151,7 +155,7 @@ zh-CN:
       closed_title: "已解决的注释 #%{note_name}"
       commented_by: "%{user}于<abbr title='%{exact_time}'>%{when}前</abbr>发表的评论"
       commented_by_anonymous: 匿名用户于<abbr title='%{exact_time}'>%{when}前</abbr>发表的评论
-      description: 说明：
+      description: 说明
       hidden_by: "%{user}隐藏于<abbr title='%{exact_time}'>%{when}前</abbr>"
       hidden_title: 隐藏注释#%{note_name}
       new_note: 新建注释
@@ -201,6 +205,7 @@ zh-CN:
     view_details: 查看详情
     view_history: 查看历史
     way: 
+      also_part_of: 路径%{related_ways}的一部分
       history_title: 路径历史：%{name}
       nodes: 节点
       title: 路径：%{name}
@@ -313,11 +318,11 @@ zh-CN:
       description: iD（浏览器内编辑器）
       name: iD
     potlatch: 
-      description: Potlatch 1（浏览器内编辑器）
-      name: Potlatch 1
+      description: 冬季节1（浏览器内编辑器）
+      name: 冬季节1
     potlatch2: 
-      description: Potlatch 2（浏览器内编辑器）
-      name: Potlatch 2
+      description: 冬季节2（浏览器内编辑器）
+      name: 冬季节2
     remote: 
       description: 远程控制（JOSM或Merkaartor）
       name: 远程控制
@@ -364,11 +369,14 @@ zh-CN:
     title: 导出
   fixthemap: 
     how_to_help: 
+      add_a_note: 
+        instructions_html: 只需点击<a class='icon note'></a>或地图上显示的相同图标。这将向地图加入书签，您也可以拖动移除它。加入您的信息，之后点击保存，其他映射也将用于研究。
       join_the_community: 
         explanation_html: 如果你发现我们的地图数据有问题，例如缺少某条道路或者你的地址，最好的处理方法就是加入OpenStreetMap社区，然后你自己添加或者改进数据。
         title: 加入社区
       title: 如何帮助
     other_concerns: 
+      explanation_html: 如果您有关于如何使用我们的数据或内容的关心请查阅我们在<a href='/copyright'>版权页面</a>的更多法律信息，或联系<a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF工作组</a>。
       title: 其他问题
     title: 报告问题/修复地图
   geocoder: 
@@ -1003,7 +1011,7 @@ zh-CN:
     home: 返回家位置
     intro_2_create_account: 创建用户账户
     intro_header: 欢迎来到 OpenStreetMap!
-    intro_text: OpenStreetMap 是一个世界地图，由像你这样的人们所建立，在开放授权下可以自由使用。
+    intro_text: OpenStreetMap是一个世界地图，由同你一样的人们所构筑，可依据开放许可协议自由使用。
     learn_more: 详细了解
     log_in: 登录
     log_in_tooltip: 使用已有账户登录
@@ -1041,6 +1049,7 @@ zh-CN:
         title: 署名示例
       contributors_at_html: <strong>奥地利</strong>：包含来自 <a href="http://data.wien.gv.at/">Stadt Wien</a>(<a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>协议)、<a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a>及 Land Tirol(修订的<a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT</a>协议)的数据。
       contributors_ca_html: <strong>加拿大</strong>：含有来自GeoBase&reg;，GeoGratis（&copy; 加拿大自然资源部），CanVec（&copy; 加拿大自然资源部）和StatCan（加拿大统计局地理处）的数据。
+      contributors_fi_html: <strong>芬兰</strong>：包含来自芬兰国家测绘局地形数据库和其他测绘机构的数据，依据<a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI协议</a>授权。
       contributors_footer_1_html: "关于其进一步的细节，及其他被用来帮助提升 OpenStreetMap 的来源，详见 OpenStreetMap Wiki 的<a\nhref=\"http://wiki.openstreetmap.org/wiki/Contributors\">贡献者页面</a>。"
       contributors_footer_2_html: OpenStreetMap 纳入数据并不意味着原始数据提供者认可 OpenStreetMap、提供任何担保或担负任何法律责任。
       contributors_fr_html: <strong>法国</strong>：含有来自Direction Générale des Impôts的数据。
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 7a1365942..f652417e5 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -3,7 +3,9 @@
 # Export driver: syck-pecl
 # Author: Anakmalaysia
 # Author: Cwlin0416
+# Author: EagerLin
 # Author: Foothsu
+# Author: Hlaw
 # Author: Justincheng12345
 # Author: Mmyangfl
 # Author: Orinx
@@ -14,15 +16,17 @@
 # Author: Wrightbus
 zh-TW: 
   about_page: 
-    community_driven_title: 社群參與
+    community_driven_html: "OpenStreetMap的社群多元化、懷有熱情，而且日益壯大。我們的貢獻者包括地圖製作愛好者，地理信息系統的專業人員，提供OSM伺服器的工程師，為受災害影響區域製圖的人道主義志願人士，以及其他各界人士。\n想進一步了解這個社群，請參閱<a href='%{diary_path}'>用戶日記</a>,\n<a href='http://blogs.openstreetmap.org/'>社群博客</a>，以及<a href='http://www.osmfoundation.org/'>OSM基金會</a> 網站。"
+    community_driven_title: 社群推動
     copyright_html: <span>&copy;</span>OpenStreetMap<br>貢獻者
-    lede_text: OpenStreetMap 是由製圖者社群所建立的，維護的資料包含世界上的道路、步道、咖啡館、火車站等等。
-    local_knowledge_html: "OpenStreetMap 強調當地的知道。貢獻者使用\n航照圖、GPS 裝置與低科技的地區地圖來驗證 OSM\n是正確而即時的。"
+    lede_text: OpenStreetMap是由製圖者社群所建立，他們提供及不斷更新包括有關世界各地的道路、路徑、咖啡館、火車站等等的資料。
+    local_knowledge_html: "OpenStreetMap強調當地的知識。貢獻者使用\n航照圖、GPS裝置與低科技的實地考察製圖，來驗證OSM\n是正確而最新的。"
     local_knowledge_title: 當地的知識
     next: 下一頁
+    open_data_html: "OpenStreetMap是<i>開放資料</i>: 您可以自由地使用作任何用途，前提是您須標明作者為OpenStreetMap及其貢獻者。若您在我們的資料上作修改或以之透過某些方式衍生其他資料\n，則只可依相同授權條款散佈有關成果。詳情請參閱<a href='%{copyright_path}'>版權及授權頁面</a>。"
     open_data_title: 開放資料
     partners_title: 合作夥伴
-    used_by: "%{name} 提供數以百計的網站、行動 app 與硬體設備地圖資料"
+    used_by: "%{name}為數以百計的網站、行動 app 與硬體設備，提供地圖資料"
   activerecord: 
     attributes: 
       diary_comment: 
@@ -95,10 +99,10 @@ zh-TW:
     require_cookies: 
       cookies_needed: 您似乎已停用 cookies - 請在瀏覽器中啟用 cookies，然後繼續。
     require_moderator: 
-      not_a_moderator: 您需要一個管理者來執行該動作。
+      not_a_moderator: 您需要是管理人員，才可執行該動作。
     setup_user_auth: 
-      blocked: 您對 API 的存取已經被阻擋了。請登入網頁介面以了解更多資訊。
-      need_to_see_terms: 我們已暫時中止您存取API的權限，請登入網頁介面查閱貢獻者條款，您不需要同意有關條款，但必須查閱全部。
+      blocked: 您已經被封禁使用API。請登入網頁介面以了解更多資訊。
+      need_to_see_terms: 我們已暫時中止您使用API的權限，請登入網頁介面查閱貢獻者條款，您不需要同意有關條款，但必須查閱它們。
   browse: 
     anonymous: 匿名
     changeset: 
@@ -107,26 +111,26 @@ zh-TW:
       feed: 
         title: 變更組合 %{id}
         title_comment: 變更組合 %{id} - %{comment}
-      node: 節點 (%{count})
-      node_paginated: 節點（%{count}的%{x}-%{y}）
-      osmchangexml: osmChange XML
+      node: 節點 (共%{count}項)
+      node_paginated: 節點 (共%{count}項中的第%{x}-%{y}項)
+      osmchangexml: osmChange格式 XML
       relation: 關係（%{count}）
       relation_paginated: 關係（%{count}的%{x}-%{y}）
       title: 變更組合：%{id}
-      way: 路線（%{count}）
+      way: 路徑 (共%{count}項)
       way_paginated: 路線（%{count}的%{x}-%{y}）
-    closed: 已關閉
-    closed_by_html: 由 %{user} 關閉於 <abbr title='%{title}'>%{time} 以前</abbr>
-    closed_html: 關閉於 <abbr title='%{title}'>%{time} 以前</abbr>
+    closed: 已關閉於
+    closed_by_html: 於<abbr title='%{title}'>%{time}前</abbr>由%{user}關閉
+    closed_html: 於<abbr title='%{title}'>%{time}前</abbr>關閉
     containing_relation: 
       entry: 關係 %{relation_name}
-      entry_role: 關係 %{relation_name} (做為 %{relation_role})
-    created: 已建立
-    created_by_html: 由 %{user} 建立於 <abbr title='%{title}'>%{time} 以前</abbr>
-    created_html: 建立於 <abbr title='%{title}'>%{time} 以前</abbr>
-    deleted_by_html: 由 %{user} 刪除於 <abbr title='%{title}'>%{time} 以前</abbr>
+      entry_role: 關係 %{relation_name} (作為 %{relation_role})
+    created: 已建立於
+    created_by_html: 於<abbr title='%{title}'>%{time}前</abbr>由%{user}建立
+    created_html: 於<abbr title='%{title}'>%{time}前</abbr>建立
+    deleted_by_html: 於<abbr title='%{title}'>%{time}前</abbr>由%{user}刪除
     download_xml: 下載 XML
-    edited_by_html: 由 %{user} 編輯於 <abbr title='%{title}'>%{time} 以前</abbr>
+    edited_by_html: 於<abbr title='%{title}'>%{time}前</abbr>由%{user}編輯
     in_changeset: 變更組合
     location: 位置：
     no_comment: (沒有評論)
@@ -134,45 +138,58 @@ zh-TW:
       history_title: 節點歷史：%{name}
       title: 節點：%{name}
     not_found: 
-      sorry: 抱歉，找不到 id %{id} 的 %{type}。
+      sorry: 抱歉，找不到%{type}#%{id}。
       type: 
         changeset: 變更組合
         node: 節點
         relation: 關係
         way: 路徑
     note: 
-      closed_title: 已解決的筆記：%{note_name}
+      closed_by: 於<abbr title='%{exact_time}'>%{when}前</abbr>由%{user}解決
+      closed_by_anonymous: 於<abbr title='%{exact_time}'>%{when}前</abbr>由匿名用户解決
+      closed_title: 已解決的筆記：#%{note_name}
+      commented_by: "%{user}於<abbr title='%{exact_time}'>%{when}前</abbr>發表的評論"
+      commented_by_anonymous: 匿名用户於<abbr title='%{exact_time}'>%{when}前</abbr>發表的評論
       description: "描述:"
+      hidden_by: 於<abbr title='%{exact_time}'>%{when}前</abbr>由%{user}隱藏
+      hidden_title: 已隱藏的筆記：#%{note_name}
       new_note: 新增節點
-      open_title: "未解決的筆記: %{note_name}"
+      open_by: 於<abbr title='%{exact_time}'>%{when}前</abbr>由%{user}建立
+      open_by_anonymous: 於<abbr title='%{exact_time}'>%{when}前</abbr>由匿名用户建立
+      open_title: "未解決的筆記: #%{note_name}"
+      reopened_by: 於<abbr title='%{exact_time}'>%{when}前</abbr>由%{user}重開
+      reopened_by_anonymous: 於<abbr title='%{exact_time}'>%{when}前</abbr>由匿名用户重開
       title: 節點：%{id}
-    part_of: 部分：
+    part_of: 屬於：
     redacted: 
-      message_html: 此 %{type} 中的版本 %{version} 不能被顯示，因爲它已被編輯過。請參閱 %{redaction_link} 的詳細資訊。
-      redaction: 修訂版 %{id}
+      message_html: 此%{type}的版本%{version}已被刪蓋，因此未能顯示。詳細資訊請參閱%{redaction_link}。
+      redaction: 刪蓋程序%{id}
       type: 
         node: 節點
         relation: 關係
         way: 路徑
     relation: 
+      history_title: "關係修訂歷史: %{name}"
       members: 成員
+      title: "關係: %{name}"
     relation_member: 
-      entry_role: "%{type} %{name} 做為 %{role}"
+      entry_role: "%{type} %{name} 作為 %{role}"
       type: 
         node: 節點
         relation: 關係
         way: 路徑
     start_rjs: 
+      feature_warning: 載入%{num_features}項物件的資料，可能會使你的瀏覽器操作緩慢或反應遲緩。你確定要顯示這些資料嗎？
       load_data: 載入資料
       loading: 正在載入...
     tag_details: 
       tags: 標籤
       wiki_link: 
-        key: "%{key} 標籤的 wiki 描述頁面"
-        tag: "%{key}=%{value} 標籤的 wiki 描述頁面"
-      wikipedia_link: 維基百科上的 %{page} 文章
+        key: "%{key}標籤的wiki說明頁面"
+        tag: "%{key}=%{value}標籤的wiki說明頁面"
+      wikipedia_link: 維基百科上的%{page}條目
     timeout: 
-      sorry: 抱歉，取得 id %{id} 的 %{type} 資料花了太長的時間。
+      sorry: 抱歉，索取id為%{id}的%{type}資料，花費時間過長。
       type: 
         changeset: 變更組合
         node: 節點
@@ -182,7 +199,11 @@ zh-TW:
     view_details: 檢視詳細資訊
     view_history: 檢視歷史
     way: 
+      also_part_of: 
+        one: 路徑%{related_ways}的部份
+        other: 路徑%{related_ways}的部份
       nodes: 節點
+      title: 路徑：%{name}
   changeset: 
     changeset: 
       anonymous: 匿名
@@ -191,50 +212,50 @@ zh-TW:
     changeset_paging_nav: 
       next: 下一頁 »
       previous: « 上一頁
-      showing_page: 第 %{page}頁
+      showing_page: 第%{page}頁
     changesets: 
       area: 區域
       comment: 註解
       id: ID
       saved_at: 儲存於
-      user: 使用者
+      user: 用户
     list: 
-      empty: 發現沒有變更集。
-      empty_area: 這一地區沒有變更集。
-      empty_user: 此用戶沒有變更集。
+      empty: 發現沒有變更組合。
+      empty_area: 這一地區沒有變更組合。
+      empty_user: 此用戶沒有變更組合。
       load_more: 載入更多
-      no_more: 沒有更多變更集。
-      no_more_area: 這一地區沒有更多變更集。
-      no_more_user: 此用戶沒有更多變更集。
+      no_more: 沒有更多變更組合。
+      no_more_area: 這一地區沒有更多變更組合。
+      no_more_user: 此用戶沒有更多變更組合。
       title: 變更組合
       title_friend: 您朋友的變更組合
       title_nearby: 鄰近使用者的變更組合
-      title_user: "%{user} 的變更組合"
+      title_user: "%{user}的變更組合"
     timeout: 
-      sorry: 對不起，您要求的變更組合集清單取回時花了太長時間。
+      sorry: 對不起，索取您所要求的變更組合清單，花費時間過長。
   diary_entry: 
     comments: 
-      ago: "%{ago} 前"
+      ago: "%{ago}前"
       comment: 評論
-      has_commented_on: "%{display_name} 在以下的日記項目發表了評論"
+      has_commented_on: "%{display_name}在以下的日記項目發表了評論"
       newer_comments: 較新的評論
       older_comments: 較舊的評論
       post: 張貼
       when: 於
     diary_comment: 
-      comment_from: 由 %{link_user}  於 %{comment_created_at} 發表評論
+      comment_from: 由%{link_user}於%{comment_created_at}發表的評論
       confirm: 確認
       hide_link: 隱藏此評論
     diary_entry: 
       comment_count: 
-        one: 1個評論
-        other: "%{count}個評論"
-        zero: 無評論
+        one: 1項評論
+        other: "%{count}項評論"
+        zero: 沒有評論
       comment_link: 對這個項目的評論
       confirm: 確認
       edit_link: 編輯此項目
       hide_link: 隱藏此項目
-      posted_by: 由 %{link_user} 於 %{created} 以 %{language_link} 張貼
+      posted_by: 於%{created}由%{link_user}以%{language_link}張貼
       reply_link: 回覆這個項目
     edit: 
       body: 內文：
@@ -249,14 +270,14 @@ zh-TW:
       use_map_link: 使用地圖
     feed: 
       all: 
-        description: 使用者最近的 OpenStreetMap 日記
-        title: OpenStreetMap 日記
+        description: OpenStreetMap使用者最近的日記項目
+        title: OpenStreetMap日記項目
       language: 
-        description: 使用者最近的 OpenStreetMap 日記(語言為 %{language_name})
-        title: OpenStreetMap 日記 (語言為 %{language_name})
+        description: OpenStreetMap使用者最近的日記項目 (語言為 %{language_name})
+        title: OpenStreetMap日記項目 (語言為 %{language_name})
       user: 
-        description: "%{user} 最近的 OpenStreetMap 日記"
-        title: "%{user} 的 OpenStreetMap 日記"
+        description: "%{user}最近的OpenStreetMap日記項目"
+        title: "%{user}的OpenStreetMap日記項目"
     list: 
       in_language_title: 日記 (語言為 %{language})
       new: 新增日記項目
@@ -268,7 +289,7 @@ zh-TW:
       title: 日記
       title_friends: 朋友的日記
       title_nearby: 附近的使用者的日記
-      user_title: "%{user} 的日記"
+      user_title: "%{user}的日記"
     location: 
       edit: 編輯
       location: 位置：
@@ -276,20 +297,20 @@ zh-TW:
     new: 
       title: 新日記項目
     no_such_entry: 
-      body: 抱歉，沒有日記項目或評論的 id 是 %{id}。請檢查您的拼字，或者可能是按到錯誤的連結。
-      heading: 沒有項目的 id 為： %{id}
+      body: 抱歉，沒有日記項目或評論的id是%{id}。請檢查您的拼字，或者可能是您按到錯誤的連結。
+      heading: 沒有項目的id為：%{id}
       title: 沒有這個日記項目
     view: 
       leave_a_comment: 留下評論
       login: 登入
-      login_to_leave_a_comment: "%{login_link} 以留下評論"
+      login_to_leave_a_comment: "%{login_link}以留下評論"
       save_button: 儲存
-      title: "%{user} 的日記 | %{title}"
+      title: "%{user}的日記 | %{title}"
       user_title: "%{user}的日記"
   editor: 
-    default: 預設 (目前 %{name})
+    default: 預設 (目前為 %{name})
     id: 
-      description: iD (網頁版編輯器)
+      description: iD (瀏覽器內編輯)
       name: iD
     potlatch: 
       description: Potlatch 1 (瀏覽器內編輯)
@@ -304,9 +325,9 @@ zh-TW:
     start: 
       add_marker: 在地圖加上標記
       area_to_export: 要匯出的區域
-      embeddable_html: 內嵌式 HTML
+      embeddable_html: 內嵌式HTML
       export_button: 匯出
-      export_details: OpenStreetMap 資料是以<a href="http://opendatacommons.org/licenses/odbl/1.0/">開放資料共用 開放資料庫</a>（ODbL）授權。
+      export_details: OpenStreetMap 資料是以<a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons 開放資料庫授權條款</a>（ODbL）授權。
       format: 格式
       format_to_export: 要匯出的格式
       image_size: 圖片大小
@@ -319,28 +340,44 @@ zh-TW:
       options: 選項
       osm_xml_data: OpenStreetMap XML 資料
       output: 輸出
-      paste_html: 貼上 HTML 內嵌於網站
+      paste_html: 貼上 HTML 以於網站內嵌
       scale: 比例
       too_large: 
-        body: 這個區域太大，無法匯出 OpenStreetMap XML 資料。請拉近選擇一個較小的區域或使用下列大量資料下載源：
+        advice: 如果上述工具匯出失敗，請考慮使用下列的來源：
+        body: 這個區域太大，無法匯出 OpenStreetMap XML 資料。請放大或選擇一個較小的區域，或使用下列大量資料下載源：
         geofabrik: 
-          description: 定期更新的洲、國家及特定城市之摘要
+          description: 定期更新的洲、國家及特定城市之摘錄資料
           title: Geofabrik下載
         metro: 
-          description: 世界主要城市與附近地區的摘要
-          title: 城市摘要
+          description: 世界主要城市與附近地區的摘錄資料
+          title: 都會區的摘錄資料
         other: 
           description: OpenStreetMap wiki 上列出的其他來源
           title: 其他來源
+        overpass: 
+          description: 從OpenStreetMap資料庫的鏡像，下載此區域
+          title: Overpass API
         planet: 
           description: 定期更新的完整OpenStreetMap資料庫副本
           title: 地球OSM
       zoom: 變焦
     title: 匯出
+  fixthemap: 
+    how_to_help: 
+      add_a_note: 
+        instructions_html: "只須點擊 <a class='icon note'></a>或地圖上的同一圖示，\n這將在地圖上添加一個標記，你可以拖動它，並添加你的筆記，然後點擊保存，其他製圖者會作出查證。"
+      join_the_community: 
+        explanation_html: 如果你發現我們的地圖資料有問題，例如缺少某條道路或者你的地址，最好的方法就是加入OpenStreetMap社群，然後自己添加或者改進資料。
+        title: 加入社群
+      title: 如何協助
+    other_concerns: 
+      explanation_html: 如果您對我們的資料如何被應用或有關的內容有任何問題，請參閱我們的<a href='/copyright'>版權頁</a>了解更多法律訊息，或聯繫適當的<a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF working group</a>。
+      title: 其他問題
+    title: 回報問題／改進地圖
   geocoder: 
     description: 
       title: 
-        geonames: 位置來自 <a href="http://www.geonames.org/">GeoNames</a>
+        geonames: 位置來自 <a href="http://www.geonames.org/">GeoNames</a>的位置
         osm_nominatim: 來自 <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a> 的位置
       types: 
         cities: 城市
@@ -356,9 +393,9 @@ zh-TW:
       south_west: 西南方
       west: 西方
     distance: 
-      one: 大約 1 公里
-      other: 大約 %{count} 公里
-      zero: 1 公里以內
+      one: 大約1公里
+      other: 大約%{count}公里
+      zero: 1公里以內
     results: 
       more_results: 更多結果
       no_results: 找不到任何結果
@@ -368,7 +405,7 @@ zh-TW:
         geonames: 來自<a href="http://www.geonames.org/">GeoNames</a>的結果
         geonames_reverse: 來自<a href="http://www.geonames.org/">GeoNames</a>的結果
         latlon: 來自<a href="http://openstreetmap.org/">內部</a>的結果
-        osm_nominatim: 來自 <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a> 的結果
+        osm_nominatim: 來自<a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>的結果
         osm_nominatim_reverse: 來自<a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>的結果
         uk_postcode: 來自<a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>的結果
         us_postcode: 來自<a href="http://geocoder.us/">Geocoder.us</a>的結果
@@ -376,7 +413,7 @@ zh-TW:
       admin_levels: 
         level10: 郊區邊界
         level2: 國界
-        level4: 州界
+        level4: 省界
         level5: 區界
         level6: 縣界
         level8: 市界
@@ -400,7 +437,7 @@ zh-TW:
           arts_centre: 藝術中心
           artwork: 藝術品
           atm: ATM
-          auditorium: 禮堂
+          auditorium: 演講廳
           bank: 銀行
           bar: 酒吧
           bbq: 燒烤場
@@ -410,7 +447,7 @@ zh-TW:
           biergarten: 啤酒花園
           brothel: 妓院
           bureau_de_change: 找換店
-          bus_station: 巴士站
+          bus_station: 巴士總站
           cafe: 咖啡廳
           car_rental: 租車
           car_sharing: 汽車共用
@@ -421,8 +458,8 @@ zh-TW:
           clinic: 診所
           club: 俱樂部
           college: 學院
-          community_centre: 社群中心
-          courthouse: 法庭
+          community_centre: 社區中心
+          courthouse: 法院
           crematorium: 火葬場
           dentist: 牙醫
           doctors: 醫生
@@ -440,7 +477,7 @@ zh-TW:
           fuel: 油店
           grave_yard: 墓地
           gym: 健身中心 / 健身房
-          hall: 大廳
+          hall: 禮堂
           health_centre: 健康中心
           hospital: 醫院
           hotel: 酒店
@@ -478,8 +515,8 @@ zh-TW:
           shopping: 購物
           shower: 淋浴
           social_centre: 社交中心
-          social_club: 社交場合
-          social_facility: 社區設施
+          social_club: 社交會所
+          social_facility: 社會福利設施
           studio: 錄音室
           supermarket: 超級市場
           swimming_pool: 游泳池
@@ -516,7 +553,7 @@ zh-TW:
           bus_guideway: 軌道巴士線
           bus_stop: 巴士站
           byway: 小路
-          construction: 建造中公路
+          construction: 建造中道路
           cycleway: 單車徑
           emergency_access_point: 緊急求助點
           footway: 行人路
@@ -526,31 +563,31 @@ zh-TW:
           minor: 次要道路
           motorway: 高速公路
           motorway_junction: 高速公路交匯處
-          motorway_link: 高速公路
+          motorway_link: 高速公路連接路
           path: 小徑
-          pedestrian: 人行道
+          pedestrian: 行人專用道路
           platform: 車站月台
           primary: 主要道路
           primary_link: 主要道路
           proposed: 擬議道路
           raceway: 賽道
-          residential: 住宅
+          residential: 住宅道路
           rest_area: 休息區
           road: 道路
-          secondary: 次要道路
-          secondary_link: 次級公路
+          secondary: 次級道路
+          secondary_link: 次級道路連接路
           service: 服務道路
           services: 高速公路休息區
           speed_camera: 測速照相機
-          steps: 步驟
+          steps: 梯級
           stile: 跨越圍欄的台階
           street_lamp: 路燈
           tertiary: 三級道路
-          tertiary_link: 三級道路
+          tertiary_link: 三級道路連接路
           track: 軌道
-          trail: 徑
-          trunk: 主幹線
-          trunk_link: 主幹線
+          trail: 小徑
+          trunk: 主要幹道
+          trunk_link: 主要幹道連接路
           unclassified: 無分級道路
           unsurfaced: 未平整道路
         historic: 
@@ -561,18 +598,18 @@ zh-TW:
           castle: 城堡
           church: 教堂
           citywalls: 城牆
-          fort: 堡
+          fort: 堡疊
           house: 房屋
           icon: 圖示
           manor: 莊園
           memorial: 紀念館
-          mine: 礦產
+          mine: 礦場
           monument: 古蹟
           museum: 博物館
           ruins: 廢墟
           tomb: 墳墓
           tower: 塔
-          wayside_cross: 路邊十字
+          wayside_cross: 路邊十字架
           wayside_shrine: 路邊神龕
           wreck: 殘骸
         landuse: 
@@ -581,8 +618,8 @@ zh-TW:
           brownfield: 棕地
           cemetery: 墳場
           commercial: 商業區
-          conservation: 保育
-          construction: 建設中
+          conservation: 保育區
+          construction: 建設中區域
           farm: 農場
           farmland: 農地
           farmyard: 農家
@@ -594,7 +631,7 @@ zh-TW:
           landfill: 垃圾埋填區
           meadow: 草地
           military: 軍事區
-          mine: 礦產
+          mine: 礦場
           nature_reserve: 自然保護區
           orchard: 果園
           park: 公園
@@ -606,7 +643,7 @@ zh-TW:
           reservoir_watershed: 水庫集水區
           residential: 住宅區
           retail: 零售
-          road: 道路區
+          road: 道路用地
           village_green: 鄉村草地
           vineyard: 葡萄園
           wetland: 濕地
@@ -624,19 +661,19 @@ zh-TW:
           miniature_golf: 小型高爾夫球場
           nature_reserve: 自然保護區
           park: 公園
-          pitch: 運動場
+          pitch: 運動場地
           playground: 遊樂場
           recreation_ground: 遊樂場
           sauna: 桑拿
           slipway: 船臺
-          sports_centre: 運動中心
-          stadium: 運動場
+          sports_centre: 體育中心
+          stadium: 體育館
           swimming_pool: 游泳池
           track: 跑道
           water_park: 水上公園
         military: 
           airfield: 軍用機場
-          barracks: 營房
+          barracks: 軍營
           bunker: 掩體
         mountain_pass: 
           "yes": 山口
@@ -649,13 +686,13 @@ zh-TW:
           cliff: 峭壁
           crater: 火山口
           dune: 沙丘
-          feature: 特征
-          fell: 費爾地貌
+          feature: 特徵
+          fell: 高原荒地
           fjord: 峽灣
           forest: 森林
           geyser: 間歇泉
           glacier: 冰川
-          heath: 希思地貌
+          heath: 石南樹叢
           hill: 小山
           island: 島
           land: 陸地
@@ -674,8 +711,8 @@ zh-TW:
           spring: 泉
           stone: 石
           strait: 海峡
-          tree: 樹
-          valley: 谷
+          tree: 樹木
+          valley: 山谷
           volcano: 火山
           water: 水
           wetland: 濕地
@@ -683,7 +720,7 @@ zh-TW:
           wood: 樹林
         office: 
           accountant: 會計師事務所
-          architect: 建築院
+          architect: 建築師樓
           company: 公司
           employment_agency: 就業中介
           estate_agent: 地產代理
@@ -703,8 +740,8 @@ zh-TW:
           hamlet: 村莊
           house: 房屋
           houses: 房屋
-          island: 島
-          islet: 嶼
+          island: 島嶼
+          islet: 小島
           isolated_dwelling: 獨立住宅
           locality: 地區
           moor: 荒野
@@ -713,32 +750,32 @@ zh-TW:
           postcode: 郵政編號
           region: 區域
           sea: 海
-          state: 狀態
+          state: 省
           subdivision: 細分
           suburb: 郊區
           town: 鄉鎮
           unincorporated_area: 非建制地區
           village: 村落
         railway: 
-          abandoned: 廢棄鐵路
+          abandoned: 鐵路線跡
           construction: 建造中鐵路
           disused: 廢棄鐵路
           disused_station: 廢棄火車站
-          funicular: 纜索鐵道
-          halt: 列車站
-          historic_station: 歷史火車站
+          funicular: 纜索鐵路
+          halt: 鐵路站
+          historic_station: 歷史鐵路站
           junction: 鐵路交匯處
           level_crossing: 道口
           light_rail: 輕鐵
           miniature: 微型鐵路
-          monorail: 單軌
+          monorail: 單軌鐵路
           narrow_gauge: 窄軌鐵路
           platform: 鐵路月臺
           preserved: 保留鐵路
           proposed: 規劃鐵路
           spur: 鐵路支線
-          station: 火車站
-          stop: 火車停車處
+          station: 鐵路站
+          stop: 鐵路停車處
           subway: 地鐵站
           subway_entrance: 地鐵出入口
           switch: 道岔
@@ -755,7 +792,7 @@ zh-TW:
           bicycle: 自行車店
           books: 書店
           boutique: 精品店
-          butcher: 屠夫
+          butcher: 肉食店
           car: 車店
           car_parts: 汽車零件
           car_repair: 汽車維修
@@ -838,7 +875,7 @@ zh-TW:
           museum: 博物館
           picnic_site: 野餐地
           theme_park: 主題公園
-          valley: 谷
+          valley: 山谷
           viewpoint: 觀景點
           zoo: 動物園
         tunnel: 
@@ -857,47 +894,93 @@ zh-TW:
           lock: 鎖
           lock_gate: 船閘
           mineral_spring: 礦泉
-          mooring: 系泊設備
+          mooring: 繫泊設備
           rapids: 急流
-          river: 河
+          river: 河流
           riverbank: 河岸
-          stream: 溪
+          stream: 小溪
           wadi: 乾河
           water_point: 取水處
           waterfall: 瀑布
           weir: 堰
   help_page: 
     help: 
+      description: 在OSM的問答網站提出問題或搜尋答案。
       title: help.openstreetmap.org
       url: https://help.openstreetmap.org/
+    introduction: OpenStreetMap有一些資源，可用於學習本計劃、提出和回答問題，以及討論和紀錄與製作地圖相關的話題。
+    title: 取得協助
     welcome: 
       description: 這個快速指南涵蓋了 OpenStreetMap 基礎知識。
       title: 歡迎來到 OSM
       url: /welcome
     wiki: 
+      description: 瀏覽wiki，取得詳盡的OSM文檔。
       title: wiki.openstreetmap.org
       url: http://wiki.openstreetmap.org/
   javascripts: 
     close: 關閉
+    edit_help: 將地圖移至你想編輯的位置並放大，然後按這裡。
+    key: 
+      tooltip: 圖例
+      tooltip_disabled: 圖例僅適用於標準圖層
     map: 
       base: 
         cycle_map: Cycle Map
+        hot: Humanitarian
+        mapquest: MapQuest Open
         standard: 標準
         transport_map: Transport Map
+      copyright: © <a href='%{copyright_url}'>OpenStreetMap貢獻者</a>
+      donate_link_text: <a class='donate-attr' href='%{donate_url}'>作出捐贈</a>
+      layers: 
+        data: 地圖圖資
+        header: 地圖圖層
+        notes: 地圖筆記
+        overlays: 啟用覆蓋層，以為地圖解決問題
+        title: 圖層
+      locate: 
+        popup: 你在該點的{distance}{unit}範圍內
+        title: 顯示我的位置
+      zoom: 
+        in: 放大
+        out: 縮小
+    notes: 
+      new: 
+        add: 提交筆記
+        intro: 發現錯誤或缺少些什麼東西嗎？請告訴其他地圖製作者以便於我們處理。將標記移動到正確的位置並輸入筆記，以解釋問題。（切勿在此輸入個人資料）
+      show: 
+        anonymous_warning: 此項筆記包含來自匿名用戶的評論，應作獨立核實。
+        comment: 提交評論
+        comment_and_resolve: 評論並關閉
+        hide: 隱藏
+        reactivate: 重啟
+        resolve: 關閉
     share: 
       cancel: 取消
+      center_marker: 將標記設為地圖中心點
       custom_dimensions: 設置自訂的尺寸
+      download: 下載
       embed: HTML
       format: 格式：
       image: 圖片
-      link: 連結或 HTML
+      image_size: 標準圖層圖片顯示尺寸為
+      include_marker: 包括標記
+      link: 連結或HTML
       long_link: 連結
-      scale: 比例
+      paste_html: 貼上HTML以嵌入網站
+      scale: 比例：
       short_link: 簡短連結
+      short_url: 簡短URL
       title: 分享
+      view_larger_map: 查看更大的地圖
     site: 
-      edit_disabled_tooltip: 拉近以編輯地圖
+      createnote_disabled_tooltip: 放大以在地圖加入筆記
+      createnote_tooltip: 在地圖加入筆記
+      edit_disabled_tooltip: 放大以編輯地圖
       edit_tooltip: 編輯地圖
+      map_data_zoom_in_tooltip: 放大以查看地圖圖資
+      map_notes_zoom_in_tooltip: 放大以查看筆記
   layouts: 
     about: 關於
     community: 社群
@@ -905,7 +988,7 @@ zh-TW:
     community_blogs_title: OpenStreetMap 社群成員的部落格
     copyright: 版權
     data: 資料
-    donate: 以 %{link} 給硬體升級基金來支援 OpenStreetMap。
+    donate: 以%{link}給硬體升級基金來支援 OpenStreetMap。
     edit: 編輯
     edit_with: 以 %{editor} 編輯
     export: 匯出
@@ -919,10 +1002,10 @@ zh-TW:
     home: 移至家的位置
     intro_2_create_account: 建立使用者帳號
     intro_header: 歡迎來到 OpenStreetMap！
-    intro_text: OpenStreetMap 是一個世界地圖，由像您這樣的人們所建立，在開放授權下可以自由使用。
+    intro_text: OpenStreetMap 是一幅世界地圖，由像您這樣的人們所建立，在開放授權下可以自由使用。
     learn_more: 了解更多
     log_in: 登入
-    log_in_tooltip: 以設定好的帳號登入
+    log_in_tooltip: 以現有帳號登入
     logo: 
       alt_text: OpenStreetMap 標誌
     logout: 登出
@@ -930,10 +1013,10 @@ zh-TW:
       text: 進行捐款
       title: 以捐贈金錢來支持 OpenStreetMap
     more: 更多
-    osm_offline: OpenStreetMap 資料庫目前離線中，直到必要的資料庫維護工作完成為止。
-    osm_read_only: OpenStreetMap 資料庫目前是唯讀模式，直到必要的資料庫維護工作完成為止。
+    osm_offline: OpenStreetMap 資料庫目前正在離線，直到必要的資料庫維護工作完成為止。
+    osm_read_only: OpenStreetMap 資料庫目前處於唯讀模式，直到必要的資料庫維護工作完成為止。
     partners_bytemark: Bytemark 主機代管
-    partners_html: 主機由%{ucl}、%{ic}、%{bytemark} 和其他 %{partners} 所支援。
+    partners_html: 主機由%{ucl}、%{ic}、%{bytemark}，和其他%{partners}所支援。
     partners_ic: 倫敦帝國學院
     partners_partners: 合作夥伴
     partners_ucl: 倫敦大學學院 VR 中心
@@ -946,20 +1029,42 @@ zh-TW:
   license_page: 
     foreign: 
       english_link: 英文原文
-      text: 這這個翻譯頁面和 %{english_original_link} 在事件上有衝突時，英文(English)網頁會有較高的優先權
+      text: 這個翻譯頁面和%{english_original_link}若有衝突，會以英文頁面為準
       title: 關於這個翻譯
     legal_babble: 
-      contributors_footer_1_html: "需要這些進一步資訊，以及其他用來協助改進\n OpenStreetMap 的資源，請查閱 OpenStreetMap Wiki 上的 <a\nhref=\"http://wiki.openstreetmap.org/wiki/Contributors\">貢獻者\n頁面</a>。"
+      attribution_example: 
+        alt: 如何在網頁上署名OpenStreetMap的例子
+        title: 署名的例子
+      contributors_at_html: <strong>奧地利</strong>：包含來自 <a href="http://data.wien.gv.at/">Stadt Wien</a>（<a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>授權）、<a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a>及 Land Tirol（修訂的<a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT</a>授權）的資料。
+      contributors_ca_html: "<strong>加拿大</strong>：包含來自GeoBase&reg;，GeoGratis（&copy; Department of Natural\nResources Canada），CanVec（&copy; Department of Natural\nResources Canada）和 StatCan（Geography Division,\nStatistics Canada）的資料。"
+      contributors_fi_html: "<strong>芬蘭</strong>: 包含來自\nNational Land Survey of Finland's Topographic Database\n及其他資料集的資料，以\n<a href=\"http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501\">NLSFI License</a>授權。"
+      contributors_footer_1_html: "若需要進一步詳情，以及其他曾用以協助改進\n OpenStreetMap 的資料來源，請參閱 OpenStreetMap Wiki 上的 <a\nhref=\"http://wiki.openstreetmap.org/wiki/Contributors\">貢獻者\n頁面</a>。"
+      contributors_footer_2_html: OpenStreetMap 收錄一項資料，並不意味原本的資料提供者認可OpenStreetMap、提供任何保證或承擔任何法律責任。
+      contributors_fr_html: "<strong>法國</strong>: 包含來自\nDirection Générale des Impôts的資料。"
+      contributors_gb_html: "<strong>英國</strong>: 包含來自Ordnance\nSurvey data（&copy; Crown copyright and database right\n2010-12）的資料。"
+      contributors_intro_html: 我們的貢獻者為成千上萬的人。我們也收納了從國家測繪機構及其他來源等取得的開放版權資料，其中包括：
+      contributors_nl_html: "<strong>荷蘭</strong>: 包含來自&copy; AND data, 2007\n(<a href=\"http://www.and.com\">www.and.com</a>)的資料。"
+      contributors_nz_html: "<strong>紐西蘭</strong>: 包含來自\nLand Information New Zealand（Crown Copyright reserved）的資料。"
       contributors_title_html: 我們的貢獻者
+      contributors_za_html: "<strong>南非</strong>: 包含來自\n<a href=\"http://www.ngi.gov.za/\">Chief Directorate:\nNational Geo-Spatial Information</a>（State copyright reserved）的資料。"
+      credit_1_html: 我們要求您以&ldquo;&copy; OpenStreetMap貢獻者&rdquo;標明作者。
+      credit_2_html: 您亦須清晰註明，有關數據可透過開放資料庫授權條款取得。若使用我們的影像塊，則須註明其製圖法是按CC-BY-SA授權。您可以透過連結至<a href="http://www.openstreetmap.org/copyright">此版權頁</a>以作註明。您亦可以指明並直接連結至授權文本（但若您要以數據形式發布OSM，這是必要條件）。在無法作出連結的媒體（如印刷品），我們建議你引導你的讀者至 openstreetmap.org（如註明OpenStreetMap的完整網址）、opendatacommons.org，及（如相關的話）creativecommons.org。
+      credit_3_html: "對於可瀏覽的電子地圖，標明出處的文字應放在地圖的一角。\n例如："
       credit_title_html: 如何標明作者是OpenStreetMap
+      infringement_1_html: OSM的貢獻者會被提醒，絕不要在沒有版權持有人的明確淮許下，添加來自任何有版權的來源的資料(如Google地圖或印刷地圖)。
+      infringement_2_html: 如果你認為有版權的材料被不恰當地添加到 OpenStreetMap 資料庫或此網站，請參見我們的<a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">撤除程序</a>，或直接在我們的<a href="http://dmca.openstreetmap.org/">網上申報頁面</a>提出。
       infringement_title_html: 侵犯版權
-      intro_1_html: OpenStreetMap為<i>開放資料</i>，以<a href="http://opendatacommons.org/licenses/odbl/">開放資料共用 開放資料庫</a>（ODbL）授權。
+      intro_1_html: OpenStreetMap為<i>開放資料</i>，以<a href="http://opendatacommons.org/licenses/odbl/">Open Data Commons 開放資料庫授權條款</a>（ODbL）授權。
+      intro_2_html: "您可以自由地複製、散布、傳輸及修改我們的資料，前提是您須標明作者為OpenStreetMap及其貢獻者。若您在我們的資料上作修改或據之衍生其他資料\n，則只可依相同授權條款散佈有關成果。授權的<a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">法律原文</a>詳述您的權責。"
+      intro_3_html: 我們地圖影像塊的製圖法以及我們的文件，以<a href="http://creativecommons.org/licenses/by-sa/2.0/">共享創意－署名－相同方式共享2.0</a>(CC BY-SA)條款授權。
+      more_1_html: "在<a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">常見法律問題</a>中，可閱讀更多關於使用我們的數據，以及如何標明我們是作者的資料。"
+      more_2_html: 雖然 OpenStreetMap 是開放資料，但我們無法為第三方開發人員提供免費的地圖 API。詳見我們的<a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">API使用政策</a>、<a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">地圖影像塊使用政策</a>及<a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim服務使用政策</a>。
       more_title_html: 了解更多
       title_html: 版權與授權條款
     native: 
       mapping_link: 開始製圖
-      native_link: 正體中文版
-      text: 您正在檢閱英文版本的版權頁。你可以返回這個網頁的 %{native_link} 或者您可以停止閱讀版權並%{mapping_link}。
+      native_link: 台灣正體中文版
+      text: 您正在檢閱英文版本的版權頁。你可以返回這個網頁的%{native_link}，您亦可以停止閱讀版權並%{mapping_link}。
       title: 關於此頁
   message: 
     delete: 
@@ -967,10 +1072,17 @@ zh-TW:
     inbox: 
       date: 日期
       from: 寄件者
+      messages: 您有%{new_messages}及%{old_messages}。
       my_inbox: 我的收件匣
-      no_messages_yet: 您還沒有訊息。何不跟 %{people_mapping_nearby_link} 的人們接觸看看？
+      new_messages: 
+        one: "%{count}項新訊息"
+        other: "%{count}項新訊息"
+      no_messages_yet: 您還沒有訊息。何不跟一些%{people_mapping_nearby_link}接觸看看？
+      old_messages: 
+        one: "%{count}項舊訊息"
+        other: "%{count}項舊訊息"
       outbox: 寄件匣
-      people_mapping_nearby: 附近製作地圖
+      people_mapping_nearby: 附近製作地圖的用戶
       subject: 主旨
       title: 收件匣
     mark: 
@@ -984,10 +1096,10 @@ zh-TW:
     new: 
       back_to_inbox: 回到收件匣
       body: 內文
-      limit_exceeded: 您剛剛才送出了很多的訊息。在嘗試寄出其他訊息之前請稍待一會兒。
+      limit_exceeded: 您最近寄出了大量的訊息。在嘗試寄出其他訊息之前請稍候。
       message_sent: 訊息已寄出
       send_button: 寄出
-      send_message_to: 寄出新訊息給 %{name}
+      send_message_to: 寄出新訊息給%{name}
       subject: 主旨
       title: 寄出訊息
     no_such_message: 
@@ -997,14 +1109,18 @@ zh-TW:
     outbox: 
       date: 日期
       inbox: 收件匣
+      messages: 
+        one: 您有%{count}項已寄訊息
+        other: 您有%{count}項已寄訊息
       my_inbox: 我的%{inbox_link}
-      no_sent_messages: 您還沒有寄出訊息。何不跟 %{people_mapping_nearby_link} 的人們接觸看看？
+      no_sent_messages: 您還沒有已寄訊息。何不跟一些%{people_mapping_nearby_link}接觸看看？
       outbox: 寄件匣
-      people_mapping_nearby: 附近製作地圖
+      people_mapping_nearby: 附近製作地圖的用戶
       subject: 主旨
       title: 寄件匣
       to: 收件者
     read: 
+      back: 返回
       date: 日期
       from: 寄件者
       reply_button: 回覆
@@ -1012,97 +1128,125 @@ zh-TW:
       title: 閱讀訊息
       to: 收件者
       unread_button: 標記為未讀
-      wrong_user: 您已經以「%{user}」的身分登入，但是您想要閱讀的訊息並非寄給那個使用者。請以正確的使用者身分登入以閱讀它。
+      wrong_user: 您已經以「%{user}」的身份登入，但是您想要閱讀的訊息並非寄給那個使用者。請以正確的使用者身份登入以閱讀它。
     reply: 
-      wrong_user: 您已經以「%{user}」的身分登入，但是您想要回覆的訊息並非寄給這個使用者。請以正確的使用者身分登入以回覆這個訊息。
+      wrong_user: 您已經以「%{user}」的身份登入，但是您想要回覆的訊息並非寄給這個使用者。請以正確的使用者身份登入以回覆這個訊息。
     sent_message_summary: 
       delete_button: 刪除
   note: 
+    description: 
+      closed_at_by_html: 於%{when}前由%{user}關閉
+      closed_at_html: 於%{when}前關閉
+      commented_at_by_html: 於%{when}前由%{user}更新
+      commented_at_html: 於%{when}前更新
+      opened_at_by_html: 於%{when}前由%{user}建立
+      opened_at_html: 於%{when}前建立
+      reopened_at_by_html: 於%{when}前由%{user}重啟
+      reopened_at_html: 於%{when}前重啟
+    entry: 
+      comment: 評論
+      full: 筆記原文
     mine: 
-      ago_html: "%{when} 前"
+      ago_html: "%{when}前"
       created_at: 建立於：
-      description: 描述
+      creator: 建立者
+      description: 說明
+      heading: "%{user}的筆記"
       last_changed: 最新變更
+      title: 由%{user}提交或評論的筆記
     rss: 
+      closed: 關閉的筆記（在%{place}附近）
+      commented: 新的評論（在%{place}附近）
+      description_area: 在你的區域[(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]所報告、評論或關閉的筆記的列表
+      description_item: 筆記%{id}的 RSS feed
+      opened: 新的筆記（在%{place}附近）
+      reopened: 重啟的筆記（在%{place}附近）
       title: OpenStreetMap 筆記
   notifier: 
     diary_comment_notification: 
-      footer: 您也可以在 %{readurl} 閱讀評論，並且在 %{commenturl} 留下評論或在 %{replyurl} 回覆
-      header: "%{from_user} 在您最近 OpenStreetMap 主旨為 %{subject} 的日記項目留下評論："
+      footer: 您也可以在 %{readurl} 閱讀評論，並且在 %{commenturl} 留下評論，或在 %{replyurl} 回覆
+      header: "%{from_user}在您最近主旨為%{subject}的 OpenStreetMap 日記項目留下評論："
       hi: "%{to_user}您好，"
-      subject: "[OpenStreetMap] %{user} 在您的日記項目留下評論"
+      subject: "[OpenStreetMap] %{user}在您的日記項目留下評論"
     email_confirm: 
       subject: "[OpenStreetMap] 確認您的電子郵件位址"
     email_confirm_html: 
       click_the_link: 如果這是您，請按下列連結確認此變更。
       greeting: 您好，
-      hopefully_you: 有人 (希望是您) 想要改變他的電子郵件位址 %{server_url} 為 %{new_address}。
+      hopefully_you: 有人 (希望是您) 想將他的電郵地址 %{server_url} 改變為 %{new_address}。
     email_confirm_plain: 
       click_the_link: 如果這是您，請按下列連結確認此變更。
       greeting: 您好，
+      hopefully_you: 有人（希望是您）希望在 %{server_url} 更改電郵地址至 %{new_address} 。
     friend_notification: 
-      befriend_them: 您可以在 %{befriendurl} 把他們加為朋友。
-      had_added_you: "%{user} 已在 OpenStreetMap 將您加入為朋友。"
+      befriend_them: 您可以在 %{befriendurl} 把他加入為朋友。
+      had_added_you: "%{user}已在 OpenStreetMap 將您加入為朋友。"
       see_their_profile: 您可以在 %{userurl} 查看他的資料。
-      subject: "[OpenStreetMap] %{user} 將您加入朋友"
+      subject: "[OpenStreetMap] %{user}將您加入為朋友"
     gpx_notification: 
-      and_no_tags: 且沒有標籤。
-      and_the_tags: 且標籤為：
+      and_no_tags: 並且沒有標籤。
+      and_the_tags: 並且標籤為：
       failure: 
-        failed_to_import: 匯入失敗。這裡是錯誤訊息：
+        failed_to_import: 看來匯入失敗。錯誤訊息為：
         more_info_1: 更多關於 GPX 匯入失敗與如何避免它們的
         more_info_2: 資訊可在這裡找到：
         subject: "[OpenStreetMap] GPX 匯入失敗"
       greeting: 您好，
       success: 
-        loaded_successfully: "成功載入可能 %{possible_points} 點中的\n%{trace_points} 點。"
+        loaded_successfully: "成功載入可能為 %{possible_points} 點中的\n%{trace_points} 點。"
         subject: "[OpenStreetMap] GPX 匯入成功"
-      with_description: 描述為
+      with_description: 附有說明為
       your_gpx_file: 您的 GPX 檔案
     lost_password: 
       subject: "[OpenStreetMap] 密碼重設要求"
     lost_password_html: 
       click_the_link: 如果這是您，請按下列連結重設您的密碼。
       greeting: 您好，
-      hopefully_you: 有人 (希望是您) 要求重設這個電子郵件位址的 openstreetmap.org 帳號密碼。
+      hopefully_you: 有人 (或許是您) 要求將以此電郵地址註冊的 openstreetmap.org 帳戶，重設密碼。
     lost_password_plain: 
       click_the_link: 如果這是您，請按下列連結重設您的密碼。
       greeting: 您好，
+      hopefully_you: 有人 (或許是您) 要求將以此電郵地址註冊的 openstreetmap.org 帳戶，重設密碼。
     message_notification: 
-      header: "%{from_user} 透過 OpenStreetMap 寄給您主旨為 %{subject} 的訊息："
+      footer_html: 您也可以在 %{readurl} 閱讀訊息，並且在 %{replyurl} 回覆
+      header: "%{from_user}透過 OpenStreetMap 寄給您主旨為%{subject}的訊息："
       hi: "%{to_user}您好，"
     note_comment_notification: 
       anonymous: 匿名使用者
       greeting: 您好，
     signup_confirm: 
+      confirm: 在我們作出任何動作之前，我們需要確認這是您提出的要求。如果確實是這樣，請按以下連結，以確認你的帳戶：
+      created: 有人（希望是您）剛在 %{site_url} 建立了帳戶。
       greeting: 您好！
       subject: "[OpenStreetMap] 歡迎加入OpenStreetMap"
+      welcome: 在確認你的帳戶後，我們將提供一些額外的訊息，幫助你開始使用OpenStreetMap。
   oauth: 
     oauthorize: 
       allow_read_gpx: 讀取您的私人 GPS 軌跡。
       allow_read_prefs: 讀取您的使用者偏好設定。
       allow_to: 允許客戶端應用程式：
       allow_write_api: 修改地圖。
-      allow_write_diary: 建立日記、註解和設定朋友。
+      allow_write_diary: 建立日記、註解和加入朋友。
       allow_write_gpx: 上傳 GPS 軌跡。
-      allow_write_notes: 修改節點。
+      allow_write_notes: 修改筆記。
       allow_write_prefs: 修改您的使用者偏好設定。
-      request_access: 應用程式 %{app_name} 要求存取您的帳號，%{user}。請確定您要讓此應用程式使用下列功能。您可以依自己的意思選擇。
+      request_access: 應用程式 %{app_name} 要求使用您的帳戶，%{user}。請確定您要讓此應用程式使用下列功能。您可以依自己喜好，選擇多少項功能。
+      title: 授權使用您的帳戶
     oauthorize_failure: 
-      denied: 您已拒絕應用程式 %{app_name} 存取您的帳號。
-      invalid: 授權記號是不正確。
+      denied: 您已拒絕應用程式 %{app_name} 使用您的帳戶。
+      invalid: 授權記號並不合法。
       title: 授權請求失敗
     oauthorize_success: 
-      allowed: 您已授權應用程式 %{app_name} 存取您的帳號。
-      title: 授權請求允許
+      allowed: 您已授權應用程式 %{app_name} 使用您的帳戶。
+      title: 允許授權請求
       verification: 驗證碼是 %{code}。
     revoke: 
-      flash: 您已經註銷 %{application} 的記號。
+      flash: 您已經註銷 %{application} 的授權記號。
   oauth_clients: 
     create: 
       flash: 註冊資訊成功
     destroy: 
-      flash: 已破壞此客戶端應用程式註冊
+      flash: 已銷毀此客戶端應用程式註冊
     edit: 
       submit: 編輯
       title: 編輯您的應用程式
@@ -1112,8 +1256,9 @@ zh-TW:
       allow_write_api: 修改地圖。
       allow_write_diary: 建立日記、註解和設定朋友。
       allow_write_gpx: 上傳 GPS 軌跡。
+      allow_write_notes: 修改筆記。
       allow_write_prefs: 修改他們的使用者偏好設定。
-      callback_url: 召回 URL
+      callback_url: 召回（Callback) URL
       name: 名稱
       requests: 向使用者要求下列權限：
       required: 必要的
@@ -1122,7 +1267,7 @@ zh-TW:
     index: 
       application: 應用程式名稱
       issued_at: 簽發於
-      list_tokens: 下列記號已發給您名下的應用程式：
+      list_tokens: 下列授權記號已發給您名下的應用程式：
       my_apps: 我的客戶端應用程式
       my_tokens: 我授權的應用程式
       no_apps: 您是否有想要註冊以使用於 %{oauth} 標準的應用程式？您必須先註冊您的網頁應用程式，才能對這個服務進行 OAuth 要求。
@@ -1142,6 +1287,7 @@ zh-TW:
       allow_write_api: 修改地圖。
       allow_write_diary: 建立日記、註解和設定朋友。
       allow_write_gpx: 上傳 GPS 軌跡。
+      allow_write_notes: 修改筆記。
       allow_write_prefs: 修改他們的使用者偏好設定。
       authorize_url: 授權 URL：
       confirm: 您確定嗎？
@@ -1155,14 +1301,16 @@ zh-TW:
       url: 要求記號 URL：
     update: 
       flash: 更新客戶端資訊成功
+  printable_name: 
+    with_version: "%{id}，版本%{version}"
   redaction: 
     edit: 
-      description: 描述
+      description: 說明
     new: 
-      description: 描述
+      description: 說明
     show: 
       confirm: 您確定嗎？
-      description: 描述：
+      description: 說明：
       user: 建立者：
     update: 
       flash: 已儲存更改。
@@ -1172,16 +1320,18 @@ zh-TW:
       flash_player_required: 您需要 Flash player 才能使用 Potlatch，OpenStreetMap Flash 編輯器。您可以<a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">在 Adobe.com 下載 Flash Player</a>。<a href="http://wiki.openstreetmap.org/wiki/Editing">還有其他許多選擇</a>也可以編輯 OpenStreetMap。
       id_not_configured: iD 尚未設定
       no_iframe_support: 您的瀏覽器不支持 HTML 嵌入式框架，這是這項功能所必要的。
-      not_public: 您尚未將您的編輯開放至公領域。
-      not_public_description: 在您這麼做之前將無法再編輯地圖。您可以在您的%{user_page}將自己的編輯設定為公領域。
+      not_public: 您尚未將您的編輯設為公開。
+      not_public_description: 在您這麼做之前將無法再編輯地圖。您可以在您的%{user_page}將自己的編輯設定為公開。
       potlatch2_unsaved_changes: 您有未儲存的更改。（要在 Potlatch 2 中儲存，您應按一下儲存。)
       potlatch_unsaved_changes: 您還有未儲存的變更。 (要在 Potlatch 中儲存，您應該取消選擇目前的路徑或節點(如果是在清單模式編輯)，或是點選儲存(如果有儲存按鈕)。)
       user_page_link: 使用者頁面
     index: 
-      createnote: 添加注釋
+      createnote: 添加筆記
       js_1: 您使用不支援 JavaScript 的瀏覽器，或者停用了 JavaScript。
       js_2: OpenStreetMap 使用 JavaScript 讓地圖更平順。
-      permalink: 永久鏈接
+      license: 
+        copyright: 版權所有，由OpenStreetMap及貢獻者根據開放的授權協議提供
+      permalink: 永久連結
       remote_failed: 編輯失敗 - 請確定已載入 JOSM 或 Merkaartor 並啟用遠端控制選項
       shortlink: 簡短連結
     key: 
@@ -1189,22 +1339,25 @@ zh-TW:
         entry: 
           admin: 行政區邊界
           apron: 
-            - Airport apron
-            - terminal
+            - 機場停機坪
+            - 機場客運大樓
+          bridge: 黑線描邊 = 橋樑
           bridleway: 馬道
-          building: 特殊建築
+          brownfield: 棕地
+          building: 重要建築
           byway: 鄉間小路
           cable: 
             - 纜車
-            - chair lift
+            - 吊椅
           cemetery: 墳場
-          centre: 運動中心
+          centre: 體育中心
           commercial: 商業區
           common: 
             - 公地
             - 草地
           construction: 建築中路段
           cycleway: 自行車道
+          destination: 只限前往目的地
           farm: 農田
           footway: 步道
           forest: 森林
@@ -1216,10 +1369,12 @@ zh-TW:
           military: 軍事區
           motorway: 高速公路
           park: 公園
+          permissive: 獲准許者可使用
+          pitch: 運動場地
           primary: 主要道路
           private: 私有
           rail: 鐵路
-          reserve: 自然保留區
+          reserve: 自然保護區
           resident: 住宅區
           retail: 零售區
           runway: 
@@ -1229,19 +1384,20 @@ zh-TW:
             - 學校
             - 大學
           secondary: 次要道路
-          station: 火車站
-          subway: 地下鐵
+          station: 鐵路站
+          subway: 地下鐵路
           summit: 
             - 提交
-            - peak
+            - 山頂
           tourist: 旅遊景站
-          track: 產業道路
+          track: 行車小徑
           tram: 
-            - 輕軌電車
-            - tram
-          trunk: 快速道路
-          unclassified: 未分類道路
-          unsurfaced: 無鋪面道路
+            - 輕便鐵路
+            - 電車
+          trunk: 主要幹路
+          tunnel: 虛線描邊 = 隧道
+          unclassified: 未分級道路
+          unsurfaced: 未鋪裝道路
           wood: 樹木
     markdown_help: 
       alt: 替代文字
@@ -1270,15 +1426,19 @@ zh-TW:
       search_results: 搜尋結果
   time: 
     formats: 
-      friendly: "%Y %B %e  於 %H:%M"
+      blog: "%Y年 %B %e日"
+      friendly: "%Y年 %B %e日 %H 時 %M 分"
   trace: 
     create: 
       trace_uploaded: 您的 GPX 檔案已經上傳並且在等候進入資料庫中。這通常不會超過半小時，完成時會以電子郵件通知您。
       upload_trace: 上傳 GPS 軌跡
     delete: 
-      scheduled_for_deletion: 軌跡已預定刪除
+      scheduled_for_deletion: 軌跡已被排程刪除
     description: 
-      description_without_count: "%{user} 的 GPX 檔案"
+      description_with_count: 
+        one: 由%{user}上載的 GPX 檔案，含有%{count}點
+        other: 由%{user}上載的 GPX 檔案，含有%{count}點
+      description_without_count: 由%{user}上載的 GPX 檔案
     edit: 
       description: 描述：
       download: 下載
@@ -1299,11 +1459,11 @@ zh-TW:
     georss: 
       title: OpenStreetMap GPS 軌跡
     list: 
-      description: 流覽最近的 GPS 軌跡上傳
+      description: 瀏覽最近的 GPS 軌跡上傳
       empty_html: 還沒有軌跡。<a href='%{upload_link}'>上傳新的軌跡</a>或在 <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki 頁面</a>上瞭解更多有關 GPS 軌跡的資訊。
       public_traces: 公開 GPS 軌跡
       public_traces_from: "%{user} 的公開 GPS 軌跡"
-      tagged_with: " 標籤為 %{tags}"
+      tagged_with: 有如下標籤：%{tags}
       your_traces: 您的 GPS 軌跡
     make_public: 
       made_public: 軌跡標記為公開
@@ -1313,7 +1473,7 @@ zh-TW:
     offline_warning: 
       message: GPX 檔案上傳系統目前無法使用
     trace: 
-      ago: "%{time_in_words_ago} 之前"
+      ago: "%{time_in_words_ago}之前"
       by: 由
       count_points: "%{count} 個點"
       edit: 編輯
@@ -1329,7 +1489,7 @@ zh-TW:
       trackable: 可追蹤
       view_map: 檢視地圖
     trace_form: 
-      description: 描述：
+      description: 說明：
       help: 求助
       tags: 標籤：
       tags_help: 以逗點分隔
@@ -1340,7 +1500,7 @@ zh-TW:
     trace_header: 
       see_all_traces: 查看所有的軌跡
       see_your_traces: 查看您所有的軌跡
-      traces_waiting: 您有 %{count} 個軌跡等待上傳。請先等待這些結束後才做進一步的上傳，如此才不會阻擋其他使用者的排程。
+      traces_waiting: 您有 %{count} 個軌跡等待上傳。請先等待這些結束後才作進一步的上傳，以免阻礙其他使用者的排程。
       upload_trace: 上傳軌跡
     trace_optionals: 
       tags: 標籤
@@ -1376,15 +1536,18 @@ zh-TW:
     account: 
       contributor terms: 
         agreed: 您已同意新的貢獻者條款。
+        agreed_with_pd: 您亦同意將您的編輯放到公共領域
         heading: 貢獻者條款：
         link text: 這是什麼？
         not yet agreed: 您未同意新的貢獻者條款。
-      current email address: 目前的電子郵件位址：
+        review link text: 請跟隨此連結，方便你查看並接受新的貢獻者條款。
+      current email address: 目前的電子郵件地址：
       delete image: 移除目前的圖片
       email never displayed publicly: (永遠不公開顯示)
-      flash update success: 使用者資訊成功的更新。
-      flash update success confirm needed: 使用者資訊成功的更新。請檢查您的電子郵件是否收到確認新電子郵件位址的通知。
+      flash update success: 使用者資訊已成功更新。
+      flash update success confirm needed: 使用者資訊成功的更新。請檢查您的電子郵件，以確認收到新電子郵件地址的通知。
       gravatar: 
+        gravatar: 使用Gravatar
         link text: 這是什麼？
       home location: 家的位置：
       image: 圖片：
@@ -1394,7 +1557,7 @@ zh-TW:
       longitude: 經度：
       make edits public button: 將我所有的編輯設為公開
       my settings: 我的設定值
-      new email address: 新的電子郵件位址：
+      new email address: 新的電子郵件地址：
       new image: 加入圖片
       no home location: 您尚未輸入家的位置。
       openid: 
@@ -1413,51 +1576,56 @@ zh-TW:
         heading: 公開編輯：
       public editing note: 
         heading: 公開編輯
-        text: 目前您的編輯是匿名的，人們不能發送郵件給您或看到您的位置。為了顯示你的編輯，讓別人透過網站與您聯繫，請點擊下面的按鈕。 <b>由於 0.6 API 的轉換，只有公開的使用者可以編輯地圖資料</b> 。 （ <a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">知道為什麼</a> ）。 <ul><li>您的電子郵件位址將不會被因為成為公開使用者而被透露。 </li><li>這個動作不能逆轉，所有新的使用者現在都預設為公開的。 </li></ul>
+        text: 目前您的編輯是匿名的，人們不能發送郵件給您或看到您的位置。為了顯示你的編輯，讓別人透過網站與您聯繫，請點擊下面的按鈕。 <b>由於 0.6 API 的轉換，只有公開的使用者可以編輯地圖資料</b> 。 （ <a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">知道為什麼</a> ）。 <ul><li>您的電子郵件地址將不會被因為成為公開使用者而被透露。 </li><li>這個動作不能逆轉，所有新的使用者現在都預設為公開的。 </li></ul>
       replace image: 取代目前的圖片
       return to profile: 回到設定檔
       save changes button: 儲存變更
-      title: 編輯帳號
+      title: 編輯帳戶
       update home location on click: 當我點選地圖時更新家的位置？
     confirm: 
+      already active: 該帳戶已經確認。
       button: 確認
-      heading: 請檢查您的電子郵件
-      introduction_1: 我們寄給您一封確認電子郵件。
-      press confirm button: 按下確認按鈕以啟用您的帳號。
+      heading: 請檢查您的電子郵件！
+      introduction_1: 我們寄給您一封確認電郵。
+      introduction_2: 按電子郵件中的連結以確認你的帳戶，然後你就可以開始繪製地圖。
+      press confirm button: 按下確認按鈕以啟用您的帳戶。
+      reconfirm_html: 如果你需要我們重新發送確認電郵，<a href="%{reconfirm}">請按這裡</a>。
+      unknown token: 確認碼已經過期或不存在。
     confirm_email: 
       button: 確認
-      failure: 具有此記號的電子郵件位址已經確認過了。
+      failure: 具有此記號的電子郵件地址已經確認過了。
       heading: 確認電子郵件位址的變更
-      press confirm button: 按下確認按鈕以確認您的新電子郵件位址。
-      success: 已確認您的電子郵件位址，感謝您的註冊！
+      press confirm button: 按下確認按鈕以確認您的新電子郵件地址。
+      success: 已確認您的電子郵件地址，感謝您的註冊！
     confirm_resend: 
       failure: 找不到使用者 %{name}。
+      success: 我們已經發送一封新的確認電郵到%{email}，只要你確認你的帳戶，你就可以開始製圖了。 <br /><br />如果你使用會發送確認請求的反垃圾郵件系統，請確保你將webmaster@openstreetmap.org加入白名單中，因為我們無法回覆任何確認請求。
     filter: 
-      not_an_administrator: 您需要一個管理者來執行該動作。
+      not_an_administrator: 您需要一個行政員才可執行該動作。
     go_public: 
-      flash success: 現在您所有的編輯都是公開的，因此您已有編輯的權利。
+      flash success: 現在您所有的編輯都是公開的，而您已獲准編輯。
     list: 
       confirm: 確認選取的使用者
       empty: 找不到符合的使用者
       heading: 使用者
       hide: 隱藏選取的使用者
       showing: 
-        one: 顯示頁面 %{page} (%{first_item} / %{items})
-        other: 顯示頁面 %{page} (%{first_item}-%{last_item} / %{items})
-      summary: "%{name} 由 %{ip_address} 於 %{date} 建立"
-      summary_no_ip: "%{name} 建立於： %{date}"
+        one: 頁面 %{page} (%{first_item} / %{items})
+        other: 頁面 %{page} (%{first_item}-%{last_item} / %{items})
+      summary: "%{name}由%{ip_address}於%{date}建立"
+      summary_no_ip: "%{name}建立於：%{date}"
       title: 使用者
     login: 
       account is suspended: 很抱歉，您的帳戶已經因可疑活動被暫停。<br>請如果您想要討論這個問題，請與<a href="%{webmaster}">網站管理員</a>聯繫。
-      account not active: 抱歉，您的帳號尚未啟用。<br />請點選帳號確認電子郵件中的連結來啟用您的帳號，或是<a href="%{reconfirm}">要求寄一封新的確認信</a>。
-      auth failure: 抱歉，無法以這些資料登入。
-      create account minute: 建立一個帳號。只需要一分鐘。
+      account not active: 抱歉，您的帳戶尚未啟用。<br />請點選帳戶確認電子郵件中的連結來啟用您的帳戶，或<a href="%{reconfirm}">要求發出新的確認電郵</a>。
+      auth failure: 很抱歉，無法以這些資料登入。
+      create account minute: 建立一個帳戶。只需要一分鐘。
       email or username: 電子郵件位址或使用者名稱：
       heading: 登入
       login_button: 登入
       lost password link: 忘記您的密碼？
       new to osm: 第一次來到 OpenStreetMap？
-      no account: 還沒有帳號嗎？
+      no account: 還沒有帳戶嗎？
       openid: "%{logo} OpenID："
       openid invalid: 很抱歉，您的 OpenID 格式似乎不正確
       openid missing provider: 很抱歉，無法聯繫您的 OpenID 提供者
@@ -1485,46 +1653,51 @@ zh-TW:
       register now: 立即註冊
       remember: 記住我：
       title: 登入
-      to make changes: 要更改的 OpenStreetMap 的資料，您必須擁有一個帳號。
+      to make changes: 要更改的 OpenStreetMap 的資料，您必須擁有一個帳戶。
       with openid: 或者請使用 OpenID 登錄：
-      with username: 已經有 OpenStreetMap 的帳號嗎？請使用您的使用者名和密碼登錄：
+      with username: 已經有 OpenStreetMap 的帳戶嗎？請使用您的使用者名和密碼登錄：
     logout: 
       heading: 從 OpenStreetMap 登出
       logout_button: 登出
       title: 登出
     lost_password: 
-      email address: 電子郵件位址：
+      email address: 電子郵件地址：
       heading: 忘記密碼？
-      help_text: 輸入您的電子郵件位址來註冊，我們會寄出連結給它，而您可以用它來重設密碼。
-      new password button: 傳送給我新的密碼
-      notice email cannot find: 找不到該電子郵件位址，抱歉。
-      notice email on way: 很遺憾您忘了它 :-( 但是一封讓您可以重設它的郵件已經寄出。
+      help_text: 輸入您的電子郵件地址來註冊，我們會將連結送至該地址，而您可以用它來重設密碼。
+      new password button: 重設密碼
+      notice email cannot find: 找不到該電子郵件地址，抱歉。
+      notice email on way: 很遺憾您忘了它 :-( 不過讓您可以重設它的電子郵件已經寄出，您待會便可重設。
       title: 遺失密碼
     make_friend: 
-      already_a_friend: 您已經是 %{name} 的朋友了。
-      button: 加入朋友
-      failed: 抱歉，無法將 %{name} 加入為朋友。
-      heading: 將 %{user} 加為朋友？
-      success: "%{name} 現在成為您的朋友！"
+      already_a_friend: 您已經是%{name}的朋友了。
+      button: 加入為朋友
+      failed: 抱歉，無法將%{name}加入為朋友。
+      heading: 將%{user}加入為朋友？
+      success: "%{name}現在已成為您的朋友！"
     new: 
-      confirm email address: 確認電子郵件位址：
+      about: 
+        header: 自由及可編輯
+        html: "<p>與其他地圖不同，OpenStreetMap是完全由像你一樣的人們創建的，而且任何人都可自由地修正、更新、下載和使用。</p>\n<p>請註冊以開始貢獻吧。我們將發出電郵以確認你的帳戶。</p>"
+      confirm email address: 確認電子郵件地址：
       confirm password: 確認密碼：
-      contact_webmaster: 請連絡 <a href="mailto:webmaster@openstreetmap.org">網站管理者</a>安排要建立的帳號，我們會儘快嘗試並處理這個要求。
+      contact_webmaster: 請聯絡 <a href="mailto:webmaster@openstreetmap.org">網站管理者</a>安排要建立的帳戶，我們會儘快嘗試並處理這個要求。
       continue: 註冊
       display name: 顯示名稱：
       display name description: 您公開顯示的使用者名稱。您可以稍後在偏好設定中改變它。
-      email address: 電子郵件位址：
-      license_agreement: 當您確認您的帳號，您需要同意<a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">貢獻者條款</a> 。
-      no_auto_account_create: 很不幸的我們現在無法自動為您建立帳號。
+      email address: 電子郵件地址：
+      license_agreement: 當您確認您的帳戶，您需要同意<a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">貢獻者條款</a> 。
+      no_auto_account_create: 很不幸的我們現在無法自動為您建立帳戶。
       not displayed publicly: 不要公開顯示 (請看 <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">隱私權政策</a>)
       openid: "%{logo} OpenID："
+      openid association: "<p>你的 OpenID 尚未與一個 OpenStreetMap 帳戶相關聯。</p>\n<ul>\n  <li>如果你是新來到OpenStreetMap，請使用下面的表單建立一個新的帳戶。 </li>\n <li>\n   如果你已經有一個帳戶，你可以使用你的用戶名稱和密碼登入你的帳戶，然後在你的用戶設置中關聯你的OpenID。 \n </li>\n</ul>"
       openid no password: 使用 OpenID 時密碼不是必需的，但可能仍需要一些額外的工具或伺服器。
       password: 密碼：
       terms accepted: 感謝您接受新的貢獻條款！
+      terms declined: 我們很遺憾你已決定不接受新的貢獻者條款。有關詳細信息，請參閱<a href="%{url}">此wiki頁面</a>.
       title: 註冊
       use openid: 或者，使用 %{logo} OpenID 登入
     no_such_user: 
-      body: 抱歉，沒有名為 %{user} 的使用者。請檢查您的拼字，或者可能是按到錯誤的連結。
+      body: 抱歉，沒有名為 %{user} 的使用者。請檢查您的拼字，或者可能是您按到錯誤的連結。
       heading: 使用者 %{user} 不存在
       title: 沒有這個使用者
     popup: 
@@ -1534,8 +1707,8 @@ zh-TW:
     remove_friend: 
       button: 移除朋友
       heading: 移除朋友%{user}？
-      not_a_friend: "%{name} 並不在您的朋友裡。"
-      success: "%{name} 已從您的朋友中移除。"
+      not_a_friend: "%{name}並不是您的朋友。"
+      success: "%{name}已從您的朋友中移除。"
     reset_password: 
       confirm password: 確認密碼：
       flash changed: 您的密碼已經變更。
@@ -1547,193 +1720,218 @@ zh-TW:
     set_home: 
       flash success: 家的位置成功的儲存
     suspended: 
-      body: "<p>\n對不起，您的帳戶已因可疑\n活動被自動暫停。 \n</p>\n<p>\n這項決定將在短期內由管理員審核，或是如果你想討論這一點\n，可以聯絡%{webmaster}。 \n</p>"
-      heading: 帳號已暫停
-      title: 帳號已暫停
+      body: "<p>\n對不起，您的帳戶已因可疑\n活動被自動暫停。 \n</p>\n<p>\n這項決定將在短期內由行政員審核，或是如果你想討論這一點\n，可以聯絡%{webmaster}。 \n</p>"
+      heading: 帳戶已暫停
+      title: 帳戶已暫停
       webmaster: 網站管理員
     terms: 
       agree: 同意
-      consider_pd: 除了上述協議，我同意將我的貢獻授權為公共領域
+      consider_pd: 在上述協議之上，我同意將我的貢獻放到公共領域
       consider_pd_why: 這是什麼？
       decline: 拒絕
+      guidance: 幫助理解這些條款的資料：一個<a href="%{summary}">供普通人閱讀的摘要</a>和一些<a href="%{translations}">非正式翻譯</a>
       heading: 貢獻者條款
       legale_names: 
         france: 法國
         italy: 意大利
         rest_of_world: 世界其他地區
-      legale_select: 請選擇您居住的國家：
+      legale_select: 請選擇您的居住地：
+      read and accept: 請閱讀下面的協議並按同意按鈕，以確認為你現有的和將來的貢獻接受本協議的條款。
       title: 貢獻者條款
+      you need to accept or decline: 請先閱讀，然後選擇接受或拒絕新的貢獻者條款，再繼續。
     view: 
       activate_user: 啟用這個使用者
-      add as friend: 加入朋友
-      ago: (%{time_in_words_ago} 之前)
+      add as friend: 加入為朋友
+      ago: (%{time_in_words_ago}之前)
       block_history: 接受封禁
-      blocks by me: 被我所阻擋
-      blocks on me: 對我的阻擋
+      blocks by me: 我所設的封禁
+      blocks on me: 對我的封禁
       comments: 評論
       confirm: 確認
       confirm_user: 確認這個使用者
-      create_block: 阻擋這個使用者
+      create_block: 封禁這個使用者
       created from: 建立於：
-      ct accepted: 於 %{ago} 前接受
+      ct accepted: 於%{ago}前接受
       ct declined: 已拒絕
       ct status: 貢獻者條款：
       ct undecided: 未決定
       deactivate_user: 停用這個使用者
       delete_user: 刪除這個使用者
-      description: 描述
+      description: 說明
       diary: 日記
       edits: 編輯
-      email address: 電子郵件位址：
+      email address: 電子郵件地址：
+      friends_changesets: 朋友的變更組合
+      friends_diaries: 朋友的日記項目
       hide_user: 隱藏這個使用者
       if set location: 您可以在%{settings_link}頁面設定您家的位置，以查看附近的用戶。
-      km away: "%{count} 公里遠"
-      latest edit: 上次編輯於 %{ago}：
-      m away: "%{count} 公尺遠"
-      mapper since: 成為製圖者於：
-      moderator_history: 執行封禁者
+      km away: "%{count}公里遠"
+      latest edit: 上次編輯於%{ago}：
+      m away: "%{count}公尺遠"
+      mapper since: 註冊為製圖者日期：
+      moderator_history: 給予封禁
       my comments: 我的評論
       my diary: 我的日記
       my edits: 我的編輯
+      my messages: 我的訊息
       my notes: 我的筆記
       my profile: 我的設定檔
       my settings: 我的設定值
       my traces: 我的軌跡
       nearby users: 其他附近的使用者
-      new diary entry: 新增日記
+      nearby_changesets: 附近使用者的變更組合
+      nearby_diaries: 附近使用者的日記項目
+      new diary entry: 新增日記項目
       no friends: 您尚未加入任何朋友。
-      no nearby users: 附近沒有在進行製圖的使用者。
+      no nearby users: 附近沒有已加入製圖的使用者。
       notes: 地圖筆記
       oauth settings: oauth 設定值
       remove as friend: 移除朋友
       role: 
-        administrator: 這個使用者是管理者
+        administrator: 這個使用者是一個行政員
         grant: 
-          administrator: 授予管理員存取權限
-        moderator: 此使用者是一個管理者
+          administrator: 授予行政員權限
+          moderator: 授予管理者權限
+        moderator: 這個使用者是一個管理者
+        revoke: 
+          administrator: 撇銷行政員權限
+          moderator: 撇銷管理者權限
       send message: 傳送訊息
       settings_link_text: 設定
       spam score: 垃圾郵件分數：
       status: 狀態：
       traces: 軌跡
-      unhide_user: 取消隱藏該使用者
+      unhide_user: 取消隱藏這個使用者
       user location: 使用者位置
       your friends: 您的朋友
   user_block: 
     blocks_by: 
-      empty: "%{name} 尚未設定任何阻擋。"
-      heading: 列出 %{name} 所設定的阻擋
-      title: "%{name} 設的阻擋"
+      empty: "%{name}尚未設定任何封禁。"
+      heading: 列出%{name}所設定的封禁
+      title: "%{name}設的封禁"
     blocks_on: 
-      empty: "%{name} 尚未被阻擋。"
-      heading: 對 %{name} 阻擋的清單
-      title: 對 %{name} 的阻擋
+      empty: "%{name}尚未被封禁。"
+      heading: 對%{name}封禁的清單
+      title: 對%{name}的封禁
     create: 
-      flash: 已建立對使用者 %{name} 的阻擋。
-      try_contacting: 在阻擋使用者之前請先試著聯繫他們，並給予他們一段合理的時間作出回應。
-      try_waiting: 在阻擋使用者之前請試著給使用者一段合理的時間來回應。
+      flash: 已建立對使用者%{name}的封禁。
+      try_contacting: 在封禁使用者之前請先嘗試聯繫他，並給予他一段合理的時間作出回應。
+      try_waiting: 在封禁使用者之前請先嘗試給使用者一段合理的時間來回應。
     edit: 
-      back: 檢視所有的阻擋
-      heading: 正在編輯對 %{name} 的阻擋
-      needs_view: 在清除這個阻擋之前是否需要使用者登入？
-      period: 從現在開始，這個使用者要被阻擋不能使用 API 多久。
-      reason: "%{name} 之所以被阻擋的理由。請以冷靜、合理的態度，盡量詳細的說明有關情況。請記住，並非所有使用者都了解社群的術語，所以請嘗試使用較為通用的說法。"
-      show: 檢視這個阻擋
-      submit: 更新阻擋
-      title: 正在編輯對 %{name} 的阻擋
+      back: 檢視所有的封禁
+      heading: 正在編輯對%{name}的封禁
+      needs_view: 在清除這項封禁之前是否需要使用者登入？
+      period: 從現在開始，這個使用者將被禁止使用 API 多久。
+      reason: "%{name}之所以被封禁的理由。請盡量以平靜、合理的態度，詳細的說明有關情況。請記住並非所有使用者都了解社群的術語，所以請嘗試使用較為通用的說法。"
+      show: 檢視這項封禁
+      submit: 更新封禁
+      title: 正在編輯對%{name}的封禁
     filter: 
-      block_expired: 這個阻擋已經逾期並且不能再編輯。
-      block_period: 阻擋的期間必須是在下拉式選單中可選擇的數值之一。
+      block_expired: 這項封禁已經逾期並且不能被編輯。
+      block_period: 封禁期間必須是在下拉式選單中可選擇的其中一項數值。
     helper: 
-      time_future: 結束於 %{time}。
-      time_past: 結束於 %{time} 之前。
-      until_login: 作用到這個使用者登入為止。
+      time_future: 於%{time}結束。
+      time_past: 於%{time}之前結束。
+      until_login: 生效直至這個使用者登入為止。
     index: 
-      empty: 尚未設定任何使用者阻擋。
-      heading: 使用者阻擋清單
-      title: 使用者阻擋
+      empty: 尚未設定任何使用者封禁。
+      heading: 使用者封禁清單
+      title: 使用者封禁
+    model: 
+      non_moderator_revoke: 只有管理者才可撇銷封禁。
+      non_moderator_update: 只有管理者才可作出或更新封禁。
     new: 
-      back: 檢視所有阻擋
-      heading: 正在建立對 %{name} 的阻擋
-      needs_view: 需要使用者登入才能解除這個阻擋
-      period: 從現在開始，這個使用者將被 API 阻擋的多久。
-      reason: "%{name} 之所以被阻擋的理由。請以冷靜、合理的態度，盡量詳細的說明有關情況。請記住，並非所有使用者都了解社群的術語，所以請嘗試使用較為通用的說法。"
-      submit: 建立阻擋
-      title: 正在建立對 %{name} 的阻擋
-      tried_contacting: 我已聯緊這個使用者並請他們停止。
+      back: 檢視所有封禁
+      heading: 正在建立對 %{name} 的封禁
+      needs_view: 需要使用者登入才能解除這項封禁
+      period: 從現在開始，這個使用者將被禁止使用 API 多久。
+      reason: "%{name} 之所以被封禁的理由。請盡量以平靜、合理的態度，詳細的說明有關情況。請記住訊息會公開讓所有人看到，而並非所有使用者都了解社群的術語，所以請嘗試使用較為通用的說法。"
+      submit: 建立封禁
+      title: 正在建立對 %{name} 的封禁
+      tried_contacting: 我已聯緊這個使用者並請他停止。
       tried_waiting: 我已經給予這位使用者合理的時間回應這些問題。
     not_found: 
       back: 返回索引
-      sorry: 抱歉，找不到 ID %{id} 的使用者阻擋。
+      sorry: 抱歉，找不到 ID 為%{id}的使用者封禁。
     partial: 
       confirm: 您確定嗎？
-      creator_name: 創造者
-      display_name: 被阻擋的使用者
+      creator_name: 建立者
+      display_name: 被封禁的使用者
       edit: 編輯
       next: 下一頁 »
-      not_revoked: (不註銷)
+      not_revoked: (沒有撇銷)
       previous: « 上一頁
-      reason: 阻擋的理由
-      revoke: 註銷！
-      revoker_name: 提出註銷者
+      reason: 封禁的理由
+      revoke: 撇銷！
+      revoker_name: 撇銷者
       show: 顯示
       showing_page: 第%{page}頁
       status: 狀態
     period: 
-      one: 1 小時
-      other: "%{count} 小時"
+      one: 1小時
+      other: "%{count}小時"
     revoke: 
-      confirm: 你確定要註銷這個阻擋？
-      flash: 這個阻擋已被註銷。
-      heading: 正在註銷 %{block_by} 對 %{block_on} 的阻擋
-      past: 這個阻擋已在 %{time} 之前結束，現在不能被註銷了。
-      revoke: 註銷！
-      time_future: 這個阻擋將於 %{time} 結束。
-      title: 正在註銷對 %{block_on} 的阻擋
+      confirm: 你確定要撇銷這項封禁？
+      flash: 這項封禁已被撇銷。
+      heading: 正在撇銷%{block_by}對%{block_on}的封禁
+      past: 這項封禁已在%{time}之前結束，現在不能被撇銷了。
+      revoke: 撇銷！
+      time_future: 這項封禁將於%{time}結束。
+      title: 正在撇銷對%{block_on}的封禁
     show: 
-      back: 檢視所有阻擋
+      back: 檢視所有封禁
       confirm: 您確定嗎？
       edit: 編輯
-      heading: "%{block_on} 被 %{block_by} 設為阻擋"
-      needs_view: 在清除這個阻擋之前咳使用者需要先登入。
-      reason: 阻擋的理由：
-      revoke: 註銷！
-      revoker: 註銷：
+      heading: "%{block_on}被%{block_by}封禁"
+      needs_view: 在撇銷這個封禁之前，該使用者需要先登入。
+      reason: 封禁的理由：
+      revoke: 撇銷！
+      revoker: 撇銷者：
       show: 顯示
       status: 狀態
-      time_future: 完成於 %{time}
-      time_past: 完成於 %{time} 之前
-      title: "%{block_on} 被 %{block_by} 設為阻擋"
+      time_future: 於%{time}內終止
+      time_past: 於%{time}前終止
+      title: "%{block_on}被%{block_by}封禁"
     update: 
-      success: 阻擋已更新。
+      only_creator_can_edit: 只有建立這項封禁的管理者可作出編輯。
+      success: 封禁已更新。
   user_role: 
     filter: 
-      already_has_role: 這個使用者已經有角色%{role}。
-      doesnt_have_role: 這個使用者沒有角色 %{role}。
+      already_has_role: 這個使用者已經有%{role}角色。
+      doesnt_have_role: 這個使用者沒有%{role}角色。
       not_a_role: 字串「%{role}」不是有效的角色。
-      not_an_administrator: 只有管理者可以進行使用者角色管理，但是您並不是管理者。
+      not_an_administrator: 只有行政員可以進行使用者角色管理，但是您並不是行政員。
     grant: 
-      are_you_sure: 您確定要給予使用者「%{name}」角色「%{role}」？
+      are_you_sure: 您確定要授予使用者「%{name}」「%{role}」的角色？
       confirm: 確認
-      fail: 無法讓使用者「%{name}」得到角色「%{role}」。請檢查使用者和角色是否都正確。
-      heading: 確認角色的賦予
-      title: 確認角色的賦予
+      fail: 無法授予使用者「%{name}」「%{role}」的角色。請檢查使用者和角色是否都正確。
+      heading: 確認授與角色
+      title: 確認授與角色
     revoke: 
-      are_you_sure: 您確定要註銷的使用者「%{name}」的角色「%{role}」？
+      are_you_sure: 您確定要撇銷使用者「%{name}」「%{role}」的角色？
       confirm: 確認
-      fail: 無法註銷使用者「%{name}」的角色「%{role}」。請檢查使用者和角色是否都正確。
-      heading: 確認角色的註銷
-      title: 確認角色註銷
+      fail: 無法撇銷使用者「%{name}」「%{role}」的角色。請檢查使用者和角色是否都正確。
+      heading: 確認撇銷角色
+      title: 確認撇銷角色
   welcome_page: 
     add_a_note: 
-      title: 沒有時間編輯嗎？幫忙加上注釋！
+      paragraph_1_html: 如果你只想做一些微小改動，而沒有時間登錄來學習如何編輯，那麼加入一項筆記還是非常容易的。
+      paragraph_2_html: 只要到<a href='%{map_url}'>地圖</a>並點擊筆記圖示： <span class='icon note'></span>。這將在地圖上添加一個標記，你可以拖動它，並添加你的筆記，然後點擊保存，其他製圖者會作出查證。
+      title: 沒有時間編輯嗎？可加入筆記！
     basic_terms: 
+      editor_html: <strong>編輯器</strong>是你可以用於編輯地圖的程序或網站。
+      node_html: <strong>節點</strong>是地圖上的一個點，例如一間餐廳或一棵樹。
+      paragraph_1_html: OpenStreetMap有自己的術語。以下是一些常用的關鍵詞。
+      tag_html: <strong>標籤</strong>是關於節點或路徑的簡要資料，例如餐廳的名字或道路的速度限制。
       title: 繪製地圖的基本術語
-    introduction_html: 歡迎來到 OpenStreetMap，自由和可編輯的世界地圖。您目前已經登錄 ，可以開始繪製地圖。這裡有一份重要的快速指南。
+      way_html: <strong>路徑</strong>是一條線或一個區域，例如一條道路、一條溪、一個湖或一棟建築物。
+    introduction_html: 歡迎來到 OpenStreetMap，自由和可編輯的世界地圖。您目前已經登錄，可以開始繪製地圖。這裡有一份您須知道最重要事項的快速指南。
     questions: 
+      paragraph_1_html: OpenStreetMap有一些資源，可用於學習本計劃、提出和回答問題，以及討論和紀錄與製作地圖相關的話題。 <a href='%{help_url}'>按此獲取幫助</a>。
       title: 有任何問題嗎？
     start_mapping: 開始製圖
     title: 歡迎！
     whats_on_the_map: 
-      on_html: "OpenStreetMap 是一個製作<em>真實且即時</em>地圖的地方 -\n它包含數以百萬計的建築物、道路以及關於位置其他詳細資料。您可以\n在地圖上畫出任何現實世界中令您感興趣的事物。"
+      off_html: 然而它<em>不包含</em>一些例如評分的主觀意見資料、歷史或假設性的地理特徵，以及有版權的來源資料。除非你獲特別許可，不要抄襲網上或印刷的地圖。
+      on_html: "OpenStreetMap 是一個為<em>真實且現存</em>物件繪製地圖的地方 -\n它包含數以百萬計的建築物、道路以及關於位置其他詳細資料。您可以\n在地圖上畫出任何現實世界中令您感興趣的地理特徵。"
       title: 地圖上有什麼
diff --git a/config/routes.rb b/config/routes.rb
index e03c5d632..9af0c1099 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -195,7 +195,7 @@ OpenStreetMap::Application.routes.draw do
   match '/traces/mine/page/:page' => 'trace#mine', :via => :get
   match '/traces/mine' => 'trace#mine', :via => :get
   match '/trace/create' => 'trace#create', :via => [:get, :post]
-  match '/trace/:id/data' => 'trace#data', :via => :get, :id => /\d+/
+  match '/trace/:id/data' => 'trace#data', :via => :get, :id => /\d+/, :as => "trace_data"
   match '/trace/:id/edit' => 'trace#edit', :via => [:get, :post, :patch], :id => /\d+/, :as => "trace_edit"
   match '/trace/:id/delete' => 'trace#delete', :via => :post, :id => /\d+/
 
diff --git a/config/wiki_pages.yml b/config/wiki_pages.yml
index 3e0f48acd..d236e776d 100644
--- a/config/wiki_pages.yml
+++ b/config/wiki_pages.yml
@@ -2,6 +2,12 @@
 # PROGRAM DO NOT MANUALLY EDIT IT
 
 ---
+ar:
+  key:
+    name: Ar:Key:name
+  tag:
+    amenity=school: Ar:Tag:amenity=school
+    shop=bakery: Ar:Tag:shop=bakery
 az:
   tag:
     craft=locksmith: Az:Tag:craft=locksmith
@@ -13,16 +19,89 @@ bg:
     railway=crossing: Bg:Tag:railway=crossing
     railway=level_crossing: Bg:Tag:railway=level crossing
 ca:
+  key:
+    name: Ca:Key:name
   tag:
     leisure=swimming_pool: Ca:Tag:leisure=swimming pool
+cs:
+  key:
+    addr: Cs:Key:addr
+    addr:conscriptionnumber: Cs:Key:addr:conscriptionnumber
+    addr:flats: Cs:Key:addr:flats
+    addr:provisionalnumber: Cs:Key:addr:provisionalnumber
+    addr:streetnumber: Cs:Key:addr:streetnumber
+    aerialway: Cs:Key:aerialway
+    aeroway: Cs:Key:aeroway
+    amenity: Cs:Key:amenity
+    barrier: Cs:Key:barrier
+    building: Cs:Key:building
+    building:flats: Cs:Key:building:flats
+    building:levels: Cs:Key:building:levels
+    contact: Cs:Key:contact
+    craft: Cs:Key:craft
+    emergency: Cs:Key:emergency
+    geological: Cs:Key:geological
+    highway: Cs:Key:highway
+    historic: Cs:Key:historic
+    image: Cs:Key:image
+    intermittent: Cs:Key:intermittent
+    landuse: Cs:Key:landuse
+    leisure: Cs:Key:leisure
+    man_made: Cs:Key:man made
+    mtb:scale: Cs:Key:mtb:scale
+    name: Cs:Key:name
+    natural: Cs:Key:natural
+    office: Cs:Key:office
+    place: Cs:Key:place
+    population: Cs:Key:population
+    power: Cs:Key:power
+    railway: Cs:Key:railway
+    ref:ruian: Cs:Key:ref:ruian
+    ref:ruian:addr: Cs:Key:ref:ruian:addr
+    ref:ruian:building: Cs:Key:ref:ruian:building
+    route: Cs:Key:route
+    salt: Cs:Key:salt
+    shop: Cs:Key:shop
+    sport: Cs:Key:sport
+    tourism: Cs:Key:tourism
+    tracktype: Cs:Key:tracktype
+    water: Cs:Key:water
+    waterway: Cs:Key:waterway
+  tag:
+    amenity=baby_hatch: Cs:Tag:amenity=baby hatch
+    building=farm: Cs:Tag:building=farm
+    building=school: Cs:Tag:building=school
+    building=university: Cs:Tag:building=university
+    historic=cannon: Cs:Tag:historic=cannon
+    historic=tomb: Cs:Tag:historic=tomb
+    landuse=allotments: Cs:Tag:landuse=allotments
+    landuse=basin: Cs:Tag:landuse=basin
+    landuse=brownfield: Cs:Tag:landuse=brownfield
+    landuse=greenfield: Cs:Tag:landuse=greenfield
+    natural=water: Cs:Tag:natural=water
+    route=trolleybus: Cs:Tag:route=trolleybus
 da:
   key:
+    access: Da:Key:access
     fee: Da:Key:fee
     lit: Da:Key:lit
     maxheight: Da:Key:maxheight
     maxspeed: Da:Key:maxspeed
   tag:
+    amenity=community_centre: Da:Tag:amenity=community centre
+    amenity=nightclub: Da:Tag:amenity=nightclub
     amenity=place_of_worship: Da:Tag:amenity=place of worship
+    amenity=veterinary: Da:Tag:amenity=veterinary
+    highway=bridleway: Da:Tag:highway=bridleway
+    highway=ford: Da:Tag:highway=ford
+    highway=tertiary: Da:Tag:highway=tertiary
+    highway=track: Da:Tag:highway=track
+    leisure=dog_park: Da:Tag:leisure=dog park
+    place=hamlet: Da:Tag:place=hamlet
+    place=town: Da:Tag:place=town
+    place=village: Da:Tag:place=village
+    route=ferry: Da:Tag:route=ferry
+    service=driveway: Da:Tag:service=driveway
 de:
   key:
     AlpinRes_ID: DE:Key:AlpinRes ID
@@ -43,16 +122,20 @@ de:
     biosphärenwirt: DE:Key:biosphärenwirt
     bollard: DE:Key:bollard
     brewery: DE:Key:brewery
+    bridge: DE:Key:bridge
+    building: DE:Key:building
     building:condition: DE:Key:building:condition
     building:material: DE:Key:building:material
     capacity: DE:Key:capacity
     clothes: DE:Key:clothes
+    club: DE:Key:club
     comment: DE:Key:comment
     construction: DE:Key:construction
     contact: DE:Key:contact
     content: DE:Key:content
     country: DE:Key:country
     covered: DE:Key:covered
+    craft: DE:Key:craft
     created_by: DE:Key:created by
     crossing: DE:Key:crossing
     cuisine: DE:Key:cuisine
@@ -61,12 +144,14 @@ de:
     cycleway: DE:Key:cycleway
     de:amtlicher_gemeindeschluessel: DE:Key:de:amtlicher gemeindeschluessel
     de:regionalschluessel: DE:Key:de:regionalschluessel
+    de:strassenschluessel: DE:Key:de:strassenschluessel
     denomination: DE:Key:denomination
     denotation: DE:Key:denotation
     description: DE:Key:description
     designation: DE:Key:designation
     destination: DE:Key:destination
     diaper: DE:Key:diaper
+    diet:*: DE:Key:diet:*
     direction: DE:Key:direction
     drink: DE:Key:drink
     drive_through: DE:Key:drive through
@@ -76,6 +161,7 @@ de:
     emergency: DE:Key:emergency
     entrance: DE:Key:entrance
     fee: DE:Key:fee
+    fence_type: DE:Key:fence type
     fetish: DE:Key:fetish
     fixme: DE:Key:fixme
     foot: DE:Key:foot
@@ -98,6 +184,7 @@ de:
     information: DE:Key:information
     intermittent: DE:Key:intermittent
     internet_access: DE:Key:internet access
+    is_in: DE:Key:is in
     junction: DE:Key:junction
     landuse: DE:Key:landuse
     lanes: DE:Key:lanes
@@ -116,6 +203,7 @@ de:
     military: DE:Key:military
     minspeed: DE:Key:minspeed
     motorroad: DE:Key:motorroad
+    mountain_pass: DE:Key:mountain pass
     mtb:scale: DE:Key:mtb:scale
     name: DE:Key:name
     natural: DE:Key:natural
@@ -123,6 +211,7 @@ de:
     noexit: DE:Key:noexit
     note: DE:Key:note
     office: DE:Key:office
+    oneway: DE:Key:oneway
     onkz: DE:Key:onkz
     opening_hours: DE:Key:opening hours
     operator: DE:Key:operator
@@ -134,6 +223,7 @@ de:
     piste:difficulty: DE:Key:piste:difficulty
     piste:type: DE:Key:piste:type
     place: DE:Key:place
+    plant:output: DE:Key:plant:output
     playground: DE:Key:playground
     population: DE:Key:population
     power: DE:Key:power
@@ -173,18 +263,23 @@ de:
     surface: DE:Key:surface
     symbol: DE:Key:symbol
     tactile_paving: DE:Key:tactile paving
+    todo: DE:Key:todo
     toll: DE:Key:toll
     tourism: DE:Key:tourism
     tracktype: DE:Key:tracktype
     traffic_calming: DE:Key:traffic calming
     traffic_sign: DE:Key:traffic sign
     trail_visibility: DE:Key:trail visibility
+    tunnel: DE:Key:tunnel
     turn: DE:Key:turn
     type: DE:Key:type
     usage: DE:Key:usage
     verbindung: DE:Key:verbindung
     voltage: DE:Key:voltage
+    waste: DE:Key:waste
+    water: DE:Key:water
     waterway: DE:Key:waterway
+    wetland: DE:Key:wetland
     wheelchair: DE:Key:wheelchair
     width: DE:Key:width
     wiki:symbol: DE:Key:wiki:symbol
@@ -251,7 +346,9 @@ de:
     amenity=parking_entrance: DE:Tag:amenity=parking entrance
     amenity=parking_space: DE:Tag:amenity=parking space
     amenity=pharmacy: DE:Tag:amenity=pharmacy
+    amenity=photo_booth: DE:Tag:amenity=photo booth
     amenity=place_of_worship: DE:Tag:amenity=place of worship
+    amenity=planetarium: DE:Tag:amenity=planetarium
     amenity=police: DE:Tag:amenity=police
     amenity=post_box: DE:Tag:amenity=post box
     amenity=post_office: DE:Tag:amenity=post office
@@ -273,6 +370,7 @@ de:
     amenity=vending_machine: DE:Tag:amenity=vending machine
     amenity=veterinary: DE:Tag:amenity=veterinary
     amenity=waste_basket: DE:Tag:amenity=waste basket
+    amenity=watering_place: DE:Tag:amenity=watering place
     atm=yes: DE:Tag:atm=yes
     barrier=bollard: DE:Tag:barrier=bollard
     barrier=cattle_grid: DE:Tag:barrier=cattle grid
@@ -308,8 +406,10 @@ de:
     craft=plumber: DE:Tag:craft=plumber
     craft=scaffolder: DE:Tag:craft=scaffolder
     craft=stonemason: DE:Tag:craft=stonemason
+    cuisine=coffee_shop: DE:Tag:cuisine=coffee shop
     emergency=ambulance_station: DE:Tag:emergency=ambulance station
     emergency=defibrillator: DE:Tag:emergency=defibrillator
+    emergency=emergency_ward_entrance: DE:Tag:emergency=emergency ward entrance
     emergency=fire_hydrant: DE:Tag:emergency=fire hydrant
     emergency=fire_water_pond: DE:Tag:emergency=fire water pond
     emergency=life_ring: DE:Tag:emergency=life ring
@@ -320,6 +420,7 @@ de:
     generator:source=solar: DE:Tag:generator:source=solar
     generator:source=wind: DE:Tag:generator:source=wind
     highway=bridleway: DE:Tag:highway=bridleway
+    highway=bus_guideway: DE:Tag:highway=bus guideway
     highway=bus_stop: DE:Tag:highway=bus stop
     highway=crossing: DE:Tag:highway=crossing
     highway=cycleway: DE:Tag:highway=cycleway
@@ -368,8 +469,10 @@ de:
     historic=monastery: DE:Tag:historic=monastery
     historic=monument: DE:Tag:historic=monument
     historic=pillory: DE:Tag:historic=pillory
+    historic=rune_stone: DE:Tag:historic=rune stone
     historic=ship: DE:Tag:historic=ship
     historic=stone: DE:Tag:historic=stone
+    historic=tomb: DE:Tag:historic=tomb
     historic=wayside_cross: DE:Tag:historic=wayside cross
     historic=wayside_shrine: DE:Tag:historic=wayside shrine
     historic=wreck: DE:Tag:historic=wreck
@@ -398,6 +501,7 @@ de:
     landuse=reservoir: DE:Tag:landuse=reservoir
     landuse=residential: DE:Tag:landuse=residential
     landuse=retail: DE:Tag:landuse=retail
+    landuse=salt_pond: DE:Tag:landuse=salt pond
     landuse=village_green: DE:Tag:landuse=village green
     landuse=vineyard: DE:Tag:landuse=vineyard
     leisure=beach_resort: DE:Tag:leisure=beach resort
@@ -438,6 +542,7 @@ de:
     man_made=tower: DE:Tag:man made=tower
     man_made=wastewater_plant: DE:Tag:man made=wastewater plant
     man_made=water_tower: DE:Tag:man made=water tower
+    man_made=water_well: DE:Tag:man made=water well
     man_made=water_works: DE:Tag:man made=water works
     man_made=watermill: DE:Tag:man made=watermill
     man_made=windmill: DE:Tag:man made=windmill
@@ -448,10 +553,17 @@ de:
     natural=bay: DE:Tag:natural=bay
     natural=beach: DE:Tag:natural=beach
     natural=cliff: DE:Tag:natural=cliff
+    natural=coastline: DE:Tag:natural=coastline
+    natural=fell: DE:Tag:natural=fell
     natural=glacier: DE:Tag:natural=glacier
     natural=grassland: DE:Tag:natural=grassland
     natural=heath: DE:Tag:natural=heath
+    natural=moor: DE:Tag:natural=moor
+    natural=mud: DE:Tag:natural=mud
+    natural=peak: DE:Tag:natural=peak
+    natural=reef: DE:Tag:natural=reef
     natural=ridge: DE:Tag:natural=ridge
+    natural=saddle: DE:Tag:natural=saddle
     natural=scree: DE:Tag:natural=scree
     natural=scrub: DE:Tag:natural=scrub
     natural=sinkhole: DE:Tag:natural=sinkhole
@@ -466,6 +578,7 @@ de:
     office=lawyer: DE:Tag:office=lawyer
     office=political_party: DE:Tag:office=political party
     pipeline=marker: DE:Tag:pipeline=marker
+    pipeline=valve: DE:Tag:pipeline=valve
     place=archipelago: DE:Tag:place=archipelago
     place=city: DE:Tag:place=city
     place=hamlet: DE:Tag:place=hamlet
@@ -481,16 +594,19 @@ de:
     power=generator: DE:Tag:power=generator
     power=line: DE:Tag:power=line
     power=minor_line: DE:Tag:power=minor line
+    power=plant: DE:Tag:power=plant
     power=pole: DE:Tag:power=pole
     power=station: DE:Tag:power=station
     power=sub_station: DE:Tag:power=sub station
     power=substation: DE:Tag:power=substation
     power=tower: DE:Tag:power=tower
+    power=transformer: DE:Tag:power=transformer
     public_transport=platform: DE:Tag:public transport=platform
     public_transport=stop_area: DE:Tag:public transport=stop area
     public_transport=stop_position: DE:Tag:public transport=stop position
     railway=abandoned: DE:Tag:railway=abandoned
     railway=crossing: DE:Tag:railway=crossing
+    railway=derail: DE:Tag:railway=derail
     railway=disused: DE:Tag:railway=disused
     railway=halt: DE:Tag:railway=halt
     railway=level_crossing: DE:Tag:railway=level crossing
@@ -586,14 +702,21 @@ de:
     waterway=riverbank: DE:Tag:waterway=riverbank
     waterway=stream: DE:Tag:waterway=stream
     waterway=weir: DE:Tag:waterway=weir
+el:
+  key:
+    building:levels: El:Key:building:levels
+    height: El:Key:height
 en:
   key:
     3dr:type: Key:3dr:type
     AND_nosr_r: Key:AND nosr r
     CEMT: Key:CEMT
     DGPS_correction: Key:DGPS correction
+    IBGE:GEOCODIGO: Key:IBGE:GEOCODIGO
     IBGE:tipo: Key:IBGE:tipo
+    Lock_ref: Key:Lock ref
     NHS: Key:NHS
+    PMSA_ref: Key:PMSA ref
     RLIS:bicycle: Key:RLIS:bicycle
     RLIS:reviewed: Key:RLIS:reviewed
     TMC:Direction: Key:TMC:Direction
@@ -608,21 +731,34 @@ en:
     access:roadtrain:trailers: Key:access:roadtrain:trailers
     addr: Key:addr
     addr:conscriptionnumber: Key:addr:conscriptionnumber
+    addr:country: Key:addr:country
+    addr:district: Key:addr:district
     addr:flats: Key:addr:flats
+    addr:hamlet: Key:addr:hamlet
+    addr:housenumber: Key:addr:housenumber
     addr:place: Key:addr:place
+    addr:postcode: Key:addr:postcode
+    addr:province: Key:addr:province
     addr:provisionalnumber: Key:addr:provisionalnumber
+    addr:state: Key:addr:state
+    addr:street: Key:addr:street
     addr:streetnumber: Key:addr:streetnumber
+    addr:subdistrict: Key:addr:subdistrict
     addr:suburb: Key:addr:suburb
+    admin_level: Key:admin level
     adr_les: Key:adr les
     aerialway: Key:aerialway
     aeroway: Key:aeroway
+    agricultural: Key:agricultural
     airmark: Key:airmark
+    alt_name: Key:alt name
     amenity: Key:amenity
     architect: Key:architect
     area: Key:area
     artwork_type: Key:artwork type
     ascent: Key:ascent
     asset_ref: Key:asset ref
+    attribution: Key:attribution
     atv: Key:atv
     automatic_door: Key:automatic door
     backrest: Key:backrest
@@ -630,7 +766,7 @@ en:
     barrier: Key:barrier
     barrier:personnel: Key:barrier:personnel
     basin: Key:basin
-    beacon: Key:beacon
+    bdouble: Key:bdouble
     beds: Key:beds
     bench: Key:bench
     bicycle: Key:bicycle
@@ -646,10 +782,14 @@ en:
     brand: Key:brand
     brewery: Key:brewery
     bridge: Key:bridge
+    bridge:movable: Key:bridge:movable
+    bridge:structure: Key:bridge:structure
+    bridge:support: Key:bridge:support
     building: Key:building
     building:condition: Key:building:condition
     building:cullis:height: Key:building:cullis:height
     building:fireproof: Key:building:fireproof
+    building:flats: Key:building:flats
     building:levels: Key:building:levels
     building:levels:underground: Key:building:levels:underground
     building:material: Key:building:material
@@ -657,11 +797,11 @@ en:
     building:obm: Key:building:obm
     building:part: Key:building:part
     bunker_type: Key:bunker type
-    buoy: Key:buoy
     busway: Key:busway
     button_operated: Key:button operated
     cables: Key:cables
     capacity: Key:capacity
+    capital: Key:capital
     carriageway_ref: Key:carriageway ref
     castle_type: Key:castle type
     castle_type:de: Key:castle type:de
@@ -672,6 +812,7 @@ en:
     checkpoint: Key:checkpoint
     circuits: Key:circuits
     circumference: Key:circumference
+    clli: Key:clli
     clothes: Key:clothes
     club: Key:club
     coastline:survey_quality: Key:coastline:survey quality
@@ -712,6 +853,7 @@ en:
     destination: Key:destination
     diaper: Key:diaper
     diet: Key:diet
+    diet:gluten_free: Key:diet:gluten free
     diocese: Key:diocese
     direction: Key:direction
     dirtbike:scale: Key:dirtbike:scale
@@ -752,10 +894,10 @@ en:
     fixme: Key:fixme
     flood_prone: Key:flood prone
     floor:material: Key:floor:material
-    fog_signal: Key:fog signal
     foot: Key:foot
     footway: Key:footway
     ford: Key:ford
+    forestry: Key:forestry
     fork: Key:fork
     format: Key:format
     frequency: Key:frequency
@@ -775,10 +917,10 @@ en:
     generator:source: Key:generator:source
     generator:type: Key:generator:type
     genus: Key:genus
-    geocodigo: Key:geocodigo
     geological: Key:geological
     gnis:feature_id: Key:gnis:feature id
     golf: Key:golf
+    grassland: Key:grassland
     group_only: Key:group only
     guidepost: Key:guidepost
     habitat: Key:habitat
@@ -796,10 +938,12 @@ en:
     hazmat: Key:hazmat
     healthcare: Key:healthcare
     height: Key:height
+    hgv: Key:hgv
     highway: Key:highway
     hiking: Key:hiking
     historic: Key:historic
     historic:civilization: Key:historic:civilization
+    historic_Garrigues: Key:historic Garrigues
     history: Key:history
     horse: Key:horse
     hov: Key:hov
@@ -830,9 +974,9 @@ en:
     kms:street_no: Key:kms:street no
     kms:zip_code: Key:kms:zip code
     kms:zip_name: Key:kms:zip name
+    kms:zip_no: Key:kms:zip no
     kp: Key:kp
     label: Key:label
-    landmark: Key:landmark
     landuse: Key:landuse
     lane_hint: Key:lane hint
     lanes: Key:lanes
@@ -842,7 +986,6 @@ en:
     leisure: Key:leisure
     length: Key:length
     level: Key:level
-    light: Key:light
     lines: Key:lines
     listed_status: Key:listed status
     lit: Key:lit
@@ -861,12 +1004,9 @@ en:
     material: Key:material
     max_age: Key:max age
     maxage: Key:maxage
-    maxairdraft: Key:maxairdraft
     maxaxleload: Key:maxaxleload
-    maxdraught: Key:maxdraught
     maxheight: Key:maxheight
     maxheight:legal: Key:maxheight:legal
-    maxheight:marine: Key:maxheight:marine
     maxheight:physical: Key:maxheight:physical
     maxlength: Key:maxlength
     maxspeed: Key:maxspeed
@@ -890,6 +1030,8 @@ en:
     monitoring:water_level: Key:monitoring:water level
     monitoring:weather: Key:monitoring:weather
     mooring: Key:mooring
+    moped: Key:moped
+    motor_vehicle: Key:motor vehicle
     motorboat: Key:motorboat
     motorcar: Key:motorcar
     motorcycle: Key:motorcycle
@@ -943,7 +1085,9 @@ en:
     owner: Key:owner
     ownership: Key:ownership
     parking: Key:parking
+    parking:condition:right: Key:parking:condition:right
     parking:lane: Key:parking:lane
+    passenger: Key:passenger
     passing_places: Key:passing places
     paved:date: Key:paved:date
     payment: Key:payment
@@ -985,12 +1129,8 @@ en:
     pump: Key:pump
     pyörä_väistää_aina_autoa: Key:pyörä väistää aina autoa
     rack: Key:rack
-    radar_conspicious: Key:radar conspicious
-    radar_reflector: Key:radar reflector
     radar_transponder: Key:radar transponder
-    radar_transponder:signal_group: Key:radar transponder:signal group
     radio_transponder: Key:radio transponder
-    radio_transponder:AIS: Key:radio transponder:AIS
     radio_transponder:signal_frequency: Key:radio transponder:signal frequency
     railway: Key:railway
     ramp: Key:ramp
@@ -1011,6 +1151,7 @@ en:
     ref:UAI: Key:ref:UAI
     ref:at:gkz: Key:ref:at:gkz
     ref:at:okz: Key:ref:at:okz
+    ref:bag: Key:ref:bag
     ref:bam.brno.cz: Key:ref:bam.brno.cz
     ref:bufa: Key:ref:bufa
     ref:colour: Key:ref:colour
@@ -1018,6 +1159,9 @@ en:
     ref:mhs: Key:ref:mhs
     ref:mobil-parken.de: Key:ref:mobil-parken.de
     ref:ortsnetz: Key:ref:ortsnetz
+    ref:ruian: Key:ref:ruian
+    ref:ruian:addr: Key:ref:ruian:addr
+    ref:ruian:building: Key:ref:ruian:building
     ref:sandre: Key:ref:sandre
     ref:taskey: Key:ref:taskey
     ref:vatin: Key:ref:vatin
@@ -1031,6 +1175,9 @@ en:
     resource: Key:resource
     retreat: Key:retreat
     retroreflecting: Key:retroreflecting
+    river:waterway_distance: Key:river:waterway distance
+    road_marking: Key:road marking
+    roadtrain: Key:roadtrain
     roof:material: Key:roof:material
     room: Key:room
     rooms: Key:rooms
@@ -1045,9 +1192,9 @@ en:
     rwn_ref: Key:rwn ref
     sac_scale: Key:sac scale
     sagns_id: Key:sagns id
+    salt: Key:salt
     scenic: Key:scenic
     school: Key:school
-    seabed_surface: Key:seabed surface
     seamark: Key:seamark
     seamark:beacon_isolated_danger:shape: Key:seamark:beacon isolated danger:shape
     seamark:beacon_safe_water:colour: Key:seamark:beacon safe water:colour
@@ -1124,10 +1271,10 @@ en:
     side_road: Key:side road
     sidewalk: Key:sidewalk
     sign: Key:sign
-    signal_station: Key:signal station
     site_type: Key:site type
     ski: Key:ski
     ski_tour_difficulty: Key:ski tour difficulty
+    sl_stop_id: Key:sl stop id
     smoothness: Key:smoothness
     snowmobile: Key:snowmobile
     snowplowing: Key:snowplowing
@@ -1161,11 +1308,14 @@ en:
     symbol: Key:symbol
     tactile_paving: Key:tactile paving
     takeaway: Key:takeaway
+    tank: Key:tank
     taxon: Key:taxon
     technology: Key:technology
+    telecom: Key:telecom
     tidal: Key:tidal
     tiger: Key:tiger
     timezone: Key:timezone
+    todo: Key:todo
     toilets:wheelchair: Key:toilets:wheelchair
     toll: Key:toll
     topmark: Key:topmark
@@ -1200,21 +1350,26 @@ en:
     usage: Key:usage
     validate:no_name: Key:validate:no name
     validate:no_ref: Key:validate:no ref
+    vehicle: Key:vehicle
     voltage: Key:voltage
     waste: Key:waste
     water: Key:water
     waterway: Key:waterway
     website: Key:website
+    wetland: Key:wetland
     wheelchair: Key:wheelchair
     wholesale: Key:wholesale
     width: Key:width
     wiki:symbol: Key:wiki:symbol
+    wikidata: Key:wikidata
     wikipedia: Key:wikipedia
     winter_road: Key:winter road
     wires: Key:wires
     woeid: Key:woeid
     wood: Key:wood
+    www.prezzibenzina.it: Key:www.prezzibenzina.it
     xmas:feature: Key:xmas:feature
+    yh:STRUCTURE: Key:yh:STRUCTURE
     zone:maxspeed: Key:zone:maxspeed
     zone:traffic: Key:zone:traffic
     zoo: Key:zoo
@@ -1247,6 +1402,7 @@ en:
     aeroway=gate: Tag:aeroway=gate
     aeroway=hangar: Tag:aeroway=hangar
     aeroway=helipad: Tag:aeroway=helipad
+    aeroway=holding_position: Tag:aeroway=holding position
     aeroway=navigationaid: Tag:aeroway=navigationaid
     aeroway=parking_position: Tag:aeroway=parking position
     aeroway=runway: Tag:aeroway=runway
@@ -1257,6 +1413,7 @@ en:
     ale_supply=limited: Tag:ale supply=limited
     allotments=plot: Tag:allotments=plot
     amenity=Kneippbecken: Tag:amenity=Kneippbecken
+    amenity=administration: Tag:amenity=administration
     amenity=animal_boarding: Tag:amenity=animal boarding
     amenity=animal_breeding: Tag:amenity=animal breeding
     amenity=animal_shelter: Tag:amenity=animal shelter
@@ -1274,6 +1431,7 @@ en:
     amenity=bicycle_trailer_sharing: Tag:amenity=bicycle trailer sharing
     amenity=biergarten: Tag:amenity=biergarten
     amenity=bikeshed: Tag:amenity=bikeshed
+    amenity=boat_sharing: Tag:amenity=boat sharing
     amenity=boat_storage: Tag:amenity=boat storage
     amenity=brothel: Tag:amenity=brothel
     amenity=bureau_de_change: Tag:amenity=bureau de change
@@ -1311,6 +1469,7 @@ en:
     amenity=festival_grounds: Tag:amenity=festival grounds
     amenity=fire_hydrant: Tag:amenity=fire hydrant
     amenity=fire_station: Tag:amenity=fire station
+    amenity=firstaid: Tag:amenity=firstaid
     amenity=food_court: Tag:amenity=food court
     amenity=fountain: Tag:amenity=fountain
     amenity=fuel: Tag:amenity=fuel
@@ -1318,6 +1477,7 @@ en:
     amenity=game_feeding: Tag:amenity=game feeding
     amenity=grave_yard: Tag:amenity=grave yard
     amenity=grit_bin: Tag:amenity=grit bin
+    amenity=gym_(Don't_use): Tag:amenity=gym (Don't use)
     amenity=harbourmaster: Tag:amenity=harbourmaster
     amenity=hospital: Tag:amenity=hospital
     amenity=hunting_stand: Tag:amenity=hunting stand
@@ -1361,6 +1521,7 @@ en:
     amenity=security_booth: Tag:amenity=security booth
     amenity=shelter: Tag:amenity=shelter
     amenity=shower: Tag:amenity=shower
+    amenity=smoking_area: Tag:amenity=smoking area
     amenity=social_centre: Tag:amenity=social centre
     amenity=social_facility: Tag:amenity=social facility
     amenity=spa: Tag:amenity=spa
@@ -1443,6 +1604,7 @@ en:
     building=bunker: Tag:building=bunker
     building=cabin: Tag:building=cabin
     building=cathedral: Tag:building=cathedral
+    building=central_office: Tag:building=central office
     building=chapel: Tag:building=chapel
     building=church: Tag:building=church
     building=civic: Tag:building=civic
@@ -1520,6 +1682,7 @@ en:
     craft=metal_construction: Tag:craft=metal construction
     craft=optician: Tag:craft=optician
     craft=painter: Tag:craft=painter
+    craft=paperhanger: Tag:craft=paperhanger
     craft=parquet_layer: Tag:craft=parquet layer
     craft=photographer: Tag:craft=photographer
     craft=photographic_laboratory: Tag:craft=photographic laboratory
@@ -1553,6 +1716,7 @@ en:
     crop=grape: Tag:crop=grape
     crop=grass: Tag:crop=grass
     crop=hay: Tag:crop=hay
+    crop=hop: Tag:crop=hop
     crop=maize: Tag:crop=maize
     crop=oats: Tag:crop=oats
     crop=rape: Tag:crop=rape
@@ -1573,6 +1737,7 @@ en:
     emergency=ambulance_station: Tag:emergency=ambulance station
     emergency=coast_guard: Tag:emergency=coast guard
     emergency=defibrillator: Tag:emergency=defibrillator
+    emergency=emergency_ward_entrance: Tag:emergency=emergency ward entrance
     emergency=fire_detection_system: Tag:emergency=fire detection system
     emergency=fire_extinguisher: Tag:emergency=fire extinguisher
     emergency=fire_flapper: Tag:emergency=fire flapper
@@ -1602,6 +1767,7 @@ en:
     generator:source=nuclear: Tag:generator:source=nuclear
     generator:source=solar: Tag:generator:source=solar
     generator:source=wind: Tag:generator:source=wind
+    geological=moraine: Tag:geological=moraine
     geological=outcrop: Tag:geological=outcrop
     geological=palaeontological_site: Tag:geological=palaeontological site
     harbour:category=RoRo: Tag:harbour:category=RoRo
@@ -1634,6 +1800,7 @@ en:
     highway=bus_guideway: Tag:highway=bus guideway
     highway=bus_stop: Tag:highway=bus stop
     highway=byway: Tag:highway=byway
+    highway=corridor: Tag:highway=corridor
     highway=crossing: Tag:highway=crossing
     highway=cycleway: Tag:highway=cycleway
     highway=elevator: Tag:highway=elevator
@@ -1681,6 +1848,7 @@ en:
     highway=via_ferrata: Tag:highway=via ferrata
     historic=aircraft: Tag:historic=aircraft
     historic=archaeological_site: Tag:historic=archaeological site
+    historic=archaeological_site_Garrigues: Tag:historic=archaeological site Garrigues
     historic=battlefield: Tag:historic=battlefield
     historic=boundary_stone: Tag:historic=boundary stone
     historic=cannon: Tag:historic=cannon
@@ -1703,6 +1871,7 @@ en:
     historic=rune_stone: Tag:historic=rune stone
     historic=ship: Tag:historic=ship
     historic=stone: Tag:historic=stone
+    historic=tomb: Tag:historic=tomb
     historic=tree_shrine: Tag:historic=tree shrine
     historic=wayside_cross: Tag:historic=wayside cross
     historic=wayside_shrine: Tag:historic=wayside shrine
@@ -1717,9 +1886,7 @@ en:
     junction=roundabout: Tag:junction=roundabout
     landform=esker: Tag:landform=esker
     landform=raised_beach: Tag:landform=raised beach
-    landmark=beacon: Tag:landmark=beacon
     landmark=cairn: Tag:landmark=cairn
-    landmark=cemetery: Tag:landmark=cemetery
     landmark=chimney: Tag:landmark=chimney
     landmark=cross: Tag:landmark=cross
     landmark=dish_aerial: Tag:landmark=dish aerial
@@ -1756,6 +1923,7 @@ en:
     landuse=grass: Tag:landuse=grass
     landuse=greenfield: Tag:landuse=greenfield
     landuse=greenhouse_horticulture: Tag:landuse=greenhouse horticulture
+    landuse=hop_garden: Tag:landuse=hop garden
     landuse=industrial: Tag:landuse=industrial
     landuse=landfill: Tag:landuse=landfill
     landuse=meadow: Tag:landuse=meadow
@@ -1765,11 +1933,11 @@ en:
     landuse=peat_cutting: Tag:landuse=peat cutting
     landuse=plant_nursery: Tag:landuse=plant nursery
     landuse=plantation: Tag:landuse=plantation
-    landuse=pond: Tag:landuse=pond
     landuse=prison: Tag:landuse=prison
     landuse=quarry: Tag:landuse=quarry
     landuse=railway: Tag:landuse=railway
     landuse=recreation_ground: Tag:landuse=recreation ground
+    landuse=religious: Tag:landuse=religious
     landuse=reservoir: Tag:landuse=reservoir
     landuse=residential: Tag:landuse=residential
     landuse=retail: Tag:landuse=retail
@@ -1781,6 +1949,7 @@ en:
     landuse=vineyard: Tag:landuse=vineyard
     landuse=well: Tag:landuse=well
     landuse=wellsite: Tag:landuse=wellsite
+    landuse=wood_(Don't_use): Tag:landuse=wood (Don't use)
     lane=buffered: Tag:lane=buffered
     leisure=adult_gaming_centre: Tag:leisure=adult gaming centre
     leisure=amusement_arcade: Tag:leisure=amusement arcade
@@ -1830,12 +1999,14 @@ en:
     man_made=bridge: Tag:man made=bridge
     man_made=bunker_silo: Tag:man made=bunker silo
     man_made=cairn: Tag:man made=cairn
+    man_made=campanile: Tag:man made=campanile
     man_made=chimney: Tag:man made=chimney
     man_made=communications_tower: Tag:man made=communications tower
     man_made=compass_rose: Tag:man made=compass rose
     man_made=crane: Tag:man made=crane
     man_made=cross: Tag:man made=cross
     man_made=cutline: Tag:man made=cutline
+    man_made=dovecote: Tag:man made=dovecote
     man_made=dyke: Tag:man made=dyke
     man_made=embankment: Tag:man made=embankment
     man_made=flagpole: Tag:man made=flagpole
@@ -1940,7 +2111,7 @@ en:
     natural=sinkhole: Tag:natural=sinkhole
     natural=spring: Tag:natural=spring
     natural=stone: Tag:natural=stone
-    natural=tidal: Tag:natural=tidal
+    natural=strait: Tag:natural=strait
     natural=tree: Tag:natural=tree
     natural=tree_row: Tag:natural=tree row
     natural=tundra: Tag:natural=tundra
@@ -1948,6 +2119,14 @@ en:
     natural=water: Tag:natural=water
     natural=wetland: Tag:natural=wetland
     natural=wood: Tag:natural=wood
+    network=US:I: Tag:network=US:I
+    network=US:IN: Tag:network=US:IN
+    network=US:KY: Tag:network=US:KY
+    network=US:OH: Tag:network=US:OH
+    network=US:OH:LOG: Tag:network=US:OH:LOG
+    network=US:OH:LUC: Tag:network=US:OH:LUC
+    network=US:OH:TUS: Tag:network=US:OH:TUS
+    network=US:US: Tag:network=US:US
     odbl=clean: Tag:odbl=clean
     office=accountant: Tag:office=accountant
     office=administrative: Tag:office=administrative
@@ -1970,6 +2149,14 @@ en:
     office=surveyor: Tag:office=surveyor
     office=telecommunication: Tag:office=telecommunication
     office=travel_agent: Tag:office=travel agent
+    passenger=international: Tag:passenger=international
+    passenger=local: Tag:passenger=local
+    passenger=national: Tag:passenger=national
+    passenger=no: Tag:passenger=no
+    passenger=regional: Tag:passenger=regional
+    passenger=suburban: Tag:passenger=suburban
+    passenger=urban: Tag:passenger=urban
+    passenger=yes: Tag:passenger=yes
     pilotage=boarding_point: Tag:pilotage=boarding point
     pilotage=office: Tag:pilotage=office
     pipeline=marker: Tag:pipeline=marker
@@ -2018,7 +2205,6 @@ en:
     pump=manual: Tag:pump=manual
     pump=no: Tag:pump=no
     pump=powered: Tag:pump=powered
-    radar_transponder=ramark: Tag:radar transponder=ramark
     radio_transponder:category=aeronautical: Tag:radio transponder:category=aeronautical
     radio_transponder:category=circular: Tag:radio transponder:category=circular
     radio_transponder:category=coast_radio: Tag:radio transponder:category=coast radio
@@ -2033,6 +2219,7 @@ en:
     railway=buffer_stop: Tag:railway=buffer stop
     railway=crossing: Tag:railway=crossing
     railway=derail: Tag:railway=derail
+    railway=diamond: Tag:railway=diamond
     railway=disused: Tag:railway=disused
     railway=funicular: Tag:railway=funicular
     railway=halt: Tag:railway=halt
@@ -2065,6 +2252,7 @@ en:
     route=fitness_trail: Tag:route=fitness trail
     route=monorail: Tag:route=monorail
     route=pipeline: Tag:route=pipeline
+    route=piste: Tag:route=piste
     route=railway: Tag:route=railway
     route=road: Tag:route=road
     route=share_taxi: Tag:route=share taxi
@@ -2231,6 +2419,7 @@ en:
     seamark:light:category=lower: Tag:seamark:light:category=lower
     seamark:light:category=moire: Tag:seamark:light:category=moire
     seamark:light:category=rear: Tag:seamark:light:category=rear
+    seamark:light:category=strip_light: Tag:seamark:light:category=strip light
     seamark:light:category=striplight: Tag:seamark:light:category=striplight
     seamark:light:category=subsidiary: Tag:seamark:light:category=subsidiary
     seamark:light:category=upper: Tag:seamark:light:category=upper
@@ -2338,9 +2527,6 @@ en:
     seamark:topmark:shape=upright-cross: Tag:seamark:topmark:shape=upright-cross
     seamark:topmark:shape=x-shape: Tag:seamark:topmark:shape=x-shape
     seamark=anchorage: Tag:seamark=anchorage
-    seamark=beacon: Tag:seamark=beacon
-    seamark=buoy: Tag:seamark=buoy
-    seamark=lighthouse: Tag:seamark=lighthouse
     segregated=no: Tag:segregated=no
     segregated=yes: Tag:segregated=yes
     service=alley: Tag:service=alley
@@ -2354,7 +2540,6 @@ en:
     service=yard: Tag:service=yard
     shelter_type=basic_hut: Tag:shelter type=basic hut
     shelter_type=lean_to: Tag:shelter type=lean to
-    shop=SpotColor: Tag:shop=SpotColor
     shop=alcohol: Tag:shop=alcohol
     shop=anime: Tag:shop=anime
     shop=antiques: Tag:shop=antiques
@@ -2401,6 +2586,7 @@ en:
     shop=farm: Tag:shop=farm
     shop=fashion: Tag:shop=fashion
     shop=fish: Tag:shop=fish
+    shop=fishing: Tag:shop=fishing
     shop=fishmonger: Tag:shop=fishmonger
     shop=florist: Tag:shop=florist
     shop=food: Tag:shop=food
@@ -2463,6 +2649,7 @@ en:
     shop=ship_chandler: Tag:shop=ship chandler
     shop=shoes: Tag:shop=shoes
     shop=shopping_centre: Tag:shop=shopping centre
+    shop=spare_parts: Tag:shop=spare parts
     shop=sports: Tag:shop=sports
     shop=stationery: Tag:shop=stationery
     shop=supermarket: Tag:shop=supermarket
@@ -2528,6 +2715,7 @@ en:
     sport=athletics: Tag:sport=athletics
     sport=australian_football: Tag:sport=australian football
     sport=badminton: Tag:sport=badminton
+    sport=balle_pelote: Tag:sport=balle pelote
     sport=base: Tag:sport=base
     sport=baseball: Tag:sport=baseball
     sport=basketball: Tag:sport=basketball
@@ -2556,6 +2744,7 @@ en:
     sport=gaelic_games: Tag:sport=gaelic games
     sport=golf: Tag:sport=golf
     sport=gymnastics: Tag:sport=gymnastics
+    sport=hapkido: Tag:sport=hapkido
     sport=hockey: Tag:sport=hockey
     sport=horse_racing: Tag:sport=horse racing
     sport=horseshoes: Tag:sport=horseshoes
@@ -2593,14 +2782,14 @@ en:
     sub_sea=reef: Tag:sub sea=reef
     summit:cross=yes: Tag:summit:cross=yes
     surface=pebbles: Tag:surface=pebbles
-    tidal=mud: Tag:tidal=mud
-    tidal=pebbles: Tag:tidal=pebbles
-    tidal=rocks: Tag:tidal=rocks
-    tidal=sand: Tag:tidal=sand
+    telecom=cross-connect: Tag:telecom=cross-connect
+    telecom=remote_terminal: Tag:telecom=remote terminal
     tourism=alpine_hut: Tag:tourism=alpine hut
+    tourism=apartment: Tag:tourism=apartment
     tourism=aquarium: Tag:tourism=aquarium
     tourism=artwork: Tag:tourism=artwork
     tourism=attraction: Tag:tourism=attraction
+    tourism=bed_and_breakfast: Tag:tourism=bed and breakfast
     tourism=camp_site: Tag:tourism=camp site
     tourism=caravan_site: Tag:tourism=caravan site
     tourism=chalet: Tag:tourism=chalet
@@ -2615,24 +2804,18 @@ en:
     tourism=theme_park: Tag:tourism=theme park
     tourism=viewpoint: Tag:tourism=viewpoint
     tourism=wilderness_hut: Tag:tourism=wilderness hut
+    tourism=yes: Tag:tourism=yes
     tourism=zoo: Tag:tourism=zoo
     tower:construction=dish: Tag:tower:construction=dish
     tower:construction=dome: Tag:tower:construction=dome
     tower:construction=freestanding: Tag:tower:construction=freestanding
     tower:construction=lattice: Tag:tower:construction=lattice
     tower:type=lattice: Tag:tower:type=lattice
-    traffic=local: Tag:traffic=local
-    traffic=national: Tag:traffic=national
-    traffic=regional: Tag:traffic=regional
-    traffic=suburban: Tag:traffic=suburban
-    traffic=urban: Tag:traffic=urban
     traffic_calming=island: Tag:traffic calming=island
     tunnel=culvert: Tag:tunnel=culvert
     type=autopass: Tag:type=autopass
     type=benchmark: Tag:type=benchmark
     type=fixed_point: Tag:type=fixed point
-    type=leading_light: Tag:type=leading light
-    type=leading_line: Tag:type=leading line
     type=observation_spot: Tag:type=observation spot
     type=public_transport: Tag:type=public transport
     type=street: Tag:type=street
@@ -2670,6 +2853,7 @@ en:
     waterway=water_point: Tag:waterway=water point
     waterway=waterfall: Tag:waterway=waterfall
     waterway=weir: Tag:waterway=weir
+    wood=broad_leaved: Tag:wood=broad leaved
     wood=casuarina: Tag:wood=casuarina
     wood=coniferous: Tag:wood=coniferous
     wood=deciduous: Tag:wood=deciduous
@@ -2682,33 +2866,64 @@ en:
     zoo=petting_zoo: Tag:zoo=petting zoo
 es:
   key:
+    addr: ES:Key:addr
     amenity: ES:Key:amenity
+    brand: ES:Key:brand
+    cycleway: ES:Key:cycleway
+    end_date: ES:Key:end date
     highway: ES:Key:highway
+    is_in: ES:Key:is in
+    maxspeed: ES:Key:maxspeed
+    name: ES:Key:name
+    noexit: ES:Key:noexit
+    opening_hours: ES:Key:opening hours
+    operator: ES:Key:operator
+    organic: ES:Key:organic
+    origin: ES:Key:origin
+    payment: ES:Key:payment
+    phone: ES:Key:phone
     proposed: ES:Key:proposed
+    shop: ES:Key:shop
     stars: ES:Key:stars
     traffic_calming: ES:Key:traffic calming
+    website: ES:Key:website
+    wheelchair: ES:Key:wheelchair
+    wholesale: ES:Key:wholesale
   tag:
     aerialway=cable_car: ES:Tag:aerialway=cable car
+    aeroway=terminal: ES:Tag:aeroway=terminal
     amenity=atm: ES:Tag:amenity=atm
     amenity=bar: ES:Tag:amenity=bar
     amenity=bicycle_parking: ES:Tag:amenity=bicycle parking
     amenity=bicycle_rental: ES:Tag:amenity=bicycle rental
+    amenity=brothel: ES:Tag:amenity=brothel
     amenity=fuel: ES:Tag:amenity=fuel
+    amenity=ice_cream: ES:Tag:amenity=ice cream
+    amenity=love_hotel: ES:Tag:amenity=love hotel
+    amenity=nightclub: ES:Tag:amenity=nightclub
+    amenity=payment_terminal: ES:Tag:amenity=payment terminal
     amenity=recycling: ES:Tag:amenity=recycling
+    amenity=restaurant: ES:Tag:amenity=restaurant
+    amenity=stripclub: ES:Tag:amenity=stripclub
     amenity=university: ES:Tag:amenity=university
+    amenity=veterinary: ES:Tag:amenity=veterinary
     emergency=fire_extinguisher: ES:Tag:emergency=fire extinguisher
     highway=bus_stop: ES:Tag:highway=bus stop
+    highway=byway: ES:Tag:highway=byway
     highway=escape: ES:Tag:highway=escape
     highway=living_street: ES:Tag:highway=living street
+    highway=motorway: ES:Tag:highway=motorway
     highway=motorway_junction: ES:Tag:highway=motorway junction
     highway=motorway_link: ES:Tag:highway=motorway link
     highway=pedestrian: ES:Tag:highway=pedestrian
     highway=residential: ES:Tag:highway=residential
     highway=stop: ES:Tag:highway=stop
+    junction=roundabout: ES:Tag:junction=roundabout
     landuse=allotments: ES:Tag:landuse=allotments
     landuse=industrial: ES:Tag:landuse=industrial
     leisure=playground: ES:Tag:leisure=playground
     leisure=water_park: ES:Tag:leisure=water park
+    man_made=pier: ES:Tag:man made=pier
     natural=beach: ES:Tag:natural=beach
     natural=glacier: ES:Tag:natural=glacier
     natural=saddle: ES:Tag:natural=saddle
@@ -2716,13 +2931,30 @@ es:
     natural=water: ES:Tag:natural=water
     power=pole: ES:Tag:power=pole
     power=tower: ES:Tag:power=tower
+    public_transport=platform: ES:Tag:public transport=platform
+    public_transport=stop_area: ES:Tag:public transport=stop area
+    public_transport=stop_position: ES:Tag:public transport=stop position
     railway=level_crossing: ES:Tag:railway=level crossing
     shop=alcohol: ES:Tag:shop=alcohol
+    shop=bakery: ES:Tag:shop=bakery
+    shop=bed: ES:Tag:shop=bed
+    shop=butcher: ES:Tag:shop=butcher
     shop=computer: ES:Tag:shop=computer
+    shop=confectionery: ES:Tag:shop=confectionery
+    shop=hardware: ES:Tag:shop=hardware
+    shop=locksmith: ES:Tag:shop=locksmith
     shop=lottery: ES:Tag:shop=lottery
+    shop=paint: ES:Tag:shop=paint
+    shop=pet: ES:Tag:shop=pet
+    shop=seafood: ES:Tag:shop=seafood
+    shop=stationery: ES:Tag:shop=stationery
+    shop=tattoo: ES:Tag:shop=tattoo
+    shop=trade: ES:Tag:shop=trade
     tourism=alpine_hut: ES:Tag:tourism=alpine hut
     tourism=artwork: ES:Tag:tourism=artwork
     tourism=camp_site: ES:Tag:tourism=camp site
+    tourism=motel: ES:Tag:tourism=motel
+    waterway=riverbank: ES:Tag:waterway=riverbank
 et:
   key:
     addr: Et:Key:addr
@@ -2837,6 +3069,7 @@ fr:
     abutters: FR:Key:abutters
     access: FR:Key:access
     addr: FR:Key:addr
+    addr:place: FR:Key:addr:place
     advertising: FR:Key:advertising
     aeroway: FR:Key:aeroway
     amenity: FR:Key:amenity
@@ -2852,6 +3085,8 @@ fr:
     boundary: FR:Key:boundary
     bridge: FR:Key:bridge
     building: FR:Key:building
+    building:levels: FR:Key:building:levels
+    building:part: FR:Key:building:part
     capacity: FR:Key:capacity
     clothes: FR:Key:clothes
     collection_times: FR:Key:collection times
@@ -2876,6 +3111,7 @@ fr:
     ele: FR:Key:ele
     email: FR:Key:email
     embankment: FR:Key:embankment
+    emergency: FR:Key:emergency
     enforcement: FR:Key:enforcement
     entrance: FR:Key:entrance
     fee: FR:Key:fee
@@ -2883,6 +3119,7 @@ fr:
     flood_prone: FR:Key:flood prone
     foot: FR:Key:foot
     footway: FR:Key:footway
+    ford: FR:Key:ford
     generator:method: FR:Key:generator:method
     generator:output: FR:Key:generator:output
     generator:output:electricity: FR:Key:generator:output:electricity
@@ -2904,9 +3141,12 @@ fr:
     level: FR:Key:level
     lit: FR:Key:lit
     lock: FR:Key:lock
+    lock_name: FR:Key:lock name
+    lock_ref: FR:Key:lock ref
     man_made: FR:Key:man made
     manufacturer: FR:Key:manufacturer
     maxage: FR:Key:maxage
+    maxaxleload: FR:Key:maxaxleload
     maxheight: FR:Key:maxheight
     maxheight:physical: FR:Key:maxheight:physical
     maxlength: FR:Key:maxlength
@@ -2916,6 +3156,7 @@ fr:
     maxwidth: FR:Key:maxwidth
     military: FR:Key:military
     minage: FR:Key:minage
+    motorboat: FR:Key:motorboat
     mountain_pass: FR:Key:mountain pass
     mtb:scale: FR:Key:mtb:scale
     name: FR:Key:name
@@ -2927,25 +3168,31 @@ fr:
     oneway: FR:Key:oneway
     opening_hours: FR:Key:opening hours
     operator: FR:Key:operator
+    overtaking: FR:Key:overtaking
     parking: FR:Key:parking
     parking:lane: FR:Key:parking:lane
     paved:date: FR:Key:paved:date
     phone: FR:Key:phone
     place: FR:Key:place
     place:fr: FR:Key:place:fr
+    playground: FR:Key:playground
     post_office:type: FR:Key:post office:type
     power: FR:Key:power
     power_supply: FR:Key:power supply
     priority: FR:Key:priority
+    priority_road: FR:Key:priority road
     proposed: FR:Key:proposed
     psv: FR:Key:psv
     public_transport: FR:Key:public transport
+    pump: FR:Key:pump
     railway: FR:Key:railway
     ref: FR:Key:ref
     ref:CEF: FR:Key:ref:CEF
     ref:ERDF:gdo: FR:Key:ref:ERDF:gdo
     ref:FR:42C: FR:Key:ref:FR:42C
+    ref:FR:FANTOIR: FR:Key:ref:FR:FANTOIR
     ref:FR:FINESS: FR:Key:ref:FR:FINESS
+    ref:FR:SIRET: FR:Key:ref:FR:SIRET
     ref:INSEE: FR:Key:ref:INSEE
     ref:UAI: FR:Key:ref:UAI
     ref:mhs: FR:Key:ref:mhs
@@ -3005,6 +3252,7 @@ fr:
     amenity=cafe: FR:Tag:amenity=cafe
     amenity=car_rental: FR:Tag:amenity=car rental
     amenity=car_sharing: FR:Tag:amenity=car sharing
+    amenity=college: FR:Tag:amenity=college
     amenity=community_centre: FR:Tag:amenity=community centre
     amenity=compressed_air: FR:Tag:amenity=compressed air
     amenity=coworking_space: FR:Tag:amenity=coworking space
@@ -3019,6 +3267,7 @@ fr:
     amenity=kindergarten: FR:Tag:amenity=kindergarten
     amenity=library: FR:Tag:amenity=library
     amenity=marketplace: FR:Tag:amenity=marketplace
+    amenity=motorcycle_parking: FR:Tag:amenity=motorcycle parking
     amenity=parking: FR:Tag:amenity=parking
     amenity=parking_space: FR:Tag:amenity=parking space
     amenity=pharmacy: FR:Tag:amenity=pharmacy
@@ -3038,6 +3287,7 @@ fr:
     amenity=university: FR:Tag:amenity=university
     amenity=veterinary: FR:Tag:amenity=veterinary
     amenity=waste_basket: FR:Tag:amenity=waste basket
+    amenity=waste_disposal: FR:Tag:amenity=waste disposal
     barrier=bollard: FR:Tag:barrier=bollard
     barrier=cycle_barrier: FR:Tag:barrier=cycle barrier
     barrier=gate: FR:Tag:barrier=gate
@@ -3120,6 +3370,7 @@ fr:
     landuse=village_green: FR:Tag:landuse=village green
     leisure=dog_park: FR:Tag:leisure=dog park
     leisure=golf_course: FR:Tag:leisure=golf course
+    leisure=paddling_pool: FR:Tag:leisure=paddling pool
     leisure=park: FR:Tag:leisure=park
     leisure=pitch: FR:Tag:leisure=pitch
     leisure=playground: FR:Tag:leisure=playground
@@ -3144,6 +3395,7 @@ fr:
     natural=tree_row: FR:Tag:natural=tree row
     natural=water: FR:Tag:natural=water
     natural=wetland: FR:Tag:natural=wetland
+    office=employment_agency: FR:Tag:office=employment agency
     office=estate_agent: FR:Tag:office=estate agent
     office=ngo: FR:Tag:office=ngo
     place=city: FR:Tag:place=city
@@ -3164,6 +3416,7 @@ fr:
     power=transformer: FR:Tag:power=transformer
     public_transport=platform: FR:Tag:public transport=platform
     public_transport=station: FR:Tag:public transport=station
+    pump=powered: FR:Tag:pump=powered
     railway=level_crossing: FR:Tag:railway=level crossing
     railway=rail: FR:Tag:railway=rail
     railway=station: FR:Tag:railway=station
@@ -3226,10 +3479,12 @@ fr:
     wall=no: FR:Tag:wall=no
     waterway=boatyard: FR:Tag:waterway=boatyard
     waterway=canal: FR:Tag:waterway=canal
+    waterway=dam: FR:Tag:waterway=dam
     waterway=lock_gate: FR:Tag:waterway=lock gate
     waterway=river: FR:Tag:waterway=river
     waterway=riverbank: FR:Tag:waterway=riverbank
     waterway=stream: FR:Tag:waterway=stream
+    waterway=weir: FR:Tag:waterway=weir
 hr:
   key:
     amenity: Hr:Key:amenity
@@ -3249,15 +3504,27 @@ ht:
   key:
     intermittent: Ht:Key:intermittent
     pump: Ht:Key:pump
-  tag:
-    landuse=residential: Ht:Tag:landuse=residential
 hu:
   key:
+    aerialway: Hu:Key:aerialway
+    aeroway: Hu:Key:aeroway
     amenity: Hu:Key:amenity
+    barrier: Hu:Key:barrier
     building: Hu:Key:building
+    denomination: Hu:Key:denomination
+    highway: Hu:Key:highway
     jel: Hu:Key:jel
+    landuse: Hu:Key:landuse
+    leisure: Hu:Key:leisure
+    natural: Hu:Key:natural
     office: Hu:Key:office
+    place: Hu:Key:place
+    railway: Hu:Key:railway
+    shop: Hu:Key:shop
     symbol: Hu:Key:symbol
+    tourism: Hu:Key:tourism
+    tracktype: Hu:Key:tracktype
+    waterway: Hu:Key:waterway
     wood: Hu:Key:wood
   tag:
     boundary=administrative: Hu:Tag:boundary=administrative
@@ -3282,6 +3549,8 @@ it:
     cutting: IT:Key:cutting
     cycleway: IT:Key:cycleway
     denomination: IT:Key:denomination
+    description: IT:Key:description
+    diet: IT:Key:diet
     ele: IT:Key:ele
     embankment: IT:Key:embankment
     enforcement: IT:Key:enforcement
@@ -3326,6 +3595,7 @@ it:
     route: IT:Key:route
     sac_scale: IT:Key:sac scale
     service: IT:Key:service
+    shop: IT:Key:shop
     smoothness: IT:Key:smoothness
     sport: IT:Key:sport
     stop: IT:Key:stop
@@ -3347,6 +3617,7 @@ it:
     amenity=animal_breeding: IT:Tag:amenity=animal breeding
     amenity=animal_shelter: IT:Tag:amenity=animal shelter
     amenity=bar: IT:Tag:amenity=bar
+    amenity=bench: IT:Tag:amenity=bench
     amenity=bicycle_rental: IT:Tag:amenity=bicycle rental
     amenity=cinema: IT:Tag:amenity=cinema
     amenity=college: IT:Tag:amenity=college
@@ -3358,6 +3629,7 @@ it:
     amenity=kindergarten: IT:Tag:amenity=kindergarten
     amenity=milk_dispenser: IT:Tag:amenity=milk dispenser
     amenity=parking: IT:Tag:amenity=parking
+    amenity=photo_booth: IT:Tag:amenity=photo booth
     amenity=place_of_worship: IT:Tag:amenity=place of worship
     amenity=police: IT:Tag:amenity=police
     amenity=post_office: IT:Tag:amenity=post office
@@ -3368,6 +3640,7 @@ it:
     amenity=waste_basket: IT:Tag:amenity=waste basket
     barrier=ditch: IT:Tag:barrier=ditch
     barrier=fence: IT:Tag:barrier=fence
+    barrier=retaining_wall: IT:Tag:barrier=retaining wall
     barrier=toll_booth: IT:Tag:barrier=toll booth
     footway=crossing: IT:Tag:footway=crossing
     footway=sidewalk: IT:Tag:footway=sidewalk
@@ -3392,7 +3665,9 @@ it:
     highway=trunk_link: IT:Tag:highway=trunk link
     historic=paleontological_site: IT:Tag:historic=paleontological site
     historic=wayside_shrine: IT:Tag:historic=wayside shrine
+    industrial=auto_wrecker: IT:Tag:industrial=auto wrecker
     junction=roundabout: IT:Tag:junction=roundabout
+    landuse=cemetery: IT:Tag:landuse=cemetery
     landuse=construction: IT:Tag:landuse=construction
     leisure=beach_resort: IT:Tag:leisure=beach resort
     leisure=dog_park: IT:Tag:leisure=dog park
@@ -3403,6 +3678,7 @@ it:
     natural=grassland: IT:Tag:natural=grassland
     natural=scree: IT:Tag:natural=scree
     natural=spring: IT:Tag:natural=spring
+    natural=tree_row: IT:Tag:natural=tree row
     natural=wetland: IT:Tag:natural=wetland
     place=village: IT:Tag:place=village
     power=cable: IT:Tag:power=cable
@@ -3432,11 +3708,15 @@ it:
     waterway=stream: IT:Tag:waterway=stream
 ja:
   key:
+    abutters: JA:Key:abutters
     access: JA:Key:access
     addr: JA:Key:addr
     aerialway: JA:Key:aerialway
+    aeroway: JA:Key:aeroway
     area: JA:Key:area
+    barrier: JA:Key:barrier
     books: JA:Key:books
+    boundary: JA:Key:boundary
     brand: JA:Key:brand
     bridge: JA:Key:bridge
     building: JA:Key:building
@@ -3445,9 +3725,12 @@ ja:
     building:parts: JA:Key:building:parts
     capacity: JA:Key:capacity
     clothes: JA:Key:clothes
+    comment: JA:Key:comment
     contact: JA:Key:contact
+    covered: JA:Key:covered
     crossing: JA:Key:crossing
     cuisine: JA:Key:cuisine
+    cutting: JA:Key:cutting
     cycleway: JA:Key:cycleway
     denomination: JA:Key:denomination
     description: JA:Key:description
@@ -3457,6 +3740,7 @@ ja:
     drive_through: JA:Key:drive through
     easy_overtaking: JA:Key:easy overtaking
     electrified: JA:Key:electrified
+    embankment: JA:Key:embankment
     emergency: JA:Key:emergency
     end_date: JA:Key:end date
     fee: JA:Key:fee
@@ -3464,40 +3748,67 @@ ja:
     foot: JA:Key:foot
     footway: JA:Key:footway
     furniture: JA:Key:furniture
+    generator:source: JA:Key:generator:source
+    genus: JA:Key:genus
     geological: JA:Key:geological
     hazard_type: JA:Key:hazard type
     height: JA:Key:height
+    highway: JA:Key:highway
+    historic: JA:Key:historic
     incline: JA:Key:incline
+    information: JA:Key:information
+    internet_access: JA:Key:internet access
+    is_in: JA:Key:is in
+    landuse: JA:Key:landuse
     lanes: JA:Key:lanes
+    layer: JA:Key:layer
+    leisure: JA:Key:leisure
     level: JA:Key:level
+    level_crossing: JA:Key:level crossing
     lit: JA:Key:lit
+    man_made: JA:Key:man made
+    military: JA:Key:military
     mountain_pass: JA:Key:mountain pass
     name: JA:Key:name
+    natural: JA:Key:natural
     note: JA:Key:note
     oneway: JA:Key:oneway
     opening_hours: JA:Key:opening hours
     operator: JA:Key:operator
     overtaking: JA:Key:overtaking
     phone: JA:Key:phone
+    place: JA:Key:place
     power: JA:Key:power
     power_source: JA:Key:power source
+    power_supply: JA:Key:power supply
     public_transport: JA:Key:public transport
+    railway: JA:Key:railway
     ref: JA:Key:ref
     religion: JA:Key:religion
     roof:material: JA:Key:roof:material
     room: JA:Key:room
+    route: JA:Key:route
     seamark:fixme: JA:Key:seamark:fixme
     segregated: JA:Key:segregated
+    service: JA:Key:service
+    shop: JA:Key:shop
+    sidewalk: JA:Key:sidewalk
+    smoothness: JA:Key:smoothness
     social_facility: JA:Key:social facility
+    source: JA:Key:source
+    species: JA:Key:species
     sport: JA:Key:sport
     start_date: JA:Key:start date
     step_count: JA:Key:step count
     surface: JA:Key:surface
     tactile_paving: JA:Key:tactile paving
     takeaway: JA:Key:takeaway
+    tourism: JA:Key:tourism
     tracktype: JA:Key:tracktype
+    tunnel: JA:Key:tunnel
     type: JA:Key:type
     url: JA:Key:url
+    waterway: JA:Key:waterway
     website: JA:Key:website
     wheelchair: JA:Key:wheelchair
     width: JA:Key:width
@@ -3511,8 +3822,12 @@ ja:
     aeroway=helipad: JA:Tag:aeroway=helipad
     aeroway=runway: JA:Tag:aeroway=runway
     aeroway=taxiway: JA:Tag:aeroway=taxiway
+    aeroway=terminal: JA:Tag:aeroway=terminal
+    amenity=arts_centre: JA:Tag:amenity=arts centre
+    amenity=atm: JA:Tag:amenity=atm
     amenity=baby_hatch: JA:Tag:amenity=baby hatch
     amenity=bank: JA:Tag:amenity=bank
+    amenity=bar: JA:Tag:amenity=bar
     amenity=bbq: JA:Tag:amenity=bbq
     amenity=bench: JA:Tag:amenity=bench
     amenity=bicycle_parking: JA:Tag:amenity=bicycle parking
@@ -3522,63 +3837,101 @@ ja:
     amenity=brothel: JA:Tag:amenity=brothel
     amenity=bureau_de_change: JA:Tag:amenity=bureau de change
     amenity=bus_station: JA:Tag:amenity=bus station
+    amenity=cafe: JA:Tag:amenity=cafe
     amenity=car_rental: JA:Tag:amenity=car rental
+    amenity=car_sharing: JA:Tag:amenity=car sharing
     amenity=car_wash: JA:Tag:amenity=car wash
+    amenity=charging_station: JA:Tag:amenity=charging station
+    amenity=cinema: JA:Tag:amenity=cinema
     amenity=clock: JA:Tag:amenity=clock
     amenity=college: JA:Tag:amenity=college
+    amenity=community_centre: JA:Tag:amenity=community centre
     amenity=courthouse: JA:Tag:amenity=courthouse
+    amenity=crematorium: JA:Tag:amenity=crematorium
     amenity=dentist: JA:Tag:amenity=dentist
+    amenity=doctors: JA:Tag:amenity=doctors
+    amenity=drinking_water: JA:Tag:amenity=drinking water
     amenity=embassy: JA:Tag:amenity=embassy
+    amenity=fast_food: JA:Tag:amenity=fast food
     amenity=ferry_terminal: JA:Tag:amenity=ferry terminal
     amenity=fire_station: JA:Tag:amenity=fire station
     amenity=food_court: JA:Tag:amenity=food court
     amenity=fountain: JA:Tag:amenity=fountain
+    amenity=fuel: JA:Tag:amenity=fuel
     amenity=grave_yard: JA:Tag:amenity=grave yard
+    amenity=grit_bin: JA:Tag:amenity=grit bin
+    amenity=hospital: JA:Tag:amenity=hospital
     amenity=hunting_stand: JA:Tag:amenity=hunting stand
+    amenity=ice_cream: JA:Tag:amenity=ice cream
     amenity=kindergarten: JA:Tag:amenity=kindergarten
     amenity=library: JA:Tag:amenity=library
+    amenity=marketplace: JA:Tag:amenity=marketplace
     amenity=nightclub: JA:Tag:amenity=nightclub
     amenity=nursing_home: JA:Tag:amenity=nursing home
     amenity=parking: JA:Tag:amenity=parking
     amenity=parking_entrance: JA:Tag:amenity=parking entrance
     amenity=parking_space: JA:Tag:amenity=parking space
     amenity=pharmacy: JA:Tag:amenity=pharmacy
+    amenity=place_of_worship: JA:Tag:amenity=place of worship
     amenity=police: JA:Tag:amenity=police
     amenity=post_box: JA:Tag:amenity=post box
     amenity=post_office: JA:Tag:amenity=post office
+    amenity=prison: JA:Tag:amenity=prison
+    amenity=pub: JA:Tag:amenity=pub
+    amenity=public_building: JA:Tag:amenity=public building
     amenity=recycling: JA:Tag:amenity=recycling
     amenity=restaurant: JA:Tag:amenity=restaurant
     amenity=sauna: JA:Tag:amenity=sauna
+    amenity=school: JA:Tag:amenity=school
     amenity=shelter: JA:Tag:amenity=shelter
     amenity=social_centre: JA:Tag:amenity=social centre
+    amenity=social_facility: JA:Tag:amenity=social facility
     amenity=stripclub: JA:Tag:amenity=stripclub
     amenity=studio: JA:Tag:amenity=studio
     amenity=taxi: JA:Tag:amenity=taxi
+    amenity=telephone: JA:Tag:amenity=telephone
+    amenity=theatre: JA:Tag:amenity=theatre
+    amenity=toilets: JA:Tag:amenity=toilets
+    amenity=townhall: JA:Tag:amenity=townhall
     amenity=university: JA:Tag:amenity=university
+    amenity=vending_machine: JA:Tag:amenity=vending machine
+    amenity=veterinary: JA:Tag:amenity=veterinary
     amenity=waste_basket: JA:Tag:amenity=waste basket
     amenity=waste_disposal: JA:Tag:amenity=waste disposal
+    amenity=waste_transfer_station: JA:Tag:amenity=waste transfer station
     amenity=watering_place: JA:Tag:amenity=watering place
     atm=yes: JA:Tag:atm=yes
     barrier=bollard: JA:Tag:barrier=bollard
     barrier=fence: JA:Tag:barrier=fence
+    barrier=gate: JA:Tag:barrier=gate
+    barrier=hedge: JA:Tag:barrier=hedge
     barrier=lift_gate: JA:Tag:barrier=lift gate
+    barrier=retaining_wall: JA:Tag:barrier=retaining wall
     barrier=toll_booth: JA:Tag:barrier=toll booth
+    barrier=wall: JA:Tag:barrier=wall
     boundary=administrative: JA:Tag:boundary=administrative
     boundary=national_park: JA:Tag:boundary=national park
     boundary=protected_area: JA:Tag:boundary=protected area
     bridge=viaduct: JA:Tag:bridge=viaduct
+    building=train_station: JA:Tag:building=train station
     craft=brewery: JA:Tag:craft=brewery
+    emergency=defibrillator: JA:Tag:emergency=defibrillator
     emergency=fire_extinguisher: JA:Tag:emergency=fire extinguisher
     emergency=fire_hydrant: JA:Tag:emergency=fire hydrant
+    highway=bus_stop: JA:Tag:highway=bus stop
     highway=crossing: JA:Tag:highway=crossing
     highway=cycleway: JA:Tag:highway=cycleway
+    highway=footway: JA:Tag:highway=footway
     highway=motorway_link: JA:Tag:highway=motorway link
     highway=path: JA:Tag:highway=path
+    highway=pedestrian: JA:Tag:highway=pedestrian
     highway=residential: JA:Tag:highway=residential
     highway=rest_area: JA:Tag:highway=rest area
     highway=road: JA:Tag:highway=road
     highway=secondary: JA:Tag:highway=secondary
+    highway=service: JA:Tag:highway=service
     highway=services: JA:Tag:highway=services
+    highway=steps: JA:Tag:highway=steps
     highway=tertiary: JA:Tag:highway=tertiary
     highway=track: JA:Tag:highway=track
     highway=traffic_signals: JA:Tag:highway=traffic signals
@@ -3595,11 +3948,13 @@ ja:
     landuse=cemetery: JA:Tag:landuse=cemetery
     landuse=commercial: JA:Tag:landuse=commercial
     landuse=construction: JA:Tag:landuse=construction
+    landuse=farm: JA:Tag:landuse=farm
     landuse=farmyard: JA:Tag:landuse=farmyard
     landuse=forest: JA:Tag:landuse=forest
     landuse=garages: JA:Tag:landuse=garages
     landuse=grass: JA:Tag:landuse=grass
     landuse=greenfield: JA:Tag:landuse=greenfield
+    landuse=greenhouse_horticulture: JA:Tag:landuse=greenhouse horticulture
     landuse=industrial: JA:Tag:landuse=industrial
     landuse=landfill: JA:Tag:landuse=landfill
     landuse=meadow: JA:Tag:landuse=meadow
@@ -3621,14 +3976,19 @@ ja:
     leisure=dog_park: JA:Tag:leisure=dog park
     leisure=garden: JA:Tag:leisure=garden
     leisure=golf_course: JA:Tag:leisure=golf course
+    leisure=ice_rink: JA:Tag:leisure=ice rink
     leisure=marina: JA:Tag:leisure=marina
     leisure=miniature_golf: JA:Tag:leisure=miniature golf
     leisure=nature_reserve: JA:Tag:leisure=nature reserve
+    leisure=park: JA:Tag:leisure=park
+    leisure=pitch: JA:Tag:leisure=pitch
     leisure=playground: JA:Tag:leisure=playground
     leisure=slipway: JA:Tag:leisure=slipway
     leisure=sports_centre: JA:Tag:leisure=sports centre
+    leisure=stadium: JA:Tag:leisure=stadium
     leisure=swimming_pool: JA:Tag:leisure=swimming pool
     leisure=track: JA:Tag:leisure=track
+    leisure=water_park: JA:Tag:leisure=water park
     man_made=adit: JA:Tag:man made=adit
     man_made=breakwater: JA:Tag:man made=breakwater
     man_made=crane: JA:Tag:man made=crane
@@ -3640,11 +4000,21 @@ ja:
     man_made=mineshaft: JA:Tag:man made=mineshaft
     man_made=pier: JA:Tag:man made=pier
     man_made=tower: JA:Tag:man made=tower
+    man_made=wastewater_plant: JA:Tag:man made=wastewater plant
     man_made=water_well: JA:Tag:man made=water well
     man_made=works: JA:Tag:man made=works
+    natural=bay: JA:Tag:natural=bay
+    natural=beach: JA:Tag:natural=beach
+    natural=cliff: JA:Tag:natural=cliff
+    natural=coastline: JA:Tag:natural=coastline
+    natural=fell: JA:Tag:natural=fell
+    natural=grassland: JA:Tag:natural=grassland
     natural=heath: JA:Tag:natural=heath
     natural=scree: JA:Tag:natural=scree
+    natural=tree: JA:Tag:natural=tree
     natural=tree_row: JA:Tag:natural=tree row
+    natural=volcano: JA:Tag:natural=volcano
+    natural=wetland: JA:Tag:natural=wetland
     natural=wood: JA:Tag:natural=wood
     place=island: JA:Tag:place=island
     place=islet: JA:Tag:place=islet
@@ -3654,11 +4024,17 @@ ja:
     public_transport=platform: JA:Tag:public transport=platform
     railway=crossing: JA:Tag:railway=crossing
     railway=level_crossing: JA:Tag:railway=level crossing
+    railway=monorail: JA:Tag:railway=monorail
     railway=rail: JA:Tag:railway=rail
+    railway=station: JA:Tag:railway=station
+    railway=subway: JA:Tag:railway=subway
     railway=tram: JA:Tag:railway=tram
     route=road: JA:Tag:route=road
     service=parking_aisle: JA:Tag:service=parking aisle
+    service=siding: JA:Tag:service=siding
+    service=spur: JA:Tag:service=spur
     shop=alcohol: JA:Tag:shop=alcohol
+    shop=anime: JA:Tag:shop=anime
     shop=art: JA:Tag:shop=art
     shop=bakery: JA:Tag:shop=bakery
     shop=beauty: JA:Tag:shop=beauty
@@ -3674,19 +4050,35 @@ ja:
     shop=department_store: JA:Tag:shop=department store
     shop=doityourself: JA:Tag:shop=doityourself
     shop=florist: JA:Tag:shop=florist
+    shop=furniture: JA:Tag:shop=furniture
+    shop=garden_centre: JA:Tag:shop=garden centre
     shop=general: JA:Tag:shop=general
+    shop=gift: JA:Tag:shop=gift
     shop=hairdresser: JA:Tag:shop=hairdresser
+    shop=kiosk: JA:Tag:shop=kiosk
+    shop=massage: JA:Tag:shop=massage
     shop=motorcycle: JA:Tag:shop=motorcycle
+    shop=outdoor: JA:Tag:shop=outdoor
     shop=pet: JA:Tag:shop=pet
     shop=second_hand: JA:Tag:shop=second hand
     shop=supermarket: JA:Tag:shop=supermarket
     shop=tobacco: JA:Tag:shop=tobacco
+    shop=variety_store: JA:Tag:shop=variety store
+    tourism=camp_site: JA:Tag:tourism=camp site
+    tourism=hostel: JA:Tag:tourism=hostel
     tourism=hotel: JA:Tag:tourism=hotel
+    tourism=information: JA:Tag:tourism=information
     tourism=museum: JA:Tag:tourism=museum
     tourism=picnic_site: JA:Tag:tourism=picnic site
+    tourism=viewpoint: JA:Tag:tourism=viewpoint
+    tunnel=culvert: JA:Tag:tunnel=culvert
+    waterway=canal: JA:Tag:waterway=canal
     waterway=dam: JA:Tag:waterway=dam
     waterway=ditch: JA:Tag:waterway=ditch
     waterway=drain: JA:Tag:waterway=drain
+    waterway=lock_gate: JA:Tag:waterway=lock gate
+    waterway=riverbank: JA:Tag:waterway=riverbank
+    waterway=stream: JA:Tag:waterway=stream
     waterway=water_point: JA:Tag:waterway=water point
     waterway=weir: JA:Tag:waterway=weir
 ko:
@@ -3697,17 +4089,74 @@ ko:
     craft=tailor: Ko:Tag:craft=tailor
     shop=garden_centre: Ko:Tag:shop=garden centre
     shop=gift: Ko:Tag:shop=gift
+lt:
+  key:
+    cycleway: Lt:Key:cycleway
 nl:
   key:
     AND_nosr_r: NL:Key:AND nosr r
+    addr: NL:Key:addr
+    amenity: NL:Key:amenity
+    backrest: NL:Key:backrest
+    barrier: NL:Key:barrier
+    bench: NL:Key:bench
+    building: NL:Key:building
+    colour: NL:Key:colour
+    craft: NL:Key:craft
     crossing: NL:Key:crossing
+    cycleway: NL:Key:cycleway
+    demolished: NL:Key:demolished
+    emergency: NL:Key:emergency
+    fence_type: NL:Key:fence type
+    fenced: NL:Key:fenced
+    landuse: NL:Key:landuse
+    leisure: NL:Key:leisure
+    man_made: NL:Key:man made
+    military: NL:Key:military
+    name: NL:Key:name
+    natural: NL:Key:natural
+    office: NL:Key:office
+    public_transport: NL:Key:public transport
+    route_master: NL:Key:route master
     scenic: NL:Key:scenic
+    shop: NL:Key:shop
+    tourism: NL:Key:tourism
+    type: NL:Key:type
+    waste: NL:Key:waste
     wheelchair: NL:Key:wheelchair
   tag:
+    amenity=bank: NL:Tag:amenity=bank
+    amenity=bench: NL:Tag:amenity=bench
+    amenity=cafe: NL:Tag:amenity=cafe
+    amenity=drinking_water: NL:Tag:amenity=drinking water
+    amenity=grave_yard: NL:Tag:amenity=grave yard
+    amenity=parking: NL:Tag:amenity=parking
     amenity=post_office: NL:Tag:amenity=post office
+    amenity=toilets: NL:Tag:amenity=toilets
+    amenity=waste_basket: NL:Tag:amenity=waste basket
+    barrier=bollard: NL:Tag:barrier=bollard
+    barrier=fence: NL:Tag:barrier=fence
+    barrier=hedge: NL:Tag:barrier=hedge
+    barrier=sump_buster: NL:Tag:barrier=sump buster
+    building=entrance: NL:Tag:building=entrance
     highway=footway: NL:Tag:highway=footway
+    highway=motorway: NL:Tag:highway=motorway
     highway=path: NL:Tag:highway=path
+    information=tactile_map: NL:Tag:information=tactile map
+    landuse=cemetery: NL:Tag:landuse=cemetery
+    landuse=garages: NL:Tag:landuse=garages
+    landuse=grass: NL:Tag:landuse=grass
+    landuse=industrial: NL:Tag:landuse=industrial
     man_made=windmill: NL:Tag:man made=windmill
+    public_transport=platform: NL:Tag:public transport=platform
+    public_transport=station: NL:Tag:public transport=station
+    public_transport=stop_area: NL:Tag:public transport=stop area
+    public_transport=stop_position: NL:Tag:public transport=stop position
+    shop=car: NL:Tag:shop=car
+    shop=department_store: NL:Tag:shop=department store
+    shop=greengrocer: NL:Tag:shop=greengrocer
+    tourism=chalet: NL:Tag:tourism=chalet
+    zoo=petting_zoo: NL:Tag:zoo=petting zoo
 no:
   key:
     amenity: No:Key:amenity
@@ -3729,11 +4178,21 @@ pl:
     abutters: Pl:Key:abutters
     access: Pl:Key:access
     addr: Pl:Key:addr
+    addr:country: Pl:Key:addr:country
+    addr:district: Pl:Key:addr:district
     addr:flats: Pl:Key:addr:flats
+    addr:hamlet: Pl:Key:addr:hamlet
+    addr:housenumber: Pl:Key:addr:housenumber
     addr:place: Pl:Key:addr:place
+    addr:postcode: Pl:Key:addr:postcode
+    addr:province: Pl:Key:addr:province
+    addr:state: Pl:Key:addr:state
+    addr:street: Pl:Key:addr:street
+    addr:subdistrict: Pl:Key:addr:subdistrict
     addr:suburb: Pl:Key:addr:suburb
     aerialway: Pl:Key:aerialway
     aeroway: Pl:Key:aeroway
+    alt_name: Pl:Key:alt name
     amenity: Pl:Key:amenity
     area: Pl:Key:area
     automatic_door: Pl:Key:automatic door
@@ -3774,13 +4233,19 @@ pl:
     destination: Pl:Key:destination
     diocese: Pl:Key:diocese
     ele: Pl:Key:ele
+    electrified: Pl:Key:electrified
     embankment: Pl:Key:embankment
     emergency: Pl:Key:emergency
+    end_date: Pl:Key:end date
     entrance: Pl:Key:entrance
     fee: Pl:Key:fee
     fixme: Pl:Key:fixme
+    flood_prone: Pl:Key:flood prone
     foot: Pl:Key:foot
     footway: Pl:Key:footway
+    ford: Pl:Key:ford
+    fuel: Pl:Key:fuel
+    gauge: Pl:Key:gauge
     generator:output: Pl:Key:generator:output
     height: Pl:Key:height
     highway: Pl:Key:highway
@@ -3804,6 +4269,7 @@ pl:
     maxheight: Pl:Key:maxheight
     maxspeed: Pl:Key:maxspeed
     maxstay: Pl:Key:maxstay
+    min_height: Pl:Key:min height
     mooring: Pl:Key:mooring
     name: Pl:Key:name
     natural: Pl:Key:natural
@@ -3820,6 +4286,7 @@ pl:
     parking:lane: Pl:Key:parking:lane
     place: Pl:Key:place
     place_name: Pl:Key:place name
+    population: Pl:Key:population
     power: Pl:Key:power
     psv: Pl:Key:psv
     public_transport: Pl:Key:public transport
@@ -3828,20 +4295,26 @@ pl:
     ramp: Pl:Key:ramp
     recycling_type: Pl:Key:recycling type
     religion: Pl:Key:religion
+    resource: Pl:Key:resource
     roof:material: Pl:Key:roof:material
     route: Pl:Key:route
     route_master: Pl:Key:route master
     sac_scale: Pl:Key:sac scale
     seamark:fixme: Pl:Key:seamark:fixme
+    second_hand: Pl:Key:second hand
     service: Pl:Key:service
     service_times: Pl:Key:service times
     shop: Pl:Key:shop
     sidewalk: Pl:Key:sidewalk
+    smoothness: Pl:Key:smoothness
+    source:date: Pl:Key:source:date
+    start_date: Pl:Key:start date
     step_count: Pl:Key:step count
     surface: Pl:Key:surface
     surveillance: Pl:Key:surveillance
     surveillance:type: Pl:Key:surveillance:type
     surveillance:zone: Pl:Key:surveillance:zone
+    toll: Pl:Key:toll
     tomb: Pl:Key:tomb
     tourism: Pl:Key:tourism
     tracktype: Pl:Key:tracktype
@@ -3853,6 +4326,7 @@ pl:
     voltage: Pl:Key:voltage
     waterway: Pl:Key:waterway
     website: Pl:Key:website
+    wetland: Pl:Key:wetland
     wheelchair: Pl:Key:wheelchair
     wikipedia: Pl:Key:wikipedia
     wood: Pl:Key:wood
@@ -3916,6 +4390,7 @@ pl:
     building=bridge: Pl:Tag:building=bridge
     building=bunker: Pl:Tag:building=bunker
     building=cabin: Pl:Tag:building=cabin
+    building=cathedral: Pl:Tag:building=cathedral
     building=chapel: Pl:Tag:building=chapel
     building=church: Pl:Tag:building=church
     building=civic: Pl:Tag:building=civic
@@ -3923,6 +4398,7 @@ pl:
     building=construction: Pl:Tag:building=construction
     building=detached: Pl:Tag:building=detached
     building=dormitory: Pl:Tag:building=dormitory
+    building=entrance: Pl:Tag:building=entrance
     building=farm_auxiliary: Pl:Tag:building=farm auxiliary
     building=garage: Pl:Tag:building=garage
     building=garages: Pl:Tag:building=garages
@@ -3941,6 +4417,7 @@ pl:
     building=roof: Pl:Tag:building=roof
     building=school: Pl:Tag:building=school
     building=shed: Pl:Tag:building=shed
+    building=stable: Pl:Tag:building=stable
     building=supermarket: Pl:Tag:building=supermarket
     building=terrace: Pl:Tag:building=terrace
     building=train_station: Pl:Tag:building=train station
@@ -3993,6 +4470,7 @@ pl:
     landuse=allotments: Pl:Tag:landuse=allotments
     landuse=brownfield: Pl:Tag:landuse=brownfield
     landuse=cemetery: Pl:Tag:landuse=cemetery
+    landuse=commercial: Pl:Tag:landuse=commercial
     landuse=farm: Pl:Tag:landuse=farm
     landuse=farmyard: Pl:Tag:landuse=farmyard
     landuse=forest: Pl:Tag:landuse=forest
@@ -4003,21 +4481,29 @@ pl:
     landuse=quarry: Pl:Tag:landuse=quarry
     landuse=railway: Pl:Tag:landuse=railway
     landuse=religious: Pl:Tag:landuse=religious
+    landuse=residential: Pl:Tag:landuse=residential
+    landuse=retail: Pl:Tag:landuse=retail
     leisure=firepit: Pl:Tag:leisure=firepit
     leisure=fishing: Pl:Tag:leisure=fishing
+    man_made=adit: Pl:Tag:man made=adit
     man_made=cross: Pl:Tag:man made=cross
     man_made=cutline: Pl:Tag:man made=cutline
     man_made=dyke: Pl:Tag:man made=dyke
     man_made=embankment: Pl:Tag:man made=embankment
     man_made=surveillance: Pl:Tag:man made=surveillance
     man_made=tower: Pl:Tag:man made=tower
+    man_made=water_well: Pl:Tag:man made=water well
     man_made=watermill: Pl:Tag:man made=watermill
     man_made=windmill: Pl:Tag:man made=windmill
+    man_made=windpump: Pl:Tag:man made=windpump
+    military=bunker: Pl:Tag:military=bunker
     mooring=ferry: Pl:Tag:mooring=ferry
+    natural=bare_rock: Pl:Tag:natural=bare rock
     natural=bay: Pl:Tag:natural=bay
     natural=cave_entrance: Pl:Tag:natural=cave entrance
     natural=grassland: Pl:Tag:natural=grassland
     natural=heath: Pl:Tag:natural=heath
+    natural=scree: Pl:Tag:natural=scree
     natural=scrub: Pl:Tag:natural=scrub
     natural=sinkhole: Pl:Tag:natural=sinkhole
     natural=tree: Pl:Tag:natural=tree
@@ -4047,6 +4533,7 @@ pl:
     railway=crossing: Pl:Tag:railway=crossing
     railway=crossing_controller: Pl:Tag:railway=crossing controller
     railway=level_crossing: Pl:Tag:railway=level crossing
+    railway=rail: Pl:Tag:railway=rail
     service=alley: Pl:Tag:service=alley
     service=drive-through: Pl:Tag:service=drive-through
     service=driveway: Pl:Tag:service=driveway
@@ -4057,9 +4544,23 @@ pl:
     service=spur: Pl:Tag:service=spur
     service=yard: Pl:Tag:service=yard
     shop=baby_goods: Pl:Tag:shop=baby goods
+    shop=bathroom_furnishing: Pl:Tag:shop=bathroom furnishing
     shop=bicycle: Pl:Tag:shop=bicycle
+    shop=confectionery: Pl:Tag:shop=confectionery
+    shop=convenience: Pl:Tag:shop=convenience
+    shop=department_store: Pl:Tag:shop=department store
     shop=funeral_directors: Pl:Tag:shop=funeral directors
+    shop=furniture: Pl:Tag:shop=furniture
+    shop=general: Pl:Tag:shop=general
+    shop=houseware: Pl:Tag:shop=houseware
+    shop=kitchen: Pl:Tag:shop=kitchen
+    shop=pastry: Pl:Tag:shop=pastry
+    shop=second_hand: Pl:Tag:shop=second hand
+    shop=supermarket: Pl:Tag:shop=supermarket
+    shop=travel_agency: Pl:Tag:shop=travel agency
+    shop=variety_store: Pl:Tag:shop=variety store
     sport=aikido: Pl:Tag:sport=aikido
+    sport=climbing: Pl:Tag:sport=climbing
     tourism=artwork: Pl:Tag:tourism=artwork
     tourism=camp_site: Pl:Tag:tourism=camp site
     tourism=caravan_site: Pl:Tag:tourism=caravan site
@@ -4088,15 +4589,31 @@ pl:
     waterway=riverbank: Pl:Tag:waterway=riverbank
     waterway=stream: Pl:Tag:waterway=stream
     waterway=weir: Pl:Tag:waterway=weir
+    wetland=bog: Pl:Tag:wetland=bog
+    wetland=mangrove: Pl:Tag:wetland=mangrove
+    wetland=marsh: Pl:Tag:wetland=marsh
+    wetland=reedbed: Pl:Tag:wetland=reedbed
+    wetland=saltern: Pl:Tag:wetland=saltern
+    wetland=saltmarsh: Pl:Tag:wetland=saltmarsh
+    wetland=swamp: Pl:Tag:wetland=swamp
+    wetland=tidalflat: Pl:Tag:wetland=tidalflat
+    wetland=wet_meadow: Pl:Tag:wetland=wet meadow
     wood=coniferous: Pl:Tag:wood=coniferous
     wood=deciduous: Pl:Tag:wood=deciduous
     wood=evergreen: Pl:Tag:wood=evergreen
     wood=mixed: Pl:Tag:wood=mixed
 pt:
   key:
+    country: Pt:Key:country
+    highway: Pt:Key:highway
     postal_code: Pt:Key:postal code
+    ref:bag: Pt:Key:ref:bag
+    source: Pt:Key:source
     sport: Pt:Key:sport
+    tiger: Pt:Key:tiger
+    wikidata: Pt:Key:wikidata
   tag:
+    amenity=bicycle_parking: Pt:Tag:amenity=bicycle parking
     amenity=hospital: Pt:Tag:amenity=hospital
     highway=primary: Pt:Tag:highway=primary
     leisure=fishing: Pt:Tag:leisure=fishing
@@ -4112,25 +4629,31 @@ pt:
     leisure=stadium: Pt:Tag:leisure=stadium
     leisure=track: Pt:Tag:leisure=track
     leisure=water_park: Pt:Tag:leisure=water park
+    natural=coastline: Pt:Tag:natural=coastline
     sport=golf: Pt:Tag:sport=golf
 pt-br:
   key:
+    IBGE:GEOCODIGO: Pt-br:Key:IBGE:GEOCODIGO
     IBGE:tipo: Pt-br:Key:IBGE:tipo
     TMC: Pt-br:Key:TMC
     abutters: Pt-br:Key:abutters
     access: Pt-br:Key:access
     addr: Pt-br:Key:addr
+    addr:housenumber: Pt-br:Key:addr:housenumber
+    admin_level: Pt-br:Key:admin level
     aerialway: Pt-br:Key:aerialway
     aeroway: Pt-br:Key:aeroway
     amenity: Pt-br:Key:amenity
     area: Pt-br:Key:area
     barrier: Pt-br:Key:barrier
     bicycle: Pt-br:Key:bicycle
+    bicycle_parking: Pt-br:Key:bicycle parking
     boat: Pt-br:Key:boat
     border_type: Pt-br:Key:border type
     boundary: Pt-br:Key:boundary
     bridge: Pt-br:Key:bridge
     building: Pt-br:Key:building
+    building:levels: Pt-br:Key:building:levels
     cables: Pt-br:Key:cables
     cep: Pt-br:Key:cep
     construction: Pt-br:Key:construction
@@ -4141,11 +4664,14 @@ pt-br:
     cuisine: Pt-br:Key:cuisine
     cutting: Pt-br:Key:cutting
     cycleway: Pt-br:Key:cycleway
+    diet:*: Pt-br:Key:diet:*
+    driving_side: Pt-br:Key:driving side
     ele: Pt-br:Key:ele
     electrified: Pt-br:Key:electrified
     embankment: Pt-br:Key:embankment
     emergency: Pt-br:Key:emergency
     fenced: Pt-br:Key:fenced
+    fishing: Pt-br:Key:fishing
     foot: Pt-br:Key:foot
     frequency: Pt-br:Key:frequency
     geological: Pt-br:Key:geological
@@ -4203,11 +4729,13 @@ pt-br:
     sac_scale: Pt-br:Key:sac scale
     seamark: Pt-br:Key:seamark
     seasonal: Pt-br:Key:seasonal
+    second_hand: Pt-br:Key:second hand
+    segregated: Pt-br:Key:segregated
     service: Pt-br:Key:service
     shop: Pt-br:Key:shop
+    sidewalk: Pt-br:Key:sidewalk
     ski: Pt-br:Key:ski
     smoothness: Pt-br:Key:smoothness
-    source: Pt-br:Key:source
     sport: Pt-br:Key:sport
     surface: Pt-br:Key:surface
     tourism: Pt-br:Key:tourism
@@ -4219,6 +4747,8 @@ pt-br:
     usage: Pt-br:Key:usage
     voltage: Pt-br:Key:voltage
     waterway: Pt-br:Key:waterway
+    wheelchair: Pt-br:Key:wheelchair
+    wikipedia: Pt-br:Key:wikipedia
     winter_road: Pt-br:Key:winter road
     wires: Pt-br:Key:wires
   tag:
@@ -4323,6 +4853,7 @@ pt-br:
     boundary=national_park: Pt-br:Tag:boundary=national park
     boundary=political: Pt-br:Tag:boundary=political
     boundary=protected_area: Pt-br:Tag:boundary=protected area
+    bridge=viaduct: Pt-br:Tag:bridge=viaduct
     building=house: Pt-br:Tag:building=house
     craft=agricultural_engines: Pt-br:Tag:craft=agricultural engines
     craft=basket_maker: Pt-br:Tag:craft=basket maker
@@ -4381,6 +4912,7 @@ pt-br:
     highway=bus_guideway: Pt-br:Tag:highway=bus guideway
     highway=bus_stop: Pt-br:Tag:highway=bus stop
     highway=byway: Pt-br:Tag:highway=byway
+    highway=corridor: Pt-br:Tag:highway=corridor
     highway=crossing: Pt-br:Tag:highway=crossing
     highway=cycleway: Pt-br:Tag:highway=cycleway
     highway=emergency_access_point: Pt-br:Tag:highway=emergency access point
@@ -4472,7 +5004,6 @@ pt-br:
     leisure=water_park: Pt-br:Tag:leisure=water park
     man_made=adit: Pt-br:Tag:man made=adit
     man_made=antenna: Pt-br:Tag:man made=antenna
-    man_made=beacon: Pt-br:Tag:man made=beacon
     man_made=breakwater: Pt-br:Tag:man made=breakwater
     man_made=crane: Pt-br:Tag:man made=crane
     man_made=cutline: Pt-br:Tag:man made=cutline
@@ -4625,6 +5156,7 @@ pt-br:
     shop=erotic: Pt-br:Tag:shop=erotic
     shop=fabric: Pt-br:Tag:shop=fabric
     shop=farm: Pt-br:Tag:shop=farm
+    shop=fishing: Pt-br:Tag:shop=fishing
     shop=florist: Pt-br:Tag:shop=florist
     shop=frame: Pt-br:Tag:shop=frame
     shop=funeral_directors: Pt-br:Tag:shop=funeral directors
@@ -4671,15 +5203,16 @@ pt-br:
     shop=tobacco: Pt-br:Tag:shop=tobacco
     shop=toys: Pt-br:Tag:shop=toys
     shop=trade: Pt-br:Tag:shop=trade
+    shop=tyres: Pt-br:Tag:shop=tyres
     shop=vacant: Pt-br:Tag:shop=vacant
     shop=vacuum_cleaner: Pt-br:Tag:shop=vacuum cleaner
     shop=variety_store: Pt-br:Tag:shop=variety store
     shop=video: Pt-br:Tag:shop=video
-    source=IBGE: Pt-br:Tag:source=IBGE
     sport=soccer: Pt-br:Tag:sport=soccer
     tourism=alpine_hut: Pt-br:Tag:tourism=alpine hut
     tourism=artwork: Pt-br:Tag:tourism=artwork
     tourism=attraction: Pt-br:Tag:tourism=attraction
+    tourism=bed_and_breakfast: Pt-br:Tag:tourism=bed and breakfast
     tourism=camp_site: Pt-br:Tag:tourism=camp site
     tourism=caravan_site: Pt-br:Tag:tourism=caravan site
     tourism=chalet: Pt-br:Tag:tourism=chalet
@@ -4707,6 +5240,7 @@ pt-br:
     waterway=weir: Pt-br:Tag:waterway=weir
 ro:
   key:
+    amenity: Ro:Key:amenity
     leisure: Ro:Key:leisure
     tracktype: Ro:Key:tracktype
   tag:
@@ -4714,6 +5248,7 @@ ro:
     junction=roundabout: Ro:Tag:junction=roundabout
 ru:
   key:
+    abandoned: RU:Key:abandoned
     abutters: RU:Key:abutters
     access: RU:Key:access
     addr: RU:Key:addr
@@ -4797,7 +5332,6 @@ ru:
     internet_access: RU:Key:internet access
     junction: RU:Key:junction
     kerb: RU:Key:kerb
-    landmark: RU:Key:landmark
     landuse: RU:Key:landuse
     lanes: RU:Key:lanes
     layer: RU:Key:layer
@@ -4837,6 +5371,7 @@ ru:
     piste:type: RU:Key:piste:type
     place: RU:Key:place
     playground: RU:Key:playground
+    police: RU:Key:police
     population: RU:Key:population
     power: RU:Key:power
     priority_road: RU:Key:priority road
@@ -4851,6 +5386,7 @@ ru:
     ruins: RU:Key:ruins
     seasonal:snowfall:regaintime: RU:Key:seasonal:snowfall:regaintime
     service: RU:Key:service
+    service_times: RU:Key:service times
     shelter: RU:Key:shelter
     shelter_type: RU:Key:shelter type
     shop: RU:Key:shop
@@ -4886,8 +5422,17 @@ ru:
     winter_road: RU:Key:winter road
     wood: RU:Key:wood
   tag:
-    abandoned=yes: RU:Tag:abandoned=yes
+    access=agricultural: RU:Tag:access=agricultural
+    access=delivery: RU:Tag:access=delivery
     access=designated: RU:Tag:access=designated
+    access=destination: RU:Tag:access=destination
+    access=forestry: RU:Tag:access=forestry
+    access=no: RU:Tag:access=no
+    access=official: RU:Tag:access=official
+    access=permissive: RU:Tag:access=permissive
+    access=private: RU:Tag:access=private
+    access=unknown: RU:Tag:access=unknown
+    access=yes: RU:Tag:access=yes
     aeroway=aerodrome: RU:Tag:aeroway=aerodrome
     aeroway=apron: RU:Tag:aeroway=apron
     aeroway=gate: RU:Tag:aeroway=gate
@@ -4917,6 +5462,7 @@ ru:
     amenity=car_sharing: RU:Tag:amenity=car sharing
     amenity=car_wash: RU:Tag:amenity=car wash
     amenity=casino: RU:Tag:amenity=casino
+    amenity=charging_station: RU:Tag:amenity=charging station
     amenity=cinema: RU:Tag:amenity=cinema
     amenity=clinic: RU:Tag:amenity=clinic
     amenity=clock: RU:Tag:amenity=clock
@@ -4965,6 +5511,7 @@ ru:
     amenity=school: RU:Tag:amenity=school
     amenity=shelter: RU:Tag:amenity=shelter
     amenity=shower: RU:Tag:amenity=shower
+    amenity=smoking_area: RU:Tag:amenity=smoking area
     amenity=social_facility: RU:Tag:amenity=social facility
     amenity=stripclub: RU:Tag:amenity=stripclub
     amenity=taxi: RU:Tag:amenity=taxi
@@ -4992,6 +5539,9 @@ ru:
     barrier=toll_booth: RU:Tag:barrier=toll booth
     barrier=turnstile: RU:Tag:barrier=turnstile
     barrier=wall: RU:Tag:barrier=wall
+    building=cathedral: RU:Tag:building=cathedral
+    building=chapel: RU:Tag:building=chapel
+    building=church: RU:Tag:building=church
     building=detached: RU:Tag:building=detached
     building=dormitory: RU:Tag:building=dormitory
     building=entrance: RU:Tag:building=entrance
@@ -5108,6 +5658,7 @@ ru:
     landuse=village_green: RU:Tag:landuse=village green
     landuse=vineyard: RU:Tag:landuse=vineyard
     leisure=beach_resort: RU:Tag:leisure=beach resort
+    leisure=common: RU:Tag:leisure=common
     leisure=dance: RU:Tag:leisure=dance
     leisure=firepit: RU:Tag:leisure=firepit
     leisure=ice_rink: RU:Tag:leisure=ice rink
@@ -5174,6 +5725,11 @@ ru:
     office=telecommunication: RU:Tag:office=telecommunication
     office=travel_agent: RU:Tag:office=travel agent
     opening_hours=24/7: RU:Tag:opening hours=24/7
+    overtaking=backward: RU:Tag:overtaking=backward
+    overtaking=both: RU:Tag:overtaking=both
+    overtaking=forward: RU:Tag:overtaking=forward
+    overtaking=no: RU:Tag:overtaking=no
+    overtaking=yes: RU:Tag:overtaking=yes
     pipeline=marker: RU:Tag:pipeline=marker
     place=allotments: RU:Tag:place=allotments
     place=city: RU:Tag:place=city
@@ -5194,6 +5750,7 @@ ru:
     power=sub_station: RU:Tag:power=sub station
     power=substation: RU:Tag:power=substation
     power=tower: RU:Tag:power=tower
+    power=transformer: RU:Tag:power=transformer
     public_transport=platform: RU:Tag:public transport=platform
     public_transport=station: RU:Tag:public transport=station
     public_transport=stop_position: RU:Tag:public transport=stop position
@@ -5207,6 +5764,7 @@ ru:
     railway=subway: RU:Tag:railway=subway
     railway=subway_entrance: RU:Tag:railway=subway entrance
     railway=tram: RU:Tag:railway=tram
+    religion=pagan: RU:Tag:religion=pagan
     route=bus: RU:Tag:route=bus
     route=ferry: RU:Tag:route=ferry
     route=railway: RU:Tag:route=railway
@@ -5304,6 +5862,7 @@ ru:
     shop=toys: RU:Tag:shop=toys
     shop=trade: RU:Tag:shop=trade
     shop=travel_agency: RU:Tag:shop=travel agency
+    shop=vacant: RU:Tag:shop=vacant
     shop=vacuum_cleaner: RU:Tag:shop=vacuum cleaner
     shop=variety_store: RU:Tag:shop=variety store
     shop=video: RU:Tag:shop=video
@@ -5315,9 +5874,11 @@ ru:
     tourism=attraction: RU:Tag:tourism=attraction
     tourism=camp_site: RU:Tag:tourism=camp site
     tourism=chalet: RU:Tag:tourism=chalet
+    tourism=guest_house: RU:Tag:tourism=guest house
     tourism=hostel: RU:Tag:tourism=hostel
     tourism=hotel: RU:Tag:tourism=hotel
     tourism=information: RU:Tag:tourism=information
+    tourism=motel: RU:Tag:tourism=motel
     tourism=museum: RU:Tag:tourism=museum
     tourism=picnic_site: RU:Tag:tourism=picnic site
     tourism=theme_park: RU:Tag:tourism=theme park
@@ -5341,10 +5902,14 @@ sq:
 sv:
   key:
     access: Sv:Key:access
+    name: Sv:Key:name
   tag:
     aerialway=cable_car: Sv:Tag:aerialway=cable car
     amenity=place_of_worship: Sv:Tag:amenity=place of worship
+    amenity=recycling: Sv:Tag:amenity=recycling
+    highway=path: Sv:Tag:highway=path
     highway=rest_area: Sv:Tag:highway=rest area
+    highway=track: Sv:Tag:highway=track
     junction=roundabout: Sv:Tag:junction=roundabout
     leisure=dog_park: Sv:Tag:leisure=dog park
     railway=rail: Sv:Tag:railway=rail
@@ -5359,27 +5924,123 @@ tr:
     sport: Tr:Key:sport
 uk:
   key:
+    abutters: Uk:Key:abutters
+    access: Uk:Key:access
+    amenity: Uk:Key:amenity
+    area: Uk:Key:area
+    bench: Uk:Key:bench
+    bicycle: Uk:Key:bicycle
     bicycle_parking: Uk:Key:bicycle parking
+    bridge: Uk:Key:bridge
+    building: Uk:Key:building
+    cutting: Uk:Key:cutting
+    embankment: Uk:Key:embankment
+    emergency: Uk:Key:emergency
+    entrance: Uk:Key:entrance
+    ford: Uk:Key:ford
+    highway: Uk:Key:highway
+    lanes: Uk:Key:lanes
+    layer: Uk:Key:layer
+    maxheight: Uk:Key:maxheight
+    maxspeed: Uk:Key:maxspeed
+    motorroad: Uk:Key:motorroad
+    name: Uk:Key:name
+    office: Uk:Key:office
+    oneway: Uk:Key:oneway
+    place: Uk:Key:place
+    playground: Uk:Key:playground
+    railway: Uk:Key:railway
+    ref: Uk:Key:ref
+    service: Uk:Key:service
+    shelter_type: Uk:Key:shelter type
+    surface: Uk:Key:surface
+    tracktype: Uk:Key:tracktype
+    traffic_sign: Uk:Key:traffic sign
+    tunnel: Uk:Key:tunnel
+    url: Uk:Key:url
+    waterway: Uk:Key:waterway
+    width: Uk:Key:width
+    wood: Uk:Key:wood
   tag:
+    amenity=atm: Uk:Tag:amenity=atm
+    amenity=bench: Uk:Tag:amenity=bench
     amenity=bicycle_parking: Uk:Tag:amenity=bicycle parking
     amenity=bicycle_rental: Uk:Tag:amenity=bicycle rental
+    amenity=school: Uk:Tag:amenity=school
+    amenity=shelter: Uk:Tag:amenity=shelter
+    amenity=university: Uk:Tag:amenity=university
+    emergency=fire_hydrant: Uk:Tag:emergency=fire hydrant
+    highway=bridleway: Uk:Tag:highway=bridleway
+    highway=ford: Uk:Tag:highway=ford
+    highway=living_street: Uk:Tag:highway=living street
+    highway=motorway: Uk:Tag:highway=motorway
+    highway=motorway_link: Uk:Tag:highway=motorway link
+    highway=pedestrian: Uk:Tag:highway=pedestrian
+    highway=primary: Uk:Tag:highway=primary
+    highway=residential: Uk:Tag:highway=residential
+    highway=road: Uk:Tag:highway=road
+    highway=secondary: Uk:Tag:highway=secondary
+    highway=service: Uk:Tag:highway=service
+    highway=tertiary: Uk:Tag:highway=tertiary
+    highway=track: Uk:Tag:highway=track
+    highway=trunk: Uk:Tag:highway=trunk
+    highway=unclassified: Uk:Tag:highway=unclassified
+    historic=memorial: Uk:Tag:historic=memorial
+    historic=monument: Uk:Tag:historic=monument
+    natural=grassland: Uk:Tag:natural=grassland
+    natural=scrub: Uk:Tag:natural=scrub
+    office=accountant: Uk:Tag:office=accountant
+    office=architect: Uk:Tag:office=architect
+    office=company: Uk:Tag:office=company
+    office=employment_agency: Uk:Tag:office=employment agency
+    office=estate_agent: Uk:Tag:office=estate agent
+    office=government: Uk:Tag:office=government
+    office=insurance: Uk:Tag:office=insurance
+    office=it: Uk:Tag:office=it
+    office=lawyer: Uk:Tag:office=lawyer
+    office=newspaper: Uk:Tag:office=newspaper
+    office=ngo: Uk:Tag:office=ngo
+    office=quango: Uk:Tag:office=quango
+    office=research: Uk:Tag:office=research
+    office=telecommunication: Uk:Tag:office=telecommunication
+    office=travel_agent: Uk:Tag:office=travel agent
+    railway=halt: Uk:Tag:railway=halt
+    railway=rail: Uk:Tag:railway=rail
+    railway=station: Uk:Tag:railway=station
+    railway=tram: Uk:Tag:railway=tram
     shop=antiques: Uk:Tag:shop=antiques
     shop=bicycle: Uk:Tag:shop=bicycle
     shop=second_hand: Uk:Tag:shop=second hand
     vending=bicycle_tube: Uk:Tag:vending=bicycle tube
+    waterway=riverbank: Uk:Tag:waterway=riverbank
+vi:
+  key:
+    highway: Vi:Key:highway
 zh-hans:
   key:
+    building:part: Zh-hans:Key:building:part
     cuisine: Zh-hans:Key:cuisine
+    ele: Zh-hans:Key:ele
+    height: Zh-hans:Key:height
+    highway: Zh-hans:Key:highway
+    landuse: Zh-hans:Key:landuse
     name: Zh-hans:Key:name
+    place: Zh-hans:Key:place
+    railway: Zh-hans:Key:railway
+    toll: Zh-hans:Key:toll
   tag:
     amenity=cafe: Zh-hans:Tag:amenity=cafe
+    barrier=toll_booth: Zh-hans:Tag:barrier=toll booth
+    barrier=wall: Zh-hans:Tag:barrier=wall
 zh-hant:
   key:
     amenity: Zh-hant:Key:amenity
+    diet:*: Zh-hant:Key:diet:*
     fixme: Zh-hant:Key:fixme
     fuel: Zh-hant:Key:fuel
     noexit: Zh-hant:Key:noexit
     opening_hours: Zh-hant:Key:opening hours
+    service: Zh-hant:Key:service
     tracktype: Zh-hant:Key:tracktype
     trail_visibility: Zh-hant:Key:trail visibility
   tag:
@@ -5394,4 +6055,3 @@ zh-hant:
     shop=funeral_directors: Zh-hant:Tag:shop=funeral directors
     shop=gas: Zh-hant:Tag:shop=gas
     tourism=alpine_hut: Zh-hant:Tag:tourism=alpine hut
-
diff --git a/db/migrate/004_user_enhancements.rb b/db/migrate/004_user_enhancements.rb
index db17f3c35..af4b65123 100644
--- a/db/migrate/004_user_enhancements.rb
+++ b/db/migrate/004_user_enhancements.rb
@@ -24,7 +24,7 @@ class UserEnhancements < ActiveRecord::Migration
     add_index "user_tokens", ["token"], :name => "user_tokens_token_idx", :unique => true
     add_index "user_tokens", ["user_id"], :name => "user_tokens_user_id_idx"
 
-    User.find(:all, :conditions => "token is not null").each do |user|
+    User.where("token is not null").each do |user|
       UserToken.create(:user_id => user.id, :token => user.token, :expiry => 1.week.from_now)
     end
 
diff --git a/db/migrate/005_tile_tracepoints.rb b/db/migrate/005_tile_tracepoints.rb
index 91d590726..d429b6fdc 100644
--- a/db/migrate/005_tile_tracepoints.rb
+++ b/db/migrate/005_tile_tracepoints.rb
@@ -9,7 +9,7 @@ class TileTracepoints < ActiveRecord::Migration
     if ENV["USE_DB_FUNCTIONS"]
       Tracepoint.update_all("latitude = latitude * 10, longitude = longitude * 10, tile = tile_for_point(latitude * 10, longitude * 10)")
     else
-      Tracepoint.find(:all).each do |tp|
+      Tracepoint.all.each do |tp|
         tp.latitude = tp.latitude * 10
         tp.longitude = tp.longitude * 10
         tp.save!
diff --git a/db/migrate/006_tile_nodes.rb b/db/migrate/006_tile_nodes.rb
index b56a095a4..91f8acb6b 100644
--- a/db/migrate/006_tile_nodes.rb
+++ b/db/migrate/006_tile_nodes.rb
@@ -19,7 +19,7 @@ class TileNodes < ActiveRecord::Migration
       FROM #{from_table}
       END_SQL
 
-      model.find(:all).each do |n|
+      model.all.each do |n|
         n.save!
       end
     end
diff --git a/db/migrate/028_add_more_changeset_indexes.rb b/db/migrate/028_add_more_changeset_indexes.rb
index d93cc79e7..45d014e9e 100644
--- a/db/migrate/028_add_more_changeset_indexes.rb
+++ b/db/migrate/028_add_more_changeset_indexes.rb
@@ -1,3 +1,5 @@
+require 'migrate'
+
 class AddMoreChangesetIndexes < ActiveRecord::Migration
   def self.up
     add_index "changesets", ["created_at"], :name => "changesets_created_at_idx"
diff --git a/db/migrate/039_add_more_controls_to_gpx_files.rb b/db/migrate/039_add_more_controls_to_gpx_files.rb
index 7cc485e6b..aa2050e78 100644
--- a/db/migrate/039_add_more_controls_to_gpx_files.rb
+++ b/db/migrate/039_add_more_controls_to_gpx_files.rb
@@ -4,7 +4,7 @@ class AddMoreControlsToGpxFiles < ActiveRecord::Migration
   def self.up
     create_enumeration :gpx_visibility_enum, ["private", "public", "trackable", "identifiable"]
     add_column :gpx_files, :visibility, :gpx_visibility_enum, :default => "public", :null => false
-    Trace.update_all("visibility = 'private'", { :public => false })
+    Trace.where(:public => false).update_all(:visibility => "private")
     add_index :gpx_files, [:visible, :visibility], :name => "gpx_files_visible_visibility_idx"
     remove_index :gpx_files, :name => "gpx_files_visible_public_idx"
     remove_column :gpx_files, :public
@@ -12,7 +12,7 @@ class AddMoreControlsToGpxFiles < ActiveRecord::Migration
 
   def self.down
     add_column :gpx_files, :public, :boolean, :default => true, :null => false
-    Trace.update_all("public = false", { :visibility => "private" })
+    Trace.where(:visibility => "private").update_all(:public => false)
     add_index :gpx_files, [:visible, :public], :name => "gpx_files_visible_public_idx"
     remove_index :gpx_files, :name => "gpx_files_visible_visibility_idx"
     remove_column :gpx_files, :visibility
diff --git a/db/migrate/044_create_user_roles.rb b/db/migrate/044_create_user_roles.rb
index 6544bbba1..0db3ea77e 100644
--- a/db/migrate/044_create_user_roles.rb
+++ b/db/migrate/044_create_user_roles.rb
@@ -11,7 +11,7 @@ class CreateUserRoles < ActiveRecord::Migration
     end
     add_column :user_roles, :role, :user_role_enum, :null => false
 
-    User.all(:conditions => ['administrator = ?', true]).each do |user|
+    User.where(:administrator => true).each do |user|
       UserRole.create(:user_id => user.id, :role => "administrator")
     end
     remove_column :users, :administrator
@@ -21,7 +21,7 @@ class CreateUserRoles < ActiveRecord::Migration
 
   def self.down
     add_column :users, :administrator, :boolean, :default => false, :null => false
-    UserRole.all(:conditions => ['role = ?', "administrator"]).each do |role|
+    UserRole.where(:role => "administrator").each do |role|
       user = User.find(role.user_id)
       user.administrator = true
       user.save!
diff --git a/db/migrate/051_add_status_to_user.rb b/db/migrate/051_add_status_to_user.rb
index 01d501d01..e79246f48 100644
--- a/db/migrate/051_add_status_to_user.rb
+++ b/db/migrate/051_add_status_to_user.rb
@@ -6,9 +6,9 @@ class AddStatusToUser < ActiveRecord::Migration
 
     add_column :users, :status, :user_status_enum, :null => false, :default => "pending"
 
-    User.update_all("status = 'deleted'", { :visible => false })
-    User.update_all("status = 'pending'", { :visible => true, :active => 0 })
-    User.update_all("status = 'active'", { :visible => true, :active => 1 })
+    User.where(:visible => false).update_all(:status => "deleted")
+    User.where(:visible => true, :active => 0).update_all(:status => "pending")
+    User.where(:visible => true, :active => 1).update_all(:status => "active")
 
     remove_column :users, :active
     remove_column :users, :visible
@@ -18,9 +18,9 @@ class AddStatusToUser < ActiveRecord::Migration
     add_column :users, :visible, :boolean, :default => true, :null => false
     add_column :users, :active, :integer, :default => 0, :null => false
 
-    User.update_all("visible = true, active = 1", { :status => "active" })
-    User.update_all("visible = true, active = 0", { :status => "pending" })
-    User.update_all("visible = false, active = 1", { :status => "deleted" })
+    User.where(:status => "active").update_all(:visible => true, :active => 1)
+    User.where(:status => "pending").update_all(:visible => true, :active => 0)
+    User.where(:status => "deleted").update_all(:visible => false, :active => 1)
 
     remove_column :users, :status
 
diff --git a/lib/osm.rb b/lib/osm.rb
index 9e8198299..daef8d3f0 100644
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -24,6 +24,17 @@ module OSM
     end
   end
 
+  # Raised when access is denied.
+  class APIAccessDenied < RuntimeError
+    def status
+      :forbidden
+    end
+
+    def to_s
+      "Access denied"
+    end
+  end
+
   # Raised when an API object is not found.
   class APINotFoundError < APIError
     def status
diff --git a/script/misc/update-wiki-pages b/script/misc/update-wiki-pages
index 7cd40e59e..e01e9cae0 100755
--- a/script/misc/update-wiki-pages
+++ b/script/misc/update-wiki-pages
@@ -128,7 +128,7 @@ sub get_embeddedin
             action => 'query',
             list => 'embeddedin',
             eititle => $title,
-            eifilterredir => 'nonredirects',
+            eifilterredir => 'all',
             # Doesn't work for De:* and anything non-en. Odd.
             # einamespace => '0|8',
             eilimit => '200',
diff --git a/test/controllers/changeset_controller_test.rb b/test/controllers/changeset_controller_test.rb
index 25bb936d9..fc4f4b681 100644
--- a/test/controllers/changeset_controller_test.rb
+++ b/test/controllers/changeset_controller_test.rb
@@ -537,10 +537,10 @@ EOF
 
     # check that the changeset bbox is within bounds
     cs = Changeset.find(changeset_id)
-    assert cs.min_lon >= -180 * SCALE, "Minimum longitude (#{cs.min_lon / SCALE}) should be >= -180 to be valid."
-    assert cs.max_lon <=  180 * SCALE, "Maximum longitude (#{cs.max_lon / SCALE}) should be <= 180 to be valid."
-    assert cs.min_lat >=  -90 * SCALE, "Minimum latitude (#{cs.min_lat / SCALE}) should be >= -90 to be valid."
-    assert cs.max_lat >=   90 * SCALE, "Maximum latitude (#{cs.max_lat / SCALE}) should be <= 90 to be valid."
+    assert cs.min_lon >= -180 * GeoRecord::SCALE, "Minimum longitude (#{cs.min_lon / GeoRecord::SCALE}) should be >= -180 to be valid."
+    assert cs.max_lon <=  180 * GeoRecord::SCALE, "Maximum longitude (#{cs.max_lon / GeoRecord::SCALE}) should be <= 180 to be valid."
+    assert cs.min_lat >=  -90 * GeoRecord::SCALE, "Minimum latitude (#{cs.min_lat / GeoRecord::SCALE}) should be >= -90 to be valid."
+    assert cs.max_lat >=   90 * GeoRecord::SCALE, "Maximum latitude (#{cs.max_lat / GeoRecord::SCALE}) should be <= 90 to be valid."
   end
 
   ##
@@ -1084,10 +1084,10 @@ EOF
 
     # check the bbox
     changeset = Changeset.find(changeset_id)
-    assert_equal 1*SCALE, changeset.min_lon, "min_lon should be 1 degree"
-    assert_equal 2*SCALE, changeset.max_lon, "max_lon should be 2 degrees"
-    assert_equal 1*SCALE, changeset.min_lat, "min_lat should be 1 degree"
-    assert_equal 2*SCALE, changeset.max_lat, "max_lat should be 2 degrees"
+    assert_equal 1*GeoRecord::SCALE, changeset.min_lon, "min_lon should be 1 degree"
+    assert_equal 2*GeoRecord::SCALE, changeset.max_lon, "max_lon should be 2 degrees"
+    assert_equal 1*GeoRecord::SCALE, changeset.min_lat, "min_lat should be 1 degree"
+    assert_equal 2*GeoRecord::SCALE, changeset.max_lat, "max_lat should be 2 degrees"
   end
 
   ##
@@ -1123,10 +1123,10 @@ EOF
 
     # check the bbox
     changeset = Changeset.find(changeset_id)
-    assert_equal 1*SCALE, changeset.min_lon, "min_lon should be 1 degree"
-    assert_equal 3*SCALE, changeset.max_lon, "max_lon should be 3 degrees"
-    assert_equal 1*SCALE, changeset.min_lat, "min_lat should be 1 degree"
-    assert_equal 3*SCALE, changeset.max_lat, "max_lat should be 3 degrees"
+    assert_equal 1*GeoRecord::SCALE, changeset.min_lon, "min_lon should be 1 degree"
+    assert_equal 3*GeoRecord::SCALE, changeset.max_lon, "max_lon should be 3 degrees"
+    assert_equal 1*GeoRecord::SCALE, changeset.min_lat, "min_lat should be 1 degree"
+    assert_equal 3*GeoRecord::SCALE, changeset.max_lat, "max_lat should be 3 degrees"
   end
 
   ##
diff --git a/test/controllers/trace_controller_test.rb b/test/controllers/trace_controller_test.rb
index 01c81a1aa..8cbc14b31 100644
--- a/test/controllers/trace_controller_test.rb
+++ b/test/controllers/trace_controller_test.rb
@@ -2,7 +2,7 @@ require 'test_helper'
 
 class TraceControllerTest < ActionController::TestCase
   fixtures :users, :gpx_files
-  set_fixture_class :gpx_files => 'Trace'
+  set_fixture_class :gpx_files => Trace
 
   def setup
     @gpx_trace_dir = Object.send("remove_const", "GPX_TRACE_DIR")
diff --git a/test/helpers/browse_helper_test.rb b/test/helpers/browse_helper_test.rb
index a48ac4df8..d5f7a91e6 100644
--- a/test/helpers/browse_helper_test.rb
+++ b/test/helpers/browse_helper_test.rb
@@ -14,28 +14,37 @@ class BrowseHelperTest < ActionView::TestCase
 
   def test_printable_name
     assert_equal "17", printable_name(current_nodes(:redacted_node))
-    assert_equal "Test Node (18)", printable_name(current_nodes(:node_with_name))
-    assert_equal "Test Node (18)", printable_name(nodes(:node_with_name_current_version))
+    assert_equal "<bdi>Test Node</bdi> (<bdi>18</bdi>)", printable_name(current_nodes(:node_with_name))
+    assert_equal "<bdi>Test Node</bdi> (<bdi>18</bdi>)", printable_name(nodes(:node_with_name_current_version))
     assert_equal "18", printable_name(nodes(:node_with_name_redacted_version))
-    assert_equal "Test Node (18, v2)", printable_name(nodes(:node_with_name_current_version), true)
+    assert_equal "<bdi>Test Node</bdi> (<bdi>18, v2</bdi>)", printable_name(nodes(:node_with_name_current_version), true)
     assert_equal "18, v1", printable_name(nodes(:node_with_name_redacted_version), true)
 
     I18n.locale = "ru"
 
     assert_equal "17", printable_name(current_nodes(:redacted_node))
-    assert_equal "проверки узла (18)", printable_name(current_nodes(:node_with_name))
-    assert_equal "проверки узла (18)", printable_name(nodes(:node_with_name_current_version))
+    assert_equal "<bdi>проверки узла</bdi> (<bdi>18</bdi>)", printable_name(current_nodes(:node_with_name))
+    assert_equal "<bdi>проверки узла</bdi> (<bdi>18</bdi>)", printable_name(nodes(:node_with_name_current_version))
     assert_equal "18", printable_name(nodes(:node_with_name_redacted_version))
-    assert_equal "проверки узла (18, v2)", printable_name(nodes(:node_with_name_current_version), true)
+    assert_equal "<bdi>проверки узла</bdi> (<bdi>18, v2</bdi>)", printable_name(nodes(:node_with_name_current_version), true)
+    assert_equal "18, v1", printable_name(nodes(:node_with_name_redacted_version), true)
+
+    I18n.locale = "ru-RU"
+
+    assert_equal "17", printable_name(current_nodes(:redacted_node))
+    assert_equal "<bdi>проверки узла</bdi> (<bdi>18</bdi>)", printable_name(current_nodes(:node_with_name))
+    assert_equal "<bdi>проверки узла</bdi> (<bdi>18</bdi>)", printable_name(nodes(:node_with_name_current_version))
+    assert_equal "18", printable_name(nodes(:node_with_name_redacted_version))
+    assert_equal "<bdi>проверки узла</bdi> (<bdi>18, v2</bdi>)", printable_name(nodes(:node_with_name_current_version), true)
     assert_equal "18, v1", printable_name(nodes(:node_with_name_redacted_version), true)
 
     I18n.locale = "de"
 
     assert_equal "17", printable_name(current_nodes(:redacted_node))
-    assert_equal "Test Node (18)", printable_name(current_nodes(:node_with_name))
-    assert_equal "Test Node (18)", printable_name(nodes(:node_with_name_current_version))
+    assert_equal "<bdi>Test Node</bdi> (<bdi>18</bdi>)", printable_name(current_nodes(:node_with_name))
+    assert_equal "<bdi>Test Node</bdi> (<bdi>18</bdi>)", printable_name(nodes(:node_with_name_current_version))
     assert_equal "18", printable_name(nodes(:node_with_name_redacted_version))
-    assert_equal "Test Node (18, v2)", printable_name(nodes(:node_with_name_current_version), true)
+    assert_equal "<bdi>Test Node</bdi> (<bdi>18, v2</bdi>)", printable_name(nodes(:node_with_name_current_version), true)
     assert_equal "18, v1", printable_name(nodes(:node_with_name_redacted_version), true)
   end
 
@@ -74,6 +83,9 @@ class BrowseHelperTest < ActionView::TestCase
 
     html = format_value("unknown", "unknown")
     assert_equal "unknown", html
+
+    html = format_value("phone", "+1234567890")
+    assert_equal "<a href=\"tel:+1234567890\" title=\"Call +1234567890\">+1234567890</a>", html
   end
 
   def test_icon_tags
@@ -148,4 +160,48 @@ class BrowseHelperTest < ActionView::TestCase
     link = wikipedia_link("foo", "Test")
     assert_nil link
   end
+
+  def test_telephone_link
+    link = telephone_link("foo", "Test")
+    assert_nil link
+
+    link = telephone_link("phone", "+123")
+    assert_nil link
+
+    link = telephone_link("phone", "123")
+    assert_nil link
+
+    link = telephone_link("phone", "123 abcdefg")
+    assert_nil link
+
+    link = telephone_link("phone", "+1234567890 abc")
+    assert_nil link
+
+    link = telephone_link("phone", "+1234567890; +22334455667788")
+    assert_nil link
+
+    link = telephone_link("phone", "1234567890")
+    assert_nil link
+
+    link = telephone_link("phone", "+1234567890")
+    assert_equal "tel:+1234567890", link
+
+    link = telephone_link("phone", "+1234-567-890")
+    assert_equal "tel:+1234-567-890", link
+
+    link = telephone_link("phone", "+1234/567/890")
+    assert_equal "tel:+1234/567/890", link
+
+    link = telephone_link("phone", "+1234.567.890")
+    assert_equal "tel:+1234.567.890", link
+
+    link = telephone_link("phone", "   +1234 567-890	")
+    assert_equal "tel:+1234567-890", link
+
+    link = telephone_link("phone", "+1 234-567-890")
+    assert_equal "tel:+1234-567-890", link
+
+    link = telephone_link("phone", "+1 (234) 567-890")
+    assert_equal "tel:+1(234)567-890", link
+  end
 end
diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb
index 503160e9d..d2dd0564e 100644
--- a/test/integration/user_creation_test.rb
+++ b/test/integration/user_creation_test.rb
@@ -16,19 +16,19 @@ class UserCreationTest < ActionDispatch::IntegrationTest
   end
 
   def test_user_create_submit_duplicate_email
-    I18n.available_locales.each do |localer|
+    I18n.available_locales.each do |locale|
       dup_email = users(:public_user).email
-      display_name = "#{localer.to_s}_new_tester"
+      display_name = "#{locale.to_s}_new_tester"
       assert_difference('User.count', 0) do
         assert_difference('ActionMailer::Base.deliveries.size', 0) do
           post '/user/new',
             {:user => { :email => dup_email, :email_confirmation => dup_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}},
-            {"HTTP_ACCEPT_LANGUAGE" => localer.to_s}
+            {"HTTP_ACCEPT_LANGUAGE" => locale.to_s}
         end
       end
       assert_response :success
       assert_template 'user/new'
-      assert_equal response.headers['Content-Language'][0..1], localer.to_s[0..1] unless localer == :root
+      assert_equal response.headers['Content-Language'][0..1], locale.to_s[0..1] unless locale == :root
       assert_select "form > fieldset > div.form-row > input.field_with_errors#user_email"
       assert_no_missing_translations
     end
diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index f6f5be296..9ad968ae9 100644
--- a/test/models/node_test.rb
+++ b/test/models/node_test.rb
@@ -49,8 +49,8 @@ class NodeTest < ActiveSupport::TestCase
   def valid_node_test(nod)
     node = current_nodes(nod)
     dbnode = Node.find(node.id)
-    assert_equal dbnode.lat, node.latitude.to_f/SCALE
-    assert_equal dbnode.lon, node.longitude.to_f/SCALE
+    assert_equal dbnode.lat, node.latitude.to_f / Node::SCALE
+    assert_equal dbnode.lon, node.longitude.to_f / Node::SCALE
     assert_equal dbnode.changeset_id, node.changeset_id
     assert_equal dbnode.timestamp, node.timestamp
     assert_equal dbnode.version, node.version
@@ -65,8 +65,8 @@ class NodeTest < ActiveSupport::TestCase
   def invalid_node_test(nod)
     node = current_nodes(nod)
     dbnode = Node.find(node.id)
-    assert_equal dbnode.lat, node.latitude.to_f/SCALE
-    assert_equal dbnode.lon, node.longitude.to_f/SCALE
+    assert_equal dbnode.lat, node.latitude.to_f / Node::SCALE
+    assert_equal dbnode.lon, node.longitude.to_f / Node::SCALE
     assert_equal dbnode.changeset_id, node.changeset_id
     assert_equal dbnode.timestamp, node.timestamp
     assert_equal dbnode.version, node.version
diff --git a/test/models/old_node_test.rb b/test/models/old_node_test.rb
index 2ccf6d18c..cdc31f4f1 100644
--- a/test/models/old_node_test.rb
+++ b/test/models/old_node_test.rb
@@ -49,8 +49,8 @@ class OldNodeTest < ActiveSupport::TestCase
   def valid_node_test(nod)
     node = nodes(nod)
     dbnode = Node.find(node.node_id)
-    assert_equal dbnode.lat, node.latitude.to_f/SCALE
-    assert_equal dbnode.lon, node.longitude.to_f/SCALE
+    assert_equal dbnode.lat, node.latitude.to_f / OldNode::SCALE
+    assert_equal dbnode.lon, node.longitude.to_f / OldNode::SCALE
     assert_equal dbnode.changeset_id, node.changeset_id
     assert_equal dbnode.version, node.version
     assert_equal dbnode.visible, node.visible
@@ -65,8 +65,8 @@ class OldNodeTest < ActiveSupport::TestCase
   def invalid_node_test(nod)
     node = nodes(nod)
     dbnode = Node.find(node.node_id)
-    assert_equal dbnode.lat, node.latitude.to_f/SCALE
-    assert_equal dbnode.lon, node.longitude.to_f/SCALE
+    assert_equal dbnode.lat, node.latitude.to_f / OldNode::SCALE
+    assert_equal dbnode.lon, node.longitude.to_f / OldNode::SCALE
     assert_equal dbnode.changeset_id, node.changeset_id
     assert_equal dbnode.version, node.version
     assert_equal dbnode.visible, node.visible
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 4e95bb7a8..9464d6623 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -10,45 +10,45 @@ class ActiveSupport::TestCase
     fixtures :users, :user_roles, :changesets, :changeset_tags
 
     fixtures :current_nodes, :nodes
-    set_fixture_class :current_nodes => 'Node'
-    set_fixture_class :nodes => 'OldNode'
+    set_fixture_class :current_nodes => Node
+    set_fixture_class :nodes => OldNode
 
     fixtures  :current_node_tags,:node_tags
-    set_fixture_class :current_node_tags => 'NodeTag'
-    set_fixture_class :node_tags => 'OldNodeTag'
+    set_fixture_class :current_node_tags => NodeTag
+    set_fixture_class :node_tags => OldNodeTag
 
     fixtures :current_ways
-    set_fixture_class :current_ways => 'Way'
+    set_fixture_class :current_ways => Way
 
     fixtures :current_way_nodes, :current_way_tags
-    set_fixture_class :current_way_nodes => 'WayNode'
-    set_fixture_class :current_way_tags => 'WayTag'
+    set_fixture_class :current_way_nodes => WayNode
+    set_fixture_class :current_way_tags => WayTag
 
     fixtures :ways
-    set_fixture_class :ways => 'OldWay'
+    set_fixture_class :ways => OldWay
 
     fixtures :way_nodes, :way_tags
-    set_fixture_class :way_nodes => 'OldWayNode'
-    set_fixture_class :way_tags => 'OldWayTag'
+    set_fixture_class :way_nodes => OldWayNode
+    set_fixture_class :way_tags => OldWayTag
 
     fixtures :current_relations
-    set_fixture_class :current_relations => 'Relation'
+    set_fixture_class :current_relations => Relation
 
     fixtures :current_relation_members, :current_relation_tags
-    set_fixture_class :current_relation_members => 'RelationMember'
-    set_fixture_class :current_relation_tags => 'RelationTag'
+    set_fixture_class :current_relation_members => RelationMember
+    set_fixture_class :current_relation_tags => RelationTag
 
     fixtures :relations
-    set_fixture_class :relations => 'OldRelation'
+    set_fixture_class :relations => OldRelation
 
     fixtures :relation_members, :relation_tags
-    set_fixture_class :relation_members => 'OldRelationMember'
-    set_fixture_class :relation_tags => 'OldRelationTag'
+    set_fixture_class :relation_members => OldRelationMember
+    set_fixture_class :relation_tags => OldRelationTag
     
     fixtures :gpx_files, :gps_points, :gpx_file_tags
-    set_fixture_class :gpx_files => 'Trace'
-    set_fixture_class :gps_points => 'Tracepoint'
-    set_fixture_class :gpx_file_tags => 'Tracetag'
+    set_fixture_class :gpx_files => Trace
+    set_fixture_class :gps_points => Tracepoint
+    set_fixture_class :gpx_file_tags => Tracetag
 
     fixtures :client_applications
     
diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb
index 8dc575aa8..70b63377c 100644
--- a/vendor/assets/iD/iD.css.erb
+++ b/vendor/assets/iD/iD.css.erb
@@ -321,111 +321,77 @@ path.shadow.selected {
     stroke-opacity: 0.7;
 }
 
-path.area.stroke {
-    stroke: white;
-    stroke-width: 1;
-}
-
-path.area.fill {
-    fill:#fff;
-    fill-opacity:0.3;
-    fill-rule: evenodd;
-}
-
 path.line.stroke {
     stroke: white;
     stroke-width: 2;
 }
 
+path.area.stroke {
+    stroke: white;
+    stroke-width: 1;
+}
+path.area.fill {
+    fill: rgba(255, 255, 255, 0.3);
+    fill-rule: evenodd;
+}
+.preset-icon-fill-area {
+    border: 1px solid rgb(170, 170, 170);
+    background-color: rgba(170, 170, 170, 0.3);
+}
+
 path.stroke.tag-natural {
-    stroke: #b6e199;
+    stroke: rgb(182, 225, 153);
 }
 path.fill.tag-natural {
-    fill: #b6e199;
+    fill: rgba(182, 225, 153, 0.3);
+}
+.preset-icon-fill-area.tag-natural {
+    border-color: rgb(182, 225, 153);
+    background-color: rgba(182, 225, 153, 0.3);
 }
 
 path.stroke.tag-natural-water {
-    stroke: #77d3de;
+    stroke: rgb(119, 211, 222);
 }
 path.fill.tag-natural-water {
-    fill: #77d3de;
+    fill: rgba(119, 211, 222, 0.3);
+}
+.preset-icon-fill-area.tag-natural-water {
+    border-color: rgb(119, 211, 222);
+    background-color: rgba(119, 211, 222, 0.3);
 }
 
 path.stroke.tag-amenity-school {
-    stroke: #ffff94;
+    stroke: rgb(255, 255, 148);
 }
 path.fill.tag-amenity-school {
-    fill: #ffff94;
-    fill-opacity: 0.2;
+    fill: rgba(255, 255, 148, 0.2);
+}
+.preset-icon-fill-area.tag-amenity-school {
+    border-color: rgb(255, 255, 148);
+    background-color: rgba(255, 255, 148, 0.2);
 }
 
 path.stroke.tag-amenity-university {
-    stroke: #ffff94;
+    stroke: rgb(255, 255, 148);
 }
 path.fill.tag-amenity-university {
-    fill: #ffff94;
-    fill-opacity: 0.1;
+    fill: rgba(255, 255, 148, 0.1);
 }
-
-path.stroke.tag-building {
-    stroke: #e06e5f;
+.preset-icon-fill-area.tag-amenity-university {
+    border-color: rgb(255, 255, 148);
+    background-color: rgba(255, 255, 148, 0.1);
 }
-path.fill.tag-building {
-    fill: #e06e5f;
-}
-
-/* Landuse */
-
 
 path.stroke.tag-landuse,
 path.stroke.tag-natural-wood,
 path.stroke.tag-natural-tree,
 path.stroke.tag-natural-grassland,
+path.stroke.tag-natural-grass,
 path.stroke.tag-leisure-pitch,
 path.stroke.tag-leisure-park {
-    stroke: #8cd05f;
+    stroke: rgb(140, 208, 95);
 }
-
-path.stroke.tag-landuse-retail,
-path.stroke.tag-landuse-commercial {
-    stroke: #eab056;
-}
-
-path.stroke.tag-landuse-industrial {
-    stroke: #e4a4f5;
-}
-
-path.stroke.tag-landuse-basin,
-path.stroke.tag-landuse-reservoir {
-    stroke: #77d3de;
-}
-
-path.stroke.tag-landuse-quarry {
-    stroke: #a6957b;
-}
-
-path.stroke.tag-landuse-landfill {
-    stroke: #ff9933;
-}
-
-path.stroke.tag-landuse-residential,
-path.stroke.tag-landuse-construction {
-    stroke: #e06e5f;
-}
-
-path.stroke.tag-landuse-meadow,
-path.stroke.tag-natural-wetland {
-    stroke: #b6e199;
-}
-
-path.stroke.tag-natural-beach {
-    stroke: #ffff7e;
-}
-
-path.stroke.tag-natural-scrub {
-    stroke: #dbf08b;
-}
-
 path.fill.tag-landuse,
 path.fill.tag-natural-wood,
 path.fill.tag-natural-tree,
@@ -433,134 +399,186 @@ path.fill.tag-natural-grassland,
 path.fill.tag-natural-grass,
 path.fill.tag-leisure-pitch,
 path.fill.tag-leisure-park {
-    fill: #8cd05f;
-    fill-opacity: 0.2;
+    fill: rgba(140, 208, 95, 0.2);
+}
+.preset-icon-fill-area.tag-landuse,
+.preset-icon-fill-area.tag-natural-wood,
+.preset-icon-fill-area.tag-natural-tree,
+.preset-icon-fill-area.tag-natural-grassland,
+.preset-icon-fill-area.tag-natural-grass,
+.preset-icon-fill-area.tag-leisure-pitch,
+.preset-icon-fill-area.tag-leisure-park {
+    border-color: rgb(140, 208, 95);
+    background-color: rgba(140, 208, 95, 0.2);
 }
 
+path.stroke.tag-landuse-residential {
+    stroke: rgb(224, 110, 95);
+}
+path.fill.tag-landuse-residential {
+    fill: rgba(224, 110, 95, 0.1);
+}
+.preset-icon-fill-area.tag-landuse-residential {
+    border-color: rgb(224, 110, 95);
+    background-color: rgba(224, 110, 95, 0.1);
+}
+
+path.stroke.tag-landuse-retail,
+path.stroke.tag-landuse-commercial {
+    stroke: rgb(234, 176, 86);
+}
 path.fill.tag-landuse-retail,
-path.fill.tag-landuse-residential,
-path.fill.tag-landuse-commercial,
+path.fill.tag-landuse-commercial {
+    fill: rgba(234, 176, 86, 0.1);
+}
+.preset-icon-fill-area.tag-landuse-retail,
+.preset-icon-fill-area.tag-landuse-commercial {
+    border-color: rgb(234, 176, 86);
+    background-color: rgba(234, 176, 86, 0.1);
+}
+
+path.stroke.tag-landuse-industrial {
+    stroke: rgb(228, 164, 245);
+}
 path.fill.tag-landuse-industrial {
-    fill-opacity: 0.1;
+    fill: rgba(228, 164, 245, 0.1);
+}
+.preset-icon-fill-area.tag-landuse-industrial {
+    border-color: rgb(228, 164, 245);
+    background-color: rgba(228, 164, 245, 0.1);
 }
 
-path.fill.tag-natural-wetland,
-path.fill.tag-natural-beach,
-path.fill.tag-natural-scrub,
-path.fill.tag-landuse-cemetery,
-path.fill.tag-landuse-meadow,
-path.fill.tag-landuse-farm,
-path.fill.tag-landuse-farmland,
-path.fill.tag-landuse-construction,
-path.fill.tag-landuse-orchard {
-    /* background color is applied a further opacity later */
-    fill-opacity: 0.8;
+path.stroke.tag-landuse-basin,
+path.stroke.tag-landuse-reservoir {
+    stroke: rgb(119, 211, 222);
 }
-
-.pattern-color-beach,
-.pattern-color-scrub,
-.pattern-color-meadow,
-.pattern-color-wetland,
-.pattern-color-cemetery,
-.pattern-color-farm,
-.pattern-color-farmland,
-.pattern-color-construction,
-.pattern-color-orchard {
-    fill-opacity: 0.2;
-}
-
 path.fill.tag-landuse-basin,
 path.fill.tag-landuse-reservoir {
-    fill: #77d3de;
+    fill: rgba(119, 211, 222, 0.3);
+}
+.preset-icon-fill-area.tag-landuse-basin,
+.preset-icon-fill-area.tag-landuse-reservoir {
+    border-color: rgb(119, 211, 222);
+    background-color: rgba(119, 211, 222, 0.3);
 }
 
+path.stroke.tag-landuse-quarry {
+    stroke: rgb(166, 149, 123);
+}
 path.fill.tag-landuse-quarry {
-    fill: #a6957b;
-    fill-opacity: 0.2;
+    fill: rgba(166, 149, 123, 0.2);
+}
+.preset-icon-fill-area.tag-landuse-quarry {
+    border-color: rgb(166, 149, 123);
+    background-color: rgba(166, 149, 123, 0.2);
 }
 
+path.stroke.tag-landuse-landfill {
+    stroke: rgb(255, 153, 51);
+}
 path.fill.tag-landuse-landfill {
-    fill: #ff8800;
-    fill-opacity: 0.2;
+    fill: rgba(255, 153, 51, 0.2);
+}
+.preset-icon-fill-area.tag-landuse-landfill {
+    border-color: rgb(255, 153, 51);
+    background-color: rgba(255, 153, 51, 0.2);
 }
 
-path.fill.tag-landuse-residential {
-    fill: #e06e5f;
+path.stroke.tag-landuse-construction {
+    stroke: rgb(224, 110, 95);
+}
+.pattern-color-construction {
+    fill: rgba(224, 110, 95, 0.2);
+}
+.preset-icon-fill-area.tag-landuse-construction {
+    border-color: rgb(224, 110, 95);
+    background-color: rgba(224, 110, 95, 0.2);
 }
 
-path.fill.tag-landuse-farm,
-path.fill.tag-landuse-farmland {
-    fill: url(#pattern-farmland) #8cd05f;
+path.stroke.tag-landuse-military {
+    stroke: rgb(224, 110, 95);
+}
+.preset-icon-fill-area.tag-landuse-military {
+    border-color: rgb(224, 110, 95);
+    background-color: rgba(224, 110, 95, 0.2);
+}
+
+path.stroke.tag-natural-wetland {
+    stroke: rgb(182, 225, 153);
+}
+.pattern-color-wetland {
+    fill: rgba(182, 225, 153, 0.2);
+}
+.preset-icon-fill-area.tag-natural-wetland {
+    border-color: rgb(182, 225, 153);
+    background-color: rgba(182, 225, 153, 0.2);
+}
+
+path.stroke.tag-landuse-meadow {
+    stroke: rgb(182, 225, 153);
+}
+.pattern-color-meadow {
+    fill: rgba(182, 225, 153, 0.2);
+}
+.preset-icon-fill-area.tag-landuse-meadow {
+    border-color: rgb(182, 225, 153);
+    background-color: rgba(182, 225, 153, 0.2);
+}
+
+path.stroke.tag-natural-beach {
+    stroke: rgb(255, 255, 126);
+}
+.pattern-color-beach {
+    fill: rgba(255, 255, 126, 0.2);
+}
+.preset-icon-fill-area.tag-natural-beach {
+    border-color: rgb(255, 255, 126);
+    background-color: rgba(255, 255, 126, 0.2);
+}
+
+path.stroke.tag-natural-scrub {
+    stroke: rgb(219, 240, 139);
+}
+.pattern-color-scrub {
+    fill: rgba(219, 240, 139, 0.2);
+}
+.preset-icon-fill-area.tag-natural-scrub {
+    border-color: rgb(219, 240, 139);
+    background-color: rgba(219, 240, 139, 0.2);
 }
 
 .pattern-color-farm,
 .pattern-color-farmland {
-    fill: url(#pattern-farmland) #8cd05f;
+    fill: rgba(140, 208, 95, 0.2);
+}
+.preset-icon-fill-area.tag-landuse-farm,
+.preset-icon-fill-area.tag-landuse-farmland {
+    background-color: rgba(140, 208, 95, 0.2);
 }
 
-path.fill.tag-landuse-meadow {
-    fill: url(#pattern-meadow) #b6e199;
-}
-.pattern-color-meadow {
-    fill: #b6e199;
-}
-
-path.fill.tag-natural-wetland {
-    fill: url(#pattern-wetland) #b6e199;
-}
-.pattern-color-wetland {
-    fill: #B6E199;
-}
-
-path.fill.tag-natural-beach {
-    fill: url(#pattern-beach) #ffff7e;
-}
-.pattern-color-beach {
-    fill: #ffff7e;
-}
-
-path.fill.tag-natural-scrub {
-    fill: url(#pattern-scrub) #dbf08b;
-}
-.pattern-color-scrub {
-    fill: #dbf08b;
-}
-
-path.fill.tag-landuse-cemetery {
-    fill: url(#pattern-cemetery) #8cd05f;
-}
 .pattern-color-cemetery {
-    fill: #8cd05f
+    fill: rgba(140, 208, 95, 0.2)
+}
+.preset-icon-fill-area.tag-landuse-cemetery {
+    background-color: rgba(140, 208, 95, 0.2);
 }
 
-path.fill.tag-landuse-orchard {
-    fill: url(#pattern-orchard) #8cd05f;
-}
 .pattern-color-orchard {
-    fill: #8cd05f
+    fill: rgba(140, 208, 95, 0.2)
 }
-
-path.fill.tag-landuse-construction {
-    fill: url(#pattern-construction) #e06e5f;
-}
-.pattern-color-construction {
-    fill: #e06e5f;
-}
-
-path.fill.tag-landuse-retail,
-path.fill.tag-landuse-commercial {
-    fill: #eab056;
-}
-
-path.fill.tag-landuse-industrial {
-    fill: #e4a4f5;
+.preset-icon-fill-area.tag-landuse-orchard {
+    background-color: rgba(140, 208, 95, 0.8);
 }
 
 path.stroke.tag-amenity-parking {
-    stroke: #aaa;
+    stroke: rgb(170, 170, 170);
 }
 path.fill.tag-amenity-parking {
-    fill: #aaa;
+    fill: rgba(170, 170, 170, 0.3);
+}
+.preset-icon-fill-area.tag-amenity-parking {
+    border-color: rgb(170, 170, 170);
+    background-color: rgba(170, 170, 170, 0.3);
 }
 
 path.fill.tag-place,
@@ -689,9 +707,6 @@ path.stroke.area.tag-highway-pedestrian {
     stroke:#fff;
     stroke-width: 2;
 }
-path.fill.area.tag-highway-pedestrian {
-    fill:#ccc;
-}
 
 path.stroke.tag-highway-service {
     stroke:#fff;
@@ -803,121 +818,66 @@ path.casing.tag-aeroway-runway {
     stroke-linecap: square;
 }
 path.fill.tag-aeroway-runway {
-    fill: #000;
-    fill-opacity: 0.6;
+    fill: rgba(0, 0, 0, 0.6);
 }
 path.stroke.tag-aeroway-apron {
     stroke: #805C80;
 }
 path.fill.tag-aeroway-apron {
-    fill: #805C80;
-    fill-opacity: 0.2;
+    fill: rgba(128, 92, 128, 0.2);
 }
 
 
-/* bridges */
-
-path.casing.tag-bridge {
-    stroke-width: 14;
-    stroke-opacity: 0.5;
-    stroke: #000;
-}
-
-path.casing.tag-highway-living_street.tag-bridge,
-path.casing.tag-highway-path.tag-bridge {
-    stroke-width: 6;
-}
-
-path.casing.line.tag-highway-pedestrian,
-path.casing.tag-highway-service.tag-bridge,
-path.casing.tag-highway-track.tag-bridge,
-path.casing.tag-highway-steps.tag-bridge,
-path.casing.tag-highway-footway.tag-bridge,
-path.casing.tag-highway-cycleway.tag-bridge,
-path.casing.tag-highway-bridleway.tag-bridge {
-    stroke-width: 8;
-}
-
-path.shadow.tag-highway-residential.tag-bridge {
-    stroke-width:22;
-}
-
-path.shadow.tag-highway-living_street.tag-bridge,
-path.shadow.tag-highway-path.tag-bridge,
-path.shadow.line.tag-highway-pedestrian,
-path.shadow.tag-highway-service.tag-bridge,
-path.shadow.tag-highway-track.tag-bridge,
-path.shadow.tag-highway-steps.tag-bridge,
-path.shadow.tag-highway-footway.tag-bridge,
-path.shadow.tag-highway-cycleway.tag-bridge,
-path.shadow.tag-highway-bridleway.tag-bridge {
-    stroke-width: 16;
-}
-
-/* tunnels */
-
-path.stroke.tag-highway.tag-tunnel {
-    stroke-opacity: 0.3;
-}
-
-path.casing.tag-highway.tag-tunnel {
-    stroke-opacity: 0.5;
-}
-
-path.stroke.tag-highway-construction,
-path.casing.tag-highway-construction {
-    stroke-linecap: butt;
-    stroke-dasharray: 7, 7;
-}
-
-/* construction */
-
-.low-zoom path.stroke.tag-highway-construction,
-.low-zoom path.casing.tag-highway-construction {
-    stroke-linecap: butt;
-    stroke-dasharray: 5, 5;
-}
-
 /* railways */
 
-.line.stroke.tag-railway {
+path.stroke.tag-railway {
     stroke: #eee;
     stroke-width: 2;
     stroke-linecap: butt;
     stroke-dasharray: 12,12;
 }
-.line.casing.tag-railway {
+
+path.casing.tag-railway {
     stroke: #555;
     stroke-width: 4;
 }
 
-.line.stroke.tag-railway-abandoned {
+path.stroke.tag-railway-abandoned {
     stroke: #eee;
 }
-.line.casing.tag-railway-abandoned {
+path.casing.tag-railway-abandoned {
     stroke: #999;
 }
 
-.line.stroke.tag-railway-subway {
+path.stroke.tag-railway-subway {
     stroke: #666;
 }
-.line.casing.tag-railway-subway {
+path.casing.tag-railway-subway {
     stroke: #222;
 }
 
-.line.stroke.tag-railway-platform {
+path.stroke.tag-railway-platform {
     stroke: #999;
     stroke-width: 4;
     stroke-dasharray: none;
 }
-.line.casing.tag-railway-platform {
+path.casing.tag-railway-platform {
+    stroke: none;
+}
+
+.area.stroke.tag-railway {
+    stroke: white;
+    stroke-width: 1;
+    stroke-dasharray: none;
+}
+.area.casing.tag-railway {
     stroke: none;
 }
 
 /* waterways */
 
 path.fill.tag-waterway {
-    fill: #77d3de;
+    fill: rgba(119, 211, 222, 0.3);
 }
 
 path.stroke.tag-waterway {
@@ -974,6 +934,96 @@ path.casing.tag-boundary-national_park {
 }
 
 
+/* bridges */
+
+path.casing.tag-bridge {
+    stroke-width: 14;
+    stroke-opacity: 0.5;
+    stroke: #000;
+}
+
+path.casing.tag-highway-living_street.tag-bridge,
+path.casing.tag-highway-path.tag-bridge {
+    stroke-width: 6;
+}
+
+path.casing.line.tag-highway-pedestrian,
+path.casing.tag-highway-service.tag-bridge,
+path.casing.tag-highway-track.tag-bridge,
+path.casing.tag-highway-steps.tag-bridge,
+path.casing.tag-highway-footway.tag-bridge,
+path.casing.tag-highway-cycleway.tag-bridge,
+path.casing.tag-highway-bridleway.tag-bridge {
+    stroke-width: 8;
+}
+
+path.shadow.tag-highway-residential.tag-bridge {
+    stroke-width:22;
+}
+
+path.shadow.tag-highway-living_street.tag-bridge,
+path.shadow.tag-highway-path.tag-bridge,
+path.shadow.line.tag-highway-pedestrian,
+path.shadow.tag-highway-service.tag-bridge,
+path.shadow.tag-highway-track.tag-bridge,
+path.shadow.tag-highway-steps.tag-bridge,
+path.shadow.tag-highway-footway.tag-bridge,
+path.shadow.tag-highway-cycleway.tag-bridge,
+path.shadow.tag-highway-bridleway.tag-bridge {
+    stroke-width: 16;
+}
+
+/* tunnels */
+
+path.stroke.tag-tunnel {
+    stroke-opacity: 0.3;
+}
+
+path.casing.tag-tunnel {
+    stroke-opacity: 0.5;
+}
+
+/* embankments / cuttings */
+
+path.casing.tag-embankment,
+path.casing.tag-cutting {
+    stroke-opacity: 0.5;
+    stroke: #000;
+    stroke-width: 22;
+    stroke-dasharray: 2, 4;
+    stroke-linecap: butt;
+}
+
+path.shadow.tag-embankment,
+path.shadow.tag-cutting {
+    stroke-width: 28;
+}
+
+.low-zoom path.casing.tag-embankment,
+.low-zoom path.casing.tag-cutting {
+    stroke-width: 10;
+}
+
+.low-zoom path.shadow.tag-embankment,
+.low-zoom path.shadow.tag-cutting {
+    stroke-width: 14;
+}
+
+
+/* construction */
+
+path.stroke.tag-highway-construction,
+path.casing.tag-highway-construction {
+    stroke-linecap: butt;
+    stroke-dasharray: 7, 7;
+}
+
+.low-zoom path.stroke.tag-highway-construction,
+.low-zoom path.casing.tag-highway-construction {
+    stroke-linecap: butt;
+    stroke-dasharray: 5, 5;
+}
+
 text {
     font-size:10px;
     pointer-events: none;
@@ -994,6 +1044,23 @@ path.oneway {
     stroke-width: 6px;
 }
 
+/* Buildings */
+
+path.stroke.tag-building,
+path.stroke.tag-amenity-shelter {
+    stroke: rgb(224, 110, 95);
+}
+path.fill.tag-building,
+path.fill.tag-amenity-shelter {
+    fill: rgba(224, 110, 95, 0.3);
+}
+.preset-icon-fill-area.tag-building,
+.preset-icon-fill-area.tag-amenity-shelter {
+    border-color: rgb(224, 110, 95);
+    background-color: rgba(224, 110, 95, 0.3);
+}
+
+
 /*
  * Labels
  */
@@ -1041,65 +1108,54 @@ text.point {
   font-size: 10px;
 }
 
+/* Turns */
+
+g.turn rect,
+g.turn circle {
+    fill: none;
+    pointer-events: all;
+}
+
+.form-field-restrictions .vertex {
+    pointer-events: none;
+    cursor: auto !important;
+}
+
 /* Cursors */
 
 #map {
     cursor: auto; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-grab.png") %>) 9 9, auto; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-grab.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-grab2x.png") %>) 2x
-        ) 9 9, auto;
 }
 
 .mode-browse .point,
 .mode-select .point {
     cursor: pointer; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-select-point.png") %>), pointer; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-select-point.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-select-point2x.png") %>) 2x
-        ), pointer;
 }
 
 .mode-select .vertex,
 .mode-browse .vertex {
     cursor: pointer; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-select-vertex.png") %>), pointer; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-select-vertex.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-select-vertex2x.png") %>) 2x
-        ), pointer;
 }
 
 .mode-browse .line,
 .mode-select .line {
     cursor: pointer; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-select-line.png") %>), pointer; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-select-line.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-select-line2x.png") %>) 2x
-        ), pointer;
 }
 
 .mode-select .area,
 .mode-browse .area {
     cursor: pointer; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-select-area.png") %>), pointer; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-select-area.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-select-area2x.png") %>) 2x
-        ), pointer;
 }
 
 .mode-select .midpoint,
 .mode-browse .midpoint {
     cursor: pointer; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-select-split.png") %>), pointer; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-select-split.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-select-split2x.png") %>) 2x
-        ), pointer;
 }
 
 .mode-select .behavior-multiselect .point,
@@ -1108,19 +1164,11 @@ text.point {
 .mode-select .behavior-multiselect .area {
     cursor: pointer; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-select-add.png") %>), pointer; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-select-add.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-select-add2x.png") %>) 2x
-        ), pointer;
 }
 
 .mode-select .behavior-multiselect .selected {
     cursor: pointer; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-select-remove.png") %>), pointer; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-select-remove.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-select-remove2x.png") %>) 2x
-        ), pointer;
 }
 
 #map .point:active,
@@ -1131,10 +1179,6 @@ text.point {
 #map .mode-select .selected {
     cursor: pointer; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-select-acting.png") %>), pointer; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-select-acting.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-select-acting2x.png") %>) 2x
-        ), pointer;
 }
 
 .mode-draw-line #map,
@@ -1144,10 +1188,6 @@ text.point {
 .mode-drag-node #map {
     cursor: crosshair; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-draw.png") %>) 9 9, crosshair; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-draw.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-draw2x.png") %>) 2x
-        ) 9 9, crosshair;
 }
 
 .mode-draw-line .way.hover,
@@ -1157,10 +1197,6 @@ text.point {
 .mode-drag-node .way.hover {
     cursor: crosshair; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-draw-connect-line.png") %>) 9 9, crosshair; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-draw-connect-line.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-draw-connect-line2x.png") %>) 2x
-        ) 9 9, crosshair;
 }
 
 .mode-draw-line .vertex.hover,
@@ -1170,10 +1206,6 @@ text.point {
 .mode-drag-node .vertex.hover {
     cursor: crosshair; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-draw-connect-vertex.png") %>) 9 9, crosshair; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-draw-connect-vertex.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-draw-connect-vertex2x.png") %>) 2x
-        ) 9 9, crosshair;
 }
 
 .mode-add-point #map,
@@ -1182,10 +1214,12 @@ text.point {
 .lasso .vertex {
     cursor: crosshair; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-draw.png") %>) 9 9, crosshair; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-draw.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-draw2x.png") %>) 2x
-        ) 9 9, crosshair;
+}
+
+.turn rect,
+.turn circle {
+    cursor: pointer; /* Opera */
+    cursor: url(<%= asset_path("iD/img/cursor-pointer.png") %>) 6 1, pointer; /* FF */
 }
 
 .lasso #map {
@@ -1269,6 +1303,13 @@ body {
     height: 100%;
 }
 
+#defs {
+    /* Can't be display: none or the clippaths are ignored. */
+    position: absolute;
+    width: 0;
+    height: 0;
+}
+
 .spacer {
     height: 40px;
     margin-right: 10px;
@@ -1312,10 +1353,6 @@ button,
 .radial-menu-item {
     cursor: pointer; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-pointer.png") %>) 6 1, pointer; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-pointer.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-pointer2x.png") %>) 2x
-        ) 6 1, pointer;
 }
 
 h2 {
@@ -2158,37 +2195,26 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
 
 /* Preset icon colors */
 
-.preset-icon-fill.icon-area {
+.preset-icon-fill-area {
     cursor: inherit;
-    height: 45px;
-    width: 45px;
+    height: 39px;
+    width: 39px;
     margin: auto;
     position: absolute;
-    left: 7px; top: 7px;
-    background:transparent url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat -240px -80px;
+    left: 10px;
+    top: 10px;
 }
 
-.preset-icon-fill.tag-shop,
-.preset-icon-fill.tag-building {
+.preset-icon-fill-area:after {
+    content: '';
+    left: -4px;
+    top: -4px;
+    height: 45px;
+    width: 45px;
+    position: absolute;
     background:transparent url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat 0 -80px;
 }
 
-.preset-icon-fill.tag-natural-water {
-    background:transparent url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat -60px -80px;
-}
-
-.preset-icon-fill.tag-landuse,
-.preset-icon-fill.tag-natural-wood,
-.preset-icon-fill.tag-natural-tree,
-.preset-icon-fill.tag-natural-grassland,
-.preset-icon-fill.tag-leisure-park {
-    background:transparent url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat -120px -80px;
-}
-
-.preset-icon-fill.tag-amenity-parking {
-    background:transparent url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat -180px -80px;
-}
-
 /* preset form basics */
 
 .inspector-preset {
@@ -2768,6 +2794,31 @@ input[type=number] {
     border-bottom: 0;
     border-radius: 0 0 4px 0;
 }
+
+/* Restrictions editor */
+
+.form-field-restrictions .preset-input-wrap {
+    position: relative;
+    height: 300px;
+}
+
+.form-field-restrictions svg {
+    width: 100%;
+    height: 100%;
+}
+
+.form-field-restrictions .restriction-help {
+    z-index: 1;
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    padding: 2px 6px;
+    background-color: rgba(255, 255, 255, .8);
+    color: #999;
+    text-align: center;
+}
+
 /* combobox dropdown */
 
 div.combobox {
@@ -3247,7 +3298,7 @@ img.wiki-image {
     height:18px;
 }
 
-.background-control .layer-toggle-gpx button {
+.background-control .layer-list button {
     float: right;
     height: 100%;
     width: 10%;
@@ -3255,11 +3306,11 @@ img.wiki-image {
     border-radius: 0;
 }
 
-.background-control .layer-toggle-gpx button .icon {
+.background-control .layer-list button .icon {
     opacity: 0.5;
 }
 
-.background-control .layer-toggle-gpx button.layer-extent {
+.background-control .layer-list button:first-of-type {
     border-radius: 0 3px 3px 0;
 }
 
@@ -3990,10 +4041,6 @@ img.wiki-image {
     fill: rgba(255,255,255,.5);
 }
 
-.radial-menu .icon {
-    pointer-events: none;
-}
-
 .lasso-box {
     fill-opacity:0.1;
     stroke: #fff;
@@ -4253,6 +4300,10 @@ img.wiki-image {
 .feature-laundry{background-position:-108px -504px;}
 .feature-car{background-position:-162px -504px;}
 .feature-suitcase{background-position:-216px -504px;}
+.feature-hairdresser{background-position:-0px -528px;}
+.feature-chemist{background-position:-54px -528px;}
+.feature-mobilephone{background-position:-108px -528px;}
+.feature-scooter{background-position:-162px -528px;}
 .preset-icon-line.feature-highway-motorway{background-position:-20px -25px;}
 .preset-icon-line.feature-highway-trunk{background-position:-80px -25px;}
 .preset-icon-line.feature-highway-primary{background-position:-140px -25px;}
@@ -4308,3 +4359,10 @@ img.wiki-image {
 .preset-icon-relation.feature-route-power{background-position:-800px -25px;}
 .preset-icon-relation.feature-route-pipeline{background-position:-860px -25px;}
 .preset-icon-relation.feature-route-master{background-position:-920px -25px;}
+.preset-icon-relation.feature-restriction-no-straight-on{background-position:-980px -25px;}
+.preset-icon-relation.feature-restriction-no-u-turn{background-position:-1040px -25px;}
+.preset-icon-relation.feature-restriction-no-left-turn{background-position:-1100px -25px;}
+.preset-icon-relation.feature-restriction-no-right-turn{background-position:-1160px -25px;}
+.preset-icon-relation.feature-restriction-only-straight-on{background-position:-1220px -25px;}
+.preset-icon-relation.feature-restriction-only-left-turn{background-position:-1280px -25px;}
+.preset-icon-relation.feature-restriction-only-right-turn{background-position:-1340px -25px;}
diff --git a/vendor/assets/iD/iD.js b/vendor/assets/iD/iD.js
index f3da45171..2ecfaf525 100644
--- a/vendor/assets/iD/iD.js
+++ b/vendor/assets/iD/iD.js
@@ -174,11 +174,13 @@
   }
 
 })(this);
-d3 = (function(){
-  var d3 = {version: "3.3.10"}; // semver
-d3.ascending = function(a, b) {
+!function(){
+  var d3 = {version: "3.4.6"}; // semver
+d3.ascending = d3_ascending;
+
+function d3_ascending(a, b) {
   return a < b ? -1 : a > b ? 1 : a >= b ? 0 : NaN;
-};
+}
 d3.descending = function(a, b) {
   return b < a ? -1 : b > a ? 1 : b >= a ? 0 : NaN;
 };
@@ -250,17 +252,17 @@ function d3_number(x) {
 }
 
 d3.mean = function(array, f) {
-  var n = array.length,
+  var s = 0,
+      n = array.length,
       a,
-      m = 0,
       i = -1,
-      j = 0;
+      j = n;
   if (arguments.length === 1) {
-    while (++i < n) if (d3_number(a = array[i])) m += (a - m) / ++j;
+    while (++i < n) if (d3_number(a = array[i])) s += a; else --j;
   } else {
-    while (++i < n) if (d3_number(a = f.call(array, array[i], i))) m += (a - m) / ++j;
+    while (++i < n) if (d3_number(a = f.call(array, array[i], i))) s += a; else --j;
   }
-  return j ? m : undefined;
+  return j ? s / j : undefined;
 };
 // R-7 per <http://en.wikipedia.org/wiki/Quantile>
 d3.quantile = function(values, p) {
@@ -274,16 +276,17 @@ d3.quantile = function(values, p) {
 d3.median = function(array, f) {
   if (arguments.length > 1) array = array.map(f);
   array = array.filter(d3_number);
-  return array.length ? d3.quantile(array.sort(d3.ascending), .5) : undefined;
+  return array.length ? d3.quantile(array.sort(d3_ascending), .5) : undefined;
 };
-d3.bisector = function(f) {
+
+function d3_bisector(compare) {
   return {
     left: function(a, x, lo, hi) {
       if (arguments.length < 3) lo = 0;
       if (arguments.length < 4) hi = a.length;
       while (lo < hi) {
         var mid = lo + hi >>> 1;
-        if (f.call(a, a[mid], mid) < x) lo = mid + 1;
+        if (compare(a[mid], x) < 0) lo = mid + 1;
         else hi = mid;
       }
       return lo;
@@ -293,17 +296,23 @@ d3.bisector = function(f) {
       if (arguments.length < 4) hi = a.length;
       while (lo < hi) {
         var mid = lo + hi >>> 1;
-        if (x < f.call(a, a[mid], mid)) hi = mid;
+        if (compare(a[mid], x) > 0) hi = mid;
         else lo = mid + 1;
       }
       return lo;
     }
   };
-};
+}
 
-var d3_bisector = d3.bisector(function(d) { return d; });
-d3.bisectLeft = d3_bisector.left;
-d3.bisect = d3.bisectRight = d3_bisector.right;
+var d3_bisect = d3_bisector(d3_ascending);
+d3.bisectLeft = d3_bisect.left;
+d3.bisect = d3.bisectRight = d3_bisect.right;
+
+d3.bisector = function(f) {
+  return d3_bisector(f.length === 1
+      ? function(d, x) { return d3_ascending(f(d), x); }
+      : f);
+};
 d3.shuffle = function(array) {
   var m = array.length, t, i;
   while (m) {
@@ -425,24 +434,15 @@ d3.map = function(object) {
 function d3_Map() {}
 
 d3_class(d3_Map, {
-  has: function(key) {
-    return d3_map_prefix + key in this;
-  },
+  has: d3_map_has,
   get: function(key) {
     return this[d3_map_prefix + key];
   },
   set: function(key, value) {
     return this[d3_map_prefix + key] = value;
   },
-  remove: function(key) {
-    key = d3_map_prefix + key;
-    return key in this && delete this[key];
-  },
-  keys: function() {
-    var keys = [];
-    this.forEach(function(key) { keys.push(key); });
-    return keys;
-  },
+  remove: d3_map_remove,
+  keys: d3_map_keys,
   values: function() {
     var values = [];
     this.forEach(function(key, value) { values.push(value); });
@@ -453,18 +453,42 @@ d3_class(d3_Map, {
     this.forEach(function(key, value) { entries.push({key: key, value: value}); });
     return entries;
   },
+  size: d3_map_size,
+  empty: d3_map_empty,
   forEach: function(f) {
-    for (var key in this) {
-      if (key.charCodeAt(0) === d3_map_prefixCode) {
-        f.call(this, key.substring(1), this[key]);
-      }
-    }
+    for (var key in this) if (key.charCodeAt(0) === d3_map_prefixCode) f.call(this, key.substring(1), this[key]);
   }
 });
 
 var d3_map_prefix = "\0", // prevent collision with built-ins
     d3_map_prefixCode = d3_map_prefix.charCodeAt(0);
 
+function d3_map_has(key) {
+  return d3_map_prefix + key in this;
+}
+
+function d3_map_remove(key) {
+  key = d3_map_prefix + key;
+  return key in this && delete this[key];
+}
+
+function d3_map_keys() {
+  var keys = [];
+  this.forEach(function(key) { keys.push(key); });
+  return keys;
+}
+
+function d3_map_size() {
+  var size = 0;
+  for (var key in this) if (key.charCodeAt(0) === d3_map_prefixCode) ++size;
+  return size;
+}
+
+function d3_map_empty() {
+  for (var key in this) if (key.charCodeAt(0) === d3_map_prefixCode) return false;
+  return true;
+}
+
 d3.nest = function() {
   var nest = {},
       keys = [],
@@ -570,9 +594,7 @@ d3.set = function(array) {
 function d3_Set() {}
 
 d3_class(d3_Set, {
-  has: function(value) {
-    return d3_map_prefix + value in this;
-  },
+  has: d3_map_has,
   add: function(value) {
     this[d3_map_prefix + value] = true;
     return value;
@@ -581,19 +603,11 @@ d3_class(d3_Set, {
     value = d3_map_prefix + value;
     return value in this && delete this[value];
   },
-  values: function() {
-    var values = [];
-    this.forEach(function(value) {
-      values.push(value);
-    });
-    return values;
-  },
+  values: d3_map_keys,
+  size: d3_map_size,
+  empty: d3_map_empty,
   forEach: function(f) {
-    for (var value in this) {
-      if (value.charCodeAt(0) === d3_map_prefixCode) {
-        f.call(this, value.substring(1));
-      }
-    }
+    for (var value in this) if (value.charCodeAt(0) === d3_map_prefixCode) f.call(this, value.substring(1));
   }
 });
 d3.behavior = {};
@@ -794,7 +808,7 @@ var d3_select = function(s, n) { return n.querySelector(s); },
 // Prefer Sizzle, if available.
 if (typeof Sizzle === "function") {
   d3_select = function(s, n) { return Sizzle(s, n)[0] || null; };
-  d3_selectAll = function(s, n) { return Sizzle.uniqueSort(Sizzle(s, n)); };
+  d3_selectAll = Sizzle;
   d3_selectMatches = Sizzle.matchesSelector;
 }
 
@@ -954,7 +968,7 @@ d3_selectionPrototype.classed = function(name, value) {
     // probably doesn't support it on SVG elements (which can be animated).
     if (typeof name === "string") {
       var node = this.node(),
-          n = (name = name.trim().split(/^|\s+/g)).length,
+          n = (name = d3_selection_classes(name)).length,
           i = -1;
       if (value = node.classList) {
         while (++i < n) if (!value.contains(name[i])) return false;
@@ -979,9 +993,13 @@ function d3_selection_classedRe(name) {
   return new RegExp("(?:^|\\s+)" + d3.requote(name) + "(?:\\s+|$)", "g");
 }
 
+function d3_selection_classes(name) {
+  return name.trim().split(/^|\s+/);
+}
+
 // Multiple class names are allowed (e.g., "foo bar").
 function d3_selection_classed(name, value) {
-  name = name.trim().split(/\s+/).map(d3_selection_classedName);
+  name = d3_selection_classes(name).map(d3_selection_classedName);
   var n = name.length;
 
   function classedConstant() {
@@ -1328,7 +1346,7 @@ d3_selectionPrototype.sort = function(comparator) {
 };
 
 function d3_selection_sortComparator(comparator) {
-  if (!arguments.length) comparator = d3.ascending;
+  if (!arguments.length) comparator = d3_ascending;
   return function(a, b) {
     return a && b ? comparator(a.__data__, b.__data__) : !a - !b;
   };
@@ -1608,29 +1626,12 @@ d3.mouse = function(container) {
   return d3_mousePoint(container, d3_eventSource());
 };
 
-// https://bugs.webkit.org/show_bug.cgi?id=44083
-var d3_mouse_bug44083 = /WebKit/.test(d3_window.navigator.userAgent) ? -1 : 0;
-
 function d3_mousePoint(container, e) {
   if (e.changedTouches) e = e.changedTouches[0];
   var svg = container.ownerSVGElement || container;
   if (svg.createSVGPoint) {
     var point = svg.createSVGPoint();
-    if (d3_mouse_bug44083 < 0 && (d3_window.scrollX || d3_window.scrollY)) {
-      svg = d3.select("body").append("svg").style({
-        position: "absolute",
-        top: 0,
-        left: 0,
-        margin: 0,
-        padding: 0,
-        border: "none"
-      }, "important");
-      var ctm = svg[0][0].getScreenCTM();
-      d3_mouse_bug44083 = !(ctm.f || ctm.e);
-      svg.remove();
-    }
-    if (d3_mouse_bug44083) point.x = e.pageX, point.y = e.pageY;
-    else point.x = e.clientX, point.y = e.clientY;
+    point.x = e.clientX, point.y = e.clientY;
     point = point.matrixTransform(container.getScreenCTM().inverse());
     return [point.x, point.y];
   }
@@ -1658,6 +1659,14 @@ function d3_sgn(x) {
   return x > 0 ? 1 : x < 0 ? -1 : 0;
 }
 
+// Returns the 2D cross product of AB and AC vectors, i.e., the z-component of
+// the 3D cross product in a quadrant I Cartesian coordinate system (+x is
+// right, +y is up). Returns a positive value if ABC is counter-clockwise,
+// negative if clockwise, and zero if the points are collinear.
+function d3_cross2d(a, b, c) {
+  return (b[0] - a[0]) * (c[1] - a[1]) - (b[1] - a[1]) * (c[0] - a[0]);
+}
+
 function d3_acos(x) {
   return x > 1 ? 0 : x < -1 ? π : Math.acos(x);
 }
@@ -1756,37 +1765,37 @@ d3.behavior.zoom = function() {
 
   zoom.event = function(g) {
     g.each(function() {
-      var event_ = event.of(this, arguments),
+      var dispatch = event.of(this, arguments),
           view1 = view;
       if (d3_transitionInheritId) {
-          d3.select(this).transition()
-              .each("start.zoom", function() {
-                view = this.__chart__ || {x: 0, y: 0, k: 1}; // pre-transition state
-                zoomstarted(event_);
-              })
-              .tween("zoom:zoom", function() {
-                var dx = size[0],
-                    dy = size[1],
-                    cx = dx / 2,
-                    cy = dy / 2,
-                    i = d3.interpolateZoom(
-                      [(cx - view.x) / view.k, (cy - view.y) / view.k, dx / view.k],
-                      [(cx - view1.x) / view1.k, (cy - view1.y) / view1.k, dx / view1.k]
-                    );
-                return function(t) {
-                  var l = i(t), k = dx / l[2];
-                  this.__chart__ = view = {x: cx - l[0] * k, y: cy - l[1] * k, k: k};
-                  zoomed(event_);
-                };
-              })
-              .each("end.zoom", function() {
-                zoomended(event_);
-              });
+        d3.select(this).transition()
+            .each("start.zoom", function() {
+              view = this.__chart__ || {x: 0, y: 0, k: 1}; // pre-transition state
+              zoomstarted(dispatch);
+            })
+            .tween("zoom:zoom", function() {
+              var dx = size[0],
+                  dy = size[1],
+                  cx = dx / 2,
+                  cy = dy / 2,
+                  i = d3.interpolateZoom(
+                    [(cx - view.x) / view.k, (cy - view.y) / view.k, dx / view.k],
+                    [(cx - view1.x) / view1.k, (cy - view1.y) / view1.k, dx / view1.k]
+                  );
+              return function(t) {
+                var l = i(t), k = dx / l[2];
+                this.__chart__ = view = {x: cx - l[0] * k, y: cy - l[1] * k, k: k};
+                zoomed(dispatch);
+              };
+            })
+            .each("end.zoom", function() {
+              zoomended(dispatch);
+            });
       } else {
         this.__chart__ = view;
-        zoomstarted(event_);
-        zoomed(event_);
-        zoomended(event_);
+        zoomstarted(dispatch);
+        zoomed(dispatch);
+        zoomended(dispatch);
       }
     });
   }
@@ -1862,65 +1871,65 @@ d3.behavior.zoom = function() {
     if (y1) y1.domain(y0.range().map(function(y) { return (y - view.y) / view.k; }).map(y0.invert));
   }
 
-  function zoomstarted(event) {
-    event({type: "zoomstart"});
+  function zoomstarted(dispatch) {
+    dispatch({type: "zoomstart"});
   }
 
-  function zoomed(event) {
+  function zoomed(dispatch) {
     rescale();
-    event({type: "zoom", scale: view.k, translate: [view.x, view.y]});
+    dispatch({type: "zoom", scale: view.k, translate: [view.x, view.y]});
   }
 
-  function zoomended(event) {
-    event({type: "zoomend"});
+  function zoomended(dispatch) {
+    dispatch({type: "zoomend"});
   }
 
   function mousedowned() {
-    var target = this,
-        event_ = event.of(target, arguments),
-        eventTarget = d3.event.target,
+    var that = this,
+        target = d3.event.target,
+        dispatch = event.of(that, arguments),
         dragged = 0,
-        w = d3.select(d3_window).on(mousemove, moved).on(mouseup, ended),
-        l = location(d3.mouse(target)),
+        subject = d3.select(d3_window).on(mousemove, moved).on(mouseup, ended),
+        location0 = location(d3.mouse(that)),
         dragRestore = d3_event_dragSuppress();
 
-    d3_selection_interrupt.call(target);
-    zoomstarted(event_);
+    d3_selection_interrupt.call(that);
+    zoomstarted(dispatch);
 
     function moved() {
       dragged = 1;
-      translateTo(d3.mouse(target), l);
-      zoomed(event_);
+      translateTo(d3.mouse(that), location0);
+      zoomed(dispatch);
     }
 
     function ended() {
-      w.on(mousemove, d3_window === target ? mousewheelreset : null).on(mouseup, null);
-      dragRestore(dragged && d3.event.target === eventTarget);
-      zoomended(event_);
+      subject.on(mousemove, d3_window === that ? mousewheelreset : null).on(mouseup, null);
+      dragRestore(dragged && d3.event.target === target);
+      zoomended(dispatch);
     }
   }
 
   // These closures persist for as long as at least one touch is active.
   function touchstarted() {
-    var target = this,
-        event_ = event.of(target, arguments),
+    var that = this,
+        dispatch = event.of(that, arguments),
         locations0 = {}, // touchstart locations
         distance0 = 0, // distance² between initial touches
         scale0, // scale when we started touching
-        eventId = d3.event.changedTouches[0].identifier,
-        touchmove = "touchmove.zoom-" + eventId,
-        touchend = "touchend.zoom-" + eventId,
-        w = d3.select(d3_window).on(touchmove, moved).on(touchend, ended),
-        t = d3.select(target).on(mousedown, null).on(touchstart, started), // prevent duplicate events
+        zoomName = ".zoom-" + d3.event.changedTouches[0].identifier,
+        touchmove = "touchmove" + zoomName,
+        touchend = "touchend" + zoomName,
+        target = d3.select(d3.event.target).on(touchmove, moved).on(touchend, ended),
+        subject = d3.select(that).on(mousedown, null).on(touchstart, started), // prevent duplicate events
         dragRestore = d3_event_dragSuppress();
 
-    d3_selection_interrupt.call(target);
+    d3_selection_interrupt.call(that);
     started();
-    zoomstarted(event_);
+    zoomstarted(dispatch);
 
     // Updates locations of any touches in locations0.
     function relocate() {
-      var touches = d3.touches(target);
+      var touches = d3.touches(that);
       scale0 = view.k;
       touches.forEach(function(t) {
         if (t.identifier in locations0) locations0[t.identifier] = location(t);
@@ -1945,7 +1954,7 @@ d3.behavior.zoom = function() {
           scaleTo(view.k * 2);
           translateTo(p, l);
           d3_eventPreventDefault();
-          zoomed(event_);
+          zoomed(dispatch);
         }
         touchtime = now;
       } else if (touches.length > 1) {
@@ -1956,7 +1965,7 @@ d3.behavior.zoom = function() {
     }
 
     function moved() {
-      var touches = d3.touches(target),
+      var touches = d3.touches(that),
           p0, l0,
           p1, l1;
       for (var i = 0, n = touches.length; i < n; ++i, l1 = null) {
@@ -1977,7 +1986,7 @@ d3.behavior.zoom = function() {
 
       touchtime = null;
       translateTo(p0, l0);
-      zoomed(event_);
+      zoomed(dispatch);
     }
 
     function ended() {
@@ -1995,24 +2004,24 @@ d3.behavior.zoom = function() {
         }
       }
       // Otherwise, remove touchmove and touchend listeners.
-      w.on(touchmove, null).on(touchend, null);
-      t.on(mousedown, mousedowned).on(touchstart, touchstarted);
+      target.on(zoomName, null);
+      subject.on(mousedown, mousedowned).on(touchstart, touchstarted);
       dragRestore();
-      zoomended(event_);
+      zoomended(dispatch);
     }
   }
 
   function mousewheeled() {
-    var event_ = event.of(this, arguments);
+    var dispatch = event.of(this, arguments);
     if (mousewheelTimer) clearTimeout(mousewheelTimer);
-    else d3_selection_interrupt.call(this), zoomstarted(event_);
-    mousewheelTimer = setTimeout(function() { mousewheelTimer = null; zoomended(event_); }, 50);
+    else d3_selection_interrupt.call(this), zoomstarted(dispatch);
+    mousewheelTimer = setTimeout(function() { mousewheelTimer = null; zoomended(dispatch); }, 50);
     d3_eventPreventDefault();
     var point = center || d3.mouse(this);
     if (!translate0) translate0 = location(point);
     scaleTo(Math.pow(2, d3_behavior_zoomDelta() * .002) * view.k);
     translateTo(point, translate0);
-    zoomed(event_);
+    zoomed(dispatch);
   }
 
   function mousewheelreset() {
@@ -2020,15 +2029,15 @@ d3.behavior.zoom = function() {
   }
 
   function dblclicked() {
-    var event_ = event.of(this, arguments),
+    var dispatch = event.of(this, arguments),
         p = d3.mouse(this),
         l = location(p),
         k = Math.log(view.k) / Math.LN2;
-    zoomstarted(event_);
+    zoomstarted(dispatch);
     scaleTo(Math.pow(2, d3.event.shiftKey ? Math.ceil(k) - 1 : Math.floor(k) + 1));
     translateTo(p, l);
-    zoomed(event_);
-    zoomended(event_);
+    zoomed(dispatch);
+    zoomended(dispatch);
   }
 
   return d3.rebind(zoom, event, "on");
@@ -2047,6 +2056,15 @@ function d3_functor(v) {
 
 d3.functor = d3_functor;
 
+d3.touch = function(container, touches, identifier) {
+  if (arguments.length < 3) identifier = touches, touches = d3_eventSource().changedTouches;
+  if (touches) for (var i = 0, n = touches.length, touch; i < n; ++i) {
+    if ((touch = touches[i]).identifier === identifier) {
+      return d3_mousePoint(container, touch);
+    }
+  }
+};
+
 var d3_timer_queueHead,
     d3_timer_queueTail,
     d3_timer_interval, // is an interval (or frame) active?
@@ -2257,7 +2275,6 @@ function d3_geo_clip(pointVisible, clipLine, interpolate, clipStart) {
         clip.lineEnd = ringEnd;
         segments = [];
         polygon = [];
-        listener.polygonStart();
       },
       polygonEnd: function() {
         clip.point = point;
@@ -2267,13 +2284,15 @@ function d3_geo_clip(pointVisible, clipLine, interpolate, clipStart) {
         segments = d3.merge(segments);
         var clipStartInside = d3_geo_pointInPolygon(rotatedClipStart, polygon);
         if (segments.length) {
+          if (!polygonStarted) listener.polygonStart(), polygonStarted = true;
           d3_geo_clipPolygon(segments, d3_geo_clipSort, clipStartInside, interpolate, listener);
         } else if (clipStartInside) {
+          if (!polygonStarted) listener.polygonStart(), polygonStarted = true;
           listener.lineStart();
           interpolate(null, null, 1, listener);
           listener.lineEnd();
         }
-        listener.polygonEnd();
+        if (polygonStarted) listener.polygonEnd(), polygonStarted = false;
         segments = polygon = null;
       },
       sphere: function() {
@@ -2300,6 +2319,7 @@ function d3_geo_clip(pointVisible, clipLine, interpolate, clipStart) {
 
     var buffer = d3_geo_clipBufferListener(),
         ringListener = clipLine(buffer),
+        polygonStarted = false,
         polygon,
         ring;
 
@@ -2335,9 +2355,12 @@ function d3_geo_clip(pointVisible, clipLine, interpolate, clipStart) {
         var n = segment.length - 1,
             i = -1,
             point;
-        listener.lineStart();
-        while (++i < n) listener.point((point = segment[i])[0], point[1]);
-        listener.lineEnd();
+        if (n > 0) {
+          if (!polygonStarted) listener.polygonStart(), polygonStarted = true;
+          listener.lineStart();
+          while (++i < n) listener.point((point = segment[i])[0], point[1]);
+          listener.lineEnd();
+        }
         return;
       }
 
@@ -2531,11 +2554,13 @@ function d3_geo_areaRingStart() {
     // previous point, current point.  Uses a formula derived from Cagnoli’s
     // theorem.  See Todhunter, Spherical Trig. (1871), Sec. 103, Eq. (2).
     var dλ = λ - λ0,
+        sdλ = dλ >= 0 ? 1 : -1,
+        adλ = sdλ * dλ,
         cosφ = Math.cos(φ),
         sinφ = Math.sin(φ),
         k = sinφ0 * sinφ,
-        u = cosφ0 * cosφ + k * Math.cos(dλ),
-        v = k * Math.sin(dλ);
+        u = cosφ0 * cosφ + k * Math.cos(adλ),
+        v = k * sdλ * Math.sin(adλ);
     d3_geo_areaRingSum.add(Math.atan2(v, u));
 
     // Advance the previous points.
@@ -2622,11 +2647,13 @@ function d3_geo_pointInPolygon(point, polygon) {
           sinφ = Math.sin(φ),
           cosφ = Math.cos(φ),
           dλ = λ - λ0,
-          antimeridian = abs(dλ) > π,
+          sdλ = dλ >= 0 ? 1 : -1,
+          adλ = sdλ * dλ,
+          antimeridian = adλ > π,
           k = sinφ0 * sinφ;
-      d3_geo_areaRingSum.add(Math.atan2(k * Math.sin(dλ), cosφ0 * cosφ + k * Math.cos(dλ)));
+      d3_geo_areaRingSum.add(Math.atan2(k * sdλ * Math.sin(adλ), cosφ0 * cosφ + k * Math.cos(adλ)));
 
-      polarAngle += antimeridian ? dλ + (dλ >= 0 ? τ : -τ): dλ;
+      polarAngle += antimeridian ? dλ + sdλ * τ : dλ;
 
       // Are the longitudes either side of the point's meridian, and are the
       // latitudes smaller than the parallel?
@@ -3218,9 +3245,9 @@ function d3_geo_clipExtent(x0, y0, x1, y1) {
         for (var j = 1, v = polygon[i], m = v.length, a = v[0], b; j < m; ++j) {
           b = v[j];
           if (a[1] <= y) {
-            if (b[1] >  y && isLeft(a, b, p) > 0) ++wn;
+            if (b[1] >  y && d3_cross2d(a, b, p) > 0) ++wn;
           } else {
-            if (b[1] <= y && isLeft(a, b, p) < 0) --wn;
+            if (b[1] <= y && d3_cross2d(a, b, p) < 0) --wn;
           }
           a = b;
         }
@@ -3228,10 +3255,6 @@ function d3_geo_clipExtent(x0, y0, x1, y1) {
       return wn !== 0;
     }
 
-    function isLeft(a, b, c) {
-      return (b[0] - a[0]) * (c[1] - a[1]) - (c[0] - a[0]) * (b[1] - a[1]);
-    }
-
     function interpolate(from, to, direction, listener) {
       var a = 0, a1 = 0;
       if (from == null ||
@@ -4546,6 +4569,131 @@ function d3_geom_polygonClosed(coordinates) {
       b = coordinates[coordinates.length - 1];
   return !(a[0] - b[0] || a[1] - b[1]);
 }
+function d3_geom_pointX(d) {
+  return d[0];
+}
+
+function d3_geom_pointY(d) {
+  return d[1];
+}
+
+/**
+ * Computes the 2D convex hull of a set of points using Graham's scanning
+ * algorithm. The algorithm has been implemented as described in Cormen,
+ * Leiserson, and Rivest's Introduction to Algorithms. The running time of
+ * this algorithm is O(n log n), where n is the number of input points.
+ *
+ * @param vertices [[x1, y1], [x2, y2], …]
+ * @returns polygon [[x1, y1], [x2, y2], …]
+ */
+d3.geom.hull = function(vertices) {
+  var x = d3_geom_pointX,
+      y = d3_geom_pointY;
+
+  if (arguments.length) return hull(vertices);
+
+  function hull(data) {
+    if (data.length < 3) return [];
+
+    var fx = d3_functor(x),
+        fy = d3_functor(y),
+        n = data.length,
+        vertices, // TODO use parallel arrays
+        plen = n - 1,
+        points = [],
+        stack = [],
+        d,
+        i, j, h = 0, x1, y1, x2, y2, u, v, a, sp;
+
+    if (fx === d3_geom_pointX && y === d3_geom_pointY) vertices = data;
+    else for (i = 0, vertices = []; i < n; ++i) {
+      vertices.push([+fx.call(this, d = data[i], i), +fy.call(this, d, i)]);
+    }
+
+    // find the starting ref point: leftmost point with the minimum y coord
+    for (i = 1; i < n; ++i) {
+      if (vertices[i][1] < vertices[h][1]
+          || vertices[i][1] == vertices[h][1]
+          && vertices[i][0] < vertices[h][0]) h = i;
+    }
+
+    // calculate polar angles from ref point and sort
+    for (i = 0; i < n; ++i) {
+      if (i === h) continue;
+      y1 = vertices[i][1] - vertices[h][1];
+      x1 = vertices[i][0] - vertices[h][0];
+      points.push({angle: Math.atan2(y1, x1), index: i});
+    }
+    points.sort(function(a, b) { return a.angle - b.angle; });
+
+    // toss out duplicate angles
+    a = points[0].angle;
+    v = points[0].index;
+    u = 0;
+    for (i = 1; i < plen; ++i) {
+      j = points[i].index;
+      if (a == points[i].angle) {
+        // keep angle for point most distant from the reference
+        x1 = vertices[v][0] - vertices[h][0];
+        y1 = vertices[v][1] - vertices[h][1];
+        x2 = vertices[j][0] - vertices[h][0];
+        y2 = vertices[j][1] - vertices[h][1];
+        if (x1 * x1 + y1 * y1 >= x2 * x2 + y2 * y2) {
+          points[i].index = -1;
+          continue;
+        } else {
+          points[u].index = -1;
+        }
+      }
+      a = points[i].angle;
+      u = i;
+      v = j;
+    }
+
+    // initialize the stack
+    stack.push(h);
+    for (i = 0, j = 0; i < 2; ++j) {
+      if (points[j].index > -1) {
+        stack.push(points[j].index);
+        i++;
+      }
+    }
+    sp = stack.length;
+
+    // do graham's scan
+    for (; j < plen; ++j) {
+      if (points[j].index < 0) continue; // skip tossed out points
+      while (!d3_geom_hullCCW(stack[sp - 2], stack[sp - 1], points[j].index, vertices)) {
+        --sp;
+      }
+      stack[sp++] = points[j].index;
+    }
+
+    // construct the hull
+    var poly = [];
+    for (i = sp - 1; i >= 0; --i) poly.push(data[stack[i]]);
+    return poly;
+  }
+
+  hull.x = function(_) {
+    return arguments.length ? (x = _, hull) : x;
+  };
+
+  hull.y = function(_) {
+    return arguments.length ? (y = _, hull) : y;
+  };
+
+  return hull;
+};
+
+// are three points in counter-clockwise order?
+function d3_geom_hullCCW(i1, i2, i3, v) {
+  var t, a, b, c, d, e, f;
+  t = v[i1]; a = t[0]; b = t[1];
+  t = v[i2]; c = t[0]; d = t[1];
+  t = v[i3]; e = t[0]; f = t[1];
+  return (f - b) * (c - a) - (d - b) * (e - a) > 0;
+}
 
 var d3_ease_default = function() { return d3_identity; };
 
@@ -4995,7 +5143,7 @@ function d3_rgb_parse(format, rgb, hsl) {
       b = 0, // blue channel; int in [0, 255]
       m1, // CSS color specification match
       m2, // CSS color specification type (e.g., rgb)
-      name;
+      color;
 
   /* Handle hsl, rgb. */
   m1 = /([a-z]+)\((.*)\)/i.exec(format);
@@ -5020,22 +5168,19 @@ function d3_rgb_parse(format, rgb, hsl) {
   }
 
   /* Named colors. */
-  if (name = d3_rgb_names.get(format)) return rgb(name.r, name.g, name.b);
+  if (color = d3_rgb_names.get(format)) return rgb(color.r, color.g, color.b);
 
   /* Hexadecimal colors: #rgb and #rrggbb. */
-  if (format != null && format.charAt(0) === "#") {
+  if (format != null && format.charAt(0) === "#" && !isNaN(color = parseInt(format.substring(1), 16))) {
     if (format.length === 4) {
-      r = format.charAt(1); r += r;
-      g = format.charAt(2); g += g;
-      b = format.charAt(3); b += b;
+      r = (color & 0xf00) >> 4; r = (r >> 4) | r;
+      g = (color & 0xf0); g = (g >> 4) | g;
+      b = (color & 0xf); b = (b << 4) | b;
     } else if (format.length === 7) {
-      r = format.substring(1, 3);
-      g = format.substring(3, 5);
-      b = format.substring(5, 7);
+      r = (color & 0xff0000) >> 16;
+      g = (color & 0xff00) >> 8;
+      b = (color & 0xff);
     }
-    r = parseInt(r, 16);
-    g = parseInt(g, 16);
-    b = parseInt(b, 16);
   }
 
   return rgb(r, g, b);
@@ -5304,89 +5449,55 @@ function d3_interpolateNumber(a, b) {
 d3.interpolateString = d3_interpolateString;
 
 function d3_interpolateString(a, b) {
-  var m, // current match
-      i, // current index
-      j, // current index (for coalescing)
-      s0 = 0, // start index of current string prefix
-      s1 = 0, // end index of current string prefix
+  var bi = d3_interpolate_numberA.lastIndex = d3_interpolate_numberB.lastIndex = 0, // scan index for next number in b
+      am, // current match in a
+      bm, // current match in b
+      bs, // string preceding current number in b, if any
+      i = -1, // index in s
       s = [], // string constants and placeholders
-      q = [], // number interpolators
-      n, // q.length
-      o;
+      q = []; // number interpolators
 
   // Coerce inputs to strings.
   a = a + "", b = b + "";
 
-  // Reset our regular expression!
-  d3_interpolate_number.lastIndex = 0;
-
-  // Find all numbers in b.
-  for (i = 0; m = d3_interpolate_number.exec(b); ++i) {
-    if (m.index) s.push(b.substring(s0, s1 = m.index));
-    q.push({i: s.length, x: m[0]});
-    s.push(null);
-    s0 = d3_interpolate_number.lastIndex;
-  }
-  if (s0 < b.length) s.push(b.substring(s0));
-
-  // Find all numbers in a.
-  for (i = 0, n = q.length; (m = d3_interpolate_number.exec(a)) && i < n; ++i) {
-    o = q[i];
-    if (o.x == m[0]) { // The numbers match, so coalesce.
-      if (o.i) {
-        if (s[o.i + 1] == null) { // This match is followed by another number.
-          s[o.i - 1] += o.x;
-          s.splice(o.i, 1);
-          for (j = i + 1; j < n; ++j) q[j].i--;
-        } else { // This match is followed by a string, so coalesce twice.
-          s[o.i - 1] += o.x + s[o.i + 1];
-          s.splice(o.i, 2);
-          for (j = i + 1; j < n; ++j) q[j].i -= 2;
-        }
-      } else {
-          if (s[o.i + 1] == null) { // This match is followed by another number.
-          s[o.i] = o.x;
-        } else { // This match is followed by a string, so coalesce twice.
-          s[o.i] = o.x + s[o.i + 1];
-          s.splice(o.i + 1, 1);
-          for (j = i + 1; j < n; ++j) q[j].i--;
-        }
-      }
-      q.splice(i, 1);
-      n--;
-      i--;
-    } else {
-      o.x = d3_interpolateNumber(parseFloat(m[0]), parseFloat(o.x));
+  // Interpolate pairs of numbers in a & b.
+  while ((am = d3_interpolate_numberA.exec(a))
+      && (bm = d3_interpolate_numberB.exec(b))) {
+    if ((bs = bm.index) > bi) { // a string precedes the next number in b
+      bs = b.substring(bi, bs);
+      if (s[i]) s[i] += bs; // coalesce with previous string
+      else s[++i] = bs;
     }
+    if ((am = am[0]) === (bm = bm[0])) { // numbers in a & b match
+      if (s[i]) s[i] += bm; // coalesce with previous string
+      else s[++i] = bm;
+    } else { // interpolate non-matching numbers
+      s[++i] = null;
+      q.push({i: i, x: d3_interpolateNumber(am, bm)});
+    }
+    bi = d3_interpolate_numberB.lastIndex;
   }
 
-  // Remove any numbers in b not found in a.
-  while (i < n) {
-    o = q.pop();
-    if (s[o.i + 1] == null) { // This match is followed by another number.
-      s[o.i] = o.x;
-    } else { // This match is followed by a string, so coalesce twice.
-      s[o.i] = o.x + s[o.i + 1];
-      s.splice(o.i + 1, 1);
-    }
-    n--;
+  // Add remains of b.
+  if (bi < b.length) {
+    bs = b.substring(bi);
+    if (s[i]) s[i] += bs; // coalesce with previous string
+    else s[++i] = bs;
   }
 
   // Special optimization for only a single match.
-  if (s.length === 1) {
-    return s[0] == null
-        ? (o = q[0].x, function(t) { return o(t) + ""; })
-        : function() { return b; };
-  }
-
   // Otherwise, interpolate each of the numbers and rejoin the string.
-  return function(t) {
-    for (i = 0; i < n; ++i) s[(o = q[i]).i] = o.x(t);
-    return s.join("");
-  };
+  return s.length < 2
+      ? (q[0] ? (b = q[0].x, function(t) { return b(t) + ""; })
+      : function() { return b; })
+      : (b = q.length, function(t) {
+          for (var i = 0, o; i < b; ++i) s[(o = q[i]).i] = o.x(t);
+          return s.join("");
+        });
 }
 
-var d3_interpolate_number = /[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g;
+var d3_interpolate_numberA = /[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g,
+    d3_interpolate_numberB = new RegExp(d3_interpolate_numberA.source, "g");
 
 d3.interpolate = d3_interpolate;
 
@@ -5401,7 +5512,8 @@ d3.interpolators = [
     var t = typeof b;
     return (t === "string" ? (d3_rgb_names.has(b) || /^(#|rgb\(|hsl\()/.test(b) ? d3_interpolateRgb : d3_interpolateString)
         : b instanceof d3_Color ? d3_interpolateRgb
-        : t === "object" ? (Array.isArray(b) ? d3_interpolateArray : d3_interpolateObject)
+        : Array.isArray(b) ? d3_interpolateArray
+        : t === "object" && isNaN(b) ? d3_interpolateObject
         : d3_interpolateNumber)(a, b);
   }
 ];
@@ -5664,6 +5776,7 @@ d3_transitionPrototype.ease = function(value) {
 
 d3_transitionPrototype.delay = function(value) {
   var id = this.id;
+  if (arguments.length < 1) return this.node().__transition__[id].delay;
   return d3_selection_each(this, typeof value === "function"
       ? function(node, i, j) { node.__transition__[id].delay = +value.call(node, node.__data__, i, j); }
       : (value = +value, function(node) { node.__transition__[id].delay = value; }));
@@ -5671,6 +5784,7 @@ d3_transitionPrototype.delay = function(value) {
 
 d3_transitionPrototype.duration = function(value) {
   var id = this.id;
+  if (arguments.length < 1) return this.node().__transition__[id].duration;
   return d3_selection_each(this, typeof value === "function"
       ? function(node, i, j) { node.__transition__[id].duration = Math.max(1, value.call(node, node.__data__, i, j)); }
       : (value = Math.max(1, value), function(node) { node.__transition__[id].duration = value; }));
@@ -5932,8 +6046,14 @@ function d3_html(request) {
 d3.xml = d3_xhrType(function(request) {
   return request.responseXML;
 });
-  return d3;
-})();
+  if (typeof define === "function" && define.amd) {
+    define(d3);
+  } else if (typeof module === "object" && module.exports) {
+    module.exports = d3;
+  } else {
+    this.d3 = d3;
+  }
+}();
 d3.combobox = function() {
     var event = d3.dispatch('accept'),
         data = [],
@@ -6930,7 +7050,7 @@ var JXON = new (function () {
 /**
  * @license
  * Lo-Dash 2.3.0 (Custom Build) <http://lodash.com/>
- * Build: `lodash include="any,assign,bind,clone,compact,contains,debounce,difference,each,every,extend,filter,find,first,forEach,groupBy,indexOf,intersection,isEmpty,isEqual,isFunction,keys,last,map,omit,pairs,pluck,reject,some,throttle,union,uniq,unique,values,without,flatten,value,chain,cloneDeep,merge" exports="global,node"`
+ * Build: `lodash --debug --output js/lib/lodash.js include="any,assign,bind,clone,compact,contains,debounce,difference,each,every,extend,filter,find,first,forEach,groupBy,indexOf,intersection,isEmpty,isEqual,isFunction,keys,last,map,omit,pairs,pluck,reject,some,throttle,union,uniq,unique,values,without,flatten,value,chain,cloneDeep,merge,pick" exports="global,node"`
  * Copyright 2012-2013 The Dojo Foundation <http://dojofoundation.org/>
  * Based on Underscore.js 1.5.2 <http://underscorejs.org/LICENSE>
  * Copyright 2009-2013 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
@@ -9233,6 +9353,57 @@ var JXON = new (function () {
     return result;
   }
 
+  /**
+   * Creates a shallow clone of `object` composed of the specified properties.
+   * Property names may be specified as individual arguments or as arrays of
+   * property names. If a callback is provided it will be executed for each
+   * property of `object` picking the properties the callback returns truey
+   * for. The callback is bound to `thisArg` and invoked with three arguments;
+   * (value, key, object).
+   *
+   * @static
+   * @memberOf _
+   * @category Objects
+   * @param {Object} object The source object.
+   * @param {Function|...string|string[]} [callback] The function called per
+   *  iteration or property names to pick, specified as individual property
+   *  names or arrays of property names.
+   * @param {*} [thisArg] The `this` binding of `callback`.
+   * @returns {Object} Returns an object composed of the picked properties.
+   * @example
+   *
+   * _.pick({ 'name': 'fred', '_userid': 'fred1' }, 'name');
+   * // => { 'name': 'fred' }
+   *
+   * _.pick({ 'name': 'fred', '_userid': 'fred1' }, function(value, key) {
+   *   return key.charAt(0) != '_';
+   * });
+   * // => { 'name': 'fred' }
+   */
+  function pick(object, callback, thisArg) {
+    var result = {};
+    if (typeof callback != 'function') {
+      var index = -1,
+          props = baseFlatten(arguments, true, false, 1),
+          length = isObject(object) ? props.length : 0;
+
+      while (++index < length) {
+        var key = props[index];
+        if (key in object) {
+          result[key] = object[key];
+        }
+      }
+    } else {
+      callback = lodash.createCallback(callback, thisArg, 3);
+      forIn(object, function(value, key, object) {
+        if (callback(value, key, object)) {
+          result[key] = value;
+        }
+      });
+    }
+    return result;
+  }
+
   /**
    * Creates an array composed of the own enumerable property values of `object`.
    *
@@ -10759,6 +10930,7 @@ var JXON = new (function () {
   lodash.merge = merge;
   lodash.omit = omit;
   lodash.pairs = pairs;
+  lodash.pick = pick;
   lodash.pluck = pluck;
   lodash.reject = reject;
   lodash.throttle = throttle;
@@ -16038,52 +16210,7 @@ window.iD = function () {
     };
 
     /* Projection */
-    function rawMercator() {
-        var project = d3.geo.mercator.raw,
-            k = 512 / Math.PI, // scale
-            x = 0, y = 0, // translate
-            clipExtent = [[0, 0], [0, 0]];
-
-        function projection(point) {
-            point = project(point[0] * Math.PI / 180, point[1] * Math.PI / 180);
-            return [point[0] * k + x, y - point[1] * k];
-        }
-
-        projection.invert = function(point) {
-            point = project.invert((point[0] - x) / k, (y - point[1]) / k);
-            return point && [point[0] * 180 / Math.PI, point[1] * 180 / Math.PI];
-        };
-
-        projection.scale = function(_) {
-            if (!arguments.length) return k;
-            k = +_;
-            return projection;
-        };
-
-        projection.translate = function(_) {
-            if (!arguments.length) return [x, y];
-            x = +_[0];
-            y = +_[1];
-            return projection;
-        };
-
-        projection.clipExtent = function(_) {
-            if (!arguments.length) return clipExtent;
-            clipExtent = _;
-            return projection;
-        };
-
-        projection.stream = d3.geo.transform({
-            point: function(x, y) {
-                x = projection([x, y]);
-                this.stream.point(x[0], x[1]);
-            }
-        }).stream;
-
-        return projection;
-    }
-
-    context.projection = rawMercator();
+    context.projection = iD.geo.RawMercator();
 
     /* Background */
     var background = iD.Background(context);
@@ -16151,7 +16278,7 @@ window.iD = function () {
     return d3.rebind(context, dispatch, 'on');
 };
 
-iD.version = '1.3.8';
+iD.version = '1.4.0';
 
 (function() {
     var detected = {};
@@ -16622,6 +16749,13 @@ iD.geo.interp = function(p1, p2, t) {
             p1[1] + (p2[1] - p1[1]) * t];
 };
 
+// 2D cross product of OA and OB vectors, i.e. z-component of their 3D cross product.
+// Returns a positive value, if OAB makes a counter-clockwise turn,
+// negative for clockwise turn, and zero if the points are collinear.
+iD.geo.cross = function(o, a, b) {
+    return (a[0] - o[0]) * (b[1] - o[1]) - (a[1] - o[1]) * (b[0] - o[0]);
+};
+
 // http://jsperf.com/id-dist-optimization
 iD.geo.euclideanDistance = function(a, b) {
     var x = a[0] - b[0], y = a[1] - b[1];
@@ -16639,6 +16773,14 @@ iD.geo.edgeEqual = function(a, b) {
         (a[0] === b[1] && a[1] === b[0]);
 };
 
+// Return the counterclockwise angle in the range (-pi, pi)
+// between the positive X axis and the line intersecting a and b.
+iD.geo.angle = function(a, b, projection) {
+    a = projection(a.loc);
+    b = projection(b.loc);
+    return Math.atan2(b[1] - a[1], b[0] - a[0]);
+};
+
 // Choose the edge with the minimal distance from `point` to its orthogonal
 // projection onto that edge, if such a projection exists, or the distance to
 // the closest vertex on that edge. Returns an object with the `index` of the
@@ -16804,6 +16946,146 @@ _.extend(iD.geo.Extent.prototype, {
         return [this[0][0], this[0][1], this[1][0], this[1][1]].join(',');
     }
 });
+iD.geo.Turn = function(turn) {
+    if (!(this instanceof iD.geo.Turn))
+        return new iD.geo.Turn(turn);
+    _.extend(this, turn);
+};
+
+iD.geo.Intersection = function(graph, vertexId) {
+    var vertex = graph.entity(vertexId),
+        highways = [];
+
+    // Pre-split ways that would need to be split in
+    // order to add a restriction. The real split will
+    // happen when the restriction is added.
+    graph.parentWays(vertex).forEach(function(way) {
+        if (!way.tags.highway || way.isArea() || way.isDegenerate())
+            return;
+
+        if (way.affix(vertexId)) {
+            highways.push(way);
+        } else {
+            var idx = _.indexOf(way.nodes, vertex.id, 1),
+                wayA = iD.Way({id: way.id + '-a', tags: way.tags, nodes: way.nodes.slice(0, idx + 1)}),
+                wayB = iD.Way({id: way.id + '-b', tags: way.tags, nodes: way.nodes.slice(idx)});
+
+            graph = graph.replace(wayA);
+            graph = graph.replace(wayB);
+
+            highways.push(wayA);
+            highways.push(wayB);
+        }
+    });
+
+    var intersection = {
+        highways: highways,
+        graph: graph
+    };
+
+    intersection.turns = function(fromNodeID) {
+        if (!fromNodeID)
+            return [];
+
+        var way = _.find(highways, function(way) { return way.contains(fromNodeID); });
+        if (way.first() === vertex.id && way.tags.oneway === 'yes')
+            return [];
+        if (way.last() === vertex.id && way.tags.oneway === '-1')
+            return [];
+
+        function withRestriction(turn) {
+            graph.parentRelations(graph.entity(turn.from.way)).forEach(function(relation) {
+                if (relation.tags.type !== 'restriction')
+                    return;
+
+                var f = relation.memberByRole('from'),
+                    t = relation.memberByRole('to'),
+                    v = relation.memberByRole('via');
+
+                if (f && f.id === turn.from.way &&
+                    v && v.id === turn.via.node &&
+                    t && t.id === turn.to.way) {
+                    turn.restriction = relation.id;
+                } else if (/^only_/.test(relation.tags.restriction) &&
+                    f && f.id === turn.from.way &&
+                    v && v.id === turn.via.node &&
+                    t && t.id !== turn.to.way) {
+                    turn.restriction = relation.id;
+                    turn.indirect_restriction = true;
+                }
+            });
+
+            return iD.geo.Turn(turn);
+        }
+
+        var from = {
+                node: way.nodes[way.first() === vertex.id ? 1 : way.nodes.length - 2],
+                way: way.id.split(/-(a|b)/)[0]
+            },
+            via = {node: vertex.id},
+            turns = [];
+
+        highways.forEach(function(parent) {
+            if (parent === way)
+                return;
+
+            var index = parent.nodes.indexOf(vertex.id);
+
+            // backward
+            if (parent.first() !== vertex.id && parent.tags.oneway !== 'yes') {
+                turns.push(withRestriction({
+                    from: from,
+                    via: via,
+                    to: {node: parent.nodes[index - 1], way: parent.id.split(/-(a|b)/)[0]}
+                }));
+            }
+
+            // forward
+            if (parent.last() !== vertex.id && parent.tags.oneway !== '-1') {
+                turns.push(withRestriction({
+                    from: from,
+                    via: via,
+                    to: {node: parent.nodes[index + 1], way: parent.id.split(/-(a|b)/)[0]}
+                }));
+            }
+        });
+
+        // U-turn
+        if (way.tags.oneway !== 'yes' && way.tags.oneway !== '-1') {
+            turns.push(withRestriction({
+                from: from,
+                via: via,
+                to: from,
+                u: true
+            }));
+        }
+
+        return turns;
+    };
+
+    return intersection;
+};
+
+iD.geo.inferRestriction = function(from, via, to, projection) {
+    var angle = iD.geo.angle(via, from, projection) -
+                iD.geo.angle(via, to, projection);
+
+    angle = angle * 180 / Math.PI;
+
+    while (angle < 0)
+        angle += 360;
+
+    if (angle < 23)
+        return 'no_u_turn';
+    if (angle < 158)
+        return 'no_right_turn';
+    if (angle < 202)
+        return 'no_straight_on';
+    if (angle < 336)
+        return 'no_left_turn';
+
+    return 'no_u_turn';
+};
 // For fixing up rendering of multipolygons with tags on the outer member.
 // https://github.com/openstreetmap/iD/issues/613
 iD.geo.isSimpleMultipolygonOuterMember = function(entity, graph) {
@@ -16939,67 +17221,55 @@ iD.geo.joinWays = function(array, graph) {
 
     return joined;
 };
-iD.geo.turns = function(graph, entityID) {
-    var way = graph.entity(entityID);
-    if (way.type !== 'way' || !way.tags.highway || way.isArea())
-        return [];
+/*
+    Bypasses features of D3's default projection stream pipeline that are unnecessary:
+    * Antimeridian clipping
+    * Spherical rotation
+    * Resampling
+*/
+iD.geo.RawMercator = function () {
+    var project = d3.geo.mercator.raw,
+        k = 512 / Math.PI, // scale
+        x = 0, y = 0, // translate
+        clipExtent = [[0, 0], [0, 0]];
 
-    function withRestriction(turn) {
-        graph.parentRelations(turn.from).forEach(function(relation) {
-            if (relation.tags.type !== 'restriction')
-                return;
-
-            var f = relation.memberByRole('from'),
-                t = relation.memberByRole('to'),
-                v = relation.memberByRole('via');
-
-            if (f && f.id === turn.from.id &&
-                t && t.id === turn.to.id &&
-                v && v.id === turn.via.id) {
-                turn.restriction = relation;
-            }
-        });
-
-        return turn;
+    function projection(point) {
+        point = project(point[0] * Math.PI / 180, point[1] * Math.PI / 180);
+        return [point[0] * k + x, y - point[1] * k];
     }
 
-    var turns = [];
+    projection.invert = function(point) {
+        point = project.invert((point[0] - x) / k, (y - point[1]) / k);
+        return point && [point[0] * 180 / Math.PI, point[1] * 180 / Math.PI];
+    };
 
-    [way.first(), way.last()].forEach(function(nodeID) {
-        var node = graph.entity(nodeID);
-        graph.parentWays(node).forEach(function(parent) {
-            if (parent === way || parent.isDegenerate() || !parent.tags.highway)
-                return;
-            if (way.first() === node.id && way.tags.oneway === 'yes')
-                return;
-            if (way.last() === node.id && way.tags.oneway === '-1')
-                return;
+    projection.scale = function(_) {
+        if (!arguments.length) return k;
+        k = +_;
+        return projection;
+    };
 
-            var index = parent.nodes.indexOf(node.id);
+    projection.translate = function(_) {
+        if (!arguments.length) return [x, y];
+        x = +_[0];
+        y = +_[1];
+        return projection;
+    };
 
-            // backward
-            if (parent.first() !== node.id && parent.tags.oneway !== 'yes') {
-                turns.push(withRestriction({
-                    from: way,
-                    to: parent,
-                    via: node,
-                    toward: graph.entity(parent.nodes[index - 1])
-                }));
-            }
+    projection.clipExtent = function(_) {
+        if (!arguments.length) return clipExtent;
+        clipExtent = _;
+        return projection;
+    };
 
-            // forward
-            if (parent.last() !== node.id && parent.tags.oneway !== '-1') {
-                turns.push(withRestriction({
-                    from: way,
-                    to: parent,
-                    via: node,
-                    toward: graph.entity(parent.nodes[index + 1])
-                }));
-            }
-       });
-    });
+    projection.stream = d3.geo.transform({
+        point: function(x, y) {
+            x = projection([x, y]);
+            this.stream.point(x[0], x[1]);
+        }
+    }).stream;
 
-    return turns;
+    return projection;
 };
 iD.actions = {};
 iD.actions.AddEntity = function(way) {
@@ -17092,12 +17362,17 @@ iD.actions.Circularize = function(wayId, projection, maxAngle) {
     maxAngle = (maxAngle || 20) * Math.PI / 180;
 
     var action = function(graph) {
-        var way = graph.entity(wayId),
-            nodes = _.uniq(graph.childNodes(way)),
+        var way = graph.entity(wayId);
+
+        if (!way.isConvex(graph)) {
+            graph = action.makeConvex(graph);
+        }
+
+        var nodes = _.uniq(graph.childNodes(way)),
             keyNodes = nodes.filter(function(n) { return graph.parentWays(n).length !== 1; }),
             points = nodes.map(function(n) { return projection(n.loc); }),
             keyPoints = keyNodes.map(function(n) { return projection(n.loc); }),
-            centroid = d3.geom.polygon(points).centroid(),
+            centroid = (points.length === 2) ? iD.geo.interp(points[0], points[1], 0.5) : d3.geom.polygon(points).centroid(),
             radius = d3.median(points, function(p) { return iD.geo.euclideanDistance(centroid, p); }),
             sign = d3.geom.polygon(points).area() > 0 ? 1 : -1,
             ids;
@@ -17118,16 +17393,19 @@ iD.actions.Circularize = function(wayId, projection, maxAngle) {
 
         // key points and nodes are those connected to the ways,
         // they are projected onto the circle, inbetween nodes are moved
-        // to constant internals between key nodes, extra inbetween nodes are
+        // to constant intervals between key nodes, extra inbetween nodes are
         // added if necessary.
         for (var i = 0; i < keyPoints.length; i++) {
             var nextKeyNodeIndex = (i + 1) % keyNodes.length,
-                startNodeIndex = nodes.indexOf(keyNodes[i]),
-                endNodeIndex = nodes.indexOf(keyNodes[nextKeyNodeIndex]),
+                startNode = keyNodes[i],
+                endNode = keyNodes[nextKeyNodeIndex],
+                startNodeIndex = nodes.indexOf(startNode),
+                endNodeIndex = nodes.indexOf(endNode),
                 numberNewPoints = -1,
                 indexRange = endNodeIndex - startNodeIndex,
                 distance, totalAngle, eachAngle, startAngle, endAngle,
-                angle, loc, node, j;
+                angle, loc, node, j,
+                inBetweenNodes = [];
 
             if (indexRange < 0) {
                 indexRange += nodes.length;
@@ -17135,6 +17413,7 @@ iD.actions.Circularize = function(wayId, projection, maxAngle) {
 
             // position this key node
             distance = iD.geo.euclideanDistance(centroid, keyPoints[i]);
+            if (distance === 0) { distance = 1e-4; }
             keyPoints[i] = [
                 centroid[0] + (keyPoints[i][0] - centroid[0]) / distance * radius,
                 centroid[1] + (keyPoints[i][1] - centroid[1]) / distance * radius];
@@ -17146,7 +17425,7 @@ iD.actions.Circularize = function(wayId, projection, maxAngle) {
             totalAngle = endAngle - startAngle;
 
             // detects looping around -pi/pi
-            if (totalAngle*sign > 0) {
+            if (totalAngle * sign > 0) {
                 totalAngle = -sign * (2 * Math.PI - Math.abs(totalAngle));
             }
 
@@ -17177,7 +17456,40 @@ iD.actions.Circularize = function(wayId, projection, maxAngle) {
                 graph = graph.replace(node);
 
                 nodes.splice(endNodeIndex + j, 0, node);
+                inBetweenNodes.push(node.id);
             }
+
+            // Check for other ways that share these keyNodes..
+            // If keyNodes are adjacent in both ways,
+            // we can add inBetween nodes to that shared way too..
+            if (indexRange === 1 && inBetweenNodes.length) {
+                var startIndex1 = way.nodes.lastIndexOf(startNode.id),
+                    endIndex1 = way.nodes.lastIndexOf(endNode.id),
+                    wayDirection1 = (endIndex1 - startIndex1);
+                if (wayDirection1 < -1) { wayDirection1 = 1;}
+
+                /*jshint -W083 */
+                _.each(_.without(graph.parentWays(keyNodes[i]), way), function(sharedWay) {
+                    if (sharedWay.areAdjacent(startNode.id, endNode.id)) {
+                        var startIndex2 = sharedWay.nodes.lastIndexOf(startNode.id),
+                            endIndex2 = sharedWay.nodes.lastIndexOf(endNode.id),
+                            wayDirection2 = (endIndex2 - startIndex2),
+                            insertAt = endIndex2;
+                        if (wayDirection2 < -1) { wayDirection2 = 1;}
+
+                        if (wayDirection1 !== wayDirection2) {
+                            inBetweenNodes.reverse();
+                            insertAt = startIndex2;
+                        }
+                        for (j = 0; j < inBetweenNodes.length; j++) {
+                            sharedWay = sharedWay.addNode(inBetweenNodes[j], insertAt + j);
+                        }
+                        graph = graph.replace(sharedWay);
+                    }
+                });
+                /*jshint +W083 */
+            }
+
         }
 
         // update the way to have all the new nodes
@@ -17190,6 +17502,38 @@ iD.actions.Circularize = function(wayId, projection, maxAngle) {
         return graph;
     };
 
+    action.makeConvex = function(graph) {
+        var way = graph.entity(wayId),
+            nodes = _.uniq(graph.childNodes(way)),
+            points = nodes.map(function(n) { return projection(n.loc); }),
+            sign = d3.geom.polygon(points).area() > 0 ? 1 : -1,
+            hull = d3.geom.hull(points);
+
+        // D3 convex hulls go counterclockwise..
+        if (sign === -1) {
+            nodes.reverse();
+            points.reverse();
+        }
+
+        for (var i = 0; i < hull.length - 1; i++) {
+            var startIndex = points.indexOf(hull[i]),
+                endIndex = points.indexOf(hull[i+1]),
+                indexRange = (endIndex - startIndex);
+
+            if (indexRange < 0) {
+                indexRange += nodes.length;
+            }
+
+            // move interior nodes to the surface of the convex hull..
+            for (var j = 1; j < indexRange; j++) {
+                var point = iD.geo.interp(hull[i], hull[i+1], j / indexRange),
+                    node = nodes[(j + startIndex) % nodes.length].move(projection.invert(point));
+                graph = graph.replace(node);
+            }
+        }
+        return graph;
+    };
+
     action.disabled = function(graph) {
         if (!graph.entity(wayId).isClosed())
             return 'not_closed';
@@ -17460,41 +17804,52 @@ iD.actions.Disconnect = function(nodeId, newNodeId) {
 
     var action = function(graph) {
         var node = graph.entity(nodeId),
-            replacements = action.replacements(graph);
+            connections = action.connections(graph);
+
+        connections.forEach(function(connection) {
+            var way = graph.entity(connection.wayID),
+                newNode = iD.Node({id: newNodeId, loc: node.loc, tags: node.tags});
 
-        replacements.forEach(function(replacement) {
-            var newNode = iD.Node({id: newNodeId, loc: node.loc, tags: node.tags});
             graph = graph.replace(newNode);
-            graph = graph.replace(graph.entity(replacement.wayID).updateNode(newNode.id, replacement.index));
+            if (connection.index === 0 && way.isArea()) {
+                // replace shared node with shared node..
+                graph = graph.replace(way.replaceNode(way.nodes[0], newNode.id));
+            } else {
+                // replace shared node with multiple new nodes..
+                graph = graph.replace(way.updateNode(newNode.id, connection.index));
+            }
         });
 
         return graph;
     };
 
-    action.replacements = function(graph) {
+    action.connections = function(graph) {
         var candidates = [],
             keeping = false,
-            parents = graph.parentWays(graph.entity(nodeId));
+            parentWays = graph.parentWays(graph.entity(nodeId));
 
-        parents.forEach(function(parent) {
-            if (wayIds && wayIds.indexOf(parent.id) === -1) {
+        parentWays.forEach(function(way) {
+            if (wayIds && wayIds.indexOf(way.id) === -1) {
                 keeping = true;
                 return;
             }
-
-            parent.nodes.forEach(function(waynode, index) {
-                if (waynode === nodeId) {
-                    candidates.push({wayID: parent.id, index: index});
-                }
-            });
+            if (way.isArea() && (way.nodes[0] === nodeId)) {
+                candidates.push({wayID: way.id, index: 0});
+            } else {
+                way.nodes.forEach(function(waynode, index) {
+                    if (waynode === nodeId) {
+                        candidates.push({wayID: way.id, index: index});
+                    }
+                });
+            }
         });
 
         return keeping ? candidates : candidates.slice(1);
     };
 
     action.disabled = function(graph) {
-        var replacements = action.replacements(graph);
-        if (replacements.length === 0 || (wayIds && wayIds.length !== replacements.length))
+        var connections = action.connections(graph);
+        if (connections.length === 0 || (wayIds && wayIds.length !== connections.length))
             return 'not_connected';
     };
 
@@ -17960,6 +18315,95 @@ iD.actions.Orthogonalize = function(wayId, projection) {
 
     return action;
 };
+// Create a restriction relation for `turn`, which must have the following structure:
+//
+//     {
+//         from: { node: <node ID>, way: <way ID> },
+//         via:  { node: <node ID> },
+//         to:   { node: <node ID>, way: <way ID> },
+//         restriction: <'no_right_turn', 'no_left_turn', etc.>
+//     }
+//
+// This specifies a restriction of type `restriction` when traveling from
+// `from.node` in `from.way` toward `to.node` in `to.way` via `via.node`.
+// (The action does not check that these entities form a valid intersection.)
+//
+// If `restriction` is not provided, it is automatically determined by the
+// angle of the turn:
+//
+//    0-23  degrees: no_u_turn
+//   23-158 degrees: no_right_turn
+//  158-202 degrees: no_straight_on
+//  202-326 degrees: no_left_turn
+//  336-360 degrees: no_u_turn
+//
+// If necessary, the `from` and `to` ways are split. In these cases, `from.node`
+// and `to.node` are used to determine which portion of the split ways become
+// members of the restriction.
+//
+// For testing convenience, accepts an ID to assign to the new relation.
+// Normally, this will be undefined and the relation will automatically
+// be assigned a new ID.
+//
+iD.actions.RestrictTurn = function(turn, projection, restrictionId) {
+    return function(graph) {
+        var from = graph.entity(turn.from.way),
+            via  = graph.entity(turn.via.node),
+            to   = graph.entity(turn.to.way);
+
+        function split(toOrFrom) {
+            var newID = toOrFrom.newID || iD.Way().id;
+            graph = iD.actions.Split(via.id, [newID])
+                .limitWays([toOrFrom.way])(graph);
+
+            var a = graph.entity(newID),
+                b = graph.entity(toOrFrom.way);
+
+            if (a.nodes.indexOf(toOrFrom.node) !== -1) {
+                return [a, b];
+            } else {
+                return [b, a];
+            }
+        }
+
+        if (!from.affix(via.id)) {
+            if (turn.from.node === turn.to.node) {
+                // U-turn
+                from = to = split(turn.from)[0];
+            } else if (turn.from.way === turn.to.way) {
+                // Straight-on
+                var s = split(turn.from);
+                from = s[0];
+                to   = s[1];
+            } else {
+                // Other
+                from = split(turn.from)[0];
+            }
+        }
+
+        if (!to.affix(via.id)) {
+            to = split(turn.to)[0];
+        }
+
+        return graph.replace(iD.Relation({
+            id: restrictionId,
+            tags: {
+                type: 'restriction',
+                restriction: turn.restriction ||
+                    iD.geo.inferRestriction(
+                        graph.entity(turn.from.node),
+                        via,
+                        graph.entity(turn.to.node),
+                        projection)
+            },
+            members: [
+                {id: from.id, type: 'way',  role: 'from'},
+                {id: via.id,  type: 'node', role: 'via'},
+                {id: to.id,   type: 'way',  role: 'to'}
+            ]
+        }));
+    };
+};
 /*
   Order the nodes of a way in reverse order and reverse any direction dependent tags
   other than `oneway`. (We assume that correcting a backwards oneway is the primary
@@ -18334,6 +18778,29 @@ iD.actions.Straighten = function(wayId, projection) {
 
     return action;
 };
+// Remove the effects of `turn.restriction` on `turn`, which must have the
+// following structure:
+//
+//     {
+//         from: { node: <node ID>, way: <way ID> },
+//         via:  { node: <node ID> },
+//         to:   { node: <node ID>, way: <way ID> },
+//         restriction: <relation ID>
+//     }
+//
+// In the simple case, `restriction` is a reference to a `no_*` restriction
+// on the turn itself. In this case, it is simply deleted.
+//
+// The more complex case is where `restriction` references an `only_*`
+// restriction on a different turn in the same intersection. In that case,
+// that restriction is also deleted, but at the same time restrictions on
+// the turns other than the first two are created.
+//
+iD.actions.UnrestrictTurn = function(turn) {
+    return function(graph) {
+        return iD.actions.DeleteRelation(turn.restriction)(graph);
+    };
+};
 iD.behavior = {};
 iD.behavior.AddWay = function(context) {
     var event = d3.dispatch('start', 'startFromWay', 'startFromNode'),
@@ -19137,8 +19604,6 @@ iD.behavior.Lasso = function(context) {
                     .on('mouseup.lasso', mouseup);
 
                 d3.event.stopPropagation();
-                d3.event.preventDefault();
-
             }
         }
 
@@ -20360,8 +20825,10 @@ iD.operations.Circularize = function(selectedIDs, context) {
     };
 
     operation.available = function() {
+        var entity = context.entity(entityId);
         return selectedIDs.length === 1 &&
-            context.entity(entityId).type === 'way';
+            entity.type === 'way' &&
+            _.uniq(entity.nodes).length > 1;
     };
 
     operation.disabled = function() {
@@ -20478,15 +20945,15 @@ iD.operations.Delete = function(selectedIDs, context) {
             }
         }
 
-        context.perform(
-            action,
-            annotation);
-
         if (nextSelectedID && context.hasEntity(nextSelectedID)) {
             context.enter(iD.modes.Select(context, [nextSelectedID]));
         } else {
             context.enter(iD.modes.Browse(context));
         }
+
+        context.perform(
+            action,
+            annotation);
     };
 
     operation.available = function() {
@@ -20839,6 +21306,7 @@ iD.areaKeys = {
         "bench": true,
         "clock": true,
         "drinking_water": true,
+        "parking_entrance": true,
         "post_box": true,
         "telephone": true,
         "vending_machine": true,
@@ -21124,7 +21592,7 @@ iD.areaKeys = {
 
     connection.changesetTags = function(comment, imageryUsed) {
         var tags = {
-            imagery_used: imageryUsed.join(';'),
+            imagery_used: imageryUsed.join(';').substr(0, 255),
             created_by: 'iD ' + iD.version
         };
 
@@ -21606,6 +22074,10 @@ iD.Entity.prototype = {
         });
     },
 
+    isHighwayIntersection: function() {
+        return false;
+    },
+
     deprecatedTags: function() {
         var tags = _.pairs(this.tags);
         var deprecated = {};
@@ -22254,6 +22726,14 @@ _.extend(iD.Node.prototype, {
         });
     },
 
+    isHighwayIntersection: function(resolver) {
+        return resolver.transient(this, 'isHighwayIntersection', function() {
+            return resolver.parentWays(this).filter(function(parent) {
+                return parent.tags.highway && parent.geometry(resolver) === 'line';
+            }).length > 1;
+        });
+    },
+
     asJXON: function(changeset_id) {
         var r = {
             node: {
@@ -22277,6 +22757,38 @@ _.extend(iD.Node.prototype, {
         };
     }
 });
+iD.oneWayTags = {
+    'aerialway': {
+        'chair_lift': true,
+        'mixed_lift': true,
+        't-bar': true,
+        'j-bar': true,
+        'platter': true,
+        'rope_tow': true,
+        'magic_carpet': true,
+        'yes': true
+    },
+    'highway': {
+        'motorway': true,
+        'motorway_link': true
+    },
+    'junction': {
+        'roundabout': true
+    },
+    'man_made': {
+        'piste:halfpipe': true,
+        'pipeline': true
+    },
+    'piste:type': {
+        'downhill': true,
+        'sled': true,
+        'yes': true
+    },
+    'waterway': {
+        'river': true,
+        'stream': true
+    }
+};
 iD.Relation = iD.Entity.relation = function iD_Relation() {
     if (!(this instanceof iD_Relation)) {
         return (new iD_Relation()).initialize(arguments);
@@ -22666,18 +23178,46 @@ _.extend(iD.Way.prototype, {
     },
 
     isOneWay: function() {
-        return this.tags.oneway === 'yes' ||
-            this.tags.oneway === '1' ||
-            this.tags.oneway === '-1' ||
-            this.tags.waterway === 'river' ||
-            this.tags.waterway === 'stream' ||
-            this.tags.junction === 'roundabout';
+        // explicit oneway tag..
+        if (['yes', '1', '-1'].indexOf(this.tags.oneway) !== -1) { return true; }
+        if (['no', '0'].indexOf(this.tags.oneway) !== -1) { return false; }
+
+        // implied oneway tag..
+        for (var key in this.tags) {
+            if (key in iD.oneWayTags && (this.tags[key] in iD.oneWayTags[key]))
+                return true;
+        }
+        return false;
     },
 
     isClosed: function() {
         return this.nodes.length > 0 && this.first() === this.last();
     },
 
+    isConvex: function(resolver) {
+        if (!this.isClosed() || this.isDegenerate()) return null;
+
+        var nodes = _.uniq(resolver.childNodes(this)),
+            coords = _.pluck(nodes, 'loc'),
+            curr = 0, prev = 0;
+
+        for (var i = 0; i < coords.length; i++) {
+            var o = coords[(i+1) % coords.length],
+                a = coords[i],
+                b = coords[(i+2) % coords.length],
+                res = iD.geo.cross(o, a, b);
+
+            curr = (res > 0) ? 1 : (res < 0) ? -1 : 0;
+            if (curr === 0) {
+                continue;
+            } else if (prev && curr !== prev) {
+                return false;
+            }
+            prev = curr;
+        }
+        return true;
+    },
+
     isArea: function() {
         if (this.tags.area === 'yes')
             return true;
@@ -23398,30 +23938,7 @@ iD.Map = function(context) {
         if (difference) {
             var complete = difference.complete(map.extent());
             all = _.compact(_.values(complete));
-            filter = function(d) {
-                if (d.type === 'midpoint') {
-
-                    var a = d.edge[0],
-                        b = d.edge[1];
-
-                    // redraw a midpoint if it needs to be
-                    // - moved (either edge node moved)
-                    // - deleted (edge nodes not consecutive in any parent way)
-                    if (a in complete || b in complete) return true;
-
-                    var parentsWays = graph.parentWays({ id: a });
-                    for (var i = 0; i < parentsWays.length; i++) {
-                        var nodes = parentsWays[i].nodes;
-                        for (var n = 0; n < nodes.length; n++) {
-                            if (nodes[n] === a && (nodes[n - 1] === b || nodes[n + 1] === b)) return false;
-                        }
-                    }
-                    return true;
-
-                } else {
-                    return d.id in complete;
-                }
-            };
+            filter = function(d) { return d.id in complete; };
 
         } else if (extent) {
             all = context.intersects(map.extent().intersection(extent));
@@ -23997,6 +24514,7 @@ iD.svg.Areas = function(projection) {
         beach: 'beach',
         scrub: 'scrub',
         construction: 'construction',
+        military: 'construction',
         cemetery: 'cemetery',
         grave_yard: 'cemetery',
         meadow: 'meadow',
@@ -24093,6 +24611,135 @@ iD.svg.Areas = function(projection) {
             .attr('d', path);
     };
 };
+/*
+    A standalone SVG element that contains only a `defs` sub-element. To be
+    used once globally, since defs IDs must be unique within a document.
+*/
+iD.svg.Defs = function(context) {
+    function autosize(image) {
+        var img = document.createElement('img');
+        img.src = image.attr('xlink:href');
+        img.onload = function() {
+            image.attr({
+                width: img.width,
+                height: img.height
+            });
+        };
+    }
+
+    function SpriteDefinition(id, href, data) {
+        return function(defs) {
+            defs.append('image')
+                .attr('id', id)
+                .attr('xlink:href', href)
+                .call(autosize);
+
+            defs.selectAll()
+                .data(data)
+                .enter().append('use')
+                .attr('id', function(d) { return d.key; })
+                .attr('transform', function(d) { return 'translate(-' + d.value[0] + ',-' + d.value[1] + ')'; })
+                .attr('xlink:href', '#' + id);
+        };
+    }
+
+    return function (selection) {
+        var defs = selection.append('defs');
+
+        defs.append('marker')
+            .attr({
+                id: 'oneway-marker',
+                viewBox: '0 0 10 10',
+                refY: 2.5,
+                refX: 5,
+                markerWidth: 2,
+                markerHeight: 2,
+                orient: 'auto'
+            })
+            .append('path')
+            .attr('d', 'M 5 3 L 0 3 L 0 2 L 5 2 L 5 0 L 10 2.5 L 5 5 z');
+
+        var patterns = defs.selectAll('pattern')
+            .data([
+                // pattern name, pattern image name
+                ['wetland', 'wetland'],
+                ['construction', 'construction'],
+                ['cemetery', 'cemetery'],
+                ['orchard', 'orchard'],
+                ['farmland', 'farmland'],
+                ['beach', 'dots'],
+                ['scrub', 'dots'],
+                ['meadow', 'dots']
+            ])
+            .enter()
+            .append('pattern')
+            .attr({
+                id: function (d) {
+                    return 'pattern-' + d[0];
+                },
+                width: 32,
+                height: 32,
+                patternUnits: 'userSpaceOnUse'
+            });
+
+        patterns.append('rect')
+            .attr({
+                x: 0,
+                y: 0,
+                width: 32,
+                height: 32,
+                'class': function (d) {
+                    return 'pattern-color-' + d[0];
+                }
+            });
+
+        patterns.append('image')
+            .attr({
+                x: 0,
+                y: 0,
+                width: 32,
+                height: 32
+            })
+            .attr('xlink:href', function (d) {
+                return context.imagePath('pattern/' + d[1] + '.png');
+            });
+
+        defs.selectAll()
+            .data([12, 18, 20, 32, 45])
+            .enter().append('clipPath')
+            .attr('id', function (d) {
+                return 'clip-square-' + d;
+            })
+            .append('rect')
+            .attr('x', 0)
+            .attr('y', 0)
+            .attr('width', function (d) {
+                return d;
+            })
+            .attr('height', function (d) {
+                return d;
+            });
+
+        var maki = [];
+        _.forEach(iD.data.featureIcons, function (dimensions, name) {
+            if (dimensions['12'] && dimensions['18'] && dimensions['24']) {
+                maki.push({key: 'maki-' + name + '-12', value: dimensions['12']});
+                maki.push({key: 'maki-' + name + '-18', value: dimensions['18']});
+                maki.push({key: 'maki-' + name + '-24', value: dimensions['24']});
+            }
+        });
+
+        defs.call(SpriteDefinition(
+            'sprite',
+            context.imagePath('sprite.svg'),
+            d3.entries(iD.data.operations)));
+
+        defs.call(SpriteDefinition(
+            'maki-sprite',
+            context.imagePath('maki-sprite.png'),
+            maki));
+    };
+};
 iD.svg.Labels = function(projection, context) {
     var path = d3.geo.path().projection(projection);
 
@@ -24647,39 +25294,50 @@ iD.svg.Midpoints = function(projection, context) {
         for (var i = 0; i < entities.length; i++) {
             var entity = entities[i];
 
-            if (entity.type !== 'way') continue;
-            if (context.selectedIDs().indexOf(entity.id) < 0) continue;
+            if (entity.type !== 'way')
+                continue;
+            if (!filter(entity))
+                continue;
+            if (context.selectedIDs().indexOf(entity.id) < 0)
+                continue;
 
             var nodes = graph.childNodes(entity);
-
-            // skip the last node because it is always repeated
             for (var j = 0; j < nodes.length - 1; j++) {
 
                 var a = nodes[j],
                     b = nodes[j + 1],
                     id = [a.id, b.id].sort().join('-');
 
-                // Redraw midpoints in two cases:
-                //   1. One of the two endpoint nodes changed (e.g. was moved).
-                //   2. A node was deleted. The midpoint between the two new
-                //      endpoints needs to be redrawn. In this case only the
-                //      way will be in the diff.
-                if (!midpoints[id] && (filter(a) || filter(b) || filter(entity))) {
+                if (midpoints[id]) {
+                    midpoints[id].parents.push(entity);
+                } else {
                     var loc = iD.geo.interp(a.loc, b.loc, 0.5);
                     if (extent.intersects(loc) && iD.geo.euclideanDistance(projection(a.loc), projection(b.loc)) > 40) {
                         midpoints[id] = {
                             type: 'midpoint',
                             id: id,
                             loc: loc,
-                            edge: [a.id, b.id]
+                            edge: [a.id, b.id],
+                            parents: [entity]
                         };
                     }
                 }
             }
         }
 
+        function midpointFilter(d) {
+            if (midpoints[d.id])
+                return true;
+
+            for (var i = 0; i < d.parents.length; i++)
+                if (filter(d.parents[i]))
+                    return true;
+
+            return false;
+        }
+
         var groups = surface.select('.layer-hit').selectAll('g.midpoint')
-            .filter(filter)
+            .filter(midpointFilter)
             .data(_.values(midpoints), function(d) { return d.id; });
 
         var group = groups.enter()
@@ -24773,192 +25431,8 @@ iD.svg.Points = function(projection, context) {
 
     return drawPoints;
 };
-iD.svg.Restrictions = function(context) {
-    var projection = context.projection;
-
-    function drawRestrictions(surface) {
-        var turns = drawRestrictions.turns(context.graph(), context.selectedIDs());
-
-        var groups = surface.select('.layer-hit').selectAll('g.restriction')
-            .data(turns, iD.Entity.key);
-
-        var enter = groups.enter().append('g')
-            .attr('class', 'restriction');
-
-        enter.append('circle')
-            .attr('class', 'restriction')
-            .attr('r', 4);
-
-        groups
-            .attr('transform', function(restriction) {
-                var via = context.entity(restriction.memberByRole('via').id);
-                return iD.svg.PointTransform(projection)(via);
-            });
-
-        groups.exit()
-            .remove();
-
-        return this;
-    }
-
-    drawRestrictions.turns = function (graph, selectedIDs) {
-        if (selectedIDs.length !== 1)
-            return [];
-
-        var from = graph.entity(selectedIDs[0]);
-        if (from.type !== 'way')
-            return [];
-
-        return graph.parentRelations(from).filter(function(relation) {
-            var f = relation.memberById(from.id),
-                t = relation.memberByRole('to'),
-                v = relation.memberByRole('via');
-
-            return relation.tags.type === 'restriction' && f.role === 'from' &&
-                t && t.type === 'way' && graph.hasEntity(t.id) &&
-                v && v.type === 'node' && graph.hasEntity(v.id) &&
-                !graph.entity(t.id).isDegenerate() &&
-                !graph.entity(f.id).isDegenerate() &&
-                graph.entity(t.id).affix(v.id) &&
-                graph.entity(f.id).affix(v.id);
-        });
-    };
-
-    drawRestrictions.datum = function(graph, from, restriction, projection) {
-        var to = graph.entity(restriction.memberByRole('to').id),
-            a = graph.entity(restriction.memberByRole('via').id),
-            b;
-
-        if (to.first() === a.id) {
-            b = graph.entity(to.nodes[1]);
-        } else {
-            b = graph.entity(to.nodes[to.nodes.length - 2]);
-        }
-
-        a = projection(a.loc);
-        b = projection(b.loc);
-
-        return {
-            from: from,
-            to: to,
-            restriction: restriction,
-            angle: Math.atan2(b[1] - a[1], b[0] - a[0])
-        };
-    };
-
-    return drawRestrictions;
-};
-iD.svg.Surface = function(context) {
-    function autosize(image) {
-        var img = document.createElement('img');
-        img.src = image.attr('xlink:href');
-        img.onload = function() {
-            image.attr({
-                width: img.width,
-                height: img.height
-            });
-        };
-    }
-
-    function SpriteDefinition(id, href, data) {
-        return function(defs) {
-            defs.append('image')
-                .attr('id', id)
-                .attr('xlink:href', href)
-                .call(autosize);
-
-            defs.selectAll()
-                .data(data)
-                .enter().append('use')
-                .attr('id', function(d) { return d.key; })
-                .attr('transform', function(d) { return 'translate(-' + d.value[0] + ',-' + d.value[1] + ')'; })
-                .attr('xlink:href', '#' + id);
-        };
-    }
-
-    return function drawSurface(selection) {
-        var defs = selection.append('defs');
-
-        defs.append('marker')
-            .attr({
-                id: 'oneway-marker',
-                viewBox: '0 0 10 10',
-                refY: 2.5,
-                refX: 5,
-                markerWidth: 2,
-                markerHeight: 2,
-                orient: 'auto'
-            })
-            .append('path')
-            .attr('d', 'M 5 3 L 0 3 L 0 2 L 5 2 L 5 0 L 10 2.5 L 5 5 z');
-
-        var patterns = defs.selectAll('pattern')
-            .data([
-                // pattern name, pattern image name
-                ['wetland', 'wetland'],
-                ['construction', 'construction'],
-                ['cemetery', 'cemetery'],
-                ['orchard', 'orchard'],
-                ['farmland', 'farmland'],
-                ['beach', 'dots'],
-                ['scrub', 'dots'],
-                ['meadow', 'dots']])
-            .enter()
-            .append('pattern')
-                .attr({
-                    id: function(d) { return 'pattern-' + d[0]; },
-                    width: 32,
-                    height: 32,
-                    patternUnits: 'userSpaceOnUse'
-                });
-
-        patterns.append('rect')
-            .attr({
-                x: 0,
-                y: 0,
-                width: 32,
-                height: 32,
-                'class': function(d) { return 'pattern-color-' + d[0]; }
-            });
-
-        patterns.append('image')
-            .attr({
-                x: 0,
-                y: 0,
-                width: 32,
-                height: 32
-            })
-            .attr('xlink:href', function(d) { return context.imagePath('pattern/' + d[1] + '.png'); });
-
-        defs.selectAll()
-            .data([12, 18, 20])
-            .enter().append('clipPath')
-            .attr('id', function(d) { return 'clip-square-' + d; })
-            .append('rect')
-            .attr('x', 0)
-            .attr('y', 0)
-            .attr('width', function(d) { return d; })
-            .attr('height', function(d) { return d; });
-
-        var maki = [];
-        _.forEach(iD.data.featureIcons, function(dimensions, name) {
-            if (dimensions['12'] && dimensions['18'] && dimensions['24']) {
-                maki.push({key: 'maki-' + name + '-12', value: dimensions['12']});
-                maki.push({key: 'maki-' + name + '-18', value: dimensions['18']});
-                maki.push({key: 'maki-' + name + '-24', value: dimensions['24']});
-            }
-        });
-
-        defs.call(SpriteDefinition(
-            'sprite',
-            context.imagePath('sprite.svg'),
-            d3.entries(iD.data.operations)));
-
-        defs.call(SpriteDefinition(
-            'maki-sprite',
-            context.imagePath('maki-sprite.png'),
-            maki));
-
+iD.svg.Surface = function() {
+    return function (selection) {
         var layers = selection.selectAll('.layer')
             .data(['fill', 'shadow', 'casing', 'stroke', 'oneway', 'hit', 'halo', 'label']);
 
@@ -24968,12 +25442,12 @@ iD.svg.Surface = function(context) {
 };
 iD.svg.TagClasses = function() {
     var primary = [
-            'highway', 'railway', 'waterway', 'aeroway', 'motorway',
-            'boundary', 'power', 'amenity', 'natural', 'landuse',
-            'building', 'leisure', 'place'
+            'building', 'highway', 'railway', 'waterway', 'aeroway',
+            'motorway', 'boundary', 'power', 'amenity', 'natural', 'landuse',
+            'leisure', 'place'
         ],
         secondary = [
-            'oneway', 'bridge', 'tunnel', 'construction'
+            'oneway', 'bridge', 'tunnel', 'construction', 'embankment', 'cutting'
         ],
         tagClassRe = /^tag-/,
         tags = function(entity) { return entity.tags; };
@@ -25021,6 +25495,77 @@ iD.svg.TagClasses = function() {
 
     return tagClasses;
 };
+iD.svg.Turns = function(projection) {
+    return function(surface, graph, turns) {
+        function key(turn) {
+            return [turn.from.node + turn.via.node + turn.to.node].join('-');
+        }
+
+        function icon(turn) {
+            var u = turn.u ? '-u' : '';
+            if (!turn.restriction)
+                return '#icon-restriction-yes' + u;
+            var restriction = graph.entity(turn.restriction).tags.restriction;
+            return '#icon-restriction-' +
+                (!turn.indirect_restriction && /^only_/.test(restriction) ? 'only' : 'no') + u;
+        }
+
+        var groups = surface.select('.layer-hit').selectAll('g.turn')
+            .data(turns, key);
+
+        // Enter
+
+        var enter = groups.enter().append('g')
+            .attr('class', 'turn');
+
+        var nEnter = enter.filter(function (turn) { return !turn.u; });
+
+        nEnter.append('rect')
+            .attr('transform', 'translate(-12, -12)')
+            .attr('width', '45')
+            .attr('height', '25');
+
+        nEnter.append('use')
+            .attr('transform', 'translate(-12, -12)')
+            .attr('clip-path', 'url(#clip-square-45)');
+
+        var uEnter = enter.filter(function (turn) { return turn.u; });
+
+        uEnter.append('circle')
+            .attr('r', '16');
+
+        uEnter.append('use')
+            .attr('transform', 'translate(-16, -16)')
+            .attr('clip-path', 'url(#clip-square-32)');
+
+        // Update
+
+        groups
+            .attr('transform', function (turn) {
+                var v = graph.entity(turn.via.node),
+                    t = graph.entity(turn.to.node),
+                    a = iD.geo.angle(v, t, projection),
+                    p = projection(v.loc),
+                    r = turn.u ? 0 : 60;
+
+                return 'translate(' + (r * Math.cos(a) + p[0]) + ',' + (r * Math.sin(a) + p[1]) + ')' +
+                    'rotate(' + a * 180 / Math.PI + ')';
+            });
+
+        groups.select('use')
+            .attr('xlink:href', icon);
+
+        groups.select('rect');
+        groups.select('circle');
+
+        // Exit
+
+        groups.exit()
+            .remove();
+
+        return this;
+    };
+};
 iD.svg.Vertices = function(projection, context) {
     var radiuses = {
         //       z16-, z17, z18+, tagged
@@ -25185,6 +25730,10 @@ iD.ui = function(context) {
             map.centerZoom([-77.02271, 38.90085], 20);
         }
 
+        container.append('svg')
+            .attr('id', 'defs')
+            .call(iD.svg.Defs(context));
+
         container.append('div')
             .attr('id', 'sidebar')
             .attr('class', 'col4')
@@ -25499,7 +26048,8 @@ iD.ui.Background = function(context) {
             ['right', [-1, 0]],
             ['bottom', [0, 1]]],
         opacityDefault = (context.storage('background-opacity') !== null) ?
-            (+context.storage('background-opacity')) : 0.5;
+            (+context.storage('background-opacity')) : 0.5,
+        customTemplate = '';
 
     // Can be 0 from <1.3.0 use or due to issue #1923.
     if (opacityDefault === 0) opacityDefault = 0.5;
@@ -25539,15 +26089,20 @@ iD.ui.Background = function(context) {
             selectLayer();
         }
 
-        function clickCustom() {
+        function editCustom() {
             d3.event.preventDefault();
-            var template = window.prompt(t('background.custom_prompt'));
-            if (!template || template.indexOf('google.com') !== -1 ||
-               template.indexOf('googleapis.com') !== -1 ||
-               template.indexOf('google.ru') !== -1) {
+            var template = window.prompt(t('background.custom_prompt'), customTemplate);
+            if (!template ||
+                template.indexOf('google.com') !== -1 ||
+                template.indexOf('googleapis.com') !== -1 ||
+                template.indexOf('google.ru') !== -1) {
                 selectLayer();
                 return;
             }
+            setCustom(template);
+        }
+
+        function setCustom(template) {
             context.background().baseLayerSource(iD.BackgroundSource.Custom(template));
             selectLayer();
         }
@@ -25611,6 +26166,11 @@ iD.ui.Background = function(context) {
                 .property('checked', showsGpx);
 
             selectLayer();
+
+            var source = context.background().baseLayerSource();
+            if (source.id === 'custom') {
+                customTemplate = source.template;
+            }
         }
 
         function clickNudge(d) {
@@ -25717,12 +26277,27 @@ iD.ui.Background = function(context) {
             .attr('class', 'custom_layer')
             .datum(iD.BackgroundSource.Custom());
 
+        custom.append('button')
+            .attr('class', 'layer-browse')
+            .call(bootstrap.tooltip()
+                .title(t('background.custom_button'))
+                .placement('left'))
+            .on('click', editCustom)
+            .append('span')
+            .attr('class', 'icon geocode');
+
         var label = custom.append('label');
 
         label.append('input')
             .attr('type', 'radio')
             .attr('name', 'layers')
-            .on('change', clickCustom);
+            .on('change', function () {
+                if (customTemplate) {
+                    setCustom(customTemplate);
+                } else {
+                    editCustom();
+                }
+            });
 
         label.append('span')
             .text(t('background.custom'));
@@ -26221,6 +26796,8 @@ iD.ui.EntityEditor = function(context) {
         preset,
         reference;
 
+    var presetEditor = iD.ui.preset(context)
+        .on('change', changeTags);
     var rawTagEditor = iD.ui.RawTagEditor(context)
         .on('change', changeTags);
 
@@ -26307,12 +26884,11 @@ iD.ui.EntityEditor = function(context) {
             .text(preset.name());
 
         $body.select('.inspector-preset')
-            .call(iD.ui.preset(context)
+            .call(presetEditor
                 .preset(preset)
                 .entityID(id)
                 .tags(tags)
-                .state(state)
-                .on('change', changeTags));
+                .state(state));
 
         $body.select('.raw-tag-editor')
             .call(rawTagEditor
@@ -26349,11 +26925,13 @@ iD.ui.EntityEditor = function(context) {
 
     function clean(o) {
         var out = {}, k, v;
+        /*jshint -W083 */
         for (k in o) {
             if (k && (v = o[k]) !== undefined) {
-                out[k] = v.trim();
+                out[k] = v.split(';').map(function(s) { return s.trim(); }).join(';');
             }
         }
+        /*jshint +W083 */
         return out;
     }
 
@@ -26871,7 +27449,12 @@ iD.ui.Inspector = function(context) {
         var $presetPane = $wrap.select('.preset-list-pane');
         var $editorPane = $wrap.select('.entity-editor-pane');
 
-        var showEditor = state === 'hover' || context.entity(entityID).isUsed(context.graph());
+        var graph = context.graph(),
+            entity = context.entity(entityID),
+            showEditor = state === 'hover' ||
+                entity.isUsed(graph) ||
+                entity.isHighwayIntersection(graph);
+
         if (showEditor) {
             $wrap.style('right', '0%');
             $editorPane.call(entityEditor);
@@ -27399,6 +27982,10 @@ iD.ui.preset = function(context) {
                 }
             });
 
+            if (entity.isHighwayIntersection(context.graph())) {
+                fields.push(UIField(context.presets().field('restrictions'), entity, true));
+            }
+
             context.presets().universal().forEach(function(field) {
                 if (preset.fields.indexOf(field) < 0) {
                     fields.push(UIField(field, entity));
@@ -27461,7 +28048,7 @@ iD.ui.preset = function(context) {
                 return field.present();
             })
             .each(function(field) {
-                var reference = iD.ui.TagReference({key: field.key});
+                var reference = iD.ui.TagReference(field.reference || {key: field.key});
 
                 if (state === 'hover') {
                     reference.showing(false);
@@ -27504,7 +28091,7 @@ iD.ui.preset = function(context) {
 
         function show(field) {
             field.show = true;
-            presets(selection);
+            context.presets()(selection);
             field.input.focus();
         }
 
@@ -27523,6 +28110,7 @@ iD.ui.preset = function(context) {
 
     presets.preset = function(_) {
         if (!arguments.length) return preset;
+        if (preset && preset.id === _.id) return presets;
         preset = _;
         fields = null;
         return presets;
@@ -27543,6 +28131,7 @@ iD.ui.preset = function(context) {
 
     presets.entityID = function(_) {
         if (!arguments.length) return id;
+        if (id === _) return presets;
         id = _;
         fields = null;
         return presets;
@@ -27568,7 +28157,7 @@ iD.ui.PresetIcon = function() {
         $fill.enter().append('div');
 
         $fill.attr('class', function() {
-            var s = 'preset-icon-fill icon-' + geom;
+            var s = 'preset-icon-fill preset-icon-fill-' + geom;
             for (var i in p.tags) {
                 s += ' tag-' + i + ' tag-' + i + '-' + p.tags[i];
             }
@@ -28466,10 +29055,22 @@ iD.ui.RawTagEditor = function(context) {
         }
 
         function keyChange(d) {
-            var tag = {};
-            tag[d.key] = undefined;
-            tag[this.value] = d.value;
-            d.key = this.value; // Maintain DOM identity through the subsequent update.
+            var kOld = d.key,
+                kNew = this.value.trim(),
+                tag = {};
+
+            if (kNew && kNew !== kOld) {
+                var match = kNew.match(/^(.*?)(?:_(\d+))?$/),
+                    base = match[1],
+                    suffix = +(match[2] || 1);
+                while (tags[kNew]) {  // rename key if already in use
+                    kNew = base + '_' + suffix++;
+                }
+            }
+            tag[kOld] = undefined;
+            tag[kNew] = d.value;
+            d.key = kNew; // Maintain DOM identity through the subsequent update.
+            this.value = kNew;
             event.change(tag);
         }
 
@@ -28772,6 +29373,7 @@ iD.ui.Sidebar = function(context) {
 
         sidebar.hide = function() {
             featureListWrap.classed('inspector-hidden', false);
+            inspectorWrap.classed('inspector-hidden', true);
             if (current) current.remove();
             current = null;
         };
@@ -29332,10 +29934,11 @@ iD.ui.preset.access = function(field) {
     }
 
     access.options = function(type) {
-        var options = ['no', 'permissive', 'private', 'designated', 'destination'];
+        var options = ['no', 'permissive', 'private', 'destination'];
 
         if (type !== 'access') {
             options.unshift('yes');
+            options.push('designated');
         }
 
         return options.map(function(option) {
@@ -29348,65 +29951,104 @@ iD.ui.preset.access = function(field) {
 
     var placeholders = {
         footway: {
-            foot: 'yes',
+            foot: 'designated',
             motor_vehicle: 'no'
         },
         steps: {
             foot: 'yes',
-            motor_vehicle: 'no'
+            motor_vehicle: 'no',
+            bicycle: 'no',
+            horse: 'no'
         },
         pedestrian: {
             foot: 'yes',
             motor_vehicle: 'no'
         },
         cycleway: {
-            bicycle: 'yes',
-            motor_vehicle: 'no'
+            motor_vehicle: 'no',
+            bicycle: 'designated'
         },
         bridleway: {
-            horse: 'yes'
+            motor_vehicle: 'no',
+            horse: 'designated'
         },
         path: {
-            motor_vehicle: 'no'
+            foot: 'yes',
+            motor_vehicle: 'no',
+            bicycle: 'yes',
+            horse: 'yes'
         },
         motorway: {
-            motor_vehicle: 'yes'
+            foot: 'no',
+            motor_vehicle: 'yes',
+            bicycle: 'no',
+            horse: 'no'
         },
         trunk: {
             motor_vehicle: 'yes'
         },
         primary: {
-            motor_vehicle: 'yes'
+            foot: 'yes',
+            motor_vehicle: 'yes',
+            bicycle: 'yes',
+            horse: 'yes'
         },
         secondary: {
-            motor_vehicle: 'yes'
+            foot: 'yes',
+            motor_vehicle: 'yes',
+            bicycle: 'yes',
+            horse: 'yes'
         },
         tertiary: {
-            motor_vehicle: 'yes'
+            foot: 'yes',
+            motor_vehicle: 'yes',
+            bicycle: 'yes',
+            horse: 'yes'
         },
         residential: {
-            motor_vehicle: 'yes'
+            foot: 'yes',
+            motor_vehicle: 'yes',
+            bicycle: 'yes',
+            horse: 'yes'
         },
         unclassified: {
-            motor_vehicle: 'yes'
+            foot: 'yes',
+            motor_vehicle: 'yes',
+            bicycle: 'yes',
+            horse: 'yes'
         },
         service: {
-            motor_vehicle: 'yes'
+            foot: 'yes',
+            motor_vehicle: 'yes',
+            bicycle: 'yes',
+            horse: 'yes'
         },
         motorway_link: {
-            motor_vehicle: 'yes'
+            foot: 'no',
+            motor_vehicle: 'yes',
+            bicycle: 'no',
+            horse: 'no'
         },
         trunk_link: {
             motor_vehicle: 'yes'
         },
         primary_link: {
-            motor_vehicle: 'yes'
+            foot: 'yes',
+            motor_vehicle: 'yes',
+            bicycle: 'yes',
+            horse: 'yes'
         },
         secondary_link: {
-            motor_vehicle: 'yes'
+            foot: 'yes',
+            motor_vehicle: 'yes',
+            bicycle: 'yes',
+            horse: 'yes'
         },
         tertiary_link: {
-            motor_vehicle: 'yes'
+            foot: 'yes',
+            motor_vehicle: 'yes',
+            bicycle: 'yes',
+            horse: 'yes'
         }
     };
 
@@ -29422,7 +30064,9 @@ iD.ui.preset.access = function(field) {
 
         _.forEach(placeholders[tags.highway], function(value, key) {
             items.selectAll('#preset-input-access-' + key)
-                .attr('placeholder', value);
+                .attr('placeholder', function() {
+                    return (tags.access && (value === 'yes' || value === 'designated')) ? tags.access : value;
+                });
         });
     };
 
@@ -29559,10 +30203,6 @@ iD.ui.preset.address = function(field, context) {
         city = wrap.select('.addr-city');
         postcode = wrap.select('.addr-postcode');
 
-        wrap.selectAll('input')
-            .on('blur', change)
-            .on('change', change);
-
         street
             .call(d3.combobox()
                 .fetcher(function(value, callback) {
@@ -29580,6 +30220,10 @@ iD.ui.preset.address = function(field, context) {
                 .fetcher(function(value, callback) {
                     callback(getPostCodes());
                 }));
+
+        wrap.selectAll('input')
+            .on('blur', change)
+            .on('change', change);
     }
 
     function change() {
@@ -29610,15 +30254,41 @@ iD.ui.preset.address = function(field, context) {
 
     return d3.rebind(address, event, 'on');
 };
-iD.ui.preset.check = function(field) {
+iD.ui.preset.check =
+iD.ui.preset.defaultcheck = function(field) {
     var event = d3.dispatch('change'),
-        values = [undefined, 'yes', 'no'],
-        value,
-        box,
-        text,
-        label;
+        options = field.strings && field.strings.options,
+        values = [],
+        texts = [],
+        entity, value, box, text, label;
+
+    if (options) {
+        for (var k in options) {
+            values.push(k === 'undefined' ? undefined : k);
+            texts.push(field.t('check.' + k, { 'default': options[k] }));
+        }
+    } else {
+        values = [undefined, 'yes'];
+        texts = [t('inspector.unknown'), t('inspector.check.yes')];
+        if (field.type === 'check') {
+            values.push('no');
+            texts.push(t('inspector.check.no'));
+        }
+    }
 
     var check = function(selection) {
+        // hack: pretend oneway field is a oneway_yes field
+        // where implied oneway tag exists (e.g. `junction=roundabout`) #2220, #1841
+        if (field.id === 'oneway') {
+            for (var key in entity.tags) {
+                if (key in iD.oneWayTags && (entity.tags[key] in iD.oneWayTags[key])) {
+                    texts.shift();
+                    texts.unshift(t('presets.fields.oneway_yes.check.undefined', { 'default': 'Assumed to be Yes' }));
+                    break;
+                }
+            }
+        }
+
         selection.classed('checkselect', 'true');
 
         label = selection.selectAll('.preset-input-wrap')
@@ -29628,18 +30298,18 @@ iD.ui.preset.check = function(field) {
             .attr('class', 'preset-input-wrap');
 
         enter.append('input')
-            .property('indeterminate', true)
+            .property('indeterminate', field.type === 'check')
             .attr('type', 'checkbox')
             .attr('id', 'preset-input-' + field.id);
 
         enter.append('span')
-            .text(t('inspector.unknown'))
+            .text(texts[0])
             .attr('class', 'value');
 
         box = label.select('input')
             .on('click', function() {
                 var t = {};
-                t[field.key] = values[(values.indexOf(value) + 1) % 3];
+                t[field.key] = values[(values.indexOf(value) + 1) % values.length];
                 event.change(t);
                 d3.event.stopPropagation();
             });
@@ -29647,11 +30317,17 @@ iD.ui.preset.check = function(field) {
         text = label.select('span.value');
     };
 
+    check.entity = function(_) {
+        if (!arguments.length) return entity;
+        entity = _;
+        return check;
+    };
+
     check.tags = function(tags) {
         value = tags[field.key];
-        box.property('indeterminate', !value);
+        box.property('indeterminate', field.type === 'check' && !value);
         box.property('checked', value === 'yes');
-        text.text(value ? t('inspector.check.' + value, {default: value}) : t('inspector.unknown'));
+        text.text(texts[values.indexOf(value)]);
         label.classed('set', !!value);
     };
 
@@ -29677,6 +30353,7 @@ iD.ui.preset.typeCombo = function(field) {
             .attr('id', 'preset-input-' + field.id);
 
         input
+            .call(combobox)
             .on('change', change)
             .on('blur', change)
             .each(function() {
@@ -29689,13 +30366,12 @@ iD.ui.preset.typeCombo = function(field) {
                         if (!err) options(_.pluck(data, 'value'));
                     });
                 }
-            })
-            .call(combobox);
+            });
 
         function options(opts) {
             combobox.data(opts.map(function(d) {
                 var o = {};
-                o.title = o.value = d.replace('_', ' ');
+                o.title = o.value = d.replace(/_+/g, ' ');
                 return o;
             }));
 
@@ -29707,7 +30383,12 @@ iD.ui.preset.typeCombo = function(field) {
     }
 
     function change() {
-        var value = input.value().replace(' ', '_');
+        var value = input.value()
+            .split(';')
+            .map(function(s) { return s.trim(); })
+            .join(';')
+            .replace(/\s+/g, '_');
+
         if (field.type === 'typeCombo' && !value) value = 'yes';
 
         var t = {};
@@ -29727,36 +30408,6 @@ iD.ui.preset.typeCombo = function(field) {
 
     return d3.rebind(combo, event, 'on');
 };
-iD.ui.preset.defaultcheck = function(field) {
-    var event = d3.dispatch('change'),
-        input;
-
-    function check(selection) {
-        input = selection.selectAll('input')
-            .data([0]);
-
-        input.enter().append('input')
-            .attr('type', 'checkbox')
-            .attr('id', 'preset-input-' + field.id);
-
-        input
-            .on('change', function() {
-                var t = {};
-                t[field.key] = input.property('checked') ? field.value || 'yes' : undefined;
-                event.change(t);
-            });
-    }
-
-    check.tags = function(tags) {
-        input.property('checked', !!tags[field.key] && tags[field.key] !== 'no');
-    };
-
-    check.focus = function() {
-        input.node().focus();
-    };
-
-    return d3.rebind(check, event, 'on');
-};
 iD.ui.preset.text =
 iD.ui.preset.number =
 iD.ui.preset.tel =
@@ -29839,10 +30490,6 @@ iD.ui.preset.localized = function(field, context) {
             .attr('class', 'localized-main')
             .attr('placeholder', field.placeholder());
 
-        input
-            .on('blur', change)
-            .on('change', change);
-
         if (field.id === 'name') {
             var preset = context.presets().match(entity, context.graph());
             input.call(d3.combobox().fetcher(
@@ -29850,6 +30497,10 @@ iD.ui.preset.localized = function(field, context) {
             ));
         }
 
+        input
+            .on('blur', change)
+            .on('change', change);
+
         var translateButton = selection.selectAll('.localized-add')
             .data([0]);
 
@@ -30079,9 +30730,9 @@ iD.ui.preset.maxspeed = function(field, context) {
             .attr('placeholder', field.placeholder());
 
         input
+            .call(combobox)
             .on('change', change)
-            .on('blur', change)
-            .call(combobox);
+            .on('blur', change);
 
         var childNodes = context.graph().childNodes(context.entity(entity.id)),
             loc = childNodes[~~(childNodes.length/2)].loc;
@@ -30241,6 +30892,145 @@ iD.ui.preset.radio = function(field) {
 
     return d3.rebind(radio, event, 'on');
 };
+iD.ui.preset.restrictions = function(field, context) {
+    var event = d3.dispatch('change'),
+        vertexID,
+        fromNodeID;
+
+    function restrictions(selection) {
+        var wrap = selection.selectAll('.preset-input-wrap')
+            .data([0]);
+
+        var enter = wrap.enter().append('div')
+            .attr('class', 'preset-input-wrap');
+
+        enter.append('div')
+            .attr('class', 'restriction-help');
+
+        enter.append('svg')
+            .call(iD.svg.Surface(context))
+            .call(iD.behavior.Hover(context));
+
+        var intersection = iD.geo.Intersection(context.graph(), vertexID),
+            graph = intersection.graph,
+            vertex = graph.entity(vertexID),
+            surface = wrap.selectAll('svg'),
+            filter = function () { return true; },
+            extent = iD.geo.Extent(),
+            projection = iD.geo.RawMercator(),
+            lines = iD.svg.Lines(projection, context),
+            vertices = iD.svg.Vertices(projection, context),
+            turns = iD.svg.Turns(projection, context);
+
+        var d = wrap.dimensions(),
+            c = [d[0] / 2, d[1] / 2],
+            z = 21;
+
+        projection
+            .scale(256 * Math.pow(2, z) / (2 * Math.PI));
+
+        var s = projection(vertex.loc);
+
+        projection
+            .translate([c[0] - s[0], c[1] - s[1]])
+            .clipExtent([[0, 0], d]);
+
+        surface
+            .call(vertices, graph, [vertex], filter, extent, z)
+            .call(lines, graph, intersection.highways, filter)
+            .call(turns, graph, intersection.turns(fromNodeID));
+
+        surface
+            .on('click.restrictions', click)
+            .on('mouseover.restrictions', mouseover)
+            .on('mouseout.restrictions', mouseout);
+
+        surface
+            .selectAll('.selected')
+            .classed('selected', false);
+
+        if (fromNodeID) {
+            surface
+                .selectAll('.' + _.find(intersection.highways, function(way) { return way.contains(fromNodeID); }).id)
+                .classed('selected', true);
+        }
+
+        mouseout();
+
+        context.history()
+            .on('change.restrictions', render);
+
+        d3.select(window)
+            .on('resize.restrictions', render);
+
+        function click() {
+            var datum = d3.event.target.__data__;
+            if (datum instanceof iD.Entity) {
+                fromNodeID = datum.nodes[(datum.first() === vertexID) ? 1 : datum.nodes.length - 2];
+                render();
+            } else if (datum instanceof iD.geo.Turn) {
+                if (datum.restriction) {
+                    context.perform(
+                        iD.actions.UnrestrictTurn(datum, projection),
+                        t('operations.restriction.annotation.delete'));
+                } else {
+                    context.perform(
+                        iD.actions.RestrictTurn(datum, projection),
+                        t('operations.restriction.annotation.create'));
+                }
+            }
+        }
+
+        function mouseover() {
+            var datum = d3.event.target.__data__;
+            if (datum instanceof iD.geo.Turn) {
+                var graph = context.graph(),
+                    presets = context.presets(),
+                    preset;
+
+                if (datum.restriction) {
+                    preset = presets.match(graph.entity(datum.restriction), graph);
+                } else {
+                    preset = presets.item('type/restriction/' +
+                        iD.geo.inferRestriction(
+                            graph.entity(datum.from.node),
+                            graph.entity(datum.via.node),
+                            graph.entity(datum.to.node),
+                            projection));
+                }
+
+                wrap.selectAll('.restriction-help')
+                    .text(t('operations.restriction.help.' +
+                        (datum.restriction ? 'toggle_off' : 'toggle_on'),
+                        {restriction: preset.name()}));
+            }
+        }
+
+        function mouseout() {
+            wrap.selectAll('.restriction-help')
+                .text(t('operations.restriction.help.' +
+                    (fromNodeID ? 'toggle' : 'select')));
+        }
+
+        function render() {
+            if (context.hasEntity(vertexID)) {
+                restrictions(selection);
+            }
+        }
+    }
+
+    restrictions.entity = function(_) {
+        if (!vertexID || vertexID !== _.id) {
+            fromNodeID = null;
+            vertexID = _.id;
+        }
+    };
+
+    restrictions.tags = function() {};
+    restrictions.focus = function() {};
+
+    return d3.rebind(restrictions, event, 'on');
+};
 iD.ui.preset.textarea = function(field) {
 
     var event = d3.dispatch('change'),
@@ -30319,9 +31109,9 @@ iD.ui.preset.wikipedia = function(field, context) {
             .value('English');
 
         lang
+            .call(langcombo)
             .on('blur', changeLang)
-            .on('change', changeLang)
-            .call(langcombo);
+            .on('change', changeLang);
 
         title = selection.selectAll('input.wiki-title')
             .data([0]);
@@ -30332,9 +31122,9 @@ iD.ui.preset.wikipedia = function(field, context) {
             .attr('id', 'preset-input-' + field.id);
 
         title
+            .call(titlecombo)
             .on('blur', change)
-            .on('change', change)
-            .call(titlecombo);
+            .on('change', change);
 
         link = selection.selectAll('a.wiki-link')
             .data([0]);
@@ -31185,7 +31975,7 @@ iD.presets.Field = function(id, field) {
     field.id = id;
 
     field.matchGeometry = function(geometry) {
-        return !field.geometry || field.geometry.indexOf(geometry) >= 0;
+        return !field.geometry || field.geometry === geometry;
     };
 
     field.t = function(scope, options) {
@@ -38246,6 +39036,42 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "terms_url": "http://geo.nls.uk/maps/",
             "terms_text": "National Library of Scotland Historic Maps"
         },
+        {
+            "name": "Ireland British War Office 1:25k GSGS 3906",
+            "type": "tms",
+            "template": "http://mapwarper.net/layers/tile/101/{zoom}/{x}/{y}.png",
+            "scaleExtent": [
+                0,
+                18
+            ],
+            "polygon": [
+                [
+                    [
+                        -10.71,
+                        51.32
+                    ],
+                    [
+                        -10.71,
+                        55.46
+                    ],
+                    [
+                        -5.37,
+                        55.46
+                    ],
+                    [
+                        -5.37,
+                        51.32
+                    ],
+                    [
+                        -10.71,
+                        51.32
+                    ]
+                ]
+            ],
+            "terms_url": "http://wiki.openstreetmap.org/wiki/WikiProject_Ireland#Trinity_College_Dublin",
+            "terms_text": "Glucksman Map Library, Trinity College Dublin",
+            "id": "GSGS3906"
+        },
         {
             "name": "Ireland British War Office One-Inch 1941-43 GSGS 4136",
             "type": "tms",
@@ -38475,7 +39301,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ]
             ],
             "terms_url": "http://geo.nls.uk/maps/",
-            "terms_text": "National Library of Scotland Historic Maps"
+            "terms_text": "National Library of Scotland Historic Maps",
+            "id": "GSGS4136"
         },
         {
             "name": "Ireland EEA CORINE 2006",
@@ -41654,22 +42481,23 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "overlay": true
         },
         {
-            "name": "MapBox Satellite",
+            "name": "MapQuest Open Aerial",
+            "type": "tms",
+            "template": "http://oatile{switch:1,2,3,4}.mqcdn.com/tiles/1.0.0/sat/{zoom}/{x}/{y}.png",
+            "default": true
+        },
+        {
+            "name": "Mapbox Satellite",
             "type": "tms",
             "description": "Satellite and aerial imagery.",
             "template": "http://{switch:a,b,c}.tiles.mapbox.com/v3/openstreetmap.map-4wvf9l0l/{zoom}/{x}/{y}.png",
             "scaleExtent": [
                 0,
-                16
+                19
             ],
             "terms_url": "http://www.mapbox.com/about/maps/",
             "terms_text": "Terms & Feedback",
-            "default": true
-        },
-        {
-            "name": "MapQuest Open Aerial",
-            "type": "tms",
-            "template": "http://oatile{switch:1,2,3,4}.mqcdn.com/tiles/1.0.0/sat/{zoom}/{x}/{y}.png",
+            "id": "Mapbox",
             "default": true
         },
         {
@@ -62940,7 +63768,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "fields": [
                     "ref",
-                    "surface"
+                    "surface",
+                    "length",
+                    "width"
                 ],
                 "tags": {
                     "aeroway": "runway"
@@ -63221,6 +64051,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "name": "Car Sharing"
             },
             "amenity/car_wash": {
+                "icon": "car",
                 "geometry": [
                     "point",
                     "area"
@@ -63233,6 +64064,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "name": "Car Wash"
             },
+            "amenity/charging_station": {
+                "icon": "car",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "amenity": "charging_station"
+                },
+                "fields": [
+                    "operator"
+                ],
+                "terms": [
+                    "EV",
+                    "Electric Vehicle",
+                    "Supercharger"
+                ],
+                "name": "Charging Station"
+            },
             "amenity/childcare": {
                 "icon": "school",
                 "fields": [
@@ -63335,6 +64185,17 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "terms": [],
                 "name": "College"
             },
+            "amenity/compressed_air": {
+                "icon": "car",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "amenity": "compressed_air"
+                },
+                "name": "Compressed Air"
+            },
             "amenity/courthouse": {
                 "fields": [
                     "operator",
@@ -63391,6 +64252,26 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "opening_hours"
                 ]
             },
+            "amenity/dojo": {
+                "icon": "pitch",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "martial arts",
+                    "dojo",
+                    "dojang"
+                ],
+                "tags": {
+                    "amenity": "dojo"
+                },
+                "fields": [
+                    "address",
+                    "sport"
+                ],
+                "name": "Dojo / Martial Arts Academy"
+            },
             "amenity/drinking_water": {
                 "icon": "water",
                 "geometry": [
@@ -63638,6 +64519,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "terms": [],
                 "name": "Car Parking"
             },
+            "amenity/parking_entrance": {
+                "icon": "entrance",
+                "geometry": [
+                    "vertex"
+                ],
+                "tags": {
+                    "amenity": "parking_entrance"
+                },
+                "fields": [
+                    "access_simple",
+                    "ref"
+                ],
+                "name": "Parking Garage Entrance/Exit"
+            },
             "amenity/pharmacy": {
                 "icon": "pharmacy",
                 "fields": [
@@ -64594,8 +65489,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "building",
                     "levels",
-                    "address",
-                    "smoking"
+                    "address"
                 ],
                 "geometry": [
                     "area"
@@ -64791,7 +65685,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "tags": {
                     "building": "entrance"
                 },
-                "name": "Entrance",
+                "name": "Entrance/Exit",
                 "searchable": false
             },
             "building/garage": {
@@ -65641,18 +66535,18 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "opening_hours"
                 ]
             },
-            "craft/photographic_labratory": {
-                "name": "Photographic Labratory",
+            "craft/photographic_laboratory": {
+                "name": "Photographic Laboratory",
                 "geometry": [
                     "point",
                     "area"
                 ],
                 "terms": [
-                    "photographic labratory",
+                    "photographic laboratory",
                     "film developer"
                 ],
                 "tags": {
-                    "craft": "photographic_labratory"
+                    "craft": "photographic_laboratory"
                 },
                 "icon": "camera",
                 "fields": [
@@ -66116,13 +67010,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "access_simple",
                     "address"
                 ],
-                "name": "Entrance"
+                "name": "Entrance/Exit"
             },
             "footway/crossing": {
                 "fields": [
                     "crossing",
                     "access",
-                    "surface"
+                    "surface",
+                    "sloped_curb",
+                    "tactile_paving"
                 ],
                 "geometry": [
                     "line"
@@ -66131,16 +67027,37 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "highway": "footway",
                     "footway": "crossing"
                 },
+                "terms": [],
+                "name": "Crossing"
+            },
+            "footway/crosswalk": {
+                "fields": [
+                    "crossing",
+                    "access",
+                    "surface",
+                    "sloped_curb",
+                    "tactile_paving"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "footway",
+                    "footway": "crossing",
+                    "crossing": "zebra"
+                },
                 "terms": [
                     "crosswalk",
                     "zebra crossing"
                 ],
-                "name": "Crossing"
+                "name": "Crosswalk"
             },
             "footway/sidewalk": {
                 "fields": [
                     "surface",
                     "lit",
+                    "width",
+                    "structure",
                     "access"
                 ],
                 "geometry": [
@@ -66153,6 +67070,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "terms": [],
                 "name": "Sidewalk"
             },
+            "ford": {
+                "geometry": [
+                    "vertex"
+                ],
+                "tags": {
+                    "ford": "yes"
+                },
+                "name": "Ford"
+            },
             "golf/bunker": {
                 "icon": "golf",
                 "geometry": [
@@ -66276,9 +67202,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "highway/bridleway": {
                 "fields": [
-                    "access",
                     "surface",
-                    "structure"
+                    "width",
+                    "structure",
+                    "access"
                 ],
                 "icon": "highway-bridleway",
                 "geometry": [
@@ -66314,7 +67241,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "highway/crossing": {
                 "fields": [
-                    "crossing"
+                    "crossing",
+                    "sloped_curb",
+                    "tactile_paving"
                 ],
                 "geometry": [
                     "vertex"
@@ -66322,20 +67251,37 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "tags": {
                     "highway": "crossing"
                 },
+                "terms": [],
+                "name": "Crossing"
+            },
+            "highway/crosswalk": {
+                "fields": [
+                    "crossing",
+                    "sloped_curb",
+                    "tactile_paving"
+                ],
+                "geometry": [
+                    "vertex"
+                ],
+                "tags": {
+                    "highway": "crossing",
+                    "crossing": "zebra"
+                },
                 "terms": [
                     "crosswalk",
                     "zebra crossing"
                 ],
-                "name": "Crossing"
+                "name": "Crosswalk"
             },
             "highway/cycleway": {
                 "icon": "highway-cycleway",
                 "fields": [
                     "surface",
                     "lit",
+                    "width",
+                    "oneway",
                     "structure",
-                    "access",
-                    "oneway"
+                    "access"
                 ],
                 "geometry": [
                     "line"
@@ -66349,9 +67295,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "highway/footway": {
                 "icon": "highway-footway",
                 "fields": [
+                    "surface",
+                    "lit",
+                    "width",
                     "structure",
-                    "access",
-                    "surface"
+                    "access"
                 ],
                 "geometry": [
                     "line",
@@ -66420,7 +67368,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "highway/motorway": {
                 "icon": "highway-motorway",
                 "fields": [
-                    "oneway",
+                    "oneway_yes",
                     "maxspeed",
                     "structure",
                     "access",
@@ -66447,7 +67395,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "ref"
                 ],
-                "name": "Motorway Junction"
+                "name": "Motorway Junction / Exit"
             },
             "highway/motorway_link": {
                 "icon": "highway-motorway-link",
@@ -66475,10 +67423,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "highway/path": {
                 "icon": "highway-path",
                 "fields": [
+                    "surface",
+                    "width",
                     "structure",
                     "access",
                     "sac_scale",
-                    "surface",
                     "incline",
                     "trail_visibility",
                     "ref"
@@ -66494,9 +67443,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "highway/pedestrian": {
                 "fields": [
-                    "access",
+                    "surface",
+                    "lit",
+                    "width",
                     "oneway",
-                    "surface"
+                    "structure",
+                    "access"
                 ],
                 "geometry": [
                     "line",
@@ -66763,8 +67715,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "highway/steps": {
                 "fields": [
-                    "access",
-                    "surface"
+                    "surface",
+                    "lit",
+                    "width",
+                    "access"
                 ],
                 "icon": "highway-steps",
                 "geometry": [
@@ -67095,7 +68049,22 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "terms": [],
                 "name": "Cemetery"
             },
+            "landuse/churchyard": {
+                "fields": [
+                    "religion",
+                    "denomination"
+                ],
+                "geometry": [
+                    "area"
+                ],
+                "tags": {
+                    "landuse": "churchyard"
+                },
+                "terms": [],
+                "name": "Churchyard"
+            },
             "landuse/commercial": {
+                "icon": "commercial",
                 "geometry": [
                     "point",
                     "area"
@@ -67228,6 +68197,16 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "terms": [],
                 "name": "Meadow"
             },
+            "landuse/military": {
+                "geometry": [
+                    "area"
+                ],
+                "tags": {
+                    "landuse": "military"
+                },
+                "terms": [],
+                "name": "Military"
+            },
             "landuse/orchard": {
                 "fields": [
                     "trees"
@@ -67255,6 +68234,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "name": "Quarry"
             },
             "landuse/residential": {
+                "icon": "building",
                 "geometry": [
                     "point",
                     "area"
@@ -67453,7 +68433,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "pitch",
                 "fields": [
                     "sport",
-                    "surface"
+                    "surface",
+                    "lit"
                 ],
                 "geometry": [
                     "point",
@@ -67468,7 +68449,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "leisure/pitch/american_football": {
                 "icon": "america-football",
                 "fields": [
-                    "surface"
+                    "surface",
+                    "lit"
                 ],
                 "geometry": [
                     "point",
@@ -67483,6 +68465,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "leisure/pitch/baseball": {
                 "icon": "baseball",
+                "fields": [
+                    "lit"
+                ],
                 "geometry": [
                     "point",
                     "area"
@@ -67498,7 +68483,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "basketball",
                 "fields": [
                     "surface",
-                    "hoops"
+                    "hoops",
+                    "lit"
                 ],
                 "geometry": [
                     "point",
@@ -67514,7 +68500,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "leisure/pitch/skateboard": {
                 "icon": "pitch",
                 "fields": [
-                    "surface"
+                    "surface",
+                    "lit"
                 ],
                 "geometry": [
                     "point",
@@ -67530,7 +68517,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "leisure/pitch/soccer": {
                 "icon": "soccer",
                 "fields": [
-                    "surface"
+                    "surface",
+                    "lit"
                 ],
                 "geometry": [
                     "point",
@@ -67546,7 +68534,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "leisure/pitch/tennis": {
                 "icon": "tennis",
                 "fields": [
-                    "surface"
+                    "surface",
+                    "lit"
                 ],
                 "geometry": [
                     "point",
@@ -67562,7 +68551,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "leisure/pitch/volleyball": {
                 "icon": "pitch",
                 "fields": [
-                    "surface"
+                    "surface",
+                    "lit"
                 ],
                 "geometry": [
                     "point",
@@ -67601,6 +68591,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "name": "Slipway"
             },
             "leisure/sports_center": {
+                "icon": "pitch",
                 "geometry": [
                     "point",
                     "area"
@@ -67611,10 +68602,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "terms": [
                     "gym"
                 ],
-                "icon": "sports",
-                "name": "Sports Center"
+                "fields": [
+                    "sport"
+                ],
+                "name": "Sports Center / Gym"
             },
             "leisure/stadium": {
+                "icon": "pitch",
                 "geometry": [
                     "point",
                     "area"
@@ -67645,7 +68639,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "leisure/track": {
                 "icon": "pitch",
                 "fields": [
-                    "surface"
+                    "surface",
+                    "lit",
+                    "width"
                 ],
                 "geometry": [
                     "point",
@@ -68571,6 +69567,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "place/city": {
                 "icon": "city",
+                "fields": [
+                    "population"
+                ],
                 "geometry": [
                     "point",
                     "area"
@@ -68582,6 +69581,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "place/hamlet": {
                 "icon": "triangle-stroked",
+                "fields": [
+                    "population"
+                ],
                 "geometry": [
                     "point",
                     "area"
@@ -68623,6 +69625,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "place/locality": {
                 "icon": "marker",
+                "fields": [
+                    "population"
+                ],
                 "geometry": [
                     "point",
                     "area"
@@ -68634,6 +69639,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "place/neighbourhood": {
                 "icon": "triangle-stroked",
+                "fields": [
+                    "population"
+                ],
                 "geometry": [
                     "point",
                     "area"
@@ -68646,8 +69654,29 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "name": "Neighborhood"
             },
+            "place/suburb": {
+                "icon": "triangle-stroked",
+                "fields": [
+                    "population"
+                ],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "tags": {
+                    "place": "suburb"
+                },
+                "terms": [
+                    "Boro",
+                    "Quarter"
+                ],
+                "name": "Borough"
+            },
             "place/town": {
                 "icon": "town",
+                "fields": [
+                    "population"
+                ],
                 "geometry": [
                     "point",
                     "area"
@@ -68659,6 +69688,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "place/village": {
                 "icon": "village",
+                "fields": [
+                    "population"
+                ],
                 "geometry": [
                     "point",
                     "area"
@@ -69268,7 +70300,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "name": "Car Dealership"
             },
             "shop/car_parts": {
-                "icon": "shop",
+                "icon": "car",
                 "fields": [
                     "address",
                     "building_area",
@@ -69285,7 +70317,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "name": "Car Parts Store"
             },
             "shop/car_repair": {
-                "icon": "shop",
+                "icon": "car",
                 "fields": [
                     "address",
                     "building_area",
@@ -69302,7 +70334,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "name": "Car Repair Shop"
             },
             "shop/chemist": {
-                "icon": "shop",
+                "icon": "chemist",
                 "fields": [
                     "address",
                     "building_area",
@@ -69507,7 +70539,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "tags": {
                     "shop": "fishmonger"
                 },
-                "name": "Fishmonger"
+                "name": "Fishmonger",
+                "searchable": false
             },
             "shop/florist": {
                 "icon": "shop",
@@ -69622,7 +70655,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "name": "Greengrocer"
             },
             "shop/hairdresser": {
-                "icon": "shop",
+                "icon": "hairdresser",
                 "fields": [
                     "address",
                     "building_area",
@@ -69778,7 +70811,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "name": "Mall"
             },
             "shop/mobile_phone": {
-                "icon": "shop",
+                "icon": "mobilephone",
                 "fields": [
                     "address",
                     "building_area",
@@ -69795,7 +70828,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "name": "Mobile Phone Store"
             },
             "shop/motorcycle": {
-                "icon": "shop",
+                "icon": "scooter",
                 "fields": [
                     "address",
                     "building_area",
@@ -69913,6 +70946,26 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "name": "Photography Store"
             },
+            "shop/seafood": {
+                "icon": "shop",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "shop": "seafood"
+                },
+                "terms": [
+                    "fishmonger"
+                ],
+                "name": "Seafood Shop"
+            },
             "shop/shoes": {
                 "icon": "shop",
                 "fields": [
@@ -70107,6 +71160,26 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "name": "Video Store"
             },
+            "shop/wine": {
+                "icon": "alcohol-shop",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "shop": "wine"
+                },
+                "terms": [
+                    "winery"
+                ],
+                "name": "Wine Shop"
+            },
             "tourism": {
                 "fields": [
                     "tourism"
@@ -70464,9 +71537,108 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "name": "Restriction",
                 "icon": "restriction",
                 "fields": [
-                    "restriction"
+                    "restriction",
+                    "except"
                 ]
             },
+            "type/restriction/no_left_turn": {
+                "name": "No Left Turn",
+                "geometry": [
+                    "relation"
+                ],
+                "tags": {
+                    "type": "restriction",
+                    "restriction": "no_left_turn"
+                },
+                "fields": [
+                    "except"
+                ],
+                "icon": "restriction-no-left-turn"
+            },
+            "type/restriction/no_right_turn": {
+                "name": "No Right Turn",
+                "geometry": [
+                    "relation"
+                ],
+                "tags": {
+                    "type": "restriction",
+                    "restriction": "no_right_turn"
+                },
+                "fields": [
+                    "except"
+                ],
+                "icon": "restriction-no-right-turn"
+            },
+            "type/restriction/no_straight_on": {
+                "name": "No Straight On",
+                "geometry": [
+                    "relation"
+                ],
+                "tags": {
+                    "type": "restriction",
+                    "restriction": "no_straight_on"
+                },
+                "fields": [
+                    "except"
+                ],
+                "icon": "restriction-no-straight-on"
+            },
+            "type/restriction/no_u_turn": {
+                "name": "No U-turn",
+                "geometry": [
+                    "relation"
+                ],
+                "tags": {
+                    "type": "restriction",
+                    "restriction": "no_u_turn"
+                },
+                "fields": [
+                    "except"
+                ],
+                "icon": "restriction-no-u-turn"
+            },
+            "type/restriction/only_left_turn": {
+                "name": "Left Turn Only",
+                "geometry": [
+                    "relation"
+                ],
+                "tags": {
+                    "type": "restriction",
+                    "restriction": "only_left_turn"
+                },
+                "fields": [
+                    "except"
+                ],
+                "icon": "restriction-only-left-turn"
+            },
+            "type/restriction/only_right_turn": {
+                "name": "Right Turn Only",
+                "geometry": [
+                    "relation"
+                ],
+                "tags": {
+                    "type": "restriction",
+                    "restriction": "only_right_turn"
+                },
+                "fields": [
+                    "except"
+                ],
+                "icon": "restriction-only-right-turn"
+            },
+            "type/restriction/only_straight_on": {
+                "name": "No Turns",
+                "geometry": [
+                    "relation"
+                ],
+                "tags": {
+                    "type": "restriction",
+                    "restriction": "only_straight_on"
+                },
+                "fields": [
+                    "except"
+                ],
+                "icon": "restriction-only-straight-on"
+            },
             "type/route": {
                 "geometry": [
                     "relation"
@@ -70689,6 +71861,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "waterway/canal": {
                 "icon": "waterway-canal",
+                "fields": [
+                    "width"
+                ],
                 "geometry": [
                     "line"
                 ],
@@ -70739,7 +71914,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "waterway/river": {
                 "icon": "waterway-river",
                 "fields": [
-                    "tunnel"
+                    "tunnel",
+                    "width"
                 ],
                 "geometry": [
                     "line"
@@ -70777,8 +71953,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "waterway/stream": {
                 "icon": "waterway-stream",
                 "fields": [
-                    "layer",
-                    "tunnel"
+                    "tunnel",
+                    "width"
                 ],
                 "geometry": [
                     "line"
@@ -71073,25 +72249,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Sainsbury's": {
-                "tags": {
-                    "name": "Sainsbury's",
-                    "amenity": "fuel"
-                },
-                "name": "Sainsbury's",
-                "icon": "fuel",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "address",
-                    "building_area"
-                ],
-                "suggestion": true
-            },
             "amenity/fuel/OMV": {
                 "tags": {
                     "name": "OMV",
@@ -71130,25 +72287,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Tesco": {
-                "tags": {
-                    "name": "Tesco",
-                    "amenity": "fuel"
-                },
-                "name": "Tesco",
-                "icon": "fuel",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "address",
-                    "building_area"
-                ],
-                "suggestion": true
-            },
             "amenity/fuel/JET": {
                 "tags": {
                     "name": "JET",
@@ -71168,25 +72306,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Morrisons": {
-                "tags": {
-                    "name": "Morrisons",
-                    "amenity": "fuel"
-                },
-                "name": "Morrisons",
-                "icon": "fuel",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "address",
-                    "building_area"
-                ],
-                "suggestion": true
-            },
             "amenity/fuel/United": {
                 "tags": {
                     "name": "United",
@@ -71206,25 +72325,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Canadian Tire": {
-                "tags": {
-                    "name": "Canadian Tire",
-                    "amenity": "fuel"
-                },
-                "name": "Canadian Tire",
-                "icon": "fuel",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "address",
-                    "building_area"
-                ],
-                "suggestion": true
-            },
             "amenity/fuel/Mobil": {
                 "tags": {
                     "name": "Mobil",
@@ -71301,25 +72401,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/ABC": {
-                "tags": {
-                    "name": "ABC",
-                    "amenity": "fuel"
-                },
-                "name": "ABC",
-                "icon": "fuel",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "address",
-                    "building_area"
-                ],
-                "suggestion": true
-            },
             "amenity/fuel/ARAL": {
                 "tags": {
                     "name": "ARAL",
@@ -71396,25 +72477,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Intermarché": {
-                "tags": {
-                    "name": "Intermarché",
-                    "amenity": "fuel"
-                },
-                "name": "Intermarché",
-                "icon": "fuel",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "address",
-                    "building_area"
-                ],
-                "suggestion": true
-            },
             "amenity/fuel/Total Access": {
                 "tags": {
                     "name": "Total Access",
@@ -71434,44 +72496,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Super U": {
-                "tags": {
-                    "name": "Super U",
-                    "amenity": "fuel"
-                },
-                "name": "Super U",
-                "icon": "fuel",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "address",
-                    "building_area"
-                ],
-                "suggestion": true
-            },
-            "amenity/fuel/Auchan": {
-                "tags": {
-                    "name": "Auchan",
-                    "amenity": "fuel"
-                },
-                "name": "Auchan",
-                "icon": "fuel",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "address",
-                    "building_area"
-                ],
-                "suggestion": true
-            },
             "amenity/fuel/Elf": {
                 "tags": {
                     "name": "Elf",
@@ -71491,25 +72515,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Carrefour": {
-                "tags": {
-                    "name": "Carrefour",
-                    "amenity": "fuel"
-                },
-                "name": "Carrefour",
-                "icon": "fuel",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "address",
-                    "building_area"
-                ],
-                "suggestion": true
-            },
             "amenity/fuel/Station Service E. Leclerc": {
                 "tags": {
                     "name": "Station Service E. Leclerc",
@@ -71852,25 +72857,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Raiffeisenbank": {
-                "tags": {
-                    "name": "Raiffeisenbank",
-                    "amenity": "fuel"
-                },
-                "name": "Raiffeisenbank",
-                "icon": "fuel",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "address",
-                    "building_area"
-                ],
-                "suggestion": true
-            },
             "amenity/fuel/Tamoil": {
                 "tags": {
                     "name": "Tamoil",
@@ -71966,25 +72952,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Coop": {
-                "tags": {
-                    "name": "Coop",
-                    "amenity": "fuel"
-                },
-                "name": "Coop",
-                "icon": "fuel",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "address",
-                    "building_area"
-                ],
-                "suggestion": true
-            },
             "amenity/fuel/Orlen": {
                 "tags": {
                     "name": "Orlen",
@@ -72194,25 +73161,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/7-Eleven": {
-                "tags": {
-                    "name": "7-Eleven",
-                    "amenity": "fuel"
-                },
-                "name": "7-Eleven",
-                "icon": "fuel",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "address",
-                    "building_area"
-                ],
-                "suggestion": true
-            },
             "amenity/fuel/Agrola": {
                 "tags": {
                     "name": "Agrola",
@@ -73334,25 +74282,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Wawa": {
-                "tags": {
-                    "name": "Wawa",
-                    "amenity": "fuel"
-                },
-                "name": "Wawa",
-                "icon": "fuel",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "address",
-                    "building_area"
-                ],
-                "suggestion": true
-            },
             "amenity/fuel/Pertamina": {
                 "tags": {
                     "name": "Pertamina",
@@ -73848,25 +74777,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Circle K": {
-                "tags": {
-                    "name": "Circle K",
-                    "amenity": "fuel"
-                },
-                "name": "Circle K",
-                "icon": "fuel",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "address",
-                    "building_area"
-                ],
-                "suggestion": true
-            },
             "amenity/fuel/Posto Ipiranga": {
                 "tags": {
                     "name": "Posto Ipiranga",
@@ -74019,25 +74929,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/Stewart's": {
-                "tags": {
-                    "name": "Stewart's",
-                    "amenity": "fuel"
-                },
-                "name": "Stewart's",
-                "icon": "fuel",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "address",
-                    "building_area"
-                ],
-                "suggestion": true
-            },
             "amenity/fuel/Posto BR": {
                 "tags": {
                     "name": "Posto BR",
@@ -74209,25 +75100,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "amenity/fuel/H-E-B": {
-                "tags": {
-                    "name": "H-E-B",
-                    "amenity": "fuel"
-                },
-                "name": "H-E-B",
-                "icon": "fuel",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "address",
-                    "building_area"
-                ],
-                "suggestion": true
-            },
             "amenity/fuel/Укрнафта": {
                 "tags": {
                     "name": "Укрнафта",
@@ -75304,6 +76176,28 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "amenity/fast_food/Subway": {
+                "tags": {
+                    "name": "Subway",
+                    "cuisine": "sandwich",
+                    "amenity": "fast_food"
+                },
+                "name": "Subway",
+                "icon": "fast-food",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "cuisine",
+                    "building_area",
+                    "address",
+                    "opening_hours",
+                    "smoking"
+                ],
+                "suggestion": true
+            },
             "amenity/fast_food/Burger King": {
                 "tags": {
                     "name": "Burger King",
@@ -80011,6 +80905,26 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "amenity/bank/Raiffeisenbank": {
+                "tags": {
+                    "name": "Raiffeisenbank",
+                    "amenity": "bank"
+                },
+                "name": "Raiffeisenbank",
+                "icon": "bank",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "atm",
+                    "building_area",
+                    "address",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
             "amenity/bank/Yorkshire Bank": {
                 "tags": {
                     "name": "Yorkshire Bank",
@@ -85730,26 +86644,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "amenity/pharmacy/Радуга": {
-                "tags": {
-                    "name": "Радуга",
-                    "amenity": "pharmacy"
-                },
-                "name": "Радуга",
-                "icon": "pharmacy",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "building_area",
-                    "address",
-                    "opening_hours"
-                ],
-                "suggestion": true
-            },
             "amenity/pharmacy/サンドラッグ": {
                 "tags": {
                     "name": "サンドラッグ",
@@ -86910,6 +87804,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/supermarket/Morrisons": {
+                "tags": {
+                    "name": "Morrisons",
+                    "shop": "supermarket"
+                },
+                "name": "Morrisons",
+                "icon": "grocery",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
+                    "building_area",
+                    "address"
+                ],
+                "suggestion": true
+            },
             "shop/supermarket/Interspar": {
                 "tags": {
                     "name": "Interspar",
@@ -86948,6 +87861,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/supermarket/Sainsbury's": {
+                "tags": {
+                    "name": "Sainsbury's",
+                    "shop": "supermarket"
+                },
+                "name": "Sainsbury's",
+                "icon": "grocery",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
+                    "building_area",
+                    "address"
+                ],
+                "suggestion": true
+            },
             "shop/supermarket/Lidl": {
                 "tags": {
                     "name": "Lidl",
@@ -87024,6 +87956,44 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/supermarket/Coop": {
+                "tags": {
+                    "name": "Coop",
+                    "shop": "supermarket"
+                },
+                "name": "Coop",
+                "icon": "grocery",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
+                    "building_area",
+                    "address"
+                ],
+                "suggestion": true
+            },
+            "shop/supermarket/Tesco": {
+                "tags": {
+                    "name": "Tesco",
+                    "shop": "supermarket"
+                },
+                "name": "Tesco",
+                "icon": "grocery",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
+                    "building_area",
+                    "address"
+                ],
+                "suggestion": true
+            },
             "shop/supermarket/Woolworths": {
                 "tags": {
                     "name": "Woolworths",
@@ -87366,25 +88336,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Tesco Express": {
-                "tags": {
-                    "name": "Tesco Express",
-                    "shop": "supermarket"
-                },
-                "name": "Tesco Express",
-                "icon": "grocery",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "building_area",
-                    "address"
-                ],
-                "suggestion": true
-            },
             "shop/supermarket/King Soopers": {
                 "tags": {
                     "name": "King Soopers",
@@ -87499,6 +88450,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/supermarket/Carrefour": {
+                "tags": {
+                    "name": "Carrefour",
+                    "shop": "supermarket"
+                },
+                "name": "Carrefour",
+                "icon": "grocery",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
+                    "building_area",
+                    "address"
+                ],
+                "suggestion": true
+            },
             "shop/supermarket/Waitrose": {
                 "tags": {
                     "name": "Waitrose",
@@ -87898,6 +88868,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/supermarket/Super U": {
+                "tags": {
+                    "name": "Super U",
+                    "shop": "supermarket"
+                },
+                "name": "Super U",
+                "icon": "grocery",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
+                    "building_area",
+                    "address"
+                ],
+                "suggestion": true
+            },
             "shop/supermarket/Metro": {
                 "tags": {
                     "name": "Metro",
@@ -88126,25 +89115,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/COOP Jednota": {
-                "tags": {
-                    "name": "COOP Jednota",
-                    "shop": "supermarket"
-                },
-                "name": "COOP Jednota",
-                "icon": "grocery",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "building_area",
-                    "address"
-                ],
-                "suggestion": true
-            },
             "shop/supermarket/Rema 1000": {
                 "tags": {
                     "name": "Rema 1000",
@@ -88772,6 +89742,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/supermarket/Auchan": {
+                "tags": {
+                    "name": "Auchan",
+                    "shop": "supermarket"
+                },
+                "name": "Auchan",
+                "icon": "grocery",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
+                    "building_area",
+                    "address"
+                ],
+                "suggestion": true
+            },
             "shop/supermarket/Mercadona": {
                 "tags": {
                     "name": "Mercadona",
@@ -88924,25 +89913,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Costcutter": {
-                "tags": {
-                    "name": "Costcutter",
-                    "shop": "supermarket"
-                },
-                "name": "Costcutter",
-                "icon": "grocery",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "building_area",
-                    "address"
-                ],
-                "suggestion": true
-            },
             "shop/supermarket/Maxi": {
                 "tags": {
                     "name": "Maxi",
@@ -89000,6 +89970,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/supermarket/Intermarché": {
+                "tags": {
+                    "name": "Intermarché",
+                    "shop": "supermarket"
+                },
+                "name": "Intermarché",
+                "icon": "grocery",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
+                    "building_area",
+                    "address"
+                ],
+                "suggestion": true
+            },
             "shop/supermarket/Delhaize": {
                 "tags": {
                     "name": "Delhaize",
@@ -89171,25 +90160,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/dm": {
-                "tags": {
-                    "name": "dm",
-                    "shop": "supermarket"
-                },
-                "name": "dm",
-                "icon": "grocery",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "building_area",
-                    "address"
-                ],
-                "suggestion": true
-            },
             "shop/supermarket/Kvickly": {
                 "tags": {
                     "name": "Kvickly",
@@ -89437,25 +90407,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Petit Casino": {
-                "tags": {
-                    "name": "Petit Casino",
-                    "shop": "supermarket"
-                },
-                "name": "Petit Casino",
-                "icon": "grocery",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "building_area",
-                    "address"
-                ],
-                "suggestion": true
-            },
             "shop/supermarket/Wasgau": {
                 "tags": {
                     "name": "Wasgau",
@@ -90045,25 +90996,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Fressnapf": {
-                "tags": {
-                    "name": "Fressnapf",
-                    "shop": "supermarket"
-                },
-                "name": "Fressnapf",
-                "icon": "grocery",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "building_area",
-                    "address"
-                ],
-                "suggestion": true
-            },
             "shop/supermarket/Coop Konsum": {
                 "tags": {
                     "name": "Coop Konsum",
@@ -90311,25 +91243,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Centra": {
-                "tags": {
-                    "name": "Centra",
-                    "shop": "supermarket"
-                },
-                "name": "Centra",
-                "icon": "grocery",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "building_area",
-                    "address"
-                ],
-                "suggestion": true
-            },
             "shop/supermarket/Квартал": {
                 "tags": {
                     "name": "Квартал",
@@ -90919,6 +91832,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/supermarket/H-E-B": {
+                "tags": {
+                    "name": "H-E-B",
+                    "shop": "supermarket"
+                },
+                "name": "H-E-B",
+                "icon": "grocery",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "operator",
+                    "building_area",
+                    "address"
+                ],
+                "suggestion": true
+            },
             "shop/supermarket/Атак": {
                 "tags": {
                     "name": "Атак",
@@ -90976,25 +91908,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Lewiatan": {
-                "tags": {
-                    "name": "Lewiatan",
-                    "shop": "supermarket"
-                },
-                "name": "Lewiatan",
-                "icon": "grocery",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "building_area",
-                    "address"
-                ],
-                "suggestion": true
-            },
             "shop/supermarket/Sigma": {
                 "tags": {
                     "name": "Sigma",
@@ -91033,25 +91946,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Społem": {
-                "tags": {
-                    "name": "Społem",
-                    "shop": "supermarket"
-                },
-                "name": "Społem",
-                "icon": "grocery",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "building_area",
-                    "address"
-                ],
-                "suggestion": true
-            },
             "shop/supermarket/Bodega Aurrera": {
                 "tags": {
                     "name": "Bodega Aurrera",
@@ -91128,25 +92022,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/supermarket/Магазин": {
-                "tags": {
-                    "name": "Магазин",
-                    "shop": "supermarket"
-                },
-                "name": "Магазин",
-                "icon": "grocery",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "operator",
-                    "building_area",
-                    "address"
-                ],
-                "suggestion": true
-            },
             "shop/supermarket/Монетка": {
                 "tags": {
                     "name": "Монетка",
@@ -91584,6 +92459,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/convenience/Tesco Express": {
+                "tags": {
+                    "name": "Tesco Express",
+                    "shop": "convenience"
+                },
+                "name": "Tesco Express",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
             "shop/convenience/One Stop": {
                 "tags": {
                     "name": "One Stop",
@@ -91622,6 +92516,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/convenience/7-Eleven": {
+                "tags": {
+                    "name": "7-Eleven",
+                    "shop": "convenience"
+                },
+                "name": "7-Eleven",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
             "shop/convenience/Sale": {
                 "tags": {
                     "name": "Sale",
@@ -91660,6 +92573,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/convenience/COOP Jednota": {
+                "tags": {
+                    "name": "COOP Jednota",
+                    "shop": "convenience"
+                },
+                "name": "COOP Jednota",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
             "shop/convenience/Mac's": {
                 "tags": {
                     "name": "Mac's",
@@ -91736,6 +92668,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/convenience/Costcutter": {
+                "tags": {
+                    "name": "Costcutter",
+                    "shop": "convenience"
+                },
+                "name": "Costcutter",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
             "shop/convenience/Valintatalo": {
                 "tags": {
                     "name": "Valintatalo",
@@ -91755,6 +92706,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/convenience/Circle K": {
+                "tags": {
+                    "name": "Circle K",
+                    "shop": "convenience"
+                },
+                "name": "Circle K",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
             "shop/convenience/セブンイレブン": {
                 "tags": {
                     "name": "セブンイレブン",
@@ -91795,6 +92765,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/convenience/Petit Casino": {
+                "tags": {
+                    "name": "Petit Casino",
+                    "shop": "convenience"
+                },
+                "name": "Petit Casino",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
             "shop/convenience/Mace": {
                 "tags": {
                     "name": "Mace",
@@ -92004,6 +92993,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/convenience/ABC": {
+                "tags": {
+                    "name": "ABC",
+                    "shop": "convenience"
+                },
+                "name": "ABC",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
             "shop/convenience/ミニストップ": {
                 "tags": {
                     "name": "ミニストップ",
@@ -92235,6 +93243,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/convenience/Магазин": {
+                "tags": {
+                    "name": "Магазин",
+                    "shop": "convenience"
+                },
+                "name": "Магазин",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
             "shop/convenience/Гастроном": {
                 "tags": {
                     "name": "Гастроном",
@@ -92273,6 +93300,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/convenience/Centra": {
+                "tags": {
+                    "name": "Centra",
+                    "shop": "convenience"
+                },
+                "name": "Centra",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
             "shop/convenience/サークルK": {
                 "tags": {
                     "name": "サークルK",
@@ -92293,6 +93339,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/convenience/Wawa": {
+                "tags": {
+                    "name": "Wawa",
+                    "shop": "convenience"
+                },
+                "name": "Wawa",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
             "shop/convenience/Proxi": {
                 "tags": {
                     "name": "Proxi",
@@ -92464,6 +93529,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/convenience/Społem": {
+                "tags": {
+                    "name": "Społem",
+                    "shop": "convenience"
+                },
+                "name": "Społem",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
             "shop/convenience/Cumberland Farms": {
                 "tags": {
                     "name": "Cumberland Farms",
@@ -92502,6 +93586,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/convenience/Kiosk": {
+                "tags": {
+                    "name": "Kiosk",
+                    "shop": "convenience"
+                },
+                "name": "Kiosk",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
             "shop/convenience/24 часа": {
                 "tags": {
                     "name": "24 часа",
@@ -92597,6 +93700,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/convenience/Stewart's": {
+                "tags": {
+                    "name": "Stewart's",
+                    "shop": "convenience"
+                },
+                "name": "Stewart's",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
             "shop/convenience/Продукти": {
                 "tags": {
                     "name": "Продукти",
@@ -92635,6 +93757,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/convenience/Радуга": {
+                "tags": {
+                    "name": "Радуга",
+                    "shop": "convenience"
+                },
+                "name": "Радуга",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
             "shop/convenience/ローソンストア100": {
                 "tags": {
                     "name": "ローソンストア100",
@@ -93015,6 +94156,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/convenience/Lewiatan": {
+                "tags": {
+                    "name": "Lewiatan",
+                    "shop": "convenience"
+                },
+                "name": "Lewiatan",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
             "shop/convenience/Продуктовый магазин": {
                 "tags": {
                     "name": "Продуктовый магазин",
@@ -93243,6 +94403,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/convenience/Boutique": {
+                "tags": {
+                    "name": "Boutique",
+                    "shop": "convenience"
+                },
+                "name": "Boutique",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
             "shop/convenience/მარკეტი (Market)": {
                 "tags": {
                     "name": "მარკეტი (Market)",
@@ -93281,13 +94460,32 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/chemist/dm": {
+                "tags": {
+                    "name": "dm",
+                    "shop": "chemist"
+                },
+                "name": "dm",
+                "icon": "chemist",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
             "shop/chemist/Müller": {
                 "tags": {
                     "name": "Müller",
                     "shop": "chemist"
                 },
                 "name": "Müller",
-                "icon": "shop",
+                "icon": "chemist",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93306,7 +94504,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "chemist"
                 },
                 "name": "Schlecker",
-                "icon": "shop",
+                "icon": "chemist",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93325,7 +94523,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "chemist"
                 },
                 "name": "Etos",
-                "icon": "shop",
+                "icon": "chemist",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93344,7 +94542,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "chemist"
                 },
                 "name": "Bipa",
-                "icon": "shop",
+                "icon": "chemist",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93363,7 +94561,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "chemist"
                 },
                 "name": "Rossmann",
-                "icon": "shop",
+                "icon": "chemist",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93382,7 +94580,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "chemist"
                 },
                 "name": "DM Drogeriemarkt",
-                "icon": "shop",
+                "icon": "chemist",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93401,7 +94599,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "chemist"
                 },
                 "name": "Ihr Platz",
-                "icon": "shop",
+                "icon": "chemist",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93420,7 +94618,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "chemist"
                 },
                 "name": "Douglas",
-                "icon": "shop",
+                "icon": "chemist",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93439,26 +94637,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "chemist"
                 },
                 "name": "Kruidvat",
-                "icon": "shop",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
-                ],
-                "suggestion": true
-            },
-            "shop/car_repair/Peugeot": {
-                "tags": {
-                    "name": "Peugeot",
-                    "shop": "car_repair"
-                },
-                "name": "Peugeot",
-                "icon": "shop",
+                "icon": "chemist",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93477,7 +94656,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Kwik Fit",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93496,7 +94675,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "ATU",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93515,7 +94694,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Kwik-Fit",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93534,7 +94713,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Midas",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93553,7 +94732,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Feu Vert",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93572,7 +94751,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Norauto",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93591,45 +94770,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Speedy",
-                "icon": "shop",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
-                ],
-                "suggestion": true
-            },
-            "shop/car_repair/Автозапчасти": {
-                "tags": {
-                    "name": "Автозапчасти",
-                    "shop": "car_repair"
-                },
-                "name": "Автозапчасти",
-                "icon": "shop",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
-                ],
-                "suggestion": true
-            },
-            "shop/car_repair/Renault": {
-                "tags": {
-                    "name": "Renault",
-                    "shop": "car_repair"
-                },
-                "name": "Renault",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93648,7 +94789,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Pit Stop",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93667,7 +94808,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Jiffy Lube",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93686,7 +94827,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Шиномонтаж",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93705,7 +94846,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "СТО",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93724,7 +94865,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "O'Reilly Auto Parts",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93743,7 +94884,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Carglass",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93762,26 +94903,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "шиномонтаж",
-                "icon": "shop",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
-                ],
-                "suggestion": true
-            },
-            "shop/car_repair/Citroen": {
-                "tags": {
-                    "name": "Citroen",
-                    "shop": "car_repair"
-                },
-                "name": "Citroen",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93800,7 +94922,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Euromaster",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93819,7 +94941,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Firestone",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93838,7 +94960,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "AutoZone",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93857,7 +94979,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Автосервис",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93876,7 +94998,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Advance Auto Parts",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -93895,7 +95017,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "car_repair"
                 },
                 "name": "Roady",
-                "icon": "shop",
+                "icon": "car",
                 "geometry": [
                     "point",
                     "vertex",
@@ -94402,6 +95524,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/doityourself/Canadian Tire": {
+                "tags": {
+                    "name": "Canadian Tire",
+                    "shop": "doityourself"
+                },
+                "name": "Canadian Tire",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
             "shop/doityourself/Leroy Merlin": {
                 "tags": {
                     "name": "Leroy Merlin",
@@ -94630,25 +95771,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/doityourself/Хозтовары": {
-                "tags": {
-                    "name": "Хозтовары",
-                    "shop": "doityourself"
-                },
-                "name": "Хозтовары",
-                "icon": "shop",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
-                ],
-                "suggestion": true
-            },
             "shop/doityourself/Стройматериалы": {
                 "tags": {
                     "name": "Стройматериалы",
@@ -94818,6 +95940,42 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/car/Citroen": {
+                "tags": {
+                    "name": "Citroen",
+                    "shop": "car"
+                },
+                "name": "Citroen",
+                "icon": "car",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "address",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "shop/car/Renault": {
+                "tags": {
+                    "name": "Renault",
+                    "shop": "car"
+                },
+                "name": "Renault",
+                "icon": "car",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "address",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
             "shop/car/Mercedes-Benz": {
                 "tags": {
                     "name": "Mercedes-Benz",
@@ -94944,6 +96102,24 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/car/Автозапчасти": {
+                "tags": {
+                    "name": "Автозапчасти",
+                    "shop": "car"
+                },
+                "name": "Автозапчасти",
+                "icon": "car",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "address",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
             "shop/car/Opel": {
                 "tags": {
                     "name": "Opel",
@@ -95052,6 +96228,24 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/car/Peugeot": {
+                "tags": {
+                    "name": "Peugeot",
+                    "shop": "car"
+                },
+                "name": "Peugeot",
+                "icon": "car",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "address",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
             "shop/car/Hyundai": {
                 "tags": {
                     "name": "Hyundai",
@@ -95599,25 +96793,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
-            "shop/clothes/Deichmann": {
-                "tags": {
-                    "name": "Deichmann",
-                    "shop": "clothes"
-                },
-                "name": "Deichmann",
-                "icon": "clothing-store",
-                "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
-                ],
-                "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
-                ],
-                "suggestion": true
-            },
             "shop/clothes/Lindex": {
                 "tags": {
                     "name": "Lindex",
@@ -97898,6 +99073,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/pet/Fressnapf": {
+                "tags": {
+                    "name": "Fressnapf",
+                    "shop": "pet"
+                },
+                "name": "Fressnapf",
+                "icon": "dog-park",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
             "shop/pet/PetSmart": {
                 "tags": {
                     "name": "PetSmart",
@@ -97993,6 +99187,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/shoes/Deichmann": {
+                "tags": {
+                    "name": "Deichmann",
+                    "shop": "shoes"
+                },
+                "name": "Deichmann",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
             "shop/shoes/Reno": {
                 "tags": {
                     "name": "Reno",
@@ -98683,7 +99896,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Билайн",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -98702,7 +99915,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "ソフトバンクショップ (SoftBank shop)",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -98721,7 +99934,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Vodafone",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -98740,7 +99953,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "O2",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -98759,7 +99972,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Carphone Warehouse",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -98778,7 +99991,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Orange",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -98797,7 +100010,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Verizon Wireless",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -98816,7 +100029,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Sprint",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -98835,7 +100048,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "T-Mobile",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -98854,7 +100067,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "МТС",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -98873,7 +100086,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Евросеть",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -98892,7 +100105,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Bell",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -98911,7 +100124,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "The Phone House",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -98930,7 +100143,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "SFR",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -98949,7 +100162,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Связной",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -98968,7 +100181,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Мегафон",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -98987,7 +100200,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "AT&T",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99006,7 +100219,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "ドコモショップ (docomo shop)",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99025,7 +100238,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "au",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99044,7 +100257,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Movistar",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99063,7 +100276,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "mobile_phone"
                 },
                 "name": "Bitė",
-                "icon": "shop",
+                "icon": "mobilephone",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99120,7 +100333,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "hairdresser"
                 },
                 "name": "Klier",
-                "icon": "shop",
+                "icon": "hairdresser",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99139,7 +100352,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "hairdresser"
                 },
                 "name": "Supercuts",
-                "icon": "shop",
+                "icon": "hairdresser",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99158,7 +100371,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "hairdresser"
                 },
                 "name": "Hairkiller",
-                "icon": "shop",
+                "icon": "hairdresser",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99177,7 +100390,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "hairdresser"
                 },
                 "name": "Great Clips",
-                "icon": "shop",
+                "icon": "hairdresser",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99196,7 +100409,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "hairdresser"
                 },
                 "name": "Парикмахерская",
-                "icon": "shop",
+                "icon": "hairdresser",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99215,7 +100428,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "hairdresser"
                 },
                 "name": "Стиль",
-                "icon": "shop",
+                "icon": "hairdresser",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99234,7 +100447,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "hairdresser"
                 },
                 "name": "Fryzjer",
-                "icon": "shop",
+                "icon": "hairdresser",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99253,7 +100466,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "hairdresser"
                 },
                 "name": "Franck Provost",
-                "icon": "shop",
+                "icon": "hairdresser",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99272,7 +100485,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "shop": "hairdresser"
                 },
                 "name": "Салон красоты",
-                "icon": "shop",
+                "icon": "hairdresser",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99304,13 +100517,32 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "suggestion": true
             },
+            "shop/hardware/Хозтовары": {
+                "tags": {
+                    "name": "Хозтовары",
+                    "shop": "hardware"
+                },
+                "name": "Хозтовары",
+                "icon": "shop",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
             "shop/motorcycle/Yamaha": {
                 "tags": {
                     "name": "Yamaha",
                     "shop": "motorcycle"
                 },
                 "name": "Yamaha",
-                "icon": "shop",
+                "icon": "scooter",
                 "geometry": [
                     "point",
                     "vertex",
@@ -99356,7 +100588,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "point"
             ],
             "vertex": [
-                "highway/crossing",
+                "highway/crosswalk",
                 "railway/level_crossing",
                 "highway/traffic_signals",
                 "highway/turning_circle",
@@ -99366,8 +100598,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             ],
             "relation": [
                 "category-route",
+                "category-restriction",
                 "type/boundary",
-                "type/restriction",
                 "type/multipolygon",
                 "relation"
             ]
@@ -99413,7 +100645,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "landuse/farmyard",
                     "landuse/forest",
                     "landuse/meadow",
-                    "landuse/cemetery"
+                    "landuse/cemetery",
+                    "landuse/military"
                 ]
             },
             "category-path": {
@@ -99441,6 +100674,21 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "railway/abandoned"
                 ]
             },
+            "category-restriction": {
+                "geometry": "relation",
+                "name": "Restriction",
+                "icon": "restriction",
+                "members": [
+                    "type/restriction/no_left_turn",
+                    "type/restriction/no_right_turn",
+                    "type/restriction/no_straight_on",
+                    "type/restriction/no_u_turn",
+                    "type/restriction/only_left_turn",
+                    "type/restriction/only_right_turn",
+                    "type/restriction/only_straight_on",
+                    "type/restriction"
+                ]
+            },
             "category-road": {
                 "geometry": "line",
                 "name": "Road",
@@ -99516,6 +100764,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "bicycle",
                     "horse"
                 ],
+                "reference": {
+                    "key": "access"
+                },
                 "type": "access",
                 "label": "Access",
                 "placeholder": "Unknown",
@@ -99574,6 +100825,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "addr:city",
                     "addr:postcode"
                 ],
+                "reference": {
+                    "key": "addr"
+                },
                 "icon": "address",
                 "universal": true,
                 "label": "Address",
@@ -99696,7 +100950,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "building_area": {
                 "key": "building",
-                "type": "check",
+                "type": "defaultcheck",
                 "default": "yes",
                 "geometry": "area",
                 "label": "Building"
@@ -99823,6 +101077,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "type": "typeCombo",
                 "label": "Type"
             },
+            "except": {
+                "key": "except",
+                "type": "combo",
+                "label": "Exceptions"
+            },
             "fax": {
                 "key": "fax",
                 "type": "tel",
@@ -99855,6 +101114,51 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "type": "combo",
                 "label": "Fuel"
             },
+            "fuel/biodiesel": {
+                "key": "fuel:biodiesel",
+                "type": "check",
+                "label": "Sells Biodiesel"
+            },
+            "fuel/diesel": {
+                "key": "fuel:diesel",
+                "type": "check",
+                "label": "Sells Diesel"
+            },
+            "fuel/e10": {
+                "key": "fuel:e10",
+                "type": "check",
+                "label": "Sells E10"
+            },
+            "fuel/e85": {
+                "key": "fuel:e85",
+                "type": "check",
+                "label": "Sells E85"
+            },
+            "fuel/lpg": {
+                "key": "fuel:lpg",
+                "type": "check",
+                "label": "Sells Propane"
+            },
+            "fuel/octane_100": {
+                "key": "fuel:octane_100",
+                "type": "check",
+                "label": "Sells Racing Gasoline"
+            },
+            "fuel/octane_91": {
+                "key": "fuel:octane_91",
+                "type": "check",
+                "label": "Sells Regular Gasoline"
+            },
+            "fuel/octane_95": {
+                "key": "fuel:octane_95",
+                "type": "check",
+                "label": "Sells Midgrade Gasoline"
+            },
+            "fuel/octane_98": {
+                "key": "fuel:octane_98",
+                "type": "check",
+                "label": "Sells Premium Gasoline"
+            },
             "gauge": {
                 "key": "gauge",
                 "type": "combo",
@@ -99965,6 +101269,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "type": "typeCombo",
                 "label": "Type"
             },
+            "length": {
+                "key": "length",
+                "type": "number",
+                "label": "Length (Meters)"
+            },
             "levels": {
                 "key": "building:levels",
                 "type": "number",
@@ -100023,13 +101332,27 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "oneway": {
                 "key": "oneway",
                 "type": "check",
-                "label": "One Way"
+                "label": "One Way",
+                "strings": {
+                    "options": {
+                        "undefined": "Assumed to be No",
+                        "yes": "Yes",
+                        "no": "No"
+                    }
+                }
             },
             "oneway_yes": {
                 "key": "oneway",
                 "type": "check",
                 "default": "yes",
-                "label": "One Way"
+                "label": "One Way",
+                "strings": {
+                    "options": {
+                        "undefined": "Assumed to be Yes",
+                        "yes": "Yes",
+                        "no": "No"
+                    }
+                }
             },
             "opening_hours": {
                 "key": "opening_hours",
@@ -100094,6 +101417,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "type": "typeCombo",
                 "label": "Type"
             },
+            "population": {
+                "key": "population",
+                "type": "text",
+                "label": "Population"
+            },
             "power": {
                 "key": "power",
                 "type": "typeCombo",
@@ -100164,6 +101492,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "type": "combo",
                 "label": "Type"
             },
+            "restrictions": {
+                "type": "restrictions",
+                "geometry": "vertex",
+                "icon": "restrictions",
+                "reference": {
+                    "rtype": "restriction"
+                },
+                "label": "Turn Restrictions"
+            },
             "route": {
                 "key": "route",
                 "type": "combo",
@@ -100220,6 +101557,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "type": "typeCombo",
                 "label": "Type"
             },
+            "sloped_curb": {
+                "key": "sloped_curb",
+                "type": "combo",
+                "label": "Sloped Curb"
+            },
             "smoking": {
                 "key": "smoking",
                 "type": "combo",
@@ -100283,7 +101625,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "bridge",
                     "tunnel",
                     "embankment",
-                    "cutting"
+                    "cutting",
+                    "ford"
                 ],
                 "label": "Structure",
                 "placeholder": "Unknown",
@@ -100292,7 +101635,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                         "bridge": "Bridge",
                         "tunnel": "Tunnel",
                         "embankment": "Embankment",
-                        "cutting": "Cutting"
+                        "cutting": "Cutting",
+                        "ford": "Ford"
                     }
                 }
             },
@@ -100315,6 +101659,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "type": "combo",
                 "label": "Surface"
             },
+            "tactile_paving": {
+                "key": "tactile_paving",
+                "type": "check",
+                "label": "Tactile Paving"
+            },
             "toilets/disposal": {
                 "key": "toilets:disposal",
                 "type": "combo",
@@ -100400,6 +101749,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "universal": true,
                 "label": "Wheelchair Access"
             },
+            "width": {
+                "key": "width",
+                "type": "number",
+                "label": "Width (Meters)"
+            },
             "wikipedia": {
                 "key": "wikipedia",
                 "type": "wikipedia",
@@ -111830,6 +113184,62 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 504
             ]
         },
+        "hairdresser": {
+            "12": [
+                42,
+                528
+            ],
+            "18": [
+                24,
+                528
+            ],
+            "24": [
+                0,
+                528
+            ]
+        },
+        "chemist": {
+            "12": [
+                96,
+                528
+            ],
+            "18": [
+                78,
+                528
+            ],
+            "24": [
+                54,
+                528
+            ]
+        },
+        "mobilephone": {
+            "12": [
+                150,
+                528
+            ],
+            "18": [
+                132,
+                528
+            ],
+            "24": [
+                108,
+                528
+            ]
+        },
+        "scooter": {
+            "12": [
+                204,
+                528
+            ],
+            "18": [
+                186,
+                528
+            ],
+            "24": [
+                162,
+                528
+            ]
+        },
         "highway-motorway": {
             "line": [
                 20,
@@ -112153,6 +113563,48 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 920,
                 25
             ]
+        },
+        "restriction-no-straight-on": {
+            "relation": [
+                980,
+                25
+            ]
+        },
+        "restriction-no-u-turn": {
+            "relation": [
+                1040,
+                25
+            ]
+        },
+        "restriction-no-left-turn": {
+            "relation": [
+                1100,
+                25
+            ]
+        },
+        "restriction-no-right-turn": {
+            "relation": [
+                1160,
+                25
+            ]
+        },
+        "restriction-only-straight-on": {
+            "relation": [
+                1220,
+                25
+            ]
+        },
+        "restriction-only-left-turn": {
+            "relation": [
+                1280,
+                25
+            ]
+        },
+        "restriction-only-right-turn": {
+            "relation": [
+                1340,
+                25
+            ]
         }
     },
     "operations": {
@@ -112251,6 +113703,30 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
         "icon-operation-disabled-continue": [
             220,
             160
+        ],
+        "icon-restriction-yes": [
+            50,
+            80
+        ],
+        "icon-restriction-no": [
+            95,
+            80
+        ],
+        "icon-restriction-only": [
+            140,
+            80
+        ],
+        "icon-restriction-yes-u": [
+            185,
+            80
+        ],
+        "icon-restriction-no-u": [
+            230,
+            80
+        ],
+        "icon-restriction-only-u": [
+            275,
+            80
         ]
     },
     "locales": [
@@ -112308,6 +113784,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
         "sl",
         "es",
         "sv",
+        "tl",
         "ta",
         "te",
         "tr",
@@ -112498,6 +113975,18 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "not_eligible": "Lines can't be split at their beginning or end.",
                 "multiple_ways": "There are too many lines here to split."
+            },
+            "restriction": {
+                "help": {
+                    "select": "Click to select a road segment.",
+                    "toggle": "Click to toggle turn restrictions.",
+                    "toggle_on": "Click to add a \"{restriction}\" restriction.",
+                    "toggle_off": "Click to remove the \"{restriction}\" restriction."
+                },
+                "annotation": {
+                    "create": "Added a turn restriction",
+                    "delete": "Deleted a turn restriction"
+                }
             }
         },
         "undo": {
@@ -112587,7 +114076,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "percent_brightness": "{opacity}% brightness",
             "none": "None",
             "custom": "Custom",
-            "custom_prompt": "Enter a tile template. Valid tokens are {z}, {x}, {y} for Z/X/Y scheme and {u} for quadtile scheme.",
+            "custom_button": "Edit custom background",
+            "custom_prompt": "Enter a tile URL template. Valid tokens are {z}, {x}, {y} for Z/X/Y scheme and {u} for quadtile scheme.",
             "fix_misalignment": "Fix alignment",
             "reset": "reset"
         },
@@ -112731,6 +114221,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "category-rail": {
                     "name": "Rail"
                 },
+                "category-restriction": {
+                    "name": "Restriction"
+                },
                 "category-road": {
                     "name": "Road"
                 },
@@ -112913,6 +114406,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "entrance": {
                     "label": "Type"
                 },
+                "except": {
+                    "label": "Exceptions"
+                },
                 "fax": {
                     "label": "Fax",
                     "placeholder": "+31 42 123 4567"
@@ -112929,6 +114425,33 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fuel": {
                     "label": "Fuel"
                 },
+                "fuel/biodiesel": {
+                    "label": "Sells Biodiesel"
+                },
+                "fuel/diesel": {
+                    "label": "Sells Diesel"
+                },
+                "fuel/e10": {
+                    "label": "Sells E10"
+                },
+                "fuel/e85": {
+                    "label": "Sells E85"
+                },
+                "fuel/lpg": {
+                    "label": "Sells Propane"
+                },
+                "fuel/octane_100": {
+                    "label": "Sells Racing Gasoline"
+                },
+                "fuel/octane_91": {
+                    "label": "Sells Regular Gasoline"
+                },
+                "fuel/octane_95": {
+                    "label": "Sells Midgrade Gasoline"
+                },
+                "fuel/octane_98": {
+                    "label": "Sells Premium Gasoline"
+                },
                 "gauge": {
                     "label": "Gauge"
                 },
@@ -112994,6 +114517,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "leisure": {
                     "label": "Type"
                 },
+                "length": {
+                    "label": "Length (Meters)"
+                },
                 "levels": {
                     "label": "Levels",
                     "placeholder": "2, 4, 6..."
@@ -113028,10 +114554,20 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "label": "Type"
                 },
                 "oneway": {
-                    "label": "One Way"
+                    "label": "One Way",
+                    "options": {
+                        "undefined": "Assumed to be No",
+                        "yes": "Yes",
+                        "no": "No"
+                    }
                 },
                 "oneway_yes": {
-                    "label": "One Way"
+                    "label": "One Way",
+                    "options": {
+                        "undefined": "Assumed to be Yes",
+                        "yes": "Yes",
+                        "no": "No"
+                    }
                 },
                 "opening_hours": {
                     "label": "Hours"
@@ -113065,6 +114601,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "place": {
                     "label": "Type"
                 },
+                "population": {
+                    "label": "Population"
+                },
                 "power": {
                     "label": "Type"
                 },
@@ -113104,6 +114643,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "restriction": {
                     "label": "Type"
                 },
+                "restrictions": {
+                    "label": "Turn Restrictions"
+                },
                 "route": {
                     "label": "Type"
                 },
@@ -113128,6 +114670,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "shop": {
                     "label": "Type"
                 },
+                "sloped_curb": {
+                    "label": "Sloped Curb"
+                },
                 "smoking": {
                     "label": "Smoking"
                 },
@@ -113151,7 +114696,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                         "bridge": "Bridge",
                         "tunnel": "Tunnel",
                         "embankment": "Embankment",
-                        "cutting": "Cutting"
+                        "cutting": "Cutting",
+                        "ford": "Ford"
                     }
                 },
                 "studio_type": {
@@ -113163,6 +114709,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "surface": {
                     "label": "Surface"
                 },
+                "tactile_paving": {
+                    "label": "Tactile Paving"
+                },
                 "toilets/disposal": {
                     "label": "Disposal"
                 },
@@ -113206,6 +114755,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "wheelchair": {
                     "label": "Wheelchair Access"
                 },
+                "width": {
+                    "label": "Width (Meters)"
+                },
                 "wikipedia": {
                     "label": "Wikipedia"
                 },
@@ -113350,6 +114902,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Car Wash",
                     "terms": ""
                 },
+                "amenity/charging_station": {
+                    "name": "Charging Station",
+                    "terms": "EV,Electric Vehicle,Supercharger"
+                },
                 "amenity/childcare": {
                     "name": "Childcare",
                     "terms": "nursery,orphanage,playgroup"
@@ -113370,6 +114926,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "College",
                     "terms": ""
                 },
+                "amenity/compressed_air": {
+                    "name": "Compressed Air",
+                    "terms": ""
+                },
                 "amenity/courthouse": {
                     "name": "Courthouse",
                     "terms": ""
@@ -113382,6 +114942,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Doctor",
                     "terms": "doctor,doctor's office"
                 },
+                "amenity/dojo": {
+                    "name": "Dojo / Martial Arts Academy",
+                    "terms": "martial arts,dojo,dojang"
+                },
                 "amenity/drinking_water": {
                     "name": "Drinking Water",
                     "terms": "water fountain,potable water"
@@ -113434,6 +114998,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Car Parking",
                     "terms": ""
                 },
+                "amenity/parking_entrance": {
+                    "name": "Parking Garage Entrance/Exit",
+                    "terms": ""
+                },
                 "amenity/pharmacy": {
                     "name": "Pharmacy",
                     "terms": ""
@@ -113679,7 +115247,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "terms": ""
                 },
                 "building/entrance": {
-                    "name": "Entrance",
+                    "name": "Entrance/Exit",
                     "terms": ""
                 },
                 "building/garage": {
@@ -113862,9 +115430,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Photographer",
                     "terms": "photographer"
                 },
-                "craft/photographic_labratory": {
-                    "name": "Photographic Labratory",
-                    "terms": "photographic labratory,film developer"
+                "craft/photographic_laboratory": {
+                    "name": "Photographic Laboratory",
+                    "terms": "photographic laboratory,film developer"
                 },
                 "craft/plasterer": {
                     "name": "Plasterer",
@@ -113959,17 +115527,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "terms": ""
                 },
                 "entrance": {
-                    "name": "Entrance",
+                    "name": "Entrance/Exit",
                     "terms": ""
                 },
                 "footway/crossing": {
                     "name": "Crossing",
+                    "terms": ""
+                },
+                "footway/crosswalk": {
+                    "name": "Crosswalk",
                     "terms": "crosswalk,zebra crossing"
                 },
                 "footway/sidewalk": {
                     "name": "Sidewalk",
                     "terms": ""
                 },
+                "ford": {
+                    "name": "Ford",
+                    "terms": ""
+                },
                 "golf/bunker": {
                     "name": "Sand Trap",
                     "terms": "hazard,bunker"
@@ -114016,6 +115592,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "highway/crossing": {
                     "name": "Crossing",
+                    "terms": ""
+                },
+                "highway/crosswalk": {
+                    "name": "Crosswalk",
                     "terms": "crosswalk,zebra crossing"
                 },
                 "highway/cycleway": {
@@ -114039,7 +115619,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "terms": ""
                 },
                 "highway/motorway_junction": {
-                    "name": "Motorway Junction",
+                    "name": "Motorway Junction / Exit",
                     "terms": ""
                 },
                 "highway/motorway_link": {
@@ -114202,6 +115782,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Cemetery",
                     "terms": ""
                 },
+                "landuse/churchyard": {
+                    "name": "Churchyard",
+                    "terms": ""
+                },
                 "landuse/commercial": {
                     "name": "Commercial",
                     "terms": ""
@@ -114242,6 +115826,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Meadow",
                     "terms": ""
                 },
+                "landuse/military": {
+                    "name": "Military",
+                    "terms": ""
+                },
                 "landuse/orchard": {
                     "name": "Orchard",
                     "terms": ""
@@ -114343,7 +115931,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "terms": ""
                 },
                 "leisure/sports_center": {
-                    "name": "Sports Center",
+                    "name": "Sports Center / Gym",
                     "terms": "gym"
                 },
                 "leisure/stadium": {
@@ -114634,6 +116222,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Neighborhood",
                     "terms": "neighbourhood"
                 },
+                "place/suburb": {
+                    "name": "Borough",
+                    "terms": "Boro,Quarter"
+                },
                 "place/town": {
                     "name": "Town",
                     "terms": ""
@@ -114946,6 +116538,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Photography Store",
                     "terms": ""
                 },
+                "shop/seafood": {
+                    "name": "Seafood Shop",
+                    "terms": "fishmonger"
+                },
                 "shop/shoes": {
                     "name": "Shoe Store",
                     "terms": ""
@@ -114986,6 +116582,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Video Store",
                     "terms": ""
                 },
+                "shop/wine": {
+                    "name": "Wine Shop",
+                    "terms": "winery"
+                },
                 "tourism": {
                     "name": "Tourism",
                     "terms": ""
@@ -115070,6 +116670,34 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Restriction",
                     "terms": ""
                 },
+                "type/restriction/no_left_turn": {
+                    "name": "No Left Turn",
+                    "terms": ""
+                },
+                "type/restriction/no_right_turn": {
+                    "name": "No Right Turn",
+                    "terms": ""
+                },
+                "type/restriction/no_straight_on": {
+                    "name": "No Straight On",
+                    "terms": ""
+                },
+                "type/restriction/no_u_turn": {
+                    "name": "No U-turn",
+                    "terms": ""
+                },
+                "type/restriction/only_left_turn": {
+                    "name": "Left Turn Only",
+                    "terms": ""
+                },
+                "type/restriction/only_right_turn": {
+                    "name": "Right Turn Only",
+                    "terms": ""
+                },
+                "type/restriction/only_straight_on": {
+                    "name": "No Turns",
+                    "terms": ""
+                },
                 "type/route": {
                     "name": "Route",
                     "terms": ""
diff --git a/vendor/assets/iD/iD/img/maki-sprite.png b/vendor/assets/iD/iD/img/maki-sprite.png
index af7b5322c..e4028833d 100644
Binary files a/vendor/assets/iD/iD/img/maki-sprite.png and b/vendor/assets/iD/iD/img/maki-sprite.png differ
diff --git a/vendor/assets/iD/iD/img/relation-presets.png b/vendor/assets/iD/iD/img/relation-presets.png
index 00c922b75..47f1d6e30 100644
Binary files a/vendor/assets/iD/iD/img/relation-presets.png and b/vendor/assets/iD/iD/img/relation-presets.png differ
diff --git a/vendor/assets/iD/iD/img/sprite.svg b/vendor/assets/iD/iD/img/sprite.svg
index fc0bbdde5..e6c15a29b 100644
--- a/vendor/assets/iD/iD/img/sprite.svg
+++ b/vendor/assets/iD/iD/img/sprite.svg
@@ -13,7 +13,7 @@
    width="800"
    height="560"
    id="svg12393"
-   inkscape:version="0.48.2 r9819"
+   inkscape:version="0.48.4 r"
    sodipodi:docname="sprite.svg">
   <sodipodi:namedview
      pagecolor="#ffffff"
@@ -28,19 +28,19 @@
      inkscape:window-height="856"
      id="namedview392"
      showgrid="true"
-     inkscape:zoom="5.656854"
-     inkscape:cx="331.17588"
-     inkscape:cy="469.35572"
-     inkscape:window-x="2"
-     inkscape:window-y="0"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="186.53252"
+     inkscape:cy="447.46176"
+     inkscape:window-x="276"
+     inkscape:window-y="71"
      inkscape:window-maximized="0"
-     inkscape:current-layer="layer12"
-     showguides="false"
+     inkscape:current-layer="svg12393"
+     showguides="true"
      inkscape:guide-bbox="true"
      inkscape:snap-global="true"
      inkscape:snap-bbox="true"
      inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-nodes="false">
+     inkscape:snap-nodes="true">
     <inkscape:grid
        type="xygrid"
        id="grid6326"
@@ -48,6 +48,22 @@
        visible="true"
        enabled="true"
        snapvisiblegridlinesonly="true" />
+    <sodipodi:guide
+       position="0,0"
+       orientation="0,800"
+       id="guide4211" />
+    <sodipodi:guide
+       position="800,0"
+       orientation="-560,0"
+       id="guide4213" />
+    <sodipodi:guide
+       position="800,560"
+       orientation="0,-800"
+       id="guide4215" />
+    <sodipodi:guide
+       position="0,560"
+       orientation="560,0"
+       id="guide4217" />
   </sodipodi:namedview>
   <defs
      id="defs12395">
@@ -72,2150 +88,1949 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4677"
+     d="m 309.5,3 -6.5,3 0,1 6.5,3 1,0 6.5,-3 0,-1 -6.5,-3 -1,0 z M 304.09375,9.5 303,10 l 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z m 0,4 L 303,14 l 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z" />
+  <rect
+     style="color:#000000;fill:none;stroke:none;stroke-width:14;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect4259"
+     y="1.0262482e-16"
+     x="0"
+     height="320"
+     width="700" />
   <g
-     transform="translate(-25,3.0624999e-6)"
-     id="layer12"
-     style="display:inline">
+     style="fill:#ffffff;fill-opacity:1"
+     id="g58869"
+     transform="translate(80.03464,-25.104236)">
+    <g
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
+       id="g58871" />
+    <g
+       style="fill:#ffffff;fill-opacity:1"
+       id="g58873" />
+  </g>
+  <g
+     style="fill:#6bc641;fill-opacity:1;display:inline"
+     id="g5460"
+     transform="translate(-346,-101.36218)" />
+  <g
+     style="opacity:0.25;fill:#000000;fill-opacity:1;display:inline"
+     id="g16215"
+     transform="translate(-346,-62.362177)" />
+  <g
+     style="display:inline"
+     id="g16306-5"
+     transform="matrix(-0.70710678,0.70710679,0.70710679,0.70710678,852.1436,-601.56033)" />
+  <g
+     id="g58885"
+     transform="translate(80.03464,-6.1042359)">
+    <g
+       style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
+       id="g58887" />
+    <g
+       id="g58889" />
+  </g>
+  <g
+     style="fill:#ffffff;fill-opacity:1;display:inline"
+     id="g11035"
+     transform="translate(-379,-135)">
+    <g
+       style="fill:#ffffff;fill-opacity:1;display:inline"
+       id="g11037"
+       transform="matrix(0.70710678,0.70710679,-0.70710679,0.70710678,-113.14357,-447.56033)" />
+    <g
+       style="fill:#ffffff;fill-opacity:1;display:inline"
+       id="g11041"
+       transform="matrix(-0.70710678,0.70710679,0.70710679,0.70710678,1293.1436,-447.56033)" />
+  </g>
+  <g
+     style="fill:#1a1a1a;fill-opacity:1;display:inline"
+     id="g9591"
+     transform="translate(480,-653.36218)">
     <path
-       d="m 309.5,3 -6.5,3 0,1 6.5,3 1,0 6.5,-3 0,-1 -6.5,-3 -1,0 z M 304.09375,9.5 303,10 l 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z m 0,4 L 303,14 l 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z"
-       transform="translate(25,-3.0624999e-6)"
-       id="path4677"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <rect
-       width="700"
-       height="320"
-       x="25"
-       y="-3.0624999e-06"
-       id="rect4259"
-       style="color:#000000;fill:none;stroke:none;stroke-width:14;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <g
-       transform="translate(105.03464,-25.104239)"
-       id="g58869"
-       style="fill:#ffffff;fill-opacity:1">
-      <g
-         id="g58871"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" />
-      <g
-         id="g58873"
-         style="fill:#ffffff;fill-opacity:1" />
-    </g>
-    <g
-       transform="translate(-321,-101.36218)"
-       id="g5460"
-       style="fill:#6bc641;fill-opacity:1;display:inline" />
-    <g
-       transform="translate(-321,-62.36218)"
-       id="g16215"
-       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"
-       style="display:inline" />
-    <g
-       transform="translate(105.03464,-6.104239)"
-       id="g58885">
-      <g
-         id="g58887"
-         style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" />
-      <g
-         id="g58889" />
-    </g>
-    <g
-       transform="translate(-354,-135)"
-       id="g11035"
-       style="fill:#ffffff;fill-opacity:1;display:inline">
-      <g
-         transform="matrix(0.70710678,0.70710679,-0.70710679,0.70710678,-113.14357,-447.56033)"
-         id="g11037"
-         style="fill:#ffffff;fill-opacity:1;display:inline" />
-      <g
-         transform="matrix(-0.70710678,0.70710679,0.70710679,0.70710678,1293.1436,-447.56033)"
-         id="g11041"
-         style="fill:#ffffff;fill-opacity:1;display:inline" />
-    </g>
-    <g
-       transform="translate(505,-653.36218)"
-       id="g9591"
-       style="fill:#1a1a1a;fill-opacity:1;display:inline">
-      <path
-         d="m -130.5,603 c -4.14213,0 -7.5,3.35787 -7.5,7.5 0,4.14214 3.35787,7.5 7.5,7.5 4.14213,0 7.5,-3.35786 7.5,-7.5 0,-4.14213 -3.35787,-7.5 -7.5,-7.5 z m 0,1 c 3.58393,0 6.5,2.91607 6.5,6.5 0,3.58393 -2.91607,6.5 -6.5,6.5 -3.58393,0 -6.5,-2.91607 -6.5,-6.5 0,-3.58393 2.91607,-6.5 6.5,-6.5 z"
-         transform="translate(0,52.362183)"
-         id="path9593"
-         style="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"
-         style="fill:#1a1a1a;fill-opacity:1">
-        <rect
-           width="1"
-           height="6"
-           x="-131"
-           y="657.36218"
-           id="rect9597"
-           style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <g
-           id="g9599"
-           style="fill:#1a1a1a;fill-opacity:1">
-          <path
-             d="m -126,609.5 c 0,1.933 -1.567,3.5 -3.5,3.5 l 0,-3.5 z"
-             transform="matrix(1.5714241,0,0,1.5714241,72.999423,-294.92081)"
-             id="path9601"
-             style="opacity:0.2;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -126,615 -4.5,-4.5 0,6.5 z"
-             transform="translate(0,52.362183)"
-             id="path9603"
-             style="opacity:0.1;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -135.99999,662.86218 c 0,3.03756 2.46242,5.49998 5.49999,5.49998 l 0,-5.49998 z"
-             id="path9605"
-             style="opacity:0.4;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -135.99999,662.86216 c 0,-3.03756 2.46242,-5.49998 5.49999,-5.49998 l 0,5.49998 z"
-             id="path9607"
-             style="opacity:0.6;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -130.5,662.86216 -4,4.50002 -2.68804,-4.50002 z"
-             id="path9609"
-             style="opacity:0.1;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -135,658.36218 4.5,4.5 0,-6.5 z"
-             id="path9611"
-             style="opacity:0.1;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-    </g>
-    <path
-       d="m 388,72.362183 0,-2 10,-4 2,0 0,2 -4,10 -2,0 0,-6 z"
-       transform="translate(0,-62.362186)"
-       id="path15565"
-       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"
-       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.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"
-       inkscape:connector-curvature="0" />
-    <g
-       transform="translate(-511.00001,-44)"
-       id="g44379"
-       style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
-      <g
-         transform="matrix(0.64285714,0,0,0.64285714,332.85714,42.142857)"
-         id="g44381"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.55555558;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
-        <path
-           d="m 925.00003,71.333338 c -3.86599,0 -7,3.13401 -7,7 0,1.12542 0.30585,2.16901 0.77778,3.11111 l -5.44445,5.444436 0,3.11111 3.11112,0 5.44444,-5.44444 c 0.94211,0.47192 1.98568,0.77778 3.11111,0.77778 3.86599,0 7,-3.134006 7,-6.999996 0,-3.86599 -3.13401,-7 -7,-7 z m 0,3.11111 c 2.14777,0 3.88889,1.74112 3.88889,3.88889 0,2.14777 -1.74112,3.88889 -3.88889,3.88889 -2.14777,0 -3.88889,-1.74112 -3.88889,-3.88889 0,-2.14777 1.74112,-3.88889 3.88889,-3.88889 z"
-           id="path44383"
-           style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.55555558;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-      <g
-         transform="matrix(0.35714364,0,0,0.35714364,597.14212,77.857044)"
-         id="g44387"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    </g>
-    <g
-       transform="translate(-656,73.637817)"
-       id="g9588-4"
-       style="fill:#ffffff;fill-opacity:1;display:inline">
-      <path
-         d="m 174,3 -1,1 0,4 -4,0 -1,1 0,1 1,1 4,0 0,4 1,1 1,0 1,-1 0,-4 4,0 1,-1 0,-1 -1,-1 -4,0 0,-4 -1,-1 -1,0 z"
-         transform="translate(756,-73.637817)"
-         id="path9584-2"
-         style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <path
-       d="m 290,8 11,0 1,1.00002 0,1 -1,0.99998 -11,0 -1,-1 0,-1 z"
-       id="path9631"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 313.5,3.00001 c -3.03757,0 -5.5,2.46243 -5.5,5.5 0,3.03757 2.46243,5.5 5.5,5.5 1.00612,0 1.93866,-0.27827 2.75,-0.75 l 3.75,3.75 1,0 1,-1 0,-1 -3.75,-3.75 c 0.47173,-0.81134 0.75,-1.74387 0.75,-2.75 0,-3.03757 -2.46243,-5.5 -5.5,-5.5 z m -0.5,2 1,0 2,1 1,2 0,1 -1,2 -2,1 -1,0 -2,-1 -1,-2 0,-1 1,-2 2,-1 z"
-       id="path3048-0-7-5-6"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 354.5,2.9999972 c -1.5,0 -2.5,2 -2.5,3 0,0.666667 0,1.333333 0,2 0,1 1,2.1538468 1,2.1538468 l 0,0.846153 -1.69231,0.384617 c -1.45419,0.330499 -2.02608,1.236079 -2.15384,2.76923 L 349,15.999998 l 12,0 -0.15385,-1.846154 c -0.12776,-1.533151 -0.69965,-2.438731 -2.15384,-2.76923 L 357,10.999997 l 0,-0.846153 c 0,0 1,-1.1538468 1,-2.1538468 0,-0.666667 0,-1.333333 0,-2 0,-1 -1,-3 -2.5,-3 z"
-       id="path54704-4"
+       inkscape:connector-curvature="0"
        style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       id="path9593"
+       transform="translate(0,52.362183)"
+       d="m -130.5,603 c -4.14213,0 -7.5,3.35787 -7.5,7.5 0,4.14214 3.35787,7.5 7.5,7.5 4.14213,0 7.5,-3.35786 7.5,-7.5 0,-4.14213 -3.35787,-7.5 -7.5,-7.5 z m 0,1 c 3.58393,0 6.5,2.91607 6.5,6.5 0,3.58393 -2.91607,6.5 -6.5,6.5 -3.58393,0 -6.5,-2.91607 -6.5,-6.5 0,-3.58393 2.91607,-6.5 6.5,-6.5 z" />
     <g
-       transform="translate(505,-613.36218)"
-       id="g9693"
-       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"
-         inkscape:connector-curvature="0" />
-      <g
-         clip-path="url(#clipPath9141-6)"
-         id="g9697"
-         style="fill:#000000;fill-opacity:1">
-        <rect
-           width="1"
-           height="6"
-           x="-131"
-           y="657.36218"
-           id="rect9699"
-           style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <g
-           id="g9701"
-           style="fill:#000000;fill-opacity:1">
-          <path
-             d="m -126,609.5 c 0,1.933 -1.567,3.5 -3.5,3.5 l 0,-3.5 z"
-             transform="matrix(1.5714241,0,0,1.5714241,72.999423,-294.92081)"
-             id="path9703"
-             style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -126,615 -4.5,-4.5 0,6.5 z"
-             transform="translate(0,52.362183)"
-             id="path9705"
-             style="opacity:0.1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -135.99999,662.86218 c 0,3.03756 2.46242,5.49998 5.49999,5.49998 l 0,-5.49998 z"
-             id="path9707"
-             style="opacity:0.4;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -135.99999,662.86216 c 0,-3.03756 2.46242,-5.49998 5.49999,-5.49998 l 0,5.49998 z"
-             id="path9709"
-             style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -130.5,662.86216 -4,4.50002 -2.68804,-4.50002 z"
-             id="path9711"
-             style="opacity:0.1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -135,658.36218 4.5,4.5 0,-6.5 z"
-             id="path9713"
-             style="opacity:0.1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-    </g>
-    <path
-       d="m 416.5,3.9999947 c -2.48528,0 -4.5,2.0147207 -4.5,4.5 0,0.7234907 0.19662,1.3943635 0.50001,2.0000053 L 409,13.999995 l 0,1.999999 2.00001,0 3.49999,-3.499997 c 0.60565,0.303377 1.27651,0.499995 2,0.499995 2.48528,0 4.5,-2.014712 4.5,-4.4999973 0,-2.4852793 -2.01472,-4.5 -4.5,-4.5 z m 0,1.9999993 c 1.38071,0 2.5,1.1192914 2.5,2.5000007 0,1.3807157 -1.11929,2.5000003 -2.5,2.5000003 -1.38071,0 -2.5,-1.1192846 -2.5,-2.5000003 0,-1.3807093 1.11929,-2.5000007 2.5,-2.5000007 z"
-       id="path47528"
-       style="color:#000000;fill:#1c1c1c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <g
-       transform="translate(-656,113.63782)"
-       id="g47761"
-       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"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="translate(-635,113.63782)"
-       id="g47765"
-       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"
-         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.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.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"
-       style="fill:#ffffff;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="path33297"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <g
-         clip-path="url(#clipPath9141-6)"
-         id="g33299"
-         style="fill:#ffffff;fill-opacity:1">
-        <rect
-           width="1"
-           height="6"
-           x="-131"
-           y="657.36218"
-           id="rect33301"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <g
-           id="g33303"
-           style="fill:#ffffff;fill-opacity:1">
-          <path
-             d="m -126,609.5 c 0,1.933 -1.567,3.5 -3.5,3.5 l 0,-3.5 z"
-             transform="matrix(1.5714241,0,0,1.5714241,72.999423,-294.92081)"
-             id="path33305"
-             style="opacity:0.2;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -126,615 -4.5,-4.5 0,6.5 z"
-             transform="translate(0,52.362183)"
-             id="path33307"
-             style="opacity:0.1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -135.99999,662.86218 c 0,3.03756 2.46242,5.49998 5.49999,5.49998 l 0,-5.49998 z"
-             id="path33309"
-             style="opacity:0.4;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -135.99999,662.86216 c 0,-3.03756 2.46242,-5.49998 5.49999,-5.49998 l 0,5.49998 z"
-             id="path33311"
-             style="opacity:0.6;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -130.5,662.86216 -4,4.50002 -2.68804,-4.50002 z"
-             id="path33313"
-             style="opacity:0.1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m -135,658.36218 4.5,4.5 0,-6.5 z"
-             id="path33315"
-             style="opacity:0.1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-        </g>
-      </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.55555558;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 31,144 -1,1 0,1 1,1 8,0 1,-1 0,-1 -1,-1 z m 0,4 0,7 1,1 6,0 1,-1 0,-7 z m 2,2 1,0 0,4 -1,0 0,-1 z m 3,0 1,0 0,3 0,1 -1,0 z"
-       id="path9820"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 89,145.01282 c -1,0 -2,1 -2,2 l 0,2 3,0 2,1 -2,1 -3,0 0,2 c 0,1 1,2 2,2 l 1,0 c 2,0 2.48722,-0.97443 3,-2 l 1,-2 9,-5 c 0,0 0,-1 -2,-1 L 93.96875,148.91907 93,147.01282 c -0.49406,-0.98812 -1,-2 -3,-2 z m 0,1 2,0 1,2 -4,0 c 0,0 0,-0.66667 0,-1 0,-1.01282 1,-1 1,-1 z m 8.09375,4.71875 -2,1 5.90625,3.28125 c 2,0 2,-1 2,-1 z M 88,152.01282 l 4,0 -1,2 -2,0 c 0,0 -1,0 -1,-1 z"
-       id="path9826"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 55,141 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z"
-       id="path4824"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 189,142 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
-       id="path4822"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 133,145 -4,5 4,5 2,0 0,-1 -3.5,-4 3.5,-4 0,-1 -2,0 z"
-       id="path4820"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 139,145 -4,5 4,5 2,0 0,-1 -3.5,-4 3.5,-4 0,-1 -2,0 z"
-       id="path4818"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 47.84375,146 c -0.77652,0.0669 -1.494002,0.58712 -1.75,1.375 -0.341331,1.05051 0.230742,2.18992 1.28125,2.53125 1.050508,0.34133 2.189919,-0.23074 2.53125,-1.28125 0.341331,-1.05051 -0.230742,-2.18992 -1.28125,-2.53125 -0.262627,-0.0853 -0.52241,-0.11611 -0.78125,-0.0937 z"
-       id="path4816"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 61.78125,146 c -0.132056,0.0149 -0.274936,0.0512 -0.40625,0.0937 -1.050508,0.34133 -1.622581,1.48074 -1.28125,2.53125 0.341331,1.05051 1.480742,1.62258 2.53125,1.28125 1.050508,-0.34133 1.622581,-1.48074 1.28125,-2.53125 -0.298664,-0.91919 -1.20061,-1.47926 -2.125,-1.375 z"
-       id="path4814"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 67,148 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z"
-       id="path4812"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 75,148 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z"
-       id="path4810"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 83,148 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z"
-       id="path4808"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 115,148 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
-       id="path4806"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 155,141 -3,3 1,1 1,0 0,2 2,0 0,-2 1,0 1,-1 -3,-3 z"
-       id="path4861"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 149,147 -3,3 3,3 1,-1 0,-1 2,0 0,-2 -2,0 0,-1 -1,-1 z"
-       id="path4859"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 161,147 -1,1 0,1 -2,0 0,2 2,0 0,1 1,1 3,-3 -3,-3 z"
-       id="path4857"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 155,148 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
-       id="path4855"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 154,153 0,2 -1,0 -1,1 3,3 3,-3 -1,-1 -1,0 0,-2 -2,0 z"
-       id="path4804"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 215,148 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
-       id="path4802"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 189,154 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
-       id="path4800"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 201,154 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
-       id="path4798"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 51.0625,154 c -0.641658,-0.0219 -1.281719,0.25399 -1.6875,0.8125 -0.64925,0.89362 -0.456116,2.16325 0.4375,2.8125 0.893616,0.64925 2.16325,0.45612 2.8125,-0.4375 0.64925,-0.89362 0.456116,-2.16325 -0.4375,-2.8125 -0.335106,-0.24347 -0.740005,-0.36184 -1.125,-0.375 z"
-       id="path4796"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 58.9375,154 c -0.384995,0.0132 -0.789894,0.13153 -1.125,0.375 -0.893615,0.64925 -1.08675,1.91888 -0.4375,2.8125 0.64925,0.89362 1.918885,1.08675 2.8125,0.4375 0.893615,-0.64925 1.08675,-1.91888 0.4375,-2.8125 -0.405781,-0.55851 -1.045842,-0.83443 -1.6875,-0.8125 z"
-       id="path9830"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 52.03125,142.60657 c -1.32908,0.53118 -2.444369,1.41916 -3.3125,2.53125 0.07092,0.0184 0.149734,0.009 0.21875,0.0312 0.520689,0.16918 0.941853,0.48986 1.28125,0.875 0.583365,-0.69731 1.320919,-1.23792 2.15625,-1.625 -0.228003,-0.42194 -0.375,-0.89709 -0.375,-1.4062 0,-0.14028 0.0122,-0.27085 0.03125,-0.40625 z m 5.9375,0 C 57.9878,142.74197 58,142.87254 58,143.01282 c 0,0.50911 -0.146997,0.98426 -0.375,1.40625 0.835331,0.38708 1.572885,0.92769 2.15625,1.625 0.339397,-0.38514 0.760561,-0.70582 1.28125,-0.875 0.06748,-0.0219 0.146303,-0.0395 0.21875,-0.0625 -0.866395,-1.10291 -1.991152,-1.97191 -3.3125,-2.5 z m -10.9375,8.21875 c 0.132811,1.35398 0.618313,2.61506 1.34375,3.6875 0.05422,-0.0956 0.121594,-0.19054 0.1875,-0.28125 0.298579,-0.41096 0.689964,-0.72255 1.125,-0.9375 -0.439267,-0.72096 -0.728373,-1.5606 -0.84375,-2.4375 -0.563589,0.16464 -1.184566,0.16262 -1.78125,-0.0312 -0.009,-0.003 -0.02228,0.003 -0.03125,0 z m 15.90625,0 c -0.596684,0.19387 -1.217661,0.19589 -1.78125,0.0312 -0.115377,0.8769 -0.404483,1.71654 -0.84375,2.4375 0.438042,0.20421 0.821177,0.51932 1.125,0.9375 0.06591,0.0907 0.133279,0.18566 0.1875,0.28125 0.725438,-1.07244 1.210939,-2.33352 1.34375,-3.6875 -0.009,0.003 -0.02224,-0.003 -0.03125,0 z M 54,156.16907 c -0.03014,0.55835 -0.21394,1.114 -0.5625,1.59375 -0.027,0.0372 -0.06534,0.0582 -0.09375,0.0937 0.540476,0.11583 1.081942,0.1875 1.65625,0.1875 0.574308,0 1.115774,-0.0717 1.65625,-0.1875 -0.02841,-0.0355 -0.06675,-0.0566 -0.09375,-0.0937 -0.34856,-0.47975 -0.532362,-1.0354 -0.5625,-1.59375 -0.329444,0.0535 -0.654988,0.0937 -1,0.0937 -0.345012,0 -0.670556,-0.0403 -1,-0.0937 z"
-       id="path9840"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#7092ff;fill-opacity:1;stroke:none;stroke-width:0.50000125;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 109,146.01282 -4,4 4,4 1,-1 0,-2 2.1875,0 c -0.11352,-0.31647 -0.1875,-0.64447 -0.1875,-1 0,-0.34518 0.0802,-0.69136 0.1875,-1 l -2.1875,0 0,-2 -1,-1 z m 12,0 -1,1 0,2 -2.1875,0 c 0.10728,0.30864 0.1875,0.65482 0.1875,1 0,0.35553 -0.074,0.68353 -0.1875,1 l 2.1875,0 0,2 1,1 4,-4 -4,-4 z"
-       id="path9854"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 174,143 -1,1 0,4 -4,0 -1,1 0,2 1,1 4,0 0,4 1,1 2,0 1,-1 0,-4 4,0 1,-1 0,-2 -1,-1 -4,0 0,-4 -1,-1 z"
-       id="path5624-8"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 231,44.999999 -1,1 0,1 3,3 -3,3 0,1 1,1 1,0 3,-3 3,3 1,0 1,-1 0,-1 -3,-3 3,-3 0,-1 -1,-1 -1,0 -3,3 -3,-3 z"
-       id="path11047"
-       style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 190,140 -1,1 0,1.0625 c -3.94444,0.49381 -7,3.85922 -7,7.9375 0,4.41827 3.58173,8 8,8 4.41827,0 8,-3.58173 8,-8 0,-2.46731 -1.11852,-4.65856 -2.875,-6.125 l -1.40625,1.40625 C 195.11409,146.37996 196,148.08592 196,150 c 0,3.3137 -2.6863,6 -6,6 -3.3137,0 -6,-2.6863 -6,-6 0,-2.97561 2.15859,-5.43327 5,-5.90625 l 0,0.90625 1,1 3,-3 -3,-3 z"
-       transform="translate(25,-3.0625001e-6)"
-       id="path6502"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 233,142 c -1.33333,0 -2.21875,0.78125 -2.71875,1.28125 -0.5,0.5 -0.61458,0.71875 -1.28125,0.71875 l -1,0 0,2 1,0 c 1.33333,0 2.21875,-0.78125 2.71875,-1.28125 0.5,-0.5 0.61458,-0.71875 1.28125,-0.71875 0.16667,0 0.20569,0.009 0.40625,0.25 0.20056,0.24067 0.4375,0.6875 0.6875,1.1875 0.25,0.5 0.51306,1.05317 0.9375,1.5625 0.42444,0.50933 1.13542,1 1.96875,1 1.33333,0 2.21875,-0.78125 2.71875,-1.28125 0.5,-0.5 0.61458,-0.71875 1.28125,-0.71875 l 1,0 0,-2 -1,0 c -1.33333,0 -2.21875,0.78125 -2.71875,1.28125 -0.5,0.5 -0.61458,0.71875 -1.28125,0.71875 -0.16667,0 -0.20569,-0.009 -0.40625,-0.25 -0.20056,-0.24067 -0.4375,-0.6875 -0.6875,-1.1875 -0.25,-0.5 -0.51306,-1.05317 -0.9375,-1.5625 -0.42444,-0.50933 -1.13542,-1 -1.96875,-1 z"
-       id="path6699"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#222222;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 228,156 0,2 14,0 0,-2 -14,0 z"
-       id="path7209"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#222222;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 450,9.999997 8,7 1,-1 0,-12.0000001 -1,-1 z"
-       id="path25361-5"
-       style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 49,205 -1,1 0,9 1,1 12,0 1,-1 0,-9 -1,-1 z m 1,3 5,2.8125 5,-2.8125 0,1.5 -5,3 -5,-3 z"
-       id="rect6778"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 71,203 -1,1 0,12 1,1 8,0 1,-1 0,-12 -1,-1 -8,0 z m 1,2 6,0 0,5 -6,0 0,-5 z m 0,7 6,0 0,1 -6,0 0,-1 z m 0,2 6,0 0,1 -6,0 0,-1 z"
-       id="rect6788"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 65,204 -1,1 0,8 -2,2 1,1 14,0 1,-1 -2,-2 0,-8 -1,-1 -10,0 z m 1,2 8,0 0,5 -8,0 0,-5 z"
-       transform="translate(25,-3.4453126e-6)"
-       id="rect6808"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 90,202 -5,4 1,1 2,0 0,2 4,0 0,-2 2,0 1,-1 z m -2,9 0,2 -2,0 -1,1 5,4 5,-4 -1,-1 -2,0 0,-2 z"
-       transform="translate(25,-3.4453126e-6)"
-       id="path16625-6"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 127.5,205 -1,1 5,10 1.21875,0 2.28125,-3.9375 2.28125,3.9375 1.21875,0 5,-10 -1,-1 -1,0 -3.5,7.5 -1.5,-2.5 2,-4 -0.5,-1 -1.5,0 -1.5,3.5 -1.5,-3.5 -1.5,0 -0.5,1 2,4 -1.5,2.5 -3.5,-7.5 z"
-       id="path6899"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 10,202 c -4.418278,0 -8,3.58172 -8,8 0,4.41828 3.581722,8 8,8 4.418278,0 8,-3.58172 8,-8 0,-4.41828 -3.581722,-8 -8,-8 z m 0,2 c 3.313708,0 6,2.68629 6,6 0,3.31371 -2.686292,6 -6,6 -3.3137085,0 -6,-2.68629 -6,-6 0,-3.31371 2.6862915,-6 6,-6 z"
-       transform="translate(25,-3.4453126e-6)"
-       id="path6918"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 11,207 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
-       transform="matrix(2,0,0,2,15,-207)"
-       id="path6922"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 8,211 1,-1 2,0 1,1 0,3 -4,0 z"
-       transform="translate(25,-3.4453126e-6)"
-       id="rect6926"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 125,204 -1,1 0,11 1,1 8,0 3,-3 0,-9 -1,-1 -10,0 z m 5,2 c 0.55228,0 1,0.44772 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m -4,4 8,0 0,1 -8,0 0,-1 z m 0,2 8,0 0,1 -8,0 0,-1 z m 0,2 5,0 0,1 -5,0 0,-1 z"
-       transform="translate(25,-3.4453126e-6)"
-       id="rect4678"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="M 171.0625,208.40625 C 169.26792,209.16529 168,210.92893 168,213 c 0,2.76142 2.23858,5 5,5 1.99494,0 3.69772,-1.18524 4.5,-2.875 l -0.65625,-1.125 -1.03125,0 c -0.41551,1.15835 -1.51118,2 -2.8125,2 -1.65685,0 -3,-1.34315 -3,-3 0,-0.88447 0.39109,-1.66968 1,-2.21875 L 171,209 c 0,-0.20559 0.0222,-0.39929 0.0625,-0.59375 z"
-       id="path3226"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 174,202 c -1.10456,0 -2,0.89544 -2,2 0,1.10456 0.89544,2 2,2 1.10456,0 2,-0.89544 2,-2 0,-1.10456 -0.89544,-2 -2,-2 z m 0,5 c -1.108,0 -2,0.892 -2,2 l 0,2 c 0,1.108 0.892,2 2,2 l 3.5,0 1.6875,2.90625 c 0.26893,0.4628 0.8482,0.64134 1.3125,0.375 l 0.0312,0 c 0.4643,-0.26634 0.61268,-0.88095 0.34375,-1.34375 l -2.03125,-3.46875 c -0.0158,-0.0271 -0.0446,-0.0375 -0.0625,-0.0625 -0.0468,-0.0617 -0.0966,-0.10697 -0.15625,-0.15625 -0.0773,-0.0673 -0.15761,-0.11687 -0.25,-0.15625 -0.1049,-0.0447 -0.19835,-0.0878 -0.3125,-0.0937 -0.0224,-10e-4 -0.04,-4e-4 -0.0625,0 l -0.0937,0 -1.90625,0 0,-2 c 0,-1.108 -0.892,-2 -2,-2 z"
-       id="path4691-9"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <rect
-       width="38"
-       height="38"
-       rx="0"
-       ry="0"
-       x="28.5"
-       y="83.499992"
-       id="rect19454"
-       style="color:#000000;fill:#e06d5f;fill-opacity:0.15686275;stroke:#e06d5f;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       width="38.000004"
-       height="38.000004"
-       rx="0"
-       ry="0"
-       x="88.5"
-       y="83.499992"
-       id="rect20224"
-       style="color:#000000;fill:#77d3de;fill-opacity:0.19215686;stroke:#77d3de;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       width="38.000004"
-       height="38.000004"
-       rx="0"
-       ry="0"
-       x="148.5"
-       y="83.499992"
-       id="rect20237"
-       style="color:#000000;fill:#8cd05f;fill-opacity:0.15686275;stroke:#8cd05f;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       width="38.000004"
-       height="38.000004"
-       rx="0"
-       ry="0"
-       x="208.5"
-       y="83.499992"
-       id="rect20239"
-       style="color:#000000;fill:#aaaaaa;fill-opacity:0.15686275;stroke:#aaaaaa;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <g
-       transform="translate(326,239.63781)"
-       id="g20251-9">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20247-4">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-410.98649,14.371188)"
-           id="path20243-7"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-381.41891,-22.917117)"
-           id="path20245-0"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(326,200.63781)"
-       id="g20283">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20285">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-410.98649,15.371188)"
-           id="path20287"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-381.41891,-21.917117)"
-           id="path20289"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(365,239.63781)"
-       id="g20299">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20301">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-411.98649,14.371188)"
-           id="path20303"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-382.41891,-22.917117)"
-           id="path20305"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(365,200.63781)"
-       id="g20307">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20309">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-411.98649,15.371188)"
-           id="path20311"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-382.41891,-21.917117)"
-           id="path20313"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(386,239.63781)"
-       id="g20315">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20317">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-410.98649,14.371188)"
-           id="path20319"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-381.41891,-22.917117)"
-           id="path20321"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(386,200.63781)"
-       id="g20323">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20325">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-410.98649,15.371188)"
-           id="path20327"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-381.41891,-21.917117)"
-           id="path20329"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(425,239.63781)"
-       id="g20331">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20333">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-411.98649,14.371188)"
-           id="path20335"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-382.41891,-22.917117)"
-           id="path20337"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(425,200.63781)"
-       id="g20339">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20341">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-411.98649,15.371188)"
-           id="path20343"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-382.41891,-21.917117)"
-           id="path20345"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(446,239.63781)"
-       id="g20347">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20349">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-410.98649,14.371188)"
-           id="path20351"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-381.41891,-22.917117)"
-           id="path20353"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(446,200.63781)"
-       id="g20355">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20357">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-410.98649,15.371188)"
-           id="path20359"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-381.41891,-21.917117)"
-           id="path20361"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(485,239.63781)"
-       id="g20363">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20365">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-411.98649,14.371188)"
-           id="path20367"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-382.41891,-22.917117)"
-           id="path20369"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(485,200.63781)"
-       id="g20371">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20373">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-411.98649,15.371188)"
-           id="path20375"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-382.41891,-21.917117)"
-           id="path20377"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(506,239.63781)"
-       id="g20379">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20381">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-410.98649,14.371188)"
-           id="path20383"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-381.41891,-22.917117)"
-           id="path20385"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(506,200.63781)"
-       id="g20387">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20389">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-410.98649,15.371188)"
-           id="path20391"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-381.41891,-21.917117)"
-           id="path20393"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(545,239.63781)"
-       id="g20395">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20397">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-411.98649,14.371188)"
-           id="path20399"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-382.41891,-22.917117)"
-           id="path20401"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(545,200.63781)"
-       id="g20403">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g20405">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-411.98649,15.371188)"
-           id="path20407"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-382.41891,-21.917117)"
-           id="path20409"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <path
-       d="m 479,9.999997 -8,7 -1,-1 0,-12.0000001 1,-1 z"
-       id="path4065"
-       style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <rect
-       width="38.000004"
-       height="38.000004"
-       rx="0"
-       ry="0"
-       x="268.5"
-       y="83.499992"
-       id="rect7068"
-       style="opacity:0.15;color:#000000;fill:#000000;fill-opacity:0.15686275;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <g
-       transform="translate(566,239.63781)"
-       id="g7070">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g7072">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-410.98649,14.371188)"
-           id="path7074"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-381.41891,-22.917117)"
-           id="path7076"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(566,200.63781)"
-       id="g7078">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g7080">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-410.98649,15.371188)"
-           id="path7082"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-381.41891,-21.917117)"
-           id="path7084"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(605,239.63781)"
-       id="g7086">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g7088">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-411.98649,14.371188)"
-           id="path7090"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-382.41891,-22.917117)"
-           id="path7092"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="translate(605,200.63781)"
-       id="g7094">
-      <g
-         transform="translate(10.000004,-1.9999957)"
-         id="g7096">
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(1.009009,0,0,1.009009,-411.98649,15.371188)"
-           id="path7098"
-           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z"
-           transform="matrix(0.72072059,0,0,0.72072059,-382.41891,-21.917117)"
-           id="path7100"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="matrix(0.390625,0,0,0.390625,867.1875,238.60852)"
-       id="g4611">
+       style="fill:#1a1a1a;fill-opacity:1"
+       id="g9595"
+       clip-path="url(#clipPath9141-6)">
       <rect
-         width="256"
-         height="256"
-         x="-2156"
-         y="-47.637821"
-         id="rect4565"
-         style="color:#000000;fill:none;stroke:none;stroke-width:34;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect9597"
+         y="657.36218"
+         x="-131"
+         height="6"
+         width="1" />
       <g
-         transform="translate(-781,47)"
-         id="g4494">
-        <path
-           d="m 3.90625,224.6875 7.8125,20.5 -7.8125,20.5 7.8125,20.53125 -7.8125,20.5 4.8125,1.84375 L 34.75,282.5 l 4.6875,0.71875 5.6875,-5.6875 c -3.349219,-3.88012 -5.88,-8.51217 -7.25,-13.625 L 40.5625,261.75 c -0.457539,-2.1233 -0.71875,-4.33618 -0.71875,-6.59375 0,-11.27802 6.012891,-21.19153 15,-26.6875 L 44.9375,224.6875 24.40625,232.5 l -20.5,-7.8125 z M 71,229 c -14.359404,0 -26,11.6406 -26,26 0,14.3594 11.640596,26 26,26 14.359404,0 26,-11.6406 26,-26 0,-14.3594 -11.640596,-26 -26,-26 z m 20.0625,50.15625 c -5.42082,4.51861 -12.380625,7.25 -19.96875,7.25 -2.257578,0 -4.47043,-0.26122 -6.59375,-0.71875 l -2.15625,2.65625 c -4.855312,-1.30096 -9.306172,-3.58895 -13.0625,-6.6875 l -5.875,5.875 0.71875,4.34375 -21.8125,21.84375 2.09375,0.8125 20.53125,-7.8125 20.5,7.8125 20.5,-7.8125 7.8125,-20.5 -2.6875,-7.0625 z"
-           transform="matrix(2.56,0,0,2.56,-1375,-657.83782)"
-           id="path6718"
-           style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="matrix(0.5,0,0,0.5,-317.5001,125.49999)"
-       id="g8629">
-      <rect
-         width="100.00001"
-         height="100.00001"
-         x="935"
-         y="238.99998"
-         id="rect8627"
-         style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         d="m 1035,259.46976 c -3.679,1.6066 -7.6336,2.69227 -11.7831,3.18013 4.2351,-2.49939 7.4885,-6.45736 9.0205,-11.17402 -3.9645,2.31516 -8.3552,3.99577 -13.0286,4.90089 -3.7418,-3.92491 -9.0738,-6.37759 -14.9751,-6.37759 -11.33021,0 -20.51679,9.04283 -20.51679,20.19639 0,1.58324 0.18008,3.12476 0.53217,4.60303 -17.05108,-0.8424 -32.16868,-8.88327 -42.28747,-21.10256 -1.76581,2.98278 -2.77795,6.45238 -2.77795,10.15396 0,7.00715 3.62183,13.1887 9.12688,16.81077 -3.36304,-0.1076 -6.52651,-1.01351 -9.29247,-2.52616 -0.002,0.084 -0.002,0.16796 -0.002,0.25194 0,9.78524 7.07195,17.94866 16.45764,19.80431 -1.72156,0.46135 -3.53416,0.70856 -5.40515,0.70856 -1.32202,0 -2.60724,-0.12596 -3.85969,-0.36215 2.61039,8.02355 10.18701,13.86315 19.16488,14.02559 -7.02158,5.41762 -15.8675,8.64629 -25.48033,8.64629 -1.65593,0 -3.28903,-0.0945 -4.89377,-0.28289 9.07933,5.73043 19.86348,9.07458 31.44972,9.07458 37.73703,0 58.37353,-30.77522 58.37353,-57.46492 0,-0.87573 -0.037,-1.74674 -0.063,-2.61276 4.0095,-2.84789 7.4872,-6.40461 10.238,-10.45497"
-         id="path5047-4-7"
-         style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="translate(0,50)"
-       id="g3815"
-       style="fill:#1a1a1a;fill-opacity:1">
-      <path
-         d="m 464,2 -1,1 0,13 1,1 11,0 1,-1 0,-10 -4,0 0,6 -2.5,-1.5 -2.5,1.5 0,-6 -2,0 0,-1 0,-1 11,0 0,-1 0,-1 -12,0 z"
-         transform="translate(25,-50.000003)"
-         id="path3648"
-         style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="translate(0,70)"
-       id="g3822">
-      <path
-         d="m 464,2 -1,1 0,13 1,1 11,0 1,-1 0,-10 -4,0 0,6 -2.5,-1.5 -2.5,1.5 0,-6 -2,0 0,-1 0,-1 11,0 0,-1 0,-1 -12,0 z"
-         transform="translate(25,-50.000003)"
-         id="path3824"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="translate(-1,0)"
-       id="g3837" />
-    <g
-       transform="translate(0,20)"
-       id="g3842"
-       style="fill:#ffffff" />
-    <rect
-       width="100"
-       height="100"
-       x="225"
-       y="220"
-       id="rect6623-9"
-       style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <g
-       transform="translate(575,-25.000003)"
-       id="g7459-3"
-       style="display:inline">
-      <path
-         d="m -145,255 c 0,24.88542 0,49.77083 0,74.65625 7.5,3.44792 15,6.89583 22.5,10.34375 7.5,-3.33333 15,-6.66667 22.5,-10 7.5,3.33333 15,6.66667 22.5,10 7.5,-3.44792 15,-6.89583 22.5,-10.34375 0,-24.88542 0,-49.77083 0,-74.65625 -7.5,3.33333 -15,6.66667 -22.5,10 -7.5,-3.33333 -15,-6.66667 -22.5,-10 -7.5,3.33333 -15,6.66667 -22.5,10 -7.5,-3.33333 -15,-6.66667 -22.5,-10 z m 57.40625,23.59375 5.59375,5.59375 5.59375,-5.59375 2.46236,3.16264 -5.24361,5.24361 5.59375,5.59375 -3.16264,2.46236 L -82,289.8125 l -5.59375,5.59375 -3.08736,-2.97514 5.86861,-5.43111 -5.59375,-5.59375 z m -25.1875,12.3125 c 3.02949,0.26492 6.03959,1.32487 8.375,3.31225 l -2.90625,2.78125 c -1.69778,-1.26665 -3.7758,-1.93771 -5.87485,-2.1247 0.13531,-1.3229 0.27106,-2.64608 0.4061,-3.9688 z m -4.84375,0.375 c 0.23428,1.25604 1.33288,2.86593 1.28125,3.81245 -1.9797,1.00126 -3.28203,2.99612 -4.4062,4.74985 l -3.14878,-2.51673 c 1.59525,-2.42637 3.50946,-4.89188 6.27373,-6.04557 z m 33.46875,6.28125 3.6875,1.59375 c -0.85495,2.6344 -2.05943,5.19957 -3.8749,7.3124 l -2.78125,-2.90625 c 1.37974,-1.77526 2.31524,-3.85778 2.96865,-5.9999 z m -17.21875,0.0937 c 1.52998,2.21288 2.46049,4.7627 3.84365,7.06245 l -3.59375,1.78125 c -1.26185,-2.16828 -2.15272,-4.55761 -3.5936,-6.6249 1.11453,-0.7396 2.22935,-1.47918 3.3437,-2.2188 z m -24.75,3.8125 3.4375,2.03125 c -0.94627,2.15394 -1.82847,4.38347 -2.53105,6.59365 l -3.66832,-1.66122 c 0.79087,-2.367 1.68957,-4.70832 2.76187,-6.96368 z m 36.25,4.625 1.60017,3.68116 c -2.71921,1.52252 -6.25719,2.08348 -9.13142,0.66264 l 2.16859,-3.41112 c 1.76867,0.54341 3.84526,0.007 5.36266,-0.93268 z"
-         id="path6625-8"
-         style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <rect
-       width="100"
-       height="100"
-       x="325"
-       y="220"
-       id="rect6623-9-2"
-       style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="m 592.5314,229 c -8.2842,0 -15,6.71574 -15,15 0,8.28429 15,21 15,21 0,0 15,-12.71571 15,-21 0,-8.28426 -6.7158,-15 -15,-15 z M 593,238 c 3.3138,0 6,2.68629 6,6 0,3.31371 -2.6862,6 -6,6 -3.3135,0 -6,-2.68629 -6,-6 0,-3.31371 2.6865,-6 6,-6 z"
-       id="path8139-4-6-3"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 608.5,266 c -4.14214,0 -7.5,3.35786 -7.5,7.5 0,0.75557 0.13591,1.46849 0.34375,2.15625 l -18.6875,18.6875 C 581.96849,294.13591 581.25557,294 580.5,294 c -4.14214,0 -7.5,3.35786 -7.5,7.5 0,4.14214 3.35786,7.5 7.5,7.5 4.14214,0 7.5,-3.35786 7.5,-7.5 0,-0.75557 -0.13591,-1.46849 -0.34375,-2.15625 l 18.6875,-18.6875 C 607.03151,280.86409 607.74443,281 608.5,281 c 4.14214,0 7.5,-3.35786 7.5,-7.5 0,-4.14214 -3.35786,-7.5 -7.5,-7.5 z m 0,4.5 c 1.65685,0 3,1.34315 3,3 0,1.65685 -1.34315,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65685 1.34315,-3 3,-3 z m -28,28 c 1.65685,0 3,1.34315 3,3 0,1.65685 -1.34315,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65685 1.34315,-3 3,-3 z"
-       id="path5387-6-5"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 541.5,251 c -4.14214,0 -7.5,3.35786 -7.5,7.5 0,2.8726 1.62846,5.3652 4,6.625 l 0,13.75 c -2.37154,1.2598 -4,3.7524 -4,6.625 0,4.14214 3.35786,7.5 7.5,7.5 2.8726,0 5.3652,-1.62846 6.625,-4 l 13.75,0 c 1.2598,2.37154 3.7524,4 6.625,4 4.14214,0 7.5,-3.35786 7.5,-7.5 0,-2.8726 -1.62846,-5.3652 -4,-6.625 l 0,-13.75 c 2.37154,-1.2598 4,-3.7524 4,-6.625 0,-4.14214 -3.35786,-7.5 -7.5,-7.5 -2.90753,0 -5.41167,1.67488 -6.65625,4.09375 L 561.65625,255 548.125,255 c -1.2598,-2.37154 -3.7524,-4 -6.625,-4 z m 0,4.5 c 1.65685,0 3,1.34315 3,3 0,1.65685 -1.34315,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65685 1.34315,-3 3,-3 z m 27,0 c 1.65685,0 3,1.34315 3,3 0,1.65685 -1.34315,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65685 1.34315,-3 3,-3 z m -20.375,6.5 13.75,0 c 0.70304,1.32345 1.80155,2.42196 3.125,3.125 l 0,13.75 c -1.32345,0.70304 -2.42196,1.80155 -3.125,3.125 l -13.75,0 c -0.70304,-1.32345 -1.80155,-2.42196 -3.125,-3.125 l 0,-13.75 c 1.32345,-0.70304 2.42196,-1.80155 3.125,-3.125 z m -6.625,20.5 c 1.65685,0 3,1.34315 3,3 0,1.65685 -1.34315,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65685 1.34315,-3 3,-3 z m 27,0 c 1.65685,0 3,1.34315 3,3 0,1.65685 -1.34315,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65685 1.34315,-3 3,-3 z"
-       id="path5288-4-8-0"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <g
-       id="g7659" />
-    <g
-       transform="translate(-28,28)"
-       id="g7663" />
-    <g
-       transform="translate(1.625,1.3749969)"
-       id="g7690" />
-    <g
-       transform="translate(-25.375,1.3749969)"
-       id="g7694" />
-    <g
-       transform="translate(1.625,-25.625003)"
-       id="g7700" />
-    <g
-       transform="translate(-25.375,-25.625003)"
-       id="g7706" />
-    <rect
-       width="100"
-       height="100"
-       x="425"
-       y="220"
-       id="rect6623-9-2-3"
-       style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       width="100"
-       height="100"
-       x="525"
-       y="220"
-       id="rect4211"
-       style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       width="100"
-       height="100"
-       x="525"
-       y="220"
-       id="rect4219"
-       style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <g
-       transform="translate(295,5)"
-       id="g4221">
-      <path
-         d="m 455,232 -5,0 -3,3 0,5 58,58 5,0 3,-3 0,-5 z"
-         id="path4223"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#e06d5f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 505,232 5,0 3,3 0,5 -58,58 -5,0 -3,-3 0,-5 z"
-         id="path4255"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#e06d5f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-    </g>
-    <path
-       d="m 675,228 -2,2 0,5.0625 c -18.3398,1.05112 -33,16.34328 -33,34.9375 0,19.27074 15.72926,35 35,35 19.27075,0 35,-15.72926 35,-35 0,-11.66567 -5.76668,-22.0373 -14.59375,-28.40625 l -7.1875,7.1875 C 695.3012,253.17882 700,260.99881 700,270 c 0,13.86634 -11.13365,25 -25,25 -13.86634,0 -25,-11.13366 -25,-25 0,-13.18969 10.08302,-23.8917 23,-24.90625 l 0,4.90625 2,2 3,0 12,-12 -12,-12 -3,0 z"
-       id="path4227"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#7092ff;fill-opacity:1;stroke:none;stroke-width:11.66666508;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       inkscape:connector-curvature="0" />
-    <rect
-       width="200"
-       height="80"
-       x="25"
-       y="320"
-       id="rect8373"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="M 195.00001,351 C 186.7158,351 180,357.71573 180,366.00001 180,374.28428 195.00001,387 195.00001,387 195.00001,387 210,374.28428 210,366.00001 210,357.71573 203.2842,351 195.00001,351 z"
-       id="path8377"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 187,358 c -0.4714,0 -1,0.5 -1,1 l 0,7 c 0,2.216 1,5 5,5 0.35868,0 0.68618,-0.017 1,-0.062 l 0,-2.9375 -4,0 c 0,0 0.5,-2 3,-2 0.5,0 0.69653,0.074 1,0.1875 l 0,-2.1875 c 0,-0.9167 0.36529,-1.6826 1,-2 1,-0.5 1.40372,-0.2981 2,0 1,0.5 1,0.5 1,0.5 l 0,-3.5 c 0,-0.5 -0.5286,-1 -1,-1 -1,0 -2,1 -4,1 -2,0 -3,-1 -4,-1 z m 1.75,3.5 c 0.69036,0 1.25,0.5596 1.25,1.25 0,0.6904 -0.55964,1.25 -1.25,1.25 -0.69036,0 -1.25,-0.5596 -1.25,-1.25 0,-0.6904 0.55964,-1.25 1.25,-1.25 z M 194,363 c -0.4714,0 -1,0.5 -1,1 l 0,7 c 0,2.216 1,5 5,5 4,0 5,-2.784 5,-5 l 0,-7 c 0,-0.5 -0.5286,-1 -1,-1 -1,0 -2,1 -4,1 -2,0 -3,-1 -4,-1 z m 1.75,3.5 c 0.69036,0 1.25,0.5596 1.25,1.25 0,0.6904 -0.55964,1.25 -1.25,1.25 -0.69036,0 -1.25,-0.5596 -1.25,-1.25 0,-0.6904 0.55964,-1.25 1.25,-1.25 z m 4.5,0 c 0.69036,0 1.25,0.5596 1.25,1.25 0,0.6904 -0.55964,1.25 -1.25,1.25 -0.69036,0 -1.25,-0.5596 -1.25,-1.25 0,-0.6904 0.55964,-1.25 1.25,-1.25 z m -5.25,5.5 6,0 c 0,0 -0.5,2 -3,2 -2.5,0 -3,-2 -3,-2 z"
-       id="path8379"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.055;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="M 55.00001,351 C 46.7158,351 40,357.71573 40,366.00001 40,374.28428 55.00001,387 55.00001,387 55.00001,387 70,374.28428 70,366.00001 70,357.71573 63.2842,351 55.00001,351 z"
-       id="path8381"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 49,356 c -0.55401,0 -1,0.446 -1,1 l 0,16 c 0,0.5 0.5,1 1,1 l 9,0 c 0.5,0 1,-0.5 1,-1 l 0,-5 0.5,0 c 0.5,0 0.5,0.5 0.5,0.5 l 0,2 c 0,1 0.5,1.5 1.5,1.5 1,0 1.5,-0.5 1.5,-1.5 0,-1.1667 0,-4.5 0,-5.5 0,-1 -2,-2 -2,-3 l 0,-3 -1,0 -1,-1 0,-1 c 0,-0.554 -0.44599,-1 -1,-1 z m 1,2 7,0 0,4 -7,0 z m 9,3 1,0 c 0,0 0,0.8333 0,1.5 0,1 2,2 2,3 l 0,5 c 0,0.5 -0.5,0.5 -0.5,0.5 0,0 -0.5,0 -0.5,-0.5 0,0 0,-2 0,-2.5 0,-0.5 -0.5,-1 -1,-1 -0.33333,0 -1,0 -1,0 z"
-       id="path8383"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="M 125.00001,351 C 116.7158,351 110,357.71573 110,366.00001 110,374.28428 125.00001,387 125.00001,387 125.00001,387 140,374.28428 140,366.00001 140,357.71573 133.2842,351 125.00001,351 z"
-       id="path8385"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 123,358 c -3,0 -6,1.5 -6,4 l 0,2 17,0 0,-2 c -2e-5,-2.5 -3,-4 -6,-4 z m 0.5,1 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m -6,2 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m -12.5,4 c -0.50003,0 -1.00001,0.5 -1,1 1e-5,0.5 0.49997,1 1,1 l 17,0 c 0.50001,0 0.99999,-0.5 1,-1 0,-0.5 -0.5,-1 -1,-1 z m 0,3 0,1 c 0,1 1,2 2,2 l 13,0 c 1,0 2,-1 2,-2 l 0,-1 z"
-       id="path8387"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="M 160.00001,331 C 151.7158,331 145,337.71573 145,346.00001 145,354.28428 160.00001,367 160.00001,367 160.00001,367 175,354.28428 175,346.00001 175,337.71573 168.2842,331 160.00001,331 z"
-       id="path10172"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="M 90.00001,331 C 81.7158,331 75,337.71573 75,346.00001 75,354.28428 90.00001,367 90.00001,367 90.00001,367 105,354.28428 105,346.00001 105,337.71573 98.2842,331 90.00001,331 z"
-       id="path10174"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 84,338 c -0.55401,0 -1,0.446 -1,1 l 0,9 c 0,0.554 0.44599,1 1,1 l 11,0 c 0.55401,0 1,-0.446 1,-1 l 0,-1 0.5,0 c 0.5,0 0.5,-0.5 0.5,-0.5 l 0,-0.5 1,0 c 1,0 2,-1 2,-2 l 0,-1 0,-2 c 0,-0.5 -0.5,-1 -1,-1 l -3,0 0,-1 c 0,-0.554 -0.44599,-1 -1,-1 z m 12,3 2.5,0 c 0.5,0 0.5,0.5 0.5,0.5 l 0,2.5 c 0,0.5 -0.5,1 -1,1 l -1,0 -1,0 z m -15,9 1,1 1,1 13,0 1,-1 1,-1 z"
-       id="rect9826-2-1"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 159,338 c -0.554,0 -1,0.446 -1,1 l 0,4 -4,0 c -0.554,0 -1,0.446 -1,1 l 0,3 c 0,0.554 0.446,1 1,1 l 4,0 0,4 c 0,0.554 0.446,1 1,1 l 3,0 c 0.554,0 1,-0.446 1,-1 l 0,-4 4,0 c 0.554,0 1,-0.446 1,-1 l 0,-3 c 0,-0.554 -0.446,-1 -1,-1 l -4,0 0,-4 c 0,-0.554 -0.446,-1 -1,-1 z"
-       id="rect8206-4"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <g
-       transform="translate(375,15)"
-       id="g10113">
-      <rect
-         width="200"
-         height="80"
-         x="-350"
-         y="465"
-         id="rect8477"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <g
-         transform="translate(-1110,437.63781)"
-         id="railway-rail"
-         style="fill:#7092ff;fill-opacity:1">
-        <path
-           d="m 853.5,50.362183 -1.5,1 -0.4688,2 -3.2812,0 c -0.554,0 -0.8656,0.462541 -1,1 l -0.25,1 c -0.1344,0.537459 0.446,1 1,1 l 24,0 c 0.554,0 1.1344,-0.462541 1,-1 l -0.25,-1 c -0.1344,-0.537459 -0.446,-1 -1,-1 l -2.7812,0 -0.4688,-2 -1.5,-1 -1,1 0.4688,2 -12.4376,0 0.4688,-2 -1,-1 z m -2,4 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m 17,0 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m -17.9375,3 -0.4687,2 -2.8438,0 c -0.554,0 -0.8656,0.462541 -1,1 l -0.25,1 c -0.1344,0.537459 0.446,1 1,1 l 26,0 c 0.554,0 1.1344,-0.462541 1,-1 l -0.25,-1 c -0.1344,-0.537459 -0.446,-1 -1,-1 l -2.3438,0 -0.4687,-2 -2.5,0 0.4687,2 -15.3124,0 0.4687,-2 -2.5,0 z m -0.0625,3 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m 19,0 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m -20.3438,3 -0.4687,2 -2.4375,0 c -0.554,0 -0.8656,0.462541 -1,1 l -0.25,1 c -0.1344,0.537459 0.446,1 1,1 l 28,0 c 0.554,0 1.1344,-0.462541 1,-1 l -0.25,-1 c -0.1344,-0.537459 -0.446,-1 -1,-1 l -1.9375,0 -0.4687,-2 -2.5,0 0.4687,2 -18.125,0 0.4687,-2 -2.5,0 z m 0.3438,3 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m 21,0 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m -22.7812,3 -0.7188,3 1.5,1 1,-1 0.7188,-3 -2.5,0 z m 22.5624,0 0.7188,3 1,1 1.5,-1 -0.7188,-3 -2.5,0 z"
-           id="rect17528-7"
-           style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <g
-           transform="translate(110,0)"
-           id="g22103"
-           style="fill:#7092ff;fill-opacity:1">
-          <rect
-             width="40"
-             height="3"
-             x="730"
-             y="77.362183"
-             id="rect22091"
-             style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-          <rect
-             width="5"
-             height="1.0000004"
-             x="764"
-             y="78.362183"
-             id="rect22093"
-             style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-          <rect
-             width="5"
-             height="1.0000004"
-             x="753"
-             y="78.362183"
-             id="rect22095"
-             style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-          <rect
-             width="5"
-             height="1.0000004"
-             x="742"
-             y="78.362183"
-             id="rect22097"
-             style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-          <rect
-             width="5"
-             height="1.0000004"
-             x="731"
-             y="78.362183"
-             id="rect22099"
-             style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        </g>
-        <path
-           d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
-           transform="matrix(1.6666667,0,0,1.6666667,828.66667,-31.97115)"
-           id="path26156"
-           style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
-           transform="translate(849,12.362188)"
-           id="path26158"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
-           transform="matrix(1.6666667,0,0,1.6666667,789.66667,-31.97115)"
-           id="path26160"
-           style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
-           transform="translate(810,12.362188)"
-           id="path26162"
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-      <g
-         transform="translate(-510,437.63781)"
-         id="highway-unclassified"
-         style="fill:#7092ff;fill-opacity:1">
-        <path
-           d="m 192.5,52.36218 -2.875,6 -1.625,0 -1,1 0,2 1.40625,0 -0.40625,1 0,5 0,1 0,0 c 0,0 0.60826,0.60826 1,1 l 1,0 4,0 2,1 8,0 2,-1 4,0 1,0 1,-1 0,0 0,-1 0,-5 -0.40625,-1 1.40625,0 0,-2 -1,-1 -1.625,0 -2.875,-6 z m 1,3 13,0 1.5,4 -1,1 -14,0 -1,-1 z m -2.5,8 3,0 1,2 0,1 -4,0 -1,-1 0,-1 z m 15,0 3,0 1,1 0,1 -1,1 -4,0 0,-1 z m -17,7 0,2 1,1 3,0 1,-1 0,-2 z m 17,0 0,2 1,1 3,0 1,-1 0,-2 z"
-           id="path7143"
-           style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <rect
-           width="38"
-           height="0.9999997"
-           x="181"
-           y="78.362183"
-           id="rect7157"
-           style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <g
-           transform="translate(551,1)"
-           id="g7159"
-           style="fill:#7092ff;fill-opacity:1">
-          <path
-             d="m 139.5,64 c -1.38071,0 -2.5,1.119288 -2.5,2.5 0,1.380712 1.11929,2.5 2.5,2.5 l 39,0 c 1.38071,0 2.5,-1.119288 2.5,-2.5 0,-1.380712 -1.11929,-2.5 -2.5,-2.5 z"
-             transform="translate(-510,12.362183)"
-             id="path7161"
-             style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m 362,70 c 0.31019,0.41644 0.5,0.940812 0.5,1.5 0,0.559188 -0.18981,1.08356 -0.5,1.5 l 35,0 c -0.31019,-0.41644 -0.5,-0.940812 -0.5,-1.5 0,-0.559188 0.18981,-1.08356 0.5,-1.5 l -35,0 z"
-             transform="translate(-730.5,7.362183)"
-             id="path7163"
-             style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
-             transform="translate(-401,12.362183)"
-             id="path7165"
-             style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
-             transform="translate(-362,12.362183)"
-             id="path7169"
-             style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-    </g>
-    <rect
-       width="200"
-       height="80"
-       x="25"
-       y="400"
-       id="rect9903"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="m 67.183962,443.57193 a 14.904482,5.9469357 0 1 1 -29.808964,0 14.904482,5.9469357 0 1 1 29.808964,0 z"
-       transform="matrix(1.8169101,0.18420004,-0.74043709,1.8891074,360.32499,-422.91527)"
-       id="path10275"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 78,436 -35,10 0,-6 35,-10 z"
-       id="path9990"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 79,430.5 0,6 29,14.5 0,-6 -29,-14.5 z"
-       id="path9986"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 198.5,428 c -1.22936,2e-4 -2.22819,0.8933 -2.4375,2.0625 C 195.87885,430.0195 195.69675,430 195.5,430 c -1.38071,0 -2.5,1.1193 -2.5,2.5 0,0.6391 0.23046,1.21425 0.625,1.65625 -0.94522,0.3566 -1.625,1.27365 -1.625,2.34375 0,1.3807 1,2.5 2.5,2.5 l 0.5,0 2,3.5 0,1.4375 c -1.47915,-0.43159 -2.8857,-0.88035 -4,-1.4375 -5,-2.5 -9.43382,-6.98268 -15,-7.5 -6.04072,-0.56143 -11.66667,3.33333 -17.5,5 -5.83333,1.66667 -16.93857,1.9593 -17.5,8 L 173,462.99997 208,453 c 0.32572,-3.50467 -3.70814,-6.98659 -8,-8.21875 l 0,-2.28125 2,-3.5 0.71875,0 C 204,439.0145 205,437.805 205,436.5 c 0,-1.0701 -0.67978,-1.98715 -1.625,-2.34375 0.39454,-0.442 0.625,-1.01715 0.625,-1.65625 0,-1.3807 -1.11929,-2.5 -2.5,-2.5 -0.19675,0 -0.37885,0.0195 -0.5625,0.0625 -0.20931,-1.1692 -1.20813,-2.0628 -2.4375,-2.0625 z m -1.5,11 3,0 -1,2 -1,0 z"
-       id="path10000"
-       style="color:#000000;fill:#8cd05f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <g
-       transform="translate(365,-200)"
-       id="g10052">
-      <path
-         d="m -322,646 30,15 0,-6 -30,-15 z"
-         id="path10048"
-         style="color:#000000;fill:#c1c1c1;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m -257,651 -35,10 0,-6 35,-10 z"
-         id="path10050"
-         style="color:#000000;fill:#c1c1c1;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <path
-       d="m 43,446 30,15 0,-6 -30,-15 z"
-       id="path9980"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 108,451 -35,10 0,-6 35,-10 z"
-       id="path9982"
-       style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <rect
-       width="699.86035"
-       height="560"
-       x="-724.86035"
-       y="-3.0624999e-06"
-       transform="scale(-1,1)"
-       id="rect10169"
-       style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="m 132,417 c 0,0 2.63599,3.5293 5.4375,3.96875 C 132.96029,420.81568 132,419 132,419 c 0,0 -0.96029,1.81568 -5.4375,1.96875 C 129.36401,420.5293 132,417 132,417 z"
-       id="path10271"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 118,419 c 0,0 2.63599,3.5293 5.4375,3.96875 C 118.96029,422.81568 118,421 118,421 c 0,0 -0.96029,1.81568 -5.4375,1.96875 C 115.36401,422.5293 118,419 118,419 z"
-       id="path10269"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 128,424 c 0,0 2.63599,3.5293 5.4375,3.96875 C 128.96029,427.81568 128,426 128,426 c 0,0 -0.96029,1.81568 -5.4375,1.96875 C 125.36401,427.5293 128,424 128,424 z"
-       id="path10253"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <g
-       transform="translate(-235,452.63781)"
-       id="waterway-river">
-      <rect
-         width="40"
-         height="3.0000014"
-         x="400"
-         y="77.362183"
-         id="rect24309"
-         style="color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         d="m 406.76193,73.362183 c 0,0 -0.53638,-1.846128 -0.34524,-2.75 0.22134,-1.046677 1.65476,-2.75 1.65476,-2.75 0,0 1.43342,-1.703323 1.65476,-2.75 0.19114,-0.903872 -0.34524,-2.75 -0.34524,-2.75 0,0 -0.53639,-1.846127 -0.34525,-2.75 0.22134,-1.046678 1.65476,-2.75 1.65476,-2.75 0,0 1.43342,-1.703323 1.65476,-2.75 0.19114,-0.903872 -0.34524,-2.75 -0.34524,-2.75 l 16.5,0 c 0,0 1.43342,1.703323 1.65476,2.75 0.19115,0.903872 -0.34523,2.75 -0.34523,2.75 0,0 -0.53638,1.846128 -0.34524,2.75 0.22134,1.046679 1.65477,2.75 1.65477,2.75 0,0 1.43342,1.703323 1.65476,2.75 0.19115,0.903872 -0.34523,2.75 -0.34523,2.75 0,0 -0.53638,1.846128 -0.34524,2.75 0.22134,1.046679 1.65477,2.75 1.65477,2.75 z"
-         id="245"
-         style="color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 808,51 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z"
-         transform="matrix(0.48296291,0.12940952,-0.19411409,0.72444365,27.631711,-76.388519)"
-         id="path25543"
-         style="opacity:0.5;color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 808,51 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z"
-         transform="matrix(0.64951905,0.375,-0.50000001,0.86602541,-89.512357,-292.05512)"
-         id="path25545"
-         style="opacity:0.5;color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 808,51 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z"
-         transform="matrix(-0.48296291,0.12940952,0.19411409,0.72444365,811.75652,-82.439629)"
-         id="path25547"
-         style="opacity:0.5;color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 808,51 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z"
-         transform="matrix(-0.64951905,0.375,0.50000001,0.86602541,933.61049,-277.05512)"
-         id="path25549"
-         style="opacity:0.5;color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
-         transform="matrix(1.6666667,0,0,1.6666667,388.66667,-31.97115)"
-         id="path26103"
-         style="color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
-         transform="translate(409,12.362188)"
-         id="path26105"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
-         transform="matrix(1.6666667,0,0,1.6666667,349.66667,-31.97115)"
-         id="path26107"
-         style="color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
-         transform="translate(370,12.362188)"
-         id="path26109"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <path
-       d="m 450,29.999997 8,7 1,-1 0,-12 -1,-1 z"
-       id="path10391"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 479,29.999997 -8,7 -1,-1 0,-12 1,-1 z"
-       id="path10393"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 31,164 -1,1 0,1 1,1 8,0 1,-1 0,-1 -1,-1 z m 0,4 0,7 1,1 6,0 1,-1 0,-7 z m 2,2 1,0 0,4 -1,0 0,-1 z m 3,0 1,0 0,3 0,1 -1,0 z"
-       id="path3399"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 89,165.01282 c -1,0 -2,1 -2,2 l 0,2 3,0 2,1 -2,1 -3,0 0,2 c 0,1 1,2 2,2 l 1,0 c 2,0 2.48722,-0.97443 3,-2 l 1,-2 9,-5 c 0,0 0,-1 -2,-1 L 93.96875,168.91907 93,167.01282 c -0.49406,-0.98812 -1,-2 -3,-2 z m 0,1 2,0 1,2 -4,0 c 0,0 0,-0.66667 0,-1 0,-1.01282 1,-1 1,-1 z m 8.09375,4.71875 -2,1 5.90625,3.28125 c 2,0 2,-1 2,-1 z M 88,172.01282 l 4,0 -1,2 -2,0 c 0,0 -1,0 -1,-1 z"
-       id="path3403"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 69.8125,169.01282 c 0.11352,0.31647 0.1875,0.64447 0.1875,1 0,0.35553 -0.074,0.68353 -0.1875,1 l 2.375,0 c -0.11352,-0.31647 -0.1875,-0.64447 -0.1875,-1 0,-0.35553 0.074,-0.68353 0.1875,-1 l -2.375,0 z m 8,0 c 0.11352,0.31647 0.1875,0.64447 0.1875,1 0,0.35553 -0.074,0.68353 -0.1875,1 l 2.375,0 c -0.11352,-0.31647 -0.1875,-0.64447 -0.1875,-1 0,-0.35553 0.074,-0.68353 0.1875,-1 l -2.375,0 z"
-       id="path3407"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 67,168 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z m 8,0 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z m 8,0 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z"
-       id="path3409"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 155,168 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
-       id="path3415"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 52.03125,162.60657 c -1.32908,0.53118 -2.444369,1.41916 -3.3125,2.53125 0.07092,0.0184 0.149734,0.009 0.21875,0.0312 0.520689,0.16918 0.941853,0.48986 1.28125,0.875 0.583365,-0.69731 1.320919,-1.23792 2.15625,-1.625 -0.228003,-0.42194 -0.375,-0.89709 -0.375,-1.4062 0,-0.14028 0.0122,-0.27085 0.03125,-0.40625 z m 5.9375,0 C 57.9878,162.74197 58,162.87254 58,163.01282 c 0,0.50911 -0.146997,0.98426 -0.375,1.40625 0.835331,0.38708 1.572885,0.92769 2.15625,1.625 0.339397,-0.38514 0.760561,-0.70582 1.28125,-0.875 0.06748,-0.0219 0.146303,-0.0395 0.21875,-0.0625 -0.866395,-1.10291 -1.991152,-1.97191 -3.3125,-2.5 z m -10.9375,8.21875 c 0.132811,1.35398 0.618313,2.61506 1.34375,3.6875 0.05422,-0.0956 0.121594,-0.19054 0.1875,-0.28125 0.298579,-0.41096 0.689964,-0.72255 1.125,-0.9375 -0.439267,-0.72096 -0.728373,-1.5606 -0.84375,-2.4375 -0.563589,0.16464 -1.184566,0.16262 -1.78125,-0.0312 -0.009,-0.003 -0.02228,0.003 -0.03125,0 z m 15.90625,0 c -0.596684,0.19387 -1.217661,0.19589 -1.78125,0.0312 -0.115377,0.8769 -0.404483,1.71654 -0.84375,2.4375 0.438042,0.20421 0.821177,0.51932 1.125,0.9375 0.06591,0.0907 0.133279,0.18566 0.1875,0.28125 0.725438,-1.07244 1.210939,-2.33352 1.34375,-3.6875 -0.009,0.003 -0.02224,-0.003 -0.03125,0 z M 54,176.16907 c -0.03014,0.55835 -0.21394,1.114 -0.5625,1.59375 -0.027,0.0372 -0.06534,0.0582 -0.09375,0.0937 0.540476,0.11583 1.081942,0.1875 1.65625,0.1875 0.574308,0 1.115774,-0.0717 1.65625,-0.1875 -0.02841,-0.0355 -0.06675,-0.0566 -0.09375,-0.0937 -0.34856,-0.47975 -0.532362,-1.0354 -0.5625,-1.59375 -0.329444,0.0535 -0.654988,0.0937 -1,0.0937 -0.345012,0 -0.670556,-0.0403 -1,-0.0937 z"
-       id="path3419"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.50000125;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 55,161 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z m -7.15625,5 c -0.77652,0.0669 -1.494002,0.58712 -1.75,1.375 -0.341331,1.05051 0.230742,2.18992 1.28125,2.53125 1.050508,0.34133 2.189919,-0.23074 2.53125,-1.28125 0.341331,-1.05051 -0.230742,-2.18992 -1.28125,-2.53125 -0.262627,-0.0853 -0.52241,-0.11606 -0.78125,-0.0937 z m 13.9375,0 c -0.132056,0.0149 -0.274936,0.0511 -0.40625,0.0937 -1.050508,0.34133 -1.622581,1.48074 -1.28125,2.53125 0.341331,1.05051 1.480742,1.62258 2.53125,1.28125 1.050508,-0.34133 1.622581,-1.48074 1.28125,-2.53125 -0.298664,-0.91919 -1.20061,-1.47926 -2.125,-1.375 z m -10.71875,8 c -0.641658,-0.0219 -1.281719,0.25399 -1.6875,0.8125 -0.64925,0.89362 -0.456116,2.16325 0.4375,2.8125 0.893616,0.64925 2.16325,0.45612 2.8125,-0.4375 0.64925,-0.89362 0.456116,-2.16325 -0.4375,-2.8125 -0.335106,-0.24347 -0.740005,-0.36184 -1.125,-0.375 z m 7.875,0 c -0.384995,0.0132 -0.789894,0.13153 -1.125,0.375 -0.893615,0.64925 -1.08675,1.91888 -0.4375,2.8125 0.64925,0.89362 1.918885,1.08675 2.8125,0.4375 0.893615,-0.64925 1.08675,-1.91888 0.4375,-2.8125 -0.405781,-0.55851 -1.045842,-0.83443 -1.6875,-0.8125 z"
-       id="path3423"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 109,166.01282 -4,4 4,4 1,-1 0,-2 2.1875,0 c -0.11352,-0.31647 -0.1875,-0.64447 -0.1875,-1 0,-0.34518 0.0802,-0.69136 0.1875,-1 l -2.1875,0 0,-2 -1,-1 z m 12,0 -1,1 0,2 -2.1875,0 c 0.10728,0.30864 0.1875,0.65482 0.1875,1 0,0.35553 -0.074,0.68353 -0.1875,1 l 2.1875,0 0,2 1,1 4,-4 -4,-4 z"
-       id="path3427"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 226,732.36218 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
-       transform="matrix(2.0000003,0,0,2.0000003,-335.00007,-1294.7246)"
-       id="path3429"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 133,165 -4,5 4,5 2,0 0,-1 -3.5,-4 3.5,-4 0,-1 -2,0 z m 6,0 -4,5 4,5 2,0 0,-1 -3.5,-4 3.5,-4 0,-1 -2,0 z"
-       id="path3433"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 174,163 -1,1 0,4 -4,0 -1,1 0,2 1,1 4,0 0,4 1,1 2,0 1,-1 0,-4 4,0 1,-1 0,-2 -1,-1 -4,0 0,-4 -1,-1 z"
-       id="path3437"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 189,162 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
-       id="path3412"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 189,174 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
-       id="path3410"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 201,174 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
-       id="path3443"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 215,160 -1,1 0,1.0625 c -3.94444,0.49381 -7,3.85922 -7,7.9375 0,4.41827 3.58173,8 8,8 4.41827,0 8,-3.58173 8,-8 0,-2.46731 -1.11852,-4.65856 -2.875,-6.125 l -1.40625,1.40625 C 220.11409,166.37996 221,168.08592 221,170 c 0,3.3137 -2.6863,6 -6,6 -3.3137,0 -6,-2.6863 -6,-6 0,-2.97561 2.15859,-5.43327 5,-5.90625 l 0,0.90625 1,1 3,-3 -3,-3 z"
-       id="path3445"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 233,162 c -1.33333,0 -2.21875,0.78125 -2.71875,1.28125 -0.5,0.5 -0.61458,0.71875 -1.28125,0.71875 l -1,0 0,2 1,0 c 1.33333,0 2.21875,-0.78125 2.71875,-1.28125 0.5,-0.5 0.61458,-0.71875 1.28125,-0.71875 0.16667,0 0.20569,0.009 0.40625,0.25 0.20056,0.24067 0.4375,0.6875 0.6875,1.1875 0.25,0.5 0.51306,1.05317 0.9375,1.5625 0.42444,0.50933 1.13542,1 1.96875,1 1.33333,0 2.21875,-0.78125 2.71875,-1.28125 0.5,-0.5 0.61458,-0.71875 1.28125,-0.71875 l 1,0 0,-2 -1,0 c -1.33333,0 -2.21875,0.78125 -2.71875,1.28125 -0.5,0.5 -0.61458,0.71875 -1.28125,0.71875 -0.16667,0 -0.20569,-0.009 -0.40625,-0.25 -0.20056,-0.24067 -0.4375,-0.6875 -0.6875,-1.1875 -0.25,-0.5 -0.51306,-1.05317 -0.9375,-1.5625 -0.42444,-0.50933 -1.13542,-1 -1.96875,-1 z"
-       id="path3451"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 228,176 0,2 14,0 0,-2 -14,0 z"
-       id="path3453"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 532.5,1.9999969 0,1 1,1 -4.5,4.5000001 0,0.5 0,1 1.5,0 4.5,-4.5000001 1,1 1,0 0,-3.5 0,-1 -1,0 z m -6.5,1 -1,1 0,9.0000001 1,1 9,0 1,-1 0,-5 -2,2 0,2 -1,0 -1,0 -4,0 -1,0 0,-5.0000001 0,-2 1,0 1,0 2,-2 z"
-       id="path3404-8"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 532.5,15.999997 0,1 1,1 -4.5,4.5 0,0.5 0,1 1.5,0 4.5,-4.5 1,1 1,0 0,-3.5 0,-1 -1,0 z m -6.5,1 -1,1 0,9 1,1 9,0 1,-1 0,-5 -2,2 0,2 -1,0 -1,0 -4,0 -1,0 0,-5 0,-2 1,0 1,0 2,-2 z"
-       id="path5520"
-       style="color:#000000;fill:#597be7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 114,21.999997 -5,4.5 5,4.5 0,-3 3,0 1,1 0,3 -1,1 -5,0 -1,1 0,1 1,1 5,0 2,-1 1,-1 1,-2 0,-3 -1,-2 -1,-1 -2,-1 -3,0 z m 22,0 0,3 -3,0 -2,1 -1,1 -1,2 0,3 1,2 1,1 2,1 5,0 1,-1 0,-1 -1,-1 -5,0 -1,-1 0,-3 1,-1 3,0 0,3 5,-4.5 z m -57,1 -1,1 0,1.59375 -6.40625,6.40625 -1.59375,0 -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 6.40625,-6.40625 1.59375,0 1,-1 0,-2 -1,-1 z m 96,0 -6,6 1,1 3,0 0,6 1,1 2,0 1,-1 0,-6 3,0 1,-1 z m -118,1 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 23,0 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 C 79.30935,25.719977 79.28,25.690657 79.25,25.656247 79.09665,25.480516 79,25.251518 79,24.999997 c 0,-0.55228 0.44772,-1 1,-1 z m 10,0 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 z m 69.5,0 -4.9375,8.5625 -3.5625,-3.5625 -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 z m 30.5,0 -1,1 0,1 4,4 -4,4 0,1 1,1 1,0 4,-4 4,4 1,0 1,-1 0,-1 -4,-4 4,-4 0,-1 -1,-1 -1,0 -4,4 -4,-4 z m 21,0 -1,1 0,1 1,1 8,0 1,-1 0,-1 -1,-1 z m -120,1 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 132,0 -1,1 0,1 3,3 -3,3 0,1 1,1 1,0 3,-3 3,3 1,0 1,-1 0,-1 -3,-3 3,-3 0,-1 -1,-1 -1,0 -3,3 -3,-3 z m -173.84375,2 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 z m 35.84375,0 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 z m 118,1 0,7 1,1 6,0 1,-1 0,-7 z m 2,2 1,0 0,4 -1,0 0,-1 z m 3,0 1,0 0,3 0,1 -1,0 z m -145,3 c 0.25152,0 0.48052,0.0967 0.65625,0.25 l 0.09375,0.09375 c 0.15335,0.175731 0.25,0.404734 0.25,0.65625 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 20,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z"
-       id="path4657"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <g
-       transform="translate(-656,93.637817)"
-       id="g4659"
-       style="fill:#ffffff;fill-opacity:1;display:inline">
-      <path
-         d="m 174,3 -1,1 0,4 -4,0 -1,1 0,1 1,1 4,0 0,4 1,1 1,0 1,-1 0,-4 4,0 1,-1 0,-1 -1,-1 -4,0 0,-4 -1,-1 -1,0 z"
-         transform="translate(756,-73.637817)"
-         id="path4661"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <path
-       d="m 290,28 11,0 1,1.00002 0,1 -1,0.99998 -11,0 -1,-1 0,-1 z"
-       id="path4663"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 313.5,23.00001 c -3.03757,0 -5.5,2.46243 -5.5,5.5 0,3.03757 2.46243,5.5 5.5,5.5 1.00612,0 1.93866,-0.27827 2.75,-0.75 l 3.75,3.75 1,0 1,-1 0,-1 -3.75,-3.75 c 0.47173,-0.81134 0.75,-1.74387 0.75,-2.75 0,-3.03757 -2.46243,-5.5 -5.5,-5.5 z m -0.5,2 1,0 2,1 1,2 0,1 -1,2 -2,1 -1,0 -2,-1 -1,-2 0,-1 1,-2 2,-1 z"
-       id="path4665"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <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"
-       inkscape:connector-curvature="0" />
-    <rect
-       width="6"
-       height="2"
-       x="192"
-       y="155"
-       id="rect4769"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       width="2"
-       height="5.9999971"
-       x="188"
-       y="147"
-       id="rect4769-6"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       width="2"
-       height="2"
-       x="45"
-       y="149"
-       transform="translate(25,-3.0624999e-6)"
-       id="rect4789"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       width="2"
-       height="2"
-       x="78"
-       y="149"
-       id="rect4791"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="m 188,167 2,0 c 0,2.00001 0,4 0,6 l -2,0 z"
-       id="path4863"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 192,175 6,0 c 0,0.66667 0,1.33333 0,2 l -6,0 z"
-       id="path4863-8"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 231,4.9999969 -1,1 0,1 3,3 -3,3.0000001 0,1 1,1 1,0 3,-3 3,3 1,0 1,-1 0,-1 -3,-3.0000001 3,-3 0,-1 -1,-1 -1,0 -3,3 -3,-3 -1,0 z"
-       id="path3848"
-       style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 114,41.999997 -5,4.5 5,4.5 0,-3 3,0 1,1 0,3 -1,1 -5,0 -1,1 0,1 1,1 5,0 2,-1 1,-1 1,-2 0,-3 -1,-2 -1,-1 -2,-1 -3,0 z m 22,0 0,3 -3,0 -2,1 -1,1 -1,2 0,3 1,2 1,1 2,1 5,0 1,-1 0,-1 -1,-1 -5,0 -1,-1 0,-3 1,-1 3,0 0,3 5,-4.5 z m -57,1 -1,1 0,1.59375 -6.40625,6.40625 -1.59375,0 -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 6.40625,-6.40625 1.59375,0 1,-1 0,-2 -1,-1 z m 96,0 -6,6 1,1 3,0 0,6 1,1 2,0 1,-1 0,-6 3,0 1,-1 z m -118,1 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 23,0 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 C 79.30935,45.719977 79.28,45.690657 79.25,45.656247 79.09665,45.480516 79,45.251518 79,44.999997 c 0,-0.55228 0.44772,-1 1,-1 z m 10,0 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 z m 69.5,0 -4.9375,8.5625 -3.5625,-3.5625 -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 z m 30.5,0 -1,1 0,1 4,4 -4,4 0,1 1,1 1,0 4,-4 4,4 1,0 1,-1 0,-1 -4,-4 4,-4 0,-1 -1,-1 -1,0 -4,4 -4,-4 z m 21,0 -1,1 0,1 1,1 8,0 1,-1 0,-1 -1,-1 z m -120,1 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m -41.84375,2 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 z m 35.84375,0 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 z m 118,1 0,7 1,1 6,0 1,-1 0,-7 z m 2,2 1,0 0,4 -1,0 0,-1 z m 3,0 1,0 0,3 0,1 -1,0 z m -145,3 c 0.25152,0 0.48052,0.0967 0.65625,0.25 l 0.09375,0.09375 c 0.15335,0.175731 0.25,0.404734 0.25,0.65625 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 20,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z"
-       id="path2997-6"
-       style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 215,168 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
-       id="path4802-1"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 155,161 -3,3 1,1 1,0 0,2 2,0 0,-2 1,0 1,-1 -3,-3 z"
-       id="path4861-8"
-       style="color:#000000;fill:#bfbfbf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 149,167 -3,3 3,3 1,-1 0,-1 2,0 0,-2 -2,0 0,-1 -1,-1 z"
-       id="path4859-2"
-       style="color:#000000;fill:#bfbfbf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 161,167 -1,1 0,1 -2,0 0,2 2,0 0,1 1,1 3,-3 -3,-3 z"
-       id="path4857-6"
-       style="color:#000000;fill:#bfbfbf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 155,168 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
-       id="path4855-0"
-       style="color:#000000;fill:#bfbfbf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 154,173 0,2 -1,0 -1,1 3,3 3,-3 -1,-1 -1,0 0,-2 -2,0 z"
-       id="path4804-3"
-       style="color:#000000;fill:#bfbfbf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 209,147.5 0,3.5 -1,0 -1,1 3,3 3,-3 -1,-1 -1,0 0,-1.5 c -1.70008,-0.85011 -2,-2 -2,-2 z"
-       transform="translate(25,-3.0624999e-6)"
-       id="path5237"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 232,172 1,-1 1,0 0,-3.5 c 0,0 0.29992,1.14989 2,2 0,0.591 0,1.5 0,1.5 l 1,0 1,1 -3,3 z"
-       id="path5239-7"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 257.5,251.25 c -1.385,0 -2.5,1.115 -2.5,2.5 l 0,37.5 c 0,1.385 1.115,2.5 2.5,2.5 l 20,0 0.10937,-20 -5.10937,0 0,-5 5,0 0,-1.5 c 0,-1.82822 0.17535,-3.11147 0.5,-4 0.44424,-1.19602 1.38937,-2.26525 2.5,-3 1.1277,-0.75177 2.48379,-1.49996 4.5,-1.5 2.5,0 4.1947,0.87241 5.45976,2.03147 l -1.63603,3.63589 c -0.95686,-0.17083 -2.46942,-0.66733 -3.32373,-0.66736 -1.4011,3e-5 -1.78946,0.016 -2.37039,0.61398 -0.58094,0.59806 -0.62961,0.74575 -0.62961,2.38602 l 0,2 6.5,0 0,5 -6.5,0 0,20 10,0 c 1.385,0 2.5,-1.115 2.5,-2.5 l 0,-37.5 c 0,-1.385 -1.115,-2.5 -2.5,-2.5 z"
-       id="rect3843"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <rect
-       width="100"
-       height="100"
-       x="625"
-       y="220"
-       id="rect4219-0"
-       style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <g
-       id="text3863"
-       style="font-size:17.49651146px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:120.00000477%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#e4a4be;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Avenir;-inkscape-font-specification:Avenir" />
-    <path
-       d="m 253.78571,5.0714269 -1,1 v 1 l 1,1 h 1 l 1,-1 v -1 l -1,-1 h -1 z m 0,4 -1,1.0000001 v 5 l 1,1 h 1 l 1,-1 v -5 l -1,-1.0000001 h -1 z"
-       id="path10613"
-       style="font-size:16.71258354px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#222222;fill-rule:nonzero;enable-background:accumulate;font-family:Helvetica Neue"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 253.78571,45.071427 -1,1 0,1 1,1 1,0 1,-1 0,-1 -1,-1 -1,0 z m 0,4 -1,1 0,5 1,1 1,0 1,-1 0,-5 -1,-1 -1,0 z"
-       id="path10620"
-       style="font-size:16.71258354px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#000000;fill-rule:nonzero;enable-background:accumulate;font-family:Helvetica Neue"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 253.78571,25.071427 -1,1 0,1 1,1 1,0 1,-1 0,-1 -1,-1 -1,0 z m 0,4 -1,1 0,5 1,1 1,0 1,-1 0,-5 -1,-1 -1,0 z"
-       id="path5293"
-       style="font-size:16.71258354px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-rule:nonzero;enable-background:accumulate;font-family:Helvetica Neue"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 431,2.9999969 0,1 2,2.40625 0,1.59375 4,0 0,-1.59375 2,-2.40625 0,-1 -1,0 -2,2 -2,0 -2,-2 -1,0 z m 1,6 -1,1 -3,0 -1,1.0000001 1,1 3,0 0,1 -2,1 -1,1 0,1 1,0 2,-1 2,2 4,0 2,-2 2,1 1,0 0,-1 -1,-1 -2,-1 0,-1 3,0 1,-1 -1,-1.0000001 -3,0 -1,-1 -6,0 z"
-       id="rect14284"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 431,22.999997 0,1 2,2.40625 0,1.59375 4,0 0,-1.59375 2,-2.40625 0,-1 -1,0 -2,2 -2,0 -2,-2 -1,0 z m 1,6 -1,1 -3,0 -1,1 1,1 3,0 0,1 -2,1 -1,1 0,1 1,0 2,-1 2,2 4,0 2,-2 2,1 1,0 0,-1 -1,-1 -2,-1 0,-1 3,0 1,-1 -1,-1 -3,0 -1,-1 -6,0 z"
-       id="path14358"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 431,42.999997 0,1 2,2.40625 0,1.59375 4,0 0,-1.59375 2,-2.40625 0,-1 -1,0 -2,2 -2,0 -2,-2 -1,0 z m 1,6 -1,1 -3,0 -1,1 1,1 3,0 0,1 -2,1 -1,1 0,1 1,0 2,-1 2,2 4,0 2,-2 2,1 1,0 0,-1 -1,-1 -2,-1 0,-1 3,0 1,-1 -1,-1 -3,0 -1,-1 -6,0 z"
-       id="path14360"
-       style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 507,26.999997 2,0 3,3 4.7735,-6 2.2265,0 0,2 -5,6 -1,1 -2,0 -1,-1 -3,-3 z"
-       id="path3361"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 507,6.999997 2,0 3,3 4.7735,-6 2.2265,0 0,2 -5,6 -1,1 -2,0 -1,-1 -3,-3 z"
-       id="path3365"
-       style="color:#000000;fill:#7f7f7f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <g
-       transform="translate(20,0)"
-       id="g16825">
-      <path
-         d="m 524,5 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 10,0 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m -9,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m -6,6 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         transform="translate(25,-3.0624999e-6)"
-         id="path17679"
-         style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 558.0625,9.21875 -1.5,2.5 0.875,0.53125 1.5,-2.5 -0.875,-0.53125 z"
-         id="path17685"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 551.9375,9.21875 -0.875,0.53125 1.5,2.5 0.875,-0.53125 -1.5,-2.5 z"
-         id="path17687"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="translate(5457.5,-1245.375)"
-       id="g17870">
-      <path
-         d="m -4868.5,1248.3622 -1,1 0,2 1,1 0,6 -1,1 0,2 1,1 2,0 1,-1 6,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-6 1,-1 0,-2 -1,-1 -2,0 -1,1 -6,0 -1,-1 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m -8,2 6,0 1,1 0,6 -1,1 -6,0 -1,-1 0,-6 z m -2,8 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path2997-7-7"
-         style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m -4863.5,1253.3622 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path17497-7-3"
-         style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="translate(-49,-1)"
-       id="g16816">
-      <path
-         d="m 598,4.9872 0,0 -1,1 0,1 0,1 0,1 1,1 0,0 1,1 1,0 1,0 1,0 1,-1 0,0 1,-1 0,-1 0,-1 0,-1 -1,-1 0,0 -1,-1 -1,0 -1,0 -1,0 z m 2,1 1,0 1,1 0,1 -1,1 -1,0 -1,-1 0,-1 z"
-         id="path17900"
-         style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 608,5.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path17902"
-         style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 606,11.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path17942"
-         style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 600,13.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path17944"
-         style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 604.34375,10.625 -0.6875,0.71875 1,1 0.6875,-0.71875 -1,-1 z"
-         id="path17687-1"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 605,7 0,1 1,0 0,-1 -1,0 z"
-         id="path17964"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 600,12 0,1 1,0 0,-1 -1,0 z"
-         id="path17966"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="translate(20,20)"
-       id="g16830"
-       style="fill:#ffffff">
-      <path
-         d="m 524,5 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 10,0 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m -9,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m -6,6 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         transform="translate(25,-3.0624999e-6)"
-         id="path16832"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 558.0625,9.21875 -1.5,2.5 0.875,0.53125 1.5,-2.5 -0.875,-0.53125 z"
-         id="path16834"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 551.9375,9.21875 -0.875,0.53125 1.5,2.5 0.875,-0.53125 -1.5,-2.5 z"
-         id="path16836"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="translate(5457.5,-1225.375)"
-       id="g16838"
-       style="fill:#ffffff">
-      <path
-         d="m -4868.5,1248.3622 -1,1 0,2 1,1 0,6 -1,1 0,2 1,1 2,0 1,-1 6,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-6 1,-1 0,-2 -1,-1 -2,0 -1,1 -6,0 -1,-1 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m -8,2 6,0 1,1 0,6 -1,1 -6,0 -1,-1 0,-6 z m -2,8 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path16840"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m -4863.5,1253.3622 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path16842"
-         style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="translate(-49,19)"
-       id="g16844"
-       style="fill:#ffffff">
-      <path
-         d="m 598,4.9872 0,0 -1,1 0,1 0,1 0,1 1,1 0,0 1,1 1,0 1,0 1,0 1,-1 0,0 1,-1 0,-1 0,-1 0,-1 -1,-1 0,0 -1,-1 -1,0 -1,0 -1,0 z m 2,1 1,0 1,1 0,1 -1,1 -1,0 -1,-1 0,-1 z"
-         id="path16846"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 608,5.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path16848"
-         style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 606,11.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path16850"
-         style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 600,13.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path16852"
-         style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 604.34375,10.625 -0.6875,0.71875 1,1 0.6875,-0.71875 -1,-1 z"
-         id="path16854"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 605,7 0,1 1,0 0,-1 -1,0 z"
-         id="path16856"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 600,12 0,1 1,0 0,-1 -1,0 z"
-         id="path16858"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="translate(20,40)"
-       id="g16860"
-       style="opacity:0.5">
-      <path
-         d="m 524,5 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 10,0 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m -9,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m -6,6 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         transform="translate(25,-3.0624999e-6)"
-         id="path16862"
-         style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 558.0625,9.21875 -1.5,2.5 0.875,0.53125 1.5,-2.5 -0.875,-0.53125 z"
-         id="path16864"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 551.9375,9.21875 -0.875,0.53125 1.5,2.5 0.875,-0.53125 -1.5,-2.5 z"
-         id="path16866"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="translate(5457.5,-1205.375)"
-       id="g16868"
-       style="opacity:0.5">
-      <path
-         d="m -4868.5,1248.3622 -1,1 0,2 1,1 0,6 -1,1 0,2 1,1 2,0 1,-1 6,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-6 1,-1 0,-2 -1,-1 -2,0 -1,1 -6,0 -1,-1 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m -8,2 6,0 1,1 0,6 -1,1 -6,0 -1,-1 0,-6 z m -2,8 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path16870"
-         style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m -4863.5,1253.3622 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path16872"
-         style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="translate(-49,39)"
-       id="g16874"
-       style="opacity:0.5">
-      <path
-         d="m 598,4.9872 0,0 -1,1 0,1 0,1 0,1 1,1 0,0 1,1 1,0 1,0 1,0 1,-1 0,0 1,-1 0,-1 0,-1 0,-1 -1,-1 0,0 -1,-1 -1,0 -1,0 -1,0 z m 2,1 1,0 1,1 0,1 -1,1 -1,0 -1,-1 0,-1 z"
-         id="path16876"
-         style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 608,5.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path16878"
-         style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 606,11.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path16880"
-         style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 600,13.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
-         id="path16882"
-         style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 604.34375,10.625 -0.6875,0.71875 1,1 0.6875,-0.71875 -1,-1 z"
-         id="path16884"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 605,7 0,1 1,0 0,-1 -1,0 z"
-         id="path16886"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 600,12 0,1 1,0 0,-1 -1,0 z"
-         id="path16888"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         inkscape:connector-curvature="0" />
-    </g>
-    <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3805"
-       d="m 334.5,22.999997 -6.5,3 0,1 6.5,3 1,0 6.5,-3 0,-1 -6.5,-3 -1,0 z m -5.40625,6.5 -1.09375,0.5 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z m 0,4 -1.09375,0.5 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z"
-       inkscape:connector-curvature="0" />
-    <path
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 9,4 -6,11 1,1 12,0 1,-1 -6,-11 z m 1,3 1,1 0,2 -1,1 -1,-1 0,-2 z m 0,5 1,1 -1,1 -1,-1 z"
-       transform="translate(25,-3.0624999e-6)"
-       id="path4065-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccccccccc" />
-    <path
-       id="path6484"
-       d="m 34,23.999997 -7,11 1,1 14,0 1,-1 -7,-11 z m 1,3 1,1 0,2 -1,1 -1,-1 0,-2 z m 0,5 1,1 -1,1 -1,-1 z"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccccccccc" />
-    <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 34,43.999997 -7,11 1,1 14,0 1,-1 -7,-11 z m 1,3 1,1 0,2 -1,1 -1,-1 0,-2 z m 0,5 1,1 -1,1 -1,-1 z"
-       id="path6503"
-       sodipodi:nodetypes="ccccccccccccccccccc" />
-    <path
-       inkscape:connector-curvature="0"
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 357.5,251.25 c -1.385,0 -2.5,1.115 -2.5,2.5 l 0,37.5 c 0,1.385 1.115,2.5 2.5,2.5 l 35,0 c 1.385,0 2.5,-1.115 2.5,-2.5 l 0,-37.5 c 0,-1.385 -1.115,-2.5 -2.5,-2.5 l -35,0 z m 12.42187,8.95312 7.73438,0 -1.73438,1.26563 -2.45312,0 c 1.62608,0.62541 2.48437,2.50808 2.48437,4.45312 0,1.6339 -0.8932,3.04778 -2.17187,4.04688 -1.2477,0.97471 -1.48438,1.37445 -1.48438,2.20312 0,0.70735 1.33236,1.91155 2.03125,2.40625 2.04292,1.44503 2.70313,2.79195 2.70313,5.03125 0,2.79312 -2.69863,5.5625 -7.59375,5.5625 -4.29379,0 -7.92188,-1.73845 -7.92188,-4.53125 0,-2.83563 3.30028,-5.57812 7.59375,-5.57812 l 1.34375,0 c -0.58757,-0.57164 -1.04687,-1.27693 -1.04687,-2.14063 0,-0.51252 0.16172,-1.01502 0.39062,-1.45312 -0.23328,0.0169 -0.47328,0.0312 -0.71875,0.0312 -3.52671,0 -5.89062,-2.51638 -5.89062,-5.625 0,-3.04233 3.2677,-5.67188 6.73437,-5.67188 z M 384.5,260.75 l 1.5,0 0,4.5 4.5,0 0,1.5 -4.5,0 0,4.5 -1.5,0 0,-4.5 -4.5,0 0,-1.5 4.5,0 0,-4.5 z m -15.90625,0.5625 c -1.78652,0.18034 -2.94719,2.09397 -2.625,4.54687 0.34366,2.61549 2.24211,4.78433 4.23437,4.84375 0.0279,10e-4 0.0503,0 0.0781,0 1.94503,0 3.24491,-2.04547 2.90625,-4.625 -0.34398,-2.6158 -2.24274,-4.70589 -4.23438,-4.76562 -0.12447,-0.004 -0.24027,-0.012 -0.35937,0 z m 1.34375,14.46875 c -2.96791,-0.0322 -5.625,1.81947 -5.625,4.03125 0,2.2565 2.14147,4.125 5.10937,4.125 4.17246,0 5.625,-1.75882 5.625,-4.01563 0,-0.27206 -0.0325,-0.53796 -0.0937,-0.79687 -0.32583,-1.2771 -1.48237,-1.91083 -3.09375,-3.03125 -0.58601,-0.18951 -1.22922,-0.30529 -1.92187,-0.3125 z"
-       id="path6774"
-       inkscape:export-filename="/Users/saman/Desktop/id-google-plus.svg.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <g
-       transform="translate(301,-5.0000027)"
-       style="display:inline"
-       id="g7018">
-      <rect
-         style="opacity:0.5;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect6728-7"
-         width="20"
-         height="20"
-         x="-56"
-         y="145" />
-      <g
-         id="g6893-0"
-         style="display:inline"
-         transform="translate(-21,0.2499569)">
-        <path
-           style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="path4812-0-2"
-           d="m -33,152.75004 c -1.10457,0 -2.000003,0.89543 -2.000003,2 0,1.10457 0.895433,2 2.000003,2 1.104562,0 1.999996,-0.89543 1.999996,-2 0,-1.10457 -0.895434,-2 -1.999996,-2 z"
-           inkscape:connector-curvature="0" />
+         style="fill:#1a1a1a;fill-opacity:1"
+         id="g9599">
         <path
            inkscape:connector-curvature="0"
-           id="path4808-3-3"
-           transform="translate(46,-0.24995996)"
-           d="m -67,149 c -3.313744,0 -6,2.68627 -6,6 0,3.31375 2.686256,6 6,6 3.313731,0 6,-2.68625 6,-6 0,-3.31373 -2.686269,-6 -6,-6 z m -1,2 2,0 0,3 3,0 0,2 -3,0 0,3 -2,0 0,-3 -3,0 0,-2 3,0 0,-3 z m -8,3 0,2 2,0 0,-2 -2,0 z"
-           style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+           style="opacity:0.2;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path9601"
+           transform="matrix(1.5714241,0,0,1.5714241,72.999423,-294.92081)"
+           d="m -126,609.5 c 0,1.933 -1.567,3.5 -3.5,3.5 l 0,-3.5 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.1;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path9603"
+           transform="translate(0,52.362183)"
+           d="m -126,615 -4.5,-4.5 0,6.5 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.4;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path9605"
+           d="m -135.99999,662.86218 c 0,3.03756 2.46242,5.49998 5.49999,5.49998 l 0,-5.49998 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.6;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path9607"
+           d="m -135.99999,662.86216 c 0,-3.03756 2.46242,-5.49998 5.49999,-5.49998 l 0,5.49998 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.1;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path9609"
+           d="m -130.5,662.86216 -4,4.50002 -2.68804,-4.50002 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.1;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path9611"
+           d="m -135,658.36218 4.5,4.5 0,-6.5 z" />
       </g>
     </g>
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path15565"
+     d="m 363,10 0,-2 10,-4 2,0 0,2 -4,10 -2,0 0,-6 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3767"
+     d="m 363,30 0,-2 10,-4 2,0 0,2 -4,10 -2,0 0,-6 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3769"
+     d="m 363,49.999997 0,-2 10,-4 2,0 0,2 -4,10 -2,0 0,-6 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path2997"
+     d="m 89,2 -5,4.5 5,4.5 0,-3 3,0 1,1 0,3 -1,1 -5,0 -1,1 0,1 1,1 5,0 2,-1 1,-1 1,-2 L 96,9 95,7 94,6 92,5 89,5 z m 22,0 0,3 -3,0 -2,1 -1,1 -1,2 0,3 1,2 1,1 2,1 5,0 1,-1 0,-1 -1,-1 -5,0 -1,-1 0,-3 1,-1 3,0 0,3 5,-4.5 z M 54,3 53,4 53,5.59375 46.59375,12 45,12 l -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 L 54.40625,7 56,7 57,6 57,4 56,3 z m 96,0 -6,6 1,1 3,0 0,6 1,1 2,0 1,-1 0,-6 3,0 1,-1 z M 32,4 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 23,0 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 C 54.74848,6 54.51948,5.9033 54.34375,5.75 54.30935,5.71998 54.28,5.69066 54.25,5.65625 54.09665,5.480519 54,5.251521 54,5 54,4.44772 54.44772,4 55,4 z m 10,0 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 z m 69.5,0 -4.9375,8.5625 L 126,9 l -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 z m 30.5,0 -1,1 0,1 4,4 -4,4 0,1 1,1 1,0 4,-4 4,4 1,0 1,-1 0,-1 -4,-4 4,-4 0,-1 -1,-1 -1,0 -4,4 -4,-4 z m 21,0 -1,1 0,1 1,1 8,0 1,-1 0,-1 -1,-1 z M 66,5 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 C 73.44772,7 73,6.552285 73,6 73,5.447715 73.44772,5 74,5 z M 32.15625,7 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 z M 68,7 l 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 z m 118,1 0,7 1,1 6,0 1,-1 0,-7 z m 2,2 1,0 0,4 -1,0 0,-1 z m 3,0 1,0 0,3 0,1 -1,0 z M 46,13 c 0.25152,0 0.48052,0.0967 0.65625,0.25 L 46.75,13.34375 C 46.90335,13.519481 47,13.748484 47,14 c 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 20,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z" />
+  <g
+     style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="g44379"
+     transform="translate(-536.00001,-43.999997)">
+    <g
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.55555558;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="g44381"
+       transform="matrix(0.64285714,0,0,0.64285714,332.85714,42.142857)">
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.55555558;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path44383"
+         d="m 925.00003,71.333338 c -3.86599,0 -7,3.13401 -7,7 0,1.12542 0.30585,2.16901 0.77778,3.11111 l -5.44445,5.444436 0,3.11111 3.11112,0 5.44444,-5.44444 c 0.94211,0.47192 1.98568,0.77778 3.11111,0.77778 3.86599,0 7,-3.134006 7,-6.999996 0,-3.86599 -3.13401,-7 -7,-7 z m 0,3.11111 c 2.14777,0 3.88889,1.74112 3.88889,3.88889 0,2.14777 -1.74112,3.88889 -3.88889,3.88889 -2.14777,0 -3.88889,-1.74112 -3.88889,-3.88889 0,-2.14777 1.74112,-3.88889 3.88889,-3.88889 z" />
+    </g>
     <g
-       id="g7098"
-       style="fill:#222222;fill-opacity:1;display:inline"
-       transform="translate(301,14.999997)">
-      <rect
-         y="145"
-         x="-56"
-         height="20"
-         width="20"
-         id="rect7100"
-         style="opacity:0.5;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <g
-         transform="translate(-21,0.2499569)"
-         style="fill:#222222;fill-opacity:1;display:inline"
-         id="g7102">
-        <path
-           style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="m 14,24 c -3.313744,0 -6,2.68627 -6,6 0,3.31375 2.686256,6 6,6 3.313731,0 6,-2.68625 6,-6 0,-3.31373 -2.686269,-6 -6,-6 z m -1,2 2,0 0,3 3,0 0,2 -3,0 0,3 -2,0 0,-3 -3,0 0,-2 3,0 0,-3 z M 2,28 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.104562,0 2,-0.89543 2,-2 0,-1.10457 -0.895438,-2 -2,-2 z m 3,1 0,2 2,0 0,-2 -2,0 z"
-           transform="translate(-35,124.75004)"
-           id="path7104"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="g44387"
+       transform="matrix(0.35714364,0,0,0.35714364,597.14212,77.857044)" />
+  </g>
+  <g
+     style="fill:#ffffff;fill-opacity:1;display:inline"
+     id="g9588-4"
+     transform="translate(-681,73.63782)">
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path9584-2"
+       transform="translate(756,-73.637817)"
+       d="m 174,3 -1,1 0,4 -4,0 -1,1 0,1 1,1 4,0 0,4 1,1 1,0 1,-1 0,-4 4,0 1,-1 0,-1 -1,-1 -4,0 0,-4 -1,-1 -1,0 z" />
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path9631"
+     d="m 265,8.0000031 11,0 1,1.00002 0,0.9999999 -1,0.99998 -11,0 -1,-1 0,-0.9999999 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3048-0-7-5-6"
+     d="m 288.5,3.0000131 c -3.03757,0 -5.5,2.46243 -5.5,5.5 0,3.0375699 2.46243,5.4999999 5.5,5.4999999 1.00612,0 1.93866,-0.27827 2.75,-0.75 l 3.75,3.75 1,0 1,-1 0,-1 -3.75,-3.75 c 0.47173,-0.81134 0.75,-1.7438699 0.75,-2.7499999 0,-3.03757 -2.46243,-5.5 -5.5,-5.5 z m -0.5,2 1,0 2,1 1,2 0,1 -1,1.9999999 -2,1 -1,0 -2,-1 -1,-1.9999999 0,-1 1,-2 2,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path54704-4"
+     d="m 329.5,3.0000003 c -1.5,0 -2.5,2 -2.5,3 0,0.666667 0,1.333333 0,2 0,1 1,2.1538467 1,2.1538467 L 328,11 l -1.69231,0.384617 c -1.45419,0.330499 -2.02608,1.236079 -2.15384,2.76923 L 324,16.000001 l 12,0 -0.15385,-1.846154 c -0.12776,-1.533151 -0.69965,-2.438731 -2.15384,-2.76923 L 332,11 l 0,-0.846153 c 0,0 1,-1.1538467 1,-2.1538467 0,-0.666667 0,-1.333333 0,-2 0,-1 -1,-3 -2.5,-3 z" />
+  <g
+     style="opacity:0.5;fill:#000000;fill-opacity:1;display:inline"
+     id="g9693"
+     transform="translate(480,-613.36218)">
     <path
        inkscape:connector-curvature="0"
        style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path17942-7"
-       d="m 614,7.9999969 -1,1.0000001 0,2 1,1 2,0 1,-1 0,-2 -1,-1.0000001 -2,0 z m 1,1.0000001 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
+       id="path9695"
+       transform="translate(0,52.362183)"
+       d="m -130.5,603 c -4.14213,0 -7.5,3.35787 -7.5,7.5 0,4.14214 3.35787,7.5 7.5,7.5 4.14213,0 7.5,-3.35786 7.5,-7.5 0,-4.14213 -3.35787,-7.5 -7.5,-7.5 z m 0,1 c 3.58393,0 6.5,2.91607 6.5,6.5 0,3.58393 -2.91607,6.5 -6.5,6.5 -3.58393,0 -6.5,-2.91607 -6.5,-6.5 0,-3.58393 2.91607,-6.5 6.5,-6.5 z" />
+    <g
+       style="fill:#000000;fill-opacity:1"
+       id="g9697"
+       clip-path="url(#clipPath9141-6)">
+      <rect
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect9699"
+         y="657.36218"
+         x="-131"
+         height="6"
+         width="1" />
+      <g
+         style="fill:#000000;fill-opacity:1"
+         id="g9701">
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path9703"
+           transform="matrix(1.5714241,0,0,1.5714241,72.999423,-294.92081)"
+           d="m -126,609.5 c 0,1.933 -1.567,3.5 -3.5,3.5 l 0,-3.5 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path9705"
+           transform="translate(0,52.362183)"
+           d="m -126,615 -4.5,-4.5 0,6.5 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.4;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path9707"
+           d="m -135.99999,662.86218 c 0,3.03756 2.46242,5.49998 5.49999,5.49998 l 0,-5.49998 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path9709"
+           d="m -135.99999,662.86216 c 0,-3.03756 2.46242,-5.49998 5.49999,-5.49998 l 0,5.49998 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path9711"
+           d="m -130.5,662.86216 -4,4.50002 -2.68804,-4.50002 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path9713"
+           d="m -135,658.36218 4.5,4.5 0,-6.5 z" />
+      </g>
+    </g>
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#1c1c1c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path47528"
+     d="m 391.5,3.9999978 c -2.48528,0 -4.5,2.0147207 -4.5,4.5 0,0.7234907 0.19662,1.3943635 0.50001,2.0000052 L 384,13.999998 l 0,1.999999 2.00001,0 L 389.5,12.5 c 0.60565,0.303377 1.27651,0.499995 2,0.499995 2.48528,0 4.5,-2.014712 4.5,-4.4999972 0,-2.4852793 -2.01472,-4.5 -4.5,-4.5 z m 0,1.9999993 c 1.38071,0 2.5,1.1192914 2.5,2.5000007 0,1.3807157 -1.11929,2.5000002 -2.5,2.5000002 -1.38071,0 -2.5,-1.1192845 -2.5,-2.5000002 0,-1.3807093 1.11929,-2.5000007 2.5,-2.5000007 z" />
+  <g
+     style="opacity:0.5;fill:#000000;fill-opacity:1;display:inline"
+     id="g47761"
+     transform="translate(-681,113.63782)">
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path47763"
+       transform="translate(756,-73.637817)"
+       d="m 174,3 -1,1 0,4 -4,0 -1,1 0,1 1,1 4,0 0,4 1,1 1,0 1,-1 0,-4 4,0 1,-1 0,-1 -1,-1 -4,0 0,-4 -1,-1 -1,0 z" />
+  </g>
+  <g
+     style="opacity:0.5;fill:#000000;fill-opacity:1;display:inline"
+     id="g47765"
+     transform="translate(-660,113.63782)">
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path47767"
+       d="m 925,-65.637817 11,0 1,1.00002 0,1 -1,0.99998 -11,0 -1,-1 0,-1 z" />
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path47777"
+     d="m 288.5,43.000013 c -3.03757,0 -5.5,2.46243 -5.5,5.5 0,3.03757 2.46243,5.5 5.5,5.5 1.00612,0 1.93866,-0.27827 2.75,-0.75 l 3.75,3.75 1,0 1,-1 0,-1 -3.75,-3.75 c 0.47173,-0.81134 0.75,-1.74387 0.75,-2.75 0,-3.03757 -2.46243,-5.5 -5.5,-5.5 z m -0.5,2 1,0 2,1 1,2 0,1 -1,2 -2,1 -1,0 -2,-1 -1,-2 0,-1 1,-2 2,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path14143"
+     d="m 329.5,43 c -1.5,0 -2.5,2 -2.5,3 0,0.666667 0,1.333333 0,2 0,1 1,2.153847 1,2.153847 L 328,51 l -1.69231,0.384617 c -1.45419,0.330499 -2.02608,1.236079 -2.15384,2.76923 L 324,56.000001 l 12,0 -0.15385,-1.846154 c -0.12776,-1.533151 -0.69965,-2.438731 -2.15384,-2.76923 L 332,51 l 0,-0.846153 c 0,0 1,-1.153847 1,-2.153847 0,-0.666667 0,-1.333333 0,-2 0,-1 -1,-3 -2.5,-3 z" />
+  <g
+     style="fill:#ffffff;fill-opacity:1;display:inline"
+     id="g33295"
+     transform="translate(480,-633.36218)">
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path33297"
+       transform="translate(0,52.362183)"
+       d="m -130.5,603 c -4.14213,0 -7.5,3.35787 -7.5,7.5 0,4.14214 3.35787,7.5 7.5,7.5 4.14213,0 7.5,-3.35786 7.5,-7.5 0,-4.14213 -3.35787,-7.5 -7.5,-7.5 z m 0,1 c 3.58393,0 6.5,2.91607 6.5,6.5 0,3.58393 -2.91607,6.5 -6.5,6.5 -3.58393,0 -6.5,-2.91607 -6.5,-6.5 0,-3.58393 2.91607,-6.5 6.5,-6.5 z" />
+    <g
+       style="fill:#ffffff;fill-opacity:1"
+       id="g33299"
+       clip-path="url(#clipPath9141-6)">
+      <rect
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect33301"
+         y="657.36218"
+         x="-131"
+         height="6"
+         width="1" />
+      <g
+         style="fill:#ffffff;fill-opacity:1"
+         id="g33303">
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.2;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path33305"
+           transform="matrix(1.5714241,0,0,1.5714241,72.999423,-294.92081)"
+           d="m -126,609.5 c 0,1.933 -1.567,3.5 -3.5,3.5 l 0,-3.5 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path33307"
+           transform="translate(0,52.362183)"
+           d="m -126,615 -4.5,-4.5 0,6.5 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.4;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path33309"
+           d="m -135.99999,662.86218 c 0,3.03756 2.46242,5.49998 5.49999,5.49998 l 0,-5.49998 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.6;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path33311"
+           d="m -135.99999,662.86216 c 0,-3.03756 2.46242,-5.49998 5.49999,-5.49998 l 0,5.49998 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path33313"
+           d="m -130.5,662.86216 -4,4.50002 -2.68804,-4.50002 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path33315"
+           d="m -135,658.36218 4.5,4.5 0,-6.5 z" />
+      </g>
+    </g>
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.55555558;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path33341"
+     d="m 391.5,23.999999 c -2.48528,0 -4.5,2.01472 -4.5,4.499999 0,0.723491 0.19662,1.394364 0.50001,2.000006 L 384,33.999999 l 0,1.999999 2.00001,0 3.49999,-3.499997 c 0.60565,0.303377 1.27651,0.499995 2,0.499995 2.48528,0 4.5,-2.014712 4.5,-4.499998 0,-2.485279 -2.01472,-4.499999 -4.5,-4.499999 z m 0,1.999999 c 1.38071,0 2.5,1.119291 2.5,2.5 0,1.380716 -1.11929,2.500001 -2.5,2.500001 -1.38071,0 -2.5,-1.119285 -2.5,-2.500001 0,-1.380709 1.11929,-2.5 2.5,-2.5 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path9820"
+     d="m 6,144 -1,1 0,1 1,1 8,0 1,-1 0,-1 -1,-1 z m 0,4 0,7 1,1 6,0 1,-1 0,-7 z m 2,2 1,0 0,4 -1,0 0,-1 z m 3,0 1,0 0,3 0,1 -1,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path9826"
+     d="m 64,145.01282 c -1,0 -2,1 -2,2 l 0,2 3,0 2,1 -2,1 -3,0 0,2 c 0,1 1,2 2,2 l 1,0 c 2,0 2.48722,-0.97443 3,-2 l 1,-2 9,-5 c 0,0 0,-1 -2,-1 L 68.96875,148.91907 68,147.01282 c -0.49406,-0.98812 -1,-2 -3,-2 z m 0,1 2,0 1,2 -4,0 c 0,0 0,-0.66667 0,-1 0,-1.01282 1,-1 1,-1 z m 8.09375,4.71875 -2,1 L 76,155.01282 c 2,0 2,-1 2,-1 z M 63,152.01282 l 4,0 -1,2 -2,0 c 0,0 -1,0 -1,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4824"
+     d="m 30,141 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4822"
+     d="m 164,142 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4820"
+     d="m 108,145 -4,5 4,5 2,0 0,-1 -3.5,-4 3.5,-4 0,-1 -2,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4818"
+     d="m 114,145 -4,5 4,5 2,0 0,-1 -3.5,-4 3.5,-4 0,-1 -2,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4816"
+     d="m 22.84375,146 c -0.77652,0.0669 -1.494002,0.58712 -1.75,1.375 -0.341331,1.05051 0.230742,2.18992 1.28125,2.53125 1.050508,0.34133 2.189919,-0.23074 2.53125,-1.28125 0.341331,-1.05051 -0.230742,-2.18992 -1.28125,-2.53125 -0.262627,-0.0853 -0.52241,-0.11611 -0.78125,-0.0937 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4814"
+     d="m 36.78125,146 c -0.132056,0.0149 -0.274936,0.0512 -0.40625,0.0937 -1.050508,0.34133 -1.622581,1.48074 -1.28125,2.53125 0.341331,1.05051 1.480742,1.62258 2.53125,1.28125 1.050508,-0.34133 1.622581,-1.48074 1.28125,-2.53125 -0.298664,-0.91919 -1.20061,-1.47926 -2.125,-1.375 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4812"
+     d="m 42,148 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4810"
+     d="m 50,148 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4808"
+     d="m 58,148 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4806"
+     d="m 90,148 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4861"
+     d="m 130,141 -3,3 1,1 1,0 0,2 2,0 0,-2 1,0 1,-1 -3,-3 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4859"
+     d="m 124,147 -3,3 3,3 1,-1 0,-1 2,0 0,-2 -2,0 0,-1 -1,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4857"
+     d="m 136,147 -1,1 0,1 -2,0 0,2 2,0 0,1 1,1 3,-3 -3,-3 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4855"
+     d="m 130,148 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4804"
+     d="m 129,153 0,2 -1,0 -1,1 3,3 3,-3 -1,-1 -1,0 0,-2 -2,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4802"
+     d="m 190,148 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4800"
+     d="m 164,154 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4798"
+     d="m 176,154 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4796"
+     d="m 26.0625,154 c -0.641658,-0.0219 -1.281719,0.25399 -1.6875,0.8125 -0.64925,0.89362 -0.456116,2.16325 0.4375,2.8125 0.893616,0.64925 2.16325,0.45612 2.8125,-0.4375 0.64925,-0.89362 0.456116,-2.16325 -0.4375,-2.8125 -0.335106,-0.24347 -0.740005,-0.36184 -1.125,-0.375 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path9830"
+     d="m 33.9375,154 c -0.384995,0.0132 -0.789894,0.13153 -1.125,0.375 -0.893615,0.64925 -1.08675,1.91888 -0.4375,2.8125 0.64925,0.89362 1.918885,1.08675 2.8125,0.4375 0.893615,-0.64925 1.08675,-1.91888 0.4375,-2.8125 -0.405781,-0.55851 -1.045842,-0.83443 -1.6875,-0.8125 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#7092ff;fill-opacity:1;stroke:none;stroke-width:0.50000125;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     id="path9840"
+     d="m 27.03125,142.60657 c -1.32908,0.53118 -2.444369,1.41916 -3.3125,2.53125 0.07092,0.0184 0.149734,0.009 0.21875,0.0312 0.520689,0.16918 0.941853,0.48986 1.28125,0.875 0.583365,-0.69731 1.320919,-1.23792 2.15625,-1.625 -0.228003,-0.42194 -0.375,-0.89709 -0.375,-1.4062 0,-0.14028 0.0122,-0.27085 0.03125,-0.40625 z m 5.9375,0 C 32.9878,142.74197 33,142.87254 33,143.01282 c 0,0.50911 -0.146997,0.98426 -0.375,1.40625 0.835331,0.38708 1.572885,0.92769 2.15625,1.625 0.339397,-0.38514 0.760561,-0.70582 1.28125,-0.875 0.06748,-0.0219 0.146303,-0.0395 0.21875,-0.0625 -0.866395,-1.10291 -1.991152,-1.97191 -3.3125,-2.5 z m -10.9375,8.21875 c 0.132811,1.35398 0.618313,2.61506 1.34375,3.6875 0.05422,-0.0956 0.121594,-0.19054 0.1875,-0.28125 0.298579,-0.41096 0.689964,-0.72255 1.125,-0.9375 -0.439267,-0.72096 -0.728373,-1.5606 -0.84375,-2.4375 -0.563589,0.16464 -1.184566,0.16262 -1.78125,-0.0312 -0.009,-0.003 -0.02228,0.003 -0.03125,0 z m 15.90625,0 c -0.596684,0.19387 -1.217661,0.19589 -1.78125,0.0312 -0.115377,0.8769 -0.404483,1.71654 -0.84375,2.4375 0.438042,0.20421 0.821177,0.51932 1.125,0.9375 0.06591,0.0907 0.133279,0.18566 0.1875,0.28125 0.725438,-1.07244 1.210939,-2.33352 1.34375,-3.6875 -0.009,0.003 -0.02224,-0.003 -0.03125,0 z M 29,156.16907 c -0.03014,0.55835 -0.21394,1.114 -0.5625,1.59375 -0.027,0.0372 -0.06534,0.0582 -0.09375,0.0937 0.540476,0.11583 1.081942,0.1875 1.65625,0.1875 0.574308,0 1.115774,-0.0717 1.65625,-0.1875 -0.02841,-0.0355 -0.06675,-0.0566 -0.09375,-0.0937 -0.34856,-0.47975 -0.532362,-1.0354 -0.5625,-1.59375 -0.329444,0.0535 -0.654988,0.0937 -1,0.0937 -0.345012,0 -0.670556,-0.0403 -1,-0.0937 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path9854"
+     d="m 84,146.01282 -4,4 4,4 1,-1 0,-2 2.1875,0 c -0.11352,-0.31647 -0.1875,-0.64447 -0.1875,-1 0,-0.34518 0.0802,-0.69136 0.1875,-1 l -2.1875,0 0,-2 -1,-1 z m 12,0 -1,1 0,2 -2.1875,0 c 0.10728,0.30864 0.1875,0.65482 0.1875,1 0,0.35553 -0.074,0.68353 -0.1875,1 l 2.1875,0 0,2 1,1 4,-4 -4,-4 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path5624-8"
+     d="m 149,143 -1,1 0,4 -4,0 -1,1 0,2 1,1 4,0 0,4 1,1 2,0 1,-1 0,-4 4,0 1,-1 0,-2 -1,-1 -4,0 0,-4 -1,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path11047"
+     d="m 206,45.000002 -1,1 0,1 3,3 -3,3 0,1 1,1 1,0 3,-3 3,3 1,0 1,-1 0,-1 -3,-3 3,-3 0,-1 -1,-1 -1,0 -3,3 -3,-3 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path6502"
+     d="m 190,140 -1,1 0,1.0625 c -3.94444,0.49381 -7,3.85922 -7,7.9375 0,4.41827 3.58173,8 8,8 4.41827,0 8,-3.58173 8,-8 0,-2.46731 -1.11852,-4.65856 -2.875,-6.125 l -1.40625,1.40625 C 195.11409,146.37996 196,148.08592 196,150 c 0,3.3137 -2.6863,6 -6,6 -3.3137,0 -6,-2.6863 -6,-6 0,-2.97561 2.15859,-5.43327 5,-5.90625 l 0,0.90625 1,1 3,-3 -3,-3 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#222222;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     id="path6699"
+     d="m 208,142 c -1.33333,0 -2.21875,0.78125 -2.71875,1.28125 -0.5,0.5 -0.61458,0.71875 -1.28125,0.71875 l -1,0 0,2 1,0 c 1.33333,0 2.21875,-0.78125 2.71875,-1.28125 0.5,-0.5 0.61458,-0.71875 1.28125,-0.71875 0.16667,0 0.20569,0.009 0.40625,0.25 0.20056,0.24067 0.4375,0.6875 0.6875,1.1875 0.25,0.5 0.51306,1.05317 0.9375,1.5625 0.42444,0.50933 1.13542,1 1.96875,1 1.33333,0 2.21875,-0.78125 2.71875,-1.28125 0.5,-0.5 0.61458,-0.71875 1.28125,-0.71875 l 1,0 0,-2 -1,0 c -1.33333,0 -2.21875,0.78125 -2.71875,1.28125 -0.5,0.5 -0.61458,0.71875 -1.28125,0.71875 -0.16667,0 -0.20569,-0.009 -0.40625,-0.25 -0.20056,-0.24067 -0.4375,-0.6875 -0.6875,-1.1875 -0.25,-0.5 -0.51306,-1.05317 -0.9375,-1.5625 -0.42444,-0.50933 -1.13542,-1 -1.96875,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#222222;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     id="path7209"
+     d="m 203,156 0,2 14,0 0,-2 -14,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path25361-5"
+     d="m 425,10 8,7 1,-1 0,-12 -1,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect6778"
+     d="m 24,205 -1,1 0,9 1,1 12,0 1,-1 0,-9 -1,-1 z m 1,3 5,2.8125 5,-2.8125 0,1.5 -5,3 -5,-3 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect6788"
+     d="m 46,203 -1,1 0,12 1,1 8,0 1,-1 0,-12 -1,-1 -8,0 z m 1,2 6,0 0,5 -6,0 0,-5 z m 0,7 6,0 0,1 -6,0 0,-1 z m 0,2 6,0 0,1 -6,0 0,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect6808"
+     d="m 65,204 -1,1 0,8 -2,2 1,1 14,0 1,-1 -2,-2 0,-8 -1,-1 -10,0 z m 1,2 8,0 0,5 -8,0 0,-5 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path16625-6"
+     d="m 90,202 -5,4 1,1 2,0 0,2 4,0 0,-2 2,0 1,-1 z m -2,9 0,2 -2,0 -1,1 5,4 5,-4 -1,-1 -2,0 0,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path6899"
+     d="m 102.5,205 -1,1 5,10 1.21875,0 2.28125,-3.9375 2.28125,3.9375 1.21875,0 5,-10 -1,-1 -1,0 -3.5,7.5 -1.5,-2.5 2,-4 -0.5,-1 -1.5,0 -1.5,3.5 -1.5,-3.5 -1.5,0 -0.5,1 2,4 -1.5,2.5 -3.5,-7.5 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path6918"
+     d="m 10,202 c -4.418278,0 -8,3.58172 -8,8 0,4.41828 3.581722,8 8,8 4.418278,0 8,-3.58172 8,-8 0,-4.41828 -3.581722,-8 -8,-8 z m 0,2 c 3.313708,0 6,2.68629 6,6 0,3.31371 -2.686292,6 -6,6 -3.3137085,0 -6,-2.68629 -6,-6 0,-3.31371 2.6862915,-6 6,-6 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path6922"
+     d="m 12,207 a 2,2 0 0 1 -4,0 2,2 0 1 1 4,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect6926"
+     d="m 8,211 1,-1 2,0 1,1 0,3 -4,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect4678"
+     d="m 125,204 -1,1 0,11 1,1 8,0 3,-3 0,-9 -1,-1 -10,0 z m 5,2 c 0.55228,0 1,0.44772 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m -4,4 8,0 0,1 -8,0 0,-1 z m 0,2 8,0 0,1 -8,0 0,-1 z m 0,2 5,0 0,1 -5,0 0,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3226"
+     d="M 146.0625,208.40625 C 144.26792,209.16529 143,210.92893 143,213 c 0,2.76142 2.23858,5 5,5 1.99494,0 3.69772,-1.18524 4.5,-2.875 l -0.65625,-1.125 -1.03125,0 c -0.41551,1.15835 -1.51118,2 -2.8125,2 -1.65685,0 -3,-1.34315 -3,-3 0,-0.88447 0.39109,-1.66968 1,-2.21875 L 146,209 c 0,-0.20559 0.0222,-0.39929 0.0625,-0.59375 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4691-9"
+     d="m 149,202 c -1.10456,0 -2,0.89544 -2,2 0,1.10456 0.89544,2 2,2 1.10456,0 2,-0.89544 2,-2 0,-1.10456 -0.89544,-2 -2,-2 z m 0,5 c -1.108,0 -2,0.892 -2,2 l 0,2 c 0,1.108 0.892,2 2,2 l 3.5,0 1.6875,2.90625 c 0.26893,0.4628 0.8482,0.64134 1.3125,0.375 l 0.0312,0 c 0.4643,-0.26634 0.61268,-0.88095 0.34375,-1.34375 l -2.03125,-3.46875 c -0.0158,-0.0271 -0.0446,-0.0375 -0.0625,-0.0625 -0.0468,-0.0617 -0.0966,-0.10697 -0.15625,-0.15625 -0.0773,-0.0673 -0.15761,-0.11687 -0.25,-0.15625 -0.1049,-0.0447 -0.19835,-0.0878 -0.3125,-0.0937 -0.0224,-10e-4 -0.04,-4e-4 -0.0625,0 l -0.0937,0 -1.90625,0 0,-2 c 0,-1.108 -0.892,-2 -2,-2 z" />
+  <g
+     id="g20251-9"
+     transform="translate(301,239.63781)">
+    <g
+       id="g20247-4"
+       transform="translate(10.000004,-1.9999957)">
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path20243-7"
+         transform="matrix(1.009009,0,0,1.009009,-410.98649,14.371188)"
+         d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path20245-0"
+         transform="matrix(0.72072059,0,0,0.72072059,-381.41891,-22.917117)"
+         d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z" />
+    </g>
+  </g>
+  <g
+     id="g20283"
+     transform="translate(301,200.63781)">
+    <g
+       id="g20285"
+       transform="translate(10.000004,-1.9999957)">
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path20287"
+         transform="matrix(1.009009,0,0,1.009009,-410.98649,15.371188)"
+         d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path20289"
+         transform="matrix(0.72072059,0,0,0.72072059,-381.41891,-21.917117)"
+         d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z" />
+    </g>
+  </g>
+  <g
+     id="g20299"
+     transform="translate(340,239.63781)">
+    <g
+       id="g20301"
+       transform="translate(10.000004,-1.9999957)">
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path20303"
+         transform="matrix(1.009009,0,0,1.009009,-411.98649,14.371188)"
+         d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path20305"
+         transform="matrix(0.72072059,0,0,0.72072059,-382.41891,-22.917117)"
+         d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z" />
+    </g>
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path20311"
+     d="m 44.999996,83.499995 a 3.5,3.5 0 0 1 -7,0 3.5,3.5 0 1 1 7,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path20313"
+     d="m 43.999995,83.499989 a 2.4999995,2.4999995 0 0 1 -4.999999,0 2.4999995,2.4999995 0 1 1 4.999999,0 z" />
+  <path
+     d="m 24,83.499993 a 1.5,1.5 0 0 1 -3,0 1.5,1.5 0 1 1 3,0 z"
+     id="path15602"
+     style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.009009;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     inkscape:connector-curvature="0" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4065"
+     d="m 454,10 -8,7 -1,-1 0,-12 1,-1 z" />
+  <g
+     id="g4611"
+     transform="matrix(0.390625,0,0,0.390625,842.1875,238.60852)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:34;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4565"
+       y="-47.637821"
+       x="-2156"
+       height="256"
+       width="256" />
+    <g
+       id="g4494"
+       transform="translate(-781,47)">
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path6718"
+         transform="matrix(2.56,0,0,2.56,-1375,-657.83782)"
+         d="m 3.90625,224.6875 7.8125,20.5 -7.8125,20.5 7.8125,20.53125 -7.8125,20.5 4.8125,1.84375 L 34.75,282.5 l 4.6875,0.71875 5.6875,-5.6875 c -3.349219,-3.88012 -5.88,-8.51217 -7.25,-13.625 L 40.5625,261.75 c -0.457539,-2.1233 -0.71875,-4.33618 -0.71875,-6.59375 0,-11.27802 6.012891,-21.19153 15,-26.6875 L 44.9375,224.6875 24.40625,232.5 l -20.5,-7.8125 z M 71,229 c -14.359404,0 -26,11.6406 -26,26 0,14.3594 11.640596,26 26,26 14.359404,0 26,-11.6406 26,-26 0,-14.3594 -11.640596,-26 -26,-26 z m 20.0625,50.15625 c -5.42082,4.51861 -12.380625,7.25 -19.96875,7.25 -2.257578,0 -4.47043,-0.26122 -6.59375,-0.71875 l -2.15625,2.65625 c -4.855312,-1.30096 -9.306172,-3.58895 -13.0625,-6.6875 l -5.875,5.875 0.71875,4.34375 -21.8125,21.84375 2.09375,0.8125 20.53125,-7.8125 20.5,7.8125 20.5,-7.8125 7.8125,-20.5 -2.6875,-7.0625 z" />
+    </g>
+  </g>
+  <g
+     id="g8629"
+     transform="matrix(0.5,0,0,0.5,-342.5001,125.49999)">
+    <rect
+       style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect8627"
+       y="238.99998"
+       x="935"
+       height="100.00001"
+       width="100.00001" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path5047-4-7"
+       d="m 1035,259.46976 c -3.679,1.6066 -7.6336,2.69227 -11.7831,3.18013 4.2351,-2.49939 7.4885,-6.45736 9.0205,-11.17402 -3.9645,2.31516 -8.3552,3.99577 -13.0286,4.90089 -3.7418,-3.92491 -9.0738,-6.37759 -14.9751,-6.37759 -11.33021,0 -20.51679,9.04283 -20.51679,20.19639 0,1.58324 0.18008,3.12476 0.53217,4.60303 -17.05108,-0.8424 -32.16868,-8.88327 -42.28747,-21.10256 -1.76581,2.98278 -2.77795,6.45238 -2.77795,10.15396 0,7.00715 3.62183,13.1887 9.12688,16.81077 -3.36304,-0.1076 -6.52651,-1.01351 -9.29247,-2.52616 -0.002,0.084 -0.002,0.16796 -0.002,0.25194 0,9.78524 7.07195,17.94866 16.45764,19.80431 -1.72156,0.46135 -3.53416,0.70856 -5.40515,0.70856 -1.32202,0 -2.60724,-0.12596 -3.85969,-0.36215 2.61039,8.02355 10.18701,13.86315 19.16488,14.02559 -7.02158,5.41762 -15.8675,8.64629 -25.48033,8.64629 -1.65593,0 -3.28903,-0.0945 -4.89377,-0.28289 9.07933,5.73043 19.86348,9.07458 31.44972,9.07458 37.73703,0 58.37353,-30.77522 58.37353,-57.46492 0,-0.87573 -0.037,-1.74674 -0.063,-2.61276 4.0095,-2.84789 7.4872,-6.40461 10.238,-10.45497" />
+  </g>
+  <g
+     style="fill:#1a1a1a;fill-opacity:1"
+     id="g3815"
+     transform="translate(-25,50.000003)">
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path3648"
+       transform="translate(25,-50.000003)"
+       d="m 464,2 -1,1 0,13 1,1 11,0 1,-1 0,-10 -4,0 0,6 -2.5,-1.5 -2.5,1.5 0,-6 -2,0 0,-1 0,-1 11,0 0,-1 0,-1 -12,0 z" />
+  </g>
+  <g
+     id="g3822"
+     transform="translate(-25,70.000003)">
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path3824"
+       transform="translate(25,-50.000003)"
+       d="m 464,2 -1,1 0,13 1,1 11,0 1,-1 0,-10 -4,0 0,6 -2.5,-1.5 -2.5,1.5 0,-6 -2,0 0,-1 0,-1 11,0 0,-1 0,-1 -12,0 z" />
+  </g>
+  <g
+     id="g3837"
+     transform="translate(-26,3.0624999e-6)" />
+  <g
+     style="fill:#ffffff"
+     id="g3842"
+     transform="translate(-25,20.000003)" />
+  <rect
+     style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect6623-9"
+     y="220"
+     x="200"
+     height="100"
+     width="100" />
+  <g
+     style="display:inline"
+     id="g7459-3"
+     transform="translate(550,-25)">
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path6625-8"
+       d="m -145,255 c 0,24.88542 0,49.77083 0,74.65625 7.5,3.44792 15,6.89583 22.5,10.34375 7.5,-3.33333 15,-6.66667 22.5,-10 7.5,3.33333 15,6.66667 22.5,10 7.5,-3.44792 15,-6.89583 22.5,-10.34375 0,-24.88542 0,-49.77083 0,-74.65625 -7.5,3.33333 -15,6.66667 -22.5,10 -7.5,-3.33333 -15,-6.66667 -22.5,-10 -7.5,3.33333 -15,6.66667 -22.5,10 -7.5,-3.33333 -15,-6.66667 -22.5,-10 z m 57.40625,23.59375 5.59375,5.59375 5.59375,-5.59375 2.46236,3.16264 -5.24361,5.24361 5.59375,5.59375 -3.16264,2.46236 L -82,289.8125 l -5.59375,5.59375 -3.08736,-2.97514 5.86861,-5.43111 -5.59375,-5.59375 z m -25.1875,12.3125 c 3.02949,0.26492 6.03959,1.32487 8.375,3.31225 l -2.90625,2.78125 c -1.69778,-1.26665 -3.7758,-1.93771 -5.87485,-2.1247 0.13531,-1.3229 0.27106,-2.64608 0.4061,-3.9688 z m -4.84375,0.375 c 0.23428,1.25604 1.33288,2.86593 1.28125,3.81245 -1.9797,1.00126 -3.28203,2.99612 -4.4062,4.74985 l -3.14878,-2.51673 c 1.59525,-2.42637 3.50946,-4.89188 6.27373,-6.04557 z m 33.46875,6.28125 3.6875,1.59375 c -0.85495,2.6344 -2.05943,5.19957 -3.8749,7.3124 l -2.78125,-2.90625 c 1.37974,-1.77526 2.31524,-3.85778 2.96865,-5.9999 z m -17.21875,0.0937 c 1.52998,2.21288 2.46049,4.7627 3.84365,7.06245 l -3.59375,1.78125 c -1.26185,-2.16828 -2.15272,-4.55761 -3.5936,-6.6249 1.11453,-0.7396 2.22935,-1.47918 3.3437,-2.2188 z m -24.75,3.8125 3.4375,2.03125 c -0.94627,2.15394 -1.82847,4.38347 -2.53105,6.59365 l -3.66832,-1.66122 c 0.79087,-2.367 1.68957,-4.70832 2.76187,-6.96368 z m 36.25,4.625 1.60017,3.68116 c -2.71921,1.52252 -6.25719,2.08348 -9.13142,0.66264 l 2.16859,-3.41112 c 1.76867,0.54341 3.84526,0.007 5.36266,-0.93268 z" />
+  </g>
+  <rect
+     style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect6623-9-2"
+     y="220"
+     x="300"
+     height="100"
+     width="100" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path8139-4-6-3"
+     d="m 567.5314,229 c -8.2842,0 -15,6.71574 -15,15 0,8.28429 15,21 15,21 0,0 15,-12.71571 15,-21 0,-8.28426 -6.7158,-15 -15,-15 z M 568,238 c 3.3138,0 6,2.68629 6,6 0,3.31371 -2.6862,6 -6,6 -3.3135,0 -6,-2.68629 -6,-6 0,-3.31371 2.6865,-6 6,-6 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path5387-6-5"
+     d="m 583.5,266 c -4.14214,0 -7.5,3.35786 -7.5,7.5 0,0.75557 0.13591,1.46849 0.34375,2.15625 l -18.6875,18.6875 C 556.96849,294.13591 556.25557,294 555.5,294 c -4.14214,0 -7.5,3.35786 -7.5,7.5 0,4.14214 3.35786,7.5 7.5,7.5 4.14214,0 7.5,-3.35786 7.5,-7.5 0,-0.75557 -0.13591,-1.46849 -0.34375,-2.15625 l 18.6875,-18.6875 C 582.03151,280.86409 582.74443,281 583.5,281 c 4.14214,0 7.5,-3.35786 7.5,-7.5 0,-4.14214 -3.35786,-7.5 -7.5,-7.5 z m 0,4.5 c 1.65685,0 3,1.34315 3,3 0,1.65685 -1.34315,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65685 1.34315,-3 3,-3 z m -28,28 c 1.65685,0 3,1.34315 3,3 0,1.65685 -1.34315,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65685 1.34315,-3 3,-3 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path5288-4-8-0"
+     d="m 516.5,251 c -4.14214,0 -7.5,3.35786 -7.5,7.5 0,2.8726 1.62846,5.3652 4,6.625 l 0,13.75 c -2.37154,1.2598 -4,3.7524 -4,6.625 0,4.14214 3.35786,7.5 7.5,7.5 2.8726,0 5.3652,-1.62846 6.625,-4 l 13.75,0 c 1.2598,2.37154 3.7524,4 6.625,4 4.14214,0 7.5,-3.35786 7.5,-7.5 0,-2.8726 -1.62846,-5.3652 -4,-6.625 l 0,-13.75 c 2.37154,-1.2598 4,-3.7524 4,-6.625 0,-4.14214 -3.35786,-7.5 -7.5,-7.5 -2.90753,0 -5.41167,1.67488 -6.65625,4.09375 L 536.65625,255 523.125,255 c -1.2598,-2.37154 -3.7524,-4 -6.625,-4 z m 0,4.5 c 1.65685,0 3,1.34315 3,3 0,1.65685 -1.34315,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65685 1.34315,-3 3,-3 z m 27,0 c 1.65685,0 3,1.34315 3,3 0,1.65685 -1.34315,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65685 1.34315,-3 3,-3 z m -20.375,6.5 13.75,0 c 0.70304,1.32345 1.80155,2.42196 3.125,3.125 l 0,13.75 c -1.32345,0.70304 -2.42196,1.80155 -3.125,3.125 l -13.75,0 c -0.70304,-1.32345 -1.80155,-2.42196 -3.125,-3.125 l 0,-13.75 c 1.32345,-0.70304 2.42196,-1.80155 3.125,-3.125 z m -6.625,20.5 c 1.65685,0 3,1.34315 3,3 0,1.65685 -1.34315,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65685 1.34315,-3 3,-3 z m 27,0 c 1.65685,0 3,1.34315 3,3 0,1.65685 -1.34315,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65685 1.34315,-3 3,-3 z" />
+  <g
+     id="g7659"
+     transform="translate(-25,3.0624999e-6)" />
+  <g
+     id="g7663"
+     transform="translate(-53,28.000003)" />
+  <g
+     id="g7690"
+     transform="translate(-23.375,1.375)" />
+  <g
+     id="g7694"
+     transform="translate(-50.375,1.375)" />
+  <g
+     id="g7700"
+     transform="translate(-23.375,-25.625)" />
+  <g
+     id="g7706"
+     transform="translate(-50.375,-25.625)" />
+  <rect
+     style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect6623-9-2-3"
+     y="220"
+     x="400"
+     height="100"
+     width="100" />
+  <rect
+     style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect4211"
+     y="220"
+     x="500"
+     height="100"
+     width="100" />
+  <rect
+     style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect4219"
+     y="220"
+     x="500"
+     height="100"
+     width="100" />
+  <g
+     id="g4221"
+     transform="translate(270,5.0000031)">
+    <path
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#e06d5f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path4223"
+       d="m 455,232 -5,0 -3,3 0,5 58,58 5,0 3,-3 0,-5 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#e06d5f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path4255"
+       d="m 505,232 5,0 3,3 0,5 -58,58 -5,0 -3,-3 0,-5 z" />
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#7092ff;fill-opacity:1;stroke:none;stroke-width:11.66666508;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     id="path4227"
+     d="m 650,228 -2,2 0,5.0625 c -18.3398,1.05112 -33,16.34328 -33,34.9375 0,19.27074 15.72926,35 35,35 19.27075,0 35,-15.72926 35,-35 0,-11.66567 -5.76668,-22.0373 -14.59375,-28.40625 l -7.1875,7.1875 C 670.3012,253.17882 675,260.99881 675,270 c 0,13.86634 -11.13365,25 -25,25 -13.86634,0 -25,-11.13366 -25,-25 0,-13.18969 10.08302,-23.8917 23,-24.90625 l 0,4.90625 2,2 3,0 12,-12 -12,-12 -3,0 z" />
+  <rect
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect8373"
+     y="320"
+     x="0"
+     height="80"
+     width="200" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path8377"
+     d="M 170.00001,351 C 161.7158,351 155,357.71573 155,366.00001 155,374.28428 170.00001,387 170.00001,387 170.00001,387 185,374.28428 185,366.00001 185,357.71573 178.2842,351 170.00001,351 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.055;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path8379"
+     d="m 162,358 c -0.4714,0 -1,0.5 -1,1 l 0,7 c 0,2.216 1,5 5,5 0.35868,0 0.68618,-0.017 1,-0.062 l 0,-2.9375 -4,0 c 0,0 0.5,-2 3,-2 0.5,0 0.69653,0.074 1,0.1875 l 0,-2.1875 c 0,-0.9167 0.36529,-1.6826 1,-2 1,-0.5 1.40372,-0.2981 2,0 1,0.5 1,0.5 1,0.5 l 0,-3.5 c 0,-0.5 -0.5286,-1 -1,-1 -1,0 -2,1 -4,1 -2,0 -3,-1 -4,-1 z m 1.75,3.5 c 0.69036,0 1.25,0.5596 1.25,1.25 0,0.6904 -0.55964,1.25 -1.25,1.25 -0.69036,0 -1.25,-0.5596 -1.25,-1.25 0,-0.6904 0.55964,-1.25 1.25,-1.25 z M 169,363 c -0.4714,0 -1,0.5 -1,1 l 0,7 c 0,2.216 1,5 5,5 4,0 5,-2.784 5,-5 l 0,-7 c 0,-0.5 -0.5286,-1 -1,-1 -1,0 -2,1 -4,1 -2,0 -3,-1 -4,-1 z m 1.75,3.5 c 0.69036,0 1.25,0.5596 1.25,1.25 0,0.6904 -0.55964,1.25 -1.25,1.25 -0.69036,0 -1.25,-0.5596 -1.25,-1.25 0,-0.6904 0.55964,-1.25 1.25,-1.25 z m 4.5,0 c 0.69036,0 1.25,0.5596 1.25,1.25 0,0.6904 -0.55964,1.25 -1.25,1.25 -0.69036,0 -1.25,-0.5596 -1.25,-1.25 0,-0.6904 0.55964,-1.25 1.25,-1.25 z m -5.25,5.5 6,0 c 0,0 -0.5,2 -3,2 -2.5,0 -3,-2 -3,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path8381"
+     d="M 30.00001,351 C 21.7158,351 15,357.71573 15,366.00001 15,374.28428 30.00001,387 30.00001,387 30.00001,387 45,374.28428 45,366.00001 45,357.71573 38.2842,351 30.00001,351 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path8383"
+     d="m 24,356 c -0.55401,0 -1,0.446 -1,1 l 0,16 c 0,0.5 0.5,1 1,1 l 9,0 c 0.5,0 1,-0.5 1,-1 l 0,-5 0.5,0 c 0.5,0 0.5,0.5 0.5,0.5 l 0,2 c 0,1 0.5,1.5 1.5,1.5 1,0 1.5,-0.5 1.5,-1.5 0,-1.1667 0,-4.5 0,-5.5 0,-1 -2,-2 -2,-3 l 0,-3 -1,0 -1,-1 0,-1 c 0,-0.554 -0.44599,-1 -1,-1 z m 1,2 7,0 0,4 -7,0 z m 9,3 1,0 c 0,0 0,0.8333 0,1.5 0,1 2,2 2,3 l 0,5 c 0,0.5 -0.5,0.5 -0.5,0.5 0,0 -0.5,0 -0.5,-0.5 0,0 0,-2 0,-2.5 0,-0.5 -0.5,-1 -1,-1 -0.33333,0 -1,0 -1,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path8385"
+     d="M 100.00001,351 C 91.7158,351 85,357.71573 85,366.00001 85,374.28428 100.00001,387 100.00001,387 100.00001,387 115,374.28428 115,366.00001 115,357.71573 108.2842,351 100.00001,351 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path8387"
+     d="m 98,358 c -3,0 -6,1.5 -6,4 l 0,2 17,0 0,-2 c -2e-5,-2.5 -3,-4 -6,-4 z m 0.5,1 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m -6,2 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z M 92,365 c -0.50003,0 -1.00001,0.5 -1,1 1e-5,0.5 0.49997,1 1,1 l 17,0 c 0.50001,0 0.99999,-0.5 1,-1 0,-0.5 -0.5,-1 -1,-1 z m 0,3 0,1 c 0,1 1,2 2,2 l 13,0 c 1,0 2,-1 2,-2 l 0,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path10172"
+     d="M 135.00001,331 C 126.7158,331 120,337.71573 120,346.00001 120,354.28428 135.00001,367 135.00001,367 135.00001,367 150,354.28428 150,346.00001 150,337.71573 143.2842,331 135.00001,331 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path10174"
+     d="M 65.00001,331 C 56.7158,331 50,337.71573 50,346.00001 50,354.28428 65.00001,367 65.00001,367 65.00001,367 80,354.28428 80,346.00001 80,337.71573 73.2842,331 65.00001,331 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect9826-2-1"
+     d="m 59,338 c -0.55401,0 -1,0.446 -1,1 l 0,9 c 0,0.554 0.44599,1 1,1 l 11,0 c 0.55401,0 1,-0.446 1,-1 l 0,-1 0.5,0 c 0.5,0 0.5,-0.5 0.5,-0.5 l 0,-0.5 1,0 c 1,0 2,-1 2,-2 l 0,-1 0,-2 c 0,-0.5 -0.5,-1 -1,-1 l -3,0 0,-1 c 0,-0.554 -0.44599,-1 -1,-1 z m 12,3 2.5,0 c 0.5,0 0.5,0.5 0.5,0.5 l 0,2.5 c 0,0.5 -0.5,1 -1,1 l -1,0 -1,0 z m -15,9 1,1 1,1 13,0 1,-1 1,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect8206-4"
+     d="m 134,338 c -0.554,0 -1,0.446 -1,1 l 0,4 -4,0 c -0.554,0 -1,0.446 -1,1 l 0,3 c 0,0.554 0.446,1 1,1 l 4,0 0,4 c 0,0.554 0.446,1 1,1 l 3,0 c 0.554,0 1,-0.446 1,-1 l 0,-4 4,0 c 0.554,0 1,-0.446 1,-1 l 0,-3 c 0,-0.554 -0.446,-1 -1,-1 l -4,0 0,-4 c 0,-0.554 -0.446,-1 -1,-1 z" />
+  <g
+     id="g10113"
+     transform="translate(350,15.000003)">
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect8477"
+       y="465"
+       x="-350"
+       height="80"
+       width="200" />
+    <g
+       style="fill:#7092ff;fill-opacity:1"
+       id="railway-rail"
+       transform="translate(-1110,437.63781)">
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect17528-7"
+         d="m 853.5,50.362183 -1.5,1 -0.4688,2 -3.2812,0 c -0.554,0 -0.8656,0.462541 -1,1 l -0.25,1 c -0.1344,0.537459 0.446,1 1,1 l 24,0 c 0.554,0 1.1344,-0.462541 1,-1 l -0.25,-1 c -0.1344,-0.537459 -0.446,-1 -1,-1 l -2.7812,0 -0.4688,-2 -1.5,-1 -1,1 0.4688,2 -12.4376,0 0.4688,-2 -1,-1 z m -2,4 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m 17,0 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m -17.9375,3 -0.4687,2 -2.8438,0 c -0.554,0 -0.8656,0.462541 -1,1 l -0.25,1 c -0.1344,0.537459 0.446,1 1,1 l 26,0 c 0.554,0 1.1344,-0.462541 1,-1 l -0.25,-1 c -0.1344,-0.537459 -0.446,-1 -1,-1 l -2.3438,0 -0.4687,-2 -2.5,0 0.4687,2 -15.3124,0 0.4687,-2 -2.5,0 z m -0.0625,3 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m 19,0 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m -20.3438,3 -0.4687,2 -2.4375,0 c -0.554,0 -0.8656,0.462541 -1,1 l -0.25,1 c -0.1344,0.537459 0.446,1 1,1 l 28,0 c 0.554,0 1.1344,-0.462541 1,-1 l -0.25,-1 c -0.1344,-0.537459 -0.446,-1 -1,-1 l -1.9375,0 -0.4687,-2 -2.5,0 0.4687,2 -18.125,0 0.4687,-2 -2.5,0 z m 0.3438,3 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m 21,0 c 0.2761,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.2239,0.5 -0.5,0.5 -0.2761,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.2239,-0.5 0.5,-0.5 z m -22.7812,3 -0.7188,3 1.5,1 1,-1 0.7188,-3 -2.5,0 z m 22.5624,0 0.7188,3 1,1 1.5,-1 -0.7188,-3 -2.5,0 z" />
+      <g
+         style="fill:#7092ff;fill-opacity:1"
+         id="g22103"
+         transform="translate(110,0)">
+        <rect
+           style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect22091"
+           y="77.362183"
+           x="730"
+           height="3"
+           width="40" />
+        <rect
+           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect22093"
+           y="78.362183"
+           x="764"
+           height="1.0000004"
+           width="5" />
+        <rect
+           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect22095"
+           y="78.362183"
+           x="753"
+           height="1.0000004"
+           width="5" />
+        <rect
+           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect22097"
+           y="78.362183"
+           x="742"
+           height="1.0000004"
+           width="5" />
+        <rect
+           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect22099"
+           y="78.362183"
+           x="731"
+           height="1.0000004"
+           width="5" />
+      </g>
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path26156"
+         transform="matrix(1.6666667,0,0,1.6666667,828.66667,-31.97115)"
+         d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path26158"
+         transform="translate(849,12.362188)"
+         d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path26160"
+         transform="matrix(1.6666667,0,0,1.6666667,789.66667,-31.97115)"
+         d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path26162"
+         transform="translate(810,12.362188)"
+         d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" />
+    </g>
+    <g
+       style="fill:#7092ff;fill-opacity:1"
+       id="highway-unclassified"
+       transform="translate(-510,437.63781)">
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path7143"
+         d="m 192.5,52.36218 -2.875,6 -1.625,0 -1,1 0,2 1.40625,0 -0.40625,1 0,5 0,1 0,0 c 0,0 0.60826,0.60826 1,1 l 1,0 4,0 2,1 8,0 2,-1 4,0 1,0 1,-1 0,0 0,-1 0,-5 -0.40625,-1 1.40625,0 0,-2 -1,-1 -1.625,0 -2.875,-6 z m 1,3 13,0 1.5,4 -1,1 -14,0 -1,-1 z m -2.5,8 3,0 1,2 0,1 -4,0 -1,-1 0,-1 z m 15,0 3,0 1,1 0,1 -1,1 -4,0 0,-1 z m -17,7 0,2 1,1 3,0 1,-1 0,-2 z m 17,0 0,2 1,1 3,0 1,-1 0,-2 z" />
+      <rect
+         style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect7157"
+         y="78.362183"
+         x="181"
+         height="0.9999997"
+         width="38" />
+      <g
+         style="fill:#7092ff;fill-opacity:1"
+         id="g7159"
+         transform="translate(551,1)">
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path7161"
+           transform="translate(-510,12.362183)"
+           d="m 139.5,64 c -1.38071,0 -2.5,1.119288 -2.5,2.5 0,1.380712 1.11929,2.5 2.5,2.5 l 39,0 c 1.38071,0 2.5,-1.119288 2.5,-2.5 0,-1.380712 -1.11929,-2.5 -2.5,-2.5 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path7163"
+           transform="translate(-730.5,7.362183)"
+           d="m 362,70 c 0.31019,0.41644 0.5,0.940812 0.5,1.5 0,0.559188 -0.18981,1.08356 -0.5,1.5 l 35,0 c -0.31019,-0.41644 -0.5,-0.940812 -0.5,-1.5 0,-0.559188 0.18981,-1.08356 0.5,-1.5 l -35,0 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path7165"
+           transform="translate(-401,12.362183)"
+           d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path7169"
+           transform="translate(-362,12.362183)"
+           d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" />
+      </g>
+    </g>
+  </g>
+  <rect
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect9903"
+     y="400"
+     x="0"
+     height="80"
+     width="200" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path10275"
+     d="m 128.9551,427.41503 a 27.453954,11.521752 2.2978319 1 1 -54.160208,-5.49081 27.453954,11.521752 2.2978319 0 1 54.160208,5.49081 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path9990"
+     d="m 53,436 -35,10 0,-6 35,-10 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path9986"
+     d="m 54,430.5 0,6 29,14.5 0,-6 -29,-14.5 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#8cd05f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path10000"
+     d="m 173.5,428 c -1.22936,2e-4 -2.22819,0.8933 -2.4375,2.0625 C 170.87885,430.0195 170.69675,430 170.5,430 c -1.38071,0 -2.5,1.1193 -2.5,2.5 0,0.6391 0.23046,1.21425 0.625,1.65625 -0.94522,0.3566 -1.625,1.27365 -1.625,2.34375 0,1.3807 1,2.5 2.5,2.5 l 0.5,0 2,3.5 0,1.4375 c -1.47915,-0.43159 -2.8857,-0.88035 -4,-1.4375 -5,-2.5 -9.43382,-6.98268 -15,-7.5 -6.04072,-0.56143 -11.66667,3.33333 -17.5,5 -5.83333,1.66667 -16.93857,1.9593 -17.5,8 L 148,462.99997 183,453 c 0.32572,-3.50467 -3.70814,-6.98659 -8,-8.21875 l 0,-2.28125 2,-3.5 0.71875,0 C 179,439.0145 180,437.805 180,436.5 c 0,-1.0701 -0.67978,-1.98715 -1.625,-2.34375 0.39454,-0.442 0.625,-1.01715 0.625,-1.65625 0,-1.3807 -1.11929,-2.5 -2.5,-2.5 -0.19675,0 -0.37885,0.0195 -0.5625,0.0625 -0.20931,-1.1692 -1.20813,-2.0628 -2.4375,-2.0625 z m -1.5,11 3,0 -1,2 -1,0 z" />
+  <g
+     id="g10052"
+     transform="translate(340,-200)">
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#c1c1c1;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path10048"
+       d="m -322,646 30,15 0,-6 -30,-15 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#c1c1c1;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path10050"
+       d="m -257,651 -35,10 0,-6 35,-10 z" />
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path9980"
+     d="m 18,446 30,15 0,-6 -30,-15 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#a9a9a9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path9982"
+     d="m 83,451 -35,10 0,-6 35,-10 z" />
+  <rect
+     style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect10169"
+     transform="scale(-1,1)"
+     y="1.0262482e-16"
+     x="-699.86035"
+     height="560"
+     width="699.86035" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path10271"
+     d="m 107,417 c 0,0 2.63599,3.5293 5.4375,3.96875 C 107.96029,420.81568 107,419 107,419 c 0,0 -0.96029,1.81568 -5.4375,1.96875 C 104.36401,420.5293 107,417 107,417 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path10269"
+     d="m 93,419 c 0,0 2.63599,3.5293 5.4375,3.96875 C 93.96029,422.81568 93,421 93,421 c 0,0 -0.96029,1.81568 -5.4375,1.96875 C 90.36401,422.5293 93,419 93,419 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path10253"
+     d="m 103,424 c 0,0 2.63599,3.5293 5.4375,3.96875 C 103.96029,427.81568 103,426 103,426 c 0,0 -0.96029,1.81568 -5.4375,1.96875 C 100.36401,427.5293 103,424 103,424 z" />
+  <g
+     id="waterway-river"
+     transform="translate(-260,452.63781)">
+    <rect
+       style="color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect24309"
+       y="77.362183"
+       x="400"
+       height="3.0000014"
+       width="40" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="245"
+       d="m 406.76193,73.362183 c 0,0 -0.53638,-1.846128 -0.34524,-2.75 0.22134,-1.046677 1.65476,-2.75 1.65476,-2.75 0,0 1.43342,-1.703323 1.65476,-2.75 0.19114,-0.903872 -0.34524,-2.75 -0.34524,-2.75 0,0 -0.53639,-1.846127 -0.34525,-2.75 0.22134,-1.046678 1.65476,-2.75 1.65476,-2.75 0,0 1.43342,-1.703323 1.65476,-2.75 0.19114,-0.903872 -0.34524,-2.75 -0.34524,-2.75 l 16.5,0 c 0,0 1.43342,1.703323 1.65476,2.75 0.19115,0.903872 -0.34523,2.75 -0.34523,2.75 0,0 -0.53638,1.846128 -0.34524,2.75 0.22134,1.046679 1.65477,2.75 1.65477,2.75 0,0 1.43342,1.703323 1.65476,2.75 0.19115,0.903872 -0.34523,2.75 -0.34523,2.75 0,0 -0.53638,1.846128 -0.34524,2.75 0.22134,1.046679 1.65477,2.75 1.65477,2.75 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.5;color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path25543"
+       transform="matrix(0.48296291,0.12940952,-0.19411409,0.72444365,27.631711,-76.388519)"
+       d="m 808,51 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.5;color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path25545"
+       transform="matrix(0.64951905,0.375,-0.50000001,0.86602541,-89.512357,-292.05512)"
+       d="m 808,51 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.5;color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path25547"
+       transform="matrix(-0.48296291,0.12940952,0.19411409,0.72444365,811.75652,-82.439629)"
+       d="m 808,51 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.5;color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path25549"
+       transform="matrix(-0.64951905,0.375,0.50000001,0.86602541,933.61049,-277.05512)"
+       d="m 808,51 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path26103"
+       transform="matrix(1.6666667,0,0,1.6666667,388.66667,-31.97115)"
+       d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path26105"
+       transform="translate(409,12.362188)"
+       d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#60d4de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path26107"
+       transform="matrix(1.6666667,0,0,1.6666667,349.66667,-31.97115)"
+       d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path26109"
+       transform="translate(370,12.362188)"
+       d="m 32,66.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" />
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path10391"
+     d="m 425,30 8,7 1,-1 0,-12 -1,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path10393"
+     d="m 454,30 -8,7 -1,-1 0,-12 1,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3399"
+     d="m 6,164 -1,1 0,1 1,1 8,0 1,-1 0,-1 -1,-1 z m 0,4 0,7 1,1 6,0 1,-1 0,-7 z m 2,2 1,0 0,4 -1,0 0,-1 z m 3,0 1,0 0,3 0,1 -1,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3403"
+     d="m 64,165.01282 c -1,0 -2,1 -2,2 l 0,2 3,0 2,1 -2,1 -3,0 0,2 c 0,1 1,2 2,2 l 1,0 c 2,0 2.48722,-0.97443 3,-2 l 1,-2 9,-5 c 0,0 0,-1 -2,-1 L 68.96875,168.91907 68,167.01282 c -0.49406,-0.98812 -1,-2 -3,-2 z m 0,1 2,0 1,2 -4,0 c 0,0 0,-0.66667 0,-1 0,-1.01282 1,-1 1,-1 z m 8.09375,4.71875 -2,1 L 76,175.01282 c 2,0 2,-1 2,-1 z M 63,172.01282 l 4,0 -1,2 -2,0 c 0,0 -1,0 -1,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3407"
+     d="m 44.8125,169.01282 c 0.11352,0.31647 0.1875,0.64447 0.1875,1 0,0.35553 -0.074,0.68353 -0.1875,1 l 2.375,0 c -0.11352,-0.31647 -0.1875,-0.64447 -0.1875,-1 0,-0.35553 0.074,-0.68353 0.1875,-1 l -2.375,0 z m 8,0 c 0.11352,0.31647 0.1875,0.64447 0.1875,1 0,0.35553 -0.074,0.68353 -0.1875,1 l 2.375,0 c -0.11352,-0.31647 -0.1875,-0.64447 -0.1875,-1 0,-0.35553 0.074,-0.68353 0.1875,-1 l -2.375,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3409"
+     d="m 42,168 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z m 8,0 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z m 8,0 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate"
+     id="path3415"
+     d="m 130,168 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.50000125;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     id="path3419"
+     d="m 27.03125,162.60657 c -1.32908,0.53118 -2.444369,1.41916 -3.3125,2.53125 0.07092,0.0184 0.149734,0.009 0.21875,0.0312 0.520689,0.16918 0.941853,0.48986 1.28125,0.875 0.583365,-0.69731 1.320919,-1.23792 2.15625,-1.625 -0.228003,-0.42194 -0.375,-0.89709 -0.375,-1.4062 0,-0.14028 0.0122,-0.27085 0.03125,-0.40625 z m 5.9375,0 C 32.9878,162.74197 33,162.87254 33,163.01282 c 0,0.50911 -0.146997,0.98426 -0.375,1.40625 0.835331,0.38708 1.572885,0.92769 2.15625,1.625 0.339397,-0.38514 0.760561,-0.70582 1.28125,-0.875 0.06748,-0.0219 0.146303,-0.0395 0.21875,-0.0625 -0.866395,-1.10291 -1.991152,-1.97191 -3.3125,-2.5 z m -10.9375,8.21875 c 0.132811,1.35398 0.618313,2.61506 1.34375,3.6875 0.05422,-0.0956 0.121594,-0.19054 0.1875,-0.28125 0.298579,-0.41096 0.689964,-0.72255 1.125,-0.9375 -0.439267,-0.72096 -0.728373,-1.5606 -0.84375,-2.4375 -0.563589,0.16464 -1.184566,0.16262 -1.78125,-0.0312 -0.009,-0.003 -0.02228,0.003 -0.03125,0 z m 15.90625,0 c -0.596684,0.19387 -1.217661,0.19589 -1.78125,0.0312 -0.115377,0.8769 -0.404483,1.71654 -0.84375,2.4375 0.438042,0.20421 0.821177,0.51932 1.125,0.9375 0.06591,0.0907 0.133279,0.18566 0.1875,0.28125 0.725438,-1.07244 1.210939,-2.33352 1.34375,-3.6875 -0.009,0.003 -0.02224,-0.003 -0.03125,0 z M 29,176.16907 c -0.03014,0.55835 -0.21394,1.114 -0.5625,1.59375 -0.027,0.0372 -0.06534,0.0582 -0.09375,0.0937 0.540476,0.11583 1.081942,0.1875 1.65625,0.1875 0.574308,0 1.115774,-0.0717 1.65625,-0.1875 -0.02841,-0.0355 -0.06675,-0.0566 -0.09375,-0.0937 -0.34856,-0.47975 -0.532362,-1.0354 -0.5625,-1.59375 -0.329444,0.0535 -0.654988,0.0937 -1,0.0937 -0.345012,0 -0.670556,-0.0403 -1,-0.0937 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3423"
+     d="m 30,161 c -1.104569,0 -2,0.89543 -2,2 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 0,-1.10457 -0.895431,-2 -2,-2 z m -7.15625,5 c -0.77652,0.0669 -1.494002,0.58712 -1.75,1.375 -0.341331,1.05051 0.230742,2.18992 1.28125,2.53125 1.050508,0.34133 2.189919,-0.23074 2.53125,-1.28125 0.341331,-1.05051 -0.230742,-2.18992 -1.28125,-2.53125 -0.262627,-0.0853 -0.52241,-0.11606 -0.78125,-0.0937 z m 13.9375,0 c -0.132056,0.0149 -0.274936,0.0511 -0.40625,0.0937 -1.050508,0.34133 -1.622581,1.48074 -1.28125,2.53125 0.341331,1.05051 1.480742,1.62258 2.53125,1.28125 1.050508,-0.34133 1.622581,-1.48074 1.28125,-2.53125 -0.298664,-0.91919 -1.20061,-1.47926 -2.125,-1.375 z m -10.71875,8 c -0.641658,-0.0219 -1.281719,0.25399 -1.6875,0.8125 -0.64925,0.89362 -0.456116,2.16325 0.4375,2.8125 0.893616,0.64925 2.16325,0.45612 2.8125,-0.4375 0.64925,-0.89362 0.456116,-2.16325 -0.4375,-2.8125 -0.335106,-0.24347 -0.740005,-0.36184 -1.125,-0.375 z m 7.875,0 c -0.384995,0.0132 -0.789894,0.13153 -1.125,0.375 -0.893615,0.64925 -1.08675,1.91888 -0.4375,2.8125 0.64925,0.89362 1.918885,1.08675 2.8125,0.4375 0.893615,-0.64925 1.08675,-1.91888 0.4375,-2.8125 -0.405781,-0.55851 -1.045842,-0.83443 -1.6875,-0.8125 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3427"
+     d="m 84,166.01282 -4,4 4,4 1,-1 0,-2 2.1875,0 c -0.11352,-0.31647 -0.1875,-0.64447 -0.1875,-1 0,-0.34518 0.0802,-0.69136 0.1875,-1 l -2.1875,0 0,-2 -1,-1 z m 12,0 -1,1 0,2 -2.1875,0 c 0.10728,0.30864 0.1875,0.65482 0.1875,1 0,0.35553 -0.074,0.68353 -0.1875,1 l 2.1875,0 0,2 1,1 4,-4 -4,-4 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3429"
+     d="m 91.999998,169.99998 a 2.0000003,2.0000003 0 0 1 -4.000001,0 2.0000003,2.0000003 0 1 1 4.000001,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3433"
+     d="m 108,165 -4,5 4,5 2,0 0,-1 -3.5,-4 3.5,-4 0,-1 -2,0 z m 6,0 -4,5 4,5 2,0 0,-1 -3.5,-4 3.5,-4 0,-1 -2,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3437"
+     d="m 149,163 -1,1 0,4 -4,0 -1,1 0,2 1,1 4,0 0,4 1,1 2,0 1,-1 0,-4 4,0 1,-1 0,-2 -1,-1 -4,0 0,-4 -1,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path3412"
+     d="m 164,162 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path3410"
+     d="m 164,174 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path3443"
+     d="m 176,174 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3445"
+     d="m 190,160 -1,1 0,1.0625 c -3.94444,0.49381 -7,3.85922 -7,7.9375 0,4.41827 3.58173,8 8,8 4.41827,0 8,-3.58173 8,-8 0,-2.46731 -1.11852,-4.65856 -2.875,-6.125 l -1.40625,1.40625 C 195.11409,166.37996 196,168.08592 196,170 c 0,3.3137 -2.6863,6 -6,6 -3.3137,0 -6,-2.6863 -6,-6 0,-2.97561 2.15859,-5.43327 5,-5.90625 l 0,0.90625 1,1 3,-3 -3,-3 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     id="path3451"
+     d="m 208,162 c -1.33333,0 -2.21875,0.78125 -2.71875,1.28125 -0.5,0.5 -0.61458,0.71875 -1.28125,0.71875 l -1,0 0,2 1,0 c 1.33333,0 2.21875,-0.78125 2.71875,-1.28125 0.5,-0.5 0.61458,-0.71875 1.28125,-0.71875 0.16667,0 0.20569,0.009 0.40625,0.25 0.20056,0.24067 0.4375,0.6875 0.6875,1.1875 0.25,0.5 0.51306,1.05317 0.9375,1.5625 0.42444,0.50933 1.13542,1 1.96875,1 1.33333,0 2.21875,-0.78125 2.71875,-1.28125 0.5,-0.5 0.61458,-0.71875 1.28125,-0.71875 l 1,0 0,-2 -1,0 c -1.33333,0 -2.21875,0.78125 -2.71875,1.28125 -0.5,0.5 -0.61458,0.71875 -1.28125,0.71875 -0.16667,0 -0.20569,-0.009 -0.40625,-0.25 -0.20056,-0.24067 -0.4375,-0.6875 -0.6875,-1.1875 -0.25,-0.5 -0.51306,-1.05317 -0.9375,-1.5625 -0.42444,-0.50933 -1.13542,-1 -1.96875,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     id="path3453"
+     d="m 203,176 0,2 14,0 0,-2 -14,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3404-8"
+     d="m 507.5,2 0,1 1,1 -4.5,4.5000001 0,0.5 L 504,10 l 1.5,0 4.5,-4.5 1,1 1,0 0,-3.5 0,-1 -1,0 z m -6.5,1 -1,1 0,9 1,1 9,0 1,-1 0,-4.9999999 L 509,10 l 0,2 -1,0 -1,0 -4,0 -1,0 0,-5 0,-2 1,0 1,0 2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#597be7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path5520"
+     d="m 507.5,16 0,1 1,1 -4.5,4.5 0,0.5 0,1 1.5,0 4.5,-4.5 1,1 1,0 0,-3.5 0,-1 -1,0 z m -6.5,1 -1,1 0,9 1,1 9,0 1,-1 0,-5 -2,2 0,2 -1,0 -1,0 -4,0 -1,0 0,-5 0,-2 1,0 1,0 2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4657"
+     d="m 89,22 -5,4.5 5,4.5 0,-3 3,0 1,1 0,3 -1,1 -5,0 -1,1 0,1 1,1 5,0 2,-1 1,-1 1,-2 0,-3 -1,-2 -1,-1 -2,-1 -3,0 z m 22,0 0,3 -3,0 -2,1 -1,1 -1,2 0,3 1,2 1,1 2,1 5,0 1,-1 0,-1 -1,-1 -5,0 -1,-1 0,-3 1,-1 3,0 0,3 5,-4.5 z m -57,1 -1,1 0,1.59375 L 46.59375,32 45,32 l -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 L 54.40625,27 56,27 l 1,-1 0,-2 -1,-1 z m 96,0 -6,6 1,1 3,0 0,6 1,1 2,0 1,-1 0,-6 3,0 1,-1 z M 32,24 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 23,0 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 C 54.30935,25.71998 54.28,25.69066 54.25,25.65625 54.09665,25.480519 54,25.251521 54,25 c 0,-0.55228 0.44772,-1 1,-1 z m 10,0 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 z m 69.5,0 -4.9375,8.5625 L 126,29 l -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 z m 30.5,0 -1,1 0,1 4,4 -4,4 0,1 1,1 1,0 4,-4 4,4 1,0 1,-1 0,-1 -4,-4 4,-4 0,-1 -1,-1 -1,0 -4,4 -4,-4 z m 21,0 -1,1 0,1 1,1 8,0 1,-1 0,-1 -1,-1 z M 66,25 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 132,0 -1,1 0,1 3,3 -3,3 0,1 1,1 1,0 3,-3 3,3 1,0 1,-1 0,-1 -3,-3 3,-3 0,-1 -1,-1 -1,0 -3,3 -3,-3 z M 32.15625,27 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 z M 68,27 l 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 z m 118,1 0,7 1,1 6,0 1,-1 0,-7 z m 2,2 1,0 0,4 -1,0 0,-1 z m 3,0 1,0 0,3 0,1 -1,0 z M 46,33 c 0.25152,0 0.48052,0.0967 0.65625,0.25 L 46.75,33.34375 C 46.90335,33.519481 47,33.748484 47,34 c 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 20,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z" />
+  <g
+     style="fill:#ffffff;fill-opacity:1;display:inline"
+     id="g4659"
+     transform="translate(-681,93.63782)">
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4661"
+       transform="translate(756,-73.637817)"
+       d="m 174,3 -1,1 0,4 -4,0 -1,1 0,1 1,1 4,0 0,4 1,1 1,0 1,-1 0,-4 4,0 1,-1 0,-1 -1,-1 -4,0 0,-4 -1,-1 -1,0 z" />
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4663"
+     d="m 265,28.000003 11,0 1,1.00002 0,1 -1,0.99998 -11,0 -1,-1 0,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4665"
+     d="m 288.5,23.000013 c -3.03757,0 -5.5,2.46243 -5.5,5.5 0,3.03757 2.46243,5.5 5.5,5.5 1.00612,0 1.93866,-0.27827 2.75,-0.75 l 3.75,3.75 1,0 1,-1 0,-1 -3.75,-3.75 c 0.47173,-0.81134 0.75,-1.74387 0.75,-2.75 0,-3.03757 -2.46243,-5.5 -5.5,-5.5 z m -0.5,2 1,0 2,1 1,2 0,1 -1,2 -2,1 -1,0 -2,-1 -1,-2 0,-1 1,-2 2,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4667"
+     d="m 329.5,23 c -1.5,0 -2.5,2 -2.5,3 0,0.666667 0,1.333333 0,2 0,1 1,2.153847 1,2.153847 L 328,31 l -1.69231,0.384617 c -1.45419,0.330499 -2.02608,1.236079 -2.15384,2.76923 L 324,36.000001 l 12,0 -0.15385,-1.846154 c -0.12776,-1.533151 -0.69965,-2.438731 -2.15384,-2.76923 L 332,31 l 0,-0.846153 c 0,0 1,-1.153847 1,-2.153847 0,-0.666667 0,-1.333333 0,-2 0,-1 -1,-3 -2.5,-3 z" />
+  <rect
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect4769"
+     y="155"
+     x="167"
+     height="2"
+     width="6" />
+  <rect
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect4769-6"
+     y="147"
+     x="163"
+     height="5.9999971"
+     width="2" />
+  <rect
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect4789"
+     y="149"
+     x="45"
+     height="2"
+     width="2" />
+  <rect
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect4791"
+     y="149"
+     x="53"
+     height="2"
+     width="2" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4863"
+     d="m 163,167 2,0 c 0,2.00001 0,4 0,6 l -2,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4863-8"
+     d="m 167,175 6,0 c 0,0.66667 0,1.33333 0,2 l -6,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3848"
+     d="m 206,5 -1,1 0,1 3,3 -3,3 0,1 1,1 1,0 3,-3 3,3 1,0 1,-1 0,-1 -3,-3 3,-3 0,-1 -1,-1 -1,0 -3,3 -3,-3 -1,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path2997-6"
+     d="m 89,42 -5,4.5 5,4.5 0,-3 3,0 1,1 0,3 -1,1 -5,0 -1,1 0,1 1,1 5,0 2,-1 1,-1 1,-2 0,-3 -1,-2 -1,-1 -2,-1 -3,0 z m 22,0 0,3 -3,0 -2,1 -1,1 -1,2 0,3 1,2 1,1 2,1 5,0 1,-1 0,-1 -1,-1 -5,0 -1,-1 0,-3 1,-1 3,0 0,3 5,-4.5 z m -57,1 -1,1 0,1.59375 L 46.59375,52 45,52 l -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 L 54.40625,47 56,47 l 1,-1 0,-2 -1,-1 z m 96,0 -6,6 1,1 3,0 0,6 1,1 2,0 1,-1 0,-6 3,0 1,-1 z M 32,44 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 23,0 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 C 54.30935,45.71998 54.28,45.69066 54.25,45.65625 54.09665,45.480519 54,45.251521 54,45 c 0,-0.55228 0.44772,-1 1,-1 z m 10,0 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 z m 69.5,0 -4.9375,8.5625 L 126,49 l -1,0 -1,1 0,1 5,5 1,0 1,0 6,-10 0,-1 -1,-1 z m 30.5,0 -1,1 0,1 4,4 -4,4 0,1 1,1 1,0 4,-4 4,4 1,0 1,-1 0,-1 -4,-4 4,-4 0,-1 -1,-1 -1,0 -4,4 -4,-4 z m 21,0 -1,1 0,1 1,1 8,0 1,-1 0,-1 -1,-1 z M 66,45 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m -41.84375,2 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.104569,0 -2,-0.89543 -2,-2 0,-1.10457 0.895431,-2 2,-2 z M 68,47 l 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 z m 118,1 0,7 1,1 6,0 1,-1 0,-7 z m 2,2 1,0 0,4 -1,0 0,-1 z m 3,0 1,0 0,3 0,1 -1,0 z M 46,53 c 0.25152,0 0.48052,0.0967 0.65625,0.25 L 46.75,53.34375 C 46.90335,53.519481 47,53.748484 47,54 c 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 20,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4802-1"
+     d="m 190,168 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#bfbfbf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4861-8"
+     d="m 130,161 -3,3 1,1 1,0 0,2 2,0 0,-2 1,0 1,-1 -3,-3 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#bfbfbf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4859-2"
+     d="m 124,167 -3,3 3,3 1,-1 0,-1 2,0 0,-2 -2,0 0,-1 -1,-1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#bfbfbf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4857-6"
+     d="m 136,167 -1,1 0,1 -2,0 0,2 2,0 0,1 1,1 3,-3 -3,-3 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#bfbfbf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4855-0"
+     d="m 130,168 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#bfbfbf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4804-3"
+     d="m 129,173 0,2 -1,0 -1,1 3,3 3,-3 -1,-1 -1,0 0,-2 -2,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path5237"
+     d="m 209,147.5 0,3.5 -1,0 -1,1 3,3 3,-3 -1,-1 -1,0 0,-1.5 c -1.70008,-0.85011 -2,-2 -2,-2 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path5239-7"
+     d="m 207,172 1,-1 1,0 0,-3.5 c 0,0 0.29992,1.14989 2,2 0,0.591 0,1.5 0,1.5 l 1,0 1,1 -3,3 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect3843"
+     d="m 232.5,251.25 c -1.385,0 -2.5,1.115 -2.5,2.5 l 0,37.5 c 0,1.385 1.115,2.5 2.5,2.5 l 20,0 0.10937,-20 -5.10937,0 0,-5 5,0 0,-1.5 c 0,-1.82822 0.17535,-3.11147 0.5,-4 0.44424,-1.19602 1.38937,-2.26525 2.5,-3 1.1277,-0.75177 2.48379,-1.49996 4.5,-1.5 2.5,0 4.1947,0.87241 5.45976,2.03147 l -1.63603,3.63589 c -0.95686,-0.17083 -2.46942,-0.66733 -3.32373,-0.66736 -1.4011,3e-5 -1.78946,0.016 -2.37039,0.61398 -0.58094,0.59806 -0.62961,0.74575 -0.62961,2.38602 l 0,2 6.5,0 0,5 -6.5,0 0,20 10,0 c 1.385,0 2.5,-1.115 2.5,-2.5 l 0,-37.5 c 0,-1.385 -1.115,-2.5 -2.5,-2.5 z" />
+  <rect
+     style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect4219-0"
+     y="220"
+     x="600"
+     height="100"
+     width="100" />
+  <g
+     style="font-size:17.49651146px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:120.00000477%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#e4a4be;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Avenir;-inkscape-font-specification:Avenir"
+     id="text3863"
+     transform="translate(-25,3.0624999e-6)" />
+  <path
+     inkscape:connector-curvature="0"
+     style="font-size:16.71258354px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#222222;fill-rule:nonzero;enable-background:accumulate;font-family:Helvetica Neue"
+     id="path10613"
+     d="m 228.78571,5.07143 -1,1 v 1 l 1,1 h 1 l 1,-1 v -1 l -1,-1 h -1 z m 0,4 -1,1 v 5 l 1,1 h 1 l 1,-1 v -5 l -1,-1 h -1 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="font-size:16.71258354px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#000000;fill-rule:nonzero;enable-background:accumulate;font-family:Helvetica Neue"
+     id="path10620"
+     d="m 228.78571,45.07143 -1,1 0,1 1,1 1,0 1,-1 0,-1 -1,-1 -1,0 z m 0,4 -1,1 0,5 1,1 1,0 1,-1 0,-5 -1,-1 -1,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="font-size:16.71258354px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-rule:nonzero;enable-background:accumulate;font-family:Helvetica Neue"
+     id="path5293"
+     d="m 228.78571,25.07143 -1,1 0,1 1,1 1,0 1,-1 0,-1 -1,-1 -1,0 z m 0,4 -1,1 0,5 1,1 1,0 1,-1 0,-5 -1,-1 -1,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect14284"
+     d="m 406,3 0,1 2,2.40625 L 408,8 412,8 412,6.40625 414,4 l 0,-1 -1,0 -2,2 -2,0 -2,-2 -1,0 z m 1,6 -1,1 -3,0 -1,1 1,1 3,0 0,1 -2,1 -1,1 0,1 1,0 2,-1 2,2 4,0 2,-2 2,1 1,0 0,-1 -1,-1 -2,-1 0,-1 3,0 1,-1 -1,-1 -3,0 -1,-1 -6,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path14358"
+     d="m 406,23 0,1 2,2.40625 0,1.59375 4,0 0,-1.59375 2,-2.40625 0,-1 -1,0 -2,2 -2,0 -2,-2 -1,0 z m 1,6 -1,1 -3,0 -1,1 1,1 3,0 0,1 -2,1 -1,1 0,1 1,0 2,-1 2,2 4,0 2,-2 2,1 1,0 0,-1 -1,-1 -2,-1 0,-1 3,0 1,-1 -1,-1 -3,0 -1,-1 -6,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path14360"
+     d="m 406,43 0,1 2,2.40625 0,1.59375 4,0 0,-1.59375 2,-2.40625 0,-1 -1,0 -2,2 -2,0 -2,-2 -1,0 z m 1,6 -1,1 -3,0 -1,1 1,1 3,0 0,1 -2,1 -1,1 0,1 1,0 2,-1 2,2 4,0 2,-2 2,1 1,0 0,-1 -1,-1 -2,-1 0,-1 3,0 1,-1 -1,-1 -3,0 -1,-1 -6,0 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3361"
+     d="m 482,27 2,0 3,3 4.7735,-6 2.2265,0 0,2 -5,6 -1,1 -2,0 -1,-1 -3,-3 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#7f7f7f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3365"
+     d="m 482,7.0000001 2,0 L 487,10 l 4.7735,-5.9999999 2.2265,0 0,2 L 489,12 l -1,1 -2,0 -1,-1 -3,-2.9999999 z" />
+  <g
+     id="g16825"
+     transform="translate(-5,3.0624999e-6)">
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path17679"
+       transform="translate(25,-3.0624999e-6)"
+       d="m 524,5 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 10,0 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m -9,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m -6,6 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path17685"
+       d="m 558.0625,9.21875 -1.5,2.5 0.875,0.53125 1.5,-2.5 -0.875,-0.53125 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path17687"
+       d="m 551.9375,9.21875 -0.875,0.53125 1.5,2.5 0.875,-0.53125 -1.5,-2.5 z" />
+  </g>
+  <g
+     id="g17870"
+     transform="translate(5432.5,-1245.375)">
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path2997-7-7"
+       d="m -4868.5,1248.3622 -1,1 0,2 1,1 0,6 -1,1 0,2 1,1 2,0 1,-1 6,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-6 1,-1 0,-2 -1,-1 -2,0 -1,1 -6,0 -1,-1 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m -8,2 6,0 1,1 0,6 -1,1 -6,0 -1,-1 0,-6 z m -2,8 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
     <path
        inkscape:connector-curvature="0"
        style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path17944-2"
-       d="m 614,47.999997 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
+       id="path17497-7-3"
+       d="m -4863.5,1253.3622 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
+  </g>
+  <g
+     id="g16816"
+     transform="translate(-74,-0.99999694)">
     <path
-       d="m 359,83.999997 -1,1 0,1.59375 -6.40625,6.40625 -1.59375,0 -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 6.40625,-6.40625 1.59375,0 1,-1 0,-2 -1,-1 z m -22,1 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 23,0 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 -0.0344,-0.03002 -0.0638,-0.05934 -0.0937,-0.09375 -0.15335,-0.175731 -0.25,-0.404729 -0.25,-0.65625 0,-0.55228 0.44772,-1 1,-1 z m 10,0 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 z m 1,1 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m -41.84375,2 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 z m 35.84375,0 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 z m -22,6 c 0.25152,0 0.48052,0.0967 0.65625,0.25 l 0.0937,0.09375 c 0.15335,0.175731 0.25,0.404734 0.25,0.65625 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 20,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z"
-       id="path2997-7"
-       style="color:#000000;fill:#e06d5f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccsscsscssccscccccccccccccccccccccccccccssssssssssssssscccccccccsccsssssssssssssss" />
+       style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path17900"
+       d="m 598,4.9872 0,0 -1,1 0,1 0,1 0,1 1,1 0,0 1,1 1,0 1,0 1,0 1,-1 0,0 1,-1 0,-1 0,-1 0,-1 -1,-1 0,0 -1,-1 -1,0 -1,0 -1,0 z m 2,1 1,0 1,1 0,1 -1,1 -1,0 -1,-1 0,-1 z" />
     <path
-       sodipodi:nodetypes="cccccccccccccccccsscsscssccscccccccccccccccccccccccccccssssssssssssssscccccccccsccsssssssssssssss"
        inkscape:connector-curvature="0"
-       style="color:#000000;fill:#8cd05f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3444"
-       d="m 359,104 -1,1 0,1.59375 L 351.59375,113 350,113 l -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 L 359.40625,108 361,108 l 1,-1 0,-2 -1,-1 z m -22,1 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 23,0 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 -0.0344,-0.03 -0.0638,-0.0593 -0.0937,-0.0937 -0.15335,-0.17573 -0.25,-0.40473 -0.25,-0.65625 0,-0.55228 0.44772,-1 1,-1 z m 10,0 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 z m 1,1 c 0.55228,0 1,0.44771 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55229 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.44771 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55229 0.44772,-1 1,-1 z m -41.84375,2 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 z M 373,108 l 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 z m -22,6 c 0.25152,0 0.48052,0.0967 0.65625,0.25 l 0.0937,0.0937 c 0.15335,0.17573 0.25,0.40473 0.25,0.65625 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 20,0 c 0.55228,0 1,0.44771 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55229 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.44771 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55229 0.44772,-1 1,-1 z" />
+       style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path17902"
+       d="m 608,5.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path17942"
+       d="m 606,11.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path17944"
+       d="m 600,13.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path17687-1"
+       d="m 604.34375,10.625 -0.6875,0.71875 1,1 0.6875,-0.71875 -1,-1 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path17964"
+       d="m 605,7 0,1 1,0 0,-1 -1,0 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path17966"
+       d="m 600,12 0,1 1,0 0,-1 -1,0 z" />
+  </g>
+  <g
+     style="fill:#ffffff"
+     id="g16830"
+     transform="translate(-5,20.000003)">
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path16832"
+       transform="translate(25,-3.0624999e-6)"
+       d="m 524,5 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 10,0 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m -9,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m -6,6 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path16834"
+       d="m 558.0625,9.21875 -1.5,2.5 0.875,0.53125 1.5,-2.5 -0.875,-0.53125 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path16836"
+       d="m 551.9375,9.21875 -0.875,0.53125 1.5,2.5 0.875,-0.53125 -1.5,-2.5 z" />
+  </g>
+  <g
+     style="fill:#ffffff"
+     id="g16838"
+     transform="translate(5432.5,-1225.375)">
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path16840"
+       d="m -4868.5,1248.3622 -1,1 0,2 1,1 0,6 -1,1 0,2 1,1 2,0 1,-1 6,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-6 1,-1 0,-2 -1,-1 -2,0 -1,1 -6,0 -1,-1 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m -8,2 6,0 1,1 0,6 -1,1 -6,0 -1,-1 0,-6 z m -2,8 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path16842"
+       d="m -4863.5,1253.3622 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
+  </g>
+  <g
+     style="fill:#ffffff"
+     id="g16844"
+     transform="translate(-74,19.000003)">
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path16846"
+       d="m 598,4.9872 0,0 -1,1 0,1 0,1 0,1 1,1 0,0 1,1 1,0 1,0 1,0 1,-1 0,0 1,-1 0,-1 0,-1 0,-1 -1,-1 0,0 -1,-1 -1,0 -1,0 -1,0 z m 2,1 1,0 1,1 0,1 -1,1 -1,0 -1,-1 0,-1 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path16848"
+       d="m 608,5.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path16850"
+       d="m 606,11.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path16852"
+       d="m 600,13.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path16854"
+       d="m 604.34375,10.625 -0.6875,0.71875 1,1 0.6875,-0.71875 -1,-1 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path16856"
+       d="m 605,7 0,1 1,0 0,-1 -1,0 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path16858"
+       d="m 600,12 0,1 1,0 0,-1 -1,0 z" />
+  </g>
+  <g
+     style="opacity:0.5"
+     id="g16860"
+     transform="translate(-5,40.000003)">
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path16862"
+       transform="translate(25,-3.0624999e-6)"
+       d="m 524,5 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 10,0 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m -9,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m -6,6 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path16864"
+       d="m 558.0625,9.21875 -1.5,2.5 0.875,0.53125 1.5,-2.5 -0.875,-0.53125 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path16866"
+       d="m 551.9375,9.21875 -0.875,0.53125 1.5,2.5 0.875,-0.53125 -1.5,-2.5 z" />
+  </g>
+  <g
+     style="opacity:0.5"
+     id="g16868"
+     transform="translate(5432.5,-1205.375)">
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path16870"
+       d="m -4868.5,1248.3622 -1,1 0,2 1,1 0,6 -1,1 0,2 1,1 2,0 1,-1 6,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-6 1,-1 0,-2 -1,-1 -2,0 -1,1 -6,0 -1,-1 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m -8,2 6,0 1,1 0,6 -1,1 -6,0 -1,-1 0,-6 z m -2,8 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z m 10,0 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path16872"
+       d="m -4863.5,1253.3622 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
+  </g>
+  <g
+     style="opacity:0.5"
+     id="g16874"
+     transform="translate(-74,39.000003)">
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path16876"
+       d="m 598,4.9872 0,0 -1,1 0,1 0,1 0,1 1,1 0,0 1,1 1,0 1,0 1,0 1,-1 0,0 1,-1 0,-1 0,-1 0,-1 -1,-1 0,0 -1,-1 -1,0 -1,0 -1,0 z m 2,1 1,0 1,1 0,1 -1,1 -1,0 -1,-1 0,-1 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path16878"
+       d="m 608,5.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path16880"
+       d="m 606,11.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path16882"
+       d="m 600,13.9872 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path16884"
+       d="m 604.34375,10.625 -0.6875,0.71875 1,1 0.6875,-0.71875 -1,-1 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path16886"
+       d="m 605,7 0,1 1,0 0,-1 -1,0 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path16888"
+       d="m 600,12 0,1 1,0 0,-1 -1,0 z" />
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     d="m 309.5,23 -6.5,3 0,1 6.5,3 1,0 6.5,-3 0,-1 -6.5,-3 -1,0 z M 304.09375,29.5 303,30 l 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z m 0,4 L 303,34 l 0,1 6.5,3 1,0 6.5,-3 0,-1 -1.09375,-0.5 -5.40625,2.5 -1,0 -5.40625,-2.5 z"
+     id="path3805"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     sodipodi:nodetypes="ccccccccccccccccccc"
+     inkscape:connector-curvature="0"
+     id="path4065-7"
+     d="m 9,4 -6,11 1,1 12,0 1,-1 -6,-11 z m 1,3 1,1 0,2 -1,1 -1,-1 0,-2 z m 0,5 1,1 -1,1 -1,-1 z"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     sodipodi:nodetypes="ccccccccccccccccccc"
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     d="m 9,24 -7,11 1,1 14,0 1,-1 -7,-11 z m 1,3 1,1 0,2 -1,1 -1,-1 0,-2 z m 0,5 1,1 -1,1 -1,-1 z"
+     id="path6484" />
+  <path
+     sodipodi:nodetypes="ccccccccccccccccccc"
+     id="path6503"
+     d="m 9,44 -7,11 1,1 14,0 1,-1 -7,-11 z m 1,3 1,1 0,2 -1,1 -1,-1 0,-2 z m 0,5 1,1 -1,1 -1,-1 z"
+     style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     inkscape:connector-curvature="0" />
+  <path
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/Users/saman/Desktop/id-google-plus.svg.png"
+     id="path6774"
+     d="m 332.5,251.25 c -1.385,0 -2.5,1.115 -2.5,2.5 l 0,37.5 c 0,1.385 1.115,2.5 2.5,2.5 l 35,0 c 1.385,0 2.5,-1.115 2.5,-2.5 l 0,-37.5 c 0,-1.385 -1.115,-2.5 -2.5,-2.5 l -35,0 z m 12.42187,8.95312 7.73438,0 -1.73438,1.26563 -2.45312,0 c 1.62608,0.62541 2.48437,2.50808 2.48437,4.45312 0,1.6339 -0.8932,3.04778 -2.17187,4.04688 -1.2477,0.97471 -1.48438,1.37445 -1.48438,2.20312 0,0.70735 1.33236,1.91155 2.03125,2.40625 2.04292,1.44503 2.70313,2.79195 2.70313,5.03125 0,2.79312 -2.69863,5.5625 -7.59375,5.5625 -4.29379,0 -7.92188,-1.73845 -7.92188,-4.53125 0,-2.83563 3.30028,-5.57812 7.59375,-5.57812 l 1.34375,0 c -0.58757,-0.57164 -1.04687,-1.27693 -1.04687,-2.14063 0,-0.51252 0.16172,-1.01502 0.39062,-1.45312 -0.23328,0.0169 -0.47328,0.0312 -0.71875,0.0312 -3.52671,0 -5.89062,-2.51638 -5.89062,-5.625 0,-3.04233 3.2677,-5.67188 6.73437,-5.67188 z M 359.5,260.75 l 1.5,0 0,4.5 4.5,0 0,1.5 -4.5,0 0,4.5 -1.5,0 0,-4.5 -4.5,0 0,-1.5 4.5,0 0,-4.5 z m -15.90625,0.5625 c -1.78652,0.18034 -2.94719,2.09397 -2.625,4.54687 0.34366,2.61549 2.24211,4.78433 4.23437,4.84375 0.0279,10e-4 0.0503,0 0.0781,0 1.94503,0 3.24491,-2.04547 2.90625,-4.625 -0.34398,-2.6158 -2.24274,-4.70589 -4.23438,-4.76562 -0.12447,-0.004 -0.24027,-0.012 -0.35937,0 z m 1.34375,14.46875 c -2.96791,-0.0322 -5.625,1.81947 -5.625,4.03125 0,2.2565 2.14147,4.125 5.10937,4.125 4.17246,0 5.625,-1.75882 5.625,-4.01563 0,-0.27206 -0.0325,-0.53796 -0.0937,-0.79687 -0.32583,-1.2771 -1.48237,-1.91083 -3.09375,-3.03125 -0.58601,-0.18951 -1.22922,-0.30529 -1.92187,-0.3125 z"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     inkscape:connector-curvature="0" />
+  <g
+     id="g7018"
+     style="display:inline"
+     transform="translate(276,-4.9999996)">
     <rect
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3397"
-       y="147"
-       x="200"
-       height="5.9999971"
-       width="2" />
-    <path
-       inkscape:connector-curvature="0"
-       style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3400"
-       d="m 201,142 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z" />
+       y="145"
+       x="-56"
+       height="20"
+       width="20"
+       id="rect6728-7"
+       style="opacity:0.5;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       transform="translate(-21,0.2499569)"
+       style="display:inline"
+       id="g6893-0">
+      <path
+         inkscape:connector-curvature="0"
+         d="m -33,152.75004 c -1.10457,0 -2.000003,0.89543 -2.000003,2 0,1.10457 0.895433,2 2.000003,2 1.104562,0 1.999996,-0.89543 1.999996,-2 0,-1.10457 -0.895434,-2 -1.999996,-2 z"
+         id="path4812-0-2"
+         style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m -67,149 c -3.313744,0 -6,2.68627 -6,6 0,3.31375 2.686256,6 6,6 3.313731,0 6,-2.68625 6,-6 0,-3.31373 -2.686269,-6 -6,-6 z m -1,2 2,0 0,3 3,0 0,2 -3,0 0,3 -2,0 0,-3 -3,0 0,-2 3,0 0,-3 z m -8,3 0,2 2,0 0,-2 -2,0 z"
+         transform="translate(46,-0.24995996)"
+         id="path4808-3-3"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+  <g
+     transform="translate(276,15)"
+     style="fill:#222222;fill-opacity:1;display:inline"
+     id="g7098">
     <rect
-       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3402"
-       y="143"
-       x="192"
-       height="2"
-       width="6" />
+       style="opacity:0.5;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect7100"
+       width="20"
+       height="20"
+       x="-56"
+       y="145" />
+    <g
+       id="g7102"
+       style="fill:#222222;fill-opacity:1;display:inline"
+       transform="translate(-21,0.2499569)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path7104"
+         transform="translate(-35,124.75004)"
+         d="m 14,24 c -3.313744,0 -6,2.68627 -6,6 0,3.31375 2.686256,6 6,6 3.313731,0 6,-2.68625 6,-6 0,-3.31373 -2.686269,-6 -6,-6 z m -1,2 2,0 0,3 3,0 0,2 -3,0 0,3 -2,0 0,-3 -3,0 0,-2 3,0 0,-3 z M 2,28 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.104562,0 2,-0.89543 2,-2 0,-1.10457 -0.895438,-2 -2,-2 z m 3,1 0,2 2,0 0,-2 -2,0 z"
+         style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+  </g>
+  <path
+     d="M 589,8 588,9.0000001 588,11 l 1,1 2,0 1,-1 0,-1.9999999 L 591,8 589,8 z m 1,1.0000001 c 0.5523,0 1,0.4477 1,0.9999999 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5522999 0.4477,-0.9999999 1,-0.9999999 z"
+     id="path17942-7"
+     style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     inkscape:connector-curvature="0" />
+  <path
+     d="m 589,48 -1,1 0,2 1,1 2,0 1,-1 0,-2 -1,-1 -2,0 z m 1,1 c 0.5523,0 1,0.4477 1,1 0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1 0,-0.5523 0.4477,-1 1,-1 z"
+     id="path17944-2"
+     style="opacity:0.5;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     inkscape:connector-curvature="0" />
+  <path
+     sodipodi:nodetypes="cccccccccccccccccsscsscssccscccccccccccccccccccccccccccssssssssssssssscccccccccsccsssssssssssssss"
+     inkscape:connector-curvature="0"
+     style="color:#000000;fill:#e06d5f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path2997-7"
+     d="m 514,84 -1,1 0,1.59375 L 506.59375,93 505,93 l -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 L 514.40625,88 516,88 l 1,-1 0,-2 -1,-1 z m -22,1 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 23,0 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 -0.0344,-0.03002 -0.0638,-0.05934 -0.0937,-0.09375 -0.15335,-0.175731 -0.25,-0.404729 -0.25,-0.65625 0,-0.55228 0.44772,-1 1,-1 z m 10,0 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 z m 1,1 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m -41.84375,2 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 z M 528,88 l 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 z m -22,6 c 0.25152,0 0.48052,0.0967 0.65625,0.25 l 0.0937,0.09375 c 0.15335,0.175731 0.25,0.404734 0.25,0.65625 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 20,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z" />
+  <path
+     d="m 514,104 -1,1 0,1.59375 L 506.59375,113 505,113 l -1,1 0,2 1,1 2,0 1,-1 0,-1.59375 L 514.40625,108 516,108 l 1,-1 0,-2 -1,-1 z m -22,1 c -2.76142,0 -5,2.23858 -5,5 0,2.76143 5,7 5,7 0,0 5,-4.23857 5,-7 0,-2.76142 -2.23858,-5 -5,-5 z m 23,0 c 0.55228,0 1,0.44772 1,1 0,0.55229 -0.44772,1 -1,1 -0.25152,0 -0.48052,-0.0967 -0.65625,-0.25 -0.0344,-0.03 -0.0638,-0.0593 -0.0937,-0.0937 -0.15335,-0.17573 -0.25,-0.40473 -0.25,-0.65625 0,-0.55228 0.44772,-1 1,-1 z m 10,0 -1,1 0,2 1,1 0,4 -1,1 0,2 1,1 2,0 1,-1 4,0 1,1 2,0 1,-1 0,-2 -1,-1 0,-4 1,-1 0,-2 -1,-1 -2,0 -1,1 -4,0 -1,-1 z m 1,1 c 0.55228,0 1,0.44771 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55229 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.44771 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55229 0.44772,-1 1,-1 z m -41.84375,2 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 z M 528,108 l 4,0 1,1 0,4 -1,1 -4,0 -1,-1 0,-4 z m -22,6 c 0.25152,0 0.48052,0.0967 0.65625,0.25 l 0.0937,0.0937 c 0.15335,0.17573 0.25,0.40473 0.25,0.65625 0,0.55229 -0.44772,1 -1,1 -0.55228,0 -1,-0.44771 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 20,0 c 0.55228,0 1,0.44771 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55229 0.44772,-1 1,-1 z m 8,0 c 0.55228,0 1,0.44771 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55229 0.44772,-1 1,-1 z"
+     id="path3444"
+     style="color:#000000;fill:#8cd05f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccccccccccccsscsscssccscccccccccccccccccccccccccccssssssssssssssscccccccccsccsssssssssssssss" />
+  <rect
+     width="2"
+     height="5.9999971"
+     x="175"
+     y="147"
+     id="rect3397"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 176,142 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
+     id="path3400"
+     style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     inkscape:connector-curvature="0" />
+  <rect
+     width="6"
+     height="2"
+     x="167"
+     y="143"
+     id="rect3402"
+     style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 167,163 6,0 c 0,0.66667 0,1.33333 0,2 l -6,0 z"
+     id="path3404"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     inkscape:connector-curvature="0" />
+  <path
+     d="m 175,167 2,0 c 0,2 0,3.99998 0,6 l -2,0 z"
+     id="path3406"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     inkscape:connector-curvature="0" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     d="m 176,162 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
+     id="path3414" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.009009;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path15680"
+     d="m 41.499631,103.99936 a 1.5000005,1.5000005 0 0 1 10e-7,-3 1.5000005,1.5000005 0 1 1 -10e-7,3 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:0.20000000000000001;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00900900000000004;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path15600-8"
+     d="m 24.000004,121.5 a 1.5,1.5 0 0 1 -3,0 1.5,1.5 0 1 1 3,0 z" />
+  <path
+     d="m 3.4996283,103.99936 a 1.5000015,1.5000015 0 1 1 2.1e-6,-3 1.5000015,1.5000015 0 0 1 -2.1e-6,3 z"
+     id="path15684"
+     style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00900900000000004;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.20000000000000001"
+     inkscape:connector-curvature="0" />
+  <rect
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00900900000000004;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.5"
+     id="rect15727"
+     width="1"
+     height="1.0000076"
+     x="3"
+     y="102"
+     rx="0.5"
+     ry="0.5" />
+  <rect
+     y="102"
+     x="41"
+     height="1.0000076"
+     width="1"
+     id="rect15729"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00900900000000004;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.5"
+     rx="0.5"
+     ry="0.5" />
+  <rect
+     y="-23.000008"
+     x="83.000008"
+     height="1.0000076"
+     width="1"
+     id="rect15731"
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00900900000000004;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.5"
+     transform="matrix(0,1,-1,0,0,0)"
+     rx="0.5"
+     ry="0.5" />
+  <rect
+     style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00900900000000004;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.5"
+     id="rect15733"
+     width="1"
+     height="1.0000076"
+     x="121.00001"
+     y="-23.000008"
+     transform="matrix(0,1,-1,0,0,0)"
+     rx="0.5"
+     ry="0.5" />
+  <g
+     id="g3360"
+     transform="matrix(0,1,-1,0,45,203)">
+    <path
+       sodipodi:nodetypes="ssccccccsscccccss"
+       inkscape:connector-curvature="0"
+       id="path12182"
+       d="m -111,-49 c -2,0 -3.2899,1.14974 -4,2 l -7.03125,8.41907 c -1.27939,1.51205 -1.17862,4.00251 0.21875,5.40625 l 1,1 c 0.73414,0.74243 1.76843,1.17913 2.8125,1.1875 l 0,4.375 c -2.98748,2.1875 -4.99995,5.67161 -5,9.625 6e-5,6.58002 5.41995,11.98722 12,11.98718 6.58003,10e-6 12,-5.40714 12,-11.98718 -1e-5,-3.96861 -1.99295,-7.47078 -5,-9.65625 l 0,-4.34375 c 1.05451,-1.8e-4 2.10227,-0.43771 2.84375,-1.1875 l 1,-1 c 1.39737,-1.40374 1.49814,-3.8942 0.21875,-5.40625 L -107,-47 c -0.77221,-0.92054 -2,-2 -4,-2 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+    <path
+       sodipodi:nodetypes="ccccccssccccc"
+       inkscape:connector-curvature="0"
+       id="path12188"
+       d="m -111,-45 -8,9.01282 1,1 4,0 0,10.59375 c -2.92023,1.19221 -4.99998,4.05725 -5,7.40625 4e-5,4.41829 3.58172,7.98721 8,7.98718 4.41827,10e-6 8,-3.5689 8,-7.98718 2e-5,-3.36351 -2.05966,-6.25472 -5,-7.4375 l 0,-10.5625 4,0 1,-1 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#8cd05f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.25000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
     <path
        inkscape:connector-curvature="0"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3404"
-       d="m 192,163 6,0 c 0,0.66667 0,1.33333 0,2 l -6,0 z" />
+       id="path12196"
+       d="m -110.98512,-19.99704 c 1.65685,0 3,1.34313 2.99999,3.00001 -1e-5,1.65687 -1.34312,3 -2.99999,3.00002 -1.65687,-3e-5 -2.99999,-1.34314 -2.99999,-3.00001 -10e-6,-1.6569 1.34312,-3 2.99999,-3.00002 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+  </g>
+  <g
+     id="g4219">
+    <path
+       sodipodi:nodetypes="ssccccccsscccccss"
+       inkscape:connector-curvature="0"
+       id="path12182-9"
+       d="m 139,92 c 0,-2 -1.14974,-3.2899 -2,-4 l -8.41907,-7.03125 c -1.51205,-1.27939 -4.00251,-1.17862 -5.40625,0.21875 l -1,1 c -0.74243,0.73414 -1.17913,1.76843 -1.1875,2.8125 l -4.375,0 c -2.1875,-2.98748 -5.67161,-4.99995 -9.625,-5 -6.58002,6e-5 -11.98722,5.41995 -11.98718,12 -1e-5,6.58003 5.40714,12 11.98718,12 3.96861,-1e-5 7.47078,-1.99295 9.65625,-5 l 4.34375,0 c 1.8e-4,1.05451 0.43771,2.10227 1.1875,2.84375 l 1,1 c 1.40374,1.39737 3.8942,1.49814 5.40625,0.21875 L 137,96 c 0.92054,-0.77221 2,-2 2,-4 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+    <path
+       sodipodi:nodetypes="ccccccssccccc"
+       inkscape:connector-curvature="0"
+       id="path12188-3"
+       d="m 135,92 -9.01282,-8 -1,1 0,4 -10.59375,0 c -1.19221,-2.92023 -4.05725,-4.99998 -7.40625,-5 -4.41829,4e-5 -7.98721,3.58172 -7.98718,8 -1e-5,4.41827 3.5689,8 7.98718,8 3.36351,2e-5 6.25472,-2.05966 7.4375,-5 l 10.5625,0 0,4 1,1 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#e06d5f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.25000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+    <path
+       sodipodi:nodetypes="ccccccccc"
+       inkscape:connector-curvature="0"
+       id="rect10944"
+       d="m 109,88 0,8 -1,1 -2,0 -1,-1 0,-8 1,-1 2,0 z"
+       style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+  <g
+     id="g4190"
+     transform="matrix(0,1,1,0,116.9905,-80.00893)">
+    <path
+       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:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 156,80 c -8.78916,1e-5 -16,7.21083 -16,16 1e-5,8.78916 7.21083,16 16,16 8.78916,-1e-5 16,-7.21083 16,-16 -1e-5,-8.78916 -7.21083,-16 -16,-16 z"
+       id="path4163"
+       transform="matrix(0,1,1,0,80.00893,-71.9905)"
+       inkscape:connector-curvature="0" />
+    <path
+       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:#8cd05f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.25;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 176.00893,72.0095 c -6.62739,0 -11.99999,5.37261 -12,12 0,6.62739 5.37261,11.99999 12,12 6.62739,0 11.99999,-5.37261 12,-12 0,-6.62739 -5.37261,-11.99999 -12,-12 z"
+       id="path11970"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cccccccccccccccccccccc"
+       d="m 184.00894,85.00953 -2.99999,-4e-5 -3e-5,-2.99998 -0.99997,-2.00006 -1.00001,-0.99998 -2.00002,-0.99997 -3.00003,3e-5 -1.99994,0.99998 -1.00004,0.99999 -0.99998,2.00003 -1e-5,4.99996 1.00004,1.00001 0.99996,1e-5 1,-1 2e-5,-4.99996 0.99999,-1.00004 2.99997,0 1.00003,0.99999 -1e-5,3 -3.00003,-3e-5 4.50003,5.00003 z"
+       id="path2997-6-6"
+       style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g4206"
+     transform="matrix(0,1,1,0,167,-115)">
+    <path
+       sodipodi:nodetypes="sssss"
+       inkscape:connector-curvature="0"
+       id="path13862"
+       d="m 211,63 c -8.78917,0 -16.00001,7.21082 -16,16 0,8.78917 7.21082,16.00001 16,16 8.78917,0 16.00001,-7.21082 16,-16 0,-8.78917 -7.21082,-16.00001 -16,-16 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
     <path
        inkscape:connector-curvature="0"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3406"
-       d="m 200,167 2,0 c 0,2 0,3.99998 0,6 l -2,0 z" />
+       id="path12055"
+       d="m 211,67 c -6.62739,0 -12.00001,5.37261 -12,12 0,6.62739 5.37261,12.00001 12,12 6.62739,0 12.00001,-5.37261 12,-12 0,-6.62739 -5.37261,-12.00001 -12,-12 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#e06d5f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.25;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
     <path
-       id="path3414"
-       d="m 201,162 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
-       style="opacity:0.25;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79999375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0"
+       id="path12057"
+       d="m 215.5,72.13782 -5,5 -2,2 -4,4 0,1 1,1 1,0 4,-4 2,-2 5,-5 0,-1 -1,-1 -1,0 z m -6.5,0.875 -2,1 -1,1 -1,2 0,4.1875 2.78125,-2.78125 0.21875,-0.21875 0,-1.1875 1,-1 1.1875,0 2.59375,-2.59375 L 212,73.01282 l -3,0 z m 7,4.03125 -2.78125,2.78125 -0.21875,0.1875 -1.5625,1.59375 3.0625,3.40625 4.5,-5 -3,0 0,-2.96875 z"
+       style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+  <g
+     transform="matrix(0,1,-1,0,135,203)"
+     id="g3350">
+    <path
+       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:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m -111,-49 c -2,0 -3.2899,1.14974 -4,2 l -7.03125,8.41907 c -1.27939,1.51205 -1.17862,4.00251 0.21875,5.40625 l 1,1 c 0.73414,0.74243 1.76843,1.17913 2.8125,1.1875 l 0,4.375 c -2.98748,2.1875 -4.99995,5.67161 -5,9.625 6e-5,6.58002 5.41995,11.98722 12,11.98718 6.58003,10e-6 12,-5.40714 12,-11.98718 -1e-5,-3.96861 -1.99295,-7.47078 -5,-9.65625 l 0,-4.34375 c 1.05451,-1.8e-4 2.10227,-0.43771 2.84375,-1.1875 l 1,-1 c 1.39737,-1.40374 1.49814,-3.8942 0.21875,-5.40625 L -107,-47 c -0.77221,-0.92054 -2,-2 -4,-2 z"
+       id="path3352"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssccccccsscccccss" />
+    <path
+       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;fill-rule:nonzero;stroke:none;stroke-width:1.25;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m -111,-45 -8,9.01282 1,1 4,0 0,10.59375 c -2.92023,1.19221 -4.99998,4.05725 -5,7.40625 4e-5,4.41829 3.58172,7.98721 8,7.98718 4.41827,10e-6 8,-3.5689 8,-7.98718 2e-5,-3.36351 -2.05966,-6.25472 -5,-7.4375 l 0,-10.5625 4,0 1,-1 z"
+       id="path3354"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccssccccc" />
+    <path
+       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:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m -110.98512,-19.99704 c 1.65685,0 3,1.34313 2.99999,3.00001 -1e-5,1.65687 -1.34312,3 -2.99999,3.00002 -1.65687,-3e-5 -2.99999,-1.34314 -2.99999,-3.00001 -10e-6,-1.6569 1.34312,-3 2.99999,-3.00002 z"
+       id="path3356"
+       inkscape:connector-curvature="0" />
+  </g>
+  <text
+     xml:space="preserve"
+     style="font-size:10px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:center;text-decoration:none;line-height:150%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:middle;baseline-shift:baseline;opacity:0.50000000000000000;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;font-family:Open Sans;-inkscape-font-specification:Open Sans Bold"
+     x="254.91199"
+     y="126.18999"
+     id="text3358"
+     sodipodi:linespacing="150%"><tspan
+       sodipodi:role="line"
+       id="tspan3360"
+       x="254.91199"
+       y="126.18999">ONLY</tspan></text>
+  <g
+     id="g4190-7"
+     transform="matrix(0,1,1,0,206.9905,-80.00893)">
+    <path
+       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:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 156,80 c -8.78916,1e-5 -16,7.21083 -16,16 1e-5,8.78916 7.21083,16 16,16 8.78916,-1e-5 16,-7.21083 16,-16 -1e-5,-8.78916 -7.21083,-16 -16,-16 z"
+       id="path4163-9"
+       transform="matrix(0,1,1,0,80.00893,-71.9905)"
+       inkscape:connector-curvature="0" />
+    <path
+       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;fill-rule:nonzero;stroke:none;stroke-width:1.25000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 176.00893,72.0095 c -6.62739,0 -11.99999,5.37261 -12,12 0,6.62739 5.37261,11.99999 12,12 6.62739,0 11.99999,-5.37261 12,-12 0,-6.62739 -5.37261,-11.99999 -12,-12 z"
+       id="path11970-3"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cccccccccccccccccccccc"
+       d="m 184.00894,85.00953 -2.99999,-4e-5 -3e-5,-2.99998 -0.99997,-2.00006 -1.00001,-0.99998 -2.00002,-0.99997 -3.00003,3e-5 -1.99994,0.99998 -1.00004,0.99999 -0.99998,2.00003 -1e-5,4.99996 1.00004,1.00001 0.99996,1e-5 1,-1 2e-5,-4.99996 0.99999,-1.00004 2.99997,0 1.00003,0.99999 -1e-5,3 -3.00003,-3e-5 4.50003,5.00003 z"
+       id="path2997-6-6-8"
+       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" />
   </g>
 </svg>
diff --git a/vendor/assets/iD/iD/locales/af.json b/vendor/assets/iD/iD/locales/af.json
index 8f86516f0..30b0a651c 100644
--- a/vendor/assets/iD/iD/locales/af.json
+++ b/vendor/assets/iD/iD/locales/af.json
@@ -830,18 +830,12 @@
             "building/apartments": {
                 "name": "Woonstelle"
             },
-            "building/entrance": {
-                "name": "Ingang"
-            },
             "building/house": {
                 "name": "Huis"
             },
             "emergency/phone": {
                 "name": "Noodtelefoon"
             },
-            "entrance": {
-                "name": "Ingang"
-            },
             "highway": {
                 "name": "Snelweg"
             },
@@ -866,9 +860,6 @@
             "highway/motorway": {
                 "name": "Snelweg"
             },
-            "highway/motorway_junction": {
-                "name": "Snelwegkruising"
-            },
             "highway/motorway_link": {
                 "name": "Snelwegaansluiting"
             },
diff --git a/vendor/assets/iD/iD/locales/ar-AA.json b/vendor/assets/iD/iD/locales/ar-AA.json
index 9e26dfeeb..3c78f484d 100644
--- a/vendor/assets/iD/iD/locales/ar-AA.json
+++ b/vendor/assets/iD/iD/locales/ar-AA.json
@@ -1 +1,172 @@
-{}
\ No newline at end of file
+{
+    "modes": {
+        "add_area": {
+            "title": "مساحة",
+            "description": ".أضف المنتزهات أو المباني أو البحيرات أو مساحات أخرى إلى الخريطة",
+            "tail": ".أنقر على الخريطة لتبدأ رسم مساحة مثل منتزه أو بحيرة أو مبنى"
+        },
+        "add_line": {
+            "title": "خط",
+            "description": "أضف الطرق السريعة أوالشوارع أوممرات المشاة أوالقنوات أو خطوط أخرى إلى الخريطة.",
+            "tail": ".انقر على الخريطة لرسم الطريق أو المسار أو الشارع"
+        },
+        "add_point": {
+            "title": "نقطة",
+            "description": ".إضف المطاعم أوالمعالم أوصناديق البريد أو نقاط أخرى إلى الخريطة",
+            "tail": ".انقر على الخريطة لإضافة نقطة"
+        },
+        "browse": {
+            "title": "تصفح",
+            "description": ".تحرك عموديا و أفقيا أو كبر الخريطة"
+        },
+        "draw_area": {
+            "tail": ".انقر لإضافة العقد إلى منطقتك. انقر فوق العقدة الأولى لإنهاء المنطقة"
+        },
+        "draw_line": {
+            "tail": ".انقر لإضافة المزيد من العقد إلى الخط. انقر على خطوط أخرى للاتصال بهم، وانقر نقرا مزدوجا لإنهاء الخط"
+        }
+    },
+    "operations": {
+        "add": {
+            "annotation": {
+                "point": ".أضاف نقطة",
+                "vertex": ".أظاف عقدة إلى الطريق"
+            }
+        },
+        "start": {
+            "annotation": {
+                "line": ".بدأ خط",
+                "area": ".بدأ المساحة"
+            }
+        },
+        "continue": {
+            "annotation": {
+                "line": ".مواصلة خط",
+                "area": ".مواصلة مساحة"
+            }
+        },
+        "cancel_draw": {
+            "annotation": ".إلغاء الرسم"
+        },
+        "change_tags": {
+            "annotation": ".العلامات المتغيرة"
+        },
+        "circularize": {
+            "annotation": {
+                "line": ".جعل خط دائري",
+                "area": "جعل مساحة  دائرية"
+            }
+        },
+        "orthogonalize": {
+            "title": "مربع",
+            "annotation": {
+                "line": ".جعل زوايا الخط مربعة",
+                "area": ".جعل زوايا المساحة مربعة"
+            }
+        },
+        "delete": {
+            "title": "حذف",
+            "description": ".إزالة هذا من الخريطة",
+            "annotation": {
+                "point": ".حذف نقطة",
+                "vertex": ".حذف عقدة من الطريق",
+                "line": ".حذف خط",
+                "area": ".حذف مساحة",
+                "relation": ".حذف علاقة",
+                "multiple": " .شيء {n} حذف"
+            }
+        },
+        "connect": {
+            "annotation": {
+                "point": ".وصل طريق بنقطة",
+                "vertex": ".وصل طريق بآخر",
+                "line": ".وصل طريق بخط",
+                "area": ".وصل طريق بمساحة"
+            }
+        },
+        "disconnect": {
+            "title": ".غير متصل",
+            "description": ".قطع إتصال هذه الخطوط أوالمساحات بعضها ببعض",
+            "annotation": ".خطوط أومساحات غير متصلة"
+        },
+        "merge": {
+            "title": "دمج",
+            "description": ".دمج هذه الخطوط",
+            "annotation": ".خط مندمج {n}"
+        },
+        "move": {
+            "title": "نقل",
+            "description": ".نقل هذا إلى موقع مختلف",
+            "annotation": {
+                "point": ".نقل نقطة",
+                "vertex": ".نقل عقدة في طريق",
+                "line": ".نقل خط",
+                "area": ".نقل مساحة",
+                "multiple": ".نقل أشياء متعددة"
+            }
+        },
+        "rotate": {
+            "title": "تدوير",
+            "description": ".تدوير هذا الشيء حول نقطة مركزه",
+            "annotation": {
+                "line": ".استدارة خط",
+                "area": ".استدارة مساحة"
+            }
+        },
+        "reverse": {
+            "title": "عكس",
+            "description": ".عكس إتجاه الخط",
+            "annotation": ".تم عكس إتجاه الخط"
+        },
+        "split": {
+            "title": "تقسيم"
+        }
+    },
+    "browser_notice": "هذا المحرر مدعوم في فايرفوكس، كروم، سفاري، أوبرا، وإنترنت إكسبلورر 9 وما فوق. الرجاء ترقية المتصفح أو استخدام بوتلاتش2 .لتعديل الخريطة ",
+    "zoom_in_edit": ".كبِّر للتعديل",
+    "logout": "تسجيل الخروج",
+    "report_a_bug": "خبِّر عن خطأ أو عطل",
+    "commit": {
+        "title": "حفظ التغييرات",
+        "description_placeholder": "وصف موجز لمساهماتكم",
+        "upload_explanation": "التغييرات التي قمتم بتحميلها ستكون مرئية على جميع الخرائط التي تستخدم بيانات خريطة الشارع المفتوح.",
+        "save": "حفظ",
+        "cancel": "إلغاء",
+        "warnings": "تحذيرات",
+        "modified": "تم التغيير",
+        "deleted": "تم الحذف",
+        "created": "تم الإنشاء"
+    },
+    "contributors": {
+        "list": "{users} تعديلات من قبل",
+        "truncated_list": "تعديلات من قبل {users} و {count} آخرين"
+    },
+    "geolocate": {
+        "title": "أظهر مكاني"
+    },
+    "inspector": {
+        "no_documentation_combination": "لا توجد وثائق متاحة لهذه المجموعة من العلامات",
+        "no_documentation_key": "لا توجد وثائق متاحة لهذه الكلمة",
+        "view_on_osm": "openstreetmap.org شاهد على",
+        "choose": "حدد نوع الميزة",
+        "results": "{n} نتائج {search}",
+        "reference": "OpenStreetMap شاهد على ويكي"
+    },
+    "background": {
+        "title": "الخلفية",
+        "description": "إعدادات الخلفية",
+        "percent_brightness": "{opacity}% سطوع",
+        "fix_misalignment": "إصلاح الإستقامة",
+        "reset": "أعد للوضع السابق"
+    },
+    "restore": {
+        "description": "هل ترغب في استعادة التغييرات غير المحفوظة من جلسة التحرير السابق؟",
+        "restore": "استعادة",
+        "reset": "أعد للوضع السابق"
+    },
+    "save": {
+        "title": "حفظ",
+        "help": " مما يجعلها مرئية للمستخدمين الآخرين OpenStreetMap حفظ التغييرات إلى",
+        "no_changes": ".لا تغييرات للحفظ"
+    }
+}
\ No newline at end of file
diff --git a/vendor/assets/iD/iD/locales/ar.json b/vendor/assets/iD/iD/locales/ar.json
index ead07a295..3822b146d 100644
--- a/vendor/assets/iD/iD/locales/ar.json
+++ b/vendor/assets/iD/iD/locales/ar.json
@@ -1052,10 +1052,6 @@
                 "name": "مبني تجاري",
                 "terms": "مبنى تجاري"
             },
-            "building/entrance": {
-                "name": "مدخل",
-                "terms": "مدخل"
-            },
             "building/garage": {
                 "name": "جراج",
                 "terms": "مَرْأب , كراج, تصليح سيارات"
@@ -1088,10 +1084,6 @@
                 "name": "هاتف طوارئ",
                 "terms": "هاتف طوارئ"
             },
-            "entrance": {
-                "name": "مدخل",
-                "terms": "مدخل"
-            },
             "footway/crossing": {
                 "name": "تقاطع",
                 "terms": "تقاطع, معبر"
@@ -1136,10 +1128,6 @@
                 "name": "طريق سريع",
                 "terms": "طريق سريع"
             },
-            "highway/motorway_junction": {
-                "name": "مفرق طريق سريع",
-                "terms": "مفرق طريق سريع"
-            },
             "highway/motorway_link": {
                 "name": "رابط لطريق سريع",
                 "terms": "رابط لطريق سريع"
@@ -1412,10 +1400,6 @@
                 "name": "مزلقة سفن",
                 "terms": "مزلقة سفن"
             },
-            "leisure/sports_center": {
-                "name": "مركز رياضة",
-                "terms": "مركز رياضي، مركز للتسلية والترفيه"
-            },
             "leisure/stadium": {
                 "name": "مدرج رياضي",
                 "terms": "مدرج, مدرج للألعاب الرياضية, أستاذ رياضي"
diff --git a/vendor/assets/iD/iD/locales/ast.json b/vendor/assets/iD/iD/locales/ast.json
index eca8ab38f..0eb143cb7 100644
--- a/vendor/assets/iD/iD/locales/ast.json
+++ b/vendor/assets/iD/iD/locales/ast.json
@@ -18,6 +18,12 @@
         "browse": {
             "title": "Navegar",
             "description": "Mover y ampliar el mapa."
+        },
+        "draw_area": {
+            "tail": "Calca p'amestar noyos al área. Calca nel primeru p'acabar el área."
+        },
+        "draw_line": {
+            "tail": "Calca p'amestar más noyos a la llinia. Calca n'otres llinies pa coneutar con elles, y fai doble clic p'acabar la llinia."
         }
     },
     "operations": {
@@ -42,22 +48,45 @@
         "cancel_draw": {
             "annotation": "Dibuxu encaboxáu."
         },
+        "change_role": {
+            "annotation": "Camudó'l rol d'un miembru de la rellación."
+        },
         "change_tags": {
             "annotation": "Etiquetes camudaes."
         },
         "circularize": {
             "title": "Poner en círculu",
+            "description": {
+                "line": "Facer esta llinia circular.",
+                "area": "Facer esti área circular."
+            },
             "key": "O",
             "annotation": {
                 "line": "Facer una llinia circular.",
                 "area": "Facer un área circular."
-            }
+            },
+            "too_large": "Esto nun pue facese circular porque anguaño nun ye visible bastante."
         },
         "orthogonalize": {
+            "title": "Escuadrar",
+            "description": {
+                "line": "Escuadrar les esquines d'esta llinia.",
+                "area": "Escuadrar les esquines d'esti área."
+            },
+            "key": "S",
             "annotation": {
                 "line": "Escuadraes les esquines d'una llinia.",
                 "area": "Escuadraes les esquines d'un área."
-            }
+            },
+            "not_squarish": "Nun pue escuadrase porque nun ye cuadrada",
+            "too_large": "Esto nun pue escuadrase porque anguaño nun ye visible bastante."
+        },
+        "straighten": {
+            "title": "Enderechar",
+            "description": "Enderechar esta llinia.",
+            "key": "S",
+            "annotation": "Enderechada una llinia.",
+            "too_bendy": "Nun pue enderechase porque ta doblada enforma."
         },
         "delete": {
             "title": "Desaniciar",
@@ -90,7 +119,8 @@
             "title": "Entemecer",
             "description": "Entemecer eses llinies.",
             "key": "C",
-            "annotation": "Entemecies {n} llinies."
+            "annotation": "Entemecies {n} llinies.",
+            "incomplete_relation": "Estes carauterístiques nun puen entemecese porque polo menos una nun se descargó completamente."
         },
         "move": {
             "title": "Mover",
@@ -106,6 +136,7 @@
         },
         "rotate": {
             "title": "Xirar",
+            "description": "Xirar esti oxetu alredor del puntu central.",
             "key": "R",
             "annotation": {
                 "line": "Xirada una llinia.",
@@ -132,16 +163,25 @@
     "tooltip_keyhint": "Atayu:",
     "browser_notice": "Esti editor tien sofitu en Firefox, Chrome, Safari, Opera, ya Internet Explorer 9 y superior. Anueve'l so navegador o use Potlatch 2 pa editar el mapa.",
     "translate": {
+        "translate": "Traducir",
+        "localized_translation_label": "Nome multillingüe",
         "localized_translation_language": "Escoyer idioma",
         "localized_translation_name": "Nome"
     },
+    "zoom_in_edit": "Averar pa editar",
     "logout": "zarrar sesión",
     "loading_auth": "Coneutando con OpenStreetMap...",
     "report_a_bug": "informar d'un fallu",
+    "status": {
+        "error": "Nun se pue coneutar cola API.",
+        "offline": "La API ta desconeutada. Intente la edición más sero.",
+        "readonly": "La API ta en mou de sólo llectura. Tendrá d'esperar pa guardar los cambios."
+    },
     "commit": {
         "title": "Guardar cambios",
         "description_placeholder": "Descripción curtia de les collaboraciones",
         "message_label": "Mensaxe d'unviu",
+        "upload_explanation": "Los cambios que xuba tarán visibles en tolos mapes qu'usen los datos d'OpenStreetMap.",
         "save": "Guardar",
         "cancel": "Encaboxar",
         "warnings": "Avisos",
@@ -149,6 +189,10 @@
         "deleted": "Desaniciáu",
         "created": "Creáu"
     },
+    "contributors": {
+        "list": "Ediciones de {users}",
+        "truncated_list": "Ediciones de {users} y otros {count}"
+    },
     "geolocate": {
         "title": "Amosar el mio allugamientu"
     },
@@ -156,13 +200,33 @@
         "no_documentation_combination": "Nun hai documentación disponible pa esta combinación d'etiquetes",
         "no_documentation_key": "Nun hai documentación disponible pa esta clave",
         "show_more": "Ver más",
+        "view_on_osm": "Ver en openstreetmap.org",
+        "all_tags": "Toles etiquetes",
+        "all_members": "Tolos miembros",
+        "all_relations": "Toles rellaciones",
+        "role": "Rol",
         "choose": "Seleicione un tipu de carauterística",
-        "results": "{n} resultaos pa {search}"
+        "results": "{n} resultaos pa {search}",
+        "reference": "Ver na Wiki d'OpenStreetMap",
+        "back_tooltip": "Camudar carauterística",
+        "remove": "Desaniciar",
+        "search": "Guetar",
+        "multiselect": "Elementos seleicionaos",
+        "unknown": "Desconocíu",
+        "none": "Dengún",
+        "node": "Nuedu",
+        "way": "Vía",
+        "relation": "Rellación",
+        "location": "Allugamientu"
     },
     "background": {
         "title": "Fondu",
         "description": "Configuración del fondu",
         "percent_brightness": "{opacity}% brillu",
+        "none": "Dengún",
+        "custom": "Personalizáu",
+        "custom_button": "Editar fondu personalizáu",
+        "fix_misalignment": "Iguar l'alliniamientu",
         "reset": "reaniciar"
     },
     "restore": {
@@ -183,7 +247,9 @@
         "edited_osm": "¡Editáu OSM!",
         "just_edited": "¡Acaba d'editar OpenStreetMap!",
         "view_on_osm": "Ver en OSM",
-        "facebook": "Compartir en Facebook"
+        "facebook": "Compartir en Facebook",
+        "twitter": "Compartir en Twitter",
+        "google": "Compartir en Google+"
     },
     "confirm": {
         "okay": "Aceutar"
@@ -205,10 +271,12 @@
         "used_with": "usada con {type}"
     },
     "validations": {
+        "untagged_point": "Puntu ensin etiquetar",
         "untagged_line": "Llinia ensin etiquetar",
         "untagged_area": "Área ensin etiquetar",
         "many_deletions": "Va desaniciar {n} oxetos. ¿Ta seguru de que ye esto lo que quier facer? Esto desaniciarálos del mapa que ve tol mundu en openstreetmap.org.",
         "tag_suggests_area": "La etiqueta {tag} suxer que la llinia tendría de ser un área, pero nun ye un area",
+        "untagged_tooltip": "Seleicione un tipu de carauterística que describe qué tipu de {geometry} ye.",
         "deprecated_tags": "Etiquetes anticuaes: {tags}"
     },
     "zoom": {
@@ -216,7 +284,10 @@
         "out": "Alloñar"
     },
     "gpx": {
-        "local_layer": "Ficheru GPX llocal"
+        "local_layer": "Ficheru GPX llocal",
+        "drag_drop": "Abasne y suelte un ficheru .gpx na páxina, o faiga clic nel botón de la drecha pa restolar",
+        "zoom": "Ampliar a la traza GPX",
+        "browse": "Restolar por un ficheru .gpx"
     },
     "help": {
         "title": "Ayuda"
@@ -231,7 +302,12 @@
         },
         "points": {
             "title": "Puntos",
-            "add": "Los puntos puen usase pa representar carauterístiques como tiendes, restaurantes y monumentos. Marquen un llugar específicu, y describen lo qu'hai ellí. **Calque nel botón Puntu p'amestar un puntu nuevu.**"
+            "add": "Los puntos puen usase pa representar carauterístiques como tiendes, restaurantes y monumentos. Marquen un llugar específicu, y describen lo qu'hai ellí. **Calque nel botón Puntu p'amestar un puntu nuevu.**",
+            "place": "El puntu pue ponese faciendo clic nel mapa. **Pon el puntu enriba del edificiu.**",
+            "search": "Hai munches carauterístiques distintes que puen representase con puntos. El puntu que vienes d'amestar ye un Café. **Busca '{name}'**",
+            "choose": "**Escueyi Café la llista.**",
+            "describe": "Agora ta marcáu el puntu como un café. Usando'l editor de carauterístiques, podemos amestar más información de la carauterística. **Amiesta un nome**",
+            "close": "L'editor de carauterístiques pue zarrase calcando nel botón zarrar. **Zarra l'editor de carauterístiques**"
         },
         "areas": {
             "title": "Árees",
@@ -241,7 +317,9 @@
             "title": "Llinies"
         },
         "startediting": {
-            "title": "Principiar la edición"
+            "title": "Principiar la edición",
+            "save": "¡Nun escaeza guardar los cambios de mou regular!",
+            "start": "¡Principie a facer mapes!"
         }
     },
     "presets": {
@@ -447,6 +525,36 @@
             "fixme": {
                 "label": "Arréglame"
             },
+            "fuel": {
+                "label": "Combustible"
+            },
+            "fuel/biodiesel": {
+                "label": "Biodiesel"
+            },
+            "fuel/diesel": {
+                "label": "Diesel"
+            },
+            "fuel/e10": {
+                "label": "E10"
+            },
+            "fuel/e85": {
+                "label": "E85"
+            },
+            "fuel/lpg": {
+                "label": "Propanu"
+            },
+            "fuel/octane_100": {
+                "label": "Gasolina de competición"
+            },
+            "fuel/octane_91": {
+                "label": "Gasolina normal"
+            },
+            "fuel/octane_95": {
+                "label": "Gasolina media"
+            },
+            "fuel/octane_98": {
+                "label": "Gasolina súper"
+            },
             "gauge": {
                 "label": "Anchu de vía"
             },
@@ -473,6 +581,9 @@
             "historic": {
                 "label": "Tipu"
             },
+            "hoops": {
+                "placeholder": "1, 2, 4..."
+            },
             "iata": {
                 "label": "IATA"
             },
@@ -506,6 +617,9 @@
             "leisure": {
                 "label": "Tipu"
             },
+            "length": {
+                "label": "Llonxitú (Metros)"
+            },
             "levels": {
                 "label": "Niveles",
                 "placeholder": "2, 4, 6..."
@@ -555,6 +669,9 @@
                 "label": "Par",
                 "placeholder": "3, 4, 5..."
             },
+            "park_ride": {
+                "label": "Aparcamientu con tresporte públicu"
+            },
             "parking": {
                 "label": "Tipu"
             },
@@ -571,6 +688,9 @@
             "place": {
                 "label": "Tipu"
             },
+            "population": {
+                "label": "Población"
+            },
             "power": {
                 "label": "Tipu"
             },
@@ -619,6 +739,9 @@
             "sac_scale": {
                 "label": "Dificultá del camín"
             },
+            "seasonal": {
+                "label": "Estacional"
+            },
             "service": {
                 "label": "Tipu"
             },
@@ -641,6 +764,9 @@
             "sport": {
                 "label": "Deporte"
             },
+            "sport_ice": {
+                "label": "Deporte"
+            },
             "structure": {
                 "label": "Estructura",
                 "placeholder": "Desconocíu",
@@ -648,7 +774,8 @@
                     "bridge": "Ponte",
                     "tunnel": "Túnel",
                     "embankment": "Rellenu",
-                    "cutting": "Trinchera"
+                    "cutting": "Trinchera",
+                    "ford": "Vau"
                 }
             },
             "studio_type": {
@@ -660,6 +787,9 @@
             "surface": {
                 "label": "Superficie"
             },
+            "tactile_paving": {
+                "label": "Baldosa táctil"
+            },
             "tourism": {
                 "label": "Tipu"
             },
@@ -675,6 +805,9 @@
             "tree_type": {
                 "label": "Tipu"
             },
+            "trees": {
+                "label": "Árboles"
+            },
             "tunnel": {
                 "label": "Túnel"
             },
@@ -697,6 +830,9 @@
             "wheelchair": {
                 "label": "Accesu pa siella de ruedes"
             },
+            "width": {
+                "label": "Anchura (Metros)"
+            },
             "wikipedia": {
                 "label": "Wikipedia"
             },
@@ -709,6 +845,9 @@
                 "name": "Direición",
                 "terms": "Señes,Allugamientu"
             },
+            "aerialway/pylon": {
+                "name": "Poste de tresporte per cable"
+            },
             "aeroway": {
                 "name": "Via d'aviación"
             },
@@ -756,6 +895,9 @@
                 "name": "Bar",
                 "terms": "Chigre,Tasca"
             },
+            "amenity/bbq": {
+                "name": "Barbacoa/Asador"
+            },
             "amenity/bench": {
                 "name": "Asientu",
                 "terms": "Asientu"
@@ -783,6 +925,9 @@
             "amenity/car_wash": {
                 "name": "Llaváu de coches"
             },
+            "amenity/charging_station": {
+                "name": "Estación de recarga"
+            },
             "amenity/cinema": {
                 "name": "Cine",
                 "terms": "Cinematógrafu,Multicine"
@@ -794,6 +939,9 @@
             "amenity/clock": {
                 "name": "Reló"
             },
+            "amenity/compressed_air": {
+                "name": "Aire comprimíu"
+            },
             "amenity/courthouse": {
                 "name": "Xulgáu"
             },
@@ -830,6 +978,13 @@
             "amenity/grave_yard": {
                 "name": "Enterramientos"
             },
+            "amenity/hospital": {
+                "name": "Antoxana d'hospital",
+                "terms": "Zona hospitalaria, terrenu d'hospital"
+            },
+            "amenity/kindergarten": {
+                "name": "Antoxana de guardería"
+            },
             "amenity/library": {
                 "name": "Biblioteca",
                 "terms": "Llibros,Centru de llectura"
@@ -840,6 +995,9 @@
             "amenity/parking": {
                 "name": "Aparcamientu"
             },
+            "amenity/parking_entrance": {
+                "name": "Entrada/Salida de garaxe"
+            },
             "amenity/pharmacy": {
                 "name": "Farmacia",
                 "terms": "Botica,Parafarmacia"
@@ -853,13 +1011,16 @@
                 "terms": "Pagoda"
             },
             "amenity/place_of_worship/christian": {
-                "name": "Ilesia"
+                "name": "Ilesia",
+                "terms": "Cultu cristianu, templu"
             },
             "amenity/place_of_worship/jewish": {
-                "name": "Synagoga"
+                "name": "Synagoga",
+                "terms": "Xudería, xudaísmu"
             },
             "amenity/place_of_worship/muslim": {
-                "name": "Mezquita"
+                "name": "Mezquita",
+                "terms": "Islam, cultu islámicu"
             },
             "amenity/police": {
                 "name": "Policía",
@@ -882,7 +1043,12 @@
                 "terms": "Llimpieza,Reutilización,Escombru"
             },
             "amenity/restaurant": {
-                "name": "Restaurante"
+                "name": "Restaurante",
+                "terms": "Chigre, llagar"
+            },
+            "amenity/school": {
+                "name": "Antoxana d'escuela",
+                "terms": "Terrén d'escuela, zona escolar"
             },
             "amenity/social_facility": {
                 "name": "Serviciu social"
@@ -890,6 +1056,12 @@
             "amenity/social_facility/food_bank": {
                 "name": "Bancu d'alimentos"
             },
+            "amenity/social_facility/group_home": {
+                "name": "Albergue pa grupos"
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Albergue de probes"
+            },
             "amenity/studio": {
                 "name": "Estudiu",
                 "terms": "Música,Radio,Televisión"
@@ -905,13 +1077,15 @@
                 "terms": "Cabina"
             },
             "amenity/theatre": {
-                "name": "Teatru"
+                "name": "Teatru",
+                "terms": "comedia, corral"
             },
             "amenity/toilets": {
                 "name": "Aseos"
             },
             "amenity/townhall": {
-                "name": "Edificiu municipal"
+                "name": "Edificiu municipal",
+                "terms": "Casa del Conceyu, Ayuntamientu"
             },
             "amenity/university": {
                 "name": "Universidá"
@@ -925,7 +1099,8 @@
                 "terms": "Clínica veterinaria"
             },
             "amenity/waste_basket": {
-                "name": "Papelera"
+                "name": "Papelera",
+                "terms": "Papelera, basoria"
             },
             "area": {
                 "name": "Área"
@@ -933,15 +1108,24 @@
             "barrier": {
                 "name": "Barrera"
             },
+            "barrier/block": {
+                "name": "Bloque"
+            },
             "barrier/bollard": {
                 "name": "Bolardu"
             },
+            "barrier/cattle_grid": {
+                "name": "Rexa pa ganáu"
+            },
             "barrier/city_wall": {
                 "name": "Muralla de ciudá"
             },
             "barrier/cycle_barrier": {
                 "name": "Barrera pa bicicletes"
             },
+            "barrier/ditch": {
+                "name": "Riega"
+            },
             "barrier/entrance": {
                 "name": "Entrada"
             },
@@ -954,12 +1138,18 @@
             "barrier/hedge": {
                 "name": "Sebe"
             },
+            "barrier/kissing_gate": {
+                "name": "Puerta ganadera"
+            },
             "barrier/lift_gate": {
                 "name": "Barrera"
             },
             "barrier/retaining_wall": {
                 "name": "Muru de contención"
             },
+            "barrier/stile": {
+                "name": "Pasera pa reblagu"
+            },
             "barrier/toll_booth": {
                 "name": "Cabina de peaxe"
             },
@@ -975,9 +1165,15 @@
             "building/apartments": {
                 "name": "Pisos"
             },
+            "building/barn": {
+                "name": "Graneru"
+            },
             "building/bunker": {
                 "name": "Bunker"
             },
+            "building/cabin": {
+                "name": "Cabaña"
+            },
             "building/cathedral": {
                 "name": "Catedral"
             },
@@ -994,8 +1190,14 @@
                 "name": "Edificiu en construcción",
                 "terms": "Obra, Arreglu"
             },
+            "building/detached": {
+                "name": "Vivienda aisllada"
+            },
+            "building/dormitory": {
+                "name": "Residencia"
+            },
             "building/entrance": {
-                "name": "Entrada"
+                "name": "Entrada/Salida"
             },
             "building/garage": {
                 "name": "Garaxe",
@@ -1037,6 +1239,15 @@
             "building/school": {
                 "name": "Edificiu escolar"
             },
+            "building/shed": {
+                "name": "Caseta de xardín"
+            },
+            "building/stable": {
+                "name": "Establu"
+            },
+            "building/static_caravan": {
+                "name": "Casa portátil"
+            },
             "building/train_station": {
                 "name": "Estación de tren",
                 "terms": "Terminal ferroviaria"
@@ -1044,6 +1255,9 @@
             "building/university": {
                 "name": "Edificiu universitariu"
             },
+            "building/warehouse": {
+                "terms": "Nave d'almacenamientu"
+            },
             "craft/basket_maker": {
                 "name": "Cesteru",
                 "terms": "Goxeru,Paxos,Macones"
@@ -1076,12 +1290,27 @@
                 "name": "Confitería",
                 "terms": "Pastelería, Bollería"
             },
+            "craft/dressmaker": {
+                "name": "Modista"
+            },
             "craft/electrician": {
                 "name": "Electricista"
             },
             "craft/gardener": {
                 "name": "Xardineru"
             },
+            "craft/glaziery": {
+                "name": "Cristalería"
+            },
+            "craft/handicraft": {
+                "name": "Manualidaes"
+            },
+            "craft/hvac": {
+                "name": "Calefactor"
+            },
+            "craft/insulator": {
+                "name": "Aislamientos"
+            },
             "craft/jeweler": {
                 "name": "Xoyería"
             },
@@ -1107,17 +1336,35 @@
                 "name": "Fotografía",
                 "terms": "Fotógrafu,Reveláu"
             },
-            "craft/photographic_labratory": {
+            "craft/photographic_laboratory": {
                 "name": "Llaboratoriu fotográficu",
-                "terms": "Reveláu,Ampliaciones fotográfiques"
+                "terms": "Fotografía, Reveláu, Ampliaciones"
+            },
+            "craft/plasterer": {
+                "name": "Revocador"
             },
             "craft/plumber": {
                 "name": "Fontaneru"
             },
+            "craft/pottery": {
+                "name": "Alfarería"
+            },
+            "craft/rigger": {
+                "name": "Montaxes"
+            },
             "craft/roofer": {
                 "name": "Reteyador",
                 "terms": "Reparación de teyaos, Cubiertes"
             },
+            "craft/saddler": {
+                "name": "Guarnicioneru"
+            },
+            "craft/sailmaker": {
+                "name": "Fabricante de veles"
+            },
+            "craft/sawmill": {
+                "name": "Serraderu"
+            },
             "craft/scaffolder": {
                 "name": "Montaxe d'andamios"
             },
@@ -1130,12 +1377,31 @@
             "craft/stonemason": {
                 "name": "Canteru"
             },
+            "craft/sweep": {
+                "name": "Llimpieza de chimenees"
+            },
             "craft/tailor": {
                 "name": "Sastre"
             },
+            "craft/tiler": {
+                "name": "Azulexista"
+            },
+            "craft/tinsmith": {
+                "name": "Caldereru"
+            },
+            "craft/upholsterer": {
+                "name": "Tapicería"
+            },
+            "craft/watchmaker": {
+                "name": "Reloxeru"
+            },
             "craft/window_construction": {
                 "name": "Construcción de ventanes"
             },
+            "embankment": {
+                "name": "Terremplén",
+                "terms": "rellenu"
+            },
             "emergency/ambulance_station": {
                 "name": "Parque d'ambulancies",
                 "terms": "Centru d'emerxencies"
@@ -1149,12 +1415,15 @@
                 "terms": "S.O.S.,Teléfonu d'ayuda,Teléfonu de socorru"
             },
             "entrance": {
-                "name": "Entrada"
+                "name": "Entrada/Salida"
             },
             "footway/crossing": {
                 "name": "Pasu de peatones",
                 "terms": "Cruce"
             },
+            "ford": {
+                "name": "Vau"
+            },
             "golf/hole": {
                 "name": "Furacu de golf"
             },
@@ -1169,13 +1438,15 @@
                 "name": "Parada d'autobús"
             },
             "highway/crossing": {
-                "name": "Pasu de peatones"
+                "name": "Pasu de peatones",
+                "terms": "Cruce de víes, pasu"
             },
             "highway/cycleway": {
                 "name": "Camín ciclista"
             },
             "highway/footway": {
-                "name": "Camín peatonal"
+                "name": "Camín peatonal",
+                "terms": "Camín, senderu, sienda"
             },
             "highway/living_street": {
                 "name": "Cai residencial",
@@ -1187,11 +1458,9 @@
             "highway/motorway": {
                 "name": "Autopista"
             },
-            "highway/motorway_junction": {
-                "name": "Xunión d'autopista"
-            },
             "highway/motorway_link": {
-                "name": "Enllaz d'autopista"
+                "name": "Enllaz d'autopista",
+                "terms": "Salida, accesu, enllaz, autopista"
             },
             "highway/path": {
                 "name": "Camín"
@@ -1203,7 +1472,8 @@
                 "name": "Carretera autonómica"
             },
             "highway/primary_link": {
-                "name": "Enllaz de carretera autonómica I"
+                "name": "Enllaz de carretera autonómica I",
+                "terms": "Salida, accesu, enllaz, autonómica primaria, autonómica naranxa"
             },
             "highway/residential": {
                 "name": "Cai urbana"
@@ -1218,11 +1488,15 @@
                 "name": "Carretera secundaria"
             },
             "highway/secondary_link": {
-                "name": "Enllaz de carretera autonómica II"
+                "name": "Enllaz de carretera autonómica II",
+                "terms": "Salida, accesu, enllaz, autonómica secundaria, autonómica verde"
             },
             "highway/service": {
                 "name": "Vía de serviciu"
             },
+            "highway/service/alley": {
+                "name": "Pasaxe"
+            },
             "highway/service/emergency_access": {
                 "name": "Accesu d'emerxencia"
             },
@@ -1241,19 +1515,22 @@
                 "name": "Carretera terciaria"
             },
             "highway/tertiary_link": {
-                "name": "Enllaz de carretera autonómica III"
+                "name": "Enllaz de carretera autonómica III",
+                "terms": "Salida, accesu, enllaz, autonómica terciaria, autonómica mariella"
             },
             "highway/track": {
                 "name": "Caleya"
             },
             "highway/traffic_signals": {
-                "name": "Semáforu"
+                "name": "Semáforu",
+                "terms": "Semáforu, pasu peatonal"
             },
             "highway/trunk": {
                 "name": "Carretera nacional"
             },
             "highway/trunk_link": {
-                "name": "Enllaz de carretera nacional"
+                "name": "Enllaz de carretera nacional",
+                "terms": "Salida, accesu, enllaz, nacional"
             },
             "highway/turning_circle": {
                 "name": "Vuelta en cai ensin salida"
@@ -1273,6 +1550,9 @@
             "historic/castle": {
                 "name": "Castiellu"
             },
+            "historic/memorial": {
+                "name": "Obra d'alcordanza"
+            },
             "historic/monument": {
                 "name": "Monumentu"
             },
@@ -1298,6 +1578,9 @@
             "landuse/cemetery": {
                 "name": "Cementeriu"
             },
+            "landuse/churchyard": {
+                "name": "Antoxana d'ilesia"
+            },
             "landuse/commercial": {
                 "name": "Comercial"
             },
@@ -1319,6 +1602,15 @@
             "landuse/industrial": {
                 "name": "Industrial"
             },
+            "landuse/landfill": {
+                "name": "Escombrera"
+            },
+            "landuse/meadow": {
+                "name": "Prau"
+            },
+            "landuse/military": {
+                "name": "Militar"
+            },
             "landuse/orchard": {
                 "name": "Plantación"
             },
@@ -1343,11 +1635,18 @@
             "leisure/golf_course": {
                 "name": "Campu de golf"
             },
+            "leisure/ice_rink": {
+                "name": "Pista de xelu"
+            },
             "leisure/marina": {
                 "name": "Puertu deportivu"
             },
             "leisure/park": {
-                "name": "Parque"
+                "name": "Parque",
+                "terms": "Parque, campu, xardín"
+            },
+            "leisure/picnic_table": {
+                "name": "Mesa pa escursión"
             },
             "leisure/pitch": {
                 "name": "Campu deportivu"
@@ -1380,10 +1679,6 @@
             "leisure/slipway": {
                 "name": "Rampla de botadura"
             },
-            "leisure/sports_center": {
-                "name": "Centru deportivu",
-                "terms": "Polideportivu, Pabellón deportivu"
-            },
             "leisure/stadium": {
                 "name": "Estadiu"
             },
@@ -1400,6 +1695,10 @@
             "man_made": {
                 "name": "Construcciones"
             },
+            "man_made/embankment": {
+                "name": "Terremplén",
+                "terms": "rellenu"
+            },
             "man_made/flagpole": {
                 "name": "Mástil",
                 "terms": "Palu, Bandera"
@@ -1424,7 +1723,8 @@
                 "name": "Torre"
             },
             "man_made/wastewater_plant": {
-                "name": "Planta depuradora"
+                "name": "Planta depuradora",
+                "terms": "Depuradora, tratamientu, agua, pretratamientu"
             },
             "man_made/water_tower": {
                 "name": "Torre de depósitu"
@@ -1432,6 +1732,9 @@
             "man_made/water_well": {
                 "name": "Pozu d'agua"
             },
+            "man_made/water_works": {
+                "name": "Captación d'agua"
+            },
             "military/barracks": {
                 "name": "Cuartel",
                 "terms": "Campamentu militar"
@@ -1456,7 +1759,8 @@
                 "name": "Cantil"
             },
             "natural/coastline": {
-                "name": "Llinia costera"
+                "name": "Llinia costera",
+                "terms": "Costa, ribera"
             },
             "natural/glacier": {
                 "name": "Glacier"
@@ -1464,8 +1768,15 @@
             "natural/grassland": {
                 "name": "Pradera"
             },
+            "natural/heath": {
+                "name": "Escobal"
+            },
             "natural/peak": {
-                "name": "Picu"
+                "name": "Picu",
+                "terms": "Picu, monte, vértiz"
+            },
+            "natural/scrub": {
+                "name": "Fuérfagu"
             },
             "natural/spring": {
                 "name": "Fonte natural"
@@ -1485,6 +1796,9 @@
             "natural/water/reservoir": {
                 "name": "Embalse"
             },
+            "natural/wetland": {
+                "name": "Llamorgal"
+            },
             "natural/wood": {
                 "name": "Viesca"
             },
@@ -1545,12 +1859,25 @@
             "place/city": {
                 "name": "Ciudá"
             },
+            "place/hamlet": {
+                "name": "Aldea"
+            },
             "place/island": {
-                "name": "Islla"
+                "name": "Islla",
+                "terms": "Islla, castru"
             },
             "place/isolated_dwelling": {
                 "name": "Vivienda aisllada"
             },
+            "place/locality": {
+                "name": "Llugar despobláu"
+            },
+            "place/town": {
+                "name": "Villa"
+            },
+            "place/village": {
+                "name": "Pueblu"
+            },
             "point": {
                 "name": "Puntu"
             },
@@ -1604,7 +1931,8 @@
                 "terms": "Parada"
             },
             "railway/level_crossing": {
-                "name": "Pasu a nivel"
+                "name": "Pasu a nivel",
+                "terms": "Pasu a nivel, barrera"
             },
             "railway/monorail": {
                 "name": "Monocarril"
@@ -1629,7 +1957,8 @@
                 "name": "Boca del metro"
             },
             "railway/tram": {
-                "name": "Tranvía"
+                "name": "Tranvía",
+                "terms": "Tranvía, tresporte, trole"
             },
             "relation": {
                 "name": "Rellación"
@@ -1640,9 +1969,19 @@
             "shop": {
                 "name": "Tienda"
             },
+            "shop/alcohol": {
+                "name": "Llicorería",
+                "terms": "Bodega"
+            },
             "shop/bakery": {
                 "name": "Panadería"
             },
+            "shop/beauty": {
+                "name": "Cosmética"
+            },
+            "shop/beverages": {
+                "name": "Venta de bebíes"
+            },
             "shop/bicycle": {
                 "name": "Tienda de ciclismu"
             },
@@ -1664,6 +2003,9 @@
             "shop/car_repair": {
                 "name": "Taller d'automóviles"
             },
+            "shop/chemist": {
+                "name": "Droguería"
+            },
             "shop/clothes": {
                 "name": "Tienda de ropa"
             },
@@ -1673,6 +2015,12 @@
             "shop/confectionery": {
                 "name": "Confitería"
             },
+            "shop/convenience": {
+                "name": "Tienda d'ultramarinos"
+            },
+            "shop/deli": {
+                "name": "Gourmet"
+            },
             "shop/department_store": {
                 "name": "Grandes almacenes"
             },
@@ -1691,6 +2039,10 @@
             "shop/florist": {
                 "name": "Floristería"
             },
+            "shop/funeral_directors": {
+                "name": "Velatoriu",
+                "terms": "Tanatoriu, Funeraria"
+            },
             "shop/furniture": {
                 "name": "Mueblería"
             },
@@ -1753,14 +2105,22 @@
                 "name": "Fotografía",
                 "terms": "Fotógrafu,Reveláu,Material fotográficu"
             },
+            "shop/seafood": {
+                "name": "Mariscos",
+                "terms": "Pescadería"
+            },
             "shop/shoes": {
                 "name": "Zapatería"
             },
             "shop/sports": {
                 "name": "Material deportivu"
             },
+            "shop/stationery": {
+                "name": "Papelería"
+            },
             "shop/supermarket": {
-                "name": "Supermercáu"
+                "name": "Supermercáu",
+                "terms": "Supermercáu, super"
             },
             "shop/toys": {
                 "name": "Xuguetería"
@@ -1774,12 +2134,21 @@
             "shop/vacant": {
                 "name": "Tienda balera"
             },
+            "shop/variety_store": {
+                "name": "Bazar"
+            },
             "shop/video": {
                 "name": "Tienda de videos"
             },
+            "shop/wine": {
+                "name": "Bodega"
+            },
             "tourism": {
                 "name": "Turismu"
             },
+            "tourism/alpine_hut": {
+                "name": "Refuxu d'alpinismu"
+            },
             "tourism/artwork": {
                 "name": "Obra d'arte"
             },
@@ -1789,6 +2158,16 @@
             "tourism/camp_site": {
                 "name": "Llugar d'acampada"
             },
+            "tourism/caravan_site": {
+                "name": "Aparcaderu d'autocaravanes"
+            },
+            "tourism/chalet": {
+                "name": "Casa d'aldea"
+            },
+            "tourism/guest_house": {
+                "name": "Pensión",
+                "terms": "Pensión, agospiamientu, güespes"
+            },
             "tourism/hostel": {
                 "name": "Albergue"
             },
@@ -1802,11 +2181,18 @@
                 "name": "Motel"
             },
             "tourism/museum": {
-                "name": "Muséu"
+                "name": "Muséu",
+                "terms": "Muséu, esposición, galería"
+            },
+            "tourism/picnic_site": {
+                "name": "Área recreativa"
             },
             "tourism/theme_park": {
                 "name": "Parque temáticu"
             },
+            "tourism/viewpoint": {
+                "name": "Mirador"
+            },
             "tourism/zoo": {
                 "name": "Zoo"
             },
@@ -1865,14 +2251,34 @@
             "vertex": {
                 "name": "Otru"
             },
+            "waterway": {
+                "name": "Vía d'agua"
+            },
             "waterway/canal": {
                 "name": "Canal"
             },
+            "waterway/dam": {
+                "name": "Banzáu"
+            },
+            "waterway/ditch": {
+                "name": "Riega"
+            },
+            "waterway/drain": {
+                "name": "Drenaxe"
+            },
             "waterway/river": {
-                "name": "Ríu"
+                "name": "Ríu",
+                "terms": "Ríu, regatu"
             },
             "waterway/riverbank": {
                 "name": "Ribera"
+            },
+            "waterway/stream": {
+                "name": "Regueru",
+                "terms": "Regatu, regueru"
+            },
+            "waterway/weir": {
+                "name": "Ñora"
             }
         }
     }
diff --git a/vendor/assets/iD/iD/locales/bg-BG.json b/vendor/assets/iD/iD/locales/bg-BG.json
index aa6bde43c..ee31e69a0 100644
--- a/vendor/assets/iD/iD/locales/bg-BG.json
+++ b/vendor/assets/iD/iD/locales/bg-BG.json
@@ -898,18 +898,12 @@
             "building/apartments": {
                 "name": "Жилищен блок"
             },
-            "building/entrance": {
-                "name": "Вход"
-            },
             "building/house": {
                 "name": "Къща"
             },
             "emergency/phone": {
                 "name": "Телефон за спешна помощ"
             },
-            "entrance": {
-                "name": "Вход"
-            },
             "highway": {
                 "name": "Път"
             },
@@ -937,9 +931,6 @@
             "highway/motorway": {
                 "name": "Автомагистрала"
             },
-            "highway/motorway_junction": {
-                "name": "Автомагистрален пътен възел"
-            },
             "highway/motorway_link": {
                 "name": "Автомагистрална връзка"
             },
diff --git a/vendor/assets/iD/iD/locales/bn.json b/vendor/assets/iD/iD/locales/bn.json
index 408ae396e..2379c813f 100644
--- a/vendor/assets/iD/iD/locales/bn.json
+++ b/vendor/assets/iD/iD/locales/bn.json
@@ -809,9 +809,6 @@
             "building/commercial": {
                 "name": "বানিজ্যিক ভবন"
             },
-            "building/entrance": {
-                "name": "দ্বার"
-            },
             "building/garage": {
                 "name": "গ্যারেজ"
             },
@@ -830,9 +827,6 @@
             "emergency/phone": {
                 "name": "অাপদকালীন দুরভাষ"
             },
-            "entrance": {
-                "name": "প্রবেশপথ"
-            },
             "footway/crossing": {
                 "name": "ক্রসিং"
             },
diff --git a/vendor/assets/iD/iD/locales/bs.json b/vendor/assets/iD/iD/locales/bs.json
index 4dc6d2e7f..f3947e3dd 100644
--- a/vendor/assets/iD/iD/locales/bs.json
+++ b/vendor/assets/iD/iD/locales/bs.json
@@ -260,7 +260,6 @@
         "percent_brightness": "prozirnost {opacity}% ",
         "none": "Ništa",
         "custom": "Prilagođena pozadina",
-        "custom_prompt": "Unesite šablon pločica. Validni simboli su {z}, {x}, {y} za Z/X/Y šemu i {u} za \"QuadTile\" šemu.",
         "fix_misalignment": "Popravite poravnanje",
         "reset": "ponovo postavite"
     },
@@ -1184,10 +1183,6 @@
                 "name": "Poslovna zgrada",
                 "terms": "poslovna zgrada,zgrada firme"
             },
-            "building/entrance": {
-                "name": "Ulaz",
-                "terms": "ulaz,vrata"
-            },
             "building/garage": {
                 "name": "Garaža",
                 "terms": "garaža"
@@ -1266,9 +1261,6 @@
             "craft/photographer": {
                 "name": "Fotograf"
             },
-            "craft/photographic_labratory": {
-                "name": "Fotografska laboratorija"
-            },
             "craft/plumber": {
                 "name": "Vodoinstalater"
             },
@@ -1312,10 +1304,6 @@
                 "name": "Telefon za hitne slučajeve",
                 "terms": "telefon za hitne slučajeve,hitna telefonska linija"
             },
-            "entrance": {
-                "name": "Ulaz",
-                "terms": "ulaz,vrata"
-            },
             "footway/crossing": {
                 "name": "Prelaz",
                 "terms": "prelaz,pješački prelaz"
@@ -1392,10 +1380,6 @@
                 "name": "Autoput",
                 "terms": "autoput,autocesta"
             },
-            "highway/motorway_junction": {
-                "name": "Čvorište autoputa",
-                "terms": "čvorište autoceste,čvorište autoputa"
-            },
             "highway/motorway_link": {
                 "name": "Poveznica na autoput",
                 "terms": "poveznica na autoput,poveznica na autocestu"
@@ -1672,10 +1656,6 @@
                 "name": "Navoz",
                 "terms": "navoz,navoz na šine"
             },
-            "leisure/sports_center": {
-                "name": "Sportski centar",
-                "terms": "sportski centar,centar za sport, centar za sportske aktivnosti"
-            },
             "leisure/stadium": {
                 "name": "Stadion",
                 "terms": "stadion,sportsko borilište"
diff --git a/vendor/assets/iD/iD/locales/ca.json b/vendor/assets/iD/iD/locales/ca.json
index 7a6cacbb7..f91bc3b6f 100644
--- a/vendor/assets/iD/iD/locales/ca.json
+++ b/vendor/assets/iD/iD/locales/ca.json
@@ -2,28 +2,28 @@
     "modes": {
         "add_area": {
             "title": "Àrea",
-            "description": "Afegeix parcs, edificis, llacs o altres tipus d'àrees sobre el mapa.",
-            "tail": "Feu clic sobre el mapa per començar a un tipus d'àrea com per exemple un parc, un llac o un edifici."
+            "description": "Afegiu parcs, edificis, llacs o altres tipus d'àrees sobre el mapa.",
+            "tail": "Féu clic sobre el mapa per començar a un tipus d'àrea com per exemple un parc, un llac o un edifici."
         },
         "add_line": {
             "title": "Línia",
-            "description": "Afegeix autopistes, carrers, camins per a vianants o d'altres tipus de línies sobre el mapa.",
-            "tail": "Feu clic sobre el mapa per a començar a dibuixar una carretera, un camí o una ruta."
+            "description": "Afegiu autopistes, carrers, camins per a vianants o d'altres tipus de línies sobre el mapa.",
+            "tail": "Féu clic sobre el mapa per a començar a dibuixar una carretera, un camí o una ruta."
         },
         "add_point": {
             "title": "Punt",
-            "description": "Afegeix restaurants, monuments, bústies de correus o altres punts al mapa.",
+            "description": "Afegiu restaurants, monuments, bústies de correus o altres punts al mapa.",
             "tail": "Cliqueu al mapa per afegir un punt."
         },
         "browse": {
             "title": "Navega",
-            "description": "Allunya o amplia el mapa"
+            "description": "Allunyeu o amplieu el mapa"
         },
         "draw_area": {
-            "tail": "Feu clic per afegir nodes a la vostra àrea. Feu clic al primer node per finalitzar l'àrea."
+            "tail": "Féu clic per afegir nodes a la vostra àrea. Féu clic al primer node per finalitzar l'àrea."
         },
         "draw_line": {
-            "tail": "Feu clic per afegir més nodes a la línia. Feu clic a altres línies per connectar amb elles, i feu doble clic per acabar la línia."
+            "tail": "Féu clic per afegir més nodes a la línia. Féu clic a altres línies per connectar amb elles, i feu doble clic per acabar la línia."
         }
     },
     "operations": {
@@ -61,7 +61,7 @@
             "annotation": "Heu canviat etiquetes."
         },
         "circularize": {
-            "title": "Fes-ho circular",
+            "title": "Féu-ho circular",
             "description": {
                 "line": "Fes aquesta línia circular",
                 "area": "Fes aquesta àrea circular"
@@ -71,7 +71,8 @@
                 "line": "Heu fet una línia circular.",
                 "area": "Heu fet una àrea circular."
             },
-            "not_closed": "Això no es pot fer circular perquè no té els extrems units."
+            "not_closed": "Això no es pot fer circular perquè no té els extrems units.",
+            "too_large": "Això no es pot fer circular perquè no hi ha suficient superfície visble."
         },
         "orthogonalize": {
             "title": "Quadrar",
@@ -84,7 +85,8 @@
                 "line": "Heu quadrat les cantonades d'una línia.",
                 "area": "Heu quadrat les cantonades d'una àrea."
             },
-            "not_squarish": "Això no es pot quadrar perquè no té forma quadrada"
+            "not_squarish": "Això no es pot quadrar perquè no té forma quadrada",
+            "too_large": "Això no es pot quadrar perquè no hi ha suficient superfície visible."
         },
         "straighten": {
             "title": "Fer recta",
@@ -94,8 +96,8 @@
             "too_bendy": "Això no es pot quadrar perquè és massa sinuós."
         },
         "delete": {
-            "title": "Suprimeix",
-            "description": "Elimina això del mapa.",
+            "title": "Eliminar",
+            "description": "Elimineu això del mapa.",
             "annotation": {
                 "point": "Heu eliminat un punt.",
                 "vertex": "Heu eliminat un node d'una via.",
@@ -121,15 +123,15 @@
             }
         },
         "disconnect": {
-            "title": "Desconnecta",
-            "description": "Desconnecta aquestes línies/àrees entre elles.",
+            "title": "Desconnectar",
+            "description": "Desconnecteu aquestes línies/àrees entre elles.",
             "key": "D",
             "annotation": "Heu desconnectat línies/àrees.",
             "not_connected": "Aquí no hi han suficients línies/àrees a desconnectar."
         },
         "merge": {
-            "title": "Fusiona",
-            "description": "Fusiona aquestes línies.",
+            "title": "Fusionar",
+            "description": "Fusioneu aquestes línies.",
             "key": "C",
             "annotation": "Heu fusionat {n} línies.",
             "not_eligible": "Aquestes característiques no poden ser fusionades.",
@@ -138,8 +140,8 @@
             "incomplete_relation": "Aquestes característiques no poden ser fusionades perquè com a mínim una no s'ha descarregat del tot."
         },
         "move": {
-            "title": "Mou",
-            "description": "Mou això a una ubicació diferent.",
+            "title": "Moure",
+            "description": "Moveu això a una ubicació diferent.",
             "key": "M",
             "annotation": {
                 "point": "Heu mogut un punt.",
@@ -152,7 +154,7 @@
         },
         "rotate": {
             "title": "Girar-ho",
-            "description": "Girar aquest objecte al voltant del seu centre",
+            "description": "Gireu aquest objecte al voltant del seu centre",
             "key": "R",
             "annotation": {
                 "line": "Heu girat una línia.",
@@ -160,13 +162,13 @@
             }
         },
         "reverse": {
-            "title": "Reverteix",
-            "description": "Fes que aquesta línia vagi en direcció contrària.",
+            "title": "Revertir",
+            "description": "Féu que aquesta línia vagi en direcció contrària.",
             "key": "V",
             "annotation": "Heu revertit una línia."
         },
         "split": {
-            "title": "Divideix",
+            "title": "Dividir",
             "description": {
                 "line": "Dividiu aquesta línia en dos en aquest node.",
                 "area": "Divideix el límit d'aquesta àrea en dues parts.",
@@ -180,6 +182,18 @@
             },
             "not_eligible": "Les línies no es poden dividir al seu inici o al seu final.",
             "multiple_ways": "Aquí hi ha masses línies a dividir."
+        },
+        "restriction": {
+            "help": {
+                "select": "Cliqueu per seleccionar un segment de carretera",
+                "toggle": "Féu clic per canviar les restriccions de gir",
+                "toggle_on": "Féu clic per afegir una restricció de \"{restriction}\"",
+                "toggle_off": "Féu clic per eliminar una restricció de \"{restriction}\""
+            },
+            "annotation": {
+                "create": "Heu afegit una restricció de gir",
+                "delete": "Heu eliminat una restricció de gir"
+            }
         }
     },
     "undo": {
@@ -191,33 +205,33 @@
         "nothing": "Res a refer."
     },
     "tooltip_keyhint": "Drecera:",
-    "browser_notice": "Aquest editor és compatible amb Firefox, Chrome, Safari, Opera i Internet Explorer 9 o superior.\nSiusplau actualitza el teu navegador o bé fes servir Potlach 2 per editar el mapa.",
+    "browser_notice": "Aquest editor és compatible amb Firefox, Chrome, Safari, Opera i Internet Explorer 9 o superior.\nSi us plau actualitzeu el vostre navegador o bé féu servir Potlach 2 per editar el mapa.",
     "translate": {
         "translate": "Traduïu",
         "localized_translation_label": "Nom multilingüe",
         "localized_translation_language": "Escull l'idioma",
         "localized_translation_name": "Nom"
     },
-    "zoom_in_edit": "Apropa't més per editar",
-    "logout": "Tanca la sessió",
+    "zoom_in_edit": "Apropeu-vos més per editar",
+    "logout": "Tancar la sessió",
     "loading_auth": "Connectant a OpenStreetMap...",
-    "report_a_bug": "Reporta un error",
+    "report_a_bug": "Reportar un error",
     "status": {
         "error": "No es pot connectar amb l'API.",
         "offline": "l'API està fora de línia. Siusplau proveu d'editar més tard.",
         "readonly": "L'API es troba en mode només lectura. Us haureu d'esperar per desar els vostres canvis."
     },
     "commit": {
-        "title": "Desa els canvis",
-        "description_placeholder": "Breu descripció de les teves contribucions",
-        "message_label": "Afegeix un comentari",
-        "upload_explanation": "Els canvis que desis seran visibles a tots els maps que utilitzin dades d'OpenStreetMap.",
+        "title": "Desar els canvis",
+        "description_placeholder": "Breu descripció de les vostres contribucions",
+        "message_label": "Afegiu un comentari",
+        "upload_explanation": "Els canvis que deseu seran visibles a tots els mapes que utilitzin dades d'OpenStreetMap.",
         "upload_explanation_with_user": "Els canvis que desis com a {user} seran visibles en tots els mapes que utilitzin dades d'OpenStreetMap.",
-        "save": "Desa",
-        "cancel": "Cancel·la",
+        "save": "Desar",
+        "cancel": "Cancel·lar",
         "warnings": "Avisos",
         "modified": "Modificat",
-        "deleted": "Suprimit",
+        "deleted": "Eliminat",
         "created": "Creat"
     },
     "contributors": {
@@ -230,13 +244,13 @@
         "no_results_worldwide": "No s'han trobat resultats"
     },
     "geolocate": {
-        "title": "Mostra la meva ubicació"
+        "title": "Mostrar la meva ubicació"
     },
     "inspector": {
         "no_documentation_combination": "No hi ha documentació per a aquesta combinació d'etiquetes",
         "no_documentation_key": "No hi ha documentació per a aquesta clau",
-        "show_more": "Mostra'n més",
-        "view_on_osm": "Mostra-ho a openstreetmap.org",
+        "show_more": "Mostrar-ne més",
+        "view_on_osm": "Mostrar-ho a openstreetmap.org",
         "all_tags": "Totes les etiquetes",
         "all_members": "Tots els membres",
         "all_relations": "Totes les relacions",
@@ -244,8 +258,8 @@
         "role": "Rol",
         "choose": "Seleccioneu un tipus de característica",
         "results": "{n} resultats per {search}",
-        "reference": "Mostra-ho al wiki de l'OpenStreetMap",
-        "back_tooltip": "Canvia la característica",
+        "reference": "Mostrar-ho al wiki de l'OpenStreetMap",
+        "back_tooltip": "Canviar la característica",
         "remove": "Elimina",
         "search": "Cerca",
         "multiselect": "Els ítems seleccionats",
@@ -265,23 +279,24 @@
         "percent_brightness": "{opacity}% brillantor",
         "none": "Cap",
         "custom": "Personalitza",
-        "custom_prompt": "Introdueix una plantilla de casella. Els paràmetres vàlids són {z}, {x}, {y} per a l'esquema Z/X/Y i  {u} per a l'esquema quadtile.",
+        "custom_button": "Editar el fons personalitzat",
+        "custom_prompt": "Introduïu una plantilla d'URL de casella. Els paràmetres vàlids són {z}, {x}, {y} per a l'esquema Z/X/Y i  {u} per a l'esquema quadtile.",
         "fix_misalignment": "Corregir la alineació",
-        "reset": "reinicia"
+        "reset": "reiniciar"
     },
     "restore": {
-        "heading": "Tens canvis sense desar",
-        "description": "Vols restaurar els canvis no desats de la sessió anterior?",
-        "restore": "Restaura",
-        "reset": "Reinicia"
+        "heading": "Teniu canvis sense desar",
+        "description": "Voleu restaurar els canvis no desats de la sessió anterior?",
+        "restore": "Restaurar",
+        "reset": "Reiniciar"
     },
     "save": {
-        "title": "Desa",
-        "help": "Desa els canvis a OpenStreetMap, fent-los visibles per als altres usuaris.",
+        "title": "Desar",
+        "help": "Deseu els canvis a OpenStreetMap, fent-los visibles per als altres usuaris.",
         "no_changes": "No hi ha canvis a desar.",
-        "error": "Ha hagut un error en intentar desar",
+        "error": "Hi ha hagut un error en intentar desar",
         "uploading": "Pujant els canvis a l'OpenStreetMap.",
-        "unsaved_changes": "Tens canvis sense desar."
+        "unsaved_changes": "Teniu canvis sense desar."
     },
     "success": {
         "edited_osm": "Heu editat l'OSM!",
@@ -298,8 +313,8 @@
     "splash": {
         "welcome": "Benvinguts a l'editor iD per a l'OpenStreetMap",
         "text": "L'editor iD és una eina fàcil i potent per contribuir al millor mapa lliure del món. Aquesta és la versió {version}. Per obtenir més informació visiteu {website} i si voleu comunicar l'existència d'algun error feu-ho a {github}.",
-        "walkthrough": "Comença la visita guiada",
-        "start": "Edita'l ara"
+        "walkthrough": "Comenceu la visita guiada",
+        "start": "Editeu-lo ara"
     },
     "source_switch": {
         "live": "directe",
@@ -312,17 +327,17 @@
         "used_with": "utilitzat amb {type}"
     },
     "validations": {
-        "untagged_point": "Punt sense etiquetat",
+        "untagged_point": "Punt sense etiquetar",
         "untagged_line": "Línia sense etiquetar",
         "untagged_area": "Àrea sense etiquetar",
-        "many_deletions": "Esteu eliminant {n} objectes. Esteu segurs que voleu fer-ho? Això els eliminarà dels mapa que tothom veu a openstreetmap.org",
+        "many_deletions": "Esteu eliminant {n} objectes. Esteu segurs que voleu fer-ho? Això els eliminarà dels mapes que tothom veu a openstreetmap.org",
         "tag_suggests_area": "L'etiqueta {tag} suggereix que la línia hauria de ser una àrea, però no és una àrea",
         "untagged_tooltip": "Seleccioneu un tipus de característica que descrigui el que és aquesta {geometry}.",
         "deprecated_tags": "Etiquetes obsoletes : {tags}"
     },
     "zoom": {
-        "in": "Apropa't",
-        "out": "Allunya't"
+        "in": "Apropar-se",
+        "out": "Allunyar-se"
     },
     "cannot_zoom": "No es pot allunyar més la vista al mode actual.",
     "gpx": {
@@ -334,9 +349,9 @@
     "help": {
         "title": "Ajuda",
         "help": "# Ajuda\n\nAixò és un editor per al [OpenStreetMap](http://www.openstreetmap.org/), el mapa lliure i editable del món. Podeu utilitzar-lo per afegir i actualitzar\nles dades a la vostra àrea, contibuint així a fer un mapa de codi obert i amb dades lliures del món\nmillor per a tothom.\n\nLes edicions que feu en aquest mapa seran visibles per tothom que faci servir OpenStreetMap. per tal de començar a editar, necessitareu un\n[compte gratuït d'OpenStreetMap](https://www.openstreetmap.org/user/new).\n\n L'[Editor iD](http://ideditor.com/) iés un projecte cooperatiu que té el [codi font\ndisponible a GitHub](https://github.com/openstreetmap/iD).\n",
-        "editing_saving": "# Edició i desat\n\nAquest editor està dissenyat per treballar principalment en línia, i hi has accedit mitjançant una pàgina web.\n\n### Selecció de característiques\n\nPer selecionar una característica del mapa, com ara una carretera o un punt d'interès, clica-hi a sobre. Això ressaltarà la característica, obrirà un panell amb els detalls sobre aquesta, i un menú amb les coses que hi pots fer .\n\nPots seleccionar múltiples característiques, prement la tecla 'Shift' i clicant-les per separat, o bé clicant i arrossegant el cursor. Això seleccionarà totes les característiques que englobi el requadre que es dibuixarà i permetrà modificar totes les característiques seleccionades en un sol cop.\n\n### Desant les edicions\n\nQuan facis canvis com ara editar carreteres, edificis, o llocs, aquests canvis es guarden localment fins que els desis al servidor. No et preocupis si comets algun error- pots desfer els canvis clicant el botó de desfer, i pots refer els canvis clicant el botó de refer.\n\nClica 'Desa' per acabar un grup d'edicions - per exemple, si has acabat de delimitar l'àrea d'una ciutat i vols començar a fer-ne una altra. Tindràs la oportunitat de revisar la feina feta,\ni l'editor proporcionarà suggeriments que et podràn ajudar\ni també mostrarà alertes si alguna cosa no està del tot bé als teus canvis.\n\nSi tot sembla correcte, pots escriure un breu comentari explicant el canvis\nque has fet, i clicar desa un altre cop per publicar els canvis\na [OpenStreetMap.org](http://www.openstreetmap.org/), on seràn visibles\nper a tots els altres usuaris i disponibles per a altres editors per refer-los o bé millorar-los.\n\nSi no pots acabar les teves edicions en una sessió, pots sortir de la finestra d'edició i tornar més tard (al mateix navegador i ordinador), i l'aplicació d'edició\npreguntarà si vols restaurar els canvis anteriors.\n",
-        "roads": "# Carreteres\n\nPots crear, ajustar i eliminar carreteres amb aquest editor. Les carreteres poden ser\nde molts tipus: pistes, autovies, camins, carrils bici, i molts més - tots els segments\nmés comuns han de ser cartografiables.\n\n### Selecció\n\nClica a la carretera per seleccionar-la. Al fer això els seus contorns es faran visibles, \ncom també un petit menú d'eines i una barra lateral que mostrarà més informació\nsobre la carretera.\n\n### Modificació\n\nDe vegades veuràs carreteres que no estan alineades amb la imatge del darrere \no amb una traça de GPS. Podeu ajustar aquestes carreteres per tal que estiguin al lloc\ncorrecte.\n\nPrimer clica a la carretera que vols canviar. Això la ressaltarà i mostrarà els punts de control\nque pots arrossegar a les ubicacions desitjades. Si el que\nvols és afegir nous punts per obtenir un grau de detall més alt, fes doble clic en una part de la carretera sense cap punt, i se'n afegirà un.\n\nSi la carretera es connecta amb una altra, però no ho reflecteix al mapa, \npots arrossegar un dels punts de control cap a l'altre carretera \nper tal d'unir-les. Fer que les carreteres es connectin és molt important \nper al mapa i essencial per proveir direccions per a la conducció.\n\nTambé pots clicar l'eina «Moure» o prémer la tecla «M» per moure la carretera sencera, tota de cop, i llavors clicar altra vegada per guardar aquest moviment.\n\n### Eliminació\n\nSi una carretera està totalment malament -pots apreciar que no existeix a la imatge per satèl·lit\ni a més a més, els veïns ens han confirmat que no existeix - la pots eliminar, cosa que la treurà del mapa. Vés amb molt de compte a l'hora d'eliminar característiques -\ncom ara altres edicions; els resultats podran ser vistos per tothom i moltes vegades la imatgeria per satèl·lit no està actualitzada, per tant la carretera es pot haver estat construida recentment.\n\nPots eliminar una carretera clicant-la, i llavors clicant la icona de la paperera o bé prement la tecla «Suprimir».\n\n### Creació\n\nHas trobat que en algun lloc hi hauria d'haver una carretera però no hi és? Clica la icona «Línia»\nal marge superior esquerre de la zona del mapa o bé prem la tecla «2» per començar a dibuixar\nuna línia.\n\nClica a l'inici de la carretera al mapa per començar a dibuixar. Si la carretera comença amb una bifurcació en una carretera existent, cliqueu al lloc a on connecten.\n\nA continuació clica a diferents punts al llarg de la carretera per tal que segueixi el traçat correcte, d'acord  amb la imatge del satèl·lit o la traça del GPS. Si la carretera que estàs dibuixant s'encreua amb una altra carretera, connecta-les clicant al punt d'intersecció. Quan acabis el dibuix, fes doble clic o prem «Retorn» del teclat.\n",
-        "gps": "# GPS\n\nLes dades de GPS són la font més fiable de dades per a l'OpenStreetMap. Aquest editor és compatible amb les taces locals - fitxers`.gpx`al teu ordinador local. Pots recollir \naquest tipus de traça GPS amb algunes aplicacions per a smartphones com també \ndispositius personals de GPS.\n\nPer a més informació sobre com recollir dades amb GPS, llegeix\n[Recollir dades amb GPS](http://learnosm.org/en/beginner/using-gps/).\n\nper fer servir una traça GPX per editar el mapa, arrossega i deixa el fitxer GPX a l'editor. \nSi es detecta, s'afegirà el mapa com una línia verda llampant. \nClica a 'Paràmetres de configuració del fons'  al cantó esquerre per activar,\ndesactivar, o per ajustar la vista a aquesta capa GPX.\n\nLa traça GPX no és pujada directament a OpenStreetMap - la millor manera de \nfer-la servir és dibuixar tu el mapa, fent-la servir com a guia per a les noves característiques que afegiràs. també les pots [pujar a l'OpenStreetMap] \n(http://www.openstreetmap.org/trace/create)\nperquè d'altres persones les utilitzin.\n",
+        "editing_saving": "# Edició i desat\n\nAquest editor està dissenyat per treballar principalment en línia, i hi heu accedit mitjançant una pàgina web.\n\n### Selecció de característiques\n\nPer selecionar una característica del mapa, com ara una carretera o un punt d'interès, cliqueu-hi a sobre. Això ressaltarà la característica, obrirà un panell amb els detalls sobre aquesta, i un menú amb les coses que hi podeu fer .\n\nPodeu seleccionar múltiples característiques, prement la tecla 'Shift' i clicant-les per separat, o bé clicant i arrossegant el cursor. Això seleccionarà totes les característiques que englobi el requadre que es dibuixarà i permetrà modificar totes les característiques seleccionades en un sol cop.\n\n### Desant les edicions\n\nQuan féu canvis com ara editar carreteres, edificis, o llocs, aquests canvis es desen localment fins que els deseu al servidor. No us preocupeu si cometeu algun error- podeu desfer els canvis clicant el botó de desfer, i podeu refer els canvis clicant el botó de refer.\n\nCliqueu 'Desa' per acabar un grup d'edicions - per exemple, si heu acabat de delimitar l'àrea d'una ciutat i voleu començar a fer-ne una altra. Tindreu la oportunitat de revisar la feina feta,\ni l'editor proporcionarà suggeriments que us podran ajudar\ni també mostrarà alertes si alguna cosa no està del tot bé als vostres canvis.\n\nSi tot sembla correcte, podeu escriure un breu comentari explicant el canvis\nque heu fet, i clicar desa un altre cop per publicar els canvis\na [OpenStreetMap.org](http://www.openstreetmap.org/), on seran visibles\nper a tots els altres usuaris i disponibles per a altres editors per refer-los o bé millorar-los.\n\nSi no podeu acabar les vostres edicions en una sessió, podeu sortir de la finestra d'edició i tornar més tard (al mateix navegador i ordinador), i l'aplicació d'edició\npreguntarà si voleu restaurar els canvis anteriors.\n",
+        "roads": "# Carreteres\n\nPodeu crear, ajustar i eliminar carreteres amb aquest editor. Les carreteres poden ser\nde molts tipus: pistes, autovies, camins, carrils bici, i molts més - tots els segments\nmés comuns han de ser cartografiables.\n\n### Selecció\n\nCliqueu a la carretera per seleccionar-la. Al fer això els seus contorns es faran visibles, \ncom també un petit menú d'eines i una barra lateral que mostrarà més informació\nsobre la carretera.\n\n### Modificació\n\nDe vegades veureu carreteres que no estan alineades amb la imatge del darrere \no amb una traça de GPS. Podeu ajustar aquestes carreteres per tal que estiguin al lloc\ncorrecte.\n\nPrimer cliqueu a la carretera que voleu canviar. Això la ressaltarà i mostrarà els punts de control\nque podeu arrossegar a les ubicacions desitjades. Si el que\nvoleu és afegir nous punts per obtenir un grau de detall més alt, féu doble clic en una part de la carretera sense cap punt, i se'n afegirà un.\n\nSi la carretera es connecta amb una altra, però no es reflecteix al mapa, \npodeu arrossegar un dels punts de control cap a l'altre carretera \nper tal d'unir-les. Fer que les carreteres es connectin és molt important \nper al mapa i essencial per proveir direccions per a la conducció.\n\nTambé podeu clicar l'eina «Moure» o prémer la tecla «M» per moure la carretera sencera, tota de cop, i llavors clicar altra vegada per guardar aquest moviment.\n\n### Eliminació\n\nSi una carretera està totalment malament -podeu apreciar que no existeix a la imatge per satèl·lit\ni a més a més, els veïns ens han confirmat que no existeix - la podeu eliminar, cosa que la treurà del mapa. Aneu amb molt de compte a l'hora d'eliminar característiques -\ncom ara altres edicions; els resultats podran ser vistos per tothom i moltes vegades la imatgeria per satèl·lit no està actualitzada, per tant la carretera es pot haver estat construida recentment.\n\nPodeu eliminar una carretera clicant-la, i llavors clicant la icona de la paperera o bé prement la tecla «Suprimir».\n\n### Creació\n\nHeu trobat que en algun lloc hi hauria d'haver una carretera però no hi és? Cliqueu la icona «Línia»\nal marge superior esquerre de la zona del mapa o bé prem la tecla «2» per començar a dibuixar\nuna línia.\n\nCliqueu a l'inici de la carretera al mapa per començar a dibuixar. Si la carretera comença amb una bifurcació en una carretera existent, cliqueu al lloc a on connecten.\n\nA continuació cliqueu a diferents punts al llarg de la carretera per tal que segueixi el traçat correcte, d'acord  amb la imatge del satèl·lit o la traça del GPS. Si la carretera que esteu dibuixant s'encreua amb una altra carretera, connecteu-les clicant al punt d'intersecció. Quan acabis el dibuix, féu doble clic o premeu «Retorn» del teclat.\n",
+        "gps": "# GPS\n\nLes dades de GPS són la font més fiable de dades per a l'OpenStreetMap. Aquest editor és compatible amb les taces locals - fitxers`.gpx`al vostre ordinador local. Podeu recollir \naquest tipus de traça GPS amb algunes aplicacions per a smartphones com també \ndispositius personals de GPS.\n\nPer a més informació sobre com recollir dades amb GPS, llegiu\n[Recollir dades amb GPS](http://learnosm.org/en/beginner/using-gps/).\n\nper fer servir una traça GPX per editar el mapa, arrossegueu i deixeu el fitxer GPX a l'editor. \nSi es detecta, s'afegirà el mapa com una línia verda llampant. \nCliqueu a 'Paràmetres de configuració del fons'  al cantó esquerre per activar,\ndesactivar, o per ajustar la vista a aquesta capa GPX.\n\nLa traça GPX no és pujada directament a OpenStreetMap - la millor manera de \nfer-la servir és dibuixar vosaltres el mapa, fent-la servir com a guia per a les noves característiques que afegireu. També les podeu [pujar a l'OpenStreetMap] \n(http://www.openstreetmap.org/trace/create)\nperquè d'altres persones les utilitzin.\n",
         "imagery": "# Imatgeria\n\nLa imatgeria aèria és un recurs important per a l'edició de mapes. Una combinació de\nvols d'aeronaus, fotografies de satèl·lit, i d'altres fonts compilades gratuïtament \nestan disponibles a l'editor dins del menú de l'esquerra 'Paràmetres de configuració del fons'.\n\nPer defecte, l'editor mostra la capa de satèl·lit de [Bing Maps](http://www.bing.com/maps/), però a mesura que et mous i ajustes la vista del mapa a noves àrees geogràfiques, noves fonts estaran disponibles. En alguns països, com ara els Estats Units, França, i Dinamarca tenen\n una imatgeria d'alta qualitat disponible per a determinades àrees.\n\nLa imatgeria a vegades no es correspon amb les dades del mapa, això és degut a un error\nper part del proveïdor de la imatge. Si veus moltes carreteres mogudes del seu lloc a la imatge,\nno les moguis per tal que encaixin amb aquesta. Ja que pots ajustar la imatgeria per tal de que quadri amb les dades existents clicant a 'Corregeix la desalineació' al capdevall de la pestanya dels\n'Paràmetres de configuració del fons'.\n",
         "addresses": "# Adreçes\n\nLes adreçes són una de les informacions més útils per al mapa.\n\nTot i que les adreces sovint es representen com a part del carrer, a l'OpenStreetMap\nes desen com a atributs dels edificis i llocs al llarg dels carrers\n\nPodeu afegir la informació de l'adreça a llocs cartografiats com a edificis com també\na aquells llocs cartografiats com a simples punts. La forma òptima d'obtenir dades \nde les adreces és a partir d'un estudi al carrer o bé el coneixement propi - com a qualsevol altra característica, la còpia de fonts comercials com ara el Google Maps és estrictament prohibida.\n",
         "inspector": "# Utilitzant l'inspector\n\nL'Inspector és l'element de l'interfície d'usuari que es troba al cantó dret de la pàgina i que+\napareix quan una característica és seleccionada i permet editar-ne els detalls.\n\n### Selecció del tipus de característica\n\nDesprés d'afegir un punt, línia, o àrea, pots escollir quin tipus de característica és,\nTant si és una autopista com un carrer residencial, un supermercat o un cafè.\nL'inspector mostrarà botons per els tipus de característica més comuns, i en pots trobar d'altres escrivint el que estàs buscant al quadre de cerca.\n\nClica la 'i' al cantó inferior dret del botó  del tipus de característica per saber-ne més. Clica el botó per seleccionar-la.\n\n### Utilització dels camps i les etiquetes d'edició\n\nDesprés d'escollir la característica, o quan selecciones una característica que ja té\nun tipus assignat, l'inspector mostrarà uns camps amb detalls de la característica \ncom ara el seu nom o la seva adreça .\n\nA sota dels camps que veus, pots clicar algunes icones per afegir altres detalls,\ncom ara infrmació de la [Viquipèdia](http://www.wikipedia.org/), l'accés per a cadires de rodes,\ni alguna cosa més.\n\nAl capdavall de l'inspector, clica 'Etiquetes adicionals' per afegir altres etiquetes arbitràries a l'element. [Taginfo](http://taginfo.openstreetmap.org/) és una gran eina per aprendre'n més sobre les combinacions d'etiquetes més populars.\n\nEls canvis que facis a l'inspector s'aplicaran automàticament al mapa.\nEls pots desfer en qualsevol moment clicant al botó de 'Desfer' .\n\n",
@@ -409,6 +424,9 @@
             "category-rail": {
                 "name": "Rail"
             },
+            "category-restriction": {
+                "name": "Restricció"
+            },
             "category-road": {
                 "name": "Carretera"
             },
@@ -591,6 +609,9 @@
             "entrance": {
                 "label": "Tipus"
             },
+            "except": {
+                "label": "Excepcions"
+            },
             "fax": {
                 "label": "Fax",
                 "placeholder": "+31 42 123 4567"
@@ -604,6 +625,36 @@
             "fixme": {
                 "label": "Arregla'm"
             },
+            "fuel": {
+                "label": "Carburant"
+            },
+            "fuel/biodiesel": {
+                "label": "Ven Biodièsel"
+            },
+            "fuel/diesel": {
+                "label": "Ven dièsel"
+            },
+            "fuel/e10": {
+                "label": "Ven E10"
+            },
+            "fuel/e85": {
+                "label": "Ven E85"
+            },
+            "fuel/lpg": {
+                "label": "Ven propà"
+            },
+            "fuel/octane_100": {
+                "label": "Ven benzina de competició"
+            },
+            "fuel/octane_91": {
+                "label": "Ven benzina regular"
+            },
+            "fuel/octane_95": {
+                "label": "Ven benzina de mig grau"
+            },
+            "fuel/octane_98": {
+                "label": "Ven benzina premium"
+            },
             "gauge": {
                 "label": "Ample"
             },
@@ -667,6 +718,9 @@
             "leisure": {
                 "label": "Tipus"
             },
+            "length": {
+                "label": "Llargada (metres)"
+            },
             "levels": {
                 "label": "Nivells",
                 "placeholder": "2, 4, 6..."
@@ -701,10 +755,16 @@
                 "label": "Tipus"
             },
             "oneway": {
-                "label": "Sentit únic"
+                "label": "Sentit únic",
+                "options": {
+                    "undefined": "Sobreentès que és no"
+                }
             },
             "oneway_yes": {
-                "label": "Sentit únic"
+                "label": "Sentit únic",
+                "options": {
+                    "undefined": "Sobreentès que és sí"
+                }
             },
             "opening_hours": {
                 "label": "Horari"
@@ -738,6 +798,9 @@
             "place": {
                 "label": "Tipus"
             },
+            "population": {
+                "label": "Població"
+            },
             "power": {
                 "label": "Tipus"
             },
@@ -777,6 +840,9 @@
             "restriction": {
                 "label": "Tipus"
             },
+            "restrictions": {
+                "label": "Restriccions de gir"
+            },
             "route": {
                 "label": "Tipus"
             },
@@ -786,6 +852,9 @@
             "sac_scale": {
                 "label": "Dificultat del camí"
             },
+            "seasonal": {
+                "label": "Estacional"
+            },
             "service": {
                 "label": "Tipus"
             },
@@ -798,6 +867,9 @@
             "shop": {
                 "label": "Tipus"
             },
+            "sloped_curb": {
+                "label": "Corba peraltada"
+            },
             "smoking": {
                 "label": "Apte per a fumadors"
             },
@@ -811,6 +883,9 @@
             "sport": {
                 "label": "Esport"
             },
+            "sport_ice": {
+                "label": "Esport"
+            },
             "structure": {
                 "label": "Estructura",
                 "placeholder": "Desconegut",
@@ -818,7 +893,8 @@
                     "bridge": "Pont",
                     "tunnel": "Túnel",
                     "embankment": "Terraplè ",
-                    "cutting": "Trinxera"
+                    "cutting": "Trinxera",
+                    "ford": "Ford"
                 }
             },
             "studio_type": {
@@ -830,6 +906,9 @@
             "surface": {
                 "label": "Superfície"
             },
+            "tactile_paving": {
+                "label": "Paviment rugós"
+            },
             "toilets/disposal": {
                 "label": "Contenidor"
             },
@@ -873,6 +952,9 @@
             "wheelchair": {
                 "label": "Accés per a cadires de rodes"
             },
+            "width": {
+                "label": "Amplada (metres)"
+            },
             "wikipedia": {
                 "label": "Viquipèdia"
             },
@@ -970,6 +1052,9 @@
                 "name": "Bar",
                 "terms": "Bar, Local d'oci nocturn, Bar Musical, Local d'oci "
             },
+            "amenity/bbq": {
+                "name": "Barbacoa/graella"
+            },
             "amenity/bench": {
                 "name": "Banc",
                 "terms": "Banc peatonal, Banc per a asseure's, Banc de carrer"
@@ -1001,6 +1086,9 @@
                 "name": "Rentat de cotxes",
                 "terms": "Servei de neteja de cotxes, Tren de rentat de cotxes, Estació d'autorentat de cotxes"
             },
+            "amenity/charging_station": {
+                "name": "Estació de càrrega"
+            },
             "amenity/childcare": {
                 "name": "Servei de guarderia",
                 "terms": "Servei de guarderia, Servei de cangur, Servei de cura de la infància"
@@ -1019,6 +1107,9 @@
                 "name": "Campus universitari",
                 "terms": "Col·legi, Campus universitàri, universitat, facultat"
             },
+            "amenity/compressed_air": {
+                "name": "Aire comprimit"
+            },
             "amenity/courthouse": {
                 "name": "Jutjat",
                 "terms": "Jutjats, Palau de justícia"
@@ -1029,6 +1120,9 @@
             "amenity/doctor": {
                 "name": "Doctor"
             },
+            "amenity/dojo": {
+                "name": "Dojo / Acadèmia d'arts marcials"
+            },
             "amenity/drinking_water": {
                 "name": "Aigua apte per al consum",
                 "terms": "Aigua potable, Aigua apte per al consum humà, Aigua per beure"
@@ -1058,10 +1152,12 @@
                 "terms": "Cementiri, Camp de tombes, necròpoli, ciutat dels difunts"
             },
             "amenity/hospital": {
-                "name": "Terrenys hospitalaris"
+                "name": "Terrenys hospitalaris",
+                "terms": "Hospital, centre hospitalari, policlínica, clínica. "
             },
             "amenity/kindergarten": {
-                "name": "Terrenys de Jardí d'infància"
+                "name": "Terrenys de Jardí d'infància",
+                "terms": "Parc infantil"
             },
             "amenity/library": {
                 "name": "Biblioteca",
@@ -1078,6 +1174,9 @@
                 "name": "Aparcament",
                 "terms": "Aparcament, Pàrquing, Garatge"
             },
+            "amenity/parking_entrance": {
+                "name": "Entrada de Garatge/Sortida"
+            },
             "amenity/pharmacy": {
                 "name": "Farmàcia",
                 "terms": "Farmàcia, establiment de venda de medicaments,"
@@ -1129,7 +1228,8 @@
                 "terms": "Restaurant, Lloc per menjar, Bistro, Wok, Trattoria, Pizzeria"
             },
             "amenity/school": {
-                "name": "Terrenys d'escola"
+                "name": "Terrenys d'escola",
+                "terms": "Escola, CEIP, IES, Col·legi, Institut, Centre educatiu, Guarderia"
             },
             "amenity/shelter": {
                 "name": "Refugi"
@@ -1240,14 +1340,16 @@
                 "terms": "Porta giratòria, Porta sense retorn, Accés giratori, Porta de no retorn"
             },
             "barrier/lift_gate": {
-                "name": "Barrera per a vehicles"
+                "name": "Barrera per a vehicles",
+                "terms": "Porta d'ascensor"
             },
             "barrier/retaining_wall": {
                 "name": "Mur de contenció",
                 "terms": "Mur de contenció, Paret de contenció"
             },
             "barrier/stile": {
-                "name": "esgraons"
+                "name": "esgraons",
+                "terms": "Escala de tanca"
             },
             "barrier/toll_booth": {
                 "name": "Peatge",
@@ -1288,7 +1390,8 @@
                 "name": "Església"
             },
             "building/commercial": {
-                "name": "Edifici comercial"
+                "name": "Edifici comercial",
+                "terms": "Edifici comercial"
             },
             "building/construction": {
                 "name": "Edifici en construcció"
@@ -1301,11 +1404,12 @@
                 "name": "Edifici d'habitacions"
             },
             "building/entrance": {
-                "name": "Entrada",
-                "terms": "Entrada, Porta, Portes, Portalada, Accés"
+                "name": "Entrada/Sortida",
+                "terms": "Entrada/Sortida"
             },
             "building/garage": {
-                "name": "garatge "
+                "name": "garatge ",
+                "terms": "Garatge"
             },
             "building/garages": {
                 "name": "Garatges"
@@ -1320,19 +1424,23 @@
                 "name": "Edifici hoteler"
             },
             "building/house": {
-                "name": "Casa"
+                "name": "Casa",
+                "terms": "Casa"
             },
             "building/hut": {
-                "name": "Cabana"
+                "name": "Cabana",
+                "terms": "Barraca"
             },
             "building/industrial": {
-                "name": "Edifici industrial"
+                "name": "Edifici industrial",
+                "terms": "Edifici industrial"
             },
             "building/public": {
                 "name": "Edifici públic"
             },
             "building/residential": {
-                "name": "Edifici residencial"
+                "name": "Edifici residencial",
+                "terms": "Edifici residencial"
             },
             "building/retail": {
                 "name": "Edifici de grans magatzems"
@@ -1440,7 +1548,7 @@
             "craft/photographer": {
                 "name": "Fotògraf"
             },
-            "craft/photographic_labratory": {
+            "craft/photographic_laboratory": {
                 "name": "Laboratori fotogràfic"
             },
             "craft/plasterer": {
@@ -1515,15 +1623,23 @@
                 "terms": "Telèfon d'emergències, SOS, S.O.S"
             },
             "entrance": {
-                "name": "Entrada",
-                "terms": "Entrada, Porta, Portes, Portalada, Accés"
+                "name": "Entrada/Sortida",
+                "terms": "Entrada/Sortida"
             },
             "footway/crossing": {
-                "name": "Cruïlla"
+                "name": "Pas de vianants",
+                "terms": "Travessera, Cruïlla, Pas de Vianants, Pas Zebra, Pas de peatons, pas de transeünts"
+            },
+            "footway/crosswalk": {
+                "name": "Pas de vianants",
+                "terms": "Pas de peations, pas, de, peatons, vianants, persones, zebra"
             },
             "footway/sidewalk": {
                 "name": "Vorera"
             },
+            "ford": {
+                "name": "Ford"
+            },
             "golf/bunker": {
                 "name": "Bunker"
             },
@@ -1549,79 +1665,102 @@
                 "name": "Obstacle d'aigua"
             },
             "highway": {
-                "name": "Via"
+                "name": "Via",
+                "terms": "Via, Carretera"
             },
             "highway/bridleway": {
-                "name": "Camí de ferradura"
+                "name": "Camí de ferradura",
+                "terms": "Camí de ferradura, cavall, camí eqüestre, via eqüestre, ferradura, via de ferradura"
             },
             "highway/bus_stop": {
                 "name": "Parada d'autobús",
                 "terms": "Parada de bus, Parada"
             },
             "highway/crossing": {
-                "name": "Cruïlla"
+                "name": "Pas de vianants",
+                "terms": "Travessera, Cruïlla, Pas de Vianants, Pas Zebra, Pas de peatons, pas de transeünts"
+            },
+            "highway/crosswalk": {
+                "name": "Pas de vianants",
+                "terms": "Pas de peations, pas, de, peatons, vianants, persones, zebra"
             },
             "highway/cycleway": {
-                "name": "Carril bici"
+                "name": "Carril bici",
+                "terms": "Carril bici, Via verda,Via ciclista"
             },
             "highway/footway": {
-                "name": "Camí per a vianants"
+                "name": "Camí per a vianants",
+                "terms": "Camí per a vianants, carrer peatonal, camí per a peatons, a peu, camí per caminar, vianant, vianants, peató, peatons, transeünt, transeünts, peatonal"
             },
             "highway/living_street": {
-                "name": "Carrer residencial"
+                "name": "Carrer residencial",
+                "terms": "Carrer residencial"
             },
             "highway/mini_roundabout": {
                 "name": "Mini-Rotonda",
                 "terms": "Minirotonda, Mini-rotonda, Rotonda petita"
             },
             "highway/motorway": {
-                "name": "Autopista"
+                "name": "Autopista",
+                "terms": "Autopista,Autovia"
             },
             "highway/motorway_junction": {
-                "name": "sortida d'autopista"
+                "name": "Intersecció d'autopista / Sortida"
             },
             "highway/motorway_link": {
-                "name": "Enllaç d'autopista"
+                "name": "Enllaç d'autopista",
+                "terms": "Rampa, entrada, incorporació, baixada, addició, autopista, autovia, eix"
             },
             "highway/path": {
-                "name": "Camí"
+                "name": "Camí",
+                "terms": "Sender,Corriol"
             },
             "highway/pedestrian": {
                 "name": "Via Peatonal",
                 "terms": "Carrer Peatonal, Àrea per a peatons, Trànsit tallat, Carrer tancat al trànsit, Carrer per a vianants, Àrea per a vianants, Carrer per a transeünts, Peatons, Peatonal, Carrer per a Transeünts, Àrea peatonal"
             },
             "highway/primary": {
-                "name": "Carretera primària"
+                "name": "Carretera primària",
+                "terms": "Carretera primària,Carretera de 1r ordre"
             },
             "highway/primary_link": {
-                "name": "Enllaç de carretera primària"
+                "name": "Enllaç de carretera primària",
+                "terms": "Enllaç amb primària"
             },
             "highway/residential": {
-                "name": "Carrer"
+                "name": "Carrer",
+                "terms": "Carrer"
             },
             "highway/rest_area": {
                 "name": "Àrea de descans"
             },
             "highway/road": {
-                "name": "Carretera sense classificació"
+                "name": "Carretera sense classificació",
+                "terms": "via desconeguda, via per arreglar,"
             },
             "highway/secondary": {
-                "name": "Carretera secundària"
+                "name": "Carretera secundària",
+                "terms": "Carretera secundària,Carretera de 2n ordre"
             },
             "highway/secondary_link": {
-                "name": "Enllaç de carretera secundària"
+                "name": "Enllaç de carretera secundària",
+                "terms": "Enllaç amb secundària"
             },
             "highway/service": {
-                "name": "Via de servei"
+                "name": "Via de servei",
+                "terms": "Via de servei, Lateral"
             },
             "highway/service/alley": {
-                "name": "Carreró"
+                "name": "Carreró",
+                "terms": "Carreró,Cul de sac"
             },
             "highway/service/drive-through": {
-                "name": "Via dins una propietat"
+                "name": "Via dins una propietat",
+                "terms": "Pas de vehicles"
             },
             "highway/service/driveway": {
-                "name": "Via d'accés a una propietat"
+                "name": "Via d'accés a una propietat",
+                "terms": "Entrada de vehicles"
             },
             "highway/service/emergency_access": {
                 "name": "Accés per a emergències",
@@ -1635,16 +1774,19 @@
                 "name": "Àrea de servei"
             },
             "highway/steps": {
-                "name": "Escales"
+                "name": "Escales",
+                "terms": "esgraons, graons, escalinata, escala, escalons"
             },
             "highway/stop": {
                 "name": "Senyal de stop"
             },
             "highway/tertiary": {
-                "name": "Carretera terciària"
+                "name": "Carretera terciària",
+                "terms": "Carretera terciària,Carretera de 3r ordre,local"
             },
             "highway/tertiary_link": {
-                "name": "Enllaç de carretera terciària"
+                "name": "Enllaç de carretera terciària",
+                "terms": "Enllaç amb terciària"
             },
             "highway/track": {
                 "name": "Pista",
@@ -1655,16 +1797,20 @@
                 "terms": "Senyals de trànsit, Senyals de tràfic"
             },
             "highway/trunk": {
-                "name": "Carretera principal"
+                "name": "Carretera principal",
+                "terms": "Via ràpida,Variant"
             },
             "highway/trunk_link": {
-                "name": "Enllaç de via principal"
+                "name": "Enllaç de via principal",
+                "terms": "Enllaç amb via ràpida"
             },
             "highway/turning_circle": {
-                "name": "Cul de sac"
+                "name": "Cul de sac",
+                "terms": "Girar 180 graus, Canviar de sentit"
             },
             "highway/unclassified": {
-                "name": "Altres carreteres"
+                "name": "Altres carreteres",
+                "terms": "Carretera municipal"
             },
             "historic": {
                 "name": "Lloc històric",
@@ -1675,7 +1821,8 @@
                 "terms": "Lloc arqueològic"
             },
             "historic/boundary_stone": {
-                "name": "Fita de terme"
+                "name": "Fita de terme",
+                "terms": "Fita de frontera"
             },
             "historic/castle": {
                 "name": "Castell",
@@ -1694,29 +1841,39 @@
                 "terms": "Ruines"
             },
             "historic/wayside_cross": {
-                "name": "Creu Cristiana"
+                "name": "Creu Cristiana",
+                "terms": "Calvari,Encreuament del camí"
             },
             "historic/wayside_shrine": {
-                "name": "Capella"
+                "name": "Capella",
+                "terms": "Ermita"
             },
             "landuse": {
-                "name": "Aprofitament del terreny"
+                "name": "Aprofitament del terreny",
+                "terms": "Ús del terra, Ús del sòl"
             },
             "landuse/allotments": {
-                "name": "Horts"
+                "name": "Horts",
+                "terms": "Assignació"
             },
             "landuse/basin": {
-                "name": "Bassa"
+                "name": "Bassa",
+                "terms": "Conca"
             },
             "landuse/cemetery": {
                 "name": "Cementiri",
                 "terms": "Cementiri, Camp Sant"
             },
+            "landuse/churchyard": {
+                "name": "Terrenys d'església"
+            },
             "landuse/commercial": {
-                "name": "Zona comercial"
+                "name": "Zona comercial",
+                "terms": "Comercial,Botiga"
             },
             "landuse/construction": {
-                "name": "Zona en construcció"
+                "name": "Zona en construcció",
+                "terms": "En construcció"
             },
             "landuse/farm": {
                 "name": "Terrenys de granja",
@@ -1726,115 +1883,155 @@
                 "name": "Terrenys de Granja"
             },
             "landuse/farmyard": {
-                "name": "Granja"
+                "name": "Granja",
+                "terms": "Pati,Jardí"
             },
             "landuse/forest": {
-                "name": "Bosc"
+                "name": "Bosc",
+                "terms": "Massa forestal,Bosc,Arbreda"
             },
             "landuse/grass": {
-                "name": "Herba"
+                "name": "Herba",
+                "terms": "Herba,Gespa"
             },
             "landuse/industrial": {
-                "name": "Zona Industrial"
+                "name": "Zona Industrial",
+                "terms": "Indústria, Industrial,Fàbrica"
             },
             "landuse/landfill": {
                 "name": "Abocador"
             },
             "landuse/meadow": {
-                "name": "Prat"
+                "name": "Prat",
+                "terms": "Prat,Prada,Natural"
+            },
+            "landuse/military": {
+                "name": "Militar"
             },
             "landuse/orchard": {
-                "name": "Verger"
+                "name": "Verger",
+                "terms": "Horta,Hort,Plantació"
             },
             "landuse/quarry": {
-                "name": "Mina a cel obert"
+                "name": "Mina a cel obert",
+                "terms": "Pedrera"
             },
             "landuse/residential": {
-                "name": "Zona residencial"
+                "name": "Zona residencial",
+                "terms": "Residencial,Cases"
             },
             "landuse/retail": {
-                "name": "Comerç minorista"
+                "name": "Comerç minorista",
+                "terms": "Venda al detall,Botiga,Minoristes"
             },
             "landuse/vineyard": {
                 "name": "Vinya",
                 "terms": "Vinyar, Vinyal, Vinyet, Vinya"
             },
             "leisure": {
-                "name": "Esbarjo"
+                "name": "Esbarjo",
+                "terms": "Lleure,Temps lliure"
             },
             "leisure/common": {
                 "name": "Àrea comuna"
             },
             "leisure/dog_park": {
-                "name": "Parc Caní"
+                "name": "Parc Caní",
+                "terms": "Pipi-can,Parc per gossos"
+            },
+            "leisure/firepit": {
+                "name": "Lloc per a fogueres"
             },
             "leisure/garden": {
-                "name": "Jardí"
+                "name": "Jardí",
+                "terms": "Jardí,Parc,Zona ajardinada"
             },
             "leisure/golf_course": {
-                "name": "Camp de golf"
+                "name": "Camp de golf",
+                "terms": "Camp de Golf"
+            },
+            "leisure/ice_rink": {
+                "name": "Pista de gel"
             },
             "leisure/marina": {
                 "name": "Port esportiu",
                 "terms": "Port esportiu, Marina"
             },
             "leisure/park": {
-                "name": "Parc"
+                "name": "Parc",
+                "terms": "parc, àrea verda, àrea enjardinada, jardí, verger, gespa, arbres, flors"
+            },
+            "leisure/picnic_table": {
+                "name": "Taula de picnic"
             },
             "leisure/pitch": {
-                "name": "Camp d'esports"
+                "name": "Camp d'esports",
+                "terms": "Camp d'esports, Pista poliesportiva"
             },
             "leisure/pitch/american_football": {
-                "name": "Camp de futbol americà"
+                "name": "Camp de futbol americà",
+                "terms": "Estadi de futbol americà,Camp de futbol americà"
             },
             "leisure/pitch/baseball": {
-                "name": "Camp de beisbol"
+                "name": "Camp de beisbol",
+                "terms": "Camp de beisbol,Pista de beisbol"
             },
             "leisure/pitch/basketball": {
-                "name": "Pista de bàsquet"
+                "name": "Pista de bàsquet",
+                "terms": "Pista de bàsquet, Pavelló de bàsquet"
             },
             "leisure/pitch/skateboard": {
                 "name": "Parc per a skates"
             },
             "leisure/pitch/soccer": {
-                "name": "Camp de futbol"
+                "name": "Camp de futbol",
+                "terms": "Camp de futbol,Pista de futbol"
             },
             "leisure/pitch/tennis": {
-                "name": "Pista de tennis"
+                "name": "Pista de tennis",
+                "terms": "Camp de Tennis, Pista de tennis"
             },
             "leisure/pitch/volleyball": {
-                "name": "Camp de vòleibol"
+                "name": "Camp de vòleibol",
+                "terms": "Pista de voleibol,Camp de voleibol"
             },
             "leisure/playground": {
                 "name": "Zona de jocs infantils",
                 "terms": "Parc Infantil"
             },
             "leisure/slipway": {
-                "name": "Pendent per a embarcacions"
+                "name": "Pendent per a embarcacions",
+                "terms": "Varador"
             },
             "leisure/sports_center": {
-                "name": "Centre d'esports"
+                "name": "Centre d'esports / Gimnàs"
             },
             "leisure/stadium": {
-                "name": "Estadi"
+                "name": "Estadi",
+                "terms": "Estadi,Camp"
             },
             "leisure/swimming_pool": {
-                "name": "Piscina"
+                "name": "Piscina",
+                "terms": "Piscina"
             },
             "leisure/track": {
                 "name": "Circuit de carreres"
             },
             "line": {
-                "name": "Línia"
+                "name": "Línia",
+                "terms": "Línia"
             },
             "man_made": {
-                "name": "Fet per l'home"
+                "name": "Fet per l'home",
+                "terms": "Fet per la mà de l'home"
             },
             "man_made/breakwater": {
-                "name": "trencaonades"
+                "name": "trencaonades",
+                "terms": "Escullera,Espigó,Espatller"
             },
             "man_made/cutline": {
-                "name": "Línia de tall"
+                "name": "Línia de tall",
+                "terms": "Línia de tall"
             },
             "man_made/embankment": {
                 "name": "Terraplè "
@@ -1843,26 +2040,31 @@
                 "name": "Màstil"
             },
             "man_made/lighthouse": {
-                "name": "Far"
+                "name": "Far",
+                "terms": "Far"
             },
             "man_made/observation": {
                 "name": "Torre de vigilància"
             },
             "man_made/pier": {
-                "name": "Moll de pilons"
+                "name": "Moll de pilons",
+                "terms": "Moll,Dàrsena"
             },
             "man_made/pipeline": {
-                "name": "Canonada"
+                "name": "Canonada",
+                "terms": "Gàseoducte,Oleoducte,Canonades"
             },
             "man_made/survey_point": {
-                "name": "Punt referencial"
+                "name": "Punt referencial",
+                "terms": "Punt de salvació,Punt de salvament,Punt d'evacuació"
             },
             "man_made/tower": {
                 "name": "Torre",
                 "terms": "Torre, Torres"
             },
             "man_made/wastewater_plant": {
-                "name": "Depuradora d'aigües residuals"
+                "name": "Depuradora d'aigües residuals",
+                "terms": "Depuradora"
             },
             "man_made/water_tower": {
                 "name": "Torre d'aigua",
@@ -1900,7 +2102,8 @@
                 "name": "Penya-segat"
             },
             "natural/coastline": {
-                "name": "Línia costanera"
+                "name": "Línia costanera",
+                "terms": "Línia costera, costa, litoral, línia de platja, costa, platja, mar"
             },
             "natural/fell": {
                 "name": "Prat d'alta muntanya"
@@ -1915,7 +2118,8 @@
                 "name": "Landa"
             },
             "natural/peak": {
-                "name": "Pic"
+                "name": "Pic",
+                "terms": "Pic, cim, cimadal, pollegó, agulla."
             },
             "natural/scree": {
                 "name": "Tartera"
@@ -1939,7 +2143,8 @@
                 "terms": "Llac, Estany"
             },
             "natural/water/pond": {
-                "name": "Estany"
+                "name": "Estany",
+                "terms": "estany, bassa, bassal, llac, reserva"
             },
             "natural/water/reservoir": {
                 "name": "Embassament"
@@ -2041,6 +2246,12 @@
             "place/locality": {
                 "name": "Indret"
             },
+            "place/neighbourhood": {
+                "name": "Barri"
+            },
+            "place/suburb": {
+                "name": "Districte"
+            },
             "place/town": {
                 "name": "Ciutat"
             },
@@ -2100,7 +2311,8 @@
                 "name": "Parada de Ferrocarril"
             },
             "railway/level_crossing": {
-                "name": "Pas a nivell"
+                "name": "Pas a nivell",
+                "terms": "Pas a nivell, Pas de ferrocarril, guardaagulles, pas de ferrocarril, barreres, semàfors, tren, cotxe"
             },
             "railway/monorail": {
                 "name": "Monocarril",
@@ -2127,7 +2339,8 @@
                 "terms": "Boca de metro, Entrada de metro"
             },
             "railway/tram": {
-                "name": "Tramvia "
+                "name": "Tramvia ",
+                "terms": "Tranvia, Tram"
             },
             "relation": {
                 "name": "Relació",
@@ -2219,7 +2432,8 @@
                 "terms": "Botiga d'electrònica, Botiga de components electrònics"
             },
             "shop/farm": {
-                "name": "Estand productiu"
+                "name": "Estand productiu",
+                "terms": "Grades"
             },
             "shop/fishmonger": {
                 "name": "Peixateria"
@@ -2228,6 +2442,9 @@
                 "name": "Floristeria",
                 "terms": "Floristeria, Botiga de plantes, Botiga de jardineria"
             },
+            "shop/funeral_directors": {
+                "name": "Tanatori"
+            },
             "shop/furniture": {
                 "name": "Botiga de mobles",
                 "terms": "Botiga de mobles"
@@ -2294,6 +2511,9 @@
             "shop/photo": {
                 "name": "Botiga de fotografia"
             },
+            "shop/seafood": {
+                "name": "Marisqueria"
+            },
             "shop/shoes": {
                 "name": "Sabateria",
                 "terms": "Sabateria, Botiga de sabates, Sabater"
@@ -2328,6 +2548,9 @@
             "shop/video": {
                 "name": "Botiga de vídeos"
             },
+            "shop/wine": {
+                "name": "Botiga de vins"
+            },
             "tourism": {
                 "name": "Turisme"
             },
@@ -2350,7 +2573,8 @@
                 "name": "Xalet"
             },
             "tourism/guest_house": {
-                "name": "Habitacions de lloguer"
+                "name": "Habitacions de lloguer",
+                "terms": "Casa de convidats, convidats, hostes, invitats"
             },
             "tourism/hostel": {
                 "name": "Alberg",
@@ -2401,6 +2625,28 @@
                 "name": "Restricció",
                 "terms": "Restricció"
             },
+            "type/restriction/no_left_turn": {
+                "name": "Prohibició del gir a l'esquerra"
+            },
+            "type/restriction/no_right_turn": {
+                "name": "Prohibició del gir a la dreta"
+            },
+            "type/restriction/no_straight_on": {
+                "name": "Prohibició de seguir recte"
+            },
+            "type/restriction/no_u_turn": {
+                "name": "Prohibició del gir total"
+            },
+            "type/restriction/only_left_turn": {
+                "name": "Només gir a l'esquerra"
+            },
+            "type/restriction/only_right_turn": {
+                "name": "Només gir a la dreta"
+            },
+            "type/restriction/only_straight_on": {
+                "name": "Prohibició de tots els girs",
+                "terms": "Prohibit girar, no girs, cap gir, no girar, seguir recte"
+            },
             "type/route": {
                 "name": "Ruta",
                 "terms": "Ruta"
@@ -2470,7 +2716,8 @@
                 "name": "Banc fluvial"
             },
             "waterway/stream": {
-                "name": "Rierol"
+                "name": "Rierol",
+                "terms": "Sèquia, rierol, fil d'aigua, rajolí, riuet, riachuelu, ramal, reguer, segla, canal, rec, regueró, sequiola, sequió, cavim."
             },
             "waterway/weir": {
                 "name": "Assut"
diff --git a/vendor/assets/iD/iD/locales/cs.json b/vendor/assets/iD/iD/locales/cs.json
index 94e9f01fa..c3b225676 100644
--- a/vendor/assets/iD/iD/locales/cs.json
+++ b/vendor/assets/iD/iD/locales/cs.json
@@ -264,7 +264,6 @@
         "percent_brightness": "{opacity}% viditelnost",
         "none": "Žádné",
         "custom": "Vlastní",
-        "custom_prompt": "Vložte šablonu adres dlaždic. Lze použít tokeny {z}, {x}, {y} pro schéma Z/X/Y a {u} pro hierarchické schéma quadtile.",
         "fix_misalignment": "Vyrovnat posunutí pozadí",
         "reset": "vrátit na začátek"
     },
@@ -1243,10 +1242,6 @@
                 "name": "Obchodní budova",
                 "terms": "obchody,firmy,firma,prodej,podnik,podniky,kanceláře"
             },
-            "building/entrance": {
-                "name": "Vchod",
-                "terms": "vchod"
-            },
             "building/garage": {
                 "name": "Garáž",
                 "terms": "garáž,garáže,parkování,kryté parkování"
@@ -1367,10 +1362,6 @@
                 "name": "Fotograf",
                 "terms": "fotograf,fotografie,ateliér"
             },
-            "craft/photographic_labratory": {
-                "name": "Fotolaboratoř",
-                "terms": "fotolaboratoř,fotografická laboratoř,vyvolání,film"
-            },
             "craft/plasterer": {
                 "name": "Štukatér",
                 "terms": "štukatér,škukatérství,štuky"
@@ -1463,10 +1454,6 @@
                 "name": "Tísňový telefon",
                 "terms": "nouzový telefon,SOS,tísňová linka"
             },
-            "entrance": {
-                "name": "Vchod",
-                "terms": "vchod,východ,únikový východ,brána,dveře,vrata"
-            },
             "footway/crossing": {
                 "name": "Přechod pro chodce",
                 "terms": "přechod pro chodce,zebra,přechod,přechod pro pěší"
@@ -1543,10 +1530,6 @@
                 "name": "Dálnice",
                 "terms": "dálnice"
             },
-            "highway/motorway_junction": {
-                "name": "Dálniční sjezd",
-                "terms": "dálniční nájezd, dálniční výjezd, dálniční exit"
-            },
             "highway/motorway_link": {
                 "name": "Dálnice - nájezd",
                 "terms": "nájezd,sjezd,výjezd,příjezd,rampa,exit"
@@ -1831,10 +1814,6 @@
                 "name": "Vodní skluz",
                 "terms": "spouštění lodi,dok,loděnice,skluz v loděnici,skluzavka"
             },
-            "leisure/sports_center": {
-                "name": "Sportovní areál",
-                "terms": "sportovní areál,sportovní centrum"
-            },
             "leisure/stadium": {
                 "name": "Stadion",
                 "terms": "stadion,fotbal,fotbalový stadión,hřiště"
diff --git a/vendor/assets/iD/iD/locales/da.json b/vendor/assets/iD/iD/locales/da.json
index 284220696..4de128c43 100644
--- a/vendor/assets/iD/iD/locales/da.json
+++ b/vendor/assets/iD/iD/locales/da.json
@@ -71,7 +71,8 @@
                 "line": "Gjorde en linje cirkulær.",
                 "area": "Gjorde et område cirkulært."
             },
-            "not_closed": "Dette kan ikke gøres cirkulært fordi det ikke er en løkke."
+            "not_closed": "Dette kan ikke gøres cirkulært fordi det ikke er en løkke.",
+            "too_large": "Dette kan ikke laves rundt da  der ikke er nok vist kortudsnit."
         },
         "orthogonalize": {
             "title": "Firkantet",
@@ -84,7 +85,8 @@
                 "line": "Gjorde hjørner på en linje retvinklede.",
                 "area": "Gjorde hjørner på et område retvinklede."
             },
-            "not_squarish": "Dette kan ikke laves firkantet da det ikke er firkantet."
+            "not_squarish": "Dette kan ikke laves firkantet da det ikke er firkantet.",
+            "too_large": "Dette kan ikke laves firkantet da det ikke er nok vist kortudsnit."
         },
         "straighten": {
             "title": "Ret lige",
@@ -180,6 +182,18 @@
             },
             "not_eligible": "Linje kan ikke deles op ved deres begyndelse eller ende.",
             "multiple_ways": "Der er for mange linjer her til at dele op."
+        },
+        "restriction": {
+            "help": {
+                "select": "Vælg et vejsegment.",
+                "toggle": "Klik for at slå dreje restriktioner til.",
+                "toggle_on": "Klik for tilføje \"{restriction}\" restriktion.",
+                "toggle_off": "Klik for at fjerne  \"{restriction}\" restriktionen."
+            },
+            "annotation": {
+                "create": "Tilføjede en dreje restriktion",
+                "delete": "Slettede en dreje restriktion"
+            }
         }
     },
     "undo": {
@@ -265,7 +279,8 @@
         "percent_brightness": "{opacity}% lysstyrke",
         "none": "Ingen",
         "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. ",
+        "custom_button": "Ret brugerdefineret baggrund",
+        "custom_prompt": "Angiv en URL tile skabelon. Valide værdier er {z}, {x}, {y} for Z/X/Y skemaer og {u} for quadtile skema. ",
         "fix_misalignment": "Ret justering",
         "reset": "nulstil"
     },
@@ -409,6 +424,9 @@
             "category-rail": {
                 "name": "Jernbane"
             },
+            "category-restriction": {
+                "name": "Restriktion"
+            },
             "category-road": {
                 "name": "Vej"
             },
@@ -591,6 +609,9 @@
             "entrance": {
                 "label": "Type"
             },
+            "except": {
+                "label": "Undtagelser"
+            },
             "fax": {
                 "label": "Fax",
                 "placeholder": "+31 42 123 4567"
@@ -607,6 +628,33 @@
             "fuel": {
                 "label": "Brændstof"
             },
+            "fuel/biodiesel": {
+                "label": "Sælger biodiesel"
+            },
+            "fuel/diesel": {
+                "label": "Sælger diesel"
+            },
+            "fuel/e10": {
+                "label": "Sælger E10"
+            },
+            "fuel/e85": {
+                "label": "Sælger E85"
+            },
+            "fuel/lpg": {
+                "label": "Sælger gas"
+            },
+            "fuel/octane_100": {
+                "label": "Sælger høj oktan benzin"
+            },
+            "fuel/octane_91": {
+                "label": "Sælger almindelig benzin"
+            },
+            "fuel/octane_95": {
+                "label": "Sælger medium benzin"
+            },
+            "fuel/octane_98": {
+                "label": "Sælger premium benzin"
+            },
             "gauge": {
                 "label": "Sporvidde"
             },
@@ -670,6 +718,9 @@
             "leisure": {
                 "label": "Type"
             },
+            "length": {
+                "label": "Længde(Meter)"
+            },
             "levels": {
                 "label": "Etager",
                 "placeholder": "2, 4, 6..."
@@ -704,10 +755,16 @@
                 "label": "Type"
             },
             "oneway": {
-                "label": "Ensrettet"
+                "label": "Ensrettet",
+                "options": {
+                    "undefined": "Forventet at være Nej"
+                }
             },
             "oneway_yes": {
-                "label": "Ensrettet"
+                "label": "Ensrettet",
+                "options": {
+                    "undefined": "Forventet at være Ja"
+                }
             },
             "opening_hours": {
                 "label": "Åbningstider"
@@ -741,6 +798,9 @@
             "place": {
                 "label": "Type"
             },
+            "population": {
+                "label": "Befolkning"
+            },
             "power": {
                 "label": "Type"
             },
@@ -780,6 +840,9 @@
             "restriction": {
                 "label": "Type"
             },
+            "restrictions": {
+                "label": "Sving restriktioner"
+            },
             "route": {
                 "label": "Type"
             },
@@ -804,6 +867,9 @@
             "shop": {
                 "label": "Type"
             },
+            "sloped_curb": {
+                "label": "Sløfekurve"
+            },
             "smoking": {
                 "label": "Rygning"
             },
@@ -827,7 +893,8 @@
                     "bridge": "Bro",
                     "tunnel": "Tunnel",
                     "embankment": "Forhøjning til tog, vej",
-                    "cutting": "Forsænkning"
+                    "cutting": "Forsænkning",
+                    "ford": "Vadested"
                 }
             },
             "studio_type": {
@@ -839,6 +906,9 @@
             "surface": {
                 "label": "Overflade"
             },
+            "tactile_paving": {
+                "label": "Tactile Paving"
+            },
             "toilets/disposal": {
                 "label": "Bortskaffelse affald"
             },
@@ -882,6 +952,9 @@
             "wheelchair": {
                 "label": "Kørestolsadgang"
             },
+            "width": {
+                "label": "Bredde(Meter)"
+            },
             "wikipedia": {
                 "label": "Wikipedia"
             },
@@ -1026,6 +1099,10 @@
                 "name": "Bilvask",
                 "terms": "Bilvask, Automobilvask"
             },
+            "amenity/charging_station": {
+                "name": "Opladerstation",
+                "terms": "Opladerstation, elbilopladerstation"
+            },
             "amenity/childcare": {
                 "name": "Børnepasning",
                 "terms": "Børnehave, Børnepasning, Vuggestue, Dagpleje, Fritidshjem"
@@ -1046,6 +1123,10 @@
                 "name": "Gymnasie",
                 "terms": "Gymnasie, Handelsgymnasie"
             },
+            "amenity/compressed_air": {
+                "name": "Luftpumpe",
+                "terms": "Luftpumpe, Billuftpumpe"
+            },
             "amenity/courthouse": {
                 "name": "Domstolsbygning",
                 "terms": "Domstolsbygning, Domstol"
@@ -1058,6 +1139,10 @@
                 "name": "Læge",
                 "terms": "Læge, Doktor"
             },
+            "amenity/dojo": {
+                "name": "Dojo/Kampsports akdemi",
+                "terms": "Dojo/Kampsports akdemi"
+            },
             "amenity/drinking_water": {
                 "name": "Drikkevand",
                 "terms": "<oversæt med synonymer eller beslægtet termer for 'Drikkevand', adskilt med kommaer>"
@@ -1110,6 +1195,10 @@
                 "name": "Bilparkering",
                 "terms": "Bilparkering"
             },
+            "amenity/parking_entrance": {
+                "name": "Parkeringsgarage Indgang/Udgang",
+                "terms": "Parkeringsgarage Indgang/Udgang, Parkeringskælder Indgang/Udgang"
+            },
             "amenity/pharmacy": {
                 "name": "Apotek",
                 "terms": "Apotek"
@@ -1355,8 +1444,8 @@
                 "terms": " Kollegie, Klubværelse, Kollegium"
             },
             "building/entrance": {
-                "name": "Indgang",
-                "terms": "Indgang"
+                "name": "Indgang/Udgang",
+                "terms": "Indgang/Udgang"
             },
             "building/garage": {
                 "name": "Garage",
@@ -1538,9 +1627,9 @@
                 "name": "Fotograf",
                 "terms": "Fotograf"
             },
-            "craft/photographic_labratory": {
-                "name": "Fotolaboratorie",
-                "terms": "Fotolaboratorie"
+            "craft/photographic_laboratory": {
+                "name": "Fotolaboratorium",
+                "terms": "Fotolaboratorium, Fotoforhandler"
             },
             "craft/plasterer": {
                 "name": "Oppudser",
@@ -1635,17 +1724,25 @@
                 "terms": "Nødtelefon, Nødopkaldstelefon"
             },
             "entrance": {
-                "name": "Indgang",
-                "terms": "Indgang, Indgangsparti"
+                "name": "Indgang/Udgang",
+                "terms": "Indgang/Udgang"
             },
             "footway/crossing": {
                 "name": "Kryds",
                 "terms": "Kryds"
             },
+            "footway/crosswalk": {
+                "name": "Fodgængerovergang",
+                "terms": "Fodgængerovergang"
+            },
             "footway/sidewalk": {
                 "name": "Fortov",
                 "terms": "Fortov"
             },
+            "ford": {
+                "name": "Vadested",
+                "terms": "Vadested"
+            },
             "golf/bunker": {
                 "name": "Sandbunker",
                 "terms": "Sandbunker"
@@ -1694,6 +1791,10 @@
                 "name": "Kryds",
                 "terms": "Kryds"
             },
+            "highway/crosswalk": {
+                "name": "Fodgængerovergang",
+                "terms": "Fodgængerovergang"
+            },
             "highway/cycleway": {
                 "name": "Cykelsti",
                 "terms": "Cykelsti"
@@ -1715,8 +1816,8 @@
                 "terms": "Motorvej"
             },
             "highway/motorway_junction": {
-                "name": "Motorvejskryds",
-                "terms": "Motorvejskryds"
+                "name": "Motorvejsafkørsel/ Udkørsel",
+                "terms": "Motorvejsafkørsel/ Udkørsel"
             },
             "highway/motorway_link": {
                 "name": "Motorvejsafkørsel",
@@ -1878,6 +1979,10 @@
                 "name": "Gravplads ",
                 "terms": "Gravplads "
             },
+            "landuse/churchyard": {
+                "name": "Kirkegård",
+                "terms": "Kirkegårde"
+            },
             "landuse/commercial": {
                 "name": "Kommercielt område",
                 "terms": "Kommercielt område"
@@ -1918,6 +2023,10 @@
                 "name": "Eng",
                 "terms": "Eng"
             },
+            "landuse/military": {
+                "name": "Militær",
+                "terms": "Militær"
+            },
             "landuse/orchard": {
                 "name": "Frugtplantage",
                 "terms": "Frugtplantage, Æbleplantage"
@@ -2019,8 +2128,8 @@
                 "terms": "Bådrampe, Skibsrampe"
             },
             "leisure/sports_center": {
-                "name": "Sportscenter",
-                "terms": "Sportscenter"
+                "name": "Sportscenter/Gymnastik",
+                "terms": "Sportscenter/Gymnastik"
             },
             "leisure/stadium": {
                 "name": "Stadion",
@@ -2306,6 +2415,14 @@
                 "name": "Lokalitet",
                 "terms": "Lokalitet"
             },
+            "place/neighbourhood": {
+                "name": "Nabolag",
+                "terms": "Nabolag"
+            },
+            "place/suburb": {
+                "name": "Bydel",
+                "terms": "Bydel"
+            },
             "place/town": {
                 "name": "By",
                 "terms": "By"
@@ -2530,6 +2647,10 @@
                 "name": "Blomsterbutik",
                 "terms": "Blomsterbutik, Blomsterforretning"
             },
+            "shop/funeral_directors": {
+                "name": "Bedemandsforretning",
+                "terms": "Bedemandsforretning, Begravelsesbutik"
+            },
             "shop/furniture": {
                 "name": "Møbelforhandler",
                 "terms": "Møbelbutik, Møbelhandler"
@@ -2614,6 +2735,10 @@
                 "name": "Fotoforretning",
                 "terms": "<Oversæt med synonymer eller relaterede termer for \"Fotoforretning\", adskilt af kommaer>"
             },
+            "shop/seafood": {
+                "name": "Fiskehandler",
+                "terms": "Fiskehandler, Fiskebutik"
+            },
             "shop/shoes": {
                 "name": "Skobutik",
                 "terms": "Skobutik, Skoforretning"
@@ -2654,6 +2779,10 @@
                 "name": "Videobutik",
                 "terms": "Videobutik, Videoforretning, Videoudlejning"
             },
+            "shop/wine": {
+                "name": "Vinforretning",
+                "terms": "Vinforretning, Vinbutik"
+            },
             "tourism": {
                 "name": "Turisme",
                 "terms": "Turisme"
@@ -2738,6 +2867,34 @@
                 "name": "Restriktion",
                 "terms": "Restriktion"
             },
+            "type/restriction/no_left_turn": {
+                "name": "Ingen venstresving",
+                "terms": "Ingen venstresving"
+            },
+            "type/restriction/no_right_turn": {
+                "name": "Ingen højresving",
+                "terms": "Ingen højresving"
+            },
+            "type/restriction/no_straight_on": {
+                "name": "Ingen lige ud kørsel",
+                "terms": "Ingen lige ud kørsel"
+            },
+            "type/restriction/no_u_turn": {
+                "name": "Ingen U-vending",
+                "terms": "Ingen U-vending"
+            },
+            "type/restriction/only_left_turn": {
+                "name": "Kun venstresving tilladt",
+                "terms": "Kun venstresving tilladt"
+            },
+            "type/restriction/only_right_turn": {
+                "name": "Kun højresving tilladt",
+                "terms": "Kun højresving tilladt"
+            },
+            "type/restriction/only_straight_on": {
+                "name": "Ingen sving tilladt",
+                "terms": "Ingen sving tilladt"
+            },
             "type/route": {
                 "name": "Rute",
                 "terms": "Rute"
diff --git a/vendor/assets/iD/iD/locales/de.json b/vendor/assets/iD/iD/locales/de.json
index e2b3169fc..e009dc8e6 100644
--- a/vendor/assets/iD/iD/locales/de.json
+++ b/vendor/assets/iD/iD/locales/de.json
@@ -71,7 +71,8 @@
                 "line": "Eine Fläche abgerundet",
                 "area": "Eine Fläche kreisförmig gemacht"
             },
-            "not_closed": "Dieses Objekt kann nicht kreisförmig gemacht werden, da es keine geschlossene Linie ist."
+            "not_closed": "Dieses Objekt kann nicht kreisförmig gemacht werden, da es keine geschlossene Linie ist.",
+            "too_large": "Die Elemente können nicht kreisförmig gemacht werden, weil zuwenig sichtbar ist."
         },
         "orthogonalize": {
             "title": "Rechteck",
@@ -84,7 +85,8 @@
                 "line": "Die Ecken einer Linie rechtwinklig ausgerichtet.",
                 "area": "Die Ecken einer Fläche rechtwinklig ausgerichtet."
             },
-            "not_squarish": "Dieses Objekt kann nicht rechtwinklig gemacht werden, da es nicht annähernd rechtwinklig ist."
+            "not_squarish": "Dieses Objekt kann nicht rechtwinklig gemacht werden, da es nicht annähernd rechtwinklig ist.",
+            "too_large": "Die Elemente können nicht quadratisch gemacht werden, weil zuwenig sichtbar ist."
         },
         "straighten": {
             "title": "Begradigen",
@@ -180,6 +182,18 @@
             },
             "not_eligible": "Linien können nicht am Anfang oder Ende geteilt werden.",
             "multiple_ways": "Es gibt hier zu viele Linien, um diese teilen zu können."
+        },
+        "restriction": {
+            "help": {
+                "select": "Klicke um ein Straßensegment zu selektieren.",
+                "toggle": "Klicke um das Abbiegeverbot umzudrehen.",
+                "toggle_on": "Klicke um ein \"{restriction}\" Verbot anzulegen.",
+                "toggle_off": "Klicke um das \"{restriction}\" Verbot zu löschen."
+            },
+            "annotation": {
+                "create": "Füge ein Abbiegeverbot ein",
+                "delete": "Lösche ein Abbiegeverbot"
+            }
         }
     },
     "undo": {
@@ -265,7 +279,8 @@
         "percent_brightness": "{opacity}% Helligkeit",
         "none": "Kein Hintergrund",
         "custom": "Benutzerdefiniert",
-        "custom_prompt": "Gib 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.",
+        "custom_button": "Benutzerdefinierten Hintergrund editieren",
+        "custom_prompt": "Gib ein tile URL template ein. Gültige Platzhalter sind {z}, {x}, {y} für das Z/X/Y Schema und {u} für das quadtile Schema.",
         "fix_misalignment": "Ausrichtung korrigieren",
         "reset": "Zurücksetzen"
     },
@@ -409,6 +424,9 @@
             "category-rail": {
                 "name": "Schiene"
             },
+            "category-restriction": {
+                "name": "Abbiegevorschrift"
+            },
             "category-road": {
                 "name": "Straße"
             },
@@ -424,7 +442,7 @@
         },
         "fields": {
             "access": {
-                "label": "Zugangsbeschränkung",
+                "label": "Zugangsberechtigung",
                 "placeholder": "Unbekannt",
                 "types": {
                     "access": "Allgemein",
@@ -591,6 +609,9 @@
             "entrance": {
                 "label": "Typ"
             },
+            "except": {
+                "label": "Ausnahmen"
+            },
             "fax": {
                 "label": "Fax",
                 "placeholder": "+31 42 123 4567"
@@ -607,6 +628,33 @@
             "fuel": {
                 "label": "Treibstogg"
             },
+            "fuel/biodiesel": {
+                "label": "Verkauft Biodiesel"
+            },
+            "fuel/diesel": {
+                "label": "Verkauft Diesel"
+            },
+            "fuel/e10": {
+                "label": "Verkauft E10"
+            },
+            "fuel/e85": {
+                "label": "Verkauft E85"
+            },
+            "fuel/lpg": {
+                "label": "Verkauft Propan"
+            },
+            "fuel/octane_100": {
+                "label": "Verkauft Rennkraftstoffe"
+            },
+            "fuel/octane_91": {
+                "label": "Verkauft Kraftstoffe"
+            },
+            "fuel/octane_95": {
+                "label": "Verkauft Mittelklassekraftstoffe"
+            },
+            "fuel/octane_98": {
+                "label": "Verkauft Premiumkraftstoffe"
+            },
             "gauge": {
                 "label": "Spurbreite"
             },
@@ -670,6 +718,9 @@
             "leisure": {
                 "label": "Art"
             },
+            "length": {
+                "label": "Länge (Meter)"
+            },
             "levels": {
                 "label": "Etagen",
                 "placeholder": "2, 4, 6..."
@@ -704,10 +755,16 @@
                 "label": "Typ"
             },
             "oneway": {
-                "label": "Einbahnstraße"
+                "label": "Einbahnstraße",
+                "options": {
+                    "undefined": "Vermutlich Nein"
+                }
             },
             "oneway_yes": {
-                "label": "Einbahnstraße"
+                "label": "Einbahnstraße",
+                "options": {
+                    "undefined": "Vermutlich Ja"
+                }
             },
             "opening_hours": {
                 "label": "Öffnungszeiten"
@@ -741,6 +798,9 @@
             "place": {
                 "label": "Art"
             },
+            "population": {
+                "label": "Bevölkerung"
+            },
             "power": {
                 "label": "Typ"
             },
@@ -780,6 +840,9 @@
             "restriction": {
                 "label": "Typ"
             },
+            "restrictions": {
+                "label": "Abbiegevorschriften"
+            },
             "route": {
                 "label": "Typ"
             },
@@ -804,6 +867,9 @@
             "shop": {
                 "label": "Typ"
             },
+            "sloped_curb": {
+                "label": "abgeschrägter Bordstein"
+            },
             "smoking": {
                 "label": "Rauchen"
             },
@@ -827,7 +893,8 @@
                     "bridge": "Brücke",
                     "tunnel": "Tunnel",
                     "embankment": "Fahrdamm",
-                    "cutting": "Senke"
+                    "cutting": "Senke",
+                    "ford": "Furt"
                 }
             },
             "studio_type": {
@@ -839,8 +906,11 @@
             "surface": {
                 "label": "Oberfläche"
             },
+            "tactile_paving": {
+                "label": "taktile Oberfläche"
+            },
             "toilets/disposal": {
-                "label": "Abfallkübel, Mistkübel"
+                "label": "Toiletten-Bauart"
             },
             "tourism": {
                 "label": "Typ"
@@ -882,6 +952,9 @@
             "wheelchair": {
                 "label": "Rollstuhlzugang"
             },
+            "width": {
+                "label": "Breite (Meter)"
+            },
             "wikipedia": {
                 "label": "Wikipedia"
             },
@@ -1026,6 +1099,10 @@
                 "name": "Autowäsche",
                 "terms": "Auto-Waschanlage, Waschanlage"
             },
+            "amenity/charging_station": {
+                "name": "Ladestation",
+                "terms": "Ladestation"
+            },
             "amenity/childcare": {
                 "name": "Kindertagesbetreuung",
                 "terms": "Hort"
@@ -1046,6 +1123,10 @@
                 "name": "Hochschule",
                 "terms": "Hochschule, Kolleg"
             },
+            "amenity/compressed_air": {
+                "name": "Druckluft",
+                "terms": "Druckluft, Pressluft"
+            },
             "amenity/courthouse": {
                 "name": "Gericht",
                 "terms": "Gericht, Amtsgericht"
@@ -1058,6 +1139,10 @@
                 "name": "Arzt",
                 "terms": "Arzt, Mediziner"
             },
+            "amenity/dojo": {
+                "name": "Kampfsportstudio",
+                "terms": "Kampfsportstudio, Kampfsportzentrum, Karatestudio"
+            },
             "amenity/drinking_water": {
                 "name": "Trinkwasserstelle",
                 "terms": "Brunnen,Trinkwasser,Trinkwasserbrunnen,Wasserhahn,Trinkbrunnen"
@@ -1110,6 +1195,10 @@
                 "name": "Autoparkplatz",
                 "terms": "Autoparkplatz, Parkplatz, Parkhaus, Garage, Parkgarage"
             },
+            "amenity/parking_entrance": {
+                "name": "Garageneinfahrt/-ausfahrt",
+                "terms": "Parkgaragen-Einfahrt/Ausfahrt, Garageneinfahrt/-ausfahrt, Garagenzufahrt/-abfahrt"
+            },
             "amenity/pharmacy": {
                 "name": "Apotheke",
                 "terms": "Apotheke"
@@ -1355,8 +1444,8 @@
                 "terms": "Schlafsaal, Dormitorium"
             },
             "building/entrance": {
-                "name": "Eingang",
-                "terms": "Eingang"
+                "name": "Eingang/Ausgang",
+                "terms": "Eingang/Ausgang, Zugang/Abgang, Einfahrt/Ausfahrt, Eintritt/Austritt"
             },
             "building/garage": {
                 "name": "Garage",
@@ -1538,9 +1627,9 @@
                 "name": "Fotograf",
                 "terms": "Fotograf, Fotostudio, Fotoatelier"
             },
-            "craft/photographic_labratory": {
+            "craft/photographic_laboratory": {
                 "name": "Fotolabor",
-                "terms": "Fotolabor"
+                "terms": "Fotolabor, fotografisches Labor"
             },
             "craft/plasterer": {
                 "name": "Stuckateur",
@@ -1635,17 +1724,25 @@
                 "terms": "Notruf-Telefon, Notrufsäule, Notfallsäule"
             },
             "entrance": {
-                "name": "Eingang",
-                "terms": "Eingang"
+                "name": "Eingang/Ausgang",
+                "terms": "Eingang/Ausgang, Zugang/Abgang, Einfahrt/Ausfahrt, Eintritt/Austritt"
             },
             "footway/crossing": {
                 "name": "Fussgängerüberweg",
                 "terms": "Zebrastreifen"
             },
+            "footway/crosswalk": {
+                "name": "Zebrastreifen",
+                "terms": "Zebrastreifen, Fußgängerübergang, Fußgängerstreifen"
+            },
             "footway/sidewalk": {
                 "name": "Bürgersteig",
                 "terms": "Gehsteig, Fußgängerweg, Gehweg, Fußweg, Gangsteig, Trottoir"
             },
+            "ford": {
+                "name": "Furt",
+                "terms": "Furt"
+            },
             "golf/bunker": {
                 "name": "Bunker (Golf)",
                 "terms": "Bunker, Sandbunker, Sand-Hindernis, Golfbunker"
@@ -1694,6 +1791,10 @@
                 "name": "Fußgängerüberweg",
                 "terms": "Zebrastreifen"
             },
+            "highway/crosswalk": {
+                "name": "Zebrastreifen",
+                "terms": "Zebrastreifen, Fußgängerübergang, Fußgängerstreifen"
+            },
             "highway/cycleway": {
                 "name": "Radweg",
                 "terms": "Radweg"
@@ -1715,8 +1816,8 @@
                 "terms": "Autobahn"
             },
             "highway/motorway_junction": {
-                "name": "Autobahnausfahrt",
-                "terms": "Autobahn-Anschlussstelle, Autobahn-Abfahrt"
+                "name": "Autobahnkreuz / Autobahnanschluss",
+                "terms": "Autobahnkreuz, Autobahnanschluss, Autobahndreieck, Autobahnknoten, Autobahnzubringer"
             },
             "highway/motorway_link": {
                 "name": "Autobahnanschluss",
@@ -1804,7 +1905,7 @@
             },
             "highway/track": {
                 "name": "Feld-/Waldweg",
-                "terms": "Spur, Fährte, Strecke, Weg"
+                "terms": "Forstweg,Wirtschaftsweg,Wiesenweg,Feldweg,Waldweg"
             },
             "highway/traffic_signals": {
                 "name": "Ampeln",
@@ -1856,7 +1957,7 @@
             },
             "historic/wayside_cross": {
                 "name": "Wegkreuz",
-                "terms": "Wegkreuz"
+                "terms": "Wegkreuz,Wegekreuz,Flurkreuz"
             },
             "historic/wayside_shrine": {
                 "name": "Bildstock",
@@ -1878,6 +1979,10 @@
                 "name": "Friedhof",
                 "terms": "Friedhof, Friedwald"
             },
+            "landuse/churchyard": {
+                "name": "Kirchhof",
+                "terms": "Kirchhof, Friedhof, Gottesacker, Leichenhof"
+            },
             "landuse/commercial": {
                 "name": "Gewerbegebiet",
                 "terms": "Gewerbezone,Gewerbegebiet,gewerblich genutzte Gebäude,Business Park,Büros"
@@ -1918,6 +2023,10 @@
                 "name": "Weide",
                 "terms": "Wiese, Weide"
             },
+            "landuse/military": {
+                "name": "Militär",
+                "terms": "Militär, Armee, Landesverteidigung"
+            },
             "landuse/orchard": {
                 "name": "Obstplantage",
                 "terms": "Obstplantage, Streuobstwiese"
@@ -2019,8 +2128,8 @@
                 "terms": "Gleitbahn, Rampe"
             },
             "leisure/sports_center": {
-                "name": "Sportzentrum",
-                "terms": "Fitnesscenter"
+                "name": "Fitnessstudio",
+                "terms": "Fitnessstudio, Sportstudio, Trainingszentrum"
             },
             "leisure/stadium": {
                 "name": "Stadion",
@@ -2306,6 +2415,14 @@
                 "name": "Ortschaft",
                 "terms": "Ort, Gegend"
             },
+            "place/neighbourhood": {
+                "name": "Wohngegend",
+                "terms": "Wohngegend, Nachbarschaft, Umgebung, Viertel, Grätzel, Kiez"
+            },
+            "place/suburb": {
+                "name": "Bezirk",
+                "terms": "Bezirk, Gemeinde, Stadtbezirk"
+            },
             "place/town": {
                 "name": "Kleinstadt",
                 "terms": "Stadt, Ortschaft"
@@ -2530,6 +2647,10 @@
                 "name": "Blumenhändler",
                 "terms": "Florist, Blumenladen, Blumengeschäft"
             },
+            "shop/funeral_directors": {
+                "name": "Beerdigungsinstitut",
+                "terms": "Beerdigungsinstitut, Bestattungsinstitut, Bestattungsunternehmen"
+            },
             "shop/furniture": {
                 "name": "Möbelhaus",
                 "terms": "Möbelladen, Möbelgeschäft, Einrichtungsgeschäft"
@@ -2614,6 +2735,10 @@
                 "name": "Fotofachgeschäft",
                 "terms": "Fotoladen, Fotograf, Fotogeschäft"
             },
+            "shop/seafood": {
+                "name": "Fischgeschäft",
+                "terms": "Fischgeschäft, Meeresfrüchtegeschäft"
+            },
             "shop/shoes": {
                 "name": "Schuhgeschäft",
                 "terms": "Schuhgeschäft"
@@ -2654,6 +2779,10 @@
                 "name": "Videothek",
                 "terms": "Video-Geschäft, DVD-Geschäft"
             },
+            "shop/wine": {
+                "name": "Vinothek",
+                "terms": "Weinladen, Weinhandlung, Weinhaus, Enothek"
+            },
             "tourism": {
                 "name": "Tourismus",
                 "terms": "Fremdenverkehr, Tourimus"
@@ -2735,8 +2864,36 @@
                 "terms": "Multipolygon"
             },
             "type/restriction": {
-                "name": "Beschränkung",
-                "terms": "Beschränkung, Einschränkung"
+                "name": "Sonstige Abbiegevorschrift",
+                "terms": "Abbiegebeschränkung, Beschränkung, Einschränkung"
+            },
+            "type/restriction/no_left_turn": {
+                "name": "Linksabbiegeverbot",
+                "terms": "Linksabbiegeverbot, Linksabbiegen verboten, kein Linksabbiegen, kein Abbiegen nach links"
+            },
+            "type/restriction/no_right_turn": {
+                "name": "Rechtsabbiegeverbot",
+                "terms": "Rechtsabbiegeverbot, Rechtsabbiegen verboten, kein Rechtsabbiegen, kein Abbiegen nach rechts"
+            },
+            "type/restriction/no_straight_on": {
+                "name": "Geradeausfahrverbot",
+                "terms": "Geradeausfahrverbot, Geradeausfahren verboten, geradeaus fahren nicht erlaubt"
+            },
+            "type/restriction/no_u_turn": {
+                "name": "Kehrtwendeverbot",
+                "terms": "Kehrtwendeverbot, Kehrtwende verboten, Umdrehen verboten"
+            },
+            "type/restriction/only_left_turn": {
+                "name": "Linksabbiegegebot",
+                "terms": "Linksabbiegegebot, Links abbiegen geboten, nur links abbiegen erlaubt"
+            },
+            "type/restriction/only_right_turn": {
+                "name": "Rechtsabbiegegebot",
+                "terms": "Rechtsabbiegegebot, Rechts abbiegen geboten, nur rechts abbiegen erlaubt"
+            },
+            "type/restriction/only_straight_on": {
+                "name": "Kehrtwendeverbot",
+                "terms": "Kehrwendeverbot, keine Kehrtwende erlaubt, Umdrehverbot, Umdrehen verboten"
             },
             "type/route": {
                 "name": "Route",
diff --git a/vendor/assets/iD/iD/locales/el.json b/vendor/assets/iD/iD/locales/el.json
index 6d038213c..1ef09526c 100644
--- a/vendor/assets/iD/iD/locales/el.json
+++ b/vendor/assets/iD/iD/locales/el.json
@@ -1028,10 +1028,6 @@
                 "name": "Εμπορικό Κτίριο",
                 "terms": "Εμπορικό Κτήριο, Επαγγελματικό κτήριο"
             },
-            "building/entrance": {
-                "name": "Είσοδος",
-                "terms": "Είσοδος"
-            },
             "building/garage": {
                 "name": "Εργαστήριο",
                 "terms": "Γκαράζ"
@@ -1099,10 +1095,6 @@
                 "name": "Τηλέφωνο Ανάγκης",
                 "terms": "Τηλέφωνο επειγόντων, Τηλέφωνο ανάγκης"
             },
-            "entrance": {
-                "name": "Είσοδος",
-                "terms": "Είσοδος"
-            },
             "highway": {
                 "name": "Αυτοκινητόδρομος",
                 "terms": "Οδική αρτηρία, Αυτοκινητόδρομος"
@@ -1135,10 +1127,6 @@
                 "name": "Αυτοκινητόδρομος",
                 "terms": "Αυτοκινητόδρομος"
             },
-            "highway/motorway_junction": {
-                "name": "Διασταύρωση Αυτοκινητόδρομου",
-                "terms": "Διασταύρωση αυτοκινητόδρομου"
-            },
             "highway/motorway_link": {
                 "name": "Σύνδεση Αυτοκινητόδρομου",
                 "terms": "Σύνδεσμος Αυτοκινητόδρομου "
@@ -1368,9 +1356,6 @@
                 "name": "Γλύστρα",
                 "terms": "Γλίστρα"
             },
-            "leisure/sports_center": {
-                "name": "Αθλητικό Κέντρο"
-            },
             "leisure/stadium": {
                 "name": "Στάδιο",
                 "terms": "Στάδιο"
diff --git a/vendor/assets/iD/iD/locales/en-GB.json b/vendor/assets/iD/iD/locales/en-GB.json
index bab6c5df9..771cb75f9 100644
--- a/vendor/assets/iD/iD/locales/en-GB.json
+++ b/vendor/assets/iD/iD/locales/en-GB.json
@@ -84,9 +84,6 @@
             "building/terrace": {
                 "name": "Terraced houses"
             },
-            "leisure/sports_center": {
-                "name": "Sports Centre"
-            },
             "shop/garden_centre": {
                 "name": "Garden Centre"
             },
diff --git a/vendor/assets/iD/iD/locales/en.json b/vendor/assets/iD/iD/locales/en.json
index b5a466c9a..61fe5ce3a 100644
--- a/vendor/assets/iD/iD/locales/en.json
+++ b/vendor/assets/iD/iD/locales/en.json
@@ -182,6 +182,18 @@
             },
             "not_eligible": "Lines can't be split at their beginning or end.",
             "multiple_ways": "There are too many lines here to split."
+        },
+        "restriction": {
+            "help": {
+                "select": "Click to select a road segment.",
+                "toggle": "Click to toggle turn restrictions.",
+                "toggle_on": "Click to add a \"{restriction}\" restriction.",
+                "toggle_off": "Click to remove the \"{restriction}\" restriction."
+            },
+            "annotation": {
+                "create": "Added a turn restriction",
+                "delete": "Deleted a turn restriction"
+            }
         }
     },
     "undo": {
@@ -271,7 +283,8 @@
         "percent_brightness": "{opacity}% brightness",
         "none": "None",
         "custom": "Custom",
-        "custom_prompt": "Enter a tile template. Valid tokens are {z}, {x}, {y} for Z/X/Y scheme and {u} for quadtile scheme.",
+        "custom_button": "Edit custom background",
+        "custom_prompt": "Enter a tile URL template. Valid tokens are {z}, {x}, {y} for Z/X/Y scheme and {u} for quadtile scheme.",
         "fix_misalignment": "Fix alignment",
         "reset": "reset"
     },
@@ -415,6 +428,9 @@
             "category-rail": {
                 "name": "Rail"
             },
+            "category-restriction": {
+                "name": "Restriction"
+            },
             "category-road": {
                 "name": "Road"
             },
@@ -597,6 +613,9 @@
             "entrance": {
                 "label": "Type"
             },
+            "except": {
+                "label": "Exceptions"
+            },
             "fax": {
                 "label": "Fax",
                 "placeholder": "+31 42 123 4567"
@@ -613,6 +632,33 @@
             "fuel": {
                 "label": "Fuel"
             },
+            "fuel/biodiesel": {
+                "label": "Sells Biodiesel"
+            },
+            "fuel/diesel": {
+                "label": "Sells Diesel"
+            },
+            "fuel/e10": {
+                "label": "Sells E10"
+            },
+            "fuel/e85": {
+                "label": "Sells E85"
+            },
+            "fuel/lpg": {
+                "label": "Sells Propane"
+            },
+            "fuel/octane_100": {
+                "label": "Sells Racing Gasoline"
+            },
+            "fuel/octane_91": {
+                "label": "Sells Regular Gasoline"
+            },
+            "fuel/octane_95": {
+                "label": "Sells Midgrade Gasoline"
+            },
+            "fuel/octane_98": {
+                "label": "Sells Premium Gasoline"
+            },
             "gauge": {
                 "label": "Gauge"
             },
@@ -678,6 +724,9 @@
             "leisure": {
                 "label": "Type"
             },
+            "length": {
+                "label": "Length (Meters)"
+            },
             "levels": {
                 "label": "Levels",
                 "placeholder": "2, 4, 6..."
@@ -712,10 +761,20 @@
                 "label": "Type"
             },
             "oneway": {
-                "label": "One Way"
+                "label": "One Way",
+                "options": {
+                    "undefined": "Assumed to be No",
+                    "yes": "Yes",
+                    "no": "No"
+                }
             },
             "oneway_yes": {
-                "label": "One Way"
+                "label": "One Way",
+                "options": {
+                    "undefined": "Assumed to be Yes",
+                    "yes": "Yes",
+                    "no": "No"
+                }
             },
             "opening_hours": {
                 "label": "Hours"
@@ -749,6 +808,9 @@
             "place": {
                 "label": "Type"
             },
+            "population": {
+                "label": "Population"
+            },
             "power": {
                 "label": "Type"
             },
@@ -788,6 +850,9 @@
             "restriction": {
                 "label": "Type"
             },
+            "restrictions": {
+                "label": "Turn Restrictions"
+            },
             "route": {
                 "label": "Type"
             },
@@ -812,6 +877,9 @@
             "shop": {
                 "label": "Type"
             },
+            "sloped_curb": {
+                "label": "Sloped Curb"
+            },
             "smoking": {
                 "label": "Smoking"
             },
@@ -835,7 +903,8 @@
                     "bridge": "Bridge",
                     "tunnel": "Tunnel",
                     "embankment": "Embankment",
-                    "cutting": "Cutting"
+                    "cutting": "Cutting",
+                    "ford": "Ford"
                 }
             },
             "studio_type": {
@@ -847,6 +916,9 @@
             "surface": {
                 "label": "Surface"
             },
+            "tactile_paving": {
+                "label": "Tactile Paving"
+            },
             "toilets/disposal": {
                 "label": "Disposal"
             },
@@ -890,6 +962,9 @@
             "wheelchair": {
                 "label": "Wheelchair Access"
             },
+            "width": {
+                "label": "Width (Meters)"
+            },
             "wikipedia": {
                 "label": "Wikipedia"
             },
@@ -1034,6 +1109,10 @@
                 "name": "Car Wash",
                 "terms": ""
             },
+            "amenity/charging_station": {
+                "name": "Charging Station",
+                "terms": "EV,Electric Vehicle,Supercharger"
+            },
             "amenity/childcare": {
                 "name": "Childcare",
                 "terms": "nursery,orphanage,playgroup"
@@ -1054,6 +1133,10 @@
                 "name": "College",
                 "terms": ""
             },
+            "amenity/compressed_air": {
+                "name": "Compressed Air",
+                "terms": ""
+            },
             "amenity/courthouse": {
                 "name": "Courthouse",
                 "terms": ""
@@ -1066,6 +1149,10 @@
                 "name": "Doctor",
                 "terms": "doctor,doctor's office"
             },
+            "amenity/dojo": {
+                "name": "Dojo / Martial Arts Academy",
+                "terms": "martial arts,dojo,dojang"
+            },
             "amenity/drinking_water": {
                 "name": "Drinking Water",
                 "terms": "water fountain,potable water"
@@ -1118,6 +1205,10 @@
                 "name": "Car Parking",
                 "terms": ""
             },
+            "amenity/parking_entrance": {
+                "name": "Parking Garage Entrance/Exit",
+                "terms": ""
+            },
             "amenity/pharmacy": {
                 "name": "Pharmacy",
                 "terms": ""
@@ -1363,7 +1454,7 @@
                 "terms": ""
             },
             "building/entrance": {
-                "name": "Entrance",
+                "name": "Entrance/Exit",
                 "terms": ""
             },
             "building/garage": {
@@ -1546,9 +1637,9 @@
                 "name": "Photographer",
                 "terms": "photographer"
             },
-            "craft/photographic_labratory": {
-                "name": "Photographic Labratory",
-                "terms": "photographic labratory,film developer"
+            "craft/photographic_laboratory": {
+                "name": "Photographic Laboratory",
+                "terms": "photographic laboratory,film developer"
             },
             "craft/plasterer": {
                 "name": "Plasterer",
@@ -1643,17 +1734,25 @@
                 "terms": ""
             },
             "entrance": {
-                "name": "Entrance",
+                "name": "Entrance/Exit",
                 "terms": ""
             },
             "footway/crossing": {
                 "name": "Crossing",
+                "terms": ""
+            },
+            "footway/crosswalk": {
+                "name": "Crosswalk",
                 "terms": "crosswalk,zebra crossing"
             },
             "footway/sidewalk": {
                 "name": "Sidewalk",
                 "terms": ""
             },
+            "ford": {
+                "name": "Ford",
+                "terms": ""
+            },
             "golf/bunker": {
                 "name": "Sand Trap",
                 "terms": "hazard,bunker"
@@ -1700,6 +1799,10 @@
             },
             "highway/crossing": {
                 "name": "Crossing",
+                "terms": ""
+            },
+            "highway/crosswalk": {
+                "name": "Crosswalk",
                 "terms": "crosswalk,zebra crossing"
             },
             "highway/cycleway": {
@@ -1723,7 +1826,7 @@
                 "terms": ""
             },
             "highway/motorway_junction": {
-                "name": "Motorway Junction",
+                "name": "Motorway Junction / Exit",
                 "terms": ""
             },
             "highway/motorway_link": {
@@ -1886,6 +1989,10 @@
                 "name": "Cemetery",
                 "terms": ""
             },
+            "landuse/churchyard": {
+                "name": "Churchyard",
+                "terms": ""
+            },
             "landuse/commercial": {
                 "name": "Commercial",
                 "terms": ""
@@ -1926,6 +2033,10 @@
                 "name": "Meadow",
                 "terms": ""
             },
+            "landuse/military": {
+                "name": "Military",
+                "terms": ""
+            },
             "landuse/orchard": {
                 "name": "Orchard",
                 "terms": ""
@@ -2027,7 +2138,7 @@
                 "terms": ""
             },
             "leisure/sports_center": {
-                "name": "Sports Center",
+                "name": "Sports Center / Gym",
                 "terms": "gym"
             },
             "leisure/stadium": {
@@ -2318,6 +2429,10 @@
                 "name": "Neighborhood",
                 "terms": "neighbourhood"
             },
+            "place/suburb": {
+                "name": "Borough",
+                "terms": "Boro,Quarter"
+            },
             "place/town": {
                 "name": "Town",
                 "terms": ""
@@ -2630,6 +2745,10 @@
                 "name": "Photography Store",
                 "terms": ""
             },
+            "shop/seafood": {
+                "name": "Seafood Shop",
+                "terms": "fishmonger"
+            },
             "shop/shoes": {
                 "name": "Shoe Store",
                 "terms": ""
@@ -2670,6 +2789,10 @@
                 "name": "Video Store",
                 "terms": ""
             },
+            "shop/wine": {
+                "name": "Wine Shop",
+                "terms": "winery"
+            },
             "tourism": {
                 "name": "Tourism",
                 "terms": ""
@@ -2754,6 +2877,34 @@
                 "name": "Restriction",
                 "terms": ""
             },
+            "type/restriction/no_left_turn": {
+                "name": "No Left Turn",
+                "terms": ""
+            },
+            "type/restriction/no_right_turn": {
+                "name": "No Right Turn",
+                "terms": ""
+            },
+            "type/restriction/no_straight_on": {
+                "name": "No Straight On",
+                "terms": ""
+            },
+            "type/restriction/no_u_turn": {
+                "name": "No U-turn",
+                "terms": ""
+            },
+            "type/restriction/only_left_turn": {
+                "name": "Left Turn Only",
+                "terms": ""
+            },
+            "type/restriction/only_right_turn": {
+                "name": "Right Turn Only",
+                "terms": ""
+            },
+            "type/restriction/only_straight_on": {
+                "name": "No Turns",
+                "terms": ""
+            },
             "type/route": {
                 "name": "Route",
                 "terms": ""
diff --git a/vendor/assets/iD/iD/locales/es.json b/vendor/assets/iD/iD/locales/es.json
index 691bf358a..5687bc15f 100644
--- a/vendor/assets/iD/iD/locales/es.json
+++ b/vendor/assets/iD/iD/locales/es.json
@@ -71,7 +71,8 @@
                 "line": "Redondear línea.",
                 "area": "Redondear área."
             },
-            "not_closed": "Esto no se puede redondear porque no es un bucle."
+            "not_closed": "Esto no se puede redondear porque no es un bucle.",
+            "too_large": "Esto no se puede redondear porque no está completamente visible."
         },
         "orthogonalize": {
             "title": "Escuadrar",
@@ -84,13 +85,14 @@
                 "line": "Escuadra las esquinas de una línea.",
                 "area": "Escuadra las esquinas de un área."
             },
-            "not_squarish": "Esto no puede escuadrarse porque no es cuadrado."
+            "not_squarish": "Esto no puede escuadrarse porque no es cuadrado.",
+            "too_large": "Esto no puede escuadrarse porque no está completamente visible."
         },
         "straighten": {
             "title": "Enderezado",
             "description": "Enderezar esta línea",
             "key": "S",
-            "annotation": "Enderezar una línea.",
+            "annotation": "Línea enderezada.",
             "too_bendy": "Esto no puede ser enderezado porque es demasiado sinuoso."
         },
         "delete": {
@@ -222,7 +224,7 @@
     },
     "contributors": {
         "list": "Ediciones de {users}",
-        "truncated_list": "Ediciones de {users} y {count} otros"
+        "truncated_list": "Ediciones de {users} y {count} más"
     },
     "geocoder": {
         "search": "Buscar mundialmente…",
@@ -265,7 +267,8 @@
         "percent_brightness": "{opacity}% brillo",
         "none": "Ninguno",
         "custom": "Personalizado",
-        "custom_prompt": "Introduzca una plantilla de teselas. Los símbolos válidos son {z}, {x}, {y} para el esquema Z\\/X\\/Y y {u} para el esquema quadtile.",
+        "custom_button": "Editar fondo personalizado",
+        "custom_prompt": "Introduzca la URL de una plantilla de teselas. Los símbolos válidos son {z}, {x}, {y} para el esquema Z/X/Y y {u} para el esquema quadtile.",
         "fix_misalignment": "Corregir la alineación",
         "reset": "reiniciar"
     },
@@ -409,6 +412,9 @@
             "category-rail": {
                 "name": "Ferrocarril"
             },
+            "category-restriction": {
+                "name": "Restricción"
+            },
             "category-road": {
                 "name": "Carretera"
             },
@@ -583,7 +589,7 @@
                 "label": "Electrificación"
             },
             "elevation": {
-                "label": "Altura"
+                "label": "Altitud"
             },
             "emergency": {
                 "label": "Emergencia"
@@ -591,6 +597,9 @@
             "entrance": {
                 "label": "Tipo"
             },
+            "except": {
+                "label": "Excepciones"
+            },
             "fax": {
                 "label": "Fax",
                 "placeholder": "+31 42 123 4567"
@@ -604,6 +613,24 @@
             "fixme": {
                 "label": "Arréglame"
             },
+            "fuel": {
+                "label": "Combustible"
+            },
+            "fuel/biodiesel": {
+                "label": "Venta de biodiesel"
+            },
+            "fuel/diesel": {
+                "label": "Venta de diesel"
+            },
+            "fuel/e10": {
+                "label": "Venta de E10"
+            },
+            "fuel/e85": {
+                "label": "Venta de E85"
+            },
+            "fuel/lpg": {
+                "label": "Venta de propano"
+            },
             "gauge": {
                 "label": "Gálibo"
             },
@@ -631,6 +658,7 @@
                 "label": "Tipo"
             },
             "hoops": {
+                "label": "Aros",
                 "placeholder": "1, 2, 4..."
             },
             "iata": {
@@ -666,6 +694,9 @@
             "leisure": {
                 "label": "Tipo"
             },
+            "length": {
+                "label": "Longitud (Metros)"
+            },
             "levels": {
                 "label": "Niveles",
                 "placeholder": "2, 4, 6..."
@@ -737,6 +768,9 @@
             "place": {
                 "label": "Tipo"
             },
+            "population": {
+                "label": "Población"
+            },
             "power": {
                 "label": "Tipo"
             },
@@ -785,6 +819,9 @@
             "sac_scale": {
                 "label": "Dificultad del sendero"
             },
+            "seasonal": {
+                "label": "Estacional"
+            },
             "service": {
                 "label": "Tipo"
             },
@@ -797,6 +834,9 @@
             "shop": {
                 "label": "Tipo"
             },
+            "smoking": {
+                "label": "Fumar"
+            },
             "social_facility_for": {
                 "label": "Personas atendidas",
                 "placeholder": "Personas sin hogar, discapacitados, niños, etc"
@@ -807,6 +847,9 @@
             "sport": {
                 "label": "Deporte"
             },
+            "sport_ice": {
+                "label": "Deporte"
+            },
             "structure": {
                 "label": "Estructura",
                 "placeholder": "Desconocido",
@@ -826,6 +869,9 @@
             "surface": {
                 "label": "Superficie"
             },
+            "tactile_paving": {
+                "label": "Pavimento táctil"
+            },
             "toilets/disposal": {
                 "label": "Disponible"
             },
@@ -869,6 +915,9 @@
             "wheelchair": {
                 "label": "Acceso en silla de ruedas"
             },
+            "width": {
+                "label": "Anchura (Metros)"
+            },
             "wikipedia": {
                 "label": "Wikipedia"
             },
@@ -882,7 +931,8 @@
                 "terms": "dirección, domicilio, señas, residencia"
             },
             "aerialway": {
-                "name": "Pista aérea"
+                "name": "Teleférico",
+                "terms": "aerovía, teleférico, telecabina, funicular, transbordador, telesilla, telesquí"
             },
             "aerialway/cable_car": {
                 "name": "Teleférico",
@@ -897,19 +947,22 @@
                 "terms": "Telecabina"
             },
             "aerialway/magic_carpet": {
-                "name": "Ascensor de alfombra mágica"
+                "name": "Ascensor de alfombra mágica",
+                "terms": "Cinta transportadora de esquí"
             },
             "aerialway/platter": {
                 "name": "Ascensor de plato"
             },
             "aerialway/pylon": {
-                "name": "Pilón aéreo"
+                "name": "Pilón aéreo",
+                "terms": "pilona, columna, poste, soporte"
             },
             "aerialway/rope_tow": {
                 "name": "Ascensor de remolque de cuerda"
             },
             "aerialway/station": {
-                "name": "Estación aérea"
+                "name": "Estación de teleférico",
+                "terms": "estación, parada, funicular, telesilla, telesquí, teleférico"
             },
             "aerialway/t-bar": {
                 "name": "Ascensor T-bar"
@@ -969,12 +1022,16 @@
                 "name": "Bar",
                 "terms": "bar, pub, tasca, cantina, café, taberna"
             },
+            "amenity/bbq": {
+                "name": "Asador",
+                "terms": "barbacoa, asador, parrilla"
+            },
             "amenity/bench": {
                 "name": "Banco",
                 "terms": "asiento público,banco,banquillo,banqueta"
             },
             "amenity/bicycle_parking": {
-                "name": "Aparcamiento de bibicletas",
+                "name": "Aparcamiento de bicicletas",
                 "terms": "bicicleta, bici, aparcamiento, parking, estacionamiento"
             },
             "amenity/bicycle_rental": {
@@ -1000,6 +1057,9 @@
                 "name": "Lavado de automóviles",
                 "terms": "lavadero,lavado de coches"
             },
+            "amenity/charging_station": {
+                "name": "Estación de carga"
+            },
             "amenity/childcare": {
                 "name": "Cuidado de niños",
                 "terms": "canguro,cuidadora"
@@ -1019,6 +1079,9 @@
                 "name": "Instituto",
                 "terms": "facultad,universidad,escuela profesional, instituto"
             },
+            "amenity/compressed_air": {
+                "name": "Aire comprimido"
+            },
             "amenity/courthouse": {
                 "name": "Palacio de justicia",
                 "terms": "tribunal, magistratura, judicatura, audiencia,justicia"
@@ -1060,10 +1123,12 @@
                 "terms": "cementerio,camposanto, necrópolis, sacramental"
             },
             "amenity/hospital": {
-                "name": "Terrenos de hospital"
+                "name": "Hospital",
+                "terms": "Recinto hospitalario"
             },
             "amenity/kindergarten": {
-                "name": "Terrenos del jardín de niños"
+                "name": "Jardín de infancia",
+                "terms": "preescolar, parvulario, guardería, kinder, educación infantil, educación inicial"
             },
             "amenity/library": {
                 "name": "Biblioteca",
@@ -1073,8 +1138,16 @@
                 "name": "Mercado",
                 "terms": "mercado, mercadillo"
             },
+            "amenity/nightclub": {
+                "name": "Discoteca",
+                "terms": "discoteca, club nocturno, pub"
+            },
             "amenity/parking": {
-                "name": "Aparcamiento de automóviles"
+                "name": "Aparcamiento de automóviles",
+                "terms": "aparcamiento, parking, aparcadero, estacionamiento, garaje"
+            },
+            "amenity/parking_entrance": {
+                "name": "Entrada/Salida del Estacionamiento"
             },
             "amenity/pharmacy": {
                 "name": "Farmacia",
@@ -1102,7 +1175,7 @@
             },
             "amenity/police": {
                 "name": "Policía",
-                "terms": "policía,comisaría,gendarmería,cuartel,guardia cicvil"
+                "terms": "policía,comisaría,gendarmería,cuartel,guardia civil"
             },
             "amenity/post_box": {
                 "name": "Buzón de correos",
@@ -1120,24 +1193,28 @@
                 "name": "Puesto de guardaparques"
             },
             "amenity/recycling": {
-                "name": "Reciclaje"
+                "name": "Reciclaje",
+                "terms": "Reciclaje"
             },
             "amenity/restaurant": {
                 "name": "Restaurante",
                 "terms": "restaurante,restorán, comedor, ambigú, bufé, mesón, taberna"
             },
             "amenity/school": {
-                "name": "Terrenos de escuelas"
+                "name": "Escuela",
+                "terms": "Recinto escolar"
             },
             "amenity/shelter": {
                 "name": "Refugio",
                 "terms": "albergue, abrigo, amparo, asilo, cobertizo, garita, refugio"
             },
             "amenity/social_facility": {
-                "name": "Instalación social"
+                "name": "Instalación social",
+                "terms": "Servicios sociales, Asistencia social, "
             },
             "amenity/social_facility/food_bank": {
-                "name": "Banco de alimentos"
+                "name": "Banco de alimentos",
+                "terms": "Banco de alimentos"
             },
             "amenity/social_facility/group_home": {
                 "name": "Grupo residencial"
@@ -1159,7 +1236,7 @@
             },
             "amenity/telephone": {
                 "name": "Teléfono",
-                "terms": "teatro,sala, salón, anfiteatro, coliseo, escenario"
+                "terms": "teléfono, llamar, cabina telefónica"
             },
             "amenity/theatre": {
                 "name": "Teatro",
@@ -1178,7 +1255,8 @@
                 "terms": "universidad,facultad, escuela, seminario, colegio, cátedra, claustro, paraninfo,"
             },
             "amenity/vending_machine": {
-                "name": "Máquina expendedora"
+                "name": "Máquina expendedora",
+                "terms": "máquina expendedora, máquina autoventa, vending"
             },
             "amenity/veterinary": {
                 "name": "Veterinario",
@@ -1206,7 +1284,7 @@
             },
             "barrier/cattle_grid": {
                 "name": "Rejilla de retención",
-                "terms": "Paso con rejas para animales"
+                "terms": "Paso con rejas para animales, paso canadiense, barrera canadiense, guardaganados"
             },
             "barrier/city_wall": {
                 "name": "Muralla de ciudad",
@@ -1241,7 +1319,7 @@
                 "terms": "Puerta de seguridad para ganado"
             },
             "barrier/lift_gate": {
-                "name": "Puerta levadiza",
+                "name": "Barrera levadiza",
                 "terms": "Barrera elevada"
             },
             "barrier/retaining_wall": {
@@ -1273,7 +1351,7 @@
                 "terms": "apartamento, piso, vivienda, alojamiento, buhardilla, estudio, edificio"
             },
             "building/barn": {
-                "name": "Granero, hórreo, silo, depósito de cereal, troj",
+                "name": "Granero",
                 "terms": "Granero, hórreo, silo, depósito de cereal, troj"
             },
             "building/bunker": {
@@ -1281,14 +1359,16 @@
                 "terms": "Fortaleza"
             },
             "building/cabin": {
-                "name": "Cabina"
+                "name": "Cabina",
+                "terms": "Cabina"
             },
             "building/cathedral": {
                 "name": "Catedral",
                 "terms": "Iglesia, Lugar de culto, templo, basílica, parroquia, santuario, oratorio, iglesia, basílica"
             },
             "building/chapel": {
-                "name": "Capilla"
+                "name": "Capilla",
+                "terms": "Capilla"
             },
             "building/church": {
                 "name": "Iglesia",
@@ -1300,7 +1380,7 @@
             },
             "building/construction": {
                 "name": "Edificio en construcción",
-                "terms": "Edificio en construcción"
+                "terms": "Edificio en construcción, edificio en obras"
             },
             "building/detached": {
                 "name": "Casa unifamiliar",
@@ -1310,7 +1390,7 @@
                 "name": "Dormitorio"
             },
             "building/entrance": {
-                "name": "Entrada",
+                "name": "Entrada/Salida",
                 "terms": "puerta, portal, vestíbulo, umbral, soportal, pórtico, abertura, acceso, boca, embocadura, agujero, hueco"
             },
             "building/garage": {
@@ -1322,14 +1402,16 @@
                 "terms": "garajes, cocheras"
             },
             "building/greenhouse": {
-                "name": "Invernadero"
+                "name": "Invernadero",
+                "terms": "Invernadero, Invernáculo"
             },
             "building/hospital": {
                 "name": "Edificio de hospital",
                 "terms": "Hospital, sanatorio, Centro de primeros auxilios"
             },
             "building/hotel": {
-                "name": "Edificio de hotel"
+                "name": "Edificio de hotel",
+                "terms": "Edificio hotelero"
             },
             "building/house": {
                 "name": "Casa",
@@ -1344,7 +1426,8 @@
                 "terms": "fábrica,factoría, industria, manufactura, taller, empresa, explotación"
             },
             "building/public": {
-                "name": "Edificio público"
+                "name": "Edificio público",
+                "terms": "Edificio público"
             },
             "building/residential": {
                 "name": "Edificio residencial",
@@ -1354,14 +1437,16 @@
                 "name": "Edificio de ventas al por menor"
             },
             "building/roof": {
-                "name": "Tejado"
+                "name": "Tejado",
+                "terms": "Tejado, Techumbre"
             },
             "building/school": {
                 "name": "Edificio escolar",
                 "terms": "Edificio colegio"
             },
             "building/shed": {
-                "name": "Cobertizo"
+                "name": "Cobertizo",
+                "terms": "cobertizo, establo, tinglado, barraca"
             },
             "building/stable": {
                 "name": "Establo de caballos",
@@ -1378,20 +1463,23 @@
                 "terms": "parada, alto, detención, apeadero, terminal, tren, ferrocarril"
             },
             "building/university": {
-                "name": "Edificio universitario"
+                "name": "Edificio universitario",
+                "terms": "Universidad, Facultad, Escuela universitaria"
             },
             "building/warehouse": {
                 "name": "Almacén",
                 "terms": "almacén, depósito, bodega, lonja, nave"
             },
             "craft/basket_maker": {
-                "name": "Fabricante de cestas"
+                "name": "Fabricante de cestas",
+                "terms": "cestero, cesta, cestería, canastero, canasto, mimbrero, mimbre"
             },
             "craft/beekeeper": {
                 "name": "Apicultor"
             },
             "craft/blacksmith": {
-                "name": "Herrero"
+                "name": "Herrero",
+                "terms": "herrero, herrería, herrajes, hierro, forja"
             },
             "craft/boatbuilder": {
                 "name": "Constructor de barco"
@@ -1413,7 +1501,8 @@
                 "name": "Proveedor"
             },
             "craft/clockmaker": {
-                "name": "Relojero"
+                "name": "Relojero",
+                "terms": "relojero, joyero, reloj"
             },
             "craft/confectionary": {
                 "name": "Golosinas",
@@ -1427,7 +1516,8 @@
                 "terms": "electricista, iluminista, trabajo de electricista"
             },
             "craft/gardener": {
-                "name": "Jardinero"
+                "name": "Jardinero",
+                "terms": "Jardinero,  Jardinería"
             },
             "craft/glaziery": {
                 "name": "Vidriería"
@@ -1453,28 +1543,32 @@
                 "terms": "Cerrajero, cerraduras"
             },
             "craft/metal_construction": {
-                "name": "Construcción metálica"
+                "name": "Construcción metálica",
+                "terms": "Metalúrgica, Taller metálico, Construcciones de metal, Calderería"
             },
             "craft/optician": {
                 "name": "Óptico",
                 "terms": "óptico, óptica, gafas"
             },
             "craft/painter": {
-                "name": "Pintor"
+                "name": "Pintor",
+                "terms": "Pintor"
             },
             "craft/photographer": {
                 "name": "Fotógrafo",
                 "terms": "fotógrafo, retratista"
             },
-            "craft/photographic_labratory": {
-                "name": "Laboratorio fotográfico"
+            "craft/photographic_laboratory": {
+                "name": "Laboratorio Fotográfico",
+                "terms": "Laboratorio fotográfico"
             },
             "craft/plasterer": {
                 "name": "Yesero",
                 "terms": "yeso, albañil, obra"
             },
             "craft/plumber": {
-                "name": "Fontanero"
+                "name": "Fontanero",
+                "terms": "Fontanero, Fontanería"
             },
             "craft/pottery": {
                 "name": "Cerámica",
@@ -1495,7 +1589,8 @@
                 "terms": "Fabricante de velas"
             },
             "craft/sawmill": {
-                "name": "Aserradero"
+                "name": "Aserradero",
+                "terms": "Aserradero"
             },
             "craft/scaffolder": {
                 "name": "Andamista"
@@ -1509,25 +1604,31 @@
                 "terms": "zapatero, remendón"
             },
             "craft/stonemason": {
-                "name": "Albañil"
+                "name": "Albañil",
+                "terms": "Albañil, Cantero, Enconfrador"
             },
             "craft/sweep": {
-                "name": "Deshollinador"
+                "name": "Deshollinador",
+                "terms": "Deshollinador, Limpiachimeneas"
             },
             "craft/tailor": {
-                "name": "Sastre"
+                "name": "Sastre",
+                "terms": "Sastre, Satrería"
             },
             "craft/tiler": {
                 "name": "Solador"
             },
             "craft/tinsmith": {
-                "name": "Hojalatero"
+                "name": "Hojalatero",
+                "terms": "Hojalatero, Soldador"
             },
             "craft/upholsterer": {
-                "name": "Tapicero"
+                "name": "Tapicero",
+                "terms": "Tapicero"
             },
             "craft/watchmaker": {
-                "name": "Relojero"
+                "name": "Relojero",
+                "terms": "Relojero"
             },
             "craft/window_construction": {
                 "name": "Construcción de ventanas"
@@ -1536,7 +1637,8 @@
                 "name": "Terraplén"
             },
             "emergency/ambulance_station": {
-                "name": "Estación de ambulancias"
+                "name": "Estación de ambulancias",
+                "terms": "Estación de ambulancia"
             },
             "emergency/fire_hydrant": {
                 "name": "Boca de incendio",
@@ -1544,13 +1646,16 @@
             },
             "emergency/phone": {
                 "name": "Teléfono de emergencias",
-                "terms": "Teléfono de emergencia"
+                "terms": "Teléfono de emergencia, SOS"
             },
             "entrance": {
-                "name": "Entrada",
-                "terms": "puerta, portal, vestíbulo, umbral, soportal, pórtico, abertura, acceso, boca, entrada, portilla"
+                "name": "Entrada/Salida"
             },
             "footway/crossing": {
+                "name": "Cruce peatonal",
+                "terms": "cruce, travesía, paso, cruzamiento, pasaje, vado, paseo, traviesa, paso de peatones, paso de cebra"
+            },
+            "footway/crosswalk": {
                 "name": "Cruce peatonal",
                 "terms": "cruce, travesía, paso, cruzamiento, pasaje, vado, paseo, traviesa, paso de peatones"
             },
@@ -1568,7 +1673,8 @@
                 "name": "Putting Green"
             },
             "golf/hole": {
-                "name": "Hoyo de golf"
+                "name": "Hoyo de golf",
+                "terms": "Hoyo de golf"
             },
             "golf/lateral_water_hazard": {
                 "name": "Obstáculo de agua lateral"
@@ -1588,7 +1694,7 @@
             },
             "highway/bridleway": {
                 "name": "Camino de herradura",
-                "terms": "Camino de herradura"
+                "terms": "camino de herradura, senda ecuestre, camino para caballos"
             },
             "highway/bus_stop": {
                 "name": "Parada de autobús",
@@ -1598,12 +1704,16 @@
                 "name": "Cruce peatonal",
                 "terms": "cruce peatonal, paso peatonal, paso de cebra, paso de peatones, paso semafórico"
             },
+            "highway/crosswalk": {
+                "name": "Cruce peatonal",
+                "terms": "cruce, travesía, paso, cruzamiento, pasaje, vado, paseo, traviesa, paso de peatones"
+            },
             "highway/cycleway": {
                 "name": "Sendero ciclista",
-                "terms": "Camino para bicicletas"
+                "terms": "Camino para bicicletas, senda ciclable, sendero ciclista, carril bici"
             },
             "highway/footway": {
-                "name": "Sendero peatonal",
+                "name": "Vía urbana peatonal",
                 "terms": "Camino peatonal"
             },
             "highway/living_street": {
@@ -1619,7 +1729,7 @@
                 "terms": "autopista, autovía, vía rápida"
             },
             "highway/motorway_junction": {
-                "name": "Cruce de autopista",
+                "name": "Cruce / salida de autopista",
                 "terms": "enlace, acceso, autopista, autovía, salida"
             },
             "highway/motorway_link": {
@@ -1631,7 +1741,7 @@
                 "terms": "vereda, sendero, camino, vía, calzada, ramal, trocha, atajo, travesía, huella, rastro"
             },
             "highway/pedestrian": {
-                "name": "Vía peatonal",
+                "name": "Calle peatonal",
                 "terms": "Peatonal, plaza, calle"
             },
             "highway/primary": {
@@ -1684,7 +1794,7 @@
             },
             "highway/service/parking_aisle": {
                 "name": "Pasillo de aparcamiento",
-                "terms": "aparcamiento, parking"
+                "terms": "aparcamiento, parking, pasillo, estacionamiento"
             },
             "highway/services": {
                 "name": "Área de servicio",
@@ -1699,16 +1809,16 @@
                 "terms": "señal de detención, señal de parada, señal, stop, detención, parada"
             },
             "highway/tertiary": {
-                "name": "Carretera ternaria",
+                "name": "Carretera terciaria",
                 "terms": "calle, ronda, carril, ruta, arteria, rúa, trayecto, avenida, carretera, paseo, camino, vía, local, terciaria"
             },
             "highway/tertiary_link": {
-                "name": "Enlace a carretera ternaria",
+                "name": "Enlace a carretera terciaria",
                 "terms": "enlace, unión, cruce, calle, ronda, carril, ruta, arteria, rúa, trayecto, avenida, carretera, paseo, camino, vía, local, terciaria"
             },
             "highway/track": {
-                "name": "Camino",
-                "terms": "Vía"
+                "name": "Pista",
+                "terms": "pista, camino, vía"
             },
             "highway/traffic_signals": {
                 "name": "Semáforos",
@@ -1716,7 +1826,7 @@
             },
             "highway/trunk": {
                 "name": "Carretera troncal",
-                "terms": "Carretera principal"
+                "terms": "Carretera principal, nacional"
             },
             "highway/trunk_link": {
                 "name": "Enlace a carretera troncal",
@@ -1727,8 +1837,8 @@
                 "terms": "círculo, giro, retorno, cul de sac"
             },
             "highway/unclassified": {
-                "name": "Carretera no clasificada",
-                "terms": "Carretera sin clasificación"
+                "name": "Carretera sin clasificación",
+                "terms": "carretera, camino, vía, camino rural"
             },
             "historic": {
                 "name": "Lugar histórico",
@@ -1748,7 +1858,7 @@
             },
             "historic/memorial": {
                 "name": "Monumento",
-                "terms": "memorial, monolito, obelisco, pirámide, estatua, túmulo, panteón, mausoleo, menhir, dolmen"
+                "terms": "memorial, monolito, obelisco, pirámide, estatua, túmulo, panteón, mausoleo, menhir, dolmen, escultura, busto"
             },
             "historic/monument": {
                 "name": "Monumento",
@@ -1759,11 +1869,11 @@
                 "terms": "restos, escombros, cascotes, vestigios, reliquias, despojos"
             },
             "historic/wayside_cross": {
-                "name": "Cruz al borde del camino",
+                "name": "Crucero",
                 "terms": "crucero, cruz, humilladero"
             },
             "historic/wayside_shrine": {
-                "name": "Santuario al borde del camino",
+                "name": "Humilladero",
                 "terms": "santuario, humilladero, crucero, cruz, sagrario"
             },
             "landuse": {
@@ -1782,29 +1892,32 @@
                 "name": "Cementerio",
                 "terms": "cementerio, camposanto, necrópolis, sacramental"
             },
+            "landuse/churchyard": {
+                "name": "Camposanto"
+            },
             "landuse/commercial": {
                 "name": "Comercial",
-                "terms": "Comercial"
+                "terms": "Comercial, tiendas, compras"
             },
             "landuse/construction": {
                 "name": "Construcción",
-                "terms": "Construcción"
+                "terms": "Construcción, obras"
             },
             "landuse/farm": {
-                "name": "Granja",
-                "terms": "Granja"
+                "name": "Tierras de cultivo",
+                "terms": "Granja, cultivo, finca, campo"
             },
             "landuse/farmland": {
                 "name": "Tierra de labranza",
                 "terms": "granja, tierra de cultivo"
             },
             "landuse/farmyard": {
-                "name": "Tierras de cultivo",
+                "name": "Granja",
                 "terms": "Edificios de la granja"
             },
             "landuse/forest": {
-                "name": "Bosque forestal",
-                "terms": "Bosque"
+                "name": "Plantación forestal",
+                "terms": "bosque, plantación, pinar, cultivo, plantío, sembrado, eucaliptal, explotación"
             },
             "landuse/grass": {
                 "name": "Hierba",
@@ -1812,12 +1925,19 @@
             },
             "landuse/industrial": {
                 "name": "Industrial",
-                "terms": "Industrial"
+                "terms": "Industrial, polígono"
+            },
+            "landuse/landfill": {
+                "name": "Vertedero"
             },
             "landuse/meadow": {
                 "name": "Prado",
                 "terms": "prado, pradera, campo, mies, braniza, braña"
             },
+            "landuse/military": {
+                "name": "Militar",
+                "terms": "militar, ejercito, fuerzas armadas, defensa, cuartel, milicia"
+            },
             "landuse/orchard": {
                 "name": "Huerta",
                 "terms": "herbazal, pradera, pradería, prado, pasto, majada, monte, dehesa, huerta, riego, sembrado"
@@ -1827,8 +1947,8 @@
                 "terms": "cantera"
             },
             "landuse/residential": {
-                "name": "Urbano",
-                "terms": "zona, residencial, urbano"
+                "name": "Suelo Urbano residencial",
+                "terms": "zona, residencial, urbano, suelo"
             },
             "landuse/retail": {
                 "name": "Venta al por menor",
@@ -1849,6 +1969,9 @@
                 "name": "Parque canino",
                 "terms": "perro,can,parque"
             },
+            "leisure/firepit": {
+                "name": "Hoguera"
+            },
             "leisure/garden": {
                 "name": "Jardín",
                 "terms": "parque, parterre, vergel, floresta, huerto, rosaleda, jardín"
@@ -1857,14 +1980,21 @@
                 "name": "Campo de golf",
                 "terms": "Campo de golf"
             },
+            "leisure/ice_rink": {
+                "name": "Pista de Hielo"
+            },
             "leisure/marina": {
-                "name": "Marina",
-                "terms": "marina"
+                "name": "Muelle",
+                "terms": "marina, muelle, puerto, embarcadero"
             },
             "leisure/park": {
                 "name": "Parque",
                 "terms": "parque, jardín"
             },
+            "leisure/picnic_table": {
+                "name": "Mesa de picnic",
+                "terms": "Mesa de picnic, Mesa de parque"
+            },
             "leisure/pitch": {
                 "name": "Cancha deportiva",
                 "terms": "cancha, frontón, campo, pista, polideportivo, terreno de juego, juego, deporte"
@@ -1905,8 +2035,8 @@
                 "terms": "Grada"
             },
             "leisure/sports_center": {
-                "name": "Centro deportivo",
-                "terms": "Complejo deportivo"
+                "name": "Centro deportivo / Gimnasio",
+                "terms": "centro deportivo, club deportivo, club atlético, gimnasio"
             },
             "leisure/stadium": {
                 "name": "Estadio",
@@ -1925,7 +2055,7 @@
                 "terms": "Línea"
             },
             "man_made": {
-                "name": "Hecho por el hombre",
+                "name": "Estructura artificial",
                 "terms": "manufactura, industrial, fabricado, manufacturado, fábrica, industria, hecho por el hombre"
             },
             "man_made/breakwater": {
@@ -1947,7 +2077,8 @@
                 "terms": "faro"
             },
             "man_made/observation": {
-                "name": "Torre de Observación"
+                "name": "Torre de Observación",
+                "terms": "Torre de observación"
             },
             "man_made/pier": {
                 "name": "Embarcadero",
@@ -1978,7 +2109,7 @@
                 "terms": "Pozo de agua"
             },
             "man_made/water_works": {
-                "name": "Trabajos hídricos",
+                "name": "Abastecimiento de agua potable",
                 "terms": "Depósito de agua"
             },
             "military/airfield": {
@@ -1994,7 +2125,8 @@
                 "terms": "búnker, refugio subterráneo"
             },
             "military/range": {
-                "name": "Rango militar"
+                "name": "Campo militar de tiro",
+                "terms": "campo, entrenamiento, militar, tiro, prácticas"
             },
             "natural": {
                 "name": "Natural",
@@ -2044,7 +2176,7 @@
             },
             "natural/spring": {
                 "name": "Manantial",
-                "terms": "Manantial"
+                "terms": "Manantial, fuente, agua"
             },
             "natural/tree": {
                 "name": "Árbol",
@@ -2108,7 +2240,8 @@
                 "name": "Oficina financiera"
             },
             "office/government": {
-                "name": "Oficina de gobierno"
+                "name": "Oficina de gobierno",
+                "terms": "Oficina gubernamental"
             },
             "office/insurance": {
                 "name": "Aseguradora",
@@ -2122,7 +2255,8 @@
                 "terms": "despacho, bufete, abogado, procurador, letrado, jurisconsulto, jurisperito, jurista, legista"
             },
             "office/newspaper": {
-                "name": "Periódico"
+                "name": "Periódico",
+                "terms": "Periódico"
             },
             "office/ngo": {
                 "name": "ONG",
@@ -2132,10 +2266,12 @@
                 "name": "Doctor"
             },
             "office/political_party": {
-                "name": "Partido político"
+                "name": "Partido político",
+                "terms": "Partido político"
             },
             "office/research": {
-                "name": "Oficina de investigación"
+                "name": "Oficina de investigación",
+                "terms": "Oficina de investigación, Laboratorio de investigación, Departamento de investigación, Centro de investigación"
             },
             "office/telecommunication": {
                 "name": "Oficina de telecomunicaciones"
@@ -2148,7 +2284,8 @@
                 "terms": "agencia, viaje, vacaciones, turismo, excursión"
             },
             "piste": {
-                "name": "Pista/Sendero de ski"
+                "name": "Pista/Sendero de ski",
+                "terms": "Pista de esquí"
             },
             "place": {
                 "name": "Lugar",
@@ -2174,6 +2311,10 @@
                 "name": "Paraje",
                 "terms": "paraje, lugar, sitio, rincón"
             },
+            "place/neighbourhood": {
+                "name": "Barrio",
+                "terms": "barrio, vecindario, vecindad"
+            },
             "place/town": {
                 "name": "Ciudad",
                 "terms": "ciudad, pueblo, población, localidad, villa, núcleo urbano, urbano"
@@ -2218,7 +2359,8 @@
                 "terms": "Transformador"
             },
             "public_transport/platform": {
-                "name": "Plataforma"
+                "name": "Plataforma",
+                "terms": "Plataforma, Andén"
             },
             "public_transport/stop_position": {
                 "name": "Punto de parada",
@@ -2237,22 +2379,24 @@
                 "terms": "Ferrocarril en deshuso"
             },
             "railway/funicular": {
-                "name": "Funicular"
+                "name": "Funicular",
+                "terms": "Funicular, Teleférico, Telecabina"
             },
             "railway/halt": {
                 "name": "Apeadero",
                 "terms": "apeadero,estación,ferrocarril,tren,andén"
             },
             "railway/level_crossing": {
-                "name": "Cruce a nivel",
-                "terms": "Paso a nivel"
+                "name": "Paso a nivel",
+                "terms": "paso a nivel, cruce a nivel, ferrocarril, tren"
             },
             "railway/monorail": {
                 "name": "Monorraíl",
                 "terms": "Monorail"
             },
             "railway/narrow_gauge": {
-                "name": "Carril de vía estrecha"
+                "name": "Carril de vía estrecha",
+                "terms": "Ferrocarril de vía estrecha"
             },
             "railway/platform": {
                 "name": "Andén",
@@ -2312,7 +2456,7 @@
             },
             "shop/bicycle": {
                 "name": "Tienda de bicicletas",
-                "terms": "tienda de bicicletas, bici"
+                "terms": "tienda de bicicletas, bici, bicicleta, taller de bicicletas"
             },
             "shop/bookmaker": {
                 "name": "Librero"
@@ -2334,7 +2478,7 @@
                 "terms": "concesionario, coches, automóviles, carros, vehículos, venta"
             },
             "shop/car_parts": {
-                "name": "Tienda de partes de automóviles",
+                "name": "Tienda de recambios de automóviles",
                 "terms": "repuestos, tienda, automóvil, vehículo, carro, coche, piezas, almacén"
             },
             "shop/car_repair": {
@@ -2342,7 +2486,7 @@
                 "terms": "reparación, automóvil, vehículo, carro, coche, taller"
             },
             "shop/chemist": {
-                "name": "Farmacia",
+                "name": "Droguería",
                 "terms": "farmacéutico, botica, farmacia, boticario, apoteca"
             },
             "shop/clothes": {
@@ -2392,12 +2536,17 @@
                 "name": "Floristería",
                 "terms": "floristería, florista, flores, ramos, plantas, tienda, comercio"
             },
+            "shop/funeral_directors": {
+                "name": "Funeraria",
+                "terms": "Funeraria"
+            },
             "shop/furniture": {
                 "name": "Mueblería",
                 "terms": "mueble, mobiliario, utensilio, armario, mesa, silla, tienda, decoración, cocina"
             },
             "shop/garden_centre": {
-                "name": "Centro de jardinería"
+                "name": "Centro de jardinería",
+                "terms": "Centro de jardinería, Tienda de jardinería"
             },
             "shop/gift": {
                 "name": "Tienda de regalos",
@@ -2416,7 +2565,8 @@
                 "terms": "Ferreteria"
             },
             "shop/hifi": {
-                "name": "Tienda de equipos de sonido"
+                "name": "Tienda de equipos de sonido",
+                "terms": "sonido, hifi, alta fidelidad, electrónica, altavoces, amplificadores"
             },
             "shop/jewelry": {
                 "name": "Joyería",
@@ -2431,10 +2581,12 @@
                 "terms": "lavandería, lavadero, colada, ropa, tintorería, limpieza"
             },
             "shop/locksmith": {
-                "name": "Cerrajero"
+                "name": "Cerrajero",
+                "terms": "cerrajero, cerradura, candado"
             },
             "shop/lottery": {
-                "name": "Lotería"
+                "name": "Administración de Lotería",
+                "terms": "Administración de loterías, Venta de lotería"
             },
             "shop/mall": {
                 "name": "Centro comercial",
@@ -2471,6 +2623,9 @@
                 "name": "Tienda de fotografía",
                 "terms": "fotografía, tienda , establecimiento, fotógrafo, cámara, retratista, revelado"
             },
+            "shop/seafood": {
+                "name": "Tienda de Mariscos"
+            },
             "shop/shoes": {
                 "name": "Zapatería",
                 "terms": "zapatería, calzado, tienda, zapato, zapatilla, escarpín, bota, sandalia, alpargata, pantufla, babucha, borceguí, almadreña, zueco, chancla, chanclo, madreña, chinela, coturno, alborga"
@@ -2494,7 +2649,8 @@
                 "terms": "agencia de viajes, agencia de turismo"
             },
             "shop/tyres": {
-                "name": "Tienda de neumáticos"
+                "name": "Tienda de neumáticos",
+                "terms": "Taller de neumáticos, Recambio de ruedas"
             },
             "shop/vacant": {
                 "name": "Local vacío"
@@ -2507,19 +2663,24 @@
                 "name": "Videoclub",
                 "terms": "tienda, alquiler, renta, tienda de vídeos, videoclub, alquiler de vídeos, renta de vídeos"
             },
+            "shop/wine": {
+                "name": "Vinoteca, Tienda de vinos"
+            },
             "tourism": {
                 "name": "Turismo",
                 "terms": "turismo"
             },
             "tourism/alpine_hut": {
-                "name": "Cabaña alpina"
+                "name": "Cabaña alpina",
+                "terms": "Refugio de montaña, refugio alpino"
             },
             "tourism/artwork": {
-                "name": "Obra de arte"
+                "name": "Obra de arte",
+                "terms": "obra de arte, pieza de arte, pintura, escultura, mural, pintada, estatua"
             },
             "tourism/attraction": {
                 "name": "Atracción turística",
-                "terms": "punto de interés,interesante"
+                "terms": "punto de interés, interesante, interés turístico, atracción turística"
             },
             "tourism/camp_site": {
                 "name": "Lugar de acampada",
@@ -2546,7 +2707,7 @@
             },
             "tourism/information": {
                 "name": "Información",
-                "terms": "información,aviso,señal"
+                "terms": "información, aviso, señal, información turística"
             },
             "tourism/motel": {
                 "name": "Motel",
@@ -2558,15 +2719,15 @@
             },
             "tourism/picnic_site": {
                 "name": "Zona de picnic",
-                "terms": "picnic,barbacoa,espercimiento"
+                "terms": "picnic, barbacoa, espercimiento, merendero"
             },
             "tourism/theme_park": {
-                "name": "Parque temático",
+                "name": "Parque de atracciones",
                 "terms": "parque temático, parque de atracciones, atracciones"
             },
             "tourism/viewpoint": {
-                "name": "Vista panorámica",
-                "terms": "oteadero, punto de vista, mirador, vistas"
+                "name": "Mirador",
+                "terms": "oteadero, punto de vista, mirador, vistas, vista panorámica"
             },
             "tourism/zoo": {
                 "name": "Zoológico",
@@ -2588,12 +2749,31 @@
                 "name": "Restricción",
                 "terms": "restricción, limitación, prohibición"
             },
+            "type/restriction/no_left_turn": {
+                "name": "No girar a la izquierda",
+                "terms": "no girar a la izquierda, prohibido girar a la izquierda"
+            },
+            "type/restriction/no_right_turn": {
+                "name": "No girar a la derecha",
+                "terms": "no girar a la derecha, prohibido girar a la derecha"
+            },
+            "type/restriction/only_left_turn": {
+                "name": "Sólo girar a la izquierda"
+            },
+            "type/restriction/only_right_turn": {
+                "name": "Sólo girar a la derecha"
+            },
+            "type/restriction/only_straight_on": {
+                "name": "No girar",
+                "terms": "no girar, prohibido girar"
+            },
             "type/route": {
                 "name": "Ruta",
                 "terms": "ruta,recorrido,línea"
             },
             "type/route/bicycle": {
-                "name": "Ruta de bicicleta"
+                "name": "Ruta de bicicleta",
+                "terms": "ruta ciclista, ciclovía, carril bici, ciclosenda, bicicleta"
             },
             "type/route/bus": {
                 "name": "Ruta de bus",
@@ -2612,7 +2792,8 @@
                 "terms": "ruta, itinerario, rumbo, dirección, trayecto, peatonal, pie, senderismo , camino, derrotero, vía"
             },
             "type/route/hiking": {
-                "name": "Ruta de senderismo"
+                "name": "Ruta de senderismo",
+                "terms": "Ruta de senderismo"
             },
             "type/route/pipeline": {
                 "name": "Ruta de tubería",
@@ -2625,10 +2806,12 @@
                 "name": "Ruta de carretera"
             },
             "type/route/train": {
-                "name": "Ruta del tren"
+                "name": "Ruta del tren",
+                "terms": "Ruta de tren, Línea de tren"
             },
             "type/route/tram": {
-                "name": "Ruta del tranvía"
+                "name": "Ruta del tranvía",
+                "terms": "Ruta de tranvía, Línea de tranvía"
             },
             "type/route_master": {
                 "name": "Ruta maestra"
@@ -2639,20 +2822,23 @@
             },
             "waterway": {
                 "name": "Vía fluvial",
-                "terms": "canal, cauce, acueducto, fluvial"
+                "terms": "canal, cauce, acueducto, fluvial, agua, río"
             },
             "waterway/canal": {
                 "name": "Canal",
                 "terms": "canaleta, canaleja, canalón, canalizo, caño, cañería, reguero, reguera, tubería, conducto, caz, cacera, zanja, acequia, cauce, cloaca, acueducto, canal"
             },
             "waterway/dam": {
-                "name": "Presa"
+                "name": "Presa",
+                "terms": "Presa, Dique"
             },
             "waterway/ditch": {
-                "name": "Acequia"
+                "name": "Acequia",
+                "terms": "Foso, Zanja, Hoyo, Cuneta"
             },
             "waterway/drain": {
-                "name": "Desagüe"
+                "name": "Desagüe",
+                "terms": "Desagüe, Sumidero"
             },
             "waterway/river": {
                 "name": "Río",
diff --git a/vendor/assets/iD/iD/locales/et.json b/vendor/assets/iD/iD/locales/et.json
index e4950ea8e..052adee25 100644
--- a/vendor/assets/iD/iD/locales/et.json
+++ b/vendor/assets/iD/iD/locales/et.json
@@ -139,6 +139,7 @@
         },
         "rotate": {
             "title": "Pööra",
+            "description": "Pööra objekti ümber tema keskpunkti.",
             "key": "R",
             "annotation": {
                 "line": "Pööratud joont.",
@@ -239,7 +240,6 @@
         "percent_brightness": "{opacity}% heledus",
         "none": "Puudub",
         "custom": "Kohandatud",
-        "custom_prompt": "Sisesta kohandatud tausta URL. Kasutatavad muutujad on {z}, {x}, {y} Z/X/Y skeemi jaoks ja {u} quadtile skeemi jaoks.",
         "fix_misalignment": "Korrigeeri nihet",
         "reset": "lähtesta"
     },
@@ -658,9 +658,6 @@
             "building/commercial": {
                 "name": "Ärihoone"
             },
-            "building/entrance": {
-                "name": "Sissepääs"
-            },
             "building/house": {
                 "name": "Maja"
             },
@@ -673,9 +670,6 @@
             "emergency/phone": {
                 "name": "Hädaabi telefon"
             },
-            "entrance": {
-                "name": "Sissepääs"
-            },
             "highway": {
                 "name": "Tee"
             },
@@ -703,9 +697,6 @@
             "highway/motorway": {
                 "name": "Kiirtee"
             },
-            "highway/motorway_junction": {
-                "name": "Kiirtee liiklussõlm"
-            },
             "highway/path": {
                 "name": "Rada"
             },
diff --git a/vendor/assets/iD/iD/locales/fa.json b/vendor/assets/iD/iD/locales/fa.json
index 4b0e3fddc..aea9e29eb 100644
--- a/vendor/assets/iD/iD/locales/fa.json
+++ b/vendor/assets/iD/iD/locales/fa.json
@@ -246,7 +246,7 @@
         "reference": "نمایش در ویکی  OpenStreetMap",
         "back_tooltip": "تغییر ویژگی",
         "remove": "پاک کردن",
-        "search": "جسنجو",
+        "search": "جستجو",
         "multiselect": "موارد انتخاب شدند",
         "unknown": "ناشناخته",
         "incomplete": "<دانلود نشده>",
@@ -264,7 +264,6 @@
         "percent_brightness": "{opacity}% روشنایی",
         "none": "هیچ",
         "custom": "سفارشی",
-        "custom_prompt": "قالب کاشی را وارد کنید. نشانه های مشخص  {z}, {x}, {y} هستند برای طرح  Z/X/Y و {u} برای طرح چهار کاشی.",
         "fix_misalignment": "تعمیر تراز",
         "reset": "باز نشاندن"
     },
@@ -1214,10 +1213,6 @@
                 "name": "ساختمان ارتباطی",
                 "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'ساختمان ارتباطی'، با کاما جدا میشوند>"
             },
-            "building/entrance": {
-                "name": "ورودی",
-                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای  'Entrance'، با کاما جدا میشوند>"
-            },
             "building/garage": {
                 "name": "گاراژ",
                 "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'گاراژ'، با کاما جدا میشوند>"
@@ -1310,9 +1305,6 @@
             "craft/photographer": {
                 "name": "عکاس"
             },
-            "craft/photographic_labratory": {
-                "name": "آزمایشگاه عکس برداری"
-            },
             "craft/plasterer": {
                 "name": "گچ کار"
             },
@@ -1383,10 +1375,6 @@
                 "name": "تلفن اورژانسی",
                 "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'تلفن اورژانسی'، با کاما جدا میشوند>"
             },
-            "entrance": {
-                "name": "درب ورودی",
-                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای  'Entrance'، با کاما جدا میشوند>"
-            },
             "footway/crossing": {
                 "name": "خط عابر پیاده"
             },
@@ -1453,10 +1441,6 @@
                 "name": "مسیر موتور سواری",
                 "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'راه وسایل موتوری'، با کاما جدا میشوند>"
             },
-            "highway/motorway_junction": {
-                "name": "محل اتصال جاده موتور سیکلت",
-                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'Motorway Junction'، با کاما جدا میشوند>"
-            },
             "highway/motorway_link": {
                 "name": "اتصال جاده موتور سیکلت",
                 "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'پیوستن جاده موتور'، با کاما جدا میشوند>"
@@ -1695,9 +1679,6 @@
             "leisure/slipway": {
                 "name": "قایق ساکن"
             },
-            "leisure/sports_center": {
-                "name": "مرکز ورزشی"
-            },
             "leisure/stadium": {
                 "name": "ورزشگاه"
             },
diff --git a/vendor/assets/iD/iD/locales/fi.json b/vendor/assets/iD/iD/locales/fi.json
index 9f426d768..2591f4275 100644
--- a/vendor/assets/iD/iD/locales/fi.json
+++ b/vendor/assets/iD/iD/locales/fi.json
@@ -71,7 +71,8 @@
                 "line": "Viiva pyöristettiin.",
                 "area": "Alue pyöristettiin."
             },
-            "not_closed": "Tätä ei voi tehdä ympyränmuotoiseksi, sillä sitä ei ole suljettu."
+            "not_closed": "Tätä ei voi tehdä ympyränmuotoiseksi, sillä sitä ei ole suljettu.",
+            "too_large": "Tätä ei voi pyöristää koska se ei ole tarpeeksi näkyvissä."
         },
         "orthogonalize": {
             "title": "Muuta suorakulmaiseksi",
@@ -84,7 +85,8 @@
                 "line": "Viiva muutettu suorakulmaiseksi.",
                 "area": "Alue muutettu suorakulmaiseksi."
             },
-            "not_squarish": "Nelikulmion tekeminen epäonnistui, koska se ei ole neliömäinen."
+            "not_squarish": "Nelikulmion tekeminen epäonnistui, koska se ei ole neliömäinen.",
+            "too_large": "Tätä ei voi tehdä suorakulmaiseksi, koska se ei ole tarpeeksi näkyvissä."
         },
         "straighten": {
             "title": "Suorista",
@@ -180,6 +182,18 @@
             },
             "not_eligible": "Viivoja ei voi jakaa alusta tai lopusta.",
             "multiple_ways": "Viivoja on liian monta jotta niitä voitaisiin jakaa osiin."
+        },
+        "restriction": {
+            "help": {
+                "select": "Valitse tienpätkä napsauttamalla.",
+                "toggle": "Muuta kääntymiskieltoja napsauttamalla.",
+                "toggle_on": "Lisää kääntymisrajoitus \"{restriction}\" napsauttamalla.",
+                "toggle_off": "Poista kääntymisrajoitus \"{restriction}\" napsauttamalla."
+            },
+            "annotation": {
+                "create": "Kääntymisrajoitus lisätty.",
+                "delete": "Kääntymisrajoitus poistettu."
+            }
         }
     },
     "undo": {
@@ -406,6 +420,9 @@
             "category-rail": {
                 "name": "Rautatie"
             },
+            "category-restriction": {
+                "name": "Rajoitus"
+            },
             "category-road": {
                 "name": "Tie"
             },
@@ -483,7 +500,7 @@
                 "placeholder": "500, 2500, 5000..."
             },
             "aerialway/duration": {
-                "label": "Kesto (minuuttia)",
+                "label": "Matka-aika (minuutteina)",
                 "placeholder": "1, 2, 3..."
             },
             "aerialway/heating": {
@@ -531,7 +548,7 @@
             },
             "capacity": {
                 "label": "Paikkamäärä",
-                "placeholder": "50, 100, 200..."
+                "placeholder": "5, 10, 20, 100..."
             },
             "cardinal_direction": {
                 "label": "Suunta"
@@ -570,6 +587,9 @@
             "description": {
                 "label": "Kuvaus"
             },
+            "electrified": {
+                "label": "Sähköistys"
+            },
             "elevation": {
                 "label": "Korkeus"
             },
@@ -579,6 +599,9 @@
             "entrance": {
                 "label": "Tyyppi"
             },
+            "except": {
+                "label": "Poikkeukset"
+            },
             "fax": {
                 "label": "Faksinumero",
                 "placeholder": "+358 40 123 4567"
@@ -592,6 +615,21 @@
             "fixme": {
                 "label": "Korjaa minut"
             },
+            "fuel/biodiesel": {
+                "label": "Biodiesel-myynti"
+            },
+            "fuel/diesel": {
+                "label": "Diesel-myynti"
+            },
+            "fuel/e10": {
+                "label": "E10-myynti"
+            },
+            "fuel/e85": {
+                "label": "E85-myynti"
+            },
+            "fuel/lpg": {
+                "label": "Propaanin myynti"
+            },
             "gauge": {
                 "label": "Raideväli"
             },
@@ -604,6 +642,14 @@
             "generator/type": {
                 "label": "Tyyppi"
             },
+            "golf_hole": {
+                "label": "Väylänumero",
+                "placeholder": "Väylänumero (1-18)"
+            },
+            "handicap": {
+                "label": "Tasoitussuositus (HCP)",
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "Tyyppi"
             },
@@ -619,6 +665,9 @@
             "incline": {
                 "label": "Kaltevuus"
             },
+            "information": {
+                "label": "Tyyppi"
+            },
             "internet_access": {
                 "label": "Internet-yhteys",
                 "options": {
@@ -640,6 +689,9 @@
             "leisure": {
                 "label": "Tyyppi"
             },
+            "length": {
+                "label": "Pituus (metreinä)"
+            },
             "levels": {
                 "label": "Kerrokset",
                 "placeholder": "2, 4, 6..."
@@ -665,7 +717,7 @@
                 "label": "Luonto"
             },
             "network": {
-                "label": "Verkko"
+                "label": "Verkosto"
             },
             "note": {
                 "label": "Huomautus"
@@ -685,6 +737,10 @@
             "operator": {
                 "label": "Toimija"
             },
+            "par": {
+                "label": "Lyöntimääräsuositus",
+                "placeholder": "3, 4, 5..."
+            },
             "park_ride": {
                 "label": "Autoparkki"
             },
@@ -707,12 +763,27 @@
             "place": {
                 "label": "Tyyppi"
             },
+            "population": {
+                "label": "Asukasmäärä"
+            },
             "power": {
                 "label": "Tyyppi"
             },
             "railway": {
                 "label": "Tyyppi"
             },
+            "recycling/cans": {
+                "label": "Tölkinkeräys"
+            },
+            "recycling/clothes": {
+                "label": "Vaatekeräys"
+            },
+            "recycling/glass": {
+                "label": "Lasinkeräys"
+            },
+            "recycling/paper": {
+                "label": "Paperinkeräys"
+            },
             "ref": {
                 "label": "Tie- tai linjanumero"
             },
@@ -734,6 +805,9 @@
             "restriction": {
                 "label": "Tyyppi"
             },
+            "restrictions": {
+                "label": "Kääntymisrajoitukset"
+            },
             "route": {
                 "label": "Tyyppi"
             },
@@ -752,11 +826,17 @@
             "shop": {
                 "label": "Tyyppi"
             },
+            "sloped_curb": {
+                "label": "Viistetty reunakivi"
+            },
+            "smoking": {
+                "label": "Tupakointi"
+            },
             "source": {
                 "label": "Lähde"
             },
             "sport": {
-                "label": "Urheilu"
+                "label": "Urheilulaji"
             },
             "structure": {
                 "label": "Rakenne",
@@ -777,6 +857,9 @@
             "surface": {
                 "label": "Päällyste"
             },
+            "tactile_paving": {
+                "label": "Huomioreuna näkövammaisille"
+            },
             "tourism": {
                 "label": "Tyyppi"
             },
@@ -808,6 +891,9 @@
             "wheelchair": {
                 "label": "Esteettömyys"
             },
+            "width": {
+                "label": "Leveys (metreinä)"
+            },
             "wikipedia": {
                 "label": "Wikipedia"
             },
@@ -824,7 +910,7 @@
                 "name": "Ilmarata"
             },
             "aerialway/cable_car": {
-                "name": "köysirata"
+                "name": "Köysirata"
             },
             "aerialway/chair_lift": {
                 "name": "Tuolihissi"
@@ -904,6 +990,10 @@
             "amenity/bar": {
                 "name": "Baari"
             },
+            "amenity/bbq": {
+                "name": "Grilli",
+                "terms": "grilli, grillaus, grillauspiste, grillauspaikka, grillipiste, grillauspaikka"
+            },
             "amenity/bench": {
                 "name": "Penkki",
                 "terms": "penkki, tuoli, istuin"
@@ -921,11 +1011,12 @@
                 "terms": "vene, laiva, paatti, jolla, veneenvuokraus, venevuokra, vuokra, venevuokraus, venevuokraamo, veneenvuokraamo"
             },
             "amenity/cafe": {
-                "name": "Kahvila"
+                "name": "Kahvila",
+                "terms": "Kahvila, Kahvitupa, Teehuone"
             },
             "amenity/car_rental": {
-                "name": "Auton vuokraus",
-                "terms": "autovuokraamo, autonvuokraus, auton vuokraus, auto, vuokra-auto"
+                "name": "Autonvuokraus",
+                "terms": "autovuokraamo, autonvuokraus, auton vuokraus, auto, vuokra-auto, auton vuokraaminen, vuokraaminen"
             },
             "amenity/car_sharing": {
                 "name": "Kimppakyyti"
@@ -934,6 +1025,10 @@
                 "name": "Autopesula",
                 "terms": "autopesu, automaattipesu, pesula, pesukone, pesuhalli, auto, autot"
             },
+            "amenity/charging_station": {
+                "name": "Latauspiste",
+                "terms": "sähköauto, sähkönlataus, sähköpiste, latauspiste, lataaminen, lataus"
+            },
             "amenity/childcare": {
                 "name": "Esikoulu",
                 "terms": "esikoulu, eskari, leikkikoulu"
@@ -988,7 +1083,12 @@
                 "terms": "hautausmaa, kalmisto, luutarha"
             },
             "amenity/hospital": {
-                "name": "Sairaala-alue"
+                "name": "Sairaala-alue",
+                "terms": "Sairaala-alue"
+            },
+            "amenity/kindergarten": {
+                "name": "Päiväkotialue",
+                "terms": "päiväkoti, piha, ulkoilualue, lastentarha"
             },
             "amenity/library": {
                 "name": "Kirjasto",
@@ -997,6 +1097,9 @@
             "amenity/marketplace": {
                 "name": "Tori"
             },
+            "amenity/nightclub": {
+                "name": "Yökerho"
+            },
             "amenity/parking": {
                 "name": "Autopysäköinti",
                 "terms": "auto, parkki, parkkihalli, pysäköintialue, pysäköinti, parkki, parkkipaikka, pysäköintialue, parkkialue"
@@ -1006,22 +1109,27 @@
                 "terms": "apteekki, lääke, lääkkeet, lääkemyymälä, lääkkeenmyynti, farmasia, farmaseutti"
             },
             "amenity/place_of_worship": {
-                "name": "Rukoilupaikka"
+                "name": "Rukoilupaikka",
+                "terms": "Uskonnollinen rakennus, Kirkkorakennus"
             },
             "amenity/place_of_worship/buddhist": {
                 "name": "Buddhalaistemppeli"
             },
             "amenity/place_of_worship/christian": {
-                "name": "Kirkko"
+                "name": "Kirkko",
+                "terms": "Kirkko, Pyhäkkö, Rukoushuone, Stupa, Tsasouna, Moskeija, Temppeli"
             },
             "amenity/place_of_worship/jewish": {
-                "name": "Synagoga"
+                "name": "Synagoga",
+                "terms": "Synagooga"
             },
             "amenity/place_of_worship/muslim": {
-                "name": "Moskeija"
+                "name": "Moskeija",
+                "terms": "Moskeija"
             },
             "amenity/police": {
-                "name": "Poliisiasema"
+                "name": "Poliisiasema",
+                "terms": "Poliisi, Poliisiasema"
             },
             "amenity/post_box": {
                 "name": "Postilaatikko",
@@ -1039,16 +1147,26 @@
                 "terms": "kierrättäminen, kierrätys, lajittelu, uudelleenkäyttö, uudelleenkäyttäminen, ympäristö, lajittelupiste, lajitteluasema, jäte, jätteet, roskat, roska, roskikset, roskis, säiliö, roskasäiliö"
             },
             "amenity/restaurant": {
-                "name": "Ravintola"
+                "name": "Ravintola",
+                "terms": "Ravintola, Ruokaravintola, Bistro, Krouvi, Pizzeria, Ruokala"
+            },
+            "amenity/school": {
+                "name": "Koulualue",
+                "terms": "koulu, koulutus, ala-aste, koulualue, alue, koulupiha, piha, välitunti, välituntialue"
             },
             "amenity/shelter": {
                 "name": "Katos"
             },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Kodittomien turvakoti",
+                "terms": "koditon, kodittomia, turvatalo, kodittomien"
+            },
             "amenity/studio": {
                 "name": "Studio"
             },
             "amenity/swimming_pool": {
-                "name": "Uima-allas"
+                "name": "Uima-allas",
+                "terms": "uimahalli, uintikeskus, uimastadion, uima-allas, uinti, uiminen"
             },
             "amenity/taxi": {
                 "name": "Taksitolppa",
@@ -1056,10 +1174,11 @@
             },
             "amenity/telephone": {
                 "name": "Yleinen puhelin",
-                "terms": "puhelinkoppi, puhelin, puhelinkioski, yleinen puhelin, julkinen puhelin"
+                "terms": "puhelinkoppi, puhelin, puhelinkioski, julkinen puhelin"
             },
             "amenity/theatre": {
-                "name": "Teatteri"
+                "name": "Teatteri",
+                "terms": "Teatteri, Kaupunginteatteri, Kansallisteatteri"
             },
             "amenity/toilets": {
                 "name": "WC"
@@ -1072,6 +1191,10 @@
                 "name": "Korkeakoulu",
                 "terms": "yliopisto, korkeakoulu, college, ammattikorkeakoulu, amk"
             },
+            "amenity/vending_machine": {
+                "name": "Myyntiautomaatti",
+                "terms": "välipalamaatti, välipala-automaatti, välipala, ruokamaatti, ruoka-automaatti, juoma, juomia, juomamaatti, kahvikone, kahviautomaatti, kahvi, automaatti, myyntilaite, myyntipiste"
+            },
             "amenity/veterinary": {
                 "name": "Eläinlääkäri"
             },
@@ -1142,16 +1265,36 @@
             "building/apartments": {
                 "name": "Kerrostalo"
             },
+            "building/barn": {
+                "name": "Lato"
+            },
+            "building/church": {
+                "name": "Kirkko"
+            },
             "building/commercial": {
                 "name": "Kaupallinen rakennus"
             },
+            "building/construction": {
+                "name": "Keskeneräinen rakennus",
+                "terms": "rakennus, rakennustyömaa, rakenteilla"
+            },
             "building/entrance": {
-                "name": "Sisäänkäynti"
+                "name": "Sisään- tai uloskäynti"
             },
             "building/garage": {
                 "name": "Autotalli",
                 "terms": "autotalli, autonsäilytys, autohalli, autovarasto, auto"
             },
+            "building/garages": {
+                "name": "Suuri autotalli",
+                "terms": "ryhmäautotalli, joukkoautotalli, joukkotalli, ryhmätalli, autotalli"
+            },
+            "building/hospital": {
+                "name": "Sairaalarakennus"
+            },
+            "building/hotel": {
+                "name": "Hotellirakennus"
+            },
             "building/house": {
                 "name": "Omakotitalo",
                 "terms": "omakotitalo, omakoti, yksityisasunto, yksityistalo, talo, asunto"
@@ -1163,12 +1306,44 @@
             "building/industrial": {
                 "name": "Teollisuusrakennus"
             },
+            "building/public": {
+                "name": "Julkinen rakennus"
+            },
             "building/residential": {
                 "name": "Asuinrakennus"
             },
+            "building/retail": {
+                "name": "Liikerakennus"
+            },
+            "building/roof": {
+                "name": "Seinätön rakennus",
+                "terms": "katos, katettu, seinätön, rakennus"
+            },
+            "building/school": {
+                "name": "Koulurakennus"
+            },
+            "building/shed": {
+                "name": "Vaja",
+                "terms": "vaja, mökki, liiteri"
+            },
+            "building/stable": {
+                "name": "Talli",
+                "terms": "hevonen, hevostalli, hevoset, ratsastus, ratsastaminen, hevoskoti"
+            },
             "building/terrace": {
                 "name": "Rivitalo"
             },
+            "building/train_station": {
+                "name": "Rautatieasema",
+                "terms": "junasema, juna, VR, rautatie, rautatieasema"
+            },
+            "building/university": {
+                "name": "Yliopistorakennus",
+                "terms": "yliopisto, yliopiston, rakennus, korkeakoulu"
+            },
+            "building/warehouse": {
+                "name": "Varasto"
+            },
             "craft/basket_maker": {
                 "name": "Koripaja",
                 "terms": "kori, paju, pajukori, korivalmistaja, koripaja"
@@ -1177,13 +1352,13 @@
                 "name": "Mehiläistarha"
             },
             "craft/blacksmith": {
-                "name": "seppä"
+                "name": "Rautaseppä"
             },
             "craft/boatbuilder": {
                 "name": "veneentekijä"
             },
             "craft/bookbinder": {
-                "name": "Kirjansitomo"
+                "name": "Kirjasitomo"
             },
             "craft/brewery": {
                 "name": "panimo"
@@ -1227,14 +1402,14 @@
                 "terms": "eriste, eristeet, eristesuunnittelija, eristesuunnittelu, eristeliike"
             },
             "craft/jeweler": {
-                "name": "kultaseppä"
+                "name": "Kultaseppä"
             },
             "craft/key_cutter": {
                 "name": "Lukkoseppä",
                 "terms": "avain, lukko, avaimet, lukot, lukkoseppä, lukkoliike, avainliike, avainseppä"
             },
             "craft/locksmith": {
-                "name": "lukkoseppä"
+                "name": "Lukkoseppä"
             },
             "craft/metal_construction": {
                 "name": "metallirakennelma"
@@ -1242,14 +1417,14 @@
             "craft/optician": {
                 "name": "optikko"
             },
+            "craft/painter": {
+                "name": "Maalari"
+            },
             "craft/photographer": {
                 "name": "valokuvaaja"
             },
-            "craft/photographic_labratory": {
-                "name": "Valokuvakehittämö"
-            },
             "craft/plasterer": {
-                "name": "rappaaja"
+                "name": "Rappaaja"
             },
             "craft/plumber": {
                 "name": "putkiasentaja"
@@ -1264,7 +1439,7 @@
                 "name": "Kattoseppä"
             },
             "craft/saddler": {
-                "name": "satulaseppä"
+                "name": "Satulaseppä"
             },
             "craft/sailmaker": {
                 "name": "purjeentekijä"
@@ -1280,7 +1455,7 @@
                 "name": "Kuvanveistämö"
             },
             "craft/shoemaker": {
-                "name": "suutari"
+                "name": "Suutari"
             },
             "craft/stonemason": {
                 "name": "Kivenhakkaamo"
@@ -1289,7 +1464,7 @@
                 "name": "Nuohooja"
             },
             "craft/tailor": {
-                "name": "räätäli"
+                "name": "Räätäli"
             },
             "craft/tiler": {
                 "name": "laatoittaja"
@@ -1304,6 +1479,9 @@
             "craft/watchmaker": {
                 "name": "Rannekelloseppä"
             },
+            "craft/window_construction": {
+                "name": "Ikkunankorjaus"
+            },
             "emergency/ambulance_station": {
                 "name": "Ambulanssiasema",
                 "terms": "ambulanssi, ambulanssit, hälytysajoneuvo, ambulanssihalli, ambulanssivarasto, ambulanssitalli, hälytysajoneuvohalli, hälytysajoneuvotalli, hälytysajoneuvovarasto"
@@ -1317,7 +1495,7 @@
                 "terms": "hätänumero, hätäpuhelin, hätätilanne, poikkeuspuhelin, hätäkeskus, hätäilmoitus"
             },
             "entrance": {
-                "name": "Sisäänkäynti"
+                "name": "Sisään- tai uloskäynti"
             },
             "footway/crossing": {
                 "name": "Suojatieväylä"
@@ -1339,7 +1517,7 @@
                 "terms": "puttigreeni, puttigriini, viheriöalue, golf, maali, maalipaikka, golf-reikä, puttausalue, putti"
             },
             "golf/hole": {
-                "name": "golf-reikä"
+                "name": "Golf-reikä"
             },
             "golf/lateral_water_hazard": {
                 "name": "Sivuvesieste"
@@ -1372,7 +1550,8 @@
                 "name": "Pyörätie"
             },
             "highway/footway": {
-                "name": "Jalkakäytävä"
+                "name": "Jalkakäytävä",
+                "terms": "Polku"
             },
             "highway/living_street": {
                 "name": "Pihakatu"
@@ -1385,7 +1564,8 @@
                 "name": "Moottoritie"
             },
             "highway/motorway_junction": {
-                "name": "Moottoritien liittymä"
+                "name": "Moottoritien liittymä",
+                "terms": "ramppi, eritasoliittymä, monitasoliittymä, moottoritie, poistumisliittymä, poistumisramppi"
             },
             "highway/motorway_link": {
                 "name": "Moottoritien ramppi"
@@ -1439,7 +1619,12 @@
                 "name": "Huoltoalue"
             },
             "highway/steps": {
-                "name": "Portaat"
+                "name": "Portaat",
+                "terms": "Portaat, Rappuset, Portaikko, Kierreportaat, Tikapuut"
+            },
+            "highway/stop": {
+                "name": "Pakollinen pysähtyminen",
+                "terms": "stop, stop-merkki, stop merkki, liikennemerkki, kieltomerkki, kieltomerkit, pysähtyminen, pysähdys, liikennesääntö, liikennesäännöt, pakollisuus, pakollinen"
             },
             "highway/tertiary": {
                 "name": "Yhdystie"
@@ -1491,7 +1676,8 @@
                 "name": "Tienvarren risti"
             },
             "historic/wayside_shrine": {
-                "name": "Tienvarren alttari"
+                "name": "Tienvarsialttari",
+                "terms": "tienvarsi, kadunvarsi, varsi, tie, katu, rukoilupaikka, pyhättö, uskonnot, uskonto, kirkko, pyhä, uhripaikka, uhrauspaikka, uhrilahja"
             },
             "landuse": {
                 "name": "Maankäyttö"
@@ -1557,11 +1743,16 @@
             "leisure/golf_course": {
                 "name": "Golfkenttä"
             },
+            "leisure/ice_rink": {
+                "name": "Luistelukenttä",
+                "terms": "jää, jääkenttä, jääalue, kaukalo, jääkiekko, luistelu, jääkiekkokaukalo, luistimet, luistinrata, luistelurata"
+            },
             "leisure/marina": {
                 "name": "Venesatama"
             },
             "leisure/park": {
-                "name": "Puisto"
+                "name": "Puisto",
+                "terms": "Puisto, Viheralue, Puistikko"
             },
             "leisure/pitch": {
                 "name": "Urheilukenttä"
@@ -1580,7 +1771,8 @@
                 "terms": "skeittipuisto, skeittaus, skeitti, rullalautailu, rullalauta, rullalautailupuisto, parkit, parkki, skeittiparkki, skeittiparkit"
             },
             "leisure/pitch/soccer": {
-                "name": "Jalkapallokenttä"
+                "name": "Jalkapallokenttä",
+                "terms": "jalkapallo, urheilu, liikunta, kenttä, areena, futis"
             },
             "leisure/pitch/tennis": {
                 "name": "Tenniskenttä"
@@ -1589,7 +1781,8 @@
                 "name": "Lentopallokenttä"
             },
             "leisure/playground": {
-                "name": "Leikkipuisto"
+                "name": "Leikkipuisto",
+                "terms": "leikkipuisto, leikkipaikka, leikki, leikkiä, lapsipuisto, leikkipiste"
             },
             "leisure/slipway": {
                 "name": "Veneramppi",
@@ -1616,6 +1809,14 @@
             "man_made/cutline": {
                 "name": "Leikkaa viiva"
             },
+            "man_made/embankment": {
+                "name": "Penkere",
+                "terms": "pengerrys, tienreuna, meluvalli, äänivalli, äänimuuri, melumuuri"
+            },
+            "man_made/flagpole": {
+                "name": "Lipputank",
+                "terms": "lippu, liputus, salko, lippusalko, tanko, tolppa, lipputolppa, liputuspäivä, liputtaa"
+            },
             "man_made/lighthouse": {
                 "name": "Majakka"
             },
@@ -1653,6 +1854,10 @@
             "military/bunker": {
                 "name": "Bunkkeri"
             },
+            "military/range": {
+                "name": "Sotilasalue",
+                "terms": "varuskunta, sotilas, armeija, sota, sodankäynti"
+            },
             "natural": {
                 "name": "Luonto"
             },
@@ -1666,7 +1871,11 @@
                 "name": "Kallionjyrkänne"
             },
             "natural/coastline": {
-                "name": "Rannikko"
+                "name": "Rannikko",
+                "terms": "Rantaviiva"
+            },
+            "natural/fell": {
+                "name": "Tunturi"
             },
             "natural/glacier": {
                 "name": "Jäätikkö"
@@ -1678,7 +1887,8 @@
                 "name": "Nummi"
             },
             "natural/peak": {
-                "name": "Vuorenhuippu"
+                "name": "Vuorenhuippu",
+                "terms": "Huippu, Vuorenhuippu, Korkein kohta, Vuoren huippu"
             },
             "natural/scrub": {
                 "name": "Pensaikko"
@@ -1693,10 +1903,12 @@
                 "name": "Vesi"
             },
             "natural/water/lake": {
-                "name": "Järvi"
+                "name": "Järvi",
+                "terms": "Järvi, Vesistö"
             },
             "natural/water/pond": {
-                "name": "Lampi"
+                "name": "Lampi",
+                "terms": "Lampi, Lammikko, Lampare, Luoma"
             },
             "natural/water/reservoir": {
                 "name": "Tekojärvi"
@@ -1710,10 +1922,34 @@
             "office": {
                 "name": "Toimisto"
             },
+            "office/accountant": {
+                "name": "Tilintarkastustoimisto",
+                "terms": "tilintarkastus, tilintarkastaja, kirjanpito, kirjanpitäjä, kirjanpitotoimisto"
+            },
+            "office/architect": {
+                "name": "Arkkitehtitoimisto"
+            },
+            "office/company": {
+                "name": "Yritystoimisto"
+            },
             "office/educational_institution": {
                 "name": "Oppilatos",
                 "terms": "koulu, alakoulu, ala-aste, yläaste, yläkoulu, lukio, yhteislukio, keskikoulu, koulutus, opiskelu, oppilaitos, yliopisto"
             },
+            "office/employment_agency": {
+                "name": "Työnvälitystoimisto",
+                "terms": "työ, työvoimatoimisto, työnvälitys, työnvälittäjä, työpaikka, työpaikat"
+            },
+            "office/financial": {
+                "name": "Taloustoimisto"
+            },
+            "office/government": {
+                "name": "Hallinnon toimisto"
+            },
+            "office/insurance": {
+                "name": "Vakuutustoimisto",
+                "terms": "vakuutus, vakuutusyhtiö, vakuutukset, vakuutuksia"
+            },
             "office/it": {
                 "name": "Tietotekniikkatoimisto",
                 "terms": "tietotalo, tietotekniikka, teknologia, tietoteknologia, IT-talo, IT-teknologia, IT-tekniikka, teknologiatalo"
@@ -1750,7 +1986,8 @@
                 "name": "Pikkukylä"
             },
             "place/island": {
-                "name": "Saari"
+                "name": "Saari",
+                "terms": "Saari, Saareke, Luoto"
             },
             "place/isolated_dwelling": {
                 "name": "Yksittäinen asunto"
@@ -1758,6 +1995,12 @@
             "place/locality": {
                 "name": "Paikkakunta"
             },
+            "place/neighbourhood": {
+                "name": "Asuinalue"
+            },
+            "place/suburb": {
+                "name": "Kaupunginosa"
+            },
             "place/town": {
                 "name": "Pieni kaupunki",
                 "terms": "kunta, pienkaupunki, pieni kaupunki, keskikokoinen kaupunki"
@@ -1771,6 +2014,9 @@
             "power": {
                 "name": "Sähkö"
             },
+            "power/generator": {
+                "name": "Generaattori"
+            },
             "power/line": {
                 "name": "Voimalinja"
             },
@@ -1790,6 +2036,10 @@
             "power/transformer": {
                 "name": "Muuntaja"
             },
+            "public_transport/platform": {
+                "name": "Laiturialue",
+                "terms": "pysäkki, asema, pysäkkilaituri, laituri, odotus, odotusalue, odotuslaituri, odottaminen, katos, asemalaituri, asema"
+            },
             "railway": {
                 "name": "Rautatie"
             },
@@ -1802,6 +2052,10 @@
             "railway/funicular": {
                 "name": "funikulaari"
             },
+            "railway/halt": {
+                "name": "Seisake",
+                "terms": "rautatie, juna, junarata, pysäkki, asema, rautatieasema, VR"
+            },
             "railway/level_crossing": {
                 "name": "Tasoristeys"
             },
@@ -1812,7 +2066,8 @@
                 "name": "Kapearaiteinen rautatie"
             },
             "railway/platform": {
-                "name": "Rautatielaituri"
+                "name": "Rautatielaituri",
+                "terms": "junalaituri, juna, rautatie, VR, asemalaituri, odotusalue, odotuslaituri"
             },
             "railway/rail": {
                 "name": "Rata"
@@ -1841,6 +2096,10 @@
             "shop/alcohol": {
                 "name": "Alkoholimyymälä"
             },
+            "shop/art": {
+                "name": "Taideliike",
+                "terms": "maalaus, taide, yritys, kauppa, liike, putiikki, antiikki, veistos, maalaaminen"
+            },
             "shop/bakery": {
                 "name": "Leipomo"
             },
@@ -1913,6 +2172,10 @@
             "shop/florist": {
                 "name": "Kukkakauppa"
             },
+            "shop/funeral_directors": {
+                "name": "Hautaustoimisto",
+                "terms": "hautajaiset, hautajaistoimisto, toimisto, vainaja"
+            },
             "shop/furniture": {
                 "name": "Huonekaluliike"
             },
@@ -1945,6 +2208,14 @@
             "shop/laundry": {
                 "name": "Pesula"
             },
+            "shop/locksmith": {
+                "name": "Lukkoliike",
+                "terms": "lukkoseppä, lukko, lukot, hälytys, valvonta, hälytin, hälyttimet, lukonavaus"
+            },
+            "shop/lottery": {
+                "name": "Veikkauspiste",
+                "terms": "lotto, veikkaus, vedonlyönti, lyödä vetoa, jokeri"
+            },
             "shop/mall": {
                 "name": "Kauppakeskus",
                 "terms": "kauppakeskus, ostoskeskus, kauppakeskittymä"
@@ -2004,6 +2275,9 @@
             "shop/video": {
                 "name": "Videovuokraamo"
             },
+            "shop/wine": {
+                "name": "Viinikauppa"
+            },
             "tourism": {
                 "name": "Turismi"
             },
@@ -2070,6 +2344,27 @@
             "type/restriction": {
                 "name": "Rajoitus"
             },
+            "type/restriction/no_left_turn": {
+                "name": "Ei saa kääntyä vasemmalle"
+            },
+            "type/restriction/no_right_turn": {
+                "name": "Ei saa kääntyä oikealle"
+            },
+            "type/restriction/no_straight_on": {
+                "name": "Ei saa ajaa suoraan"
+            },
+            "type/restriction/no_u_turn": {
+                "name": "Ei saa tehdä U-käännöstä"
+            },
+            "type/restriction/only_left_turn": {
+                "name": "Saa kääntyä vain vasemmalle"
+            },
+            "type/restriction/only_right_turn": {
+                "name": "Saa kääntyä vain oikealle"
+            },
+            "type/restriction/only_straight_on": {
+                "name": "Ei saa kääntyä lainkaan"
+            },
             "type/route": {
                 "name": "Reitti"
             },
@@ -2089,6 +2384,9 @@
             "type/route/foot": {
                 "name": "Kävelyreitti"
             },
+            "type/route/hiking": {
+                "name": "Vaellusreitti"
+            },
             "type/route/pipeline": {
                 "name": "Putkilinja"
             },
diff --git a/vendor/assets/iD/iD/locales/fil.json b/vendor/assets/iD/iD/locales/fil.json
new file mode 100644
index 000000000..771db0443
--- /dev/null
+++ b/vendor/assets/iD/iD/locales/fil.json
@@ -0,0 +1,494 @@
+{
+    "modes": {
+        "add_area": {
+            "title": "Area o poligon",
+            "description": "Magdagdag ng mga parke, mga gusali, lawa o iba pang mga \"area\" sa mapa.",
+            "tail": "Mag-click sa mapa upang simulan ang pagguhit ng isang lugar, tulad ng isang parke, lawa, o gusali."
+        },
+        "add_line": {
+            "title": "Linya o guhit",
+            "description": "Magdagdag ng mga kalsada o kalye, mga daanang pantao, kanal o iba pang mga linya sa mapa.",
+            "tail": "Mag-click sa mapa upang simulan ang pagguhit ng isang linya tulad ng kalsada, daanang pantao, o ruta."
+        },
+        "add_point": {
+            "title": "Punto o tuldok",
+            "description": "Magdagdag ng kainan, monumento, \"postbox\" o iba pang mga punto o tuldok sa mapa.",
+            "tail": "Mag-click sa mapa upang magdagdag ng isang punto o tuldok."
+        },
+        "browse": {
+            "title": "Mag-browse",
+            "description": "I-pan at i-zoom ang mapa."
+        },
+        "draw_area": {
+            "tail": "I-click upang magdagdag ng mga node sa iyong polygon o area. I-click ang unang node upang isarado ang polygon o area."
+        },
+        "draw_line": {
+            "tail": "I-click upang magdagdag ng higit pang mga node sa linya. Mag-click sa iba pang mga linya upang kumonekta sa kanila, at i-double click upang tapusin ang linya."
+        }
+    },
+    "operations": {
+        "add": {
+            "annotation": {
+                "point": "Idinagdag ng isang punto o tuldok.",
+                "vertex": "Nagdagdag ng node sa isang way.",
+                "relation": "Nagdagdag ng relation."
+            }
+        },
+        "start": {
+            "annotation": {
+                "line": "Nagsimula ng isang linya.",
+                "area": "Nagsimula sa isang area o polygon."
+            }
+        },
+        "continue": {
+            "key": "S",
+            "title": "Ipagpatuloy",
+            "description": "Ipagpatuloy ang linyang ito.",
+            "not_eligible": "Walang linyang maaring ipagpatuloy dito.",
+            "annotation": {
+                "line": "Karugtong ng isang linya.",
+                "area": "Nagpatuloy sa pagguhit ng area o poligon."
+            }
+        },
+        "cancel_draw": {
+            "annotation": "Kinansela ang pagguhit."
+        },
+        "change_tags": {
+            "annotation": "Pinalitan ang mga tag."
+        },
+        "circularize": {
+            "title": "Pina-bilog",
+            "description": {
+                "line": "Gawin pabilog ang linyang ito.",
+                "area": "Gawin pabilog ang area o poligong ito."
+            },
+            "key": "O",
+            "annotation": {
+                "line": "Ginawang pabilog and isang linya.",
+                "area": "Ginawang pabilog and isang area o poligon."
+            },
+            "not_closed": "Hindi ito maaaring gawing pabilog dahil hindi ito isang \"loop\".",
+            "too_large": "Hindi na ito maaaring gawing pabilog dahil hindi sapat ang kasalukuyang nakikita sa mapa."
+        },
+        "orthogonalize": {
+            "title": "Iskawalado",
+            "description": {
+                "line": "Gawing iskwalado ang mga kanto ng linyang ito.",
+                "area": "Gawing iskwalado ang mga kanto ng area o poligong ito."
+            },
+            "key": "S",
+            "annotation": {
+                "line": "Ginawang iskawalado ang bawat kanto ng linya.",
+                "area": "Ginawang iskawalado ang bawat kanto ng area o poligon."
+            },
+            "not_squarish": "Hindi maaring gawing iskwalado.",
+            "too_large": "Hindi ito maaaring gawing iskuwalado dahil hindi sapat ang kasalukuyang nakikita sa mapa."
+        },
+        "straighten": {
+            "title": "Ituwid",
+            "description": "Ituwid ang linyang ito.",
+            "key": "S",
+            "annotation": "Naituwid ang linya.",
+            "too_bendy": "Hindi naituwid dahil masyadong kurbado."
+        },
+        "delete": {
+            "title": "Burahin",
+            "description": "Burahin ito sa mapa.",
+            "annotation": {
+                "point": "Binura ang isang point o tuldok.",
+                "vertex": "Binura ang isang node mula sa way o linya.",
+                "line": "Binura ang isang linya.",
+                "area": "Binura ang isang area o poligon.",
+                "relation": "Binura ang isang \"relation\".",
+                "multiple": "Binura ang {n} bagay sa mapa."
+            }
+        },
+        "add_member": {
+            "annotation": "Dinagdag ang kasapi o miyembro ng relation."
+        },
+        "delete_member": {
+            "annotation": "Inalis ang kasapi o miyembro ng relation."
+        },
+        "connect": {
+            "annotation": {
+                "point": "Dinugtong ang isang \"way\" sa isang punto o tuldok.",
+                "vertex": "Dinugtong ang isang \"way\" sa isa pang \"way\".",
+                "line": "Dinugtong ang isang \"way\" sa isang linya.",
+                "area": "Dinugtong ang isang \"way\" sa isang area o poligon."
+            }
+        },
+        "disconnect": {
+            "title": "Alisin ang pagkakadugtong",
+            "description": "Alisin sa pagkakadugtong ang mga linya / poligon.",
+            "key": "D",
+            "annotation": "Naalis sa pagkakadugtong ang mga linya / poligon."
+        },
+        "merge": {
+            "title": "Pagsamahin",
+            "description": "Pagdugtungin ang mga linyang ito.",
+            "key": "C",
+            "annotation": "Dinugtung ang {n} linya.",
+            "not_eligible": "Ang mga bagay na ito ay hindi maaaring pagsamahin.",
+            "not_adjacent": "Hindi mapagsama ang linyang ito dahil sila ay hindi konektado.",
+            "incomplete_relation": "Hindi maaaring ipagsama o i-merge dahil ang isa sa mga ito ay hindi pa ganap na nai-download."
+        },
+        "move": {
+            "title": "Ilipat ng posisyon",
+            "description": "Ilipat ang posisyon.",
+            "key": "M",
+            "annotation": {
+                "point": "Inilipat ang posisyon ng isang punto o tuldok.",
+                "vertex": "Inilipat ang posisyon ng isang \"node\" na sa isang \"way\".",
+                "line": "Inilipat ang posisyon ng isang linya.",
+                "area": "Inilipat ang posisyon ng isang area o poligon.",
+                "multiple": "Inilipat ang posisyon ang maraming bagay."
+            }
+        },
+        "rotate": {
+            "title": "Paikutin",
+            "description": "Paikutin ang bagay na ito mula sa kanyang \"center point\".",
+            "key": "R",
+            "annotation": {
+                "line": "Pinaikot ang linya.",
+                "area": "Pinaikot ang area o poligon."
+            }
+        },
+        "reverse": {
+            "title": "Baliktarin",
+            "description": "Baliktarin ang direksyon ng linyang ito.",
+            "key": "V",
+            "annotation": "Binaliktad ang direksyon ng linya."
+        },
+        "split": {
+            "title": "Hatiin",
+            "description": {
+                "line": "Hatiin sa dalawa ang linya mula sa node na ito.",
+                "area": "Hatiin ang hangganan ng lugar na ito sa dalawa."
+            },
+            "key": "X",
+            "annotation": {
+                "line": "Hattin ang linya.",
+                "area": "Hatiin ang hangganan ng area o poligon.",
+                "multiple": "Hattin ang {n} linya/area o poligon."
+            },
+            "not_eligible": "Hindi maaaring hatiin ang linya mula sa umpisa o dulong \"node\" nito."
+        }
+    },
+    "undo": {
+        "tooltip": "I-undo:{action}",
+        "nothing": "Walang ma-undo"
+    },
+    "redo": {
+        "tooltip": "i-redo: {action}",
+        "nothing": "Walang ma-redo."
+    },
+    "browser_notice": "Ang editor na ito ay suportado sa Firefox, Chrome, Safari, Opera, at Internet Explorer 9 at sa mas mataas pang bersion. I-upgrade ang inyong browser o gamitin Potlatch 2 upang i-edit ng mapa.",
+    "translate": {
+        "localized_translation_language": "Pumili ng wika",
+        "localized_translation_name": "Pangalan"
+    },
+    "zoom_in_edit": "Mag-zoom in para makapag-edit",
+    "logout": "Mag-logout",
+    "loading_auth": "Kumokonekta sa OpenStreetMap ...",
+    "report_a_bug": "I-ulat ang bug",
+    "status": {
+        "error": "Hindi maka-konekta sa API."
+    },
+    "commit": {
+        "title": "I-save ang mga binago.",
+        "description_placeholder": "Maikling paglalarawan ng iyong mga ambag o edits",
+        "message_label": "Mag-commit mensahe",
+        "upload_explanation": "Ang mga pagbabagong na-upload ay makikita sa lahat ng mapang gumagamit ng datos ng OpenStreetMap.",
+        "save": "I-save",
+        "cancel": "Kanselahin",
+        "warnings": "Mga babala",
+        "modified": "Binago",
+        "deleted": "Binura",
+        "created": "Nilikha"
+    },
+    "contributors": {
+        "list": "Edits nina {users}",
+        "truncated_list": "Edits nina {users} at {count} iba pa"
+    },
+    "geocoder": {
+        "search": "Maghanap sa buong mundo ...",
+        "no_results_visible": "Walang mga resulta sa kasalukuyang lugar sa mapa",
+        "no_results_worldwide": "Walang mga resultang natagpuan"
+    },
+    "geolocate": {
+        "title": "Ipakita ang kasalukuyang lokasyon."
+    },
+    "inspector": {
+        "no_documentation_combination": "Walang documentation para sa kumbinasyon ng mga tag na ginamit",
+        "no_documentation_key": "Walang \"documentation\" na magagamit para sa \"key\" na ito.",
+        "show_more": "Higit pang detalye",
+        "view_on_osm": "Tingnan sa openstreetmap.org",
+        "all_tags": "Lahat ng tags",
+        "all_members": "Lahat ng kasapi",
+        "all_relations": "Lahat ng \"relation\"",
+        "new_relation": "Bagong relation ...",
+        "choose": "Pumili ng uri ng \"features\"",
+        "results": "{n} mga resulta para sa {search}",
+        "reference": "Tingnan sa OpenStreetMap Wiki",
+        "back_tooltip": "Baguhin ang \"feature\"",
+        "remove": "Alisin",
+        "search": "Mag-search",
+        "feature_list": "Mag-hanap ng \"feature\"",
+        "edit": "I-edit ang \"feature\"",
+        "none": "Wala",
+        "node": "Node",
+        "way": "Way",
+        "relation": "Relation",
+        "location": "Lokasyon"
+    },
+    "background": {
+        "title": "\"Background\" o \"imagery\"",
+        "description": "Mga setting ng \"background\" o \"imagery\"",
+        "percent_brightness": "{opacity}% Pagkalinaw",
+        "none": "Wala",
+        "custom": "Custom",
+        "fix_misalignment": "Ayusin ang pagkakahanay ng \"imagery\"",
+        "reset": "I-reset"
+    },
+    "restore": {
+        "heading": "Mayroon kang hindi na-save ng mga pagbabago",
+        "description": "Ibig mo bang ibalik ang mga hindi na-save na pagbabago mula sa isang nakaraang session sa pag-edit?",
+        "restore": "Ibalik",
+        "reset": "I-reset"
+    },
+    "save": {
+        "title": "I-save",
+        "help": "I-save ang mga pagbabago sa OpenStreetMap upang makita ng ibang gumagamit ng datos.",
+        "no_changes": "Walang mga pagbabago upang i-save.",
+        "error": "May error habang sinusubukang i-save",
+        "uploading": "Ina-upload ang mga pagbabago sa OpenStreetMap.",
+        "unsaved_changes": "Mayroon kang hindi na-save ng mga pagbabago"
+    },
+    "success": {
+        "edited_osm": "Nag-edit sa OSM!",
+        "view_on_osm": "Tingnan sa OSM",
+        "facebook": "I-share sa Facebook",
+        "twitter": "I-share sa Twitter",
+        "google": "I-share sa Google+"
+    },
+    "confirm": {
+        "okay": "Okay"
+    },
+    "splash": {
+        "welcome": "Maligayang pagdating sa iD OpenStreetMap editor",
+        "text": "Ang iD ay isang simple ngunit magandang editor para sa pag-edit ng libreng mapa ng buong mundo.  Ito ay bersyon {version}. Para sa karagdagang impormasyon tingnan ang {website} at i-ulat ang mga bugs sa {github}.",
+        "walkthrough": "Simulan ang \"Walkthrough\"",
+        "start": "Simulan ang pag-edit"
+    },
+    "source_switch": {
+        "live": "live",
+        "lose_changes": "Mayroon kang hindi na-save ang mga pagbabago. Mawawala ang pagbabagong ito kung lilipat sa ibang map server.   Sigurado ka bang gusto mong lumipat ng server?",
+        "dev": "dev"
+    },
+    "tag_reference": {
+        "description": "Paglalarawan",
+        "on_wiki": "{tag} sa wiki.osm.org",
+        "used_with": "Kabilang sa gingamait ang {type}"
+    },
+    "validations": {
+        "untagged_point": "Walang tag na punto o tuldok",
+        "untagged_line": "Walang tag na linya",
+        "untagged_area": "Walang tag na area o poligon",
+        "many_deletions": "Nagbura ka ng {n} bagay sa mapa. Sigurado ka bang gusto mong gawin ito? Ito ay tatanggalin sa mapa na nakikita sa openstreetmap.org.",
+        "tag_suggests_area": "Ang tag na {tag} ay kalimitang para sa mga area o poligon sublait ito ay nasa linya lamang.",
+        "untagged_tooltip": "Pumili ng uri ng \"feature\" na naglalarawan kung ano ang {geometry} na ito.",
+        "deprecated_tags": "Hindi na ginagamit na \"tag\": {tags}"
+    },
+    "zoom": {
+        "in": "i-zoom in",
+        "out": "I-zoom out"
+    },
+    "cannot_zoom": "Hindi na pwedeng mag-zoom out sa kasalukuyang \"mode\".",
+    "gpx": {
+        "local_layer": "Lokal na GPX file",
+        "drag_drop": "I-drag at i-drop ang .gpx file mula sa inyong \"computer\" sa pahinang ito, o i-click ang button sa kanan upang mag-browse",
+        "zoom": "I-zoom sa GPX track",
+        "browse": "Mag-browse ng .gpx file"
+    },
+    "intro": {
+        "navigation": {
+            "header": "Ang \"header\" ay nagpapakita kung anong uri ng \"feature\" ito."
+        },
+        "points": {
+            "title": "Mga Punto o tuldok",
+            "choose": "**Pumili ng Cafe mula sa talaan.**",
+            "describe": "Ang punto o tuldok na ito ay minarkahan bilang \"cafe\".  Gamit ang \"feature editor\", maari tayong magdagdag ng iba pang impormasyon. **Magdagdag ng pangalan**"
+        },
+        "areas": {
+            "title": "Mga area o poligon",
+            "search": "**Hanapin ang '{name}'.**",
+            "choose": "**Pliin ang \"Playground\" mula sa talaan.**",
+            "describe": "**Magdagdag ng pangalan at isara ang \"feature editor\"**"
+        },
+        "lines": {
+            "title": "Mga linya",
+            "add": "Ang mga linya ay ginagamit para kumatawan sa mga \"feature\" na gaya ng mga kalsada, riles ng tren at ilog. **I-click ang button para sa \"Linya\" upang magdagdag ng bagong linya. **",
+            "start": "**Simulan ang linya sa pamamagitan ng pag-click sa dulo ng kalsada.**",
+            "road": "**Piliin ang \"Road\" mula sa talaan**"
+        },
+        "startediting": {
+            "title": "Umpisahan ang pag-edit",
+            "save": "Huwag kalimutan na regular na i-save ang iyong mga binago!",
+            "start": "Simulan ang pagma-mapa!"
+        }
+    },
+    "presets": {
+        "fields": {
+            "address": {
+                "label": "Address",
+                "placeholders": {
+                    "number": "123",
+                    "street": "Kalsada",
+                    "city": "Siyudad"
+                }
+            },
+            "aerialway": {
+                "label": "Uri"
+            },
+            "aeroway": {
+                "label": "Uri"
+            },
+            "amenity": {
+                "label": "Uri"
+            },
+            "artwork_type": {
+                "label": "Uri"
+            },
+            "atm": {
+                "label": "ATM"
+            },
+            "barrier": {
+                "label": "Uri"
+            },
+            "bicycle_parking": {
+                "label": "Uri"
+            },
+            "boundary": {
+                "label": "Uri"
+            },
+            "building": {
+                "label": "Gusali"
+            },
+            "building_area": {
+                "label": "Gusali"
+            },
+            "capacity": {
+                "label": "Kapasidad"
+            },
+            "construction": {
+                "label": "Uri"
+            },
+            "crossing": {
+                "label": "Uri"
+            },
+            "entrance": {
+                "label": "Uri"
+            },
+            "fire_hydrant/type": {
+                "label": "Uri"
+            },
+            "generator/type": {
+                "label": "Uri"
+            },
+            "highway": {
+                "label": "Uri"
+            },
+            "historic": {
+                "label": "Uri"
+            },
+            "information": {
+                "label": "Uri"
+            },
+            "internet_access": {
+                "options": {
+                    "wlan": "Wifi"
+                }
+            },
+            "landuse": {
+                "label": "Uri"
+            },
+            "leisure": {
+                "label": "Uri"
+            },
+            "man_made": {
+                "label": "Uri"
+            },
+            "name": {
+                "label": "Pangalan"
+            },
+            "office": {
+                "label": "Uri"
+            },
+            "parking": {
+                "label": "Uri"
+            },
+            "piste/type": {
+                "label": "Uri"
+            },
+            "place": {
+                "label": "Uri"
+            },
+            "power": {
+                "label": "Uri"
+            },
+            "railway": {
+                "label": "Uri"
+            },
+            "relation": {
+                "label": "Uri"
+            },
+            "restriction": {
+                "label": "Uri"
+            },
+            "route": {
+                "label": "Uri"
+            },
+            "route_master": {
+                "label": "Uri"
+            },
+            "service": {
+                "label": "Uri"
+            },
+            "shelter_type": {
+                "label": "Uri"
+            },
+            "shop": {
+                "label": "Uri"
+            },
+            "studio_type": {
+                "label": "Uri"
+            },
+            "tourism": {
+                "label": "Uri"
+            },
+            "tracktype": {
+                "label": "Uri"
+            },
+            "tree_type": {
+                "label": "Uri"
+            },
+            "water": {
+                "label": "Uri"
+            },
+            "waterway": {
+                "label": "Uri"
+            },
+            "wetland": {
+                "label": "Uri"
+            },
+            "wood": {
+                "label": "Uri"
+            }
+        },
+        "presets": {
+            "building": {
+                "name": "Gusali"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/vendor/assets/iD/iD/locales/fr.json b/vendor/assets/iD/iD/locales/fr.json
index 386a94c3f..33c1759f8 100644
--- a/vendor/assets/iD/iD/locales/fr.json
+++ b/vendor/assets/iD/iD/locales/fr.json
@@ -71,7 +71,8 @@
                 "line": "Ligne rendue circulaire.",
                 "area": "Polygone rendu circulaire."
             },
-            "not_closed": "Cet élément ne peut pas être rendu circulaire car il ne boucle pas."
+            "not_closed": "Cet élément ne peut pas être rendu circulaire car il ne boucle pas.",
+            "too_large": "Ceci ne peut pas être transformé en cercle parce qu'une partie n'est pas visible."
         },
         "orthogonalize": {
             "title": "Carré",
@@ -84,7 +85,8 @@
                 "line": "Ligne rendue orthogonale.",
                 "area": "Polygone rendu orthogonal."
             },
-            "not_squarish": "Cela ne peut être fait, ce n'est pas carré."
+            "not_squarish": "Cela ne peut être fait, ce n'est pas carré.",
+            "too_large": "Ceci ne peut pas être transformé en rectangle parce qu'une partie n'est pas visible."
         },
         "straighten": {
             "title": "Rendre droit",
@@ -134,7 +136,8 @@
             "annotation": "Fusionne les {n} lignes.",
             "not_eligible": "Ces éléments ne peuvent pas être fusionnés.",
             "not_adjacent": "Ces lignes ne peuvent pas être fusionnées car elles ne sont pas connectées.",
-            "restriction": "Ces lignes ne peuvent pas être fusionnées car au moins l'une d'entre elles est membre d'une relation \"{relation}\"."
+            "restriction": "Ces lignes ne peuvent pas être fusionnées car au moins l'une d'entre elles est membre d'une relation \"{relation}\".",
+            "incomplete_relation": "Ces éléments ne peuvent pas être fusionnés parce qu'au moins l'un d'entre eux n'a pas été complètement téléchargé."
         },
         "move": {
             "title": "Déplacer",
@@ -264,7 +267,8 @@
         "percent_brightness": "{opacity}% luminosité",
         "none": "Aucun",
         "custom": "Personnalisé",
-        "custom_prompt": "Entre un modèle de tuile. Les jetons valides sont  {z}, {x}, {y} pour un système Z/X/Y  et {u} pour le quatrième système.",
+        "custom_button": "Modifier le fond personnalisé",
+        "custom_prompt": "Saisir un template d'URL de tuile. Les symboles sont {z}, {x}, {y} pour la structure Z/X/Y et {u} pour la balance des domaines.",
         "fix_misalignment": "Corriger l'alignement",
         "reset": "réinitialiser"
     },
@@ -557,6 +561,9 @@
             "covered": {
                 "label": "Couvert"
             },
+            "crop": {
+                "label": "Culture"
+            },
             "crossing": {
                 "label": "Type"
             },
@@ -592,7 +599,25 @@
                 "label": "Type"
             },
             "fixme": {
-                "label": "Corrigez-Moi"
+                "label": "À corriger"
+            },
+            "fuel": {
+                "label": "Station essence"
+            },
+            "fuel/biodiesel": {
+                "label": "Vente d'agro-carburant"
+            },
+            "fuel/diesel": {
+                "label": "Vente de diesel"
+            },
+            "fuel/e10": {
+                "label": "Vend du E10"
+            },
+            "fuel/e85": {
+                "label": "Vends du E85"
+            },
+            "fuel/lpg": {
+                "label": "Vente de gaz propane"
             },
             "generator/method": {
                 "label": "Méthode"
@@ -617,6 +642,9 @@
             "historic": {
                 "label": "Type"
             },
+            "hoops": {
+                "placeholder": "1, 2, 4..."
+            },
             "iata": {
                 "label": "IATA"
             },
@@ -650,6 +678,9 @@
             "leisure": {
                 "label": "Type"
             },
+            "length": {
+                "label": "Longueur (mètres)"
+            },
             "levels": {
                 "label": "Niveaux",
                 "placeholder": "2, 4, 6..."
@@ -721,12 +752,27 @@
             "place": {
                 "label": "Type"
             },
+            "population": {
+                "label": "Population"
+            },
             "power": {
                 "label": "Type"
             },
             "railway": {
                 "label": "Type"
             },
+            "recycling/cans": {
+                "label": "Accepte les boîtes de conserve"
+            },
+            "recycling/clothes": {
+                "label": "Accepte les vêtements"
+            },
+            "recycling/glass": {
+                "label": "Accepte le verre"
+            },
+            "recycling/paper": {
+                "label": "Accepte le papier"
+            },
             "ref": {
                 "label": "Référence"
             },
@@ -769,12 +815,21 @@
             "shop": {
                 "label": "Type"
             },
+            "smoking": {
+                "label": "Fumeur"
+            },
+            "social_facility_for": {
+                "placeholder": "Sans-abris, handicapés, enfants, etc."
+            },
             "source": {
                 "label": "Source"
             },
             "sport": {
                 "label": "Sport"
             },
+            "sport_ice": {
+                "label": "Sport"
+            },
             "structure": {
                 "label": "Structure",
                 "placeholder": "Inconnu",
@@ -782,7 +837,8 @@
                     "bridge": "Pont",
                     "tunnel": "Tunnel",
                     "embankment": "Remblai",
-                    "cutting": "Tranchée"
+                    "cutting": "Tranchée",
+                    "ford": "Ford"
                 }
             },
             "studio_type": {
@@ -812,6 +868,9 @@
             "tree_type": {
                 "label": "Type"
             },
+            "trees": {
+                "label": "Arbres"
+            },
             "tunnel": {
                 "label": "Tunnel"
             },
@@ -834,8 +893,11 @@
             "wheelchair": {
                 "label": "Accès en fauteuil roulant"
             },
+            "width": {
+                "label": "Largeur (mètres)"
+            },
             "wikipedia": {
-                "label": "Wikipedia"
+                "label": "Wikipédia"
             },
             "wood": {
                 "label": "Type"
@@ -856,7 +918,8 @@
                 "name": "Télésiège"
             },
             "aerialway/gondola": {
-                "name": "Gondole"
+                "name": "Gondole",
+                "terms": "Gondole"
             },
             "aerialway/magic_carpet": {
                 "name": "Bande transporteuse de personnes"
@@ -899,7 +962,7 @@
             },
             "aeroway/helipad": {
                 "name": "Héliport",
-                "terms": "Hélipad"
+                "terms": "Hélipad, Héliport"
             },
             "aeroway/runway": {
                 "name": "Piste d’atterrissage",
@@ -914,7 +977,7 @@
                 "terms": "Terminal, Terminal Aéroportuaire"
             },
             "amenity": {
-                "name": "Équipements",
+                "name": "Équipement",
                 "terms": "Commodité"
             },
             "amenity/arts_centre": {
@@ -933,6 +996,9 @@
                 "name": "Bar",
                 "terms": "Bar"
             },
+            "amenity/bbq": {
+                "name": "Barbecue/Grill"
+            },
             "amenity/bench": {
                 "name": "Banc",
                 "terms": "Banc"
@@ -985,6 +1051,10 @@
                 "name": "Enseignement supérieur (non universitaire)",
                 "terms": "Institut, École supérieure, Enseignement supérieur, Haute école, CÉGEP, cégep"
             },
+            "amenity/compressed_air": {
+                "name": "Air comprimé",
+                "terms": "Air comprimé"
+            },
             "amenity/courthouse": {
                 "name": "Tribunal",
                 "terms": "Palais de Justice, Tribunal"
@@ -1025,6 +1095,9 @@
                 "name": "Cimetière",
                 "terms": "Cimetière"
             },
+            "amenity/hospital": {
+                "name": "Terrain d'hôpital"
+            },
             "amenity/library": {
                 "name": "Bibliothèque",
                 "terms": "Bibliothèque, Librairie"
@@ -1033,6 +1106,10 @@
                 "name": "Place de marché",
                 "terms": "Marché"
             },
+            "amenity/nightclub": {
+                "name": "Boite de nuit",
+                "terms": "Boîte de nuit"
+            },
             "amenity/parking": {
                 "name": "Parc de stationnement",
                 "terms": "Parc de stationnement, parking"
@@ -1089,10 +1166,17 @@
                 "name": "Restaurant",
                 "terms": "Restaurant"
             },
+            "amenity/school": {
+                "name": "Terrain d'école"
+            },
             "amenity/shelter": {
                 "name": "Abri",
                 "terms": "Abri"
             },
+            "amenity/social_facility/food_bank": {
+                "name": "Banque alimentaire",
+                "terms": "Banque alimentaire"
+            },
             "amenity/studio": {
                 "name": "Studio"
             },
@@ -1109,7 +1193,7 @@
                 "terms": "Téléphone"
             },
             "amenity/theatre": {
-                "name": "Théatre",
+                "name": "Théâtre",
                 "terms": "Théâtre"
             },
             "amenity/toilets": {
@@ -1190,7 +1274,7 @@
             },
             "barrier/lift_gate": {
                 "name": "Barrière levante",
-                "terms": "Hayon"
+                "terms": "Barrière relevable"
             },
             "barrier/retaining_wall": {
                 "name": "Mur de soutènement",
@@ -1220,32 +1304,55 @@
                 "name": "Résidence",
                 "terms": "Appartements"
             },
+            "building/barn": {
+                "name": "Hangar agricole",
+                "terms": "Hangar agricole, Grange"
+            },
+            "building/bunker": {
+                "name": "Bunker",
+                "terms": "Casemate, Blockhaus, Bunker"
+            },
             "building/cathedral": {
-                "name": "Cathédrale"
+                "name": "Cathédrale",
+                "terms": "Cathédrale"
             },
             "building/chapel": {
-                "name": "Chapelle"
+                "name": "Chapelle",
+                "terms": "Chapelle"
             },
             "building/church": {
-                "name": "Église"
+                "name": "Église",
+                "terms": "Église"
             },
             "building/commercial": {
                 "name": "Bâtiment commercial",
                 "terms": "Bâtiment commercial"
             },
-            "building/entrance": {
-                "name": "Entrée",
-                "terms": "Entrée"
+            "building/construction": {
+                "name": "Bâtiment en construction",
+                "terms": "Bâtiment en construction, Chantier"
+            },
+            "building/dormitory": {
+                "name": "Dortoir"
             },
             "building/garage": {
                 "name": "Garage",
                 "terms": "Garage"
             },
+            "building/garages": {
+                "name": "Garages",
+                "terms": "Garages, Parc de stationnement couvert"
+            },
             "building/greenhouse": {
                 "name": "Serre"
             },
+            "building/hospital": {
+                "name": "Hôpital ",
+                "terms": "Hôpital, Clinique"
+            },
             "building/hotel": {
-                "name": "Hôtel"
+                "name": "Hôtel",
+                "terms": "Hôtel"
             },
             "building/house": {
                 "name": "Maison",
@@ -1260,26 +1367,45 @@
                 "terms": "Bâtiment industriel"
             },
             "building/public": {
-                "name": "Établissement public"
+                "name": "Établissement public",
+                "terms": "Bâtiment public"
             },
             "building/residential": {
                 "name": "Bâtiment résidentiel",
                 "terms": "Bâtiment résidentiel"
             },
+            "building/roof": {
+                "name": "Voûte",
+                "terms": "voûte, toit, marché couvert"
+            },
             "building/school": {
                 "name": "Bâtiment d'enseignement"
             },
             "building/stable": {
-                "name": "Étable"
+                "name": "Étable",
+                "terms": "Étable"
             },
             "building/train_station": {
-                "name": "Gare ferroviaire"
+                "name": "Gare ferroviaire",
+                "terms": "Gare, Station, Arrêt"
             },
             "building/university": {
                 "name": "Université"
             },
+            "building/warehouse": {
+                "name": "Entrepôt",
+                "terms": "Entrepôt, magasin, abri, dépôt, docks, hangar"
+            },
+            "craft/basket_maker": {
+                "name": "Vannier"
+            },
+            "craft/beekeeper": {
+                "name": "Apiculteur",
+                "terms": "Apiculteur"
+            },
             "craft/blacksmith": {
-                "name": "Forgeron"
+                "name": "Forgeron",
+                "terms": "Forgeron"
             },
             "craft/boatbuilder": {
                 "name": "Constructeur de bateaux",
@@ -1292,13 +1418,15 @@
                 "name": "Brasserie"
             },
             "craft/carpenter": {
-                "name": "Charpentier"
+                "name": "Charpentier",
+                "terms": "Charpentier"
             },
             "craft/caterer": {
                 "name": "Traiteur"
             },
             "craft/clockmaker": {
-                "name": "Horloger"
+                "name": "Horloger",
+                "terms": "Horloger, Horlogerie"
             },
             "craft/confectionary": {
                 "name": "Confiserie"
@@ -1340,12 +1468,17 @@
                 "name": "Opticien",
                 "terms": "Opticien"
             },
+            "craft/painter": {
+                "name": "Peintre",
+                "terms": "Peintre"
+            },
             "craft/photographer": {
                 "name": "Photographe",
                 "terms": "Photographe"
             },
-            "craft/photographic_labratory": {
-                "name": "Laboratoire Photographique"
+            "craft/photographic_laboratory": {
+                "name": "Laboratoire photographique",
+                "terms": "Laboratoire photographique, Laboratoire de développement"
             },
             "craft/plasterer": {
                 "name": "Plâtrier"
@@ -1355,10 +1488,12 @@
                 "terms": "Plombier"
             },
             "craft/pottery": {
-                "name": "Pottier"
+                "name": "Pottier",
+                "terms": "Potier"
             },
             "craft/roofer": {
-                "name": "Couvreur"
+                "name": "Couvreur",
+                "terms": "Couvreur"
             },
             "craft/saddler": {
                 "name": "Sellier"
@@ -1371,10 +1506,12 @@
                 "name": "Scierie"
             },
             "craft/sculpter": {
-                "name": "Sculpteur"
+                "name": "Sculpteur",
+                "terms": "Sculpteur"
             },
             "craft/shoemaker": {
-                "name": "Cordonnier"
+                "name": "Cordonnier",
+                "terms": "Bottier, Cordonnier"
             },
             "craft/stonemason": {
                 "name": "Tailleur de pierre"
@@ -1413,8 +1550,7 @@
                 "terms": "Téléphone d'urgence"
             },
             "entrance": {
-                "name": "Entrée",
-                "terms": "Entrée"
+                "name": "Entrée/Sortie"
             },
             "footway/crossing": {
                 "name": "Passage pieton ",
@@ -1424,19 +1560,27 @@
                 "name": "Trottoir",
                 "terms": "Trottoir"
             },
+            "ford": {
+                "name": "Ford"
+            },
             "golf/bunker": {
-                "name": "Bunker"
+                "name": "Bunker",
+                "terms": "Bunker"
             },
             "golf/fairway": {
                 "name": "Allée (golf)"
             },
+            "golf/green": {
+                "name": "Green",
+                "terms": "Green"
+            },
             "golf/hole": {
                 "name": "Trou de golf",
                 "terms": "Trou de golf"
             },
             "highway": {
                 "name": "Route",
-                "terms": "Autoroute"
+                "terms": "Autoroute, Voie rapide"
             },
             "highway/bridleway": {
                 "name": "Sentier équestre",
@@ -1456,7 +1600,7 @@
             },
             "highway/footway": {
                 "name": "Voie piétonne",
-                "terms": "Chemin piétonnier"
+                "terms": "Chemin piétonnier, Sentier"
             },
             "highway/living_street": {
                 "name": "Zone de rencontre",
@@ -1468,11 +1612,7 @@
             },
             "highway/motorway": {
                 "name": "Autoroute",
-                "terms": "Autoroute"
-            },
-            "highway/motorway_junction": {
-                "name": "Bretelle d'autoroute",
-                "terms": "Échangeur autoroutier"
+                "terms": "Autoroute, Voie rapide"
             },
             "highway/motorway_link": {
                 "name": "Bretelle d'autoroute",
@@ -1499,7 +1639,8 @@
                 "terms": "Route résidentielle"
             },
             "highway/rest_area": {
-                "name": "Aire de repos"
+                "name": "Aire de repos",
+                "terms": "Aire de repos, Aire de service"
             },
             "highway/road": {
                 "name": "Voie de type inconnu",
@@ -1523,7 +1664,7 @@
             },
             "highway/service/drive-through": {
                 "name": "Drive In",
-                "terms": "Service au comptoir"
+                "terms": "Service au comptoir, Drive-in"
             },
             "highway/service/driveway": {
                 "name": "Allée",
@@ -1559,11 +1700,11 @@
             },
             "highway/track": {
                 "name": "Piste carrossable",
-                "terms": "Piste"
+                "terms": "Piste, Chemin carrossable"
             },
             "highway/traffic_signals": {
                 "name": "Feux tricolores",
-                "terms": "Feux de circulation, Feux rouges, Lumière rouge"
+                "terms": "Feux de circulation, Feux tricolores, Feux rouges"
             },
             "highway/trunk": {
                 "name": "Voie rapide",
@@ -1669,6 +1810,9 @@
                 "name": "Prairie",
                 "terms": "Prairie"
             },
+            "landuse/military": {
+                "name": "Militaire"
+            },
             "landuse/orchard": {
                 "name": "Verger",
                 "terms": "Verger"
@@ -1709,6 +1853,9 @@
                 "name": "Parcours de golf",
                 "terms": "Golf, Terrain de golf, Parcours de golf"
             },
+            "leisure/ice_rink": {
+                "name": "Patinoire"
+            },
             "leisure/marina": {
                 "name": "Marina",
                 "terms": "Marina"
@@ -1717,6 +1864,10 @@
                 "name": "Parc",
                 "terms": "Parc"
             },
+            "leisure/picnic_table": {
+                "name": "Table de pique-nique",
+                "terms": "Table de pique-nique"
+            },
             "leisure/pitch": {
                 "name": "Terrain de sport",
                 "terms": "Terrain de sport"
@@ -1757,10 +1908,6 @@
                 "name": "Plan incliné",
                 "terms": "Cale de lancement"
             },
-            "leisure/sports_center": {
-                "name": "Centre sportif",
-                "terms": "Centre sportif"
-            },
             "leisure/stadium": {
                 "name": "Stade",
                 "terms": "Stade"
@@ -1845,7 +1992,7 @@
             },
             "military/bunker": {
                 "name": "Bunker",
-                "terms": "casemate, blockhaus"
+                "terms": "casemate, blockhaus, bunker"
             },
             "military/range": {
                 "name": "Stand de tir"
@@ -1916,7 +2063,7 @@
             },
             "natural/water/pond": {
                 "name": "Étang",
-                "terms": "Etang, Mare"
+                "terms": "Étang, Mare"
             },
             "natural/water/reservoir": {
                 "name": "Bassin de retenue",
@@ -2015,7 +2162,8 @@
                 "terms": "Agence de voyage"
             },
             "piste": {
-                "name": "Piste de ski"
+                "name": "Piste de ski",
+                "terms": "Piste de ski"
             },
             "place": {
                 "name": "Toponymie",
@@ -2041,6 +2189,9 @@
                 "name": "Lieu-dit",
                 "terms": "Localité"
             },
+            "place/neighbourhood": {
+                "name": "Voisinage"
+            },
             "place/town": {
                 "name": "Ville (10.000-100.000 habitants)",
                 "terms": "Ville"
@@ -2118,6 +2269,9 @@
                 "name": "Monorail",
                 "terms": "Monorail"
             },
+            "railway/narrow_gauge": {
+                "name": "Voie étroite"
+            },
             "railway/platform": {
                 "name": "Quai de gare",
                 "terms": "Quai de gare"
@@ -2158,6 +2312,9 @@
                 "name": "Magasin de vente d'alcool",
                 "terms": "Cave, Caviste, Magasin de vin, Vins & Spiritueux"
             },
+            "shop/art": {
+                "name": "Magasin d'art"
+            },
             "shop/bakery": {
                 "name": "Boulangerie",
                 "terms": "Boulangerie"
@@ -2250,6 +2407,10 @@
                 "name": "Fleuriste",
                 "terms": "Fleuriste"
             },
+            "shop/funeral_directors": {
+                "name": "Funérarium",
+                "terms": "Funérarium, Maison funéraire"
+            },
             "shop/furniture": {
                 "name": "Magasin de meubles",
                 "terms": "Magasin de meubles"
@@ -2294,6 +2455,9 @@
                 "name": "Serrurier",
                 "terms": "Serrurier"
             },
+            "shop/lottery": {
+                "name": "Loterie"
+            },
             "shop/mall": {
                 "name": "Centre commercial",
                 "terms": "Centre d'achat"
@@ -2370,6 +2534,10 @@
                 "name": "Vidéo-club",
                 "terms": "Club vidéo"
             },
+            "shop/wine": {
+                "name": "Caviste",
+                "terms": "Caviste, Chai, Bar à vins"
+            },
             "tourism": {
                 "name": "Tourisme",
                 "terms": "Tourisme"
@@ -2459,19 +2627,19 @@
                 "terms": "Route, rue, chemin, sentier"
             },
             "type/route/bicycle": {
-                "name": "Trajet Cyclable",
+                "name": "Trajet cyclable",
                 "terms": "Piste cyclable"
             },
             "type/route/bus": {
-                "name": "Trajet de Bus",
+                "name": "Trajet de bus",
                 "terms": "Trajet d'autobus"
             },
             "type/route/detour": {
-                "name": "Trajet de Contournement",
+                "name": "Déviation",
                 "terms": "Détour"
             },
             "type/route/ferry": {
-                "name": "Trajet de Ferry",
+                "name": "Trajet de ferry",
                 "terms": "Route de traversier, Ligne de ferry"
             },
             "type/route/foot": {
@@ -2539,7 +2707,7 @@
                 "terms": "Berge"
             },
             "waterway/stream": {
-                "name": "Cours d'eau étroit",
+                "name": "Ruisseau",
                 "terms": "Ruisseau"
             },
             "waterway/weir": {
diff --git a/vendor/assets/iD/iD/locales/gl.json b/vendor/assets/iD/iD/locales/gl.json
index 439aeb14d..08b6fd3ea 100644
--- a/vendor/assets/iD/iD/locales/gl.json
+++ b/vendor/assets/iD/iD/locales/gl.json
@@ -30,7 +30,8 @@
         "add": {
             "annotation": {
                 "point": "Punto engadido.",
-                "vertex": "Vértice engadido a unha vía."
+                "vertex": "Vértice engadido a unha vía.",
+                "relation": "Relación engadida."
             }
         },
         "start": {
@@ -40,6 +41,11 @@
             }
         },
         "continue": {
+            "key": "A",
+            "title": "Continuar",
+            "description": "Continuar esta liña.",
+            "not_eligible": "Ningunha liña se pode continuar aquí.",
+            "multiple": "Aquí pódense continuar varias liñas. Para escoller unha delas, pulsa a tecla de Maiúsculas e fai clic na liña para seleccionala.",
             "annotation": {
                 "line": "Liña continuada.",
                 "area": "Área continuada."
@@ -48,24 +54,46 @@
         "cancel_draw": {
             "annotation": "Debuxo cancelado."
         },
+        "change_role": {
+            "annotation": "Cambiado o rol do membro dunha relación."
+        },
         "change_tags": {
             "annotation": "Etiquetas modificadas."
         },
         "circularize": {
             "title": "Redondear",
+            "description": {
+                "line": "Redondear esta liña.",
+                "area": "Redondear esta área."
+            },
             "key": "O",
             "annotation": {
                 "line": "Liña redondeada.",
                 "area": "Área redondeada."
-            }
+            },
+            "not_closed": "Isto non se pode redonderar porque non é un bucle.",
+            "too_large": "Isto non se pode redondear porque non está completamente visible."
         },
         "orthogonalize": {
             "title": "Escuadrar",
+            "description": {
+                "line": "Escuadrar as esquinas desta liña.",
+                "area": "Escuadrar as esquinas desta área."
+            },
             "key": "S",
             "annotation": {
                 "line": "Escuadradas as esquinas dunha liña.",
                 "area": "Escuadradas as esquinas dunha área."
-            }
+            },
+            "not_squarish": "Isto non se pode escuadrar porque non ten forma cadrada.",
+            "too_large": "Isto non se pode escuadrar porque non está completamente visible."
+        },
+        "straighten": {
+            "title": "Endereitar",
+            "description": "Endereitar esta liña.",
+            "key": "S",
+            "annotation": "Liña endereitada.",
+            "too_bendy": "Isto non pode ser endereitado porque é demasiado sinuoso."
         },
         "delete": {
             "title": "Borrar",
@@ -77,7 +105,14 @@
                 "area": "Área borrada.",
                 "relation": "Relación borrada.",
                 "multiple": "{n} obxectos borrados."
-            }
+            },
+            "incomplete_relation": "Este elemento non pode ser borrado porque non foi descargado completamente."
+        },
+        "add_member": {
+            "annotation": "Membro engadido a unha relación."
+        },
+        "delete_member": {
+            "annotation": "Membro quitado dunha relación."
         },
         "connect": {
             "annotation": {
@@ -91,13 +126,18 @@
             "title": "Desconectar.",
             "description": "Desconectar estas liñas/áreas entre si.",
             "key": "D",
-            "annotation": "Liñas/áreas desconectadas."
+            "annotation": "Liñas/áreas desconectadas.",
+            "not_connected": "Aquí non hai liñas/áreas suficientes para poder desconectar."
         },
         "merge": {
             "title": "Unir.",
             "description": "Unir estas liñas.",
             "key": "C",
-            "annotation": "{n} liñas unidas."
+            "annotation": "{n} liñas unidas.",
+            "not_eligible": "Estes elementos non se poden unir",
+            "not_adjacent": "Estas liñas non se poden unir porque non están conectadas.",
+            "restriction": "Estas liñas non poden unirse porque cando menos unha é un membro dunha relación \"{relation}\".",
+            "incomplete_relation": "Estes elementos non se poden unir porque cando menos un deles non se descargou completamente."
         },
         "move": {
             "title": "Mover",
@@ -109,7 +149,8 @@
                 "line": "Liña movida.",
                 "area": "Área movida.",
                 "multiple": "Varios obxectos movidos."
-            }
+            },
+            "incomplete_relation": "Este elemento non se pode mover porque non se descargou completamente."
         },
         "rotate": {
             "title": "Rotar.",
@@ -128,17 +169,64 @@
         },
         "split": {
             "title": "Dividir",
-            "key": "X"
+            "description": {
+                "line": "Dividir esta liña en dúas neste vértice.",
+                "area": "Dividir o límite desta área en dous.",
+                "multiple": "Dividir as liñas/límites da área en dous neste vértice"
+            },
+            "key": "X",
+            "annotation": {
+                "line": "Dividida unha liña.",
+                "area": "Dividido un límite dunha área.",
+                "multiple": "Divididas {n} liñas/límites de área."
+            },
+            "not_eligible": "As liñas non se poden dividir no seu inicio ou fin.",
+            "multiple_ways": "Aquí hai demasiadas liñas para dividir."
+        },
+        "restriction": {
+            "help": {
+                "select": "Fai clic para seleccionar un segmento de estrada.",
+                "toggle": "Fai clic para alternar as restricións de xiro.",
+                "toggle_on": "Fai clic para engadir unha restrición \"{restriction}\".",
+                "toggle_off": "Fai clic para eliminar a restrición \"{restriction}\"."
+            },
+            "annotation": {
+                "create": "Engadida unha restrición de xiro.",
+                "delete": "Eliminada unha restrición de xiro."
+            }
         }
     },
+    "undo": {
+        "tooltip": "Desfacer: {action}",
+        "nothing": "Nada para desfacer."
+    },
+    "redo": {
+        "tooltip": "Refacer: {action}",
+        "nothing": "Nada para refacer"
+    },
+    "tooltip_keyhint": "Atallo:",
     "browser_notice": "Este editor está soportado en Firefox, Chrome, Safari, Opera e Internet Explorer 9 e superiores. Por favor, actualiza o teu navegador ou utiliza Potlatch 2 para editar o mapa.",
+    "translate": {
+        "translate": "Traducir",
+        "localized_translation_label": "Nome multilingüe",
+        "localized_translation_language": "Escoller idioma",
+        "localized_translation_name": "Nome"
+    },
     "zoom_in_edit": "Fai zoom para editar.",
     "logout": "cerrar sesión",
+    "loading_auth": "Conectando con OpenStreetMap...",
     "report_a_bug": "informar dun erro",
+    "status": {
+        "error": "Non se puido conectar coa API.",
+        "offline": "A API non está en liña. Por favor, intenta editar máis tarde.",
+        "readonly": "A API está en modo de só lectura. Necesitarás esperar para gardar os teus cambios."
+    },
     "commit": {
         "title": "Gardar Cambios",
         "description_placeholder": "Breve descrición das túas contribucións",
+        "message_label": "Mensaxe de envío",
         "upload_explanation": "Os cambios que subas serán visibles en tódolos mapas que usen os datos de OpenStreetMap.",
+        "upload_explanation_with_user": "Os cambios que subas como {user} serán visibles en tódolos mapas que usen os datos de OpenStreetMap.",
         "save": "Gardar",
         "cancel": "Cancelar",
         "warnings": "Avisos",
@@ -150,25 +238,54 @@
         "list": "Edicións de {users}",
         "truncated_list": "Edicións de {users} e {count} máis"
     },
+    "geocoder": {
+        "search": "Buscar en todo o mundo...",
+        "no_results_visible": "Ningún resultado na área visible do mapa",
+        "no_results_worldwide": "Non se atoparon resultados"
+    },
     "geolocate": {
         "title": "Mostrar a miña localización"
     },
     "inspector": {
         "no_documentation_combination": "Non hai ningunha documentación dispoñible para esta combinación de etiquetas",
         "no_documentation_key": "Non hai ningunha documentación dispoñible para esta clave",
+        "show_more": "Mostrar máis",
         "view_on_osm": "Ver en openstreetmap.org",
+        "all_tags": "Tódalas etiquetas",
+        "all_members": "Tódolos membros",
+        "all_relations": "Tódalas relacións",
+        "new_relation": "Nova relación...",
+        "role": "Rol",
         "choose": "Escolle o tipo de elemento",
         "results": "{n} resultados para {search}",
-        "reference": "Ver na Wiki de OpenStreetMap"
+        "reference": "Ver na Wiki de OpenStreetMap",
+        "back_tooltip": "Cambiar tipo de elemento",
+        "remove": "Eliminar",
+        "search": "Buscar",
+        "multiselect": "Elementos seleccionados",
+        "unknown": "Descoñecido",
+        "incomplete": "<non descargado>",
+        "feature_list": "Buscar elementos",
+        "edit": "Editar elemento",
+        "none": "Ningún",
+        "node": "Vértice",
+        "way": "Vía",
+        "relation": "Relación",
+        "location": "Localización"
     },
     "background": {
         "title": "Fondo",
         "description": "Axustes do fondo",
         "percent_brightness": "{opacity}% brillo",
+        "none": "Ningún",
+        "custom": "Personalizado",
+        "custom_button": "Editar fondo personalizado",
+        "custom_prompt": "Introduce a URL dun modelo de teselas. Os símbolos válidos son {z}, {x}, {y} para o esquema Z/X/Y e {u} para o esquema quadtile.",
         "fix_misalignment": "Corrixir a aliñación",
         "reset": "reiniciar"
     },
     "restore": {
+        "heading": "Tes cambios sen gardar",
         "description": "Queres recuperar os cambios non gardados da sesión de edición anterior?",
         "restore": "Recuperar",
         "reset": "Descartar"
@@ -181,8 +298,1264 @@
         "uploading": "Subindo cambios a OpenStreetMap.",
         "unsaved_changes": "Tes cambios sen gardar"
     },
+    "success": {
+        "edited_osm": "OSM editado!",
+        "just_edited": "Acabas de editar OpenStreetMap!",
+        "view_on_osm": "Ver en OSM",
+        "facebook": "Compartir no Facebook",
+        "twitter": "Compartir en Twitter",
+        "google": "Compartir en Google+",
+        "help_html": "Os teus cambios deberían aparecer na capa \"Estándar\" nuns minutos. Outras capas, e determinados elementos, poden tardar máis tempo (<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map' target='_blank'>detalles</a>).\n"
+    },
+    "confirm": {
+        "okay": "Vale"
+    },
     "splash": {
         "welcome": "Benvido ao editor de OpenStreetMap iD",
-        "text": "iD é unha amigable pero potente ferramenta para contribuir ao mellor mapa libre do mundo. Esta é a versión {version}. Para obter máis información visita {website} e informa de erros en {github}."
+        "text": "iD é unha amigable pero potente ferramenta para contribuir ao mellor mapa libre do mundo. Esta é a versión {version}. Para obter máis información visita {website} e informa de erros en {github}.",
+        "walkthrough": "Comezar o titorial.",
+        "start": "Editar agora"
+    },
+    "source_switch": {
+        "live": "en línea",
+        "lose_changes": "Tes cambios sen gardar. Se cambias o servidor do mapa, descartaranse. Estás seguro de que queres cambiar o servidor?",
+        "dev": "desenvolvemento"
+    },
+    "tag_reference": {
+        "description": "Descrición",
+        "on_wiki": "{tag} en wiki.osm.org",
+        "used_with": "usado con {type}"
+    },
+    "validations": {
+        "untagged_point": "Punto sen etiquetar",
+        "untagged_line": "Liña sen etiquetar",
+        "untagged_area": "Área sen etiquetar",
+        "many_deletions": "Estás borrando {n} obxectos. Estás seguro de querer facelo? Esta acción quitaraos do mapa que os demáis ven en openstreetmap.org.",
+        "tag_suggests_area": "A etiqueta {tag} suxire que a liña debería ser unha área, pero non é unha área.",
+        "untagged_tooltip": "Escolle un tipo de elemento que describa o que é esta {geometry}.",
+        "deprecated_tags": "Etiquetas obsoletas: {tags}"
+    },
+    "zoom": {
+        "in": "Acercar",
+        "out": "Afastar"
+    },
+    "cannot_zoom": "Non se pode afastar máis no modo actual.",
+    "gpx": {
+        "local_layer": "Ficheiro GPX local",
+        "drag_drop": "Arrastra e solta un ficheiro .gpx sobre a páxina, ou fai clic no botón da dereita para buscalo",
+        "zoom": "Facer zoom á pista GPX",
+        "browse": "Buscar un ficheiro .gpx"
+    },
+    "help": {
+        "title": "Axuda",
+        "help": "# Axuda\n\nEste é un editor para [OpenStreetMap](http://www.openstreetmap.org/), o\nmapa mundial libre e editable. Podes usalo para engadir e actualizar datos\nna túa zona, facendo un mellor mapa mundial de código e datos abertos\nmellor para todos.\n\nAs edicións que fagas neste mapa serán visibles a todos os que usen\nOpenStreetMap. Para facer unha edición, necesitarás unha\n[conta de OpenStreetMap gratuíta](https://www.openstreetmap.org/user/new).\n\nO [editor iD](http://ideditor.com/) é un proxecto colaborativo con [código\nfonte dispoñible en GitHub](https://github.com/openstreetmap/iD).\n"
+    },
+    "intro": {
+        "navigation": {
+            "title": "Navegación",
+            "drag": "A área principal do mapa mostra os datos de OpenStreetMap sobre un fondo. Podes navegar polo mapa arrastrando e desprazándote, igual que calquera mapa de internet. **Arrastra o mapa!**",
+            "select": "Os elementos do mapa represéntanse de tres formas: usando puntos, liñas ou áreas. Calquera elemento se pode seleccionar facendo clic nel. **Fai clic no punto para seleccionalo.**",
+            "header": "Na cabeceira móstrase o tipo de elemento.",
+            "pane": "Cando un elemento é seleccionado, móstrase o editor de elementos. A cabeceira mostra o tipo de elemento e o panel principal mostra os atributos do elemento como, por exemplo, o seu nome e o seu enderezo. **Pecha o editor de elementos co botón de cerre da parte superior dereita.**"
+        },
+        "points": {
+            "title": "Puntos",
+            "add": "Os puntos pódense usar para representar elementos tales como tendas, restaurantes e monumentos. Marcan unha localización específica, describindo o que hai aí. **Fai clic no botón \"Punto\" para engadir un novo punto.**",
+            "place": "O punto pódese situar facendo clic no mapa. **Sitúa o punto sobre o edificio.**",
+            "search": "Hai moitos elementos distintos que poden ser representados mediante puntos. O punto que acabas de engadir é unha Cafetería. **Busca por '{name}'**",
+            "choose": "**Escolle Cafetería na lista.**",
+            "describe": "Agora o punto está marcado como unha cafetería. Utilizando o editor de elementos, podemos engadir máis información acerca do elemento. **Engade un nome.**",
+            "close": "O editor de elementos pódese cerrar facendo clic no botón de cerrar. **Cerra o editor de elementos.**",
+            "reselect": "Haberá veces que os puntos xa existan pero que teñan erros ou estean incompletos. Podemos editar puntos existentes. **Selecciona o punto que acabas de crear.**",
+            "fixname": "**Cámbialle o nome e cerra o editor de elementos.**",
+            "reselect_delete": "Calquera elemento do mapa se pode eliminar. **Fai clic no punto que creaches.**",
+            "delete": "O menú que aparece arredor do punto contén operacións que se lle poden aplicar, incluindo a opción de borrar. **Borra o punto.**"
+        },
+        "areas": {
+            "title": "Áreas",
+            "add": "As áreas son unha maneira máis detallada de representar elementos, xa que dan información sobre os límites do elemento. As áreas pódense usar para a maioría dos tipos de elemento para os que se poden usar os puntos, e normalmente son a opción preferida. **Fai clic no botón \"Área\" para engadir unha nova área.**",
+            "corner": "As áreas debúxanse colocando vértices que marquen os límites da área. **Sitúa o vértice inicial nunha das esquinas do parque infantil.**",
+            "place": "Debuxa a área situando máis vértices. Finaliza a área facendo clic no vértice inicial. **Debuxa unha área para o parque infantil.**",
+            "search": "**Busca por '{name}'.**",
+            "choose": "**Elixe Parque Infantil na lista.**",
+            "describe": "**Engade un nome, e pecha o editor de elementos.**"
+        },
+        "lines": {
+            "title": "Liñas",
+            "add": "As liñas úsanse para representar elementos tales como estradas, vías do tren ou ríos. **Fai clic no botón \"Liña\" para engadir unha nova liña.**",
+            "start": "**Inicia a liña facendo clic no final da estrada.**",
+            "intersect": "Fai clic para engadir máis vértices á liña. Se é necesario, podes arrastrar o mapa mentras debuxas. As estradas, igual que moitos outros tipos de liñas, forman parte de unha rede máis grande. É importante que estas liñas estean conectadas correctamente para que as aplicacións de enrutamento poidan funcionar. **Fai clic na rúa Flower Street para crear unha intersección conectando as dúas liñas.**",
+            "finish": "As liñas pódense finalizar facendo clic outra vez no último vértice. **Finaliza a estrada.**",
+            "road": "**Selecciona \"Estrada\" na lista.**",
+            "residential": "Hai diferentes tipos de estradas. A máis común delas é a rúa urbana. **Escolle o tipo de estrada \"Rúa urbana\".**",
+            "describe": "**Ponlle nome á estrada e cerra o editor de elementos.**",
+            "restart": "A estrada debe intersectar coa rúa Flower Street.",
+            "wrong_preset": "Non seleccionaches o tipo de rúa urbana. **Fai clic aquí para volver a escoller.**"
+        },
+        "startediting": {
+            "title": "Comezar a editar",
+            "help": "Máis documentación e este titorial están dispoñibles aquí.",
+            "save": "Non te esquezas de gardar regularmente os teus cambios!",
+            "start": "Comeza a cartografiar!"
+        }
+    },
+    "presets": {
+        "categories": {
+            "category-building": {
+                "name": "Edificio"
+            },
+            "category-landuse": {
+                "name": "Uso do solo"
+            },
+            "category-path": {
+                "name": "Camiño"
+            },
+            "category-rail": {
+                "name": "Ferrocarril"
+            },
+            "category-road": {
+                "name": "Estrada"
+            },
+            "category-route": {
+                "name": "Ruta"
+            },
+            "category-water-area": {
+                "name": "Auga"
+            },
+            "category-water-line": {
+                "name": "Auga"
+            }
+        },
+        "fields": {
+            "access": {
+                "label": "Acceso",
+                "placeholder": "Descoñecido",
+                "types": {
+                    "access": "Xeral",
+                    "foot": "A pé",
+                    "motor_vehicle": "Automóbiles",
+                    "bicycle": "Bicicletas",
+                    "horse": "Cabalos"
+                },
+                "options": {
+                    "yes": {
+                        "title": "Permitido",
+                        "description": "Acceso permitido pola lei; un dereito de paso"
+                    },
+                    "no": {
+                        "title": "Prohibido",
+                        "description": "Acceso non permitido ao público en xeral"
+                    },
+                    "permissive": {
+                        "title": "Permisivo",
+                        "description": "Acceso permitido ata que o propietario revogue o permiso"
+                    },
+                    "private": {
+                        "title": "Privado",
+                        "description": "Acceso permitido só coa autorización do propietario de forma individual"
+                    },
+                    "designated": {
+                        "title": "Designado",
+                        "description": "Acceso permitido segundo sinais ou ordenanzas locais específicas"
+                    },
+                    "destination": {
+                        "title": "Destino",
+                        "description": "Acceso permitido só para chegar a un destino determinado"
+                    }
+                }
+            },
+            "address": {
+                "label": "Enderezo",
+                "placeholders": {
+                    "number": "123",
+                    "street": "Rúa",
+                    "city": "Cidade",
+                    "postcode": "Código postal"
+                }
+            },
+            "admin_level": {
+                "label": "Nivel administrativo"
+            },
+            "aeroway": {
+                "label": "Tipo"
+            },
+            "amenity": {
+                "label": "Tipo"
+            },
+            "atm": {
+                "label": "Caixeiro automático"
+            },
+            "barrier": {
+                "label": "Tipo"
+            },
+            "bicycle_parking": {
+                "label": "Tipo"
+            },
+            "boundary": {
+                "label": "Tipo"
+            },
+            "building": {
+                "label": "Edificio"
+            },
+            "building_area": {
+                "label": "Edificio"
+            },
+            "capacity": {
+                "label": "Capacidade",
+                "placeholder": "50, 100, 200..."
+            },
+            "cardinal_direction": {
+                "label": "Sentido"
+            },
+            "clock_direction": {
+                "label": "Sentido",
+                "options": {
+                    "clockwise": "Sentido horario",
+                    "anticlockwise": "Sentido antihorario"
+                }
+            },
+            "collection_times": {
+                "label": "Horario de recollida"
+            },
+            "construction": {
+                "label": "Tipo"
+            },
+            "country": {
+                "label": "País"
+            },
+            "crossing": {
+                "label": "Tipo"
+            },
+            "cuisine": {
+                "label": "Cociña"
+            },
+            "denomination": {
+                "label": "Denominación"
+            },
+            "denotation": {
+                "label": "Denotación"
+            },
+            "description": {
+                "label": "Descrición"
+            },
+            "elevation": {
+                "label": "Altitude"
+            },
+            "emergency": {
+                "label": "Emerxencia"
+            },
+            "entrance": {
+                "label": "Tipo"
+            },
+            "fax": {
+                "label": "Fax",
+                "placeholder": "+34 989 12 34 56"
+            },
+            "fee": {
+                "label": "Tarifa"
+            },
+            "fixme": {
+                "label": "Amáñame"
+            },
+            "highway": {
+                "label": "Tipo"
+            },
+            "historic": {
+                "label": "Tipo"
+            },
+            "incline": {
+                "label": "Inclinación"
+            },
+            "internet_access": {
+                "label": "Acceso a internet",
+                "options": {
+                    "wlan": "Wi-Fi",
+                    "wired": "Por cable",
+                    "terminal": "Terminal"
+                }
+            },
+            "landuse": {
+                "label": "Tipo"
+            },
+            "lanes": {
+                "label": "Carrís",
+                "placeholder": "1, 2, 3..."
+            },
+            "layer": {
+                "label": "Capa"
+            },
+            "leisure": {
+                "label": "Tipo"
+            },
+            "levels": {
+                "label": "Niveis",
+                "placeholder": "2, 4, 6..."
+            },
+            "lit": {
+                "label": "Iluminado"
+            },
+            "location": {
+                "label": "Localización"
+            },
+            "man_made": {
+                "label": "Tipo"
+            },
+            "maxspeed": {
+                "label": "Límite de velocidade",
+                "placeholder": "40, 50, 60..."
+            },
+            "name": {
+                "label": "Nome",
+                "placeholder": "Nome común (se existe)"
+            },
+            "natural": {
+                "label": "Natural"
+            },
+            "network": {
+                "label": "Rede"
+            },
+            "note": {
+                "label": "Nota"
+            },
+            "office": {
+                "label": "Tipo"
+            },
+            "oneway": {
+                "label": "Sentido único"
+            },
+            "oneway_yes": {
+                "label": "Sentido único"
+            },
+            "opening_hours": {
+                "label": "Horas"
+            },
+            "operator": {
+                "label": "Operador"
+            },
+            "parking": {
+                "label": "Tipo"
+            },
+            "phone": {
+                "label": "Teléfono",
+                "placeholder": "+34 989 12 34 56"
+            },
+            "place": {
+                "label": "Tipo"
+            },
+            "power": {
+                "label": "Tipo"
+            },
+            "railway": {
+                "label": "Tipo"
+            },
+            "ref": {
+                "label": "Referencia"
+            },
+            "relation": {
+                "label": "Tipo"
+            },
+            "religion": {
+                "label": "Relixión",
+                "options": {
+                    "christian": "Cristiá",
+                    "muslim": "Musulmá",
+                    "buddhist": "Budista",
+                    "jewish": "Xudía",
+                    "hindu": "Hinduísta",
+                    "shinto": "Xintoísta",
+                    "taoist": "Taoísta"
+                }
+            },
+            "restriction": {
+                "label": "Tipo"
+            },
+            "route": {
+                "label": "Tipo"
+            },
+            "route_master": {
+                "label": "Tipo"
+            },
+            "sac_scale": {
+                "label": "Dificultade do sendeiro"
+            },
+            "service": {
+                "label": "Tipo"
+            },
+            "shelter": {
+                "label": "Refuxio"
+            },
+            "shop": {
+                "label": "Tipo"
+            },
+            "source": {
+                "label": "Fonte"
+            },
+            "sport": {
+                "label": "Deporte"
+            },
+            "structure": {
+                "label": "Estructura",
+                "placeholder": "Descoñecido",
+                "options": {
+                    "bridge": "Ponte",
+                    "tunnel": "Túnel",
+                    "embankment": "Terraplén",
+                    "cutting": "Desmonte"
+                }
+            },
+            "supervised": {
+                "label": "Vixiado"
+            },
+            "surface": {
+                "label": "Superficie"
+            },
+            "tourism": {
+                "label": "Tipo"
+            },
+            "towertype": {
+                "label": "Tipo de torre"
+            },
+            "tracktype": {
+                "label": "Tipo"
+            },
+            "trail_visibility": {
+                "label": "Visibilidade do sendeiro"
+            },
+            "water": {
+                "label": "Tipo"
+            },
+            "waterway": {
+                "label": "Tipo"
+            },
+            "website": {
+                "label": "Sitio web",
+                "placeholder": "http://exemplo.com/"
+            },
+            "wetland": {
+                "label": "Tipo"
+            },
+            "wheelchair": {
+                "label": "Acceso para silla de rodas"
+            },
+            "wikipedia": {
+                "label": "Wikipedia"
+            },
+            "wood": {
+                "label": "Tipo"
+            }
+        },
+        "presets": {
+            "address": {
+                "name": "Enderezo"
+            },
+            "aeroway": {
+                "name": "Vía aérea"
+            },
+            "aeroway/aerodrome": {
+                "name": "Aeroporto",
+                "terms": "aeroporto, avión, aeródromo, terminal"
+            },
+            "aeroway/helipad": {
+                "name": "Heliporto",
+                "terms": "heliporto, helicóptero"
+            },
+            "amenity": {
+                "name": "Instalacións"
+            },
+            "amenity/atm": {
+                "name": "Caixeiro automático"
+            },
+            "amenity/bank": {
+                "name": "Banco",
+                "terms": "banco, caixa, entidade financeira"
+            },
+            "amenity/bar": {
+                "name": "Bar"
+            },
+            "amenity/bench": {
+                "name": "Banco"
+            },
+            "amenity/bicycle_parking": {
+                "name": "Aparcadoiro de Bicicletas"
+            },
+            "amenity/bicycle_rental": {
+                "name": "Alugamento de Bicicletas"
+            },
+            "amenity/cafe": {
+                "name": "Cafetería",
+                "terms": "cafetería, café, bar"
+            },
+            "amenity/car_rental": {
+                "name": "Aluguer de automóbiles"
+            },
+            "amenity/car_wash": {
+                "name": "Lavado de automóbiles"
+            },
+            "amenity/cinema": {
+                "name": "Cine"
+            },
+            "amenity/courthouse": {
+                "name": "Pazo de xustiza"
+            },
+            "amenity/drinking_water": {
+                "name": "Fonte"
+            },
+            "amenity/embassy": {
+                "name": "Embaixada"
+            },
+            "amenity/fast_food": {
+                "name": "Comida Rápida"
+            },
+            "amenity/fire_station": {
+                "name": "Parque de Bombeiros"
+            },
+            "amenity/fountain": {
+                "name": "Fonte ornamental"
+            },
+            "amenity/fuel": {
+                "name": "Gasolineira"
+            },
+            "amenity/grave_yard": {
+                "name": "Cemiterio"
+            },
+            "amenity/hospital": {
+                "name": "Hospital"
+            },
+            "amenity/kindergarten": {
+                "name": "Gardería"
+            },
+            "amenity/library": {
+                "name": "Biblioteca"
+            },
+            "amenity/marketplace": {
+                "name": "Mercado"
+            },
+            "amenity/parking": {
+                "name": "Aparcadoiro de Automóviles"
+            },
+            "amenity/pharmacy": {
+                "name": "Farmacia"
+            },
+            "amenity/place_of_worship": {
+                "name": "Lugar de Culto",
+                "terms": "lugar de culto, igrexa, templo, capela, basílica, parroquia, santuario, ermida, catedral, sinagoga, mesquita"
+            },
+            "amenity/place_of_worship/christian": {
+                "name": "Igrexa",
+                "terms": "igrexa, capela, parroquia, templo, ermida, santuario"
+            },
+            "amenity/place_of_worship/jewish": {
+                "name": "Sinagoga"
+            },
+            "amenity/place_of_worship/muslim": {
+                "name": "Mesquita"
+            },
+            "amenity/police": {
+                "name": "Policía",
+                "terms": "policía, comisaría, cuartel, policía local, policía nacional, garda civil, forzas de seguridade"
+            },
+            "amenity/post_box": {
+                "name": "Caixa do correo",
+                "terms": "correo, buzón, correos, mensaxería, postal"
+            },
+            "amenity/post_office": {
+                "name": "Oficina de Correos"
+            },
+            "amenity/pub": {
+                "name": "Pub"
+            },
+            "amenity/restaurant": {
+                "name": "Restaurante",
+                "terms": "restaurante, mesón, taberna, comedor, comida, comer, xantar, cear, menú"
+            },
+            "amenity/school": {
+                "name": "Escola",
+                "terms": "escola, colexio, instituto, educación, ensinanza, primaria, secundaria, ESO, bacharelato"
+            },
+            "amenity/swimming_pool": {
+                "name": "Piscina"
+            },
+            "amenity/telephone": {
+                "name": "Teléfono"
+            },
+            "amenity/theatre": {
+                "name": "Teatro"
+            },
+            "amenity/toilets": {
+                "name": "Aseos"
+            },
+            "amenity/townhall": {
+                "name": "Casa do Concello",
+                "terms": "casa do concello, concello, ayuntamiento, municipal"
+            },
+            "amenity/university": {
+                "name": "Universidade"
+            },
+            "amenity/waste_basket": {
+                "name": "Papeleira",
+                "terms": "papeleira, lixo, basura"
+            },
+            "area": {
+                "name": "Área"
+            },
+            "barrier": {
+                "name": "Barreira"
+            },
+            "barrier/block": {
+                "name": "Bloque"
+            },
+            "barrier/bollard": {
+                "name": "Bolardo"
+            },
+            "barrier/city_wall": {
+                "name": "Muralla"
+            },
+            "barrier/entrance": {
+                "name": "Entrada"
+            },
+            "barrier/fence": {
+                "name": "Valado"
+            },
+            "barrier/gate": {
+                "name": "Porta"
+            },
+            "barrier/lift_gate": {
+                "name": "Barreira levadiza"
+            },
+            "barrier/retaining_wall": {
+                "name": "Muro de contención"
+            },
+            "barrier/toll_booth": {
+                "name": "Peaxe"
+            },
+            "barrier/wall": {
+                "name": "Muro"
+            },
+            "boundary/administrative": {
+                "name": "Límite administrativo"
+            },
+            "building": {
+                "name": "Edificio"
+            },
+            "building/cathedral": {
+                "name": "Catedral"
+            },
+            "building/chapel": {
+                "name": "Capela"
+            },
+            "building/church": {
+                "name": "Igrexa"
+            },
+            "building/construction": {
+                "name": "Edificio en construcción"
+            },
+            "building/garage": {
+                "name": "Garaxe"
+            },
+            "building/house": {
+                "name": "Casa"
+            },
+            "building/hut": {
+                "name": "Refuxio"
+            },
+            "emergency/phone": {
+                "name": "Teléfono de emerxencia"
+            },
+            "footway/sidewalk": {
+                "name": "Beirarrúa"
+            },
+            "highway": {
+                "name": "Estrada"
+            },
+            "highway/bridleway": {
+                "name": "Camiño de ferradura",
+                "terms": "camiño de ferradura, camiño de cabalos, senda ecuestre"
+            },
+            "highway/bus_stop": {
+                "name": "Parada de Autobús"
+            },
+            "highway/crossing": {
+                "name": "Paso de peóns",
+                "terms": "paso peonil, paso peatonal, paso de cebra"
+            },
+            "highway/cycleway": {
+                "name": "Senda Ciclista"
+            },
+            "highway/footway": {
+                "name": "Senda Peonil"
+            },
+            "highway/living_street": {
+                "name": "Rúa residencial"
+            },
+            "highway/motorway": {
+                "name": "Autovía"
+            },
+            "highway/motorway_link": {
+                "name": "Enlace de autovía",
+                "terms": "autovía, autopista, enlace, entrada, saída, acceso"
+            },
+            "highway/path": {
+                "name": "Camiño"
+            },
+            "highway/pedestrian": {
+                "name": "Rúa peonil"
+            },
+            "highway/primary": {
+                "name": "Estrada Primaria"
+            },
+            "highway/primary_link": {
+                "name": "Enlace a estrada primaria"
+            },
+            "highway/residential": {
+                "name": "Rúa urbana"
+            },
+            "highway/road": {
+                "name": "Vía de categoría descoñecida"
+            },
+            "highway/secondary": {
+                "name": "Estrada Secundaria"
+            },
+            "highway/secondary_link": {
+                "name": "Enlace a estrada secundaria"
+            },
+            "highway/service": {
+                "name": "Vía de Servicio"
+            },
+            "highway/steps": {
+                "name": "Escaleiras"
+            },
+            "highway/tertiary": {
+                "name": "Estrada Terciaria"
+            },
+            "highway/tertiary_link": {
+                "name": "Enlace a estrada terciaria"
+            },
+            "highway/track": {
+                "name": "Pista"
+            },
+            "highway/traffic_signals": {
+                "name": "Semáforo"
+            },
+            "highway/trunk": {
+                "name": "Estrada Troncal"
+            },
+            "highway/trunk_link": {
+                "name": "Enlace a estrada troncal"
+            },
+            "highway/turning_circle": {
+                "name": "Círculo de Xiro"
+            },
+            "highway/unclassified": {
+                "name": "Vía sen clasificación"
+            },
+            "historic": {
+                "name": "Lugar Histórico"
+            },
+            "historic/archaeological_site": {
+                "name": "Sitio arqueolóxico"
+            },
+            "historic/boundary_stone": {
+                "name": "Marco",
+                "terms": "marco, fito, mollón, mouteira, linde, pedra"
+            },
+            "historic/castle": {
+                "name": "Castelo"
+            },
+            "historic/memorial": {
+                "name": "Monumento"
+            },
+            "historic/monument": {
+                "name": "Monumento"
+            },
+            "historic/ruins": {
+                "name": "Ruinas"
+            },
+            "historic/wayside_cross": {
+                "name": "Cruceiro"
+            },
+            "historic/wayside_shrine": {
+                "name": "Peto de ánimas"
+            },
+            "landuse": {
+                "name": "Uso do Solo"
+            },
+            "landuse/allotments": {
+                "name": "Horta"
+            },
+            "landuse/basin": {
+                "name": "Cunca"
+            },
+            "landuse/cemetery": {
+                "name": "Cemiterio"
+            },
+            "landuse/commercial": {
+                "name": "Comercial"
+            },
+            "landuse/construction": {
+                "name": "Construción"
+            },
+            "landuse/farm": {
+                "name": "Terra de cultivo"
+            },
+            "landuse/farmyard": {
+                "name": "Granxa"
+            },
+            "landuse/forest": {
+                "name": "Forestal"
+            },
+            "landuse/grass": {
+                "name": "Herba"
+            },
+            "landuse/industrial": {
+                "name": "Industrial"
+            },
+            "landuse/meadow": {
+                "name": "Campo"
+            },
+            "landuse/orchard": {
+                "name": "Pomar"
+            },
+            "landuse/quarry": {
+                "name": "Canteira"
+            },
+            "landuse/residential": {
+                "name": "Urbano"
+            },
+            "landuse/vineyard": {
+                "name": "Viña"
+            },
+            "leisure": {
+                "name": "Ocio"
+            },
+            "leisure/garden": {
+                "name": "Xardín"
+            },
+            "leisure/golf_course": {
+                "name": "Campo de Golf"
+            },
+            "leisure/park": {
+                "name": "Parque",
+                "terms": "parque, zona verde, xardín, alameda"
+            },
+            "leisure/pitch": {
+                "name": "Campo Deportivo"
+            },
+            "leisure/pitch/american_football": {
+                "name": "Campo de Fútbol Americano"
+            },
+            "leisure/pitch/baseball": {
+                "name": "Diamante de Béisbol"
+            },
+            "leisure/pitch/basketball": {
+                "name": "Cancha de Baloncesto"
+            },
+            "leisure/pitch/soccer": {
+                "name": "Campo de Fútbol"
+            },
+            "leisure/pitch/tennis": {
+                "name": "Cancha de Tenis"
+            },
+            "leisure/pitch/volleyball": {
+                "name": "Cancha de voleibol"
+            },
+            "leisure/playground": {
+                "name": "Parque Infantil"
+            },
+            "leisure/slipway": {
+                "name": "Rampla"
+            },
+            "leisure/stadium": {
+                "name": "Estadio"
+            },
+            "leisure/swimming_pool": {
+                "name": "Piscina"
+            },
+            "line": {
+                "name": "Liña"
+            },
+            "man_made": {
+                "name": "Estructura artificial"
+            },
+            "man_made/lighthouse": {
+                "name": "Faro"
+            },
+            "man_made/pier": {
+                "name": "Embarcadoiro"
+            },
+            "man_made/pipeline": {
+                "name": "Tubería"
+            },
+            "man_made/survey_point": {
+                "name": "Vértice Xeodésico"
+            },
+            "man_made/tower": {
+                "name": "Torre"
+            },
+            "man_made/wastewater_plant": {
+                "name": "Depuradora de augas"
+            },
+            "man_made/water_tower": {
+                "name": "Torre de auga"
+            },
+            "man_made/water_well": {
+                "name": "Pozo"
+            },
+            "natural": {
+                "name": "Natural"
+            },
+            "natural/bay": {
+                "name": "Baía"
+            },
+            "natural/beach": {
+                "name": "Praia"
+            },
+            "natural/cliff": {
+                "name": "Cantil"
+            },
+            "natural/coastline": {
+                "name": "Liña de costa",
+                "terms": "liña de costa, costa, litoral, ribeira"
+            },
+            "natural/glacier": {
+                "name": "Glaciar"
+            },
+            "natural/grassland": {
+                "name": "Pradeira"
+            },
+            "natural/heath": {
+                "name": "Páramo"
+            },
+            "natural/peak": {
+                "name": "Cume",
+                "terms": "pico, cume, montaña, monte, cúspide"
+            },
+            "natural/scrub": {
+                "name": "Matogueira"
+            },
+            "natural/spring": {
+                "name": "Manancial"
+            },
+            "natural/tree": {
+                "name": "Árbore"
+            },
+            "natural/water": {
+                "name": "Auga"
+            },
+            "natural/water/lake": {
+                "name": "Lago",
+                "terms": "lago, lagoa, charca, auga"
+            },
+            "natural/water/pond": {
+                "name": "Estanque",
+                "terms": "auga, estanque, lagoa, charca"
+            },
+            "natural/water/reservoir": {
+                "name": "Encoro"
+            },
+            "natural/wetland": {
+                "name": "Pantano"
+            },
+            "natural/wood": {
+                "name": "Bosque"
+            },
+            "office": {
+                "name": "Oficina"
+            },
+            "place": {
+                "name": "Lugar"
+            },
+            "place/city": {
+                "name": "Cidade"
+            },
+            "place/hamlet": {
+                "name": "Aldea"
+            },
+            "place/island": {
+                "name": "Illa",
+                "terms": "illa, isla, illote, insua"
+            },
+            "place/isolated_dwelling": {
+                "name": "Vivenda illada"
+            },
+            "place/locality": {
+                "name": "Lugar"
+            },
+            "place/town": {
+                "name": "Cidade"
+            },
+            "place/village": {
+                "name": "Vila"
+            },
+            "point": {
+                "name": "Punto"
+            },
+            "power": {
+                "name": "Rede eléctrica"
+            },
+            "power/generator": {
+                "name": "Xerador de enerxía"
+            },
+            "power/line": {
+                "name": "Liña de alta tensión"
+            },
+            "power/pole": {
+                "name": "Poste eléctrico"
+            },
+            "power/sub_station": {
+                "name": "Subestación"
+            },
+            "power/tower": {
+                "name": "Torre de alta tensión"
+            },
+            "power/transformer": {
+                "name": "Transformador"
+            },
+            "railway": {
+                "name": "Ferrocarril"
+            },
+            "railway/abandoned": {
+                "name": "Ferrocarril abandonado"
+            },
+            "railway/disused": {
+                "name": "Ferrocarril en desuso"
+            },
+            "railway/level_crossing": {
+                "name": "Paso a nivel"
+            },
+            "railway/monorail": {
+                "name": "Monorraíl"
+            },
+            "railway/platform": {
+                "name": "Plataforma"
+            },
+            "railway/rail": {
+                "name": "Vía de tren"
+            },
+            "railway/station": {
+                "name": "Estación de ferrocarril"
+            },
+            "railway/subway": {
+                "name": "Metro"
+            },
+            "railway/subway_entrance": {
+                "name": "Entrada de Metro"
+            },
+            "railway/tram": {
+                "name": "Tranvía"
+            },
+            "relation": {
+                "name": "Relación"
+            },
+            "shop": {
+                "name": "Tenda"
+            },
+            "shop/bakery": {
+                "name": "Panadería"
+            },
+            "shop/beauty": {
+                "name": "Salón de beleza"
+            },
+            "shop/bicycle": {
+                "name": "Tenda de bicicletas"
+            },
+            "shop/books": {
+                "name": "Librería"
+            },
+            "shop/butcher": {
+                "name": "Carnicería"
+            },
+            "shop/car": {
+                "name": "Concesionario"
+            },
+            "shop/car_parts": {
+                "name": "Tenda de recambios de automóbiles"
+            },
+            "shop/car_repair": {
+                "name": "Taller de reparación de vehículos"
+            },
+            "shop/chemist": {
+                "name": "Droguería"
+            },
+            "shop/clothes": {
+                "name": "Tenda de roupa"
+            },
+            "shop/computer": {
+                "name": "Tenda de informática"
+            },
+            "shop/electronics": {
+                "name": "Tenda de electrodomésticos"
+            },
+            "shop/florist": {
+                "name": "Florería"
+            },
+            "shop/furniture": {
+                "name": "Tenda de mobles"
+            },
+            "shop/garden_centre": {
+                "name": "Centro de xardinería"
+            },
+            "shop/greengrocer": {
+                "name": "Froitería"
+            },
+            "shop/hairdresser": {
+                "name": "Perruquería"
+            },
+            "shop/hardware": {
+                "name": "Ferretería"
+            },
+            "shop/jewelry": {
+                "name": "Xoiería"
+            },
+            "shop/kiosk": {
+                "name": "Quiosco"
+            },
+            "shop/laundry": {
+                "name": "Lavandería"
+            },
+            "shop/mall": {
+                "name": "Centro comercial"
+            },
+            "shop/mobile_phone": {
+                "name": "Tenda de telefonía móvil"
+            },
+            "shop/motorcycle": {
+                "name": "Concesionario de motocicletas"
+            },
+            "shop/music": {
+                "name": "Tenda de música"
+            },
+            "shop/optician": {
+                "name": "Óptica"
+            },
+            "shop/pet": {
+                "name": "Tenda de mascotas"
+            },
+            "shop/shoes": {
+                "name": "Zapatería"
+            },
+            "shop/stationery": {
+                "name": "Papelería"
+            },
+            "shop/supermarket": {
+                "name": "Supermercado"
+            },
+            "shop/toys": {
+                "name": "Tenda de xoguetes"
+            },
+            "shop/travel_agency": {
+                "name": "Axencia de viaxes"
+            },
+            "shop/tyres": {
+                "name": "Tenda de neumáticos"
+            },
+            "shop/vacant": {
+                "name": "Local baleiro"
+            },
+            "shop/video": {
+                "name": "Videoclub"
+            },
+            "tourism": {
+                "name": "Turismo"
+            },
+            "tourism/alpine_hut": {
+                "name": "Cabana alpina"
+            },
+            "tourism/artwork": {
+                "name": "Obra artística"
+            },
+            "tourism/attraction": {
+                "name": "Atracción turística"
+            },
+            "tourism/camp_site": {
+                "name": "Cámping"
+            },
+            "tourism/caravan_site": {
+                "name": "Parque de Caravanas"
+            },
+            "tourism/chalet": {
+                "name": "Chalé"
+            },
+            "tourism/guest_house": {
+                "name": "Hostal",
+                "terms": "hostal, pensión, hospedaxe, fonda, pousada, aloxamento, habitación"
+            },
+            "tourism/hostel": {
+                "name": "Albergue"
+            },
+            "tourism/hotel": {
+                "name": "Hotel"
+            },
+            "tourism/information": {
+                "name": "Información"
+            },
+            "tourism/motel": {
+                "name": "Motel"
+            },
+            "tourism/museum": {
+                "name": "Museo"
+            },
+            "tourism/picnic_site": {
+                "name": "Zona de Picnic"
+            },
+            "tourism/theme_park": {
+                "name": "Parque de atraccións"
+            },
+            "tourism/viewpoint": {
+                "name": "Mirador"
+            },
+            "tourism/zoo": {
+                "name": "Zoo"
+            },
+            "type/boundary": {
+                "name": "Límite"
+            },
+            "type/boundary/administrative": {
+                "name": "Límite administrativo"
+            },
+            "type/restriction": {
+                "name": "Restrición"
+            },
+            "type/route": {
+                "name": "Ruta"
+            },
+            "type/route/bicycle": {
+                "name": "Ruta ciclista"
+            },
+            "type/route/bus": {
+                "name": "Ruta de autobús"
+            },
+            "vertex": {
+                "name": "Outro"
+            },
+            "waterway": {
+                "name": "Vía de Auga"
+            },
+            "waterway/canal": {
+                "name": "Canal"
+            },
+            "waterway/dam": {
+                "name": "Presa"
+            },
+            "waterway/ditch": {
+                "name": "Cuneta"
+            },
+            "waterway/drain": {
+                "name": "Cuneta"
+            },
+            "waterway/river": {
+                "name": "Río",
+                "terms": "río, regato, afluente, auga"
+            },
+            "waterway/riverbank": {
+                "name": "Ribeira do río"
+            },
+            "waterway/stream": {
+                "name": "Regato",
+                "terms": "río, regato, rego, torrente, auga"
+            },
+            "waterway/weir": {
+                "name": "Presa"
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/vendor/assets/iD/iD/locales/hr.json b/vendor/assets/iD/iD/locales/hr.json
index 90eb44463..b5a5fb851 100644
--- a/vendor/assets/iD/iD/locales/hr.json
+++ b/vendor/assets/iD/iD/locales/hr.json
@@ -71,20 +71,22 @@
                 "line": "Linija je zaokružena.",
                 "area": "Područje je zaokruženo."
             },
-            "not_closed": "Ovo se ne može zaokružiti jer nije zatvoren objekt."
+            "not_closed": "Ovo se ne može zaokružiti jer nije zatvoren objekt.",
+            "too_large": "Ovo se ne može zaokružiti jer se trenutno ne vidi cijeli objekt."
         },
         "orthogonalize": {
             "title": "Stavi pod pravi kut",
             "description": {
-                "line": "Stavi pod pravi kut uglove linije.",
-                "area": "Stavi pod pravi kut uglove područja."
+                "line": "Stavi pod pravi kut lomove linije.",
+                "area": "Stavi pod pravi kut ćoškove područja."
             },
             "key": "S",
             "annotation": {
                 "line": "Kutovi linije su pod pravim kutom.",
                 "area": "Kutovi područja su pod pravim kutom."
             },
-            "not_squarish": "Ovo se ne može ukvadratičiti jer nije kvadratičastog oblika."
+            "not_squarish": "Ovo se ne može ukvadratičiti jer nije kvadratičastog oblika.",
+            "too_large": "Ovo se ne može ukvadratičiti jer se trenutno ne vidi cijeli objekt."
         },
         "straighten": {
             "title": "Izravnaj",
@@ -180,6 +182,18 @@
             },
             "not_eligible": "Linije ne mogu biti razdvojene na svom početku ili kraju.",
             "multiple_ways": "Previše linija za razdvajanje."
+        },
+        "restriction": {
+            "help": {
+                "select": "Klikni za selektiranje dijela ceste.",
+                "toggle": "Klikni za uključivanje zabrane skretanja.",
+                "toggle_on": "Klikni za dodavanje \"{restriction}\" zabrane.",
+                "toggle_off": "Klikni za uklanjanje \"{restriction}\" zabrane."
+            },
+            "annotation": {
+                "create": "Zabrana skretanja je dodana",
+                "delete": "Zabrana skretanja je uklonjena"
+            }
         }
     },
     "undo": {
@@ -265,7 +279,8 @@
         "percent_brightness": "{opacity}% svjetline",
         "none": "Nijedna",
         "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.",
+        "custom_button": "Uredi prilagođenu pozadinu",
+        "custom_prompt": "Unesi URL 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"
     },
@@ -336,11 +351,11 @@
         "help": "# Pomoć\n\niD je program za uređivanje [OpenStreetMap](http://www.openstreetmap.org/), \nbesplatne karte svijeta. Možeš ga koristiti za dodavanje i obnavljanje podataka u \nsvom području, čime stvaraš bolju kartu svijeta slobodnih izvornika i podataka \ndostupnu svima.\n\nKorekcije koje napraviš na karti će biti vidljive svakome tko koristi\nOpenStreetMap. Da bi mogao/la uređivati kartu, trebaš [besplatni\nOpenStreetMap korisnički račun](https://www.openstreetmap.org/user/new).\n\n[iD editor](http://ideditor.com/) je suradnički projekt sa [izvornim kôdom dostupnim \nna GitHub-u](https://github.com/openstreetmap/iD).\n",
         "editing_saving": "# Uređivanje i spremanje promjena\n\nOvaj uređivač je primarno dizajniran za uređivanje na mreži i trenutačno ga\nkoristiš kroz internet preglednik kao web stranicu.\n\n### Odabir značajki\n\nZa odabir značajke karte, npr. ceste ili točke od interesa, klikni na nju na karti.\nPojaviti će se obrub oko značajke, otvoriti će se bočno okno koje prikazuje više\ndetalja o značajki i prikazati će se alatni izbornik sa mogućnostima koje možeš\nnapraviti na značajki.\n\nZa odabir nekoliko značajki istovremeno, drži tipku \"Shift\". Zatim ili klikni na\nznačajke koje želiš odabrati ili klikni i povuci za crtanje četverokuta. Time ćeš\nodabrati sve točke unutar četverokuta.\n\n### Spremanje uređivanja\n\nKada napraviš promjene na karti, npr. urediš ulice, zgrade i mjesta, one su\nspremljene lokalno sve dok ih ne spremiš na server. Nemoraš se briniti ukoliko\nnapraviš pogrešku - možeš poništiti promjene klikom na tipku \"Opovrgni\" i\nponoviti promjene klikom na tipku \"Ponovi\".\n\nKlikni na tipku \"Spremi\" da završiš grupu promjena - na primjer ako si završio/la\npodručje grada i želiš početi uređivati novo područje. Nakon što stisneš \"Spremi\"\nmoći ćeš pregledati sve promjene koje si napravio/la i uređivač će ti dati korisne\nprijedloge i upozorenja ako je nešto neuobičajeno među promjenama.\n\nAko je sve u redu, možeš ostaviti kratak komentar u kojem ćeš opisati napravljenu\npromjenu na karti. Ponovno klikni \"Spremi\" za postavljanje promjena na\n[OpenStreetMap.org](http://www.openstreetmap.org/), gdje će biti vidljive svim\ndrugim korisnicima i dostupne drugima za dopunu i nadogradnju.\n\nAko ne možeš završiti sve planirane promjene odjednom, možeš ugasiti prozor\nuređivača i kasnije se vratiti (na isti internet preglednik i isto računalo) i uređivač\nće ti ponuditi da nastaviš gdje si stao/la. \n",
         "roads": "# Ceste\n\nMožeš stvarati, popraviti/urediti i obrisati ceste pomoću ovog uređivača. Ceste\nmogu biti svih vrsta: puteljci, ceste, poljski putovi, biciklističke staze i drugo -\nsve staze preko kojih se često prolazi bi se trebale kartirati.\n\n### Odabir\n\nKlikni na cestu da ju odabereš. Pojaviti će se obrub oko ceste, zajedno s\nmalim alatnim izbornikom na karti i bočnim oknom koji prikazuje dodatne\ninformacije o selektiranoj cesti.\n\n### Uređivanje\n\nČesto ćeš vidjeti ceste koje se ne podudaraju s pozadinskim snimcima ili s\nGNSS tragom. Možeš urediti te ceste tako da se nalaze na ispravnom mjestu.\n\nPrvo klikni na cestu koju želiš urediti. To će ju označiti i prikazati kontrolne\ntočke unutar nje koje možeš premjestiti na točnije lokacije. Ako želiš dodati\nnove kontrolne točke za precizniju putanju, klikni dvoklikom na dio ceste gdje\nnema točke kako bi dodao/la novu.\n\nAko se cesta spaja s drugom cestom, ali nije ispravno spojena na karti, možeš\npovući kontrolnu točku na drugu cestu kako bi ih spojio/la. Spojene ceste su\nvrlo važne za kartu i osnova za omogućavanje uputa za navigaciju.\n\nTakođer možeš kliknuti alat \"Premjesti\" ili pritisnuti kraticu - tipku `M` za\npomak cijele ceste odjednom i zatim kliknuti ponovno za spremanje tog\npomaka.\n\n### Brisanje\n\nAko je cesta potpuno krivo ucrtana - ne vidi se na satelitskim snimkama i ako\nsi utvrdio/la da zbilja ne postoji uvidom na terenu možeš ju obrisati, što će ju\nobrisati s karte. Budi oprezan/na kada brišeš značajke - kao i kod svakog\ndrugog uređivanja rezultati su vidljivi svima, a satelitske snimke su često\nzastarjele, pa je moguće da je cesta nedavno sagrađena.\n\nZa brisanje ceste najprije ju označi, a zatim klikni na ikonicu kante za smeće ili\npritisni tipku \"Delete\".\n\n### Stvaranje\n\nAko si pronašao/la cestu koja bi trebala biti ucrtana ali nije, klikni ikonicu\n\"Linija\" na gornjem lijevom dijelu uređivača ili pritisni kraticu - tipku `2` da\nzapočneš crtanje linije.\n\nKlikni na početak ceste na karti da započneš crtanje. Ako se cesta odvaja od\npostojeće ceste, klikni na mjesto gdje se spajaju.\n\nZatim klikni na točke duž ceste tako da prate ispravnu putanju ceste, prema\npodacima satelitske snimke ili GNSS traga. Ako se cesta koju crtaš križa s\ndrugom cestom, spoji ih klikom na mjestu raskrižja. Kada si završio/la s\ncrtanjem, klikni dvoklikom sastrane ili pritisni tipku \"Return\" ili \"Enter\" na\ntipkovnici.\n",
-        "gps": "# GNSS\n\nGNSS podaci su najpouzdaniji izvor podataka za OpenStreetMap. Ovaj\nuređivač podržava lokalne tragove - `.gpx` datoteteke sa tvog računala.\nTakav oblik GNSS traga možeš prikupiti s raznim aplikacijama za pametne\ntelefone kao i sa drugim GNSS/GPS uređajima.\n\nZa više informacija o postupku izmjere pomoću GNSS satelita, pročitaj članak\n[\"Mjerenje sa GPS-om\"](http://learnosm.org/en/beginner/using-gps/).\n\nKako bi koristio GPX tragove za kartiranje, povuci i ispusti GPX datoteku\nna uređivač karte. Ako se datoteka ispravno učita, biti će dodana na kartu\nkao linija svjetlo zelene boje. Klikni na izbornik \"Postavke pozadine\" s\ndesne strane za uključivanje, isključivanje ili povećanje na taj novi GPX sloj.\n\nGPX trag nije direktno postavljen na OpenStreetMap, samo je prikazan na\nkarti. Da bi ga iskoristio/la na najbolji način, preko njega crtaj na\nkarti koristeći ga kao vodilju za dodavanje novih značajki. Trag možeš također\n[postaviti na OpenStreetMap](http://www.openstreetmap.org/trace/create)\nkako bi ga i drugi korisnici mogli koristiti.\n",
+        "gps": "# GNSS\n\nPojam GNSS obuhvaća sve \"Globalne Navigacijske Satelitske Sustave\", to su: američki Navstar GPS, ruski GLONASS, europski GALILEO i kineski BEIDOU. Suvremeni uređaji često koriste signale više sustava istovremeno za određivanje pozicije. GNSS podaci su najpouzdaniji izvor podataka za OpenStreetMap. Ovaj\nuređivač podržava lokalne tragove - `.gpx` datoteteke koje se nalaze na tvom računalu.\nTakav oblik GNSS traga možeš prikupiti s raznim aplikacijama za pametne\ntelefone kao i sa drugim GNSS/GPS uređajima.\n\nZa više informacija o postupku izmjere pomoću GNSS satelita, pročitaj članak\n[\"Mjerenje sa GPS-om\"](http://learnosm.org/en/beginner/using-gps/).\n\nKako bi koristio GPX tragove za kartiranje, povuci i ispusti GPX datoteku\nna uređivač karte. Ako se datoteka ispravno učita, biti će dodana na kartu\nkao linija svjetlo zelene boje. Klikni na izbornik \"Postavke pozadine\" s\ndesne strane za uključivanje, isključivanje ili povećanje na taj novi GPX sloj.\n\nGPX trag nije direktno postavljen na OpenStreetMap, samo je prikazan na\nkarti. Da bi ga iskoristio/la na najbolji način, preko njega crtaj na\nkarti koristeći ga kao vodilju za dodavanje novih značajki. Trag možeš također\n[postaviti na OpenStreetMap](http://www.openstreetmap.org/trace/create)\nkako bi ga i drugi korisnici mogli koristiti.\n",
         "imagery": "# Fotografski snimci\n\nZračni snimci su važan izvor za kartiranje. Kombinacija snimaka iz aviona,\nsatelitskih snimaka i drugih besplatno prikupljenih izvornika je dostupna s\ndesne strane u izborniku \"Postavke pozadine\".\n\nPočetno je u pozadini prikazan sloj satelitskih snimaka [karte Bing Maps](http://www.bing.com/maps/). Novi izvornici postaju dostupni pomicanjem\ni povećanjem karte na novo geografsko područje. Neke države, poput SAD-a,\nFrancuske i Danske imaju dostupne vrlo kvalitetne snimke za određena\npodručja.\n\nSnimke su ponekad pomaknute u odnosu na podatke karte zbog pogreške\nna koordinatama izvornih snimaka. Ako vidiš puno cesta izmaknutih u\nodnosu na pozadinu, nemoj ih odmah pomicati da se poklope sa pozadinom.\nUmjesto toga, možeš podesiti snimke da odgovaraju postojećim podacima\ntako da klikneš \"Popravi odstupanje\" na dnu izbornika \"Postavke pozadine\".\n",
         "addresses": "# Adrese\n\nAdrese spadaju u najkorisnije informacije na karti.\n\nIako su adrese često prikazane kao dio ulica, na OpenStreetMap karti su zapisane\nkao svojstva građevina i mjesta uzduž ulica.\n\nMožeš dodati informacije o adresi na mjesta kartirana kao rub građevine, ali i na\ngrađevine koje su kartirane kao točkasti objekt. Najbolji izvor podataka o adresama\nje prikupljanje podataka na terenu ili iz osobnog znanja - kao i svake druge\nznačajke, kopiranje sa komercijalnih izvora poput Google Maps servisa je strogo\nzabranjeno.\n",
         "inspector": "# Korištenje preglednika\n\nPreglednik je element korisničkog sučelja na lijevoj strani stranice koji se pojavljuje\nnakon što se neka značajka odabere i on omogućava uređivanje detalja značajke.\n\n### Odabir vrste značajke\n\nNakon što dodaš točku, liniju ili područje, možeš odabrati koje je vrste ta značajka,\nnpr. je li to državna cesta ili ulica, veletrgovina ili kafić.\n\nPreglednik će prikazati tipke za često korištene vrste značajki, a ostale možeš\npronaći upisivanjem naziva vrste koju tražiš u okvir za pretraživanje.\n\nKlikni na \"i\" na desnoj strani vrste značajke da saznaš više o toj značajki. Klikni na\ntipku sa imenom vrste da odabereš tu vrstu.\n\n### Korištenje obrazaca i oznaka\n\nNakon što odabereš vrstu značajke ili kada odabereš značajku koja već ima\ndefeniranu vrstu, preglednik će ti prikazati polja sa detaljima o značajki, npr.\nnjezino ime i adresu.\n\nIspod polja možeš kliknuti na ikone za dodavanje drugih detalja, kao informacije sa\n[Wikipedije](http://www.wikipedia.org/), pristup invalidskim kolicima i drugo.\n\nNa dnu preglednika, klikni na \"Sve oznake\" za dodavanje proizvoljnih drugih\noznaka za značajke. [Taginfo](http://taginfo.openstreetmap.org/) je izvrstan\nizvornik za učenje o popularnim kombinacijama oznaka koje se koriste.\n\nPromjene koje napraviš u pregledniku su automatski primijenjene na kartu.\n\nMožeš poništiti promjene u bilo kojem trenutku pritiskom na tipku \"Opovrgni\".\n",
-        "buildings": "# Građevine\n\nOpenStreetMap je najveća svjetska baza podataka o građevinama. Možeš\nstvarati i unaprijediti tu bazu podataka.\n\n### Odabir\n\nMožeš odabrati građevinu klikom na njezin rub. Pojaviti će se obrub oko\ngrađevine i otvoriti će se mali alatni izbornik i bočno okno koje prikazuje više\ninformacija o građevini.\n\n### Uređivanje\n\nPonekad su građevine neispravno pozicionirane ili imaju netočna svojstva.\n\nZa premještanje cijele građevine, odaberi ju, a zatim klikni alat \"Premjesti\".\nPomakom miša namjesti točnu lokaciju građevine i zatim klikni lijevu tipku\nmiša.\n\nZa ispravak oblika zgrade, klikni i povlači rubne točke građevine na ispravnije\nmjesto.\n\n### Stvaranje\n\nJedno od glavnih pitanja u vezi dodavanja građevina na kartu je kako ih dodati\n- kao područje ili kao točke. Pravilo je da se građevine _crtaju kao područje\nkada je god to moguće_, a označavanje tvrtki, kuća, kućnih brojeva, usluga i\ndrugih stvari za koje se građevine koriste kao točke koje se nalaze unutar\npovršine građevine.\n\nZapočni crtanje građevine kao površine klikom na tipku \"Površina\" u gornjem\nlijevom uglu sučelja, a po završetku crtanja građevine pritisni tipku \"Return\"\nna tipkovnici ili klikni na početnu točku za zatvaranje oblika.\n\n### Brisanje\n\nAko je građevina potpuno krivo ucrtana - ne vidi se na satelitskim snimkama i\nako si utvrdio/la da zbilja ne postoji uvidom na terenu možeš ju obrisati, što će\nju obrisati s karte. Budi oprezan/na kada brišeš značajke - kao i kod svakog\ndrugog uređivanja rezultati su vidljivi svima, a satelitske snimke su često\nzastarjele, pa je moguće da je građevina nedavno sagrađena.\n\nMožeš obrisati građevinu tako da klikneš na rub za selektiranje, a zatim\nklikneš na ikonu kante za smeće ili pritiskom tipke \"Delete\" na tipkovnici.\n",
+        "buildings": "# Građevine\n\nOpenStreetMap je najveća svjetska baza podataka o građevinama. Možeš\nstvarati i unaprijediti tu bazu podataka.\n\n### Odabir\n\nMožeš odabrati građevinu klikom na njezin rub. Pojaviti će se obrub oko\ngrađevine i otvoriti će se mali alatni izbornik i bočno okno koje prikazuje više\ninformacija o građevini.\n\n### Uređivanje\n\nPonekad su građevine neispravno pozicionirane ili imaju netočna svojstva.\n\nZa premještanje cijele građevine, odaberi ju, a zatim klikni alat \"Premjesti\".\nPomakom miša namjesti točnu lokaciju građevine i zatim klikni lijevu tipku\nmiša.\n\nZa ispravak oblika zgrade, klikni i povlači rubne točke građevine na ispravnije\nmjesto.\n\n### Stvaranje\n\nJedno od glavnih pitanja u vezi dodavanja građevina na kartu je kako ih dodati\n- kao područje ili kao točke. Pravilo je da se građevine _crtaju kao područje\nkada je god to moguće_, a označavanje tvrtki, kuća, kućnih brojeva, usluga i\ndrugih stvari za koje se građevine koriste kao točke koje se nalaze unutar\npovršine građevine.\n\nZapočni crtanje građevine kao površine klikom na tipku \"Površina\" u gornjem\nlijevom kutu sučelja, a po završetku crtanja građevine pritisni tipku \"Return\"\nna tipkovnici ili klikni na početnu točku za zatvaranje oblika.\n\n### Brisanje\n\nAko je građevina potpuno krivo ucrtana - ne vidi se na satelitskim snimkama i\nako si utvrdio/la da zbilja ne postoji uvidom na terenu možeš ju obrisati, što će\nju obrisati s karte. Budi oprezan/na kada brišeš značajke - kao i kod svakog\ndrugog uređivanja rezultati su vidljivi svima, a satelitske snimke su često\nzastarjele, pa je moguće da je građevina nedavno sagrađena.\n\nMožeš obrisati građevinu tako da klikneš na rub za selektiranje, a zatim\nklikneš na ikonu kante za smeće ili pritiskom tipke \"Delete\" na tipkovnici.\n",
         "relations": "# Relacije\n\nRelacija je poseban oblik značajki na OpenStreetMap karti koja grupira druge\nznačajke. Na primjer, dvije često korištene relacije su *cestovne relacije*, koje\nmeđusobno grupiraju dijelove cesta koje zajedno pripadaju državnoj ili\nžupanijskoj cesti i *multipoligoni*, koji međusobno grupiraju nekoliko linija\nkoje definiraju složena područja (koja se sastoje od  više područja ili ona koja\nimaju rupu u sebi poput krafne).\n\nSkupine značajki u relaciji se nazivaju *članovi*. U bočnom oknu možeš vidjeti\nkojim sve relacijama značajka pripada i tamo kliknuti na relaciju kako bi ju\nodabrao/la. Kada je relacija odabrana možeš vidjeti sve njezine članove koji su\noznačeni na karti i izlistani u bočnom oknu.\n\niD će uglavnom automatski održavati relacije dok ti uređuješ kartu. Glavna\nstvar koje moraš biti svjestan/na je da ako obrišeš dio ceste da ju nacrtaš\npreciznije, trebaš provjeriti da je i novi dio član istih relacija kao i originalni\ndio.\n\n## Uređivanje relacija\n\nAko želiš uređivati relacije, ovdje su navedene osnove.\n\nZa dodavanje značajke nekoj relaciji, označi značajku, klikni tipku \"+\" u odjeljku\n\"Sve relacije\" na dnu bočnog okna i odaberi ili upiši ime relacije.\n\nZa stvaranje nove relacije, odaberi prvu značajku koja bi trebala biti član,\nzatim klikni tipku \"+\" u odjeljku \"Sve relacije\" i odaberi \"Nova relacija...\".\n\nZa odstranjivanje značajke iz relacije, odaberi značajku i klikni ikonu kante za\nsmeće pokraj relacije iz koje ju želiš ukloniti.\n\nMožeš stvarati višestruke poligone - multipoligone sa rupama pomoću alata\n\"Spoji\". Nacrtaj dva područja (unutarnje i vanjsko), drži tipku Shift i klikni na\noba područja kako bi ih selektirao/la i zatim klikni na tipku \"Spoji\" (+).\n"
     },
     "intro": {
@@ -349,7 +364,7 @@
             "drag": "Glavno područje karte prikazuje OpenStreetMap podatke iznad pozadine. Možeš mijenjati pogled povlačeći i pomičući, kao na svakoj drugoj web karti. **Pomakni prikaz karte!**",
             "select": "Značajke karte su prikazane na tri načina: koristeći točke, linije ili područja. Sve značajke mogu se odabrati klikom na njih. **Klikni na točku kako bi ju odabrao/la.**",
             "header": "Zaglavlje nam pokazuje tip svojstva.",
-            "pane": "Kada je značajka odabrana, prikazan je uređivač svojstava. Zaglavlje prikazuje tip značajke, a glavni prozor prikazuje njegova svojstva npr. naziv i adresu. **Zatvori uređivač svojstava sa gumbom x u gornjem desnom uglu.**"
+            "pane": "Kada je značajka odabrana, prikazan je uređivač svojstava. Zaglavlje prikazuje tip značajke, a glavni prozor prikazuje njegova svojstva npr. naziv i adresu. **Zatvori uređivač svojstava sa gumbom x u gornjem desnom kutu.**"
         },
         "points": {
             "title": "Točke",
@@ -1221,9 +1236,6 @@
             "building/detached": {
                 "name": "Samostojni dom"
             },
-            "building/entrance": {
-                "name": "Ulaz"
-            },
             "building/garage": {
                 "name": "Garaža"
             },
@@ -1369,9 +1381,6 @@
             "emergency/phone": {
                 "name": "Telefon za nuždu"
             },
-            "entrance": {
-                "name": "Ulaz"
-            },
             "golf/rough": {
                 "name": "Grubo"
             },
@@ -1405,9 +1414,6 @@
             "highway/motorway": {
                 "name": "Autocesta"
             },
-            "highway/motorway_junction": {
-                "name": "Sjecište autoceste"
-            },
             "highway/motorway_link": {
                 "name": "Pristupna cesta autoceste"
             },
@@ -1629,10 +1635,6 @@
                 "name": "Navoz za brodove",
                 "terms": "istezalište"
             },
-            "leisure/sports_center": {
-                "name": "Sportski centar",
-                "terms": "sportski centar,sport,dvorana,sportska dvorana,stadion,igralište"
-            },
             "leisure/stadium": {
                 "name": "Stadion"
             },
diff --git a/vendor/assets/iD/iD/locales/hu.json b/vendor/assets/iD/iD/locales/hu.json
index d8b27fc64..11e3f9ec3 100644
--- a/vendor/assets/iD/iD/locales/hu.json
+++ b/vendor/assets/iD/iD/locales/hu.json
@@ -71,7 +71,8 @@
                 "line": "Vonal köralakúvá tétele.",
                 "area": "Terület köralakúvá tétele."
             },
-            "not_closed": "Nem lehet köralakúvá tenni, mert nem hurok."
+            "not_closed": "Nem lehet köralakúvá tenni, mert nem hurok.",
+            "too_large": "Nem lehet körré igazítani, mert nem látszik az egész alakzat."
         },
         "orthogonalize": {
             "title": "Szögletesít",
@@ -84,7 +85,8 @@
                 "line": "Vonal sarkainak szögletesítése.",
                 "area": "Terület sarkainak szögletesítése."
             },
-            "not_squarish": "Nem lehet szögletesíteni, mert nem szögletes."
+            "not_squarish": "Nem lehet szögletesíteni, mert nem szögletes.",
+            "too_large": "Nem lehet négyszögesíteni, mert nem látszik az egész alakzat."
         },
         "straighten": {
             "title": "Kiegyenesít",
@@ -134,7 +136,8 @@
             "annotation": "{n} vonal egyesítve.",
             "not_eligible": "Az elemek nem egyesíthetőek.",
             "not_adjacent": "A vonalak nem egyesíthetőek, mert nincsenek összekapcsolva.",
-            "restriction": "A vonalak nem egyesíthetőek, mert legalább az egyikük egy \"{relation}\" kapcsolat tagja."
+            "restriction": "A vonalak nem egyesíthetőek, mert legalább az egyikük egy \"{relation}\" kapcsolat tagja.",
+            "incomplete_relation": "Nem sikerült az egyesítés, mert legalább egy elem nincs teljesen letöltve."
         },
         "move": {
             "title": "Mozgatás",
@@ -264,7 +267,8 @@
         "percent_brightness": "{opacity}% fényerő",
         "none": "Nincs",
         "custom": "Egyéni",
-        "custom_prompt": "Adj meg egy csempe sablont. Érvényes tokenek: {z}, {x}, {y} a Z/X/Y rendszerű URL-ekhez és {u} a kvadratikusakhoz.",
+        "custom_button": "Egyedi háttér szerkesztése",
+        "custom_prompt": "Adj meg egy csempe URL sablont. Érvényes tokenek: {z}, {x}, {y} a Z/X/Y rendszerű URL-ekhez és {u} a kvadratikusakhoz.",
         "fix_misalignment": "Eltolódás korrigálása",
         "reset": "visszavonás"
     },
@@ -395,6 +399,9 @@
             "category-building": {
                 "name": "Épület"
             },
+            "category-golf": {
+                "name": "Golf"
+            },
             "category-landuse": {
                 "name": "Területfunkció"
             },
@@ -568,6 +575,9 @@
             "description": {
                 "label": "Leírás"
             },
+            "electrified": {
+                "label": "Villamosítottság"
+            },
             "elevation": {
                 "label": "Tengerszint feletti magasság"
             },
@@ -590,6 +600,9 @@
             "fixme": {
                 "label": "JavítsKi"
             },
+            "fuel": {
+                "label": "Üzemanyag"
+            },
             "generator/method": {
                 "label": "Módszer"
             },
@@ -708,6 +721,18 @@
             "railway": {
                 "label": "Típus"
             },
+            "recycling/cans": {
+                "label": "Fémhulladékot elfogad"
+            },
+            "recycling/clothes": {
+                "label": "Használt ruhát elfogad"
+            },
+            "recycling/glass": {
+                "label": "Üveget elfogad"
+            },
+            "recycling/paper": {
+                "label": "Papírt elfogad"
+            },
             "ref": {
                 "label": "Azonosító"
             },
@@ -738,6 +763,9 @@
             "sac_scale": {
                 "label": "Ösvény nehézsége"
             },
+            "seasonal": {
+                "label": "Időszakos"
+            },
             "service": {
                 "label": "Típus"
             },
@@ -750,12 +778,18 @@
             "shop": {
                 "label": "Típus"
             },
+            "smoking": {
+                "label": "Dohányzó"
+            },
             "source": {
                 "label": "Forrás"
             },
             "sport": {
                 "label": "Sport"
             },
+            "sport_ice": {
+                "label": "Sport"
+            },
             "structure": {
                 "label": "Szerkezet",
                 "placeholder": "Ismeretlen",
@@ -766,6 +800,9 @@
                     "cutting": "Bevágás"
                 }
             },
+            "studio_type": {
+                "label": "Típus"
+            },
             "supervised": {
                 "label": "Felügyelt"
             },
@@ -790,6 +827,12 @@
             "tree_type": {
                 "label": "Típus"
             },
+            "trees": {
+                "label": "Fák"
+            },
+            "tunnel": {
+                "label": "Alagút"
+            },
             "vending": {
                 "label": "Termékek típusa"
             },
@@ -934,12 +977,28 @@
             "amenity/cinema": {
                 "name": "Mozi"
             },
+            "amenity/clinic": {
+                "name": "Klinika",
+                "terms": "Klinika, Rendelőintézet"
+            },
+            "amenity/clock": {
+                "name": "Óra",
+                "terms": "Óra"
+            },
             "amenity/college": {
                 "name": "Főiskola"
             },
             "amenity/courthouse": {
                 "name": "Bíróság"
             },
+            "amenity/dentist": {
+                "name": "Fogorvos",
+                "terms": "Fogorvos, Fogász, Fogászat"
+            },
+            "amenity/doctor": {
+                "name": "Orvos",
+                "terms": "Orvos, Doktor"
+            },
             "amenity/drinking_water": {
                 "name": "Ivóvíz"
             },
@@ -961,6 +1020,12 @@
             "amenity/grave_yard": {
                 "name": "Sírkert"
             },
+            "amenity/hospital": {
+                "name": "Kórház"
+            },
+            "amenity/kindergarten": {
+                "name": "Óvoda"
+            },
             "amenity/library": {
                 "name": "Könyvtár"
             },
@@ -1011,10 +1076,21 @@
             "amenity/restaurant": {
                 "name": "Étterem"
             },
+            "amenity/school": {
+                "name": "Iskola"
+            },
             "amenity/shelter": {
                 "name": "Menedék",
                 "terms": "fedett, fedél, esőház, esőkunyhó, menedékház"
             },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Hajléktalan menedék",
+                "terms": "Hajléktalan menedék"
+            },
+            "amenity/studio": {
+                "name": "Stúdió",
+                "terms": "Stúdió"
+            },
             "amenity/swimming_pool": {
                 "name": "Úszómedence"
             },
@@ -1040,6 +1116,10 @@
                 "name": "Árusító automata",
                 "terms": "italautomata, italgép"
             },
+            "amenity/veterinary": {
+                "name": "Állatorvos",
+                "terms": "Állatorvos, Állatorvosi rendelő"
+            },
             "amenity/waste_basket": {
                 "name": "Szemetes"
             },
@@ -1107,15 +1187,60 @@
             "building/apartments": {
                 "name": "Lakások"
             },
+            "building/barn": {
+                "name": "Pajta",
+                "terms": "Pajta"
+            },
+            "building/bunker": {
+                "name": "Bunker",
+                "terms": "Bunker"
+            },
+            "building/cabin": {
+                "name": "Faház",
+                "terms": "Faház"
+            },
+            "building/cathedral": {
+                "name": "Katedrális",
+                "terms": "Katedrális, Székesegyház"
+            },
+            "building/chapel": {
+                "name": "Kápolna",
+                "terms": "Kápolna, Imaház"
+            },
+            "building/church": {
+                "name": "Templom",
+                "terms": "Templom, Plébánia, Imaház"
+            },
             "building/commercial": {
                 "name": "Kereskedelmi épület"
             },
-            "building/entrance": {
-                "name": "Bejárat"
+            "building/construction": {
+                "name": "Ház építés alatt",
+                "terms": "Ház építés alatt"
+            },
+            "building/dormitory": {
+                "name": "Kollégium",
+                "terms": "Kollégium, Diákszálló, Diákotthon"
             },
             "building/garage": {
                 "name": "Garázs"
             },
+            "building/garages": {
+                "name": "Garazsak",
+                "terms": "Garazsak"
+            },
+            "building/greenhouse": {
+                "name": "Üvegház",
+                "terms": "Üvegház"
+            },
+            "building/hospital": {
+                "name": "Kórházi épület",
+                "terms": "Kórházi épület"
+            },
+            "building/hotel": {
+                "name": "Hotel épület",
+                "terms": "Hotel épület"
+            },
             "building/house": {
                 "name": "Ház"
             },
@@ -1126,10 +1251,122 @@
                 "name": "Ipari épület",
                 "terms": "Gyárépület"
             },
+            "building/public": {
+                "name": "Nyilvános épület",
+                "terms": "Nyilvános épület"
+            },
             "building/residential": {
                 "name": "Lakóépület",
                 "terms": "Lakóház, lakás, ház"
             },
+            "building/roof": {
+                "name": "Tető",
+                "terms": "Tető"
+            },
+            "building/school": {
+                "name": "Iskolaépület",
+                "terms": "Iskolaépület"
+            },
+            "building/shed": {
+                "name": "Kunyhó",
+                "terms": "Kunyhó, Fészer, Pajta"
+            },
+            "building/terrace": {
+                "name": "Sorház",
+                "terms": "Sorház"
+            },
+            "building/train_station": {
+                "name": "Vasútállomás",
+                "terms": "Vasútállomás, Vasúti megálló"
+            },
+            "building/university": {
+                "name": "Egyetemi épület",
+                "terms": "Egyetemi épület"
+            },
+            "building/warehouse": {
+                "name": "Raktár",
+                "terms": "Raktár, Lerakat"
+            },
+            "craft/basket_maker": {
+                "name": "Kosárfonó",
+                "terms": "Kosárfonó"
+            },
+            "craft/beekeeper": {
+                "name": "Méhész",
+                "terms": "Méhész"
+            },
+            "craft/blacksmith": {
+                "name": "Patkolókovács",
+                "terms": "Patkolókovács"
+            },
+            "craft/boatbuilder": {
+                "name": "Hajógyáros",
+                "terms": "Hajógyáros"
+            },
+            "craft/bookbinder": {
+                "name": "Könyvkötő",
+                "terms": "Könyvkötő"
+            },
+            "craft/brewery": {
+                "name": "Sörfőzde",
+                "terms": "Sörfőzde, Sörfőző"
+            },
+            "craft/carpenter": {
+                "name": "Asztalos",
+                "terms": "Asztalos, Ács"
+            },
+            "craft/electrician": {
+                "name": "Villanyszerelő",
+                "terms": "Villanyszerelő"
+            },
+            "craft/gardener": {
+                "name": "Kertész",
+                "terms": "Kertész"
+            },
+            "craft/insulator": {
+                "name": "Szigetelő",
+                "terms": "Szigetelő"
+            },
+            "craft/jeweler": {
+                "name": "Ékszerész",
+                "terms": "Ékszerész, Ékszeres"
+            },
+            "craft/key_cutter": {
+                "name": "Kulcsos",
+                "terms": "Kulcsos, Kulcskészítő, Kulcsmásoló"
+            },
+            "craft/optician": {
+                "name": "Szemész",
+                "terms": "Szemész"
+            },
+            "craft/painter": {
+                "name": "Festő",
+                "terms": "Festő, Festőművész"
+            },
+            "craft/photographer": {
+                "name": "Fotós",
+                "terms": "Fotós, Fotográfus"
+            },
+            "craft/photographic_laboratory": {
+                "name": "Fotólabor",
+                "terms": "Fotólabor"
+            },
+            "craft/shoemaker": {
+                "name": "Cipész",
+                "terms": "Cipész, Cipőkészítő"
+            },
+            "craft/sweep": {
+                "name": "Kéményseprő",
+                "terms": "Kéményseprő"
+            },
+            "craft/tailor": {
+                "name": "Szabó",
+                "terms": "Szabó"
+            },
+            "craft/watchmaker": {
+                "name": "Órás",
+                "terms": "Órás"
+            },
             "embankment": {
                 "name": "Töltés"
             },
@@ -1143,9 +1380,6 @@
             "emergency/phone": {
                 "name": "Segélykérő telefon"
             },
-            "entrance": {
-                "name": "Bejárat"
-            },
             "footway/crossing": {
                 "name": "Kereszteződés"
             },
@@ -1179,9 +1413,6 @@
             "highway/motorway": {
                 "name": "Autópálya"
             },
-            "highway/motorway_junction": {
-                "name": "Autópálya elágazás"
-            },
             "highway/motorway_link": {
                 "name": "Autópálya felhajtó"
             },
@@ -1324,6 +1555,10 @@
             "landuse/meadow": {
                 "name": "Rét"
             },
+            "landuse/military": {
+                "name": "Katonai",
+                "terms": "Katonai, Honvédségi"
+            },
             "landuse/orchard": {
                 "name": "Gyümölcsös"
             },
@@ -1349,6 +1584,10 @@
                 "name": "Kutyafuttató",
                 "terms": "Kutyasétáltató"
             },
+            "leisure/firepit": {
+                "name": "Tűzrakó hely",
+                "terms": "Tűzrakó hely"
+            },
             "leisure/garden": {
                 "name": "Kert"
             },
@@ -1361,6 +1600,10 @@
             "leisure/park": {
                 "name": "Park"
             },
+            "leisure/picnic_table": {
+                "name": "Piknikasztal",
+                "terms": "Piknikasztal"
+            },
             "leisure/pitch": {
                 "name": "Sportpálya"
             },
@@ -1391,9 +1634,6 @@
             "leisure/slipway": {
                 "name": "Sólya"
             },
-            "leisure/sports_center": {
-                "name": "Sportközpont"
-            },
             "leisure/stadium": {
                 "name": "Stadion"
             },
@@ -1620,6 +1860,10 @@
             "place/locality": {
                 "name": "Lakatlan hely"
             },
+            "place/neighbourhood": {
+                "name": "Környék",
+                "terms": "Környék, Negyed"
+            },
             "place/town": {
                 "name": "Város"
             },
@@ -1670,6 +1914,10 @@
             "railway/disused": {
                 "name": "Használaton kívüli vasút"
             },
+            "railway/funicular": {
+                "name": "Sikló",
+                "terms": "Sikló, Siklóvasút"
+            },
             "railway/halt": {
                 "name": "Vasúti megállóhely",
                 "terms": "megállóhely"
@@ -1680,6 +1928,10 @@
             "railway/monorail": {
                 "name": "Egysínű vasút"
             },
+            "railway/narrow_gauge": {
+                "name": "Kisvasút",
+                "terms": "Kisvasút, Keskeny nyomközű vasút"
+            },
             "railway/platform": {
                 "name": "Vasúti platform"
             },
diff --git a/vendor/assets/iD/iD/locales/id.json b/vendor/assets/iD/iD/locales/id.json
index bd16e36e1..bba2115d5 100644
--- a/vendor/assets/iD/iD/locales/id.json
+++ b/vendor/assets/iD/iD/locales/id.json
@@ -866,9 +866,6 @@
             "building/apartments": {
                 "name": "Apartemen"
             },
-            "building/entrance": {
-                "name": "Masuk"
-            },
             "building/garage": {
                 "name": "Garasi"
             },
@@ -878,9 +875,6 @@
             "emergency/phone": {
                 "name": "Telepon Darurat"
             },
-            "entrance": {
-                "name": "Pintu Masuk"
-            },
             "highway": {
                 "name": "Jalan Raya"
             },
diff --git a/vendor/assets/iD/iD/locales/is.json b/vendor/assets/iD/iD/locales/is.json
index 9b1a06a96..e2cca922c 100644
--- a/vendor/assets/iD/iD/locales/is.json
+++ b/vendor/assets/iD/iD/locales/is.json
@@ -41,6 +41,7 @@
             }
         },
         "continue": {
+            "title": "Halda áfram",
             "annotation": {
                 "line": "Hélt áfram með línu.",
                 "area": "Hélt áfram með svæði."
@@ -248,7 +249,6 @@
         "description": "Bakgrunnsstillingar",
         "percent_brightness": "{opacity}% birta",
         "none": "Ekkert",
-        "custom_prompt": "Sláðu inn stílsnið. Rétt gildi eru {z}, {x}, {y} fyror Z/X/Y hnit og {u} fyrir útlitssnið.",
         "reset": "endurstilla"
     },
     "restore": {
@@ -364,6 +364,9 @@
     },
     "presets": {
         "categories": {
+            "category-building": {
+                "name": "Bygging"
+            },
             "category-landuse": {
                 "name": "Landnotkun"
             },
@@ -477,6 +480,9 @@
             "country": {
                 "label": "Land"
             },
+            "crop": {
+                "label": "Uppskera"
+            },
             "crossing": {
                 "label": "Tegund"
             },
@@ -511,12 +517,18 @@
             "fixme": {
                 "label": "Lagaðu mig"
             },
+            "fuel": {
+                "label": "Eldsneyti"
+            },
             "highway": {
                 "label": "Tegund"
             },
             "historic": {
                 "label": "Tegund"
             },
+            "hoops": {
+                "placeholder": "1, 2, 4..."
+            },
             "iata": {
                 "label": "IATA"
             },
@@ -608,6 +620,18 @@
             "railway": {
                 "label": "Tegund"
             },
+            "recycling/cans": {
+                "label": "Tekur við dósum"
+            },
+            "recycling/clothes": {
+                "label": "Tekur við fötum"
+            },
+            "recycling/glass": {
+                "label": "Tekur við gleri"
+            },
+            "recycling/paper": {
+                "label": "Tekur við pappír"
+            },
             "ref": {
                 "label": "Heimildir"
             },
@@ -638,6 +662,9 @@
             "sac_scale": {
                 "label": "Erfiðleikastig"
             },
+            "seasonal": {
+                "label": "Árstíðabundið"
+            },
             "service": {
                 "label": "Tegund"
             },
@@ -647,12 +674,18 @@
             "shop": {
                 "label": "Tegund"
             },
+            "smoking": {
+                "label": "Reykingar"
+            },
             "source": {
                 "label": "Uppruni"
             },
             "sport": {
                 "label": "Íþrótt"
             },
+            "sport_ice": {
+                "label": "Íþrótt"
+            },
             "structure": {
                 "label": "Mannvirki",
                 "placeholder": "Óþekkt",
@@ -681,6 +714,12 @@
             "trail_visibility": {
                 "label": "Sýnileiki"
             },
+            "trees": {
+                "label": "Tré"
+            },
+            "tunnel": {
+                "label": "Göng"
+            },
             "water": {
                 "label": "Tegund"
             },
@@ -726,7 +765,8 @@
                 "name": "Flugskýli"
             },
             "aeroway/helipad": {
-                "name": "Þyrlupallur"
+                "name": "Þyrlupallur",
+                "terms": "lendingarpallur"
             },
             "aeroway/runway": {
                 "name": "Flugbraut"
@@ -744,11 +784,15 @@
                 "name": "Hraðbanki"
             },
             "amenity/bank": {
-                "name": "Banki"
+                "name": "Banki",
+                "terms": "fjármálastofnun"
             },
             "amenity/bar": {
                 "name": "Knæpa"
             },
+            "amenity/bbq": {
+                "name": "Grill"
+            },
             "amenity/bench": {
                 "name": "Bekkur"
             },
@@ -759,7 +803,8 @@
                 "name": "Hjólaleiga"
             },
             "amenity/cafe": {
-                "name": "Kaffihús"
+                "name": "Kaffihús",
+                "terms": "tehús"
             },
             "amenity/car_rental": {
                 "name": "Bílaleiga"
@@ -767,8 +812,15 @@
             "amenity/car_wash": {
                 "name": "Bílaþvottur"
             },
+            "amenity/childcare": {
+                "name": "Barnagæsla"
+            },
             "amenity/cinema": {
-                "name": "Kvikmyndahús"
+                "name": "Kvikmyndahús",
+                "terms": "bíó"
+            },
+            "amenity/clock": {
+                "name": "Klukka"
             },
             "amenity/college": {
                 "name": "Háskóli"
@@ -797,17 +849,30 @@
             "amenity/grave_yard": {
                 "name": "Grafreitur"
             },
+            "amenity/hospital": {
+                "name": "Spítalalóð"
+            },
+            "amenity/kindergarten": {
+                "name": "Leikskólalóð"
+            },
             "amenity/library": {
                 "name": "Bókasafn"
             },
             "amenity/marketplace": {
                 "name": "Markaður"
             },
+            "amenity/nightclub": {
+                "name": "Næturklúbbur"
+            },
+            "amenity/parking": {
+                "name": "Bílastæði"
+            },
             "amenity/pharmacy": {
                 "name": "Lyfjaverslun"
             },
             "amenity/place_of_worship": {
-                "name": "Tilbeiðsluhús"
+                "name": "Tilbeiðsluhús",
+                "terms": "musteri, kirkja, kapella, bænahús"
             },
             "amenity/place_of_worship/buddhist": {
                 "name": "Búddistamusteri"
@@ -819,10 +884,12 @@
                 "name": "Bænahús gyðinga"
             },
             "amenity/place_of_worship/muslim": {
-                "name": "Moska"
+                "name": "Moska",
+                "terms": "bænahús múslima"
             },
             "amenity/police": {
-                "name": "Lögregla"
+                "name": "Lögregla",
+                "terms": "löggan"
             },
             "amenity/post_box": {
                 "name": "Póstkassi"
@@ -836,6 +903,15 @@
             "amenity/restaurant": {
                 "name": "Veitingahús"
             },
+            "amenity/school": {
+                "name": "Skólalóð"
+            },
+            "amenity/social_facility/food_bank": {
+                "name": "Mataraðstoð"
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Athvarf heimilislausra"
+            },
             "amenity/swimming_pool": {
                 "name": "Sundlaug"
             },
@@ -857,6 +933,9 @@
             "amenity/university": {
                 "name": "Háskóli"
             },
+            "amenity/veterinary": {
+                "name": "Dýralæknir"
+            },
             "amenity/waste_basket": {
                 "name": "Ruslafata"
             },
@@ -923,24 +1002,137 @@
             "building/apartments": {
                 "name": "Íbúðir"
             },
-            "building/entrance": {
-                "name": "Inngangur"
+            "building/barn": {
+                "name": "Hlaða"
+            },
+            "building/bunker": {
+                "name": "Byrgi"
+            },
+            "building/cabin": {
+                "name": "Sumarhús",
+                "terms": "Sumarbústaður, kofi"
+            },
+            "building/cathedral": {
+                "name": "Dómkirkja"
+            },
+            "building/chapel": {
+                "name": "Kapella"
+            },
+            "building/church": {
+                "name": "Kirkja"
+            },
+            "building/commercial": {
+                "name": "Atvinnuhúsnæði"
+            },
+            "building/construction": {
+                "name": "Á byggingarstigi"
+            },
+            "building/dormitory": {
+                "name": "Heimavist"
+            },
+            "building/garage": {
+                "name": "Bílskúr"
+            },
+            "building/garages": {
+                "name": "Bílskúrar"
+            },
+            "building/hospital": {
+                "name": "Sjúkrahúsbygging"
+            },
+            "building/hotel": {
+                "name": "Hótelbygging"
             },
             "building/house": {
-                "name": "Íbúðarhús"
+                "name": "Einbýlishús"
+            },
+            "building/hut": {
+                "name": "Kofi"
+            },
+            "building/industrial": {
+                "name": "Iðnaðarhúsnæði"
+            },
+            "building/public": {
+                "name": "Opinber bygging"
+            },
+            "building/residential": {
+                "name": "Íbúahúsnæði"
+            },
+            "building/retail": {
+                "name": "Verslunarhúsnæði"
+            },
+            "building/roof": {
+                "name": "Þak"
+            },
+            "building/school": {
+                "name": "Skólabygging"
+            },
+            "building/shed": {
+                "name": "Skúr",
+                "terms": "garðskáli"
+            },
+            "building/static_caravan": {
+                "name": "Staðfast hjólhýsi"
+            },
+            "building/terrace": {
+                "name": "Raðhús"
+            },
+            "building/train_station": {
+                "name": "Lestarstöð"
+            },
+            "building/university": {
+                "name": "Háskólabygging"
+            },
+            "building/warehouse": {
+                "name": "Vöruhús"
+            },
+            "craft/dressmaker": {
+                "name": "Kjólasaumari"
+            },
+            "craft/electrician": {
+                "name": "Rafvirki"
+            },
+            "craft/gardener": {
+                "name": "Garðyrkjumaður"
+            },
+            "craft/jeweler": {
+                "name": "Skartgripasali"
+            },
+            "craft/key_cutter": {
+                "name": "Lyklaþjónusta"
+            },
+            "craft/locksmith": {
+                "name": "Lyklasmiður"
+            },
+            "craft/optician": {
+                "name": "Gleraugnasali"
+            },
+            "craft/painter": {
+                "name": "Málari"
             },
             "craft/photographer": {
                 "name": "Ljósmyndari"
             },
+            "craft/plumber": {
+                "name": "Pípari"
+            },
+            "craft/shoemaker": {
+                "name": "Skósmiður"
+            },
+            "craft/tailor": {
+                "name": "Skraddari"
+            },
+            "craft/upholsterer": {
+                "name": "Bólstrari"
+            },
+            "craft/watchmaker": {
+                "name": "Úrsmiður"
+            },
             "emergency/ambulance_station": {
                 "name": "Sjúkrabílastöð"
             },
             "emergency/phone": {
                 "name": "Neyðarsími"
             },
-            "entrance": {
-                "name": "Inngangur"
-            },
             "highway": {
                 "name": "Þjóðvegur"
             },
@@ -968,9 +1160,6 @@
             "highway/motorway": {
                 "name": "Hraðbraut"
             },
-            "highway/motorway_junction": {
-                "name": "Hraðbrautarmót"
-            },
             "highway/motorway_link": {
                 "name": "Hraðbrautarrein"
             },
@@ -989,6 +1178,9 @@
             "highway/residential": {
                 "name": "Íbúagata"
             },
+            "highway/rest_area": {
+                "name": "Hvíldarsvæði"
+            },
             "highway/road": {
                 "name": "Óþekktur vegur"
             },
@@ -1008,7 +1200,8 @@
                 "name": "Afgreiðslulúga"
             },
             "highway/service/driveway": {
-                "name": "Innkeyrsla"
+                "name": "Innkeyrsla",
+                "terms": "Heimreið"
             },
             "highway/service/emergency_access": {
                 "name": "Neyðaraðgangur"
@@ -1016,6 +1209,9 @@
             "highway/service/parking_aisle": {
                 "name": "Bílastæðagangur"
             },
+            "highway/services": {
+                "name": "Þjónustusvæði"
+            },
             "highway/steps": {
                 "name": "Tröppur"
             },
@@ -1103,9 +1299,16 @@
             "landuse/industrial": {
                 "name": "Iðnaðarsvæði"
             },
+            "landuse/landfill": {
+                "name": "Landfylling"
+            },
             "landuse/meadow": {
                 "name": "Engi"
             },
+            "landuse/military": {
+                "name": "Hersvæði",
+                "terms": "herstöð, æfingasvæði"
+            },
             "landuse/orchard": {
                 "name": "Aldingarður"
             },
@@ -1127,12 +1330,18 @@
             "leisure/dog_park": {
                 "name": "Hundagarður"
             },
+            "leisure/firepit": {
+                "name": "Eldstæði"
+            },
             "leisure/garden": {
                 "name": "Garður"
             },
             "leisure/golf_course": {
                 "name": "Golfvöllur"
             },
+            "leisure/ice_rink": {
+                "name": "Skautasvell"
+            },
             "leisure/marina": {
                 "name": "Bátahöfn"
             },
@@ -1289,6 +1498,9 @@
             "place/locality": {
                 "name": "Staðfesti"
             },
+            "place/neighbourhood": {
+                "name": "Hverfi"
+            },
             "place/town": {
                 "name": "Bær"
             },
@@ -1301,6 +1513,9 @@
             "power": {
                 "name": "Orka"
             },
+            "power/generator": {
+                "name": "Aflstöð"
+            },
             "power/line": {
                 "name": "Orkulína"
             },
@@ -1325,6 +1540,9 @@
             "railway/disused": {
                 "name": "Ónotaðir lestarteinar"
             },
+            "railway/funicular": {
+                "name": "Toglest"
+            },
             "railway/level_crossing": {
                 "name": "Jöfn vegamót"
             },
@@ -1361,6 +1579,9 @@
             "shop/alcohol": {
                 "name": "Vínbúð"
             },
+            "shop/art": {
+                "name": "Listverslun"
+            },
             "shop/bakery": {
                 "name": "Bakarí"
             },
@@ -1373,6 +1594,9 @@
             "shop/bicycle": {
                 "name": "Hjólabúð"
             },
+            "shop/bookmaker": {
+                "name": "Veðmangari"
+            },
             "shop/books": {
                 "name": "Bóksala"
             },
@@ -1430,6 +1654,9 @@
             "shop/florist": {
                 "name": "Blómabúð"
             },
+            "shop/funeral_directors": {
+                "name": "Útfararheimili"
+            },
             "shop/furniture": {
                 "name": "Húsgagnaverslun"
             },
@@ -1484,6 +1711,10 @@
             "shop/pet": {
                 "name": "Dýrabúð"
             },
+            "shop/seafood": {
+                "name": "Fiskverslu",
+                "terms": "verslun með sjávarfang"
+            },
             "shop/shoes": {
                 "name": "Skóbúð"
             },
diff --git a/vendor/assets/iD/iD/locales/it.json b/vendor/assets/iD/iD/locales/it.json
index 11c9b635e..2c1ba4c46 100644
--- a/vendor/assets/iD/iD/locales/it.json
+++ b/vendor/assets/iD/iD/locales/it.json
@@ -71,7 +71,8 @@
                 "line": "Crea una linea circolare",
                 "area": "Crea un'area circolare"
             },
-            "not_closed": "Questo non può essere reso circolare perché non è un anello."
+            "not_closed": "Questo non può essere reso circolare perché non è un anello.",
+            "too_large": "Questo elemento non può essere reso circolare perché non è del tutto visibile."
         },
         "orthogonalize": {
             "title": "Ortogonalizza",
@@ -84,7 +85,8 @@
                 "line": "Gli angoli della linea sono stati resi ortogonali.",
                 "area": "Gli angoli dell'area sono stati resi ortogonali."
             },
-            "not_squarish": "Questo non può essere reso squadrato perché non è squadrabile."
+            "not_squarish": "Questo non può essere reso squadrato perché non è squadrabile.",
+            "too_large": "Questo elemento non può essere reso squadrato perché non è del tutto visibile."
         },
         "straighten": {
             "title": "Raddrizzare",
@@ -180,6 +182,18 @@
             },
             "not_eligible": "Le linee non possono essere divise al loro inizio o alla loro fine.",
             "multiple_ways": "Ci sono troppe linee da dividere."
+        },
+        "restriction": {
+            "help": {
+                "select": "Clicca per selezionare un segmento di strada.",
+                "toggle": "Clicca per attivare una limitazione.",
+                "toggle_on": "Clicca per aggiungere \"{restriction}\".",
+                "toggle_off": "Clicca per rimuovere \"{restriction}\"."
+            },
+            "annotation": {
+                "create": "Limitazione aggiunta",
+                "delete": "Limitazione rimossa"
+            }
         }
     },
     "undo": {
@@ -210,7 +224,7 @@
     "commit": {
         "title": "Salva le modifiche",
         "description_placeholder": "Una breve descrizione delle tue modifiche",
-        "message_label": "Messaggio di invio",
+        "message_label": "Commento",
         "upload_explanation": "Le modifiche che carichi saranno visibili su tutte le mappe che usano i dati di OpenStreetMap.",
         "upload_explanation_with_user": "Le modifiche che carichi come {user} saranno visibili su tutte le mappe che usano i dati di OpenStreetMap.",
         "save": "Salva",
@@ -265,7 +279,8 @@
         "percent_brightness": "{opacity}% luminosità",
         "none": "Nessuno",
         "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.",
+        "custom_button": "Modifica sfondo personalizzato",
+        "custom_prompt": "Inserisci l'URL dello schema dei tasselli. Valori validi sono {z}, {x}, {y} per lo schema Z/X/Y e {u} per lo schema QuadTile.",
         "fix_misalignment": "Allinea",
         "reset": "reset"
     },
@@ -409,6 +424,9 @@
             "category-rail": {
                 "name": "Ferrovia"
             },
+            "category-restriction": {
+                "name": "Limitazione"
+            },
             "category-road": {
                 "name": "Strada"
             },
@@ -591,6 +609,9 @@
             "entrance": {
                 "label": "Tipo"
             },
+            "except": {
+                "label": "Eccezioni"
+            },
             "fax": {
                 "label": "Fax",
                 "placeholder": "+39 01 123 456"
@@ -604,6 +625,9 @@
             "fixme": {
                 "label": "Sistemare"
             },
+            "fuel": {
+                "label": "Carburante"
+            },
             "gauge": {
                 "label": "Scartamento"
             },
@@ -631,6 +655,7 @@
                 "label": "Tipo"
             },
             "hoops": {
+                "label": "Canestri",
                 "placeholder": "1, 2, 4..."
             },
             "iata": {
@@ -700,10 +725,16 @@
                 "label": "Tipo"
             },
             "oneway": {
-                "label": "Senso unico"
+                "label": "Senso unico",
+                "options": {
+                    "undefined": "No (ipotesi)"
+                }
             },
             "oneway_yes": {
-                "label": "Senso unico"
+                "label": "Senso unico",
+                "options": {
+                    "undefined": "Si (ipotesi)"
+                }
             },
             "opening_hours": {
                 "label": "Orari"
@@ -737,6 +768,9 @@
             "place": {
                 "label": "Tipo"
             },
+            "population": {
+                "label": "Popolazione"
+            },
             "power": {
                 "label": "Tipo"
             },
@@ -776,6 +810,9 @@
             "restriction": {
                 "label": "Tipo"
             },
+            "restrictions": {
+                "label": "Obblighi di svolta"
+            },
             "route": {
                 "label": "Tipo"
             },
@@ -785,6 +822,9 @@
             "sac_scale": {
                 "label": "Difficoltà del sentiero"
             },
+            "seasonal": {
+                "label": "Stagionale"
+            },
             "service": {
                 "label": "Tipo"
             },
@@ -797,6 +837,12 @@
             "shop": {
                 "label": "Tipo"
             },
+            "sloped_curb": {
+                "label": "Cordolo inclinato"
+            },
+            "smoking": {
+                "label": "Zona fumatori"
+            },
             "social_facility_for": {
                 "label": "Tipo di utenza",
                 "placeholder": "Senza dimora, disabili, minori, ..."
@@ -807,6 +853,9 @@
             "sport": {
                 "label": "Sport"
             },
+            "sport_ice": {
+                "label": "Sport"
+            },
             "structure": {
                 "label": "Struttura",
                 "placeholder": "Sconosciuto",
@@ -814,7 +863,8 @@
                     "bridge": "Ponte",
                     "tunnel": "Tunnel",
                     "embankment": "Argine",
-                    "cutting": "Infossato"
+                    "cutting": "Infossato",
+                    "ford": "Guado"
                 }
             },
             "studio_type": {
@@ -826,6 +876,9 @@
             "surface": {
                 "label": "Superficie"
             },
+            "tactile_paving": {
+                "label": "Pavimento tattile"
+            },
             "toilets/disposal": {
                 "label": "Smaltimento"
             },
@@ -977,6 +1030,10 @@
                 "name": "Bar",
                 "terms": "caffè,caffé,snack,caffetteria"
             },
+            "amenity/bbq": {
+                "name": "Barbecue/Griglia",
+                "terms": "grigliata,barbeque"
+            },
             "amenity/bench": {
                 "name": "Panchina",
                 "terms": "panca,poltrona,sedile"
@@ -1041,6 +1098,10 @@
                 "name": "Medico di base",
                 "terms": "dottore,medico,studio medico"
             },
+            "amenity/dojo": {
+                "name": "Dojo/Accademia di arti marziali",
+                "terms": "dojo,karate,judo,arti marziali"
+            },
             "amenity/drinking_water": {
                 "name": "Fontanella",
                 "terms": "fontana,fontanella,acqua potabile,nasone"
@@ -1093,6 +1154,10 @@
                 "name": "Parcheggio",
                 "terms": "parcheggio auto,autorimessa"
             },
+            "amenity/parking_entrance": {
+                "name": "Entrata/Uscita Garage",
+                "terms": "garage,posto auto,posteggio,parcheggio"
+            },
             "amenity/pharmacy": {
                 "name": "Farmacia",
                 "terms": "Farmacia"
@@ -1297,14 +1362,26 @@
                 "name": "Appartamenti",
                 "terms": "appartamenti,condominio,palazzo,palazzone,casermone,case popolari,abitazioni,case,edilizia popolare,peep,iacp"
             },
+            "building/barn": {
+                "name": "Fienile",
+                "terms": "granaio,basso servizio,tesa"
+            },
             "building/bunker": {
                 "name": "Bunker",
                 "terms": "bunker,casamatta"
             },
+            "building/cabin": {
+                "name": "Capanna",
+                "terms": "capanna,attrezzi,rimessa,ripostiglio,basso servizio"
+            },
             "building/cathedral": {
                 "name": "Cattedrale",
                 "terms": "cattedrale,chiesa,monumento,religioso"
             },
+            "building/chapel": {
+                "name": "Cappella",
+                "terms": "chiesetta,capellina"
+            },
             "building/church": {
                 "name": "Chiesa",
                 "terms": "cristiano,abbazia,basilica,cattedrale,presbiterio,cappella,chiesa,casa di Dio,luogo di preghiera,luogo di culto,missione,oratorio,parrocchia,sacello,edicola votiva,tabernacolo,tempio"
@@ -1317,13 +1394,17 @@
                 "name": "Edificio in costruzione",
                 "terms": "cantiere,struttura,in costruzione"
             },
+            "building/detached": {
+                "name": "Casa autonoma",
+                "terms": "casa autonoma"
+            },
             "building/dormitory": {
                 "name": "Dormitorio",
                 "terms": "dormitorio,struttura sociale"
             },
             "building/entrance": {
-                "name": "Entrata",
-                "terms": "Entrata"
+                "name": "Entrata/Uscita",
+                "terms": "entrata,uscita,emergenza,accesso,porta,portone,ingresso"
             },
             "building/garage": {
                 "name": "Garage",
@@ -1365,6 +1446,10 @@
                 "name": "Edificio residenziale",
                 "terms": "Edificio residenziale"
             },
+            "building/retail": {
+                "name": "Negozio",
+                "terms": "edificio commerciale,commerciale,negozi"
+            },
             "building/roof": {
                 "name": "Tettoia",
                 "terms": "tetto,pensilina"
@@ -1373,10 +1458,18 @@
                 "name": "Edificio scolastico",
                 "terms": "accademia,alma mater,lavagna,collegio,dipartimento,disciplina,classe,facoltà,aula,istituto,istituzione,riformatorio,scuola,edificio scolastico,seminario,università"
             },
+            "building/shed": {
+                "name": "Capanno",
+                "terms": "capanno degli attrezzi,capanna,rimessa,capannone"
+            },
             "building/stable": {
                 "name": "Stalla",
                 "terms": "stalla,ricovero,scuderia"
             },
+            "building/terrace": {
+                "name": "Villette a schiera",
+                "terms": "villette,fila di case"
+            },
             "building/train_station": {
                 "name": "Stazione ferroviaria",
                 "terms": "treno,stazione,centrale"
@@ -1389,10 +1482,16 @@
                 "name": "Magazzino",
                 "terms": "magazzino,ripostiglio,rimessa"
             },
+            "craft/beekeeper": {
+                "name": "Apicoltore"
+            },
             "craft/blacksmith": {
                 "name": "Maniscalco",
                 "terms": "ferri di cavallo"
             },
+            "craft/boatbuilder": {
+                "name": "Costruttore navale"
+            },
             "craft/bookbinder": {
                 "name": "Legatoria"
             },
@@ -1420,6 +1519,9 @@
                 "name": "Giardiniere",
                 "terms": "giardinaggio,giardino"
             },
+            "craft/glaziery": {
+                "name": "Vetreria"
+            },
             "craft/handicraft": {
                 "name": "Artigiano"
             },
@@ -1435,12 +1537,16 @@
                 "name": "Ottico",
                 "terms": "ottica,occhiali"
             },
+            "craft/painter": {
+                "name": "Pittore"
+            },
             "craft/photographer": {
                 "name": "Fotografo",
                 "terms": "fotografia,stampe"
             },
-            "craft/photographic_labratory": {
-                "name": "Laboratorio Fotografico"
+            "craft/photographic_laboratory": {
+                "name": "Laboratorio Fotografico",
+                "terms": "laboratorio,foto,fotografia,stampe"
             },
             "craft/plumber": {
                 "name": "Idraulico"
@@ -1448,6 +1554,10 @@
             "craft/sailmaker": {
                 "name": "Velaio"
             },
+            "craft/sawmill": {
+                "name": "Segheria",
+                "terms": "legno,segheria"
+            },
             "craft/sculpter": {
                 "name": "Scultore"
             },
@@ -1476,17 +1586,25 @@
                 "terms": "Telefono di emergenza"
             },
             "entrance": {
-                "name": "Entrata",
-                "terms": "Entrata"
+                "name": "Entrata/Uscita",
+                "terms": "entrata,uscita,emergenza,accesso,porta,portone,ingresso"
             },
             "footway/crossing": {
                 "name": "Attraversamento",
                 "terms": "attraversamento pedonale,strisce pedonali,attraversamento,dosso"
             },
+            "footway/crosswalk": {
+                "name": "Attraversamento pedonale",
+                "terms": "strisce pedonali,attraversamento"
+            },
             "footway/sidewalk": {
                 "name": "Marciapiede",
                 "terms": "marciapiedi,passeggio,salvagente,banchina"
             },
+            "ford": {
+                "name": "Guado",
+                "terms": "guado"
+            },
             "golf/bunker": {
                 "name": "Bunker",
                 "terms": "sabbia"
@@ -1527,6 +1645,10 @@
                 "name": "Attraversamento",
                 "terms": "attraversamento pedonale,strisce pedonali,attraversamento,dosso"
             },
+            "highway/crosswalk": {
+                "name": "Attraversamento pedonale",
+                "terms": "strisce pedonali,attraversamento"
+            },
             "highway/cycleway": {
                 "name": "Percorso ciclabile",
                 "terms": "Percorso ciclabile"
@@ -1548,7 +1670,7 @@
                 "terms": "Autostrada"
             },
             "highway/motorway_junction": {
-                "name": "Uscita autostradale",
+                "name": "Uscita/Svincolo da o verso Autostrada",
                 "terms": "Uscita autostradale"
             },
             "highway/motorway_link": {
@@ -1711,6 +1833,10 @@
                 "name": "Cimitero",
                 "terms": "Cimitero"
             },
+            "landuse/churchyard": {
+                "name": "Area parrocchiale",
+                "terms": "sagrato,parrocchia"
+            },
             "landuse/commercial": {
                 "name": "Commerciale",
                 "terms": "Commerciale"
@@ -1751,6 +1877,10 @@
                 "name": "Coltivazione erbacea",
                 "terms": "Prato"
             },
+            "landuse/military": {
+                "name": "Militare",
+                "terms": "base,militare,forze dell'ordine,soldati,caserma,fanteria,artiglieria"
+            },
             "landuse/orchard": {
                 "name": "Frutteto",
                 "terms": "Frutteto"
@@ -1844,7 +1974,7 @@
                 "terms": "Rampa per la messa in acqua di imbarcazioni"
             },
             "leisure/sports_center": {
-                "name": "Centro sportivo",
+                "name": "Centro sportivo/Palestra",
                 "terms": "sport,centro sportivo,pista,polivalente,tennis,calcio,campi,campetti,pallavolo,volley,palestra"
             },
             "leisure/stadium": {
@@ -1935,6 +2065,9 @@
                 "name": "Bunker",
                 "terms": "bunker,casamatta"
             },
+            "military/range": {
+                "name": "Poligono di tiro militare"
+            },
             "natural": {
                 "name": "Naturale",
                 "terms": "Elemento naturale"
@@ -2115,6 +2248,10 @@
                 "name": "Località",
                 "terms": "Località (luogo con nome, non popolato)"
             },
+            "place/suburb": {
+                "name": "Sobborgo",
+                "terms": "sobborgo,quartiere,circoscrizione"
+            },
             "place/town": {
                 "name": "Centro abitato tra 10000 e 100000 abitanti",
                 "terms": "Paese"
@@ -2339,6 +2476,10 @@
                 "name": "Fioraio",
                 "terms": "Fioraio"
             },
+            "shop/funeral_directors": {
+                "name": "Casa funeraria",
+                "terms": "funerale,cimitero"
+            },
             "shop/furniture": {
                 "name": "Negozio di mobili",
                 "terms": "Negozio di mobili"
@@ -2423,6 +2564,10 @@
                 "name": "Fotografo",
                 "terms": "fotografia,fotografico,fotografo,foto,diapositive,rullini,macchine fotografiche"
             },
+            "shop/seafood": {
+                "name": "Pescheria",
+                "terms": "pesce fresco,ittica"
+            },
             "shop/shoes": {
                 "name": "Negozio di scarpe",
                 "terms": "Negozio scarpe"
@@ -2463,6 +2608,10 @@
                 "name": "Videoteca",
                 "terms": "Videoteca"
             },
+            "shop/wine": {
+                "name": "Enoteca",
+                "terms": "vino,negozio di vini"
+            },
             "tourism": {
                 "name": "Turismo",
                 "terms": "turismo,attrazione,turistica,interesse,turisti,escursionismo,viaggio,gita"
@@ -2547,6 +2696,34 @@
                 "name": "Limitazione",
                 "terms": "Restrizione"
             },
+            "type/restriction/no_left_turn": {
+                "name": "Divieto di svolta a sinistra",
+                "terms": "divieto,vietato,curva,sinistra"
+            },
+            "type/restriction/no_right_turn": {
+                "name": "Divieto di svolta a destra",
+                "terms": "divieto,vietato,curva,destra"
+            },
+            "type/restriction/no_straight_on": {
+                "name": "Divieto di proseguire dritto",
+                "terms": "divieto,vietato,dritto"
+            },
+            "type/restriction/no_u_turn": {
+                "name": "Divieto di inversione",
+                "terms": "divieto,vietato,inversione a u"
+            },
+            "type/restriction/only_left_turn": {
+                "name": "Obbligo di svolta a sinistra",
+                "terms": "obbligo,curva,sinistra"
+            },
+            "type/restriction/only_right_turn": {
+                "name": "Obbligo di svolta a destra",
+                "terms": "obbligo,curva,destra"
+            },
+            "type/restriction/only_straight_on": {
+                "name": "Direzione obbligatoria dritto",
+                "terms": "obbligo,dritto,diritto,divieto di svolta"
+            },
             "type/route": {
                 "name": "Percorso",
                 "terms": "Itinerario"
diff --git a/vendor/assets/iD/iD/locales/ja.json b/vendor/assets/iD/iD/locales/ja.json
index 91f9f00d5..e6423f5c2 100644
--- a/vendor/assets/iD/iD/locales/ja.json
+++ b/vendor/assets/iD/iD/locales/ja.json
@@ -71,7 +71,8 @@
                 "line": "ラインを円状に整形",
                 "area": "エリアを円状に整形"
             },
-            "not_closed": "エリアが閉じられていないため、円状に整形することができません"
+            "not_closed": "エリアが閉じられていないため、円状に整形することができません",
+            "too_large": "ウェイの一部がダウンロードされていないため、円状に整形することができません。"
         },
         "orthogonalize": {
             "title": "直交化",
@@ -84,7 +85,8 @@
                 "line": "ラインの角を90度に整形",
                 "area": "エリアの角を90度に整形"
             },
-            "not_squarish": "直交にできない辺があるため、角を直角に整形することができません"
+            "not_squarish": "直交にできない辺があるため、角を直角に整形することができません",
+            "too_large": "ウェイの一部がダウンロードされていないため、四角形に整形することができません。"
         },
         "straighten": {
             "title": "直線化",
@@ -180,6 +182,18 @@
             },
             "not_eligible": "基点/終端を境としたライン分割はできません。",
             "multiple_ways": "複数のラインを分割します"
+        },
+        "restriction": {
+            "help": {
+                "select": "道路の区間を選択するにはクリックしてください。",
+                "toggle": "進行方向制限を切り替えるにはクリックしてください。",
+                "toggle_on": "「{restriction}」の制約を追加するにはクリックしてください。",
+                "toggle_off": "「{restriction}」の制約を削除するにはクリックしてください。"
+            },
+            "annotation": {
+                "create": "進行方向制限を追加しました",
+                "delete": "進行方向制限を削除しました"
+            }
         }
     },
     "undo": {
@@ -265,7 +279,8 @@
         "percent_brightness": "明度 {opacity}%",
         "none": "なし",
         "custom": "カスタム",
-        "custom_prompt": "タイル表示のテンプレートを入力。Z/X/Y スキーマに対して {z}, {x}, {y} を与え、 quadtile schemeには {u} を与える記法で記述します。",
+        "custom_button": "カスタム背景の編集",
+        "custom_prompt": "タイルURLのテンプレートを入力してください。有効なトークンは、Z/X/Y方式ならば{z}, {x} , {y}、quadtile方式ならば{u}です。",
         "fix_misalignment": "背景画像をずらす",
         "reset": "設定リセット"
     },
@@ -333,7 +348,7 @@
     },
     "help": {
         "title": "ヘルプ",
-        "help": "# ヘルプ\n\nこのアプリケーションは、自由に編集できる世界地図 [OpenStreetMap](http://www.openstreetmap.org/)のエディターです。このエディターを利用して、あなたの地域のデータを追加したり更新したりして、誰にとってもｙろい便利なオープンソースかつオープンデータの世界地図を作成できます。\n\nあなたが編集した結果は、OpenStreetMapを利用するすべての人が閲覧することができます。編集するためには [無料のOpenStreetMapアカウント](https://www.openstreetmap.org/user/new) が必要です。\n\nこの [iDエディター](http://ideditor.com/) は[GitHub上のソースコード](https://github.com/openstreetmap/iD)による協力型プロジェクトです。\n",
+        "help": "# ヘルプ\n\nこのアプリケーションは、自由に編集できる世界地図 [OpenStreetMap](http://www.openstreetmap.org/)のエディターです。このエディターを利用して、あなたの地域のデータを追加したり更新したりして、誰にとってもより便利なオープンソースかつオープンデータの世界地図を作成できます。\n\nあなたが編集した結果は、OpenStreetMapを利用するすべての人が閲覧することができます。編集するためには [無料のOpenStreetMapアカウント](https://www.openstreetmap.org/user/new) が必要です。\n\nこの [iDエディター](http://ideditor.com/) は[GitHub上のソースコード](https://github.com/openstreetmap/iD)による協力型プロジェクトです。\n",
         "editing_saving": "# データの編集と保存\n\nこのエディタはオンライン環境で使用されることを前提としています、現在あなたはブラウザを通じてアクセスしているはずです。\n\n### 地物の選択\n\nポイント情報や道路といった地物情報は、地図上に表示されている対象をクリックすることで選択ができます。選択された地物はハイライトされ、詳細情報が記載されたパネルが表示されます。このパネル内の情報を編集することで、対象の地物の情報を編集できます。\n\n複数の地物を範囲選択するには、キーボードのShiftキーを押しながら地図上をクリックし、ドラッグしてください。ドラッグした範囲が四角形で表示され、その四角形の内の地物がすべて選択されます。\n\n### 編集内容の保存\n\n道路や建物、特定の場所などの追加/編集結果は、OSMサーバに保存されるまではあなたのローカルPC上に格納されます。間違った編集をしてしまっても慌てないでください。巻き戻しボタン(Undo)をクリックすることで、編集作業を巻き戻すことができます。同じ編集をもう一度実施したい場合は、巻き戻しのキャンセルボタン(redo)をクリックしてください。\n\n編集に区切りがついたら、'保存'をクリックして作業を終了してください。例えば街の一区画の編集が終わり、そこから別の場所の編集に移動する場合などです。データを保存する前に、編集した内容をもう一度見直しましょう。データが間違っている可能性がある場所がエディタ上に表示されますので、必要に応じて修正を行なってください。\n\n編集内容に問題がなければ、そのまま保存を行いましょう。あなたの編集内容を簡潔に表すコメントを記入した後、もう一度'保存'をクリックすると、あなたの編集内容が[OpenStreetMap.org](http://www.openstreetmap.org/)に投稿されます。投稿されたデータはあなた以外のすべての利用者に対しても表示されるようになり、そこに情報を追加したり、編集したりすることができるようになります。\n\n編集を一度に完了させることができない場合は、ブラウザのエディタ表示をそのままにして、いったんブラウザを閉じてしまいましょう。同じブラウザとエディタを使えば、後々、作業の続きを実施することができます。\n",
         "roads": "# 道路\n\nこのエディタは道路を作成、修正、削除する機能を備えています。小路、自動車道、山道、自転車道等々、編集対象となる道路の種別に制限はありません。交差する道路を細かく地図に描くことも可能です。\n\n### 選択\n\n対象の道路をクリックすることで、選択することができます。選択された道路は強調表示され、ラインに対する操作を行う小さなツール項目がその近くに表示されます。道路の詳細情報は、サイドバーに一覧表示されます。\n\n### 修正\n\n既に描かれている道路の中には、背景画像の衛星写真やGPSトラックと明らかに位置が異なるものがあります。そうした道路を見つけたら、道路を正しい位置に修正しましょう。\n\nまずは変更対象となる道路をクリックして選択します。対象の道路が強調表示され、操作可能なポイントがラインの上に表示されて、位置の変更が可能となります。ラインとポイントを、より正しいと思われる位置に移動させてください。ライン上のポイントを増やすには、ラインの上でダブルクリックすることで、その位置にポイントを作成することが可能です。\n\n道路の接続状態が誤っている場合は、どちらかの道路の上に表示されているポイントをもう一つのラインの上に移動させ、2つのラインを接続してください。道路の接続は地図にとって非常に重要であり、車輌のナビゲーションを行うためには道路が正しく接続されていることが必須となります。\n\n'移動'ツールをクリックするか、キーボードでショートカットキー 'M' を押すことで、道路全体を一度に移動させることができます。もう一度クリックすることで、その位置へ対象が移動します。\n\n### 削除\n\n描かれている道路が完全に間違っている場合 - 衛星写真に映っておらず、より理想としては実際に現地で道路が無いことを確認できた場合 - その道路のデータそのものを削除し、地図から消すことが可能です。地物を削除する際の注意として、編集結果は他の編集と同様すべての利用者の目に触れること、また、衛星写真は撮影日時が古い可能性があり、道路が新しく敷設されているかもしれないことを意識してください。\n\n道路を削除するには、対象のラインをクリックして選択し、ツール項目からゴミ箱アイコンをクリックするか、'Delete'キーを押してください。\n\n### 新規作成\n\n道路があるはずなのにまだ描かれていない？ エディタ左上に表示されている'ライン'アイコンをクリックするか、ショートカットキー'2'を押すと、ラインの新規描画を行うことができます。\n\n地図をクリックすることで、その地点からラインの描画が開始されます。もし既に描かれている道路から枝分かれした道路の場合は、既存道路で分岐が行われている部分をクリックして、その位置から描画を始めるようにしてください。\n\n衛星画像やGPSログなどで表示されている道路の形に添ってクリックし、ポイントを作成してください。描画している道路が他の道路と交差している場合は、交差している位置でクリックし、ラインを接続してください。描画を終了するには、終了する位置でダブルクリックするか、キーボードの'Return'、あるいは'Enter'キーを押してください。\n\n",
         "gps": "# GPS\n\nOpenStreetMapにおいて、GPSデータは最も信用できる情報源です。iDエディタはあなたのPC上にある`.gpx`ファイルのトレース機能をサポートしています。GPSログは、スマートフォンのアプリケーションやGPSロガーを使用することで収集することができます。\n\nGPSを使用した現地調査の詳細な進め方については、[GPSによる調査](http://learnosm.org/jp/beginner/using-gps/)を参照してください。\n\nGPXログファイルをエディタの上にドラッグ＆ドロップすることで、ファイルの内容をエディタ上に表示させることができます。ファイル形式の読み込みが正常に完了すると、ログは明るい緑色の線としてエディタ上に表示されます。エディタの左側に配置されている'背景画像設定'メニューをクリックすると、ログの表示/非表示、GPXが配置されたレイヤーへのズームを設定することができます。\n\nこのGPXログファイルはOpenStreetMapへ直接アップロードされたものではありません。このログを参考情報として地図を描いたり、あなたが追加する地物の配置場所の参考情報とするのがよいでしょう。また、あなた以外のユーザにもGPSログを使ってもらうためには[OpenStreetMapへのアップロード機能](http://www.openstreetmap.org/trace/create)を利用してください。\n",
@@ -409,6 +424,9 @@
             "category-rail": {
                 "name": "線路"
             },
+            "category-restriction": {
+                "name": "制限"
+            },
             "category-road": {
                 "name": "道路"
             },
@@ -591,6 +609,9 @@
             "entrance": {
                 "label": "タイプ"
             },
+            "except": {
+                "label": "例外"
+            },
             "fax": {
                 "label": "FAX",
                 "placeholder": "+31 42 123 4567"
@@ -607,6 +628,33 @@
             "fuel": {
                 "label": "ガソリンスタンド"
             },
+            "fuel/biodiesel": {
+                "label": "バイオディーゼルの販売"
+            },
+            "fuel/diesel": {
+                "label": "軽油の販売"
+            },
+            "fuel/e10": {
+                "label": "E10の販売"
+            },
+            "fuel/e85": {
+                "label": "E85の販売"
+            },
+            "fuel/lpg": {
+                "label": "プロパンの販売"
+            },
+            "fuel/octane_100": {
+                "label": "レース用ガソリンの販売"
+            },
+            "fuel/octane_91": {
+                "label": "レギュラーガソリンの販売"
+            },
+            "fuel/octane_95": {
+                "label": "中品質ガソリンの販売"
+            },
+            "fuel/octane_98": {
+                "label": "ハイオクガソリンの販売"
+            },
             "gauge": {
                 "label": "軌間"
             },
@@ -670,6 +718,9 @@
             "leisure": {
                 "label": "タイプ"
             },
+            "length": {
+                "label": "長さ (m)"
+            },
             "levels": {
                 "label": "階数",
                 "placeholder": "2, 4, 6..."
@@ -704,10 +755,16 @@
                 "label": "タイプ"
             },
             "oneway": {
-                "label": "一方通行"
+                "label": "一方通行",
+                "options": {
+                    "undefined": "おそらくいいえ"
+                }
             },
             "oneway_yes": {
-                "label": "一方通行"
+                "label": "一方通行",
+                "options": {
+                    "undefined": "おそらくはい"
+                }
             },
             "opening_hours": {
                 "label": "利用可能な時間帯"
@@ -741,6 +798,9 @@
             "place": {
                 "label": "タイプ"
             },
+            "population": {
+                "label": "人口"
+            },
             "power": {
                 "label": "区分"
             },
@@ -780,6 +840,9 @@
             "restriction": {
                 "label": "タイプ"
             },
+            "restrictions": {
+                "label": "進行方向制限"
+            },
             "route": {
                 "label": "タイプ"
             },
@@ -804,6 +867,9 @@
             "shop": {
                 "label": "店舗種別"
             },
+            "sloped_curb": {
+                "label": "歩道のすりつけ勾配"
+            },
             "smoking": {
                 "label": "喫煙"
             },
@@ -827,7 +893,8 @@
                     "bridge": "橋",
                     "tunnel": "トンネル",
                     "embankment": "土手",
-                    "cutting": "切り通し"
+                    "cutting": "切り通し",
+                    "ford": "洗い越し"
                 }
             },
             "studio_type": {
@@ -839,6 +906,9 @@
             "surface": {
                 "label": "路面状態"
             },
+            "tactile_paving": {
+                "label": "点字ブロック"
+            },
             "toilets/disposal": {
                 "label": "汚物処理"
             },
@@ -882,6 +952,9 @@
             "wheelchair": {
                 "label": "車椅子の利用可否"
             },
+            "width": {
+                "label": "幅 (m)"
+            },
             "wikipedia": {
                 "label": "Wikipedia"
             },
@@ -1026,6 +1099,10 @@
                 "name": "車の洗浄",
                 "terms": "洗車機, 洗車, 車洗浄, カーウォッシュ"
             },
+            "amenity/charging_station": {
+                "name": "充電スタンド",
+                "terms": "充電ステーション, 急速充電システム, 充電スタンド, 給電スタンド"
+            },
             "amenity/childcare": {
                 "name": "保育施設",
                 "terms": "託児所,保育園,幼稚園,学童保育"
@@ -1046,6 +1123,10 @@
                 "name": "単科大学",
                 "terms": "大学,短大,専門学校,高専"
             },
+            "amenity/compressed_air": {
+                "name": "空気入れ",
+                "terms": "空気入れ, エアー調整"
+            },
             "amenity/courthouse": {
                 "name": "裁判所",
                 "terms": "裁判所"
@@ -1058,6 +1139,10 @@
                 "name": "医院",
                 "terms": "医者,医師"
             },
+            "amenity/dojo": {
+                "name": "道場",
+                "terms": "道場"
+            },
             "amenity/drinking_water": {
                 "name": "水飲み場",
                 "terms": "水飲み場"
@@ -1110,6 +1195,10 @@
                 "name": "駐車場",
                 "terms": "駐車場"
             },
+            "amenity/parking_entrance": {
+                "name": "駐車場の出入口",
+                "terms": "駐車場の出入口"
+            },
             "amenity/pharmacy": {
                 "name": "薬局",
                 "terms": "調剤,調剤薬局,薬局"
@@ -1356,7 +1445,7 @@
             },
             "building/entrance": {
                 "name": "出入口",
-                "terms": "出入口, エントランス"
+                "terms": "出入口, 入口, 出口"
             },
             "building/garage": {
                 "name": "車庫",
@@ -1538,7 +1627,7 @@
                 "name": "写真屋",
                 "terms": "カメラマン,写真屋"
             },
-            "craft/photographic_labratory": {
+            "craft/photographic_laboratory": {
                 "name": "現像所",
                 "terms": "現像所"
             },
@@ -1636,16 +1725,24 @@
             },
             "entrance": {
                 "name": "出入口",
-                "terms": "出入口"
+                "terms": "出入口, 入口, 出口"
             },
             "footway/crossing": {
                 "name": "横断歩道",
                 "terms": "横断歩道, 自転車横断帯"
             },
+            "footway/crosswalk": {
+                "name": "横断歩道",
+                "terms": "横断歩道, 歩行者踏切"
+            },
             "footway/sidewalk": {
                 "name": "歩道",
                 "terms": "歩道"
             },
+            "ford": {
+                "name": "洗い越し",
+                "terms": "洗い越し, 浅瀬"
+            },
             "golf/bunker": {
                 "name": "サンドトラップ",
                 "terms": "サンドトラップ,バンカー"
@@ -1694,6 +1791,10 @@
                 "name": "横断歩道",
                 "terms": "横断歩道, 自転車横断帯"
             },
+            "highway/crosswalk": {
+                "name": "横断歩道",
+                "terms": "横断歩道"
+            },
             "highway/cycleway": {
                 "name": "自転車道",
                 "terms": "自転車道, サイクリング道路"
@@ -1878,6 +1979,10 @@
                 "name": "霊園",
                 "terms": "霊園, 墓地"
             },
+            "landuse/churchyard": {
+                "name": "教会の敷地",
+                "terms": "教会, 教会の敷地"
+            },
             "landuse/commercial": {
                 "name": "オフィス地区",
                 "terms": "ビジネス街,オフィス街,オフィス地区"
@@ -1918,6 +2023,10 @@
                 "name": "牧草地",
                 "terms": "牧草地"
             },
+            "landuse/military": {
+                "name": "軍事",
+                "terms": "軍事,自衛隊"
+            },
             "landuse/orchard": {
                 "name": "果樹園",
                 "terms": "果樹園, 果物畑, リンゴ畑, ミカン畑"
@@ -2019,8 +2128,8 @@
                 "terms": "進水路, スリップウェイ"
             },
             "leisure/sports_center": {
-                "name": "スポーツセンター",
-                "terms": "スポーツセンター"
+                "name": "スポーツセンター／ジム",
+                "terms": "スポーツセンター, ジム, フィットネスクラブ"
             },
             "leisure/stadium": {
                 "name": "スタジアム",
@@ -2306,6 +2415,14 @@
                 "name": "地形名",
                 "terms": "地形名"
             },
+            "place/neighbourhood": {
+                "name": "小字",
+                "terms": "小字"
+            },
+            "place/suburb": {
+                "name": "自治区",
+                "terms": "自治区"
+            },
             "place/town": {
                 "name": "町",
                 "terms": "町"
@@ -2530,6 +2647,10 @@
                 "name": "生花店",
                 "terms": "生花店"
             },
+            "shop/funeral_directors": {
+                "name": "葬儀社",
+                "terms": "葬儀屋, 葬儀業"
+            },
             "shop/furniture": {
                 "name": "家具店",
                 "terms": "家具店, インテリア用品店"
@@ -2614,6 +2735,10 @@
                 "name": "写真屋",
                 "terms": "写真屋"
             },
+            "shop/seafood": {
+                "name": "魚屋",
+                "terms": "海鮮食品店,魚屋,魚市場"
+            },
             "shop/shoes": {
                 "name": "靴店",
                 "terms": "靴店"
@@ -2654,6 +2779,10 @@
                 "name": "ビデオソフト店",
                 "terms": "ビデオソフト店, DVD店"
             },
+            "shop/wine": {
+                "name": "ワイン店",
+                "terms": "ワイン店, 酒屋"
+            },
             "tourism": {
                 "name": "観光",
                 "terms": "旅行, 観光"
@@ -2738,6 +2867,34 @@
                 "name": "進行方向制限",
                 "terms": "進行方向制限"
             },
+            "type/restriction/no_left_turn": {
+                "name": "左折禁止",
+                "terms": "左折禁止"
+            },
+            "type/restriction/no_right_turn": {
+                "name": "右折禁止",
+                "terms": "右折禁止"
+            },
+            "type/restriction/no_straight_on": {
+                "name": "直進禁止",
+                "terms": "直進禁止"
+            },
+            "type/restriction/no_u_turn": {
+                "name": "転回禁止",
+                "terms": "転回禁止, Uターン禁止"
+            },
+            "type/restriction/only_left_turn": {
+                "name": "左折のみ可",
+                "terms": "左折のみ可"
+            },
+            "type/restriction/only_right_turn": {
+                "name": "右折のみ可",
+                "terms": "右折のみ可"
+            },
+            "type/restriction/only_straight_on": {
+                "name": "直進のみ可",
+                "terms": "直進のみ可"
+            },
             "type/route": {
                 "name": "ルート",
                 "terms": "ルート"
diff --git a/vendor/assets/iD/iD/locales/ko.json b/vendor/assets/iD/iD/locales/ko.json
index 854877e1f..ee9c1dfc7 100644
--- a/vendor/assets/iD/iD/locales/ko.json
+++ b/vendor/assets/iD/iD/locales/ko.json
@@ -61,17 +61,18 @@
             "annotation": "태그를 바꿨습니다."
         },
         "circularize": {
-            "title": "순환하기",
+            "title": "둥글게하기",
             "description": {
-                "line": "이 선 순환을 만듭니다.",
-                "area": "이 지역 순환을 만듭니다."
+                "line": "이 선을 둥글게 만듭니다.",
+                "area": "이 지역을 둥글게 만듭니다."
             },
             "key": "O",
             "annotation": {
-                "line": "선 순환을 만들었습니다.",
-                "area": "지역 순환을 만들었습니다."
+                "line": "선을 둥글게 만들었습니다.",
+                "area": "지역을 둥글게 만들었습니다."
             },
-            "not_closed": "지역이 닫혀있지 않기 때문에 순환을 만들 수 없습니다."
+            "not_closed": "지역이 닫혀있지 않기 때문에 둥글게 만들 수 없습니다.",
+            "too_large": "지역이 현재 충분히 보이지 않기 때문에 둥글게 만들 수 없습니다."
         },
         "orthogonalize": {
             "title": "사각지기",
@@ -84,7 +85,8 @@
                 "line": "선의 모서리를 사각지게 했습니다.",
                 "area": "지역의 모서리를 사각지게 했습니다."
             },
-            "not_squarish": "사각 형태가 아니기 때문에 사각지게 할 수 없습니다."
+            "not_squarish": "사각 형태가 아니기 때문에 사각지게 만들 수 없습니다.",
+            "too_large": "지역이 현재 충분히 보이지 않기 때문에 사각지게 만들 수 없습니다."
         },
         "straighten": {
             "title": "곧게 하기",
@@ -134,7 +136,8 @@
             "annotation": "선 {n}개를 병합했습니다.",
             "not_eligible": "이 기능은 병합할 수 없습니다.",
             "not_adjacent": "이 선은 연결되어 있지 않기 때문에 병합할 수 없습니다.",
-            "restriction": "이 선은 적어도 하나가 \"{relation}\" 관계의 구성원이기 때문에 병합할 수 없습니다."
+            "restriction": "이 선은 적어도 하나가 \"{relation}\" 관계의 구성원이기 때문에 병합할 수 없습니다.",
+            "incomplete_relation": "이 기능은 완전히 다운로드되어 있지 않기 때문에 병합할 수 없습니다."
         },
         "move": {
             "title": "이동",
@@ -179,6 +182,18 @@
             },
             "not_eligible": "선은 시작이나 끝에서 분할할 수 없습니다.",
             "multiple_ways": "분할하는 데 너무 많은 선이 있습니다."
+        },
+        "restriction": {
+            "help": {
+                "select": "도로 분절을 선택하려면 클릭하세요.",
+                "toggle": "회전 제한을 토글하려면 클릭하세요.",
+                "toggle_on": "\"{restriction}\" 제한을 추가하려면 클릭하세요.",
+                "toggle_off": "\"{restriction}\" 제한을 제거하려면 클릭하세요"
+            },
+            "annotation": {
+                "create": "회전 제한을 추가했습니다",
+                "delete": "회전 제한을 삭제했습니다"
+            }
         }
     },
     "undo": {
@@ -264,7 +279,8 @@
         "percent_brightness": "명도 {opacity}%",
         "none": "없음",
         "custom": "사용자 지정",
-        "custom_prompt": "타일 템플릿을 입력하세요. 올바른 토큰은 Z/X/Y scheme에 대해 {z}, {x}, {y}이고 quadtile scheme에 대해 {u}입니다.",
+        "custom_button": "사용자 지정 배경 편집",
+        "custom_prompt": "타일 URL 템플릿을 입력하세요. 올바른 토큰은 Z/X/Y scheme에 대해 {z}, {x}, {y}이고 quadtile scheme에 대해 {u}입니다.",
         "fix_misalignment": "정렬 고치기",
         "reset": "재설정"
     },
@@ -334,7 +350,7 @@
         "title": "도움말",
         "help": "# 도움말\n\n이 편집기는 세계의 자유롭고 편집할 수 있는 지도인,\n[OpenStreetMap](http://www.openstreetmap.org/)을 위한 편집기입니다.\n모두를 위한 더 나은 세계의 오픈 소스 및 오픈 데이터 지도를 만들고, 당신의\n지역에서 데이터를 추가하거나 업데이드하려면 이를 사용할 수 있습니다.\n\n이 지도에서 만든 편집은 OpenStreetMap을 사용하는 모두에게\n보여질 수 있습니다. 편집을 하기 위해, [무료 OpenStreetMap\n계정](https://www.openstreetmap.org/user/new)이 필요합니다.\n\n[iD 편집기](http://ideditor.com/)는 [GitHub에 사용할 수 있는 소스\n코드](https://github.com/openstreetmap/iD)로 된 협업 프로젝트입니다.\n",
         "editing_saving": "# 편집 및 저장\n\n이 편집기는 주로 온라인으로 작동하도록 설계되었고, 지금 웹사이트를 통해\n접근할 수 있습니다.\n\n### 기능 선택하기\n\n도로나 관심 있는 지점과 같은 지도 기능을 선택하려면, 지도에\n그것을 클릭하세요. 선택된 기능이 강조되고, 그것에 대한 세부 정보로\n된 패널을 열고, 기능을 수행할 수 있는 메뉴를 보여줍니다.\n\n여러 기능을 선택하려면 'Shift' 키를 누르고 있으세요. 다음 선택하려는\n기능을 클릭하거나, 사각형으로 그리기 위해 지도에 드래그하세요.\n상자가 그려지고 그 안에 있는 모든 지점이 선택됩니다.\n\n### 편집 저장하기\n\n도로, 건물과 장소 등을 편집하여 바꿀 때, 서버에 저장할 때까지는\n로컬에 저장됩니다. 실수를 걱정하지 마십시오 - 실행 취소\n버튼을 클릭해 바뀜을 실행 취소할 수 있고, 다시 실행 버튼을 클릭해\n바뀜을 다시 실행할 수 있습니다.\n\n편집의 그룹을 마치려면 '저장'을 클릭하세요 - 예를 들어, 마을의\n지역을 완료했고 새 지역에서 시작하고 싶으면 말입니다. 무엇을\n했는지 검토할 기회가 있을 것이며, 무언가 바꾸는 것에 대한 권한이\n없어 보이면 편집기가 유용한 제안과 경고를 제공합니다.\n\n모든 것이 좋아 보이면, 모든 다른 사용자에게 보여지고 구축하고 개선하기 위해 다른\n사용자가 사용할 수 있는 곳인, [OpenStreetMap.org](http://www.openstreetmap.org/)에\n바뀜을 게시하기 위해 바꾼 것을 설명할 짧은 요약을 입력하고 '저장'을\n다시 클릭할 수 있습니다.\n\n한 번에 앉아서 편집을 마칠 수 없으면, (같은 브라우저와 컴퓨터에서)\n편집기 창을 떠나고 나서 돌아올 수 있으며, 편집기 애플리케이션은\n작업을 되돌리도록 제공합니다.\n",
-        "roads": "# 도로\n\n이 편집기로 도로를 만들고, 고치고, 삭제할 수 있습니다. 도로는 모든 종류가\n될 수 있습니다: 경로, 고속도로, 산책로, 자전거 도로와 더 많이 - 어떠한 자주 교차되는 세그먼트도 매핑할 수 있어야 합니다.\n\n### 선택하기\n\n도로를 선택하려면 도로를 클릭하세요. 지도와 도로에 대한 자세한\n정보를 보여주는 사이드바가 있는 작은 도구 메뉴와 함께, 외곽선이\n보여져야 합니다.\n\n### 수정하기\n\n때때로 도로 뒤나 GPS 트랙에 있는 영상이 정렬되지 않은 도로를\n볼 수 있습니다. 이러한 도로를 조정할 수 있으며 조정하면 올바른\n위치에 있게 됩니다.\n\n먼저 바꾸고 싶은 도로를 클릭하세요. 도로가 강조되고 더 나은 위치로\n드래그할 수 있는 조절 점이 보여집니다. 더 자세하게 하기 위해 새\n조절 점을 추가하고 싶으면, 노드 없이 도로의 부분을 더블 클릭하면\n추가됩니다.\n\n길을 다른 길로 연결하지만, 제대로 지도에 연결되어 있지 않으면,\n그들과 합치기 위해 다른 도로 위에 그 도로의 조절 점 중 하나를\n드래그할 수 있습니다. 도로 연결이 있는 것은 지도에 있어서 중요하고\n운전 경로를 제공하는 데 있어서 필수입니다.\n\n또한 한 번에 전체 도로를 옮기려면 '이동' 도구를 클릭하거나 `M` 바로가기 키를 누를 수\n있으며, 해당 움직임을 저장하려면 다시 클릭할 수 있습니다.\n\n### 삭제하기\n\n도로가 전체적으로 잘못되었다면 - 위성 영상에서 존재하지 않는 것을 볼 수\n있으며 이상적으로는 나타나지 않는 것으로 현지로 확인되었습니다 - 지도에서\n도로를 제거할 수 있습니다. 기능을 삭제할 때 주의하십시오 -\n어떠한 다른 편집, 모두에게 보여지는 결과와 위성 영상 같은 것은 때때로\n오래되었으며, 그래서 도로는 단순히 새로 지어졌을 수 있습니다.\n\n도로를 클릭하여 선택한 다음, 휴지통 아이콘을 클릭하거나 '삭제' 키를\n눌러 도로를 삭제할 수 있습니다.\n\n### 만들기\n\n어딘가에 찾은 도로가 있어야 하지만 없습니까? 선 그리기를 시작하려면\n편집기의 위 왼쪽에 '선' 아이콘을 클릭하거나 `2` 바로가기 키를 누르세요.\n\n그리기를 시작하려면 지도에 도로의 시작 부분을 클릭하세요. 도로가\n기존 도로에서 분기되어 있다면, 연결할 장소를 클릭하여 시작하세요.\n\n다음 위성 영상이나 GPS에 따라, 올바른 경로를 따를 수 있도록 도로를 따라\n점을 클릭하세요. 그리는 도로가 다른 도로와 교차하면, 교차점을 클릭하여\n도로를 연결하세요. 그리기가 완료되면, 더블 클릭하거나\n키보드에 있는 'Return' 또는 'Enter'를 누르세요.\n",
+        "roads": "# 도로\n\n이 편집기로 도로를 만들고, 고치고, 삭제할 수 있습니다. 도로는 모든 종류가\n될 수 있습니다: 경로, 고속도로, 산책로, 자전거 도로와 더 많이 - 어떠한 자주 교차되는 분절도 매핑할 수 있어야 합니다.\n\n### 선택하기\n\n도로를 선택하려면 도로를 클릭하세요. 지도와 도로에 대한 자세한\n정보를 보여주는 사이드바가 있는 작은 도구 메뉴와 함께, 외곽선이\n보여져야 합니다.\n\n### 수정하기\n\n때때로 도로 뒤나 GPS 트랙에 있는 영상이 정렬되지 않은 도로를\n볼 수 있습니다. 이러한 도로를 조정할 수 있으며 조정하면 올바른\n위치에 있게 됩니다.\n\n먼저 바꾸고 싶은 도로를 클릭하세요. 도로가 강조되고 더 나은 위치로\n드래그할 수 있는 조절 점이 보여집니다. 더 자세하게 하기 위해 새\n조절 점을 추가하고 싶으면, 노드 없이 도로의 부분을 더블 클릭하면\n추가됩니다.\n\n길을 다른 길로 연결하지만, 제대로 지도에 연결되어 있지 않으면,\n그들과 합치기 위해 다른 도로 위에 그 도로의 조절 점 중 하나를\n드래그할 수 있습니다. 도로 연결이 있는 것은 지도에 있어서 중요하고\n운전 경로를 제공하는 데 있어서 필수입니다.\n\n또한 한 번에 전체 도로를 옮기려면 '이동' 도구를 클릭하거나 `M` 바로가기 키를 누를 수\n있으며, 해당 움직임을 저장하려면 다시 클릭할 수 있습니다.\n\n### 삭제하기\n\n도로가 전체적으로 잘못되었다면 - 위성 영상에서 존재하지 않는 것을 볼 수\n있으며 이상적으로는 나타나지 않는 것으로 현지로 확인되었습니다 - 지도에서\n도로를 제거할 수 있습니다. 기능을 삭제할 때 주의하십시오 -\n어떠한 다른 편집, 모두에게 보여지는 결과와 위성 영상 같은 것은 때때로\n오래되었으며, 그래서 도로는 단순히 새로 지어졌을 수 있습니다.\n\n도로를 클릭하여 선택한 다음, 휴지통 아이콘을 클릭하거나 '삭제' 키를\n눌러 도로를 삭제할 수 있습니다.\n\n### 만들기\n\n어딘가에 찾은 도로가 있어야 하지만 없습니까? 선 그리기를 시작하려면\n편집기의 위 왼쪽에 '선' 아이콘을 클릭하거나 `2` 바로가기 키를 누르세요.\n\n그리기를 시작하려면 지도에 도로의 시작 부분을 클릭하세요. 도로가\n기존 도로에서 분기되어 있다면, 연결할 장소를 클릭하여 시작하세요.\n\n다음 위성 영상이나 GPS에 따라, 올바른 경로를 따를 수 있도록 도로를 따라\n점을 클릭하세요. 그리는 도로가 다른 도로와 교차하면, 교차점을 클릭하여\n도로를 연결하세요. 그리기가 완료되면, 더블 클릭하거나\n키보드에 있는 'Return' 또는 'Enter'를 누르세요.\n",
         "gps": "# GPS\n\nGPS 데이터는 OpenStreetMap에 대한 데이터의 가장 신뢰할 수 있는 자료입니다.\n이 편집기는 로컬 컴퓨터에 있는 `.gpx` 파일로 로컬 추적을 지원합니다. 스마트폰\n애플리케이션과 개인 GPS 하드웨어와 같은 것으로 GPS 추적을 모을 수 있습니다.\n\nGPS 측량을 수행하는 방법에 대한 자세한 정보는\n[GPS에 의한 측량](http://learnosm.org/en/beginner/using-gps/)을 읽으세요.\n\n매핑에 GPX 트랙을 사용하려면, 지도 편집기 위에 GPX 파일을 끌어 놓으세요.\n인식되면, 밝은 초록 선으로 지도에 추가됩니다. 활성화, 비활성화, 또는 새 GPX가\n배치된 레이어로 확대하려면 오른쪽에 있는 '배경 설정' 메뉴를 클릭하세요.\n\nGPX 트랙은 OpenStreetMap에 직접 올려지지 않습니다 - 그것을 사용하는 최상의\n방법은 새로운 기능을 추가하기 위한 가이드로 사용하여, 지도를 그리는 것이며,\n다른 사용자가 사용하기 위해 [OpenStreetMap에 그것을 올리는](http://www.openstreetmap.org/trace/create)\n것입니다.\n",
         "imagery": "# 영상\n\n항공 영상은 매핑에 있어서 중요한 자료입니다. 비행기 플라이오버, 위성 뷰와\n자유롭게 컴파일된 자료의 조합은 편집기에서 오른쪽에 있는 '배경 설정' 메뉴에서\n사용할 수 있습니다.\n\n기본적으로 [Bing 지도](http://www.bing.com/maps/) 위성 레이어가 편집기에\n표현되지만, 기존대로 새 지리적 지역으로 지도를 이동하고 확대할 수 있고, 새 자료는\n사용할 수 있게 될 것입니다. 미합중국, 프랑스와 덴마크와 같은 일부 국가는 일부 지역에서\n매우 높은 품질의 영상을 사용할 수 있습니다.\n\n영상은 때때로 영상 제공자 측이 실수하기 때문에 지도 데이터에 오프셋이 있습니다.\n만약 배경에서 도로가 옮겨진 것이 많이 보인다면, 즉시 배경에 맞게 그들 모두를 이동하지\n마십시오. 대신 영상을 조정할 수 있으며 배경 설정 UI의 아래에 있는 '정렬 고치기'를\n클릭하여 기존 데이터에 맞추면 됩니다.\n",
         "addresses": "# 주소\n\n주소는 지도를 위한 가장 유용한 정보의 일부입니다.\n\n주소가 주로 거리의 부분으로 표현되어 있더라도, OpenStreetMap에서 주소는\n거리를 따라 건물과 장소의 특성으로 기록하고 있습니다.\n\n건물 외곽선으로 매핑된 장소뿐만 아니라 단일 지점으로 매핑된 장소에 주소\n정보를 추가할 수 있습니다. 최적의 주소 데이터 자료는 지상에서의 측량이나\n개인 지식에서 있습니다 - 다른 기능과 마찬가지로, Google 지도와 같은 상용\n자료에서 복사하는 행위는 엄격히 금지됩니다.\n",
@@ -376,7 +392,7 @@
             "title": "선",
             "add": "선은 도로, 철도와 강과 같은 기능을 표현하는 데 사용됩니다. **새 선을 추가하려면 선 버튼을 클릭하세요.**",
             "start": "**도로의 끝에 클릭하여 선을 시작하세요.**",
-            "intersect": "선에 더 많은 노드를 추가하려면 클릭하세요. 필요하다면 그리는 동안 지도를 드래그할 수 있습니다. 도로와 선의 다른 많은 유형은 큰 네트워크의 부분입니다. 이 선이 작동하는 애플리케이션을 경로 지정하기 위해서는 제대로 연결하는 것이 중요합니다. **두 선을 연결하는 교차로를 만드려면, Flower Street를 클릭하세요.**",
+            "intersect": "선에 더 많은 노드를 추가하려면 클릭하세요. 필요하다면 그리는 동안 지도를 드래그할 수 있습니다. 도로와 선의 다른 많은 유형은 큰 네트워크의 부분입니다. 이 선이 작동하는 애플리케이션의 경로 지정을 위해서는 제대로 연결하는 것이 중요합니다. **두 선을 연결하는 교차로를 만드려면, Flower Street를 클릭하세요.**",
             "finish": "선은 마지막 노드를 다시 클릭하여 마칠 수 있습니다. **도로 그리기를 마치세요.**",
             "road": "**목록에서 도로를 선택하세요**",
             "residential": "여기에 도로의 여러 종류가 있지만, 가장 자주 그리게 되는 것은 주거 도로입니다. **주거 도로 유형을 선택하세요**",
@@ -474,6 +490,21 @@
             "admin_level": {
                 "label": "관리 수준"
             },
+            "aerialway": {
+                "label": "유형"
+            },
+            "aerialway/capacity": {
+                "label": "수용자 수 (시간당)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "label": "소요 시간 (분)",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/occupancy": {
+                "label": "무게",
+                "placeholder": "2, 4, 8..."
+            },
             "aeroway": {
                 "label": "유형"
             },
@@ -508,7 +539,7 @@
                 "label": "건물"
             },
             "capacity": {
-                "label": "수용 가능한 수",
+                "label": "수용자 수",
                 "placeholder": "50, 100, 200..."
             },
             "cardinal_direction": {
@@ -580,12 +611,18 @@
                 "label": "참고",
                 "placeholder": "홀 수 (1-18)"
             },
+            "handicap": {
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "유형"
             },
             "historic": {
                 "label": "유형"
             },
+            "hoops": {
+                "placeholder": "1, 2, 4..."
+            },
             "iata": {
                 "label": "IATA"
             },
@@ -677,6 +714,9 @@
                 "label": "전화",
                 "placeholder": "+31 42 123 4567"
             },
+            "piste/type": {
+                "label": "유형"
+            },
             "place": {
                 "label": "유형"
             },
@@ -744,6 +784,9 @@
                     "cutting": "절토"
                 }
             },
+            "studio_type": {
+                "label": "유형"
+            },
             "supervised": {
                 "label": "감독 장소"
             },
@@ -952,6 +995,9 @@
             "amenity/restaurant": {
                 "name": "음식점"
             },
+            "amenity/school": {
+                "name": "학교 운동장"
+            },
             "amenity/shelter": {
                 "name": "피난처"
             },
@@ -1049,9 +1095,6 @@
             "building/commercial": {
                 "name": "상업 건물"
             },
-            "building/entrance": {
-                "name": "입구"
-            },
             "building/garage": {
                 "name": "차고"
             },
@@ -1067,6 +1110,9 @@
             "building/residential": {
                 "name": "주거 건물"
             },
+            "building/school": {
+                "name": "학교 건물"
+            },
             "embankment": {
                 "name": "둑",
                 "terms": "제방"
@@ -1081,9 +1127,6 @@
             "emergency/phone": {
                 "name": "긴급 전화"
             },
-            "entrance": {
-                "name": "입구"
-            },
             "footway/crossing": {
                 "name": "횡단보도"
             },
@@ -1143,9 +1186,6 @@
             "highway/motorway": {
                 "name": "고속도로"
             },
-            "highway/motorway_junction": {
-                "name": "고속도로 교차점"
-            },
             "highway/motorway_link": {
                 "name": "고속도로 연결도"
             },
@@ -1322,6 +1362,9 @@
             "leisure/golf_course": {
                 "name": "골프장"
             },
+            "leisure/ice_rink": {
+                "name": "아이스 링크"
+            },
             "leisure/marina": {
                 "name": "마리나",
                 "terms": "항구,선착장"
@@ -1329,6 +1372,9 @@
             "leisure/park": {
                 "name": "공원"
             },
+            "leisure/picnic_table": {
+                "name": "피크닉 테이블"
+            },
             "leisure/pitch": {
                 "name": "운동장"
             },
@@ -1359,9 +1405,6 @@
             "leisure/slipway": {
                 "name": "슬립 웨이"
             },
-            "leisure/sports_center": {
-                "name": "스포츠 센터"
-            },
             "leisure/stadium": {
                 "name": "경기장"
             },
diff --git a/vendor/assets/iD/iD/locales/lt.json b/vendor/assets/iD/iD/locales/lt.json
index e171c344b..e0a6fe244 100644
--- a/vendor/assets/iD/iD/locales/lt.json
+++ b/vendor/assets/iD/iD/locales/lt.json
@@ -264,7 +264,6 @@
         "percent_brightness": "{opacity}% ryškumas",
         "none": "Jokio",
         "custom": "Savas",
-        "custom_prompt": "Įveskite kaladėlių šabloną. Galimi raktažodžiai yra {z}, {x}, {y} Z/X/Y schemai arba {u} quadtile schemai.",
         "fix_misalignment": "Taisyti poziciją",
         "reset": "iš naujo"
     },
@@ -942,9 +941,6 @@
                 "name": "Komercinis pastatas",
                 "terms": "komercinis,pastatas,statinys"
             },
-            "building/entrance": {
-                "name": "Įėjimas"
-            },
             "building/garage": {
                 "name": "Garažas"
             },
@@ -965,9 +961,6 @@
             "emergency/phone": {
                 "name": "Pagalbos telefonas"
             },
-            "entrance": {
-                "name": "Įėjimas"
-            },
             "footway/sidewalk": {
                 "name": "Šaligatvis"
             },
@@ -1157,9 +1150,6 @@
             "leisure/playground": {
                 "name": "Žaidimų aikštelė"
             },
-            "leisure/sports_center": {
-                "name": "Sporto centras"
-            },
             "leisure/stadium": {
                 "name": "Stadionas"
             },
diff --git a/vendor/assets/iD/iD/locales/lv.json b/vendor/assets/iD/iD/locales/lv.json
index b3b8a0a67..4548cab9f 100644
--- a/vendor/assets/iD/iD/locales/lv.json
+++ b/vendor/assets/iD/iD/locales/lv.json
@@ -676,15 +676,9 @@
             "building/apartments": {
                 "name": "Dzīvokļi"
             },
-            "building/entrance": {
-                "name": "Ieeja"
-            },
             "building/house": {
                 "name": "Māja"
             },
-            "entrance": {
-                "name": "Ieeja"
-            },
             "highway": {
                 "name": "Šoseja"
             },
diff --git a/vendor/assets/iD/iD/locales/nl.json b/vendor/assets/iD/iD/locales/nl.json
index 80e270e29..e25aedb10 100644
--- a/vendor/assets/iD/iD/locales/nl.json
+++ b/vendor/assets/iD/iD/locales/nl.json
@@ -252,7 +252,8 @@
         "incomplete": "<niet gedownload>",
         "feature_list": "Zoek objecttype",
         "edit": "Wijzig het object",
-        "none": "Geen"
+        "none": "Geen",
+        "node": "Punt"
     },
     "background": {
         "title": "Achtergrond",
@@ -260,7 +261,6 @@
         "percent_brightness": "{opacity}% doorzichtigheid",
         "none": "Geen",
         "custom": "Aangepast",
-        "custom_prompt": "Voer een tegelschema in. Geldige waarden zijn {z}, {x}, {y} voor Z/X/Y schema en {u} voor het quadtile schema.",
         "fix_misalignment": "Repareer de ligging",
         "reset": "Standaard herstellen"
     },
@@ -466,6 +466,7 @@
                 "placeholder": "500, 2500, 5000..."
             },
             "aerialway/duration": {
+                "label": "Duur (minuten)",
                 "placeholder": "1, 2, 3..."
             },
             "aerialway/heating": {
@@ -624,6 +625,9 @@
                 "label": "Niveaus",
                 "placeholder": "2, 4, 6..."
             },
+            "lit": {
+                "label": "Verlicht"
+            },
             "location": {
                 "label": "Locatie"
             },
@@ -797,6 +801,10 @@
                 "name": "Adres",
                 "terms": "Adres"
             },
+            "aerialway/chair_lift": {
+                "name": "Stoeltjeslift",
+                "terms": "stoeltjeslift"
+            },
             "aeroway": {
                 "name": "Vliegveld",
                 "terms": "Startbaan, landingsbaan"
@@ -900,10 +908,12 @@
                 "terms": "Rechtzaal"
             },
             "amenity/dentist": {
-                "name": "Tandarts"
+                "name": "Tandarts",
+                "terms": "tandarts, tandheelkundige"
             },
             "amenity/doctor": {
-                "name": "Dokter"
+                "name": "Dokter",
+                "terms": "dokter, arts, geneesheer"
             },
             "amenity/drinking_water": {
                 "name": "Drinkwater",
@@ -993,7 +1003,8 @@
                 "terms": "Restaurant"
             },
             "amenity/social_facility/food_bank": {
-                "name": "Voedselbank"
+                "name": "Voedselbank",
+                "terms": "voedselbank"
             },
             "amenity/studio": {
                 "name": "Studio"
@@ -1027,10 +1038,12 @@
                 "terms": "Universtiteit, academie"
             },
             "amenity/vending_machine": {
-                "name": "Automaat"
+                "name": "Automaat",
+                "terms": "automaat"
             },
             "amenity/veterinary": {
-                "name": "Dierenarts"
+                "name": "Dierenarts",
+                "terms": "veearts, dierenarts"
             },
             "amenity/waste_basket": {
                 "name": "Prullenbak",
@@ -1071,7 +1084,8 @@
                 "name": "Hek"
             },
             "barrier/hedge": {
-                "name": "Haag of heg"
+                "name": "Haag of heg",
+                "terms": "heg, haag"
             },
             "barrier/kissing_gate": {
                 "name": "Voetgangershek"
@@ -1118,17 +1132,16 @@
             "building/dormitory": {
                 "name": "Slaapzaal"
             },
-            "building/entrance": {
-                "name": "Ingang"
-            },
             "building/garage": {
-                "name": "Garage"
+                "name": "Garage",
+                "terms": "garage"
             },
             "building/greenhouse": {
                 "name": "Serre"
             },
             "building/house": {
-                "name": "Huis"
+                "name": "Huis",
+                "terms": "huis, woning"
             },
             "building/hut": {
                 "name": "Hut"
@@ -1158,10 +1171,12 @@
                 "name": "Opslagplaats"
             },
             "craft/beekeeper": {
-                "name": "Imker"
+                "name": "Imker",
+                "terms": "imker, bijenhouder"
             },
             "craft/blacksmith": {
-                "name": "Smid"
+                "name": "Smid",
+                "terms": "smid, hoefsmid"
             },
             "craft/boatbuilder": {
                 "name": "Scheepsbouwer"
@@ -1170,10 +1185,12 @@
                 "name": "Boekbinder"
             },
             "craft/brewery": {
-                "name": "Brouwerij"
+                "name": "Brouwerij",
+                "terms": "brouwerij"
             },
             "craft/carpenter": {
-                "name": "Timmerman"
+                "name": "Timmerman",
+                "terms": "timmerman"
             },
             "craft/gardener": {
                 "name": "Tuinman"
@@ -1191,17 +1208,35 @@
                 "name": "Fotograaf"
             },
             "craft/plumber": {
-                "name": "Loodgieter"
+                "name": "Loodgieter",
+                "terms": "loodgieter"
             },
             "craft/pottery": {
                 "name": "Pottenbakkerij"
             },
+            "craft/roofer": {
+                "name": "Dakwerker",
+                "terms": "dakwerker"
+            },
+            "craft/saddler": {
+                "name": "Zadelmaker",
+                "terms": "Zadelmaker"
+            },
             "craft/sawmill": {
-                "name": "Zagerij"
+                "name": "Zagerij",
+                "terms": "zagerij"
+            },
+            "craft/sculpter": {
+                "name": "Beeldhouwer",
+                "terms": "beeldhouwer"
             },
             "craft/shoemaker": {
                 "name": "Schoenmaker"
             },
+            "craft/stonemason": {
+                "name": "Metselaar",
+                "terms": "metselaar"
+            },
             "craft/sweep": {
                 "name": "Schoorsteenveger"
             },
@@ -1214,6 +1249,10 @@
             "craft/watchmaker": {
                 "name": "Horlogemaker"
             },
+            "embankment": {
+                "name": "Dijk",
+                "terms": "dijk"
+            },
             "emergency/ambulance_station": {
                 "name": "Ambulancestandplaats"
             },
@@ -1223,14 +1262,12 @@
             "emergency/phone": {
                 "name": "Praatpaal"
             },
-            "entrance": {
-                "name": "Ingang"
-            },
             "highway": {
                 "name": "Autosnelweg"
             },
             "highway/bridleway": {
-                "name": "Ruiterpad"
+                "name": "Ruiterpad",
+                "terms": "jaagpad"
             },
             "highway/bus_stop": {
                 "name": "Bushalte",
@@ -1255,9 +1292,6 @@
             "highway/motorway": {
                 "name": "Snelweg"
             },
-            "highway/motorway_junction": {
-                "name": "Afslag op autosnelweg"
-            },
             "highway/motorway_link": {
                 "name": "Invoegstrook"
             },
@@ -1289,7 +1323,8 @@
                 "name": "Toegangsweg"
             },
             "highway/service/alley": {
-                "name": "Steeg"
+                "name": "Steeg",
+                "terms": "steeg, steegje"
             },
             "highway/service/drive-through": {
                 "name": "Drive-in"
@@ -1308,7 +1343,8 @@
                 "terms": "trap, trappen"
             },
             "highway/stop": {
-                "name": "Stopbord"
+                "name": "Stopbord",
+                "terms": "stopbord"
             },
             "highway/tertiary": {
                 "name": "Tertiare weg"
@@ -1400,10 +1436,12 @@
                 "name": "Industriegebied"
             },
             "landuse/meadow": {
-                "name": "Hooiland"
+                "name": "Hooiland",
+                "terms": "wei, weide"
             },
             "landuse/orchard": {
-                "name": "Boomgaard"
+                "name": "Boomgaard",
+                "terms": "boomgaard"
             },
             "landuse/quarry": {
                 "name": "Mijnbouw"
@@ -1431,7 +1469,8 @@
                 "name": "Tuin"
             },
             "leisure/golf_course": {
-                "name": "Golfbaan"
+                "name": "Golfbaan",
+                "terms": "golfterrein"
             },
             "leisure/marina": {
                 "name": "Jachthaven"
@@ -1456,10 +1495,12 @@
                 "name": "Skatepark"
             },
             "leisure/pitch/soccer": {
-                "name": "Voetbalveld"
+                "name": "Voetbalveld",
+                "terms": "voetbalveld, voetbalterrein"
             },
             "leisure/pitch/tennis": {
-                "name": "Tennisbaan"
+                "name": "Tennisbaan",
+                "terms": "tennisveld, tennisterrein"
             },
             "leisure/pitch/volleyball": {
                 "name": "Volleybalveld"
@@ -1471,9 +1512,6 @@
             "leisure/slipway": {
                 "name": "Botenhelling"
             },
-            "leisure/sports_center": {
-                "name": "Sportcentrum"
-            },
             "leisure/stadium": {
                 "name": "Stadion"
             },
@@ -1495,20 +1533,27 @@
             "man_made/cutline": {
                 "name": "Scheidingslijn"
             },
+            "man_made/embankment": {
+                "name": "Dijk",
+                "terms": "dijk"
+            },
             "man_made/flagpole": {
-                "name": "Vlaggemast"
+                "name": "Vlaggemast",
+                "terms": "vlaggemast"
             },
             "man_made/lighthouse": {
                 "name": "Vuurtoren"
             },
             "man_made/observation": {
-                "name": "Uitkijktoren"
+                "name": "Uitkijktoren",
+                "terms": "uitkijktoren"
             },
             "man_made/pier": {
                 "name": "Pier"
             },
             "man_made/pipeline": {
-                "name": "Pijpleiding"
+                "name": "Pijpleiding",
+                "terms": "pijplijn, pijpleiding"
             },
             "man_made/survey_point": {
                 "name": "Landmeetkundig referentiepunt"
@@ -1530,13 +1575,20 @@
                 "name": "Waterwinstation"
             },
             "military/airfield": {
-                "name": "Vliegveld"
+                "name": "Vliegveld",
+                "terms": "vliegveld"
             },
             "military/barracks": {
-                "name": "Kazerne"
+                "name": "Kazerne",
+                "terms": "kazerne"
             },
             "military/bunker": {
-                "name": "Bunker"
+                "name": "Bunker",
+                "terms": "bunker"
+            },
+            "military/range": {
+                "name": "Legerterrein",
+                "terms": "legerterrein"
             },
             "natural": {
                 "name": "Natuurlijk"
@@ -1627,6 +1679,10 @@
             "office/travel_agent": {
                 "name": "Reisbureau"
             },
+            "piste": {
+                "name": "Skipiste",
+                "terms": "skipiste"
+            },
             "place": {
                 "name": "Plaats"
             },
@@ -1676,8 +1732,13 @@
             "power/transformer": {
                 "name": "Transformator"
             },
+            "public_transport/platform": {
+                "name": "Perron",
+                "terms": "perron"
+            },
             "railway": {
-                "name": "Spoorwegemplacement"
+                "name": "Spoorwegemplacement",
+                "terms": "spoorweg"
             },
             "railway/abandoned": {
                 "name": "In onbruik geraakte spoorbaan"
@@ -1692,10 +1753,12 @@
                 "name": "Gelijkvloerse spoorwegovergang"
             },
             "railway/monorail": {
-                "name": "Monorail, magneetzweefbaan"
+                "name": "Monorail, magneetzweefbaan",
+                "terms": "monorail"
             },
             "railway/narrow_gauge": {
-                "name": "Smalspoor"
+                "name": "Smalspoor",
+                "terms": "smalspoor"
             },
             "railway/platform": {
                 "name": "Perron"
@@ -1723,13 +1786,15 @@
                 "name": "Veerboottraject"
             },
             "shop": {
-                "name": "Winkel"
+                "name": "Winkel",
+                "terms": "winkel, handelszaak"
             },
             "shop/alcohol": {
                 "name": "Slijterij"
             },
             "shop/bakery": {
-                "name": "Bakkerij"
+                "name": "Bakkerij",
+                "terms": "bakkerij"
             },
             "shop/beauty": {
                 "name": "Schoonheidssalon"
@@ -1738,16 +1803,19 @@
                 "name": "Drankenwinkel"
             },
             "shop/bicycle": {
-                "name": "Fietswinkel"
+                "name": "Fietswinkel",
+                "terms": "fietsenwinkel"
             },
             "shop/books": {
-                "name": "Boekwinkel"
+                "name": "Boekwinkel",
+                "terms": "boekenwinkel"
             },
             "shop/boutique": {
                 "name": "Boutique"
             },
             "shop/butcher": {
-                "name": "Slagerij"
+                "name": "Slagerij",
+                "terms": "slagerij, beenhouwerij"
             },
             "shop/car": {
                 "name": "Autoshowroom"
@@ -1759,7 +1827,8 @@
                 "name": "Autogarage"
             },
             "shop/chemist": {
-                "name": "Drogist"
+                "name": "Drogist",
+                "terms": "apotheek, apotheker, apothekerij"
             },
             "shop/clothes": {
                 "name": "Kledingwinkel"
@@ -1789,10 +1858,12 @@
                 "name": "Bruingoedwinkel"
             },
             "shop/farm": {
-                "name": "Groente- en fruitkraam"
+                "name": "Groente- en fruitkraam",
+                "terms": "groentenkraam"
             },
             "shop/fishmonger": {
-                "name": "Visboer"
+                "name": "Visboer",
+                "terms": "viswinkel"
             },
             "shop/florist": {
                 "name": "Bloemenwinkel"
@@ -1810,7 +1881,8 @@
                 "name": "Groenteboer"
             },
             "shop/hairdresser": {
-                "name": "Kapper"
+                "name": "Kapper",
+                "terms": "kapper"
             },
             "shop/hardware": {
                 "name": "Bouwmarkt"
@@ -1819,7 +1891,8 @@
                 "name": "Bruingoedwinkel"
             },
             "shop/jewelry": {
-                "name": "Juwelier"
+                "name": "Juwelier",
+                "terms": "juwelier"
             },
             "shop/kiosk": {
                 "name": "Kiosk"
@@ -1871,10 +1944,12 @@
                 "terms": "supermarkt, grootwarenhuis"
             },
             "shop/toys": {
-                "name": "Speelgoedwinkel"
+                "name": "Speelgoedwinkel",
+                "terms": "speelgoedwinkel"
             },
             "shop/travel_agency": {
-                "name": "Reisbureau"
+                "name": "Reisbureau",
+                "terms": "reisbureau"
             },
             "shop/tyres": {
                 "name": "Bandenwinkel"
@@ -1901,7 +1976,8 @@
                 "name": "Toeristische attractie"
             },
             "tourism/camp_site": {
-                "name": "Camping"
+                "name": "Camping",
+                "terms": "camping, kampeerterrein, kampeerplaats"
             },
             "tourism/caravan_site": {
                 "name": "Terrein voor kampeerwagens"
@@ -1916,7 +1992,8 @@
                 "name": "Jeugdherberg"
             },
             "tourism/hotel": {
-                "name": "Hotel"
+                "name": "Hotel",
+                "terms": "hotel"
             },
             "tourism/information": {
                 "name": "Informatie"
@@ -2001,7 +2078,8 @@
                 "name": "Kanaal"
             },
             "waterway/dam": {
-                "name": "Dam"
+                "name": "Dam",
+                "terms": "dam"
             },
             "waterway/ditch": {
                 "name": "Sloot, greppel of gracht"
@@ -2017,7 +2095,8 @@
                 "name": "Rivieroever"
             },
             "waterway/stream": {
-                "name": "Beek"
+                "name": "Beek",
+                "terms": "stroom, rivier"
             },
             "waterway/weir": {
                 "name": "Stuw"
diff --git a/vendor/assets/iD/iD/locales/no.json b/vendor/assets/iD/iD/locales/no.json
index ba1827106..656c049f5 100644
--- a/vendor/assets/iD/iD/locales/no.json
+++ b/vendor/assets/iD/iD/locales/no.json
@@ -134,6 +134,7 @@
     },
     "browser_notice": "Denne editor er støttet i Firefox, Chrome, Safari, Opera og Internet Explorer 9 og høyere. Vennligst oppgrader din nettleser eller bruk Potlatch 2 for å redigere kartet.",
     "translate": {
+        "translate": "Oversett",
         "localized_translation_language": "Velg språk",
         "localized_translation_name": "Navn"
     },
@@ -158,6 +159,7 @@
         "no_documentation_combination": "Det finnes ingen dokumentasjon for denne tag-kombinasjonen",
         "no_documentation_key": "Det finnes ingen dokumentasjon tilgjengelig for denne nøkkelen",
         "show_more": "Vis mer",
+        "all_members": "Alle medlemmer",
         "role": "Rolle",
         "choose": "Velg egenskapstype",
         "results": "{n} resultater for {search}",
@@ -187,6 +189,7 @@
     "success": {
         "just_edited": "Du har akkurat endret OpenStreetMap!",
         "view_on_osm": "Vis på OSM",
+        "facebook": "Del på Facebook",
         "twitter": "Del på Twitter",
         "google": "Del på Google+"
     },
@@ -224,6 +227,9 @@
         "navigation": {
             "title": "Navigasjon",
             "drag": "Hovedkartet viser data fra OpenstreetMap lagt over en bakgrunn. Du kan navigere ved å dra eller scrolle, slik som et vanlig nettkart. **Dra kartet!**"
+        },
+        "lines": {
+            "title": "Linjer"
         }
     },
     "presets": {
@@ -304,7 +310,11 @@
             "admin_level": {
                 "label": "Administrasjonsnivå"
             },
+            "aerialway": {
+                "label": "Type"
+            },
             "aerialway/capacity": {
+                "label": "Kapasitet (per time)",
                 "placeholder": "500, 2500, 5000..."
             },
             "aerialway/duration": {
@@ -545,6 +555,9 @@
             "sport": {
                 "label": "Sport"
             },
+            "sport_ice": {
+                "label": "Sport"
+            },
             "structure": {
                 "label": "Struktur",
                 "placeholder": "Ukjent",
@@ -553,6 +566,9 @@
                     "tunnel": "Tunnel"
                 }
             },
+            "studio_type": {
+                "label": "Type"
+            },
             "surface": {
                 "label": "Overflate"
             },
@@ -664,6 +680,9 @@
             "amenity/college": {
                 "name": "Videregående skole"
             },
+            "amenity/doctor": {
+                "name": "Doktor"
+            },
             "amenity/drinking_water": {
                 "name": "Drikkevann"
             },
@@ -688,6 +707,9 @@
             "amenity/marketplace": {
                 "name": "Markedsplass"
             },
+            "amenity/nightclub": {
+                "name": "Nattklubb"
+            },
             "amenity/pharmacy": {
                 "name": "Apotek"
             },
@@ -778,18 +800,15 @@
             "building/apartments": {
                 "name": "Leiligheter"
             },
-            "building/entrance": {
-                "name": "Inngang"
-            },
             "building/house": {
                 "name": "Hus"
             },
+            "craft/optician": {
+                "name": "Optiker"
+            },
             "emergency/phone": {
                 "name": "Nødtelefon"
             },
-            "entrance": {
-                "name": "Inngang"
-            },
             "highway": {
                 "name": "Vei"
             },
@@ -814,9 +833,6 @@
             "highway/motorway": {
                 "name": "Motorvei"
             },
-            "highway/motorway_junction": {
-                "name": "Motorveikrysning"
-            },
             "highway/motorway_link": {
                 "name": "Motorveirampe"
             },
@@ -934,6 +950,9 @@
             "leisure": {
                 "name": "Fritid"
             },
+            "leisure/dog_park": {
+                "name": "Hundepark"
+            },
             "leisure/garden": {
                 "name": "Hage"
             },
@@ -1057,6 +1076,9 @@
             "office": {
                 "name": "Kontor"
             },
+            "office/architect": {
+                "name": "Arkitekt"
+            },
             "place": {
                 "name": "Sted"
             },
diff --git a/vendor/assets/iD/iD/locales/pl.json b/vendor/assets/iD/iD/locales/pl.json
index 2f6c10f94..d9954fd10 100644
--- a/vendor/assets/iD/iD/locales/pl.json
+++ b/vendor/assets/iD/iD/locales/pl.json
@@ -180,6 +180,12 @@
             },
             "not_eligible": "Linie nie mogą zostać rozdzielone na ich początku lub końcu.",
             "multiple_ways": "Jest tu zbyt wiele linii do rozdzielenia."
+        },
+        "restriction": {
+            "annotation": {
+                "create": "Dodano zakaz/nakaz skrętu",
+                "delete": "Usunięto zakaz/nakaz skrętu"
+            }
         }
     },
     "undo": {
@@ -265,7 +271,7 @@
         "percent_brightness": "jasność {opacity}%",
         "none": "Brak",
         "custom": "Własne",
-        "custom_prompt": "Wpisz adres kafelków w formacie  {z}, {x}, {y} dla schematu Z/X/Y lub {u} dla schematu QuadTile.",
+        "custom_button": "Edycja własnego podkładu",
         "fix_misalignment": "Wyrównaj podkład",
         "reset": "resetuj"
     },
@@ -598,6 +604,9 @@
             "fixme": {
                 "label": "Napraw mnie"
             },
+            "fuel": {
+                "label": "Paliwo"
+            },
             "gauge": {
                 "label": "Wskaźnik"
             },
@@ -713,6 +722,9 @@
             "place": {
                 "label": "Typ"
             },
+            "population": {
+                "label": "Populacja"
+            },
             "power": {
                 "label": "Typ"
             },
@@ -740,6 +752,9 @@
             "restriction": {
                 "label": "Typ"
             },
+            "restrictions": {
+                "label": "Zakazy skrętu"
+            },
             "route": {
                 "label": "Typ"
             },
@@ -749,6 +764,9 @@
             "sac_scale": {
                 "label": "Trudność trasy"
             },
+            "seasonal": {
+                "label": "Sezonowy"
+            },
             "service": {
                 "label": "Typ"
             },
@@ -761,12 +779,18 @@
             "shop": {
                 "label": "Typ"
             },
+            "smoking": {
+                "label": "Dla palących, Palenie, "
+            },
             "source": {
                 "label": "Źródło"
             },
             "sport": {
                 "label": "Sport"
             },
+            "sport_ice": {
+                "label": "Sport"
+            },
             "structure": {
                 "label": "Struktura",
                 "placeholder": "Nieznane",
@@ -774,7 +798,8 @@
                     "bridge": "Most",
                     "tunnel": "Tunel",
                     "embankment": "Nasyp",
-                    "cutting": "Wykop"
+                    "cutting": "Wykop",
+                    "ford": "Bród"
                 }
             },
             "studio_type": {
@@ -845,22 +870,28 @@
                 "name": "Kolejka górska"
             },
             "aerialway/chair_lift": {
-                "name": "Wyciag krzesełkowy"
+                "name": "Wyciag krzesełkowy",
+                "terms": "Wyciąg narciarski krzesełkowy,"
             },
             "aerialway/gondola": {
-                "name": "Gondola"
+                "name": "Gondola",
+                "terms": "Wyciąg narciarski gondolowy, Gondola"
             },
             "aerialway/magic_carpet": {
-                "name": "wyciąg narciarski dywanowy"
+                "name": "wyciąg narciarski dywanowy",
+                "terms": "Narciarski pas transmisyjny dla dzieci, "
             },
             "aerialway/platter": {
-                "name": "Wyciag talerzykowy"
+                "name": "Wyciag talerzykowy",
+                "terms": "Wyciąg talerzykowy, "
             },
             "aerialway/pylon": {
-                "name": "Podpora wyciagu narciarskiego"
+                "name": "Podpora wyciagu narciarskiego",
+                "terms": "Podpora, słup "
             },
             "aerialway/rope_tow": {
-                "name": "Wyrwirączka"
+                "name": "Wyrwirączka",
+                "terms": "Wyrwirączka"
             },
             "aerialway/station": {
                 "name": "Stacja wyciagu narciarskiego"
@@ -922,6 +953,9 @@
                 "name": "Bar",
                 "terms": "bar"
             },
+            "amenity/bbq": {
+                "name": "Grill"
+            },
             "amenity/bench": {
                 "name": "Ławka",
                 "terms": "ławka,siedzenie,siedzisko"
@@ -953,6 +987,9 @@
                 "name": "Myjnia samochodowa",
                 "terms": "myjnia"
             },
+            "amenity/charging_station": {
+                "name": "Stacja ładowania pojazdów"
+            },
             "amenity/childcare": {
                 "name": "Żłobek",
                 "terms": "opieka,przedszkole"
@@ -965,7 +1002,8 @@
                 "name": "Klinika"
             },
             "amenity/clock": {
-                "name": "Zegar"
+                "name": "Zegar",
+                "terms": "Zegar, "
             },
             "amenity/college": {
                 "name": "Uczelnia",
@@ -976,7 +1014,8 @@
                 "terms": "sąd,sprawiedliwość,trybunał"
             },
             "amenity/dentist": {
-                "name": "Dentysta"
+                "name": "Dentysta",
+                "terms": "Dentysta, "
             },
             "amenity/doctor": {
                 "name": "Doktor"
@@ -1017,6 +1056,10 @@
                 "name": "Targowisko",
                 "terms": "targowisko,targ,rynek,giełda"
             },
+            "amenity/nightclub": {
+                "name": "Klub nocny",
+                "terms": "Klub nocny,"
+            },
             "amenity/parking": {
                 "name": "Parking samochodowy"
             },
@@ -1068,13 +1111,15 @@
                 "terms": "bar,kawiarnia,stołówka,jadalnia,drive-in,knajpa,jadłodajnia,fast food,grill,gospoda,klub nocny,pizzeria"
             },
             "amenity/shelter": {
-                "name": "Schronienie"
+                "name": "Schronienie",
+                "terms": "schronienie, "
             },
             "amenity/social_facility": {
                 "name": "Placówka pomocy społecznej"
             },
             "amenity/social_facility/food_bank": {
-                "name": "Bank żywności"
+                "name": "Bank żywności",
+                "terms": "Bank żywności, "
             },
             "amenity/social_facility/homeless_shelter": {
                 "name": "Schronisko dla bezdomnych"
@@ -1115,7 +1160,8 @@
                 "terms": "automat do sprzedaży"
             },
             "amenity/veterinary": {
-                "name": "Weterynarz"
+                "name": "Weterynarz",
+                "terms": "Zakład weterynaryjny, Weterynarz"
             },
             "amenity/waste_basket": {
                 "name": "Kosz na śmieci",
@@ -1200,7 +1246,7 @@
                 "terms": "budynek,budowla,dom"
             },
             "building/apartments": {
-                "name": "Apartamenty",
+                "name": "Budynek mieszkalny wielorodzinny",
                 "terms": "blok,kamienica"
             },
             "building/barn": {
@@ -1210,24 +1256,27 @@
                 "name": "Bunkier"
             },
             "building/cathedral": {
-                "name": "Katedra"
+                "name": "Katedra",
+                "terms": "Katedra, "
             },
             "building/chapel": {
-                "name": "Kaplica"
+                "name": "Kaplica",
+                "terms": "Kaplica, "
             },
             "building/church": {
-                "name": "Kościół"
+                "name": "Kościół",
+                "terms": "Kościół, "
             },
             "building/commercial": {
                 "name": "Nieruchomość komercyjna",
                 "terms": "sklep,komercyjny,sprzedaż,handlowy"
             },
-            "building/dormitory": {
-                "name": "Akademik"
+            "building/detached": {
+                "name": "Dom wolnostojący"
             },
-            "building/entrance": {
-                "name": "Wejście",
-                "terms": "wejście,drzwi"
+            "building/dormitory": {
+                "name": "Akademik",
+                "terms": "Akademik, bursa, "
             },
             "building/garage": {
                 "name": "Garaż",
@@ -1237,7 +1286,8 @@
                 "name": "Garaże"
             },
             "building/greenhouse": {
-                "name": "Szklarnia"
+                "name": "Szklarnia",
+                "terms": "Szklarnia"
             },
             "building/house": {
                 "name": "Dom",
@@ -1259,7 +1309,11 @@
                 "terms": "blok, kamienica, dom, czynszówka"
             },
             "building/roof": {
-                "name": "Zadaszenie"
+                "name": "Zadaszenie",
+                "terms": "Dach,"
+            },
+            "building/school": {
+                "name": "Budynek szkolny"
             },
             "building/shed": {
                 "name": "Szopa"
@@ -1268,7 +1322,8 @@
                 "name": "Stajnia"
             },
             "building/train_station": {
-                "name": "Stacja kolejowa"
+                "name": "Stacja kolejowa",
+                "terms": "Stacja kolejowa, "
             },
             "building/warehouse": {
                 "name": "Magazyn"
@@ -1286,7 +1341,8 @@
                 "name": "Introligator"
             },
             "craft/brewery": {
-                "name": "Gorzelnia"
+                "name": "Gorzelnia",
+                "terms": "Gorzelnia, "
             },
             "craft/caterer": {
                 "name": "Żywieniowiec"
@@ -1307,19 +1363,27 @@
                 "name": "Ogrodnik"
             },
             "craft/glaziery": {
-                "name": "Szklarz"
+                "name": "Szklarz",
+                "terms": "Zakład szklarski, Szklarz"
             },
             "craft/handicraft": {
                 "name": "Rzemiosło"
             },
+            "craft/hvac": {
+                "name": "Klimatyzacja"
+            },
             "craft/jeweler": {
                 "name": "Jubiler"
             },
+            "craft/key_cutter": {
+                "name": "Dorabianie kluczy"
+            },
             "craft/locksmith": {
                 "name": "Ślusarz"
             },
             "craft/optician": {
-                "name": "Optyk"
+                "name": "Optyk",
+                "terms": "Zakład optyczny, Optyk"
             },
             "craft/painter": {
                 "name": "Malarz"
@@ -1327,7 +1391,7 @@
             "craft/photographer": {
                 "name": "Fotograf"
             },
-            "craft/photographic_labratory": {
+            "craft/photographic_laboratory": {
                 "name": "Laboratorium fotograficzne"
             },
             "craft/plasterer": {
@@ -1361,10 +1425,12 @@
                 "name": "Szewc"
             },
             "craft/stonemason": {
-                "name": "Zakład kamieniarski"
+                "name": "Zakład kamieniarski",
+                "terms": "Zakład Kamieniarski, Kamieniarz"
             },
             "craft/sweep": {
-                "name": "Kominiarz"
+                "name": "Kominiarz",
+                "terms": "Kominiarz"
             },
             "craft/tailor": {
                 "name": "Krawiec"
@@ -1396,17 +1462,20 @@
                 "name": "Telefon alarmowy",
                 "terms": "telefon,alarmowy,alarm"
             },
-            "entrance": {
-                "name": "Wejście",
-                "terms": "wejście,przejście"
-            },
             "footway/crossing": {
-                "name": "Przejście dla pieszych"
+                "name": "Przejście dla pieszych",
+                "terms": "przejście dla pieszych, "
             },
             "footway/sidewalk": {
                 "name": "Chodnik",
                 "terms": "chodnik"
             },
+            "ford": {
+                "name": "Bród"
+            },
+            "golf/hole": {
+                "name": "dołek na polu golfowym "
+            },
             "highway": {
                 "name": "Droga",
                 "terms": "droga,szlak,ulica"
@@ -1443,10 +1512,6 @@
                 "name": "Autostrada",
                 "terms": "autostrada"
             },
-            "highway/motorway_junction": {
-                "name": "Węzeł autostradowy",
-                "terms": "węzeł, skrzyżowanie, autostrad"
-            },
             "highway/motorway_link": {
                 "name": "Autostrada - wjazd/zjazd",
                 "terms": "rampa,wjazd,wyjazd,zjazd"
@@ -1507,7 +1572,8 @@
                 "name": "Uliczka parkingowa"
             },
             "highway/services": {
-                "name": "Obszar usługowy"
+                "name": "Obszar usługowy",
+                "terms": "Obszar serwisowy, "
             },
             "highway/steps": {
                 "name": "Schody",
@@ -1630,10 +1696,17 @@
             "landuse/industrial": {
                 "name": "Obszar przemysłowy"
             },
+            "landuse/landfill": {
+                "name": "Wysypisko",
+                "terms": "składowisko odpadów,śmieci"
+            },
             "landuse/meadow": {
                 "name": "Łąka",
                 "terms": "Łąka"
             },
+            "landuse/military": {
+                "name": "Wojskowy"
+            },
             "landuse/orchard": {
                 "name": "Sad",
                 "terms": "Sad"
@@ -1654,11 +1727,15 @@
                 "terms": "winnica"
             },
             "leisure": {
-                "name": "Rozrywka i wypoczynek"
+                "name": "Rozrywka i wypoczynek",
+                "terms": "Wypoczynek, czas wolny"
             },
             "leisure/dog_park": {
                 "name": "Park dla psów"
             },
+            "leisure/firepit": {
+                "name": "Miejsce na ognisko"
+            },
             "leisure/garden": {
                 "name": "Ogród",
                 "terms": "ogród"
@@ -1667,6 +1744,9 @@
                 "name": "Pole golfowe",
                 "terms": "pole golfowe"
             },
+            "leisure/ice_rink": {
+                "name": "Lodowisko"
+            },
             "leisure/marina": {
                 "name": "Przystań",
                 "terms": "przystań"
@@ -1675,8 +1755,12 @@
                 "name": "Park",
                 "terms": "las,ogród,trawa,zieleń,trawnik,łąka,miejsce,plac,teren rekreacyjny"
             },
+            "leisure/picnic_table": {
+                "name": "Stół piknikowy"
+            },
             "leisure/pitch": {
-                "name": "Boisko"
+                "name": "Boisko",
+                "terms": "boisko sportowe, boisko"
             },
             "leisure/pitch/american_football": {
                 "name": "Boisko do futbolu amerykańskiego"
@@ -1712,10 +1796,6 @@
                 "name": "Pochylnia okrętowa",
                 "terms": "pochylnia"
             },
-            "leisure/sports_center": {
-                "name": "Centrum sportowe",
-                "terms": "centrum,sportowe,rekreacji,rekreacja,sport,boisko,stadion"
-            },
             "leisure/stadium": {
                 "name": "Stadion",
                 "terms": "stadion"
@@ -1729,7 +1809,8 @@
                 "terms": "tor wyścigowy"
             },
             "line": {
-                "name": "Linia"
+                "name": "Linia",
+                "terms": "Linia, lina"
             },
             "man_made": {
                 "name": "Obiekty sztuczne"
@@ -1835,7 +1916,8 @@
                 "terms": "Krzaki, zarośla"
             },
             "natural/spring": {
-                "name": "Źródło"
+                "name": "Źródło",
+                "terms": "źródło"
             },
             "natural/tree": {
                 "name": "Drzewo",
@@ -1865,7 +1947,8 @@
                 "name": "Puszcza"
             },
             "office": {
-                "name": "Biuro"
+                "name": "Biuro",
+                "terms": "Biuro,"
             },
             "office/accountant": {
                 "name": "Księgowy",
@@ -1879,13 +1962,15 @@
                 "name": "Instytucja edukacyjna"
             },
             "office/employment_agency": {
-                "name": "Agencja zatrudnienia"
+                "name": "Agencja zatrudnienia",
+                "terms": "Agencja pracy, "
             },
             "office/estate_agent": {
                 "name": "Biuro nieruchomości"
             },
             "office/insurance": {
-                "name": "Biuro ubezpieczeń"
+                "name": "Biuro ubezpieczeń",
+                "terms": "Agencja ubezpieczeniowa"
             },
             "office/newspaper": {
                 "name": "Gazeta"
@@ -1910,7 +1995,8 @@
                 "name": "Biuro podróży"
             },
             "piste": {
-                "name": "Trasa narciarska"
+                "name": "Trasa narciarska",
+                "terms": "Trasa narciarska"
             },
             "place": {
                 "name": "Miejsce"
@@ -1933,6 +2019,9 @@
             "place/locality": {
                 "name": "Okolica"
             },
+            "place/neighbourhood": {
+                "name": "Sąsiedztwo"
+            },
             "place/town": {
                 "name": "Miasto",
                 "terms": "Miasteczko"
@@ -1955,7 +2044,8 @@
                 "terms": "lina wysokiego napięcia, lina energetyczna"
             },
             "power/minor_line": {
-                "name": "Linia energetyczna o niskim stopniu ważności"
+                "name": "Linia energetyczna o niskim stopniu ważności",
+                "terms": "Linia energetyczna niskiego napięcia, "
             },
             "power/pole": {
                 "name": "Słup elektryczny"
@@ -1997,6 +2087,9 @@
                 "name": "Kolej jednoszynowa",
                 "terms": "Kolej jednoszynowa"
             },
+            "railway/narrow_gauge": {
+                "name": "Linia kolejowa wąskotorowa"
+            },
             "railway/platform": {
                 "name": "Peron kolejowy"
             },
@@ -2088,7 +2181,8 @@
                 "name": "Konfekcja"
             },
             "shop/convenience": {
-                "name": "Sklep ogólnospożywczy"
+                "name": "Sklep ogólnospożywczy",
+                "terms": "mały sklep, sklepik osiedlowy"
             },
             "shop/deli": {
                 "name": "Delikatesy"
@@ -2097,7 +2191,8 @@
                 "name": "Dom towarowy"
             },
             "shop/doityourself": {
-                "name": "Sklep dla majsterkowiczów"
+                "name": "Sklep dla majsterkowiczów",
+                "terms": "sklep dla majsterkowiczów"
             },
             "shop/dry_cleaning": {
                 "name": "Pralnia chemiczna"
@@ -2115,6 +2210,10 @@
                 "name": "Kwiaciarnia",
                 "terms": "kwiaciarnia"
             },
+            "shop/funeral_directors": {
+                "name": "Zakład pogrzebowy",
+                "terms": "pochówek,pogrzeb"
+            },
             "shop/furniture": {
                 "name": "Sklep meblowy",
                 "terms": "sklep meblowy"
@@ -2123,7 +2222,8 @@
                 "name": "Centrum ogrodnicze"
             },
             "shop/gift": {
-                "name": "Sklep z pamiątkami"
+                "name": "Sklep z pamiątkami",
+                "terms": "sklep z prezentami"
             },
             "shop/greengrocer": {
                 "name": "Warzywniak",
@@ -2163,7 +2263,8 @@
                 "name": "Sklep z telefonami komórkowymi"
             },
             "shop/motorcycle": {
-                "name": "Dealer motocykli"
+                "name": "Dealer motocykli",
+                "terms": "Dealer motocyklowy"
             },
             "shop/music": {
                 "name": "Sklep muzyczny",
@@ -2180,7 +2281,8 @@
                 "name": "Sklep turystyczny"
             },
             "shop/pet": {
-                "name": "Sklep zoologiczny"
+                "name": "Sklep zoologiczny",
+                "terms": "Sklep zoologiczny"
             },
             "shop/photo": {
                 "name": "sklep fotograficzny"
@@ -2203,7 +2305,8 @@
                 "terms": "sklep z zabawkami"
             },
             "shop/travel_agency": {
-                "name": "Biuro podróży"
+                "name": "Biuro podróży",
+                "terms": "Biuro podróży, "
             },
             "shop/tyres": {
                 "name": "Sklep z oponami"
@@ -2217,6 +2320,10 @@
             "shop/video": {
                 "name": "Sklep wideo"
             },
+            "shop/wine": {
+                "name": "Winiarnia",
+                "terms": "Winiarnia"
+            },
             "tourism": {
                 "name": "Turystyka",
                 "terms": "Turystyka"
@@ -2281,7 +2388,8 @@
                 "name": "Granica"
             },
             "type/boundary/administrative": {
-                "name": "Granica administracyjna"
+                "name": "Granica administracyjna",
+                "terms": "Granica administracyjna, "
             },
             "type/multipolygon": {
                 "name": "Wielokąt złożony"
@@ -2290,12 +2398,31 @@
                 "name": "Ograniczenie",
                 "terms": "restrykcja"
             },
+            "type/restriction/no_left_turn": {
+                "name": "Zakaz skrętu w lewo"
+            },
+            "type/restriction/no_right_turn": {
+                "name": "Zakaz skrętu w prawo"
+            },
+            "type/restriction/no_straight_on": {
+                "name": "Zakaz jazdy prosto"
+            },
+            "type/restriction/no_u_turn": {
+                "name": "Zakaz zawracania"
+            },
+            "type/restriction/only_left_turn": {
+                "name": "Nakaz skrętu w lewo"
+            },
+            "type/restriction/only_right_turn": {
+                "name": "Nakaz skrętu w prawo"
+            },
             "type/route": {
                 "name": "Trasa",
                 "terms": "trasa"
             },
             "type/route/bicycle": {
-                "name": "Droga rowerowa"
+                "name": "Droga rowerowa",
+                "terms": "Trasa rowerowa, "
             },
             "type/route/bus": {
                 "name": "Trasa autobusowa "
@@ -2340,7 +2467,8 @@
                 "name": "Kanał"
             },
             "waterway/dam": {
-                "name": "Tama"
+                "name": "Tama",
+                "terms": "Zapora"
             },
             "waterway/ditch": {
                 "name": "Rów"
@@ -2353,7 +2481,8 @@
                 "terms": "odpływ,potok,ujście,strumyk,dopływ,ciek wodny"
             },
             "waterway/riverbank": {
-                "name": "Brzeg rzeki"
+                "name": "Brzeg rzeki",
+                "terms": "Brzeg rzeki, "
             },
             "waterway/stream": {
                 "name": "Strumień",
diff --git a/vendor/assets/iD/iD/locales/pt-BR.json b/vendor/assets/iD/iD/locales/pt-BR.json
index 067e03276..1881c4e37 100644
--- a/vendor/assets/iD/iD/locales/pt-BR.json
+++ b/vendor/assets/iD/iD/locales/pt-BR.json
@@ -2,12 +2,12 @@
     "modes": {
         "add_area": {
             "title": "Área",
-            "description": "Adicione parques, prédios, lagos ou outras áreas ao mapa.",
+            "description": "Adicione parques, edifícios, lagos ou outras áreas ao mapa.",
             "tail": "Clique no mapa para começar a desenhar uma área, como um parque, lago ou edifício."
         },
         "add_line": {
             "title": "Linha",
-            "description": "Adicione rodovias, ruas, caminhos de pedestres, rios ou outras linhas ao mapa.",
+            "description": "Adicione estradas, ruas, vias de pedestres, rios ou outras linhas ao mapa.",
             "tail": "Clique no mapa para começar a desenhar uma estrada, caminho ou rota."
         },
         "add_point": {
@@ -20,24 +20,24 @@
             "description": "Mover e ampliar o mapa."
         },
         "draw_area": {
-            "tail": "Clique para adicionar nós na sua área. Clique no primeiro nó para concluir a área."
+            "tail": "Clique para adicionar pontos na sua área. Clique no primeiro ponto para concluir a área."
         },
         "draw_line": {
-            "tail": "Clique para adicionar mais nós à linha. Clique em outras linhas para conectá-la a elas. Dê um duplo clique para finalizar a linha."
+            "tail": "Clique para adicionar mais pontos à linha. Clique em outras linhas para conectá-la a elas. Dê um duplo clique para finalizar a linha."
         }
     },
     "operations": {
         "add": {
             "annotation": {
                 "point": "Adicionou um ponto.",
-                "vertex": "Adicionou um nó a uma via.",
+                "vertex": "Adicionou um ponto numa linha.",
                 "relation": "Adicionou uma relação."
             }
         },
         "start": {
             "annotation": {
                 "line": "Iniciou uma linha.",
-                "area": "Área iniciada."
+                "area": "Iniciou uma área."
             }
         },
         "continue": {
@@ -61,17 +61,18 @@
             "annotation": "Etiquetas alteradas."
         },
         "circularize": {
-            "title": "Fazer um círculo",
+            "title": "Circularizar",
             "description": {
-                "line": "Fazer um círculo com essa linha.",
-                "area": "Fazer um círculo com essa área."
+                "line": "Tornar essa linha circular.",
+                "area": "Tornar essa área circular."
             },
             "key": "O",
             "annotation": {
-                "line": "Fez da linha um círculo.",
-                "area": "Fez da área um círculo."
+                "line": "Circularizou uma linha.",
+                "area": "Circularizou uma área."
             },
-            "not_closed": "Não é possível fazer disso um círculo, pois não forma um ciclo fechado."
+            "not_closed": "Não é possível circularizar isso porque isto não forma um ciclo fechado.",
+            "too_large": "Não é possível circularizar isso porque uma parte disso não está visível."
         },
         "orthogonalize": {
             "title": "Ortogonalizar",
@@ -84,40 +85,41 @@
                 "line": "Ajustou os cantos de uma linha para 90°.",
                 "area": "Ajustou os cantos de uma área para 90°."
             },
-            "not_squarish": "Isto não pode ser ortogonalizado porque não é um polígono."
+            "not_squarish": "Isto não pode ser ortogonalizado porque não é um polígono.",
+            "too_large": "Não é possível ortogonalizar isso porque uma parte disso não está visível."
         },
         "straighten": {
-            "title": "Endireitar",
-            "description": "Endireitar esta linha.",
+            "title": "Retilinizar",
+            "description": "Tornar esta linha reta.",
             "key": "S",
-            "annotation": "Endireitar uma linha.",
-            "too_bendy": "Isto não pode ser alinhado porque possui muitas curvas."
+            "annotation": "Retilinizou uma linha.",
+            "too_bendy": "Isso não pode ser retilinizado porque é curvo demais."
         },
         "delete": {
-            "title": "Deletar",
+            "title": "Excluir",
             "description": "Remover isto do mapa.",
             "annotation": {
-                "point": "Removido um ponto.",
-                "vertex": "Removido um nó do caminho.",
-                "line": "Removida uma linha.",
-                "area": "Removida uma área.",
-                "relation": "Removida uma relação.",
-                "multiple": "Removidos {n} objetos."
+                "point": "Excluído um ponto.",
+                "vertex": "Excluído um pondo de uma linha.",
+                "line": "Excluída uma linha.",
+                "area": "Excluída uma área.",
+                "relation": "Excluída uma relação.",
+                "multiple": "Excluídos {n} objetos."
             },
-            "incomplete_relation": "Este elemento não pode ser removido porque não foi ainda totalmente baixado."
+            "incomplete_relation": "Este objeto não pode ser excluído porque não foi ainda totalmente baixado."
         },
         "add_member": {
             "annotation": "Adicionado um membro à relação."
         },
         "delete_member": {
-            "annotation": "Removido um membro de uma relação."
+            "annotation": "Retirado um membro de uma relação."
         },
         "connect": {
             "annotation": {
-                "point": "Conectou uma via a um ponto.",
-                "vertex": "Conectou uma via a outra.",
+                "point": "Conectou uma linha a um ponto.",
+                "vertex": "Conectou uma linha a outra.",
                 "line": "Conectou uma via a uma linha.",
-                "area": "Conectou uma via a uma área."
+                "area": "Conectou uma linha a uma área."
             }
         },
         "disconnect": {
@@ -132,10 +134,10 @@
             "description": "Mesclar estas linhas.",
             "key": "C",
             "annotation": "Mesclou {n} linhas.",
-            "not_eligible": "Esses elementos não podem ser mesclados.",
+            "not_eligible": "Esses objetos não podem ser mesclados.",
             "not_adjacent": "Essas linhas não podem ser mescladas porque não estão conectadas.",
             "restriction": "Estas linhas não podem ser mescladas porque pelo menos uma delas é membro da relação \"{relation}\".",
-            "incomplete_relation": "Estas funcionalidades não podem ser mescladas porque pelo menos uma delas não foi transferida completamente."
+            "incomplete_relation": "Estes objetos não podem ser mesclados porque pelo menos um deles não foi transferido completamente."
         },
         "move": {
             "title": "Mover",
@@ -143,12 +145,12 @@
             "key": "M",
             "annotation": {
                 "point": "Ponto movido.",
-                "vertex": "Moveu um nó em uma via.",
+                "vertex": "Moveu um ponto numa linha.",
                 "line": "Moveu uma linha.",
                 "area": "Moveu uma área.",
                 "multiple": "Moveu múltiplos objetos."
             },
-            "incomplete_relation": "Este elemento não pode ser movido porque ainda não foi totalmente baixado."
+            "incomplete_relation": "Este objeto não pode ser movido porque ainda não foi totalmente baixado."
         },
         "rotate": {
             "title": "Girar",
@@ -161,16 +163,16 @@
         },
         "reverse": {
             "title": "Inverter",
-            "description": "Fazer esta linha ir na direção oposta.",
+            "description": "Fazer esta via/linha ir na direção oposta.",
             "key": "V",
             "annotation": "Inverteu uma linha."
         },
         "split": {
             "title": "Dividir",
             "description": {
-                "line": "Dividir essa linha em duas nesse nó.",
+                "line": "Dividir essa linha em duas nesse ponto.",
                 "area": "Dividir a borda dessa área em dois pedaços.",
-                "multiple": "Dividir as linhas/áreas em duas nesse nó."
+                "multiple": "Dividir as linhas/áreas em duas nesse ponto."
             },
             "key": "X",
             "annotation": {
@@ -205,11 +207,11 @@
     "status": {
         "error": "Incapaz de conectar à API.",
         "offline": "A API está offline. Por favor tente editar mais tarde.",
-        "readonly": "O OpenStreetMap está em modo somente leitura. Você terá que esperar para salvar as suas alterações."
+        "readonly": "A API do OpenStreetMap está em modo somente leitura. Espere um pouco para salvar as suas alterações."
     },
     "commit": {
         "title": "Salvar Alterações",
-        "description_placeholder": "Breve descrição de suas contribuições",
+        "description_placeholder": "Descrição curta e clara de suas contribuições",
         "message_label": "Mensagem de alteração",
         "upload_explanation": "As alterações que você enviar ficarão visíveis em todos os mapas que usam dados do OpenStreetMap.",
         "upload_explanation_with_user": "As alterações que você enviar como {user} estarão visíveis em todos os mapas que usam os dados do OpenStreetMap.",
@@ -217,12 +219,12 @@
         "cancel": "Cancelar",
         "warnings": "Alertas",
         "modified": "Modificado",
-        "deleted": "Removido",
+        "deleted": "Excluído",
         "created": "Criado"
     },
     "contributors": {
-        "list": "Edições por {users}",
-        "truncated_list": "Edições por {users} e {count} outros"
+        "list": "Edições de {users}",
+        "truncated_list": "Edições de {users} e {count} outros"
     },
     "geocoder": {
         "search": "Buscar no mundo todo...",
@@ -242,19 +244,19 @@
         "all_relations": "Todas as relações",
         "new_relation": "Nova relação...",
         "role": "Papel",
-        "choose": "Selecione o tipo de elemento",
+        "choose": "Selecione o tipo de objeto",
         "results": "{n} resultado(s) para {search}",
         "reference": "Ver no wiki do OpenStreetMap",
-        "back_tooltip": "Alterar elemento",
+        "back_tooltip": "Alterar objeto",
         "remove": "Remover",
         "search": "Procurar",
         "multiselect": "Itens Selecionados",
         "unknown": "Desconhecido",
         "incomplete": "<não baixado>",
-        "feature_list": "Buscar elementos",
-        "edit": "Editar elemento",
+        "feature_list": "Buscar objetos",
+        "edit": "Editar objeto",
         "none": "Nenhum",
-        "node": "Nó",
+        "node": "Ponto",
         "way": "Linha",
         "relation": "Relação",
         "location": "Local"
@@ -265,13 +267,14 @@
         "percent_brightness": "Brilho de {opacity}%",
         "none": "Nenhum",
         "custom": "Customizado",
-        "custom_prompt": "Entre com um template de tiles. Tokens válidos são {z}, {x}, {y} para esquema Z/X/Y e {u} para esquema de quadtile.",
+        "custom_button": "Editar fundo de tela personalizado",
+        "custom_prompt": "Informe um modelo de URL de quadrículas. Tokens válidos são {z}, {x}, {y} para o esquema Z/X/Y e {u} para o esquema quadtile.",
         "fix_misalignment": "Corrigir alinhamento",
         "reset": "resetar"
     },
     "restore": {
         "heading": "Você tem alterações não salvas",
-        "description": "Você deseja restaurar as alterações não salvas da sessão anterior?",
+        "description": "Deseja restaurar as alterações não salvas da sessão anterior?",
         "restore": "Restaurar",
         "reset": "Resetar"
     },
@@ -290,7 +293,7 @@
         "facebook": "Compartilhar no Facebook",
         "twitter": "Compartilhar no Twitter",
         "google": "Compartilhar Google+",
-        "help_html": "Suas mudanças devem aparecer na camada \"Padrão\" do OSM em poucos minutos. Outras camadas e certos recursos podem demorar mais\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map' target='_blank'>detalhes</a>).\n"
+        "help_html": "Suas mudanças devem aparecer na camada \"Padrão\" do OSM em poucos minutos. Outras camadas e certos objetos podem demorar mais\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map' target='_blank'>detalhes</a>).\n"
     },
     "confirm": {
         "okay": "O.K."
@@ -303,7 +306,7 @@
     },
     "source_switch": {
         "live": "ao vivo",
-        "lose_changes": "Você tem alterações não salvas. Trocar o servidor de mapas irá descartar essas alterações. Você tem certeza que deseja trocar de servidor?",
+        "lose_changes": "Você tem alterações não salvas. Trocar o servidor de mapas irá descartar essas alterações. Tem certeza que deseja trocar de servidor?",
         "dev": "dev"
     },
     "tag_reference": {
@@ -315,9 +318,9 @@
         "untagged_point": "Ponto sem etiquetas",
         "untagged_line": "Linha sem etiquetas",
         "untagged_area": "Área sem etiquetas",
-        "many_deletions": "Você está deletando {n} objetos. Você tem certeza que quer fazer isto? Isto irá deletá-los do mapa que todos veem no openstreetmap.org.",
+        "many_deletions": "Você está excluíndo {n} objetos. Tem certeza disto? Isto os excluirá do mapa que todos veem no openstreetmap.org.",
         "tag_suggests_area": "A etiqueta {tag} sugere que seja utilizada numa área, mas essa linha não é uma área",
-        "untagged_tooltip": "Selecione um tipo de feição que descreve o que esta {geometry} é.",
+        "untagged_tooltip": "Selecione um tipo de objeto que descreve o que este(a) {geometry} é.",
         "deprecated_tags": "Etiquetas obsoletas: {tags}"
     },
     "zoom": {
@@ -334,54 +337,54 @@
     "help": {
         "title": "Ajuda",
         "help": "# Ajuda\n\nEste é um editor para OpenStreetMap (http://www.openstreetmap.org/), o mapa mundial livre e editavel. Você pode usá-lo para adicionar e atualizar de dados em sua área,  tornando um mapa mundi de codigo aberto melhor para todos.\nAs edições que você fizer nesse mapa serão visíveis para todos que usam OpenStreetMap. Para fazer uma edição você precisará de uma conta gratuita OpenStreetMap(https://www.openstreetmap.org/user/new).\n\nO editor iD (http://ideditor.com/) é um projeto colaborativo com o código fonte disponível no GitHub(https://github.com/openstreetmap/iD).\n",
-        "editing_saving": "# Editando e Salvando\n\nEsse editor é feito para trabalhar primariamente online e você está\nneste momento acessando-o através de um sítio eletrônico.\n\n### Selecionando Elementos\n\nPara selecionar um elemento do mapa, como uma estrada ou \num ponto de interesse, clique sobre ele. Isso vai pôr o elemento\nselecionado em destaque, abrir um painel com detalhes sobre\nele e mostrar um menu de coisas que podem ser feitas com ele.\n\nMúltiplos elementos podem ser selecionados segurando a tecla\n\"Shift\", clicando e arrastando no mapa. Isso vai selecionar todos\nos elementos que estiverem dentro da caixa que foi desenhada,\npermitindo você fazer coisas com vários elementos de uma vez\nsó.\n\n### Salvando as Alterações\n\nQuando você faz alterações como editar ruas, prédios e lugares, elas\nsão guardadas localmente até que você as envie para o servidor. Não\nse preocupe se você cometer algum deslize: você pode desfazer\nalterações clicando no botão de desfazer e também refazer as\nalterações clicando no botão de refazer.\n\nClique em \"Salvar\" para salvar um conjunto de alterações. Por exemplo,\nvocê completou uma área de uma cidade e gostaria de começar a\neditar uma outra área. Você terá a chance de revisar o que foi feito\naté o momento e o editor mostrará sugestões e dicas se alguma coisa\nparecer estar errada com as suas alterações.\n\nSe tudo parecer estar OK, você pode inserir um breve comentário\nexplicando as mudanças que você fez e clicar em \"Salvar\" de novo\npara lançar as mudanças para o [OpenStreetMap](http://www.openstreetmap.org/),\nonde elas estarão visíveis para todos os outros usuários.\n\nSe você não conseguir concluir uma sessão de edição, você pode\ndeixar a janela do seu editor aberta e voltar mais tarde (no mesmo\nnavegador e computador) que o editor irá oferecer a possibilidade\nde restaurar o seu trabalho.\n",
-        "roads": "# Estradas \n\nVocê pode criar, corrigir e excluir estradas com este editor. Estradas podem ser de vários \ntipos: caminhos, estradas, trilhas, ciclovias e muito mais - qualquer segmento\nonde se passa, mesmo que às vezes, pode ser mapeado. \n\n### Selecionando \n\nClique em uma estrada para selecioná-la. Um esboço deve tornar-se visível, junto \ncom um pequeno menu de ferramentas no mapa e uma barra lateral mostrando mais informações \nsobre a estrada. \n\n### Modificando \n\nMuitas vezes você vai encontrar estradas que não estão alinhadas com as imagens por trás delas \nou com uma faixa de GPS. Você pode ajustar estas estradas para que elas fiquem no \nlugar certo. \n\nPrimeiro clique no caminho que você deseja alterar. Isso irá destacá-lo e mostrar \npontos de controle ao longo dela que você pode arrastar para locais melhores. Se \no que você deseja é adicionar novos pontos de controle para obter mais detalhes, clique duas vezes em uma parte \nda estrada sem um nó, e um ponto será adicionado.\n\nSe a estrada se conecta a uma outra estrada, mas não está corretamente conectada no \nmapa, você pode arrastar um de seus pontos de controle para a outra estrada \na fim de juntá-las. Ter estradas que se conectam é importante para o mapa \ne essencial para fornecer instruções de direção. \n\nVocê também pode clicar na ferramenta 'Mover' ou pressione a tecla 'M' para mover o caminho inteiro de \numa vez, e em seguida, clique novamente para salvar esse movimento. \n\n### Apagando \n\nSe uma estrada está completamente errada - você pode ver que ela não existe nas imagens \nde satélite e, junto a isso, ter confirmado localmente que ela não existe - você pode apagá-la do mapa.\nSeja cauteloso ao excluir recursos - \ncomo qualquer outra edição, os resultados são vistos por todos, e como as imagens de satélite \npodem estar desatualizadas, a estrada pode simplesmente ser recém-construída. \n\nVocê pode excluir um caminho, clicando sobre ele para selecioná-lo, em seguida, clicar no \nícone de lixeira ou pressionando a tecla 'Delete'.\n\n### Criando \n\nEncontrou um lugar onde deveria ter uma estrada, mas não tem? Clique no botão 'Linha' \nno canto superior esquerdo do editor ou pressione a tecla de atalho '2' para começar a desenhar \numa linha. \n\nClique no início da estrada no mapa para começar a desenhar. Se a estrada \nse ramifica de uma estrada existente, comece clicando sobre o lugar onde eles se conectam. \n\nEm seguida, clique em pontos ao longo da estrada para que ela siga o caminho certo, de acordo \ncom imagens de satélite ou GPS. Se a estrada que você está desenhando atravessa outra estrada, ligue-as \nclicando sobre o ponto de intersecção. Quando você terminar de desenhar, clique duas vezes \nou pressione 'Voltar' ou 'Enter' no seu teclado.\n",
-        "gps": "# GPS\n\nO GPS é a fonte de dados mais confiável do OpenStreetMap. Esse editor\nsuporta trilhas locais, isto é, arquivos \".gpx\" guardados no seu computador.\nVocê pode coletar esse tipo de trilha usando um smartphone ou um\num aparelho de GPS dedicado.\n\nPara mais informações sobre como fazer mapeamento por GPS, leia\n[Utilizando o GPS](http://learnosm.org/pt/beginner/using-gps/).\n\nPara utilizar uma trilha GPS no iD, arraste o arquivo GPX para o mapa. Se\na trilha for reconhecida, ela será adicionada ao mapa como uma linha\nem verde brilhante. Clique no menu \"Configurações da imagem de fundo\",\nno lado esquerdo, para habilitar, desabilitar ou focar o zoom na camada\nreferente a essa trilha.\n\nNote que a trilha GPX não é enviada diretamente ao OpenStreetMap. A\nmelhor maneira de utilizá-la é usando-a como uma linha guia, isto é, desenhando\npor cima dela os novos elementos que estão sendo adicionados no mapa.\nAlém disso, [envie a trilha para o OpenStreetMap](http://www.openstreetmap.org/trace/create)\npara que outras pessoas possam usá-la.\n",
+        "editing_saving": "# Editando e Salvando\n\nEsse editor é feito para trabalhar primariamente online e você está\nneste momento acessando-o através de um sítio eletrônico.\n\n### Selecionando Objetos\n\nPara selecionar um objeto do mapa, como uma estrada ou \num ponto de interesse, clique sobre ele. Isso vai pôr o objeto\nselecionado em destaque, abrir um painel com detalhes sobre\nele e mostrar um menu de coisas que podem ser feitas com ele.\n\nMúltiplos objetos podem ser selecionados segurando a tecla\n\"Shift\", clicando e arrastando no mapa. Isso vai selecionar todos\nos objetos que estiverem dentro da caixa que foi desenhada,\npermitindo você fazer coisas com vários objetos de uma vez\nsó.\n\n### Salvando as Alterações\n\nQuando você faz alterações como editar ruas, prédios e lugares, elas\nsão guardadas localmente até que você as envie para o servidor. Não\nse preocupe se você cometer algum deslize: você pode desfazer\nalterações clicando no botão de desfazer e também refazer as\nalterações clicando no botão de refazer.\n\nClique em \"Salvar\" para salvar um conjunto de alterações. Por exemplo,\nvocê completou uma área de uma cidade e gostaria de começar a\neditar uma outra área. Você terá a chance de revisar o que foi feito\naté o momento e o editor mostrará sugestões e dicas se alguma coisa\nparecer estar errada com as suas alterações.\n\nSe tudo parecer estar OK, você pode inserir um breve comentário\nexplicando as mudanças que você fez e clicar em \"Salvar\" de novo\npara lançar as mudanças para o [OpenStreetMap](http://www.openstreetmap.org/),\nonde elas estarão visíveis para todos os outros usuários.\n\nSe você não conseguir concluir uma sessão de edição, você pode\ndeixar a janela do seu editor aberta e voltar mais tarde (no mesmo\nnavegador e computador) que o editor irá oferecer a possibilidade\nde restaurar o seu trabalho.\n",
+        "roads": "# Estradas \n\nVocê pode criar, corrigir e excluir estradas com este editor. Estradas podem ser de vários \ntipos: caminhos, estradas, trilhas, ciclovias e muito mais - qualquer segmento\nonde se passa, mesmo que às vezes, pode ser mapeado. \n\n### Selecionando \n\nClique em uma estrada para selecioná-la. Um esboço deve tornar-se visível, junto \ncom um pequeno menu de ferramentas no mapa e uma barra lateral mostrando mais informações \nsobre a estrada. \n\n### Modificando \n\nMuitas vezes você vai encontrar estradas que não estão alinhadas com as imagens por trás delas \nou com uma faixa de GPS. Você pode ajustar estas estradas para que elas fiquem no \nlugar certo. \n\nPrimeiro clique no caminho que você deseja alterar. Isso irá destacá-lo e mostrar \npontos de controle ao longo dela que você pode arrastar para locais melhores. Se \no que você deseja é adicionar novos pontos de controle para obter mais detalhes, clique duas vezes em uma parte \nda estrada sem um ponto, e um ponto será adicionado.\n\nSe a estrada se conecta a uma outra estrada, mas não está corretamente conectada no \nmapa, você pode arrastar um de seus pontos de controle para a outra estrada \na fim de juntá-las. Ter estradas que se conectam é importante para o mapa \ne essencial para fornecer instruções de direção. \n\nVocê também pode clicar na ferramenta 'Mover' ou pressione a tecla 'M' para mover o caminho inteiro de \numa vez, e em seguida, clique novamente para salvar esse movimento. \n\n### Apagando \n\nSe uma estrada está completamente errada - você pode ver que ela não existe nas imagens \nde satélite e, junto a isso, ter confirmado localmente que ela não existe - você pode apagá-la do mapa.\nSeja cauteloso ao excluir objetos - \ncomo qualquer outra edição, os resultados são vistos por todos, e como as imagens de satélite \npodem estar desatualizadas, a estrada pode simplesmente ser recém-construída. \n\nVocê pode excluir um caminho, clicando sobre ele para selecioná-lo, em seguida, clicar no \nícone de lixeira ou pressionando a tecla 'Delete'.\n\n### Criando \n\nEncontrou um lugar onde deveria ter uma estrada, mas não tem? Clique no botão 'Linha' \nno canto superior esquerdo do editor ou pressione a tecla de atalho '2' para começar a desenhar \numa linha. \n\nClique no início da estrada no mapa para começar a desenhar. Se a estrada \nse ramifica de uma estrada existente, comece clicando sobre o lugar onde eles se conectam. \n\nEm seguida, clique em pontos ao longo da estrada para que ela siga o caminho certo, de acordo \ncom imagens de satélite ou GPS. Se a estrada que você está desenhando atravessa outra estrada, ligue-as \nclicando sobre o ponto de intersecção. Quando você terminar de desenhar, clique duas vezes \nou pressione 'Voltar' ou 'Enter' no seu teclado.\n",
+        "gps": "# GPS\n\nO GPS é a fonte de dados mais confiável do OpenStreetMap. Esse editor\nsuporta trilhas locais, isto é, arquivos \".gpx\" guardados no seu computador.\nVocê pode coletar esse tipo de trilha usando um smartphone ou um\num aparelho de GPS dedicado.\n\nPara mais informações sobre como fazer mapeamento por GPS, leia\n[Utilizando o GPS](http://learnosm.org/pt/beginner/using-gps/).\n\nPara utilizar uma trilha GPS no iD, arraste o arquivo GPX para o mapa. Se\na trilha for reconhecida, ela será adicionada ao mapa como uma linha\nem verde brilhante. Clique no menu \"Configurações da imagem de fundo\",\nno lado esquerdo, para habilitar, desabilitar ou focar o zoom na camada\nreferente a essa trilha.\n\nNote que a trilha GPX não é enviada diretamente ao OpenStreetMap. A\nmelhor maneira de utilizá-la é usando-a como uma linha guia, isto é, desenhando\npor cima dela os novos objetos que estão sendo adicionados no mapa.\nAlém disso, [envie a trilha para o OpenStreetMap](http://www.openstreetmap.org/trace/create)\npara que outras pessoas possam usá-la.\n",
         "imagery": "# Imagens Aéreas\n\nAs imagens aéreas são um recurso muito importante para o mapeamento.\nFotos de avião, de satélite e de outras fontes livre estão disponíveis no editor,\nno menu \"Configurações da Imagem de Fundo\", no lado esquerdo.\n\nPor padrão as imagens de satélite do [Bing Maps](http://www.bing.com/maps/)\nestão habilitadas no editor, mas ao mover e aproximar o mapa para certas áreas,\nnovas fontes de imagens estarão disponíveis. Alguns países, tais como os EUA, a\nFrança e a Dinamarca, têm imagens aéreas de alta qualidade em algumas áreas.\n\nAtenção: as imagens aéreas algumas vezes não batem exatamente com o\nque há em terra, isto é, têm algum deslocamento por causa de algum erro por\nparte de quem as gerou. Se você notar que muitas ruas estão deslocadas\nem comparação com a imagem de fundo, não as alinhe imediatamente com\na imagem. Em vez disso ajuste a imagem para que ela se alinhe com as ruas\natravés do botão \"Corrigir desalinhamento\" no final do painel de Configurações\nda Imagem de Fundo.\n",
         "addresses": "# Endereços\n\nOs endereços são uma das informações mais úteis do mapa.\n\nApesar de os endereços serem representados como parte de uma rua, no OpenStreetMap\neles também são gravados como atributos de prédios e outros lugares ao longo das ruas.\n\nVocê pode adicionar informações de endereço nos locais mapeados como área de edifícios\nou mapeados como pontos. A melhor fonte de informações sobre endereços\né a que vem de pesquisas de campo ou conhecimento pessoal do local - assim\ncomo qualquer outra informação, copiar de fontes comerciais como o Google Maps é estritamente\nproibido.\n",
-        "inspector": "# Usando o Inspetor\n\nO inspetor é a seção no lado direito da página que aparece quando um recurso\né selecionado e permite que você edite seus detalhes.\n\n### Selecionando um tipo de recurso\n\nDepois de adicionar um ponto, linha ou área, você pode escolher que tipo de característica ele\ntem, como por exemplo se é uma autoestrada ou via residencial, supermercado ou cafeteria.\nO inspetor vai exibir botões para os tipos de recursos mais comuns, e você pode\nencontrar outros, digitando o que você está procurando na caixa de pesquisa.\n\nClique no botão \"i\" no canto inferior direito de um botão de recurso para\naprender mais sobre ele. Clique em um botão para escolher o tipo.\n\n### Usando formas e editando etiquetas\n\nDepois de escolher um tipo de recurso, ou quando você seleciona um recurso que já \ntem um tipo atribuído, o inspetor vai exibir campos com detalhes sobre \no recurso como seu nome e endereço. \n\nAbaixo dos campos que você vê, você pode clicar nos ícones para adicionar outros detalhes, \ncomo informações da [Wikipedia] (http://www.wikipedia.org/), acesso para cadeirantes, \nentre outros. \n\nNa parte inferior do inspetor, clique em 'Etiquetas adicionais' para adicionar \noutras etiquetas ao elemento. O [Taginfo] (http://taginfo.openstreetmap.org/) é um \nexcelente recurso para aprender mais sobre as combinações de etiquetas mais populares.\n\nAs alterações feitas no Inspetor são automaticamente aplicadas ao mapa.\nVocê pode desfazê-los a qualquer momento, clicando no botão 'Desfazer'.\n",
-        "buildings": "# Edifícios\n\nO OpenStreetMap é a maior base de dados de edifícios do mundo. Você pode criar\ne melhorar esta base de dados.\n\n### Selecionando\n\nVocê pode selecionar um edifício clicando em sua borda. Isto vai destacar o\nedifício, abrir um pequeno menu de ferramentas e uma barra lateral, mostrando mais informações\nsobre o edifício.\n\n### Modificando\n\nÀs vezes um edifício está no lugar errado ou tem etiquetas erradas.\n\nPara mover um edifício inteiro, selecione-o, e clique na ferramenta 'Mover'. Mova o\nmouse para deslocar o edifício, e clique novamente quando ele estiver no local certo.\n\nPara corrigir o formato de um edifício, clique e arraste os nós que formam as bordas\npara o lugar apropriado.\n\n### Criando\n\nUma das principais questões sobre adicionar edifícios ao mapa é que o\nOpenStreetMap registra-os tanto como formas quanto como pontos. A regra geral é\n_mapeie um edifício como uma forma sempre que possível_, e mapeie empresas, casas,\nserviços, e outros locais que operam fora de um edifício como pontos\ndentro da forma do edifício.\n\nComece desenhando um edifício como forma clicando no botão 'Área' no canto superior\nesquerdo da interface, e finalize pressionando 'Enter' no teclado\nou clicando no primeiro nó que você desenhou para fechar a forma.\n\n### Deletando\n\nSe um edifício estiver totalmente errado - você vê que ele não existe na imagem de satélite\ne também confirmou pessoalmente que ele não está lá - você pode deletá-lo,\nremovendo-o do mapa. Seja cuidadoso ao remover coisas -\nassim como qualquer outra edição, os resultados são vistos por todos, e as imagens de satélite\npodem estar desatualizadas, ou seja, pode ser que o edifício seja bem recente.\n\nVocê pode remover um edifício clicando nele para selecioná-lo, e depois clicando \nna lixeira ou pressionando a tecla 'Delete'.\n",
-        "relations": "# Relações\n\nUma relação é um tipo especial de feição do OpenStreetMap que agrupa outras feições.\nPor exemplo, dois tipos comuns de relações são as *relações de rotas*, que agrupam \ntrecho de vias que pertecem a uma mesma estrada ou rodovia, e as *relações de\n multipolígonos*, que agrupam várias linhas para definir áreas complexas, que podem\nconter áreas não contínuas ou vazios dentro de áreas.\n\nO grupo de feições em uma relação é chamado de *membros*. Na barra lateral, você \npode ver de qual relação uma feição é membro, e clicar em uma destas relações para \nselecioná-la. Quando uma relação é selecionada, você pode ver todos os seus membros \nlistados na barra lateral e selecionados no mapa.\n\nPara a maioria dos casos, o iD vai cuidar automaticamente das relações enquanto você \nedita. O mais importante a se levar em conta é que se você deletar um trecho de via \nque faz parte de uma relação para redesenhá-lo, você terá que adicioná-lo novamente \ncomo membro da relação original.\n\n## Editando Relações\n\nSe você quer editar relações, aqui estão instruções básicas.\n\nPara adicionar uma feição a uma relação, clique no botão \"+\" na seção \"Todas relações\"\nda barra lateral, e selecione ou digite o nome da relação.\n\nPara criar uma nova relação, primeiro selecione a feição que deverá ser um membro,\ndepois clique no botão \"+\" da seção \"Todas relações\" e selecione \"Nova relação...\".\n\nPara remover uma feição de uma relação, selecione ela e clique no botão de lixeira\npróximo à relação da qual você quer fazer a remoção.\n\nVocê pode criar multipolígonos com vazios usando a ferramenta \"Mesclar\". Desenhe \nduas áreas (interior e exterior), segure a tecla Shift, clique em cada uma dessas áreas\npara selecioná-las e clique no botão \"Mesclar\" (+).\n\n"
+        "inspector": "# Usando o Inspetor\n\nO inspetor é a seção no lado direito da página que aparece quando um recurso\né selecionado e permite que você edite seus detalhes.\n\n### Selecionando um tipo de recurso\n\nDepois de adicionar um ponto, linha ou área, você pode escolher que tipo de característica ele\ntem, como por exemplo se é uma autoestrada ou via residencial, supermercado ou cafeteria.\nO inspetor vai exibir botões para os tipos de recursos mais comuns, e você pode\nencontrar outros, digitando o que você está procurando na caixa de pesquisa.\n\nClique no botão \"i\" no canto inferior direito de um botão de recurso para\naprender mais sobre ele. Clique em um botão para escolher o tipo.\n\n### Usando formas e editando etiquetas\n\nDepois de escolher um tipo de recurso, ou quando você seleciona um recurso que já \ntem um tipo atribuído, o inspetor vai exibir campos com detalhes sobre \no recurso como seu nome e endereço. \n\nAbaixo dos campos que você vê, você pode clicar nos ícones para adicionar outros detalhes, \ncomo informações da [Wikipedia] (http://www.wikipedia.org/), acesso para cadeirantes, \nentre outros. \n\nNa parte inferior do inspetor, clique em 'Etiquetas adicionais' para adicionar \noutras etiquetas ao objeto. O [Taginfo] (http://taginfo.openstreetmap.org/) é um \nexcelente recurso para aprender mais sobre as combinações de etiquetas mais populares.\n\nAs alterações feitas no Inspetor são automaticamente aplicadas ao mapa.\nVocê pode desfazê-los a qualquer momento, clicando no botão 'Desfazer'.\n",
+        "buildings": "# Edifícios\n\nO OpenStreetMap é a maior base de dados de edifícios do mundo. Você pode criar\ne melhorar esta base de dados.\n\n### Selecionando\n\nVocê pode selecionar um edifício clicando em sua borda. Isto vai destacar o\nedifício, abrir um pequeno menu de ferramentas e uma barra lateral, mostrando mais informações\nsobre o edifício.\n\n### Modificando\n\nÀs vezes um edifício está no lugar errado ou tem etiquetas erradas.\n\nPara mover um edifício inteiro, selecione-o, e clique na ferramenta 'Mover'. Mova o\nmouse para deslocar o edifício, e clique novamente quando ele estiver no local certo.\n\nPara corrigir o formato de um edifício, clique e arraste os pontos que formam as bordas\npara o lugar apropriado.\n\n### Criando\n\nUma das principais questões sobre adicionar edifícios ao mapa é que o\nOpenStreetMap registra-os tanto como formas quanto como pontos. A regra geral é\n_mapeie um edifício como uma forma sempre que possível_, e mapeie empresas, casas,\nserviços, e outros locais que operam fora de um edifício como pontos\ndentro da forma do edifício.\n\nComece desenhando um edifício como forma clicando no botão 'Área' no canto superior\nesquerdo da interface, e finalize pressionando 'Enter' no teclado\nou clicando no primeiro ponto que você desenhou para fechar a forma.\n\n### Excluindo\n\nSe um edifício estiver totalmente errado - você vê que ele não existe na imagem de satélite\ne também confirmou pessoalmente que ele não está lá - você pode excluí-lo,\nremovendo-o do mapa. Seja cuidadoso ao remover coisas -\nassim como qualquer outra edição, os resultados são vistos por todos, e as imagens de satélite\npodem estar desatualizadas, ou seja, pode ser que o edifício seja bem recente.\n\nVocê pode remover um edifício clicando nele para selecioná-lo, e depois clicando \nna lixeira ou pressionando a tecla 'Delete'.\n",
+        "relations": "# Relações\n\nUma relação é um tipo especial de objeto do OpenStreetMap que agrupa outros objetos.\nPor exemplo, dois tipos comuns de relações são as *relações de rotas*, que agrupam \ntrecho de vias que pertecem a uma mesma estrada ou rodovia, e as *relações de\n multipolígonos*, que agrupam várias linhas para definir áreas complexas, que podem\nconter áreas não contínuas ou vazios dentro de áreas.\n\nOs objetos agrupados numa relação são chamados de *membros*. Na barra lateral, você \npode ver de qual relação um objeto é membro, e clicar em uma destas relações para \nselecioná-la. Quando uma relação é selecionada, você pode ver todos os seus membros \nlistados na barra lateral e selecionados no mapa.\n\nPara a maioria dos casos, o iD vai cuidar automaticamente das relações enquanto você \nedita. O mais importante a se levar em conta é que se você deletar um trecho de via \nque faz parte de uma relação para redesenhá-lo, você terá que adicioná-lo novamente \ncomo membro da relação original.\n\n## Editando Relações\n\nSe você quer editar relações, aqui estão instruções básicas.\n\nPara adicionar um objeto a uma relação, clique no botão \"+\" na seção \"Todas relações\"\nda barra lateral, e selecione ou digite o nome da relação.\n\nPara criar uma nova relação, primeiro selecione o objeto que deverá ser um membro,\ndepois clique no botão \"+\" da seção \"Todas relações\" e selecione \"Nova relação...\".\n\nPara remover um objeto de uma relação, selecione ela e clique no botão de lixeira\npróximo à relação da qual você quer fazer a remoção.\n\nVocê pode criar multipolígonos com vazios usando a ferramenta \"Mesclar\". Desenhe \nduas áreas (interior e exterior), segure a tecla Shift, clique em cada uma dessas áreas\npara selecioná-las e clique no botão \"Mesclar\" (+).\n\n"
     },
     "intro": {
         "navigation": {
             "title": "Navegação",
             "drag": "A área principal do mapa mostra os dados do OpenStreetMap sobre um fundo (uma imagem aérea, normalmente). Você pode navegar arrastando ou usando a roda do mouse, do mesmo jeito que em qualquer mapa online. **Arraste o mapa!**",
-            "select": "Os elementos do mapa são representados de três formas: pontos, linhas ou áreas. Todos os elementos podem ser selecionados clicando neles. **Clique no ponto e selecione-o.**",
-            "header": "O cabeçalho nos mostra qual é o tipo do elemento.",
-            "pane": "Quando um elemento é selecionado, o editor de elemento é mostrado. O cabeçalho nos mostra o tipo do elemento e o painel principal mostra os atributos do elemento, tais como seu nome e endereço. **Feche o editor de elemento com o botão de fechar no canto superior direito.**"
+            "select": "Os objetos do mapa são representados de três formas: pontos, linhas ou áreas. Todos os objetos podem ser selecionados clicando neles. **Clique no ponto e selecione-o.**",
+            "header": "O cabeçalho nos mostra qual é o tipo do objeto.",
+            "pane": "Quando um objeto é selecionado, o editor de objeto é mostrado. O cabeçalho nos mostra o tipo do objeto e o painel principal mostra os atributos do objeto, tais como seu nome e endereço. **Feche o editor de objeto com o botão de fechar no canto superior direito.**"
         },
         "points": {
             "title": "Pontos",
-            "add": "Pontos podem ser usados para representar elementos como lojas, restaurantes e monumentos. Eles marcam uma posição específica e descrevem o que há nela. **Clique no botão Ponto para adicionar um novo ponto.**",
-            "place": "Clicando no mapa nós criamos um ponto nele. **Coloque o ponto no topo do prédio.**",
-            "search": "Existem muitos elementos diferentes que podem ser representados por pontos. O ponto que você acabou de adicionar é uma Cafeteria. **Procure por '{name}'**",
+            "add": "Pontos podem ser usados para representar coisas como lojas, restaurantes e monumentos. Eles marcam uma posição específica e descrevem o que há nela. **Clique no botão Ponto para adicionar um novo ponto.**",
+            "place": "Clicando no mapa criamos um ponto nele. **Coloque o ponto no topo do prédio.**",
+            "search": "Existem muitos objetos diferentes que podem ser representados por pontos. O ponto que você acabou de adicionar é uma Cafeteria. **Procure por '{name}'**",
             "choose": "**Escolha \"Cafeteria\" na lista.**",
-            "describe": "O ponto agora está marcado como uma cafeteria. Usando o editor de elemento, podemos adicionar mais informações sobre ele. **Adicione um nome**",
-            "close": "O editor de elementos pode ser fechado clicando no botão de fechar. **Feche o editor de elementos.**",
-            "reselect": "Frequentemente um dado ponto pode já existir, mas ter erros ou estar incompleto. Nós podemos editar pontos já existentes. **Selecione o ponto que você acabou de criar.**",
-            "fixname": "**Altere o nome da cafeteria e feche o editor de elementos.**",
-            "reselect_delete": "Todos os elementos do mapa podem ser removidos. **Clique no ponto que você criou.**",
-            "delete": "O menu em volta do ponto contém operações que podem ser realizadas sobre ele, incluindo removê-lo. **Remova o ponto.**"
+            "describe": "O ponto agora está marcado como uma cafeteria. Usando o editor de objeto, podemos adicionar mais informações sobre ele. **Adicione um nome**",
+            "close": "O editor de objetos pode ser fechado clicando no botão de fechar. **Feche o editor de objetos.**",
+            "reselect": "Frequentemente um dado ponto pode já existir, mas ter erros ou estar incompleto. Podemos editar pontos já existentes. **Selecione o ponto que você acabou de criar.**",
+            "fixname": "**Altere o nome da cafeteria e feche o editor de objetos.**",
+            "reselect_delete": "Todos os objetos do mapa podem ser excluídos. **Clique no ponto que você criou.**",
+            "delete": "O menu em volta do ponto contém operações que podem ser realizadas sobre ele, incluindo removê-lo. **Exclua o ponto.**"
         },
         "areas": {
             "title": "Áreas",
-            "add": "Áreas são uma forma mais detalhada de representar os elementos do mapa. Elas informam quais são as bordas do elemento. As áreas podem ser usadas para a maioria dos tipos de elementos que os pontos são usados. Na verdade, é frequentemente preferível utilizá-las no lugar de pontos. **Clique no botão Área pra adicionar uma nova área.**",
-            "corner": "Para desenhar as áreas, colocamos os nós que formam a sua borda. **Coloque o primeiro nó num dos cantos do parquinho.**",
-            "place": "Coloque mais nós para desenhar o resto da área. Para terminar, complete a área clicando de novo no primeiro nó. **Desenhar a área do parquinho.**",
+            "add": "Áreas são uma forma mais detalhada de representar os objetos do mapa. Elas informam quais são as bordas do objeto. As áreas podem ser usadas para a maioria dos tipos de objetos que os pontos são usados. Na verdade, é frequentemente preferível utilizá-las no lugar de pontos. **Clique no botão Área pra adicionar uma nova área.**",
+            "corner": "Para desenhar as áreas, colocamos os pontos que formam a sua borda. **Coloque o primeiro ponto num dos cantos do parquinho.**",
+            "place": "Coloque mais pontos para desenhar o resto da área. Para terminar, complete a área clicando de novo no primeiro ponto. **Desenhar a área do parquinho.**",
             "search": "**Procurar por '{name}'.**",
             "choose": "**Escolha \"Parquinho\" na lista.**",
-            "describe": "**Adicione um nome e feche o editor de elementos.**"
+            "describe": "**Adicione um nome e feche o editor de objetos.**"
         },
         "lines": {
             "title": "Linhas",
-            "add": "As linhas são usadas para representar elementos como estradas, ferrovias e rios. **Clique no botão Linha para adicionar uma nova linha.**",
+            "add": "As linhas são usadas para representar coisas como estradas, ferrovias e rios. **Clique no botão Linha para adicionar uma nova linha.**",
             "start": "**Comece a desenhar a linha clicando no final da estrada.**",
-            "intersect": "Clique para adicionar mais nós à linha. Você pode arrastar o mapa enquanto desenha, se for necessário. Estradas, e muitos outros tipos de linhas, são partes de uma rede maior. É importante que essas linhas estejam conectadas corretamente para que as aplicações de roteamento funcionem bem. **Clique na Flower Street para criar uma interseção que conecta as duas linhas.**",
-            "finish": "Para indicar o final da criação de uma linha, clique novamente no seu último nó. **Termine de criar a rua.**",
+            "intersect": "Clique para adicionar mais pontos à linha. Você pode arrastar o mapa enquanto desenha, se for necessário. Estradas, e muitos outros tipos de linhas, são partes de uma rede maior. É importante que essas linhas estejam conectadas corretamente para que as aplicações de roteamento funcionem bem. **Clique na Flower Street para criar uma interseção que conecta as duas linhas.**",
+            "finish": "Para indicar o final da criação de uma linha, clique novamente no seu último ponto. **Termine de criar a rua.**",
             "road": "**Selecione \"Estrada\" na lista**",
             "residential": "Há vários tipos diferentes de estrada, o mais comum entre elas é a via residencial. **Escolha o tipo Via Residencial.**",
-            "describe": "**Coloque o nome da rua e feche o editor de elementos.**",
+            "describe": "**Coloque o nome da rua e feche o editor de objetos.**",
             "restart": "A rua precisa ter um ponto de interseção com a Flower Street.",
             "wrong_preset": "Você não selecionou o tipo de via Residencial. **Clique aqui para escolher novamente**"
         },
@@ -395,7 +398,7 @@
     "presets": {
         "categories": {
             "category-building": {
-                "name": "Prédio"
+                "name": "Edifício"
             },
             "category-golf": {
                 "name": "Golfe"
@@ -435,28 +438,28 @@
                 },
                 "options": {
                     "yes": {
-                        "title": "Permitido",
-                        "description": "Acesso permitido por lei; direito de passagem"
+                        "title": "Público",
+                        "description": "Acesso permitido por lei; via pública com direito de passagem"
                     },
                     "no": {
                         "title": "Proibido",
                         "description": "Acesso não permitido ao público em geral"
                     },
                     "permissive": {
-                        "title": "Concedido",
-                        "description": "Acesso permitido até que o dono cancele a permissão"
+                        "title": "Autorizado",
+                        "description": "Acesso livre e autorizado (mas cancelável) pelo dono"
                     },
                     "private": {
                         "title": "Privado",
-                        "description": "Acesso permitido apenas com a permissão do dono, dada individualmente"
+                        "description": "Acesso requer permissão prévia do dono, dada individualmente"
                     },
                     "designated": {
                         "title": "Designado",
-                        "description": "Acesso permitido de acordo com placas ou leis locais"
+                        "description": "Acesso designado por placas (ou leis locais) para uso preferencial por veículos específicos"
                     },
                     "destination": {
                         "title": "Destino",
-                        "description": "Acesso permitido apenas para aproximar-se do destino"
+                        "description": "Acesso permitido apenas na saída ou na chegada a um destino"
                     }
                 }
             },
@@ -561,6 +564,9 @@
             "covered": {
                 "label": "Coberto"
             },
+            "crop": {
+                "label": "Cultivo"
+            },
             "crossing": {
                 "label": "Tipo"
             },
@@ -576,6 +582,9 @@
             "description": {
                 "label": "Descrição"
             },
+            "electrified": {
+                "label": "Eletrificação"
+            },
             "elevation": {
                 "label": "Altitude"
             },
@@ -598,6 +607,39 @@
             "fixme": {
                 "label": "Corrija-me"
             },
+            "fuel": {
+                "label": "Combustível"
+            },
+            "fuel/biodiesel": {
+                "label": "Vende Biodiesel"
+            },
+            "fuel/diesel": {
+                "label": "Vende Diesel"
+            },
+            "fuel/e10": {
+                "label": "Vende Gasolina E10 10% Álcool"
+            },
+            "fuel/e85": {
+                "label": "Vende Combustível E85 85 Álcool/15 Gasolina"
+            },
+            "fuel/lpg": {
+                "label": "Vende Propano"
+            },
+            "fuel/octane_100": {
+                "label": "Vende Gasolina de Competição"
+            },
+            "fuel/octane_91": {
+                "label": "Vende Gasolina Comum"
+            },
+            "fuel/octane_95": {
+                "label": "Vende Gasolina Aditivada"
+            },
+            "fuel/octane_98": {
+                "label": "Vende Gasolina Premium"
+            },
+            "gauge": {
+                "label": "Bitola"
+            },
             "generator/method": {
                 "label": "Método"
             },
@@ -608,11 +650,11 @@
                 "label": "Tipo"
             },
             "golf_hole": {
-                "label": "Código de referência",
-                "placeholder": "Buraco numero (1-18)"
+                "label": "Nº do buraco",
+                "placeholder": "Número do buraco (1-18)"
             },
             "handicap": {
-                "label": "Desvantagem",
+                "label": "Acessível a deficientes",
                 "placeholder": "1-18"
             },
             "highway": {
@@ -621,6 +663,10 @@
             "historic": {
                 "label": "Tipo"
             },
+            "hoops": {
+                "label": "Aros de Tabela",
+                "placeholder": "1, 2, 4..."
+            },
             "iata": {
                 "label": "Código IATA"
             },
@@ -634,7 +680,7 @@
                 "label": "Tipo"
             },
             "internet_access": {
-                "label": "Acesso a Internet",
+                "label": "Acesso à Internet",
                 "options": {
                     "wlan": "Sem Fio",
                     "wired": "Cabeada",
@@ -654,6 +700,9 @@
             "leisure": {
                 "label": "Tipo"
             },
+            "length": {
+                "label": "Comprimento (Metros)"
+            },
             "levels": {
                 "label": "Número de andares",
                 "placeholder": "2, 4, 6..."
@@ -700,7 +749,7 @@
                 "label": "Operador"
             },
             "par": {
-                "label": "par",
+                "label": "Par",
                 "placeholder": "3, 4, 5..."
             },
             "park_ride": {
@@ -716,18 +765,36 @@
             "piste/difficulty": {
                 "label": "Dificuldade"
             },
+            "piste/grooming": {
+                "label": "Tosa de Animais"
+            },
             "piste/type": {
                 "label": "Modelo"
             },
             "place": {
                 "label": "Tipo"
             },
+            "population": {
+                "label": "População"
+            },
             "power": {
                 "label": "Tipo"
             },
             "railway": {
                 "label": "Tipo"
             },
+            "recycling/cans": {
+                "label": "Aceita Latinhas"
+            },
+            "recycling/clothes": {
+                "label": "Aceita Roupas"
+            },
+            "recycling/glass": {
+                "label": "Aceita Vidro"
+            },
+            "recycling/paper": {
+                "label": "Aceita Papel"
+            },
             "ref": {
                 "label": "Código de referência"
             },
@@ -758,6 +825,9 @@
             "sac_scale": {
                 "label": "Dificuldade do Caminho"
             },
+            "seasonal": {
+                "label": "Sazonal"
+            },
             "service": {
                 "label": "Tipo"
             },
@@ -770,12 +840,25 @@
             "shop": {
                 "label": "Tipo"
             },
+            "sloped_curb": {
+                "label": "Rampa no Meio-fio"
+            },
+            "smoking": {
+                "label": "Fumantes"
+            },
+            "social_facility_for": {
+                "label": "Pessoas atendidas",
+                "placeholder": "Moradores de rua, deficientes, crianças, etc"
+            },
             "source": {
                 "label": "Fonte"
             },
             "sport": {
                 "label": "Esporte"
             },
+            "sport_ice": {
+                "label": "Esporte"
+            },
             "structure": {
                 "label": "Estrutura",
                 "placeholder": "Desconhecido",
@@ -786,12 +869,18 @@
                     "cutting": "Escavação"
                 }
             },
+            "studio_type": {
+                "label": "Tipo"
+            },
             "supervised": {
                 "label": "Supervisionado"
             },
             "surface": {
                 "label": "Superfície"
             },
+            "tactile_paving": {
+                "label": "Piso Tátil"
+            },
             "toilets/disposal": {
                 "label": "Descarte"
             },
@@ -810,6 +899,12 @@
             "tree_type": {
                 "label": "Tipo"
             },
+            "trees": {
+                "label": "Árvores"
+            },
+            "tunnel": {
+                "label": "Túnel"
+            },
             "vending": {
                 "label": "Tipo de Produtos"
             },
@@ -829,6 +924,9 @@
             "wheelchair": {
                 "label": "Acesso a Cadeirantes"
             },
+            "width": {
+                "label": "Largura (Metros)"
+            },
             "wikipedia": {
                 "label": "Wikipédia"
             },
@@ -841,6 +939,46 @@
                 "name": "Endereço",
                 "terms": "Endereço"
             },
+            "aerialway": {
+                "name": "Teleférico",
+                "terms": "Teleférico, Bondinho, Subida Mecânica"
+            },
+            "aerialway/cable_car": {
+                "name": "Bonde Aéreo",
+                "terms": "Telecabine, Teleférico de cabine"
+            },
+            "aerialway/chair_lift": {
+                "name": "Telecadeira",
+                "terms": "Teleférico de cadeira"
+            },
+            "aerialway/gondola": {
+                "name": "Gôndola",
+                "terms": "Gôndola, Bondinho"
+            },
+            "aerialway/magic_carpet": {
+                "name": "Esteira de Ski",
+                "terms": "Esteira, Esteira de Ski"
+            },
+            "aerialway/platter": {
+                "name": "Telesqui de prato",
+                "terms": "Telesqui de prato"
+            },
+            "aerialway/pylon": {
+                "name": "Torre de Suporte de Teleférico",
+                "terms": "Torre de Suporte de Teleférico"
+            },
+            "aerialway/rope_tow": {
+                "name": "Telecorda",
+                "terms": "Telecorda"
+            },
+            "aerialway/station": {
+                "name": "Estação de Teleférico",
+                "terms": "Estação de Teleférico, Estação de Bondinho"
+            },
+            "aerialway/t-bar": {
+                "name": "Telesquis T-bar",
+                "terms": "Telesquis T-bar"
+            },
             "aeroway": {
                 "name": "Aerovia",
                 "terms": "Aerovia"
@@ -897,17 +1035,21 @@
                 "name": "Bar",
                 "terms": "Bar, Boteco"
             },
+            "amenity/bbq": {
+                "name": "Churrasqueira",
+                "terms": "Forno, Churrasco, Grill, Barbecue"
+            },
             "amenity/bench": {
                 "name": "Assento",
                 "terms": "Assento, Banco de praça"
             },
             "amenity/bicycle_parking": {
                 "name": "Bicicletário",
-                "terms": "Estacionamento de Bicicletas, Bicicletário,"
+                "terms": "Estacionamento de Bicicletas, Bicicletário, Paraciclo"
             },
             "amenity/bicycle_rental": {
                 "name": "Aluguel de Bicicletas",
-                "terms": "Aluguel de Bicicletas"
+                "terms": "Aluguel de Bicicletas, Compartilhamento de Bicicletas"
             },
             "amenity/boat_rental": {
                 "name": "Aluguel de Barcos",
@@ -929,6 +1071,10 @@
                 "name": "Lavagem de Veículos",
                 "terms": "Lavagem de Veículos, Lava jato"
             },
+            "amenity/charging_station": {
+                "name": "Estação de Carregamento",
+                "terms": "Estação de Recarga, Estação de Carga Elétrica, Tomada de Cargamento, Tomada de Recarga"
+            },
             "amenity/childcare": {
                 "name": "Creche",
                 "terms": "Creche"
@@ -937,16 +1083,33 @@
                 "name": "Cinema",
                 "terms": "Cinema, Sala de Cinema"
             },
+            "amenity/clinic": {
+                "name": "Clínica",
+                "terms": "Clínica, Consultório"
+            },
+            "amenity/clock": {
+                "name": "Relógio",
+                "terms": "Relógio"
+            },
             "amenity/college": {
                 "name": "Faculdade",
                 "terms": "faculdade, educação superior, curso superior"
             },
+            "amenity/compressed_air": {
+                "name": "Ar Comprimido",
+                "terms": "Ar Comprimido"
+            },
             "amenity/courthouse": {
                 "name": "Tribunal",
                 "terms": "Tribunal, Fórum"
             },
             "amenity/dentist": {
-                "name": "Dentista"
+                "name": "Dentista",
+                "terms": "Dentista, Odontologista"
+            },
+            "amenity/doctor": {
+                "name": "Médico",
+                "terms": "Doutor, Médico"
             },
             "amenity/drinking_water": {
                 "name": "Água Potável",
@@ -976,13 +1139,25 @@
                 "name": "Cemitério Paroquial",
                 "terms": "Cemitério"
             },
+            "amenity/hospital": {
+                "name": "Hospital",
+                "terms": "clínica,sala de emergência,serviço de saúde,hospício,enfermaria,instituição,asilo,sanatório,cirurgia"
+            },
+            "amenity/kindergarten": {
+                "name": "Escola Infantil",
+                "terms": "Creche, Pré-escola, Cuidados infantis, Bebês, Centro de Educação Infantil, CEI"
+            },
             "amenity/library": {
                 "name": "Biblioteca",
                 "terms": "Biblioteca"
             },
             "amenity/marketplace": {
-                "name": "Mercado",
-                "terms": "Mercado"
+                "name": "Mercado municipal",
+                "terms": "Feira"
+            },
+            "amenity/nightclub": {
+                "name": "Danceteria",
+                "terms": "Discoteca, Boate, Casa Noturna"
             },
             "amenity/parking": {
                 "name": "Estacionamento",
@@ -1033,16 +1208,41 @@
                 "terms": "Patrulha, Ranger"
             },
             "amenity/recycling": {
-                "name": "Reciclagem"
+                "name": "Reciclagem",
+                "terms": "Reciclagem, Reaproveitamento, Recuperação, Reutilização"
             },
             "amenity/restaurant": {
                 "name": "Restaurante",
                 "terms": "Restaurante"
             },
+            "amenity/school": {
+                "name": "Escola",
+                "terms": "Área Escolar, Terreno Escolar, Pátio Escolar"
+            },
             "amenity/shelter": {
                 "name": "Abrigo",
                 "terms": "Abrigo"
             },
+            "amenity/social_facility": {
+                "name": "Unidade de Assistência Social",
+                "terms": "Unidade de Assistência Social"
+            },
+            "amenity/social_facility/food_bank": {
+                "name": "Banco de Alimentos",
+                "terms": "Banco de Alimentos"
+            },
+            "amenity/social_facility/group_home": {
+                "name": "Lar Compartilhado",
+                "terms": "Lar Compartilhado"
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Abrigo para moradores de rua",
+                "terms": "Refúgio para Desabrigados"
+            },
+            "amenity/studio": {
+                "name": "Estúdio",
+                "terms": "Estúdio"
+            },
             "amenity/swimming_pool": {
                 "name": "Piscina",
                 "terms": "Piscina"
@@ -1061,7 +1261,7 @@
             },
             "amenity/toilets": {
                 "name": "Banheiros Públicos",
-                "terms": "Banheiros, Sanitário, WC, Toiletes, Toilettes, Lavabo, Toalete"
+                "terms": "Banheiros, Sanitário, WC, Lavabo, Toalete"
             },
             "amenity/townhall": {
                 "name": "Paço Municipal",
@@ -1075,6 +1275,10 @@
                 "name": "Máquina de Venda",
                 "terms": "Totem de vendas, Máquina de Venda Automática"
             },
+            "amenity/veterinary": {
+                "name": "Veterinário",
+                "terms": "Veterinário"
+            },
             "amenity/waste_basket": {
                 "name": "Lixeira",
                 "terms": "Cesto de Lixo, Lixeira, Balde de Lixo"
@@ -1161,33 +1365,71 @@
             },
             "building/apartments": {
                 "name": "Apartamentos",
-                "terms": "Apartamentos, Kit net"
+                "terms": "Apartamentos"
+            },
+            "building/barn": {
+                "name": "Celeiro",
+                "terms": "Celeiro"
+            },
+            "building/bunker": {
+                "name": "Casamata",
+                "terms": "Trincheira, Barreira, Obstáculo, Paiol, Abrigo"
+            },
+            "building/cabin": {
+                "name": "Cabine",
+                "terms": "Cabine"
+            },
+            "building/cathedral": {
+                "name": "Catedral",
+                "terms": "Catedral"
             },
             "building/chapel": {
-                "name": "Capela"
+                "name": "Capela",
+                "terms": "Capela, Igreja"
             },
             "building/church": {
-                "name": "Igreja"
+                "name": "Igreja",
+                "terms": "Igreja"
             },
             "building/commercial": {
                 "name": "Edifício Comercial",
                 "terms": "Edifício Comercial, Prédio Comercial"
             },
-            "building/entrance": {
-                "name": "Entrada",
-                "terms": "Entrada"
+            "building/construction": {
+                "name": "Edifício em construção",
+                "terms": "Edificação em Construção"
+            },
+            "building/detached": {
+                "name": "Casa Separada",
+                "terms": "Casa Separada"
+            },
+            "building/dormitory": {
+                "name": "Dormitório",
+                "terms": "Alojamento Estudantil, República Estudantil, Dormitório"
             },
             "building/garage": {
-                "name": "Garagem Individual",
+                "name": "Garagem",
                 "terms": "Garagem"
             },
             "building/garages": {
                 "name": "Garagens",
                 "terms": "Garagens"
             },
+            "building/greenhouse": {
+                "name": "Estufa",
+                "terms": "Estufa"
+            },
+            "building/hospital": {
+                "name": "Edifício do Hospital",
+                "terms": "Edifício hospitalar"
+            },
+            "building/hotel": {
+                "name": "Hotel",
+                "terms": "Hotel"
+            },
             "building/house": {
                 "name": "Casa",
-                "terms": "Casa"
+                "terms": "Casa, Residência"
             },
             "building/hut": {
                 "name": "Cabana",
@@ -1197,30 +1439,233 @@
                 "name": "Edifício Industrial",
                 "terms": "Edifício Industrial"
             },
+            "building/public": {
+                "name": "Edifício Público",
+                "terms": "Edifício Público"
+            },
             "building/residential": {
                 "name": "Edifício Residencial",
                 "terms": "Edifício Residencial"
             },
+            "building/retail": {
+                "name": "Edifício Comercial",
+                "terms": "Edifício Comercial, Loja, Mercado, Shopping"
+            },
             "building/roof": {
-                "name": "Teto"
+                "name": "Teto",
+                "terms": "Telhado, Cobertura"
+            },
+            "building/school": {
+                "name": "Edifício da Escola",
+                "terms": "Edifício Escolar"
+            },
+            "building/shed": {
+                "name": "Cabana",
+                "terms": "Cabana, Barraco, Galpão, Choupana"
+            },
+            "building/stable": {
+                "name": "Estábulo",
+                "terms": "Estábulo"
+            },
+            "building/static_caravan": {
+                "name": "Casa Transportável",
+                "terms": "Casa Transportável"
+            },
+            "building/terrace": {
+                "name": "Fileira de Casas",
+                "terms": "Fileira de Casas"
+            },
+            "building/train_station": {
+                "name": "Estação Ferroviária",
+                "terms": "Estação Ferroviária, Estação de Trem"
+            },
+            "building/university": {
+                "name": "Edifício Universitário",
+                "terms": "Edifício Universitário"
+            },
+            "building/warehouse": {
+                "name": "Armazém",
+                "terms": "Armazém, Depósito, Almoxarifado"
+            },
+            "craft/basket_maker": {
+                "name": "Cesteiro",
+                "terms": "Cesteiro"
             },
             "craft/beekeeper": {
-                "name": "Apicultor"
+                "name": "Apicultor",
+                "terms": "Apicultor"
             },
             "craft/blacksmith": {
-                "name": "Ferreiro"
+                "name": "Ferreiro",
+                "terms": "Serralheiro, Ferreiro"
+            },
+            "craft/boatbuilder": {
+                "name": "Fabricante de Barcos",
+                "terms": "Fabricante de Barcos, Estaleiro"
+            },
+            "craft/bookbinder": {
+                "name": "Encadernador",
+                "terms": "Encadernador"
             },
             "craft/brewery": {
-                "name": "Cervejaria"
+                "name": "Cervejaria",
+                "terms": "Cervejaria"
             },
             "craft/carpenter": {
-                "name": "Carpinteiro"
+                "name": "Carpinteiro",
+                "terms": "Carpinteiro"
+            },
+            "craft/carpet_layer": {
+                "name": "Colocador de Carpete",
+                "terms": "Colocador de Carpete"
+            },
+            "craft/caterer": {
+                "name": "Fornecedor de Mantimentos",
+                "terms": "Fornecedor de Mantimentos, Aprovisionador"
+            },
+            "craft/clockmaker": {
+                "name": "Relojoeiro",
+                "terms": "Relojoeiro"
+            },
+            "craft/confectionary": {
+                "name": "Doçaria",
+                "terms": "Confeitaria, Doceria"
+            },
+            "craft/dressmaker": {
+                "name": "Costureira",
+                "terms": "Costureira"
+            },
+            "craft/electrician": {
+                "name": "Eletricista",
+                "terms": "Eletricista"
+            },
+            "craft/gardener": {
+                "name": "Jardineiro",
+                "terms": "Jardineiro"
+            },
+            "craft/glaziery": {
+                "name": "Vidraceiro",
+                "terms": "Vidraceiro"
+            },
+            "craft/handicraft": {
+                "name": "Artesanato",
+                "terms": "Artesanato"
+            },
+            "craft/hvac": {
+                "name": "HVAC",
+                "terms": "HVAC, Refrigeração, Aquecimento, Ventilação"
+            },
+            "craft/insulator": {
+                "name": "Isolador",
+                "terms": "Isolador"
+            },
+            "craft/jeweler": {
+                "name": "Joalheiro",
+                "terms": "Ourives"
+            },
+            "craft/key_cutter": {
+                "name": "Chaveiro",
+                "terms": "Chaveiro"
             },
             "craft/locksmith": {
-                "name": "Chaveiro"
+                "name": "Chaveiro",
+                "terms": "Chaveiro"
+            },
+            "craft/metal_construction": {
+                "name": "Construção Metálica",
+                "terms": "Construção Metálica"
+            },
+            "craft/optician": {
+                "name": "Ótica",
+                "terms": "Oculista"
+            },
+            "craft/painter": {
+                "name": "Pintor",
+                "terms": "Pintor"
             },
             "craft/photographer": {
-                "name": "Fotógrafo"
+                "name": "Fotógrafo",
+                "terms": "Fotógrafo"
+            },
+            "craft/photographic_laboratory": {
+                "name": "Laboratório Fotográfico",
+                "terms": "Laboratório Fotográfico"
+            },
+            "craft/plasterer": {
+                "name": "Gesseiro",
+                "terms": "Gesseiro"
+            },
+            "craft/plumber": {
+                "name": "Encanador",
+                "terms": "Encanador, Bombeiro Hidráulico"
+            },
+            "craft/pottery": {
+                "name": "Oleiro",
+                "terms": "Cerâmica"
+            },
+            "craft/rigger": {
+                "name": "Técnico em Movimentação de Cargas",
+                "terms": "Rigger"
+            },
+            "craft/roofer": {
+                "name": "Reparador de Telhados",
+                "terms": "Telheiro"
+            },
+            "craft/saddler": {
+                "name": "Seleiro",
+                "terms": "Seleiro"
+            },
+            "craft/sailmaker": {
+                "name": "Fabricante de Velas Náuticas",
+                "terms": "Veleiro"
+            },
+            "craft/sawmill": {
+                "name": "Serraria",
+                "terms": "Serraria"
+            },
+            "craft/scaffolder": {
+                "name": "Montador de Andaimes",
+                "terms": "Montador de Andaimes"
+            },
+            "craft/sculpter": {
+                "name": "Escultor",
+                "terms": "Escultor"
+            },
+            "craft/shoemaker": {
+                "name": "Sapateiro",
+                "terms": "Sapateiro"
+            },
+            "craft/stonemason": {
+                "name": "Pedreiro",
+                "terms": "Pedreiro"
+            },
+            "craft/sweep": {
+                "name": "Limpador de Chaminé",
+                "terms": "Limpador de Chaminé"
+            },
+            "craft/tailor": {
+                "name": "Alfaiate",
+                "terms": "Alfaiate"
+            },
+            "craft/tiler": {
+                "name": "Ladrilheiro",
+                "terms": "Ladrilheiro"
+            },
+            "craft/tinsmith": {
+                "name": "Funileiro",
+                "terms": "Funileiro"
+            },
+            "craft/upholsterer": {
+                "name": "Estofador",
+                "terms": "Estofador"
+            },
+            "craft/watchmaker": {
+                "name": "Relojoeiro",
+                "terms": "Relojoeiro"
+            },
+            "craft/window_construction": {
+                "name": "Fabricante de Janelas",
+                "terms": "Janeleiro"
             },
             "embankment": {
                 "name": "Aterro Elevado",
@@ -1238,21 +1683,49 @@
                 "name": "Telefone de Emergência",
                 "terms": "Telefone de Emergência"
             },
-            "entrance": {
-                "name": "Entrada",
-                "terms": "Entrada"
-            },
             "footway/crossing": {
-                "name": "Travessia",
+                "name": "Travessia de Pedestres",
                 "terms": "faixa de segurança,cruzamento,passagem"
             },
             "footway/sidewalk": {
                 "name": "Calçada",
                 "terms": "calçada,passeio"
             },
+            "golf/bunker": {
+                "name": "Banco de Areia",
+                "terms": "Bunker, Banco de Areia, Banca de Areia, Poça de Areia, Obstáculo de Areia"
+            },
+            "golf/fairway": {
+                "name": "Fairway",
+                "terms": "Fairway, Percurso Intermediário"
+            },
+            "golf/green": {
+                "name": "Green",
+                "terms": "Green, Putting Green"
+            },
+            "golf/hole": {
+                "name": "Buraco",
+                "terms": "Buraco"
+            },
+            "golf/lateral_water_hazard": {
+                "name": "Obstáculo Lateral de Água",
+                "terms": "Obstáculo Lateral de Água"
+            },
+            "golf/rough": {
+                "name": "Rough",
+                "terms": "Rough, Mato"
+            },
+            "golf/tee": {
+                "name": "Tee Box",
+                "terms": "Tee Box"
+            },
+            "golf/water_hazard": {
+                "name": "Obstáculo de Água",
+                "terms": "Obstáculo de Água, Lago"
+            },
             "highway": {
-                "name": "Rodovia",
-                "terms": "Rodovia"
+                "name": "Via Terrestre",
+                "terms": "Rodovia, Estrada, Rua, Caminho"
             },
             "highway/bridleway": {
                 "name": "Hipovia",
@@ -1263,7 +1736,7 @@
                 "terms": "Ponto de Ônibus, Parada de Ônibus"
             },
             "highway/crossing": {
-                "name": "Faixa de Pedestre",
+                "name": "Travessia de Pedestres",
                 "terms": "Interseção"
             },
             "highway/cycleway": {
@@ -1276,7 +1749,7 @@
             },
             "highway/living_street": {
                 "name": "Via de Espaço Compartilhado",
-                "terms": "Rua Viva, Rua Preferencial a Pedestres"
+                "terms": "Rua Preferencial a Pedestres"
             },
             "highway/mini_roundabout": {
                 "name": "Mini-Rotatória",
@@ -1284,11 +1757,7 @@
             },
             "highway/motorway": {
                 "name": "Autoestrada",
-                "terms": "Auto-estrada, auto estrada"
-            },
-            "highway/motorway_junction": {
-                "name": "Saída de Autoestrada",
-                "terms": "Saída de Autoestrada"
+                "terms": "Autoestrada, Via Expressa"
             },
             "highway/motorway_link": {
                 "name": "Ligação de Autoestrada",
@@ -1314,6 +1783,10 @@
                 "name": "Via Residencial",
                 "terms": "Via Residencial, Rua Residencial"
             },
+            "highway/rest_area": {
+                "name": "Área de Repouso",
+                "terms": "Área de Repouso"
+            },
             "highway/road": {
                 "name": "Via de Tipo Desconhecido",
                 "terms": "Estrada Desconhecida"
@@ -1339,7 +1812,7 @@
                 "terms": "Drive-Thru"
             },
             "highway/service/driveway": {
-                "name": "Via de Garagem",
+                "name": "Acesso de Estacionamento",
                 "terms": "Via de Garagem"
             },
             "highway/service/emergency_access": {
@@ -1350,6 +1823,10 @@
                 "name": "Corredor de Estacionamento",
                 "terms": "Corredor de Estacionamento"
             },
+            "highway/services": {
+                "name": "Área de Serviço",
+                "terms": "Área de Serviço"
+            },
             "highway/steps": {
                 "name": "Via com Degraus",
                 "terms": "Degraus, Escada, Escadaria"
@@ -1424,7 +1901,7 @@
             },
             "historic/wayside_shrine": {
                 "name": "Capelinha de Beira de Estrada",
-                "terms": "Ermida, Alminhas"
+                "terms": "Santuário de Beira de Estrada"
             },
             "landuse": {
                 "name": "Uso da Terra",
@@ -1442,6 +1919,10 @@
                 "name": "Cemitério Secular",
                 "terms": "Sepulcrário, Cemitério"
             },
+            "landuse/churchyard": {
+                "name": "Adro",
+                "terms": "Adro, Entorno da Igreja, Terreno Adjacente à Igreja"
+            },
             "landuse/commercial": {
                 "name": "Comercial",
                 "terms": "Comercial"
@@ -1463,7 +1944,7 @@
                 "terms": "Pátio de Fazenda"
             },
             "landuse/forest": {
-                "name": "Floresta",
+                "name": "Floresta manejada",
                 "terms": "Floresta"
             },
             "landuse/grass": {
@@ -1474,10 +1955,18 @@
                 "name": "Industrial",
                 "terms": "Industrial"
             },
+            "landuse/landfill": {
+                "name": "Aterro Sanitário",
+                "terms": "Aterro Sanitário, Depósito de Lixo"
+            },
             "landuse/meadow": {
                 "name": "Prado",
                 "terms": "Prado, Pasto, Pradaria"
             },
+            "landuse/military": {
+                "name": "Militar",
+                "terms": "Militar"
+            },
             "landuse/orchard": {
                 "name": "Pomar",
                 "terms": "Pomar"
@@ -1508,7 +1997,11 @@
             },
             "leisure/dog_park": {
                 "name": "Cachorródromo",
-                "terms": "Canódromo, Parque de Cães, Parque Canino"
+                "terms": "Canódromo, Parque de Cães, Parque Canino, Parque de Cachorros"
+            },
+            "leisure/firepit": {
+                "name": "Fogueira",
+                "terms": "Fogueira"
             },
             "leisure/garden": {
                 "name": "Jardim",
@@ -1518,6 +2011,10 @@
                 "name": "Campo de Golfe",
                 "terms": "Campo de Golfe"
             },
+            "leisure/ice_rink": {
+                "name": "Pista de Gelo",
+                "terms": "Rinque de Patinação no Gelo"
+            },
             "leisure/marina": {
                 "name": "Marina",
                 "terms": "Marina"
@@ -1526,6 +2023,10 @@
                 "name": "Parque/Praça",
                 "terms": "Parque, praça"
             },
+            "leisure/picnic_table": {
+                "name": "Mesa de piquenique",
+                "terms": "Mesa de Piquenique"
+            },
             "leisure/pitch": {
                 "name": "Quadra Esportiva",
                 "terms": "Campo de Esportes, Campo Esportivo, Quadra Esportiva"
@@ -1566,10 +2067,6 @@
                 "name": "Rampa Náutica",
                 "terms": "Rampa Náutica"
             },
-            "leisure/sports_center": {
-                "name": "Centro/Clube Esportivo",
-                "terms": "Centro Esportivo, Clube Esportivo, Ginásio de Esportes, Ginásio Poliesportivo, Academia de Esportes, Academia de Ginástica"
-            },
             "leisure/stadium": {
                 "name": "Estádio",
                 "terms": "Estádio, Ginásio"
@@ -1620,7 +2117,7 @@
             },
             "man_made/pipeline": {
                 "name": "Tubulação",
-                "terms": "Encanamento"
+                "terms": "Encanamento, Duto"
             },
             "man_made/survey_point": {
                 "name": "Ponto de Exame Geográfico",
@@ -1683,7 +2180,8 @@
                 "terms": "Orla Marítima, Linha Costeira"
             },
             "natural/fell": {
-                "name": "Fell"
+                "name": "Fell",
+                "terms": "Colina, Morro, Cerro, Coxilha, Montanha, Outeiro"
             },
             "natural/glacier": {
                 "name": "Geleira",
@@ -1762,7 +2260,7 @@
                 "terms": "Escritório da Empresa"
             },
             "office/educational_institution": {
-                "name": "Instituto de Educação",
+                "name": "Instituição Educacional",
                 "terms": "escola,colégio,universidade,faculdade,curso,instituto,educação,educacional"
             },
             "office/employment_agency": {
@@ -1790,7 +2288,7 @@
                 "terms": "ti,cpd,informática,computador,rede"
             },
             "office/lawyer": {
-                "name": "Escritório de Advogado",
+                "name": "Escritório de Advocacia",
                 "terms": "advogado,advocacia,escritório"
             },
             "office/newspaper": {
@@ -1825,6 +2323,10 @@
                 "name": "Agência de Viagens",
                 "terms": "viagem,viagens,agência"
             },
+            "piste": {
+                "name": "Pista de Ski",
+                "terms": "Pista de Ski, Trilha de Ski"
+            },
             "place": {
                 "name": "Local",
                 "terms": "Local"
@@ -1849,6 +2351,14 @@
                 "name": "Localidade",
                 "terms": "Localidade"
             },
+            "place/neighbourhood": {
+                "name": "Vizinhança",
+                "terms": "Vizinhança, Bairro"
+            },
+            "place/suburb": {
+                "name": "Distrito Municipal",
+                "terms": "Distrito Municipal"
+            },
             "place/town": {
                 "name": "Cidade Menor",
                 "terms": "Vila, Cidade, Município"
@@ -1863,7 +2373,7 @@
             },
             "power": {
                 "name": "Eletricidade",
-                "terms": "Eletricidade"
+                "terms": "Energia, Eletricidade"
             },
             "power/generator": {
                 "name": "Gerador de Energia",
@@ -1871,11 +2381,11 @@
             },
             "power/line": {
                 "name": "Linha de Transmissão",
-                "terms": "Fio Elétrico"
+                "terms": "Fio Elétrico, Condutor Elétrico, Linha de Transmissão"
             },
             "power/minor_line": {
-                "name": "Linha de Transmissão Pequena",
-                "terms": "Menor Linha de Energia"
+                "name": "Linha de Distribuição",
+                "terms": "Linha de Subtransmissão, Linha de Transmissão Secundária"
             },
             "power/pole": {
                 "name": "Poste de Transmissão",
@@ -1891,7 +2401,7 @@
             },
             "power/transformer": {
                 "name": "Transformador",
-                "terms": "Transformado"
+                "terms": "Transformador"
             },
             "public_transport/platform": {
                 "name": "Plataforma",
@@ -1913,8 +2423,13 @@
                 "name": "Ferrovia Inativa",
                 "terms": "Ferrovia em Desuso"
             },
+            "railway/funicular": {
+                "name": "Funicular",
+                "terms": "Funicular, Plano Inclinado"
+            },
             "railway/halt": {
-                "name": "Parada de Ferrovia"
+                "name": "Parada de Ferrovia",
+                "terms": "Estação de Parada na Ferrovia, Estação Simples, Estação Sem Facilidades"
             },
             "railway/level_crossing": {
                 "name": "Passagem de Nível",
@@ -1924,6 +2439,10 @@
                 "name": "Monotrilho",
                 "terms": "Monotrilho"
             },
+            "railway/narrow_gauge": {
+                "name": "Ferrovia de Bitola Estreita",
+                "terms": "Ferrovia de Bitola Estreita"
+            },
             "railway/platform": {
                 "name": "Plataforma de Trem",
                 "terms": "Plataforma de Trem"
@@ -1964,6 +2483,10 @@
                 "name": "Loja de Licores",
                 "terms": "Loja de Licores"
             },
+            "shop/art": {
+                "name": "Loja de Artes",
+                "terms": "Loja de Artes"
+            },
             "shop/bakery": {
                 "name": "Padaria",
                 "terms": "Padaria, Panificadora"
@@ -1980,6 +2503,10 @@
                 "name": "Loja de Bicicletas",
                 "terms": "Loja de Bicicletas, Bicicletaria"
             },
+            "shop/bookmaker": {
+                "name": "Casa de Apostas",
+                "terms": "Casa de Apostas"
+            },
             "shop/books": {
                 "name": "Livraria",
                 "terms": "Livraria"
@@ -1998,14 +2525,14 @@
             },
             "shop/car_parts": {
                 "name": "Loja de Peças Automotivas",
-                "terms": "Loja de Peças Automotivas"
+                "terms": "Loja de Peças Automotivas, Autopeças"
             },
             "shop/car_repair": {
                 "name": "Oficina Mecânica",
                 "terms": "Oficina Automotiva"
             },
             "shop/chemist": {
-                "name": "Loja de Cosméticos",
+                "name": "Loja de Cosméticos e Higiene",
                 "terms": "Loja de Cosméticos e Higiene Pessoal"
             },
             "shop/clothes": {
@@ -2017,7 +2544,7 @@
                 "terms": "Loja de Informática"
             },
             "shop/confectionery": {
-                "name": "Confeitaria",
+                "name": "Doçaria",
                 "terms": "Confeitaria"
             },
             "shop/convenience": {
@@ -2056,6 +2583,10 @@
                 "name": "Floricultura",
                 "terms": "Floricultura"
             },
+            "shop/funeral_directors": {
+                "name": "Funerária",
+                "terms": "Funerária"
+            },
             "shop/furniture": {
                 "name": "Loja de Móveis",
                 "terms": "Loja de Móveis, Decoração"
@@ -2100,6 +2631,10 @@
                 "name": "Chaveiro",
                 "terms": "Técnico de Chaves e Cadeados, Cópia de Chaves, Conserto de Cadeados"
             },
+            "shop/lottery": {
+                "name": "Lotérica",
+                "terms": "Loteria, Casa Lotérica, Mega Sena, Trimania, Quina"
+            },
             "shop/mall": {
                 "name": "Centro Comercial",
                 "terms": "Shopping Center, Galeria"
@@ -2136,9 +2671,13 @@
                 "name": "Loja de Fotografia",
                 "terms": "Loja de Fotografia"
             },
+            "shop/seafood": {
+                "name": "Loja de frutos do mar",
+                "terms": "Peixaria, Petiscaria, Pescado, Petisqueira"
+            },
             "shop/shoes": {
                 "name": "Loja de Calçados",
-                "terms": "Loja de Calçados"
+                "terms": "Loja de Calçados, Sapataria"
             },
             "shop/sports": {
                 "name": "Loja de Equipamentos Esportivos",
@@ -2170,12 +2709,16 @@
             },
             "shop/variety_store": {
                 "name": "Loja de Variedades a 1,99",
-                "terms": "Loja de Variedades, Um e Noventa e Nove, 1.99, 199"
+                "terms": "Loja de Variedades"
             },
             "shop/video": {
                 "name": "Loja/Locadora de Vídeos",
                 "terms": "Loja de Vídeos, Locadora de Vídeos, Videolocadora"
             },
+            "shop/wine": {
+                "name": "Loja de Vinhos",
+                "terms": "Vinícola, Adega"
+            },
             "tourism": {
                 "name": "Turismo",
                 "terms": "Turismo"
@@ -2290,7 +2833,7 @@
             },
             "type/route/pipeline": {
                 "name": "Rota de Tubulação",
-                "terms": "Rota de Tubulação"
+                "terms": "Rota de Tubulação, Faixa de Dutos"
             },
             "type/route/power": {
                 "name": "Rota de Energia Elétrica",
diff --git a/vendor/assets/iD/iD/locales/pt.json b/vendor/assets/iD/iD/locales/pt.json
index ff1360b64..a112450b0 100644
--- a/vendor/assets/iD/iD/locales/pt.json
+++ b/vendor/assets/iD/iD/locales/pt.json
@@ -71,7 +71,8 @@
                 "line": "Fazer uma linha circular.",
                 "area": "Área tornada circular."
             },
-            "not_closed": "Isto não pode ser tornado circular porque não é uma linha fechada."
+            "not_closed": "Isto não pode ser tornado circular porque não é uma linha fechada.",
+            "too_large": "Não é possível fazer um circulo porque o objecto não está completamente visível no mapa."
         },
         "orthogonalize": {
             "title": "Esquadrar",
@@ -84,7 +85,8 @@
                 "line": "Cantos da linha ortogonalizados.",
                 "area": "Cantos da área ortogonalizados."
             },
-            "not_squarish": "Isto não pode ser tornado quadrado porque não tem um formato quadrangular."
+            "not_squarish": "Isto não pode ser tornado quadrado porque não tem um formato quadrangular.",
+            "too_large": "Não é possível esquadrar porque o objecto não está completamente visível no mapa."
         },
         "straighten": {
             "title": "Endireitar",
@@ -134,7 +136,8 @@
             "annotation": "{n} linhas combinadas.",
             "not_eligible": "Estes elementos não podem ser unidos.",
             "not_adjacent": "Estas linhas não podem ser unidas porque não estão ligadas num ponto comum a ambas.",
-            "restriction": "Estas linhas não podem ser unidas porque pelo menos uma delas faz parte de uma relação \"{relation}\"."
+            "restriction": "Estas linhas não podem ser unidas porque pelo menos uma delas faz parte de uma relação \"{relation}\".",
+            "incomplete_relation": "Estes elementos não podem ser unidos porque pelo menos um deles não está completamente descarregado no mapa."
         },
         "move": {
             "title": "Mover",
@@ -179,6 +182,18 @@
             },
             "not_eligible": "As linhas não podem ser divididas no seu início ou fim.",
             "multiple_ways": "Existem aqui demasiadas linhas para dividir."
+        },
+        "restriction": {
+            "help": {
+                "select": "Clique para selecionar um segmento de estrada.",
+                "toggle": "Clique para inverter as restrições de viragem.",
+                "toggle_on": "Clique para adicionar uma \"{restriction}\" restrição.",
+                "toggle_off": "Clique para remover a \"{restriction}\" restrição."
+            },
+            "annotation": {
+                "create": "Restrição de viragem adicionada.",
+                "delete": "Restrição de viragem apagada."
+            }
         }
     },
     "undo": {
@@ -253,6 +268,9 @@
         "feature_list": "Pesquisar elementos",
         "edit": "Editar elemento",
         "none": "Nenhum",
+        "node": "Nó",
+        "way": "Linha",
+        "relation": "Relação",
         "location": "Localização"
     },
     "background": {
@@ -261,7 +279,8 @@
         "percent_brightness": "{opacity}% transparente",
         "none": "Nenhum",
         "custom": "Personalizado",
-        "custom_prompt": "Introduza um modelo de peça. Símbolos válidos são {z}, {x}, {y} para o esquema Z/X/Y, e {u} para o esquema \"quadtile\".",
+        "custom_button": "Editar fundo personalizando",
+        "custom_prompt": "Introduz um endereço URL válido. Pontos validos são {z}, {x}, {y} para esquemas Z/X/Y e {u} para esquemas QuadTile.",
         "fix_misalignment": "Corrigir alinhamento",
         "reset": "reiniciar"
     },
@@ -330,10 +349,13 @@
     "help": {
         "title": "Ajuda",
         "help": "# Ajuda\n\nEste é um editor do [OpenStreetMap](http://www.openstreetmap.org/), o mapa mundial livre e editável. Pode utilizá-lo para adicionar e atualizar dados do mapa na sua área, colaborando na construção de um mapa mundial melhor para todos. \n\nAs edições que fizer neste mapa serão visíveis a todas as pessoas que utilizem o OpenStreetMap. Para poder alterar o mapa é necessário ter uma [conta no OpenStreetMap](https://www.openstreetmap.org/user/new). O [editor iD](http://ideditor.com/) é um projeto colaborativo com [código-fonte disponível no site GitHub](https://github.com/openstreetmap/iD). \n",
+        "editing_saving": "# Editar e Gravar\n\nEste editor foi concebido para editar ligado à internet, e está a utilizá-lo\natravés de um site neste momento.\n\n### Selecionar elementos do mapa\n\nPara selecionar um elemento do mapa, como uma estrada ou uma loja,\nclique nesse elemento no mapa. Aparecerá de seguida um painel lateral\ncom informações sobre o elemento onde poderá eliminar, alterar ou\nacrescentar informações.\n\nPara selecionar vários elementos manter premida a tecla 'Shift' (maiúsculas),\nclicar e arrastar com o rato no mapa. Isto irá selecionar todos os elementos\ndentro do retângulo selecionado, permitindo fazer alterações em todos\nos elementos selecionados de uma só vez.\n\n### Gravar Edições\n\nQuando faz alterações como editar estradas, edifícios e locais, as alterações\nsão gravadas no seu computador até que clique no botão Gravar para enviar\nas alterações para o OpenStreetMap. Não se preocupe caso cometa algum\nerro - pode desfazer as alterações clicando no botão de Desfazer, assim\ncomo refazer as alterações desfeitas clicando no botão Refazer que se\nencontram no topo do ecrã.\n\nClique em 'Gravar' para terminar um conjunto de alterações - por exemplo,\nse terminou as alterações num local e quer fazer alterações noutro local.\nTerá oportunidade de rever as alterações que fez e o editor fornece\nsugestões úteis e avisos caso alguma alteração que não pareça correta.\n\nSe tudo estiver bem, pode introduzir uma breve descrição explicando\nas alterações que fez e clicar de seguida em 'Gravar' de novo para enviar\nas alterações para o [OpenStreetMap.org](http://www.openstreetmap.org/)\nonde estarão visíveis para todos e onde outros podem melhorar e completar.\n\nCaso não possa terminar as edições de uma só vez, pode deixar o editor,\nou inclusive fechar o navegador de internet e mais tarde regressar ao site\ndo OpenStreetMap, editando-o novamente . Será mostrado então um aviso\n(caso seja o mesmo computador e mesmo navegador de internet) que tem\nalterações por gravar e se quer recuperar essas alterações, para continuar.\n",
         "roads": "# Estradas\n\nPode criar, corrigir e eliminar estradas com o editor. As estradas podem ser\nde qualquer tipo: caminhos, autoestradas, carreiros florestais ou agrícolas,\nruas pedonais, ciclovias, entre outras. Qualquer local que seja frequentemente\natravessado por pessoas deve ser normalmente colocado no mapa.\n\n### Selecionar\n\nClique numa estrada para a selecionar. Aparece o painel lateral direito para\npoder editar as caraterísticas da estrada e botões em redor da estrada.\n\n### Alterar\n\nClique na estrada que quer alterar. Se quiser adicionar pontos à estrada entre\ndois pontos existentes basta clicar 2 vezes sobre o segmento da estrada.\nPode então deslocar esse ponto acabado de criar.\n\nSe existir uma estrada com ligação a outra no terreno mas que no mapa não\nestão ligadas, basta deslocar um ponto de uma das estradas até à outra estrada\npara ficarem ligadas. É muito importante as estradas estarem corretamente\nligadas umas às outras para que os programas de rotas possam fornecer\ninformações corretas aos utilizadores.\n\nPode também clicar no botão de 'Mover' ou premir a tecla 'M' para mover\na estrada toda de uma só vez. No entanto deve-se ter cuidado ao fazer isso\npois todos os pontos da estrada, incluindo os pontos partilhados com\noutras estradas, serão todos movidos.\n\nPara dividir uma estrada em duas, útil por exemplo quando existe uma estrada\nno mapa que na realidade são 2 estradas diferentes com referências diferentes,\nclique no ponto da estrada onde quer dividir e clique no botão da tesoura que\naparece ao lado do ponto. Esse botão aparece apenas se estiver o ponto\nselecionado e não a linha. Pode também combinar as 2 linhas numa só\nselecionando as duas estradas e clicando no botão + que aparece ao lado.\nSe existirem no mapa 2 estradas ligadas (nas extremidades ou num cruzamento)\nmas que na realidade não se ligam ou cruzam, basta selecionar o ponto comum\ne clicar no botão ao lado de desligar as linhas. Pode então deslocar o ponto\npara outro local.\n\n### Eliminar\n\nSe uma estrada estiver errada - pode-se confirmar pela imagem de satélite (ter em\nconta que a imagem de satélite pode ter alguns anos e a estrada pode ter sido\nconstruida posteriormente) e preferencialmente confirmar presencialmente  - pode\neliminar a estrada toda. É necessária precaução ao eliminar elementos do mapa.\nTal como qualquer outra alteração, os resultados serão visíveis a todos os outros.\n\nPode eliminar uma estrada clicando nela para a selecionar e de seguida\nclicar no ícone do caixote do lixo que aparece ao lado, ou simplesmente\npressionar na tecla 'Del' do teclado.\n\n### Criar\n\nEncontrou alguma estrada que não existe no mapa? Clique no botão 'Linha' que\nestá na parte superior ou pressione a tecla '2' para começar a desenhar a linha.\n\nClique no ponto inicial da estrada para começar a desenhá-la. Se Já existir\numa estrada no mapa, mas que está incompleta, pode continuá-la bastando\npara isso clicar no ponto da extremidade da estrada existente.\n\nAdicione então outros pontos de acordo com as imagens de satélite ou os trilhos\nGPS. Se a estrada que está a desenhar cruzar com outra estrada, crie um ponto\npor cima da outra estrada onde se cruzam. Quando terminar de desenhar\na estrada, clique duas vezes no último ponto da estrada ou pressione as teclas\nde mudança de linha ou 'Enter'.\n",
         "gps": "# GPS\n\nOs dados GPS são os de maior confiança para o OpenStreetMap. Este editor\npermite usar ficheiros `.gpx` como fundo para ajudar a editar mapas.\nPode obter dados GPS com vários telemóveis, assim como dispositivos GPS.\n\nPara mais informações sobre a obtenção de dados GPS ver a página [Gravando trilhos GPS] (http://wiki.openstreetmap.org/wiki/Recording_GPS_tracks).\n\nPara usar um ficheiro GPX como imagem de fundo, arraste o ficheiro do seu\ncomputador para o mapa. Se o ficheiro for reconhecido corretamente o trilho GPS\nserá mostrado a verde. Clique em  'Configuração da imagem de fundo' do lado\ndireito para mostrar ou esconder o trilho GPS, assim como enquadrar todo\no trilho GPS na janela.\n\nEste trilho GPS não é carregado para o OpenStreetMap para estar disponível\na outros editores, é apenas um ficheiro local GPS que pode utilizar para servir\nde referência e ajuda a editar o mapa. Também pode [carregar o ficheiro GPX para o OpenStreetMap](http://www.openstreetmap.org/trace/create)⏎\npara que outros o possam utilizar ao editar mapas.\n\n",
+        "imagery": "# Imagens de Satélite\n\nAs imagens de satélite são um recurso importante na criação e alteração\ndos mapas. Existe um grande leque de fontes de informações totalmente\ngratuitas no lado direito \ndo editor sob 'Configurações da Imagem de Fundo'.\n\nPor defeito são usado os mapas do [Bing](http://www.bing.com/maps/), que\npode variar no nível de qualidade. Em regra geral as capitais e os centros\npopulacionais têm as imagens de maior qualidade.\n\nExistem áreas do globo que contêm outros tipos de imagens de satélite,\ncomo por exemplo as zonas abrangidas pelo satélite de Mapnik.\n\nAs vezes a imagem pode encontrar-se desalinhada, se verificar que existe\numa grande quantidade de estradas fora do lugar mas geralmente sempre\npara o mesmo sentido, é recomendado mexer o mapa de maneira a alinhar.\nPara alinhar basta clicar onde diz 'Corrigir Alinhamento' no fim das \n'Configurações da Imagem de Fundo'.\n",
         "addresses": "# Endereços\n\nEndereços são das informações mais importantes para o mapa.\n\nApesar de endereços serem frequentemente representados em muitos mapas como parte de ruas, no OpenStreetMap eles são armazenados como atributos de edifícios e locais ao longo de ruas.\n\nDados de endereço podem ser adicionados tanto a locais representados como contornos de edifícios, como aos representados como um único ponto. A fonte ideal de dados de endereço é a recolha no local ou conhecimento pessoal — tal como com qualquer outro elemento, a cópia de fontes comerciais como o Google Maps é estritamente proibida.\n",
-        "buildings": "# Edifícios\n\nO OpenStreetMap é a maior base de dados de edifícios que existe sob licença\nlivre. Pode adicionar e  melhorar o mapa com edifícios.\n\n### Selecionar\n\nPode selecionar edifícios clicando nos contornos da área que delimita o edifício.\nSerá mostrado então o menu de botões e o painel lateral direito com informações\nsobre o edifício.\n\n### Alterar\n\nPor vezes os edifícios são desenhados incorretamente colocados fora do sítio\nou têm etiquetas incompletas ou erradas.\n\nPara mover um edifício, selecione-o e clique no botão 'Mover' que aparece\nà volta do edifício selecionado. De seguida desloque o rato para deslocar\no edifício. Para terminar o movimento clique de novo.\n\nPara corrigir os contornos do edifício clique e desloque os pontos que formam\na área do edifício. caso seja necessário adicionar pontos clique e desloque\num ponto central que aparece entre dois pontos já existentes. Para remover\num ponto, clique no ponto e de seguida no botão de Eliminar que aparece\nà volta do ponto.\n\n### Criar\n\nPodem-se criar edifícios como áreas ou pontos. Sempre que possível, e caso\nse conheça a área que um edifício ocupa, caso esteja ligado a outros, deve-se\ncriar uma área para cada edifício. Se uma loja ou serviço ocupar um edifício todo\npode-se acrescentar etiquetas sobre a loja ou serviço ao edifício (área) todo,\ncaso existam vários num só edifício, os serviços e lojas devem ser criados\ncom pontos dentro do edifício com as etiquetas correspondentes.\n\nPara criar um edifício como área, clique no botão superior 'Área' e comece\na clicar para criar os pontos que definem a área do edifício. Termine de criar\na área clicando no ponto inicial, ou na tecla de mudança de linha do teclado.\n\n\n### Eliminar\n\nSe um edifício estiver incorreto - pode-se confirmar pela imagem de satélite (ter em\nconta que a imagem de satélite pode ter alguns anos e o edifício pode ter sido\nedificado posteriormente) e preferencialmente confirmar presencialmente  - pode\neliminar o edifício. É necessária precaução ao eliminar elementos do mapa.\nTal como qualquer outra alteração, os resultados serão visíveis a todos os outros.\n\nPode eliminar um edifício clicando na área dele para o selecionar e de seguida\nclicar no ícone do caixote do lixo que aparece ao lado, ou simplesmente\npressionar na tecla 'Del' do teclado.\n"
+        "buildings": "# Edifícios\n\nO OpenStreetMap é a maior base de dados de edifícios que existe sob licença\nlivre. Pode adicionar e  melhorar o mapa com edifícios.\n\n### Selecionar\n\nPode selecionar edifícios clicando nos contornos da área que delimita o edifício.\nSerá mostrado então o menu de botões e o painel lateral direito com informações\nsobre o edifício.\n\n### Alterar\n\nPor vezes os edifícios são desenhados incorretamente colocados fora do sítio\nou têm etiquetas incompletas ou erradas.\n\nPara mover um edifício, selecione-o e clique no botão 'Mover' que aparece\nà volta do edifício selecionado. De seguida desloque o rato para deslocar\no edifício. Para terminar o movimento clique de novo.\n\nPara corrigir os contornos do edifício clique e desloque os pontos que formam\na área do edifício. caso seja necessário adicionar pontos clique e desloque\num ponto central que aparece entre dois pontos já existentes. Para remover\num ponto, clique no ponto e de seguida no botão de Eliminar que aparece\nà volta do ponto.\n\n### Criar\n\nPodem-se criar edifícios como áreas ou pontos. Sempre que possível, e caso\nse conheça a área que um edifício ocupa, caso esteja ligado a outros, deve-se\ncriar uma área para cada edifício. Se uma loja ou serviço ocupar um edifício todo\npode-se acrescentar etiquetas sobre a loja ou serviço ao edifício (área) todo,\ncaso existam vários num só edifício, os serviços e lojas devem ser criados\ncom pontos dentro do edifício com as etiquetas correspondentes.\n\nPara criar um edifício como área, clique no botão superior 'Área' e comece\na clicar para criar os pontos que definem a área do edifício. Termine de criar\na área clicando no ponto inicial, ou na tecla de mudança de linha do teclado.\n\n\n### Eliminar\n\nSe um edifício estiver incorreto - pode-se confirmar pela imagem de satélite (ter em\nconta que a imagem de satélite pode ter alguns anos e o edifício pode ter sido\nedificado posteriormente) e preferencialmente confirmar presencialmente  - pode\neliminar o edifício. É necessária precaução ao eliminar elementos do mapa.\nTal como qualquer outra alteração, os resultados serão visíveis a todos os outros.\n\nPode eliminar um edifício clicando na área dele para o selecionar e de seguida\nclicar no ícone do caixote do lixo que aparece ao lado, ou simplesmente\npressionar na tecla 'Del' do teclado.\n",
+        "relations": "# Relações\n\nNo OpenStreetMap Uma relação é um tipo especial de função pois é capaz\nde agrupar vários tipos de funções diferentes. Por exemplo, dois tipos\ncomuns de relações são: *rotas*, onde são agrupadas diferentes tipos de\nestradas que pertencem ao mesmo grupo, como por exemplo as\nautoestradas, e *multipolígonos*, que agrupa diferentes linhas de forma a\ncompor formas e áreas complexas (uma área com várias secções ou\nburacos como num donut.)\n\nO conjunto de funções que constituem uma relação são chamados de\n*membros*. Na barra lateral, podes ver quais relações uma determinada\nfunção pertence e clicando nela é possível seleccionar a relação. Quando\na relação é seleccionada, é possível ver todos os seus membros assim\ncomo ver-los iluminados no mapa.\n\nNa maior parte das vezes, o editor iD gere automaticamente as relações\nque são criadas, adicionando qualquer alteração que faças. O que\nnecessitas de ter em atenção é que se eliminares, por exemplo, uma\nsecção de estrada de maneira a mapear-la de forma diferente, tens de te\ncertificar que a nova secção pertence à mesma relação onde a antiga\nestrada estava inserida.\n\n## Editando Relações\n\nCaso queiras editar uma relação, aqui estão algumas ideias para\ncomeçares.\n\nPara adicionar uma nova função a uma relação, selecciona a função desejada, clica no botão \"+\" na parte onde diz \"Todas as Relações\" e\nescolhe \"Nova relação...\"\n\nPara remover uma função de uma relação, selecciona a função desejada\ne clica no ícone com o caixote de lixo que fica à direita da relação.\n\nÉ possível criar multipoligonos com buracos utilizando a ferramenta \"Unir\". Desenha primeiro duas áreas (uma dentro e outra\nfora), sustem a tecla Shift e clica em cada uma delas para as seleccionar a\nambas e depois basta \"unir-las\" clicando no botão que tem o símbolo \"+\".\n"
     },
     "intro": {
         "navigation": {
@@ -386,6 +408,12 @@
     },
     "presets": {
         "categories": {
+            "category-building": {
+                "name": "Edifício"
+            },
+            "category-golf": {
+                "name": "Golfe"
+            },
             "category-landuse": {
                 "name": "Uso do Solo"
             },
@@ -395,11 +423,20 @@
             "category-rail": {
                 "name": "Ferrovia"
             },
+            "category-restriction": {
+                "name": "Restrição"
+            },
             "category-road": {
-                "name": "Estrada"
+                "name": "Rodovia"
             },
             "category-route": {
                 "name": "Rota"
+            },
+            "category-water-area": {
+                "name": "Água"
+            },
+            "category-water-line": {
+                "name": "Água"
             }
         },
         "fields": {
@@ -408,10 +445,10 @@
                 "placeholder": "Desconhecido",
                 "types": {
                     "access": "Geral",
-                    "foot": "A pé",
-                    "motor_vehicle": "Veículos motorizados",
+                    "foot": "Peões",
+                    "motor_vehicle": "Veículos Motorizados",
                     "bicycle": "Bicicletas",
-                    "horse": "Cavalos"
+                    "horse": "Animais"
                 },
                 "options": {
                     "yes": {
@@ -432,36 +469,56 @@
                     },
                     "designated": {
                         "title": "Designado",
-                        "description": "Acesso permitido de acordo com sinalética ou leis locais específicas"
+                        "description": "Acesso permitido de acordo com a sinalética e/ou com leis locais específicas; como p. ex. o Código da Estrada"
                     },
                     "destination": {
                         "title": "Destino",
-                        "description": "Acesso permitido apenas para chegar a determinado destino"
+                        "description": "Acesso permitido apenas para chegar a determinado destino; como p. ex. parques de estacionamento ou centros comerciais"
                     }
                 }
             },
+            "access_simple": {
+                "label": "Acesso"
+            },
             "address": {
                 "label": "Morada",
                 "placeholders": {
                     "number": "123",
                     "street": "Rua",
-                    "city": "Cidade",
+                    "city": "Localidade",
                     "postcode": "Código postal"
                 }
             },
             "admin_level": {
                 "label": "Nível Administrativo"
             },
+            "aerialway": {
+                "label": "Tipo"
+            },
             "aerialway/access": {
                 "label": "Acesso"
             },
+            "aerialway/bubble": {
+                "label": "Bolha"
+            },
             "aerialway/capacity": {
-                "label": "Capacidade (por hora)"
+                "label": "Capacidade (por hora)",
+                "placeholder": "500, 2500, 5000..."
             },
             "aerialway/duration": {
                 "label": "Duração (minutos)",
                 "placeholder": "1, 2, 3..."
             },
+            "aerialway/heating": {
+                "label": "Aquecido"
+            },
+            "aerialway/occupancy": {
+                "label": "Ocupação Máxima",
+                "placeholder": "2, 4, 8...."
+            },
+            "aerialway/summer/access": {
+                "label": "Acesso (verão)"
+            },
             "aeroway": {
                 "label": "Tipo"
             },
@@ -475,7 +532,7 @@
                 "label": "Tipo"
             },
             "atm": {
-                "label": "MultiBanco"
+                "label": "Multibanco"
             },
             "backrest": {
                 "label": "Encosto"
@@ -503,10 +560,10 @@
                 "label": "Direção"
             },
             "clock_direction": {
-                "label": "DIreção",
+                "label": "Direção",
                 "options": {
                     "clockwise": "Sentido dos Ponteiros do Relógio",
-                    "anticlockwise": "Sentido Inverso dos Ponteiros do Relógio"
+                    "anticlockwise": "Sentido Contrário aos Ponteiros do Relógio."
                 }
             },
             "collection_times": {
@@ -518,11 +575,17 @@
             "country": {
                 "label": "País"
             },
+            "covered": {
+                "label": "Coberto"
+            },
+            "crop": {
+                "label": "Produção"
+            },
             "crossing": {
                 "label": "Tipo"
             },
             "cuisine": {
-                "label": "Cozinha"
+                "label": "Culinária"
             },
             "denomination": {
                 "label": "Denominação"
@@ -533,8 +596,11 @@
             "description": {
                 "label": "Descrição"
             },
+            "electrified": {
+                "label": "Eletrificação"
+            },
             "elevation": {
-                "label": "Altura acima do nível médio do mar"
+                "label": "Elevação"
             },
             "emergency": {
                 "label": "Emergência"
@@ -542,12 +608,15 @@
             "entrance": {
                 "label": "Tipo"
             },
+            "except": {
+                "label": "Exceções"
+            },
             "fax": {
                 "label": "Fax",
-                "placeholder": "+351 99 123 4567"
+                "placeholder": "+351 252 471441"
             },
             "fee": {
-                "label": "Tarifa"
+                "label": "Taxa"
             },
             "fire_hydrant/type": {
                 "label": "Tipo"
@@ -555,6 +624,39 @@
             "fixme": {
                 "label": "Corrigir"
             },
+            "fuel": {
+                "label": "Combustível"
+            },
+            "fuel/biodiesel": {
+                "label": "Vende Biodiesel"
+            },
+            "fuel/diesel": {
+                "label": "Vende Gasóleo"
+            },
+            "fuel/e10": {
+                "label": "Vende \"Etanol 10\""
+            },
+            "fuel/e85": {
+                "label": "Vende \"Etanol 85\""
+            },
+            "fuel/lpg": {
+                "label": "Vende GPL"
+            },
+            "fuel/octane_100": {
+                "label": "Vende \"Gasolina 100\""
+            },
+            "fuel/octane_91": {
+                "label": "Vende \"Gasolina 91\""
+            },
+            "fuel/octane_95": {
+                "label": "Vende \"Gasolina 95\""
+            },
+            "fuel/octane_98": {
+                "label": "Vende \"Gasolina 98\""
+            },
+            "gauge": {
+                "label": "Bitola"
+            },
             "generator/method": {
                 "label": "Método"
             },
@@ -564,6 +666,14 @@
             "generator/type": {
                 "label": "Tipo"
             },
+            "golf_hole": {
+                "label": "Referência",
+                "placeholder": "Número do Buraco (1-18)"
+            },
+            "handicap": {
+                "label": "Handicap",
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "Tipo"
             },
@@ -571,6 +681,7 @@
                 "label": "Tipo"
             },
             "hoops": {
+                "label": "Cestos",
                 "placeholder": "1, 2, 4..."
             },
             "iata": {
@@ -582,10 +693,13 @@
             "incline": {
                 "label": "Inclinação"
             },
+            "information": {
+                "label": "Tipo"
+            },
             "internet_access": {
                 "label": "Acesso à Internet",
                 "options": {
-                    "wlan": "Wifi",
+                    "wlan": "Wi-Fi",
                     "wired": "Com fio",
                     "terminal": "Terminal de acesso"
                 }
@@ -598,13 +712,16 @@
                 "placeholder": "1, 2, 3..."
             },
             "layer": {
-                "label": "Nível"
+                "label": "Camada"
             },
             "leisure": {
                 "label": "Tipo"
             },
+            "length": {
+                "label": "Comprimento (metros)"
+            },
             "levels": {
-                "label": "Nível",
+                "label": "Nº de Andares",
                 "placeholder": "2, 4, 6..."
             },
             "lit": {
@@ -618,11 +735,11 @@
             },
             "maxspeed": {
                 "label": "Limite de Velocidade",
-                "placeholder": "50, 90, 120..."
+                "placeholder": "50, 90, 100, 120..."
             },
             "name": {
                 "label": "Nome",
-                "placeholder": "Nome comum (caso se aplique)"
+                "placeholder": "Nome Comum (caso se aplique)"
             },
             "natural": {
                 "label": "Natural"
@@ -631,16 +748,22 @@
                 "label": "Rede"
             },
             "note": {
-                "label": "Nota"
+                "label": "Notas"
             },
             "office": {
                 "label": "Tipo"
             },
             "oneway": {
-                "label": "Sentido Único"
+                "label": "Sentido Único",
+                "options": {
+                    "undefined": "Assumido que seja Não"
+                }
             },
             "oneway_yes": {
-                "label": "Sentido Único"
+                "label": "Sentido Único",
+                "options": {
+                    "undefined": "Assumido que seja Sim"
+                }
             },
             "opening_hours": {
                 "label": "Horário de Funcionamento"
@@ -648,6 +771,10 @@
             "operator": {
                 "label": "Operador"
             },
+            "par": {
+                "label": "Par",
+                "placeholder": "3, 4, 5..."
+            },
             "park_ride": {
                 "label": "Estacionamento de Intercâmbio"
             },
@@ -655,18 +782,42 @@
                 "label": "Tipo"
             },
             "phone": {
-                "label": "Telefone",
-                "placeholder": "+351 99 123 4567"
+                "label": "Telefone / Telemóvel",
+                "placeholder": "+351 245 125961"
+            },
+            "piste/difficulty": {
+                "label": "Dificuldade"
+            },
+            "piste/grooming": {
+                "label": "Niveladora de Neve"
+            },
+            "piste/type": {
+                "label": "Tipo"
             },
             "place": {
                 "label": "Tipo"
             },
+            "population": {
+                "label": "População"
+            },
             "power": {
                 "label": "Tipo"
             },
             "railway": {
                 "label": "Tipo"
             },
+            "recycling/cans": {
+                "label": "Aceita Latas"
+            },
+            "recycling/clothes": {
+                "label": "Aceita Roupa"
+            },
+            "recycling/glass": {
+                "label": "Aceita Vidros"
+            },
+            "recycling/paper": {
+                "label": "Aceita Papel"
+            },
             "ref": {
                 "label": "Referência"
             },
@@ -688,6 +839,9 @@
             "restriction": {
                 "label": "Tipo"
             },
+            "restrictions": {
+                "label": "Restrição de Curvas"
+            },
             "route": {
                 "label": "Tipo"
             },
@@ -695,7 +849,10 @@
                 "label": "Tipo"
             },
             "sac_scale": {
-                "label": "Dificuldade"
+                "label": "Dificuldade do Terreno"
+            },
+            "seasonal": {
+                "label": "Sazonal"
             },
             "service": {
                 "label": "Tipo"
@@ -703,15 +860,31 @@
             "shelter": {
                 "label": "Abrigo"
             },
+            "shelter_type": {
+                "label": "Tipo"
+            },
             "shop": {
                 "label": "Tipo"
             },
+            "sloped_curb": {
+                "label": "Lancil Inclinado"
+            },
+            "smoking": {
+                "label": "Fumar"
+            },
+            "social_facility_for": {
+                "label": "Pessoas Servidas",
+                "placeholder": "Sem-abrigo, Deficientes, Crianças, etc."
+            },
             "source": {
                 "label": "Fonte das informações"
             },
             "sport": {
                 "label": "Desporto"
             },
+            "sport_ice": {
+                "label": "Desporto"
+            },
             "structure": {
                 "label": "Estrutura",
                 "placeholder": "Desconhecido",
@@ -719,17 +892,24 @@
                     "bridge": "Ponte",
                     "tunnel": "Túnel",
                     "embankment": "Elevação no terreno",
-                    "cutting": "Corte no terreno"
+                    "cutting": "Corte no terreno",
+                    "ford": "Vau"
                 }
             },
+            "studio_type": {
+                "label": "Tipo"
+            },
             "supervised": {
                 "label": "Vigiado"
             },
             "surface": {
                 "label": "Superfície"
             },
+            "tactile_paving": {
+                "label": "Pavimentação Táctil"
+            },
             "toilets/disposal": {
-                "label": "Eliminação de resíduos"
+                "label": "Método de Eliminação de Resíduos"
             },
             "tourism": {
                 "label": "Tipo"
@@ -743,11 +923,17 @@
             "trail_visibility": {
                 "label": "Visibilidade do Trilho"
             },
+            "tree_type": {
+                "label": "Tipo"
+            },
+            "trees": {
+                "label": "Árvores"
+            },
             "tunnel": {
                 "label": "Túnel"
             },
             "vending": {
-                "label": "Tipo de produto"
+                "label": "Tipo de Produtos"
             },
             "water": {
                 "label": "Tipo"
@@ -756,8 +942,8 @@
                 "label": "Tipo"
             },
             "website": {
-                "label": "Website",
-                "placeholder": "http://exemplo.org/"
+                "label": "Sítio Eletrónico",
+                "placeholder": "http://www.exemplo.org/"
             },
             "wetland": {
                 "label": "Tipo"
@@ -765,6 +951,9 @@
             "wheelchair": {
                 "label": "Acesso com cadeira de rodas"
             },
+            "width": {
+                "label": "Largura (metros)"
+            },
             "wikipedia": {
                 "label": "Wikipédia"
             },
@@ -775,1053 +964,2027 @@
         "presets": {
             "address": {
                 "name": "Morada",
-                "terms": "Endereço,Morada"
+                "terms": "Endereço, Morada"
+            },
+            "aerialway": {
+                "name": "Telesqui",
+                "terms": "Aerialway, Teleférico de Superfície"
+            },
+            "aerialway/cable_car": {
+                "name": "Teleférico",
+                "terms": "Cable Car"
+            },
+            "aerialway/chair_lift": {
+                "name": "Telecadeira",
+                "terms": "Chair Lift, Teleférico de cadeira"
+            },
+            "aerialway/gondola": {
+                "name": "Gôndola",
+                "terms": "Gondola"
+            },
+            "aerialway/magic_carpet": {
+                "name": "Corredor de Subida para Esquis",
+                "terms": "Magic Carpet Lift"
+            },
+            "aerialway/platter": {
+                "name": "Telesqui",
+                "terms": "Platter Lift, Prato de Elevação"
+            },
+            "aerialway/pylon": {
+                "name": "Pilar de Suporte de Teleféricos",
+                "terms": "Aerialway Pylon"
+            },
+            "aerialway/rope_tow": {
+                "name": "Ascenção com Corda de Reboque ",
+                "terms": "Rope Tow Lift"
+            },
+            "aerialway/station": {
+                "name": "Estação de Teleféricos",
+                "terms": "Aerialway Station, Entrada de Teleféricos, Paragem de Teleféricos"
+            },
+            "aerialway/t-bar": {
+                "name": "Teleférico de Neve",
+                "terms": "T-bar Lift, Subida Mecânica"
             },
             "aeroway": {
-                "name": "Via área"
+                "name": "Via área",
+                "terms": "Aerodromo, Aviões, Avião, Helicóptero"
             },
             "aeroway/aerodrome": {
-                "name": "Aeroporto"
+                "name": "Aeroporto",
+                "terms": "Avião, aeródromo"
             },
             "aeroway/apron": {
-                "name": "Plataforma de Estacionamento"
+                "name": "Plataforma de Estacionamento",
+                "terms": "Rampa"
             },
             "aeroway/gate": {
-                "name": "Porta de Embarque / Desembarque"
+                "name": "Porta de Embarque / Desembarque",
+                "terms": "Porão, Porta de Embarque, Porta de Desembarque, Manga"
             },
             "aeroway/hangar": {
-                "name": "Hangar"
+                "name": "Hangar",
+                "terms": "Hangar, Abrigo de Aviões"
             },
             "aeroway/helipad": {
-                "name": "Heliponto"
+                "name": "Heliporto / Heliponto",
+                "terms": "Helicóptero"
             },
             "aeroway/runway": {
-                "name": "Pista de Aterragem e Descolagem"
+                "name": "Pista de Aterragem e Descolagem",
+                "terms": "Faixa de Aterragem"
             },
             "aeroway/taxiway": {
-                "name": "Via de Circulação"
+                "name": "Faixa de Rolagem / Táxi",
+                "terms": "Rolar, Faixa de Rolagem"
             },
             "aeroway/terminal": {
-                "name": "Terminal de Aeroporto"
+                "name": "Terminal de Aeroporto",
+                "terms": "Aeroporto, Aeródromo"
             },
             "amenity": {
-                "name": "Infraestrutura"
+                "name": "Infraestrutura",
+                "terms": "característica, qualidade, aspecto"
             },
             "amenity/arts_centre": {
-                "name": "Centro artístico"
+                "name": "Centro Artístico",
+                "terms": "Arts Center, Centro de Artes"
             },
             "amenity/atm": {
-                "name": "Caixa MultiBanco"
+                "name": "Multibanco",
+                "terms": "Caixa Multibanco, Caixa de Multibanco, MB, Caixa de MB"
             },
             "amenity/bank": {
-                "name": "Banco"
+                "name": "Banco",
+                "terms": "Agência bancária, Agência financeira, Agência de Investimentos, Cofre, Depósito, Levantamentos, Firma de Investimentos"
             },
             "amenity/bar": {
-                "name": "Bar"
+                "name": "Bar",
+                "terms": "Bar, Bares, Bebidas, Alcool"
+            },
+            "amenity/bbq": {
+                "name": "Churrasco",
+                "terms": "Barbacue/Grill, Barbacue, Carne Assada"
             },
             "amenity/bench": {
-                "name": "Banco (mobiliário)"
+                "name": "Assento",
+                "terms": "Banco, Assento, Banco de Sentar, Sentar"
             },
             "amenity/bicycle_parking": {
-                "name": "Parque de Bicicletas"
+                "name": "Parque de Bicicletas",
+                "terms": "Parque de Bicicletas, Área de Bicicletas, Zona de Bicicletas"
             },
             "amenity/bicycle_rental": {
-                "name": "Aluguer de Bicicletas"
+                "name": "Aluguer de Bicicletas",
+                "terms": "Aluguer de Bicicletas, Área de Aluguer de Bicicletas, Zona de Aluguer de Bicicletas"
             },
             "amenity/boat_rental": {
-                "name": "Aluguer de barcos"
+                "name": "Aluguer de Barcos",
+                "terms": "Boat Rental"
             },
             "amenity/cafe": {
-                "name": "Café"
+                "name": "Café",
+                "terms": "Chá, Loja de Café, Cafetaria"
             },
             "amenity/car_rental": {
-                "name": "Aluguer de Automóveis"
+                "name": "Aluguer de Automóveis",
+                "terms": "Aluguer de Automóveis, Área de Aluguer de Automóveis, Zona de Aluguer de Automoveis"
             },
             "amenity/car_sharing": {
-                "name": "Partilha de Automóveis"
+                "name": "Partilha de Automóveis",
+                "terms": "Partilha de Carros, Partilha de Veículos "
             },
             "amenity/car_wash": {
-                "name": "Lavagem de Veículos"
+                "name": "Lavagem de Veículos",
+                "terms": "Lavagem, Lavagem Automática, Mangueira, Limpeza"
+            },
+            "amenity/charging_station": {
+                "name": "Posto de Carregamento para Veículos Elétricos",
+                "terms": "Charging Station, Estação de recarga, Energia, Bateria"
             },
             "amenity/childcare": {
                 "name": "Creche",
-                "terms": "Área de cuidados infantis"
+                "terms": "Área de Cuidados Infantis"
             },
             "amenity/cinema": {
                 "name": "Cinema",
-                "terms": "cinema"
+                "terms": "Filme, filmes"
+            },
+            "amenity/clinic": {
+                "name": "Clínica",
+                "terms": "Clinic, Centro de Saúde"
             },
             "amenity/clock": {
-                "name": "Relógio"
+                "name": "Relógio",
+                "terms": "Clock"
             },
             "amenity/college": {
-                "name": "Colégio"
+                "name": "Colégio",
+                "terms": "Colégio, Colégio Interno, Escola Privada, Privada, Externatos, Semiprivado"
+            },
+            "amenity/compressed_air": {
+                "name": "Máquina de Ar Comprimido",
+                "terms": "Compressed Air, Pneumática, Pneus, Encher"
             },
             "amenity/courthouse": {
-                "name": "Tribunal"
+                "name": "Tribunal",
+                "terms": "Casa da Justiça"
+            },
+            "amenity/dentist": {
+                "name": "Dentista",
+                "terms": "Dentist, Dentes, Ortodontia"
+            },
+            "amenity/doctor": {
+                "name": "Médico",
+                "terms": "Doctor, Doutor"
+            },
+            "amenity/dojo": {
+                "name": "Centro de Artes Marciais",
+                "terms": "Dojo, Karaté, Taekwondo, Judo, Jiu-jitsu, Jiu-jitsu Brasileiro, Kung Fu, Capoeira, Eskrima, Escrima, Escryma, Muay Thai, Krav Magá, Jeet Kune Do"
             },
             "amenity/drinking_water": {
-                "name": "Água Potável"
+                "name": "Água Potável",
+                "terms": "Fonte de Água, Água Potável, Bebedouro"
             },
             "amenity/embassy": {
-                "name": "Embaixada"
+                "name": "Embaixada",
+                "terms": "Consulado"
             },
             "amenity/fast_food": {
-                "name": "Comida Rápida"
+                "name": "Comida Rápida",
+                "terms": "Comida Instantânea, Comida de plástico, Fast Food"
             },
             "amenity/fire_station": {
                 "name": "Quartel de Bombeiros",
-                "terms": "bombeiros,quartel,quartel dos bombeiros,quartel de bombeiros"
+                "terms": "Bombeiros, Quartel, Quartel dos Bombeiros, Quartel de Bombeiros"
             },
             "amenity/fountain": {
-                "name": "Fonte Decorativa"
+                "name": "Fonte Decorativa",
+                "terms": "Fonte, Fonte de Água, Jacto de Água"
             },
             "amenity/fuel": {
-                "name": "Posto de Combustível"
+                "name": "Gasolineira / Posto de Combustível",
+                "terms": "Bombas de Abastecimento, Bombas de Gasolina"
             },
             "amenity/grave_yard": {
-                "name": "Sepultura"
+                "name": "Sepultura",
+                "terms": "Cemitério, Mortos, Funerário, Solene"
+            },
+            "amenity/hospital": {
+                "name": "Hospital",
+                "terms": "Sala de emergência, Operação, Serviço de Saúde, Hospício, Enfermaria, Sanatório, Cirurgia, Médico, Ambulância"
+            },
+            "amenity/kindergarten": {
+                "name": "Jardim Infantil / Infantário",
+                "terms": "Pré-Escola, Pré Escola"
             },
             "amenity/library": {
-                "name": "Biblioteca"
+                "name": "Biblioteca",
+                "terms": "Biblioteca, Livros, Consulta, Publica"
             },
             "amenity/marketplace": {
-                "name": "Mercado / Feira"
+                "name": "Mercado / Feira",
+                "terms": "Bazar, Minimercado"
             },
             "amenity/nightclub": {
-                "name": "Clube Nocturno"
+                "name": "Clube Nocturno",
+                "terms": "Nightclub, Discoteca"
             },
             "amenity/parking": {
-                "name": "Estacionamento"
+                "name": "Parque de Estacionamento",
+                "terms": "Estacionamento, Lugar de Estacionamento"
+            },
+            "amenity/parking_entrance": {
+                "name": "Entrada / Saída de Parque de Estacionamento",
+                "terms": "Parking Garage Entrance/Exit"
             },
             "amenity/pharmacy": {
-                "name": "Farmácia"
+                "name": "Farmácia",
+                "terms": "Farmácia, Parafarmácia"
             },
             "amenity/place_of_worship": {
-                "name": "Local de Oração"
+                "name": "Local de Oração",
+                "terms": "Abadia, Basílica, Casa de Adoração, Casa de Deus, Catedral, Capela, Capelinha, Centro Espiritual, Santuário, Templo"
             },
             "amenity/place_of_worship/buddhist": {
-                "name": "Templo Budista"
+                "name": "Templo Budista",
+                "terms": "Estupa, Vihara, Mosteiro, Templo, Pagode, Zendo, Dojo"
             },
             "amenity/place_of_worship/christian": {
-                "name": "Igreja"
+                "name": "Igreja",
+                "terms": "Cristão, Abadia, Alminha, Alminhas, Basílica, Betel, Casa de Adoração, Casa de Deus, Carmelo, Catedral, Capela, Capelinha, Colegiada, Congregação, Convento, Cruzeiro, Ermida, Mosteiro, Oratório, Paróquia, Salão do Reino  Sé"
             },
             "amenity/place_of_worship/jewish": {
-                "name": "Sinagoga"
+                "name": "Sinagoga",
+                "terms": "Judaico, Sinagoga"
             },
             "amenity/place_of_worship/muslim": {
-                "name": "Mesquita"
+                "name": "Mesquita",
+                "terms": "Muçulmano, Mesquita"
             },
             "amenity/police": {
                 "name": "Polícia",
-                "terms": "polícia,gnr,psp,g.n.r.,p.s.p.,polícia de segurança pública,guarda nacional republicana"
+                "terms": "Polícia, GNR, G.N.R., PSP, P.S.P., Polícia de Segurança Pública, Guarda Nacional Republicana"
             },
             "amenity/post_box": {
-                "name": "Caixa de Correio"
+                "name": "Caixa de Correio",
+                "terms": "Marco de Correio, Caixa Postal, Posto de Correio"
             },
             "amenity/post_office": {
-                "name": "Estação de Correios"
+                "name": "Estação de Correios",
+                "terms": "Central de Correio, CTT, C.T.T., CTTs, Correio de Portugal"
             },
             "amenity/pub": {
-                "name": "Bar"
+                "name": "Taberna",
+                "terms": "Pub"
             },
             "amenity/ranger_station": {
-                "name": "Posto de guarda florestal"
+                "name": "Posto de Guarda Florestal",
+                "terms": "Ranger Station, Guarda Florestal"
+            },
+            "amenity/recycling": {
+                "name": "Reciclagem",
+                "terms": "Recycling, Reutilizar, Reciclar"
             },
             "amenity/restaurant": {
-                "name": "Restaurante"
+                "name": "Restaurante",
+                "terms": "Bar, Cafetaria, Café, Cantina, Almoço, Jantar, Cozinha, Restaurante, Pizzaria, Culinária, Gastronomia, Restauração"
+            },
+            "amenity/school": {
+                "name": "Escola",
+                "terms": "Academia, Creche, Colégio, Departamento, Externato, Liceu, Seminário"
+            },
+            "amenity/shelter": {
+                "name": "Abrigo",
+                "terms": "Shelter"
+            },
+            "amenity/social_facility": {
+                "name": "Centro Social",
+                "terms": "Social Facility"
+            },
+            "amenity/social_facility/food_bank": {
+                "name": "Banco Alimentar",
+                "terms": "Food Bank, Alimento, Comida"
+            },
+            "amenity/social_facility/group_home": {
+                "name": "Pousada Pública",
+                "terms": "Group Home, Hostel, Casa Comunitária"
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Abrigo para os Sem-Abrigo",
+                "terms": "Homeless Shelter, Casa para os Sem-Abrigo, Casa Pública, Sem-Abrigo"
+            },
+            "amenity/studio": {
+                "name": "Estúdio",
+                "terms": "Studio"
             },
             "amenity/swimming_pool": {
-                "name": "Piscina"
+                "name": "Piscina",
+                "terms": "Piscina, Parque Aquático "
             },
             "amenity/taxi": {
-                "name": "Praça de táxis",
-                "terms": "Paragem de táxis"
+                "name": "Praça de Táxis",
+                "terms": "Paragem de Táxis"
             },
             "amenity/telephone": {
-                "name": "Telefone"
+                "name": "Telefone",
+                "terms": "Telefone, Telemóvel"
             },
             "amenity/theatre": {
-                "name": "Teatro"
+                "name": "Teatro",
+                "terms": "Teatro, Performance, Peça, Peça de Teatro, Musical"
             },
             "amenity/toilets": {
-                "name": "Casas de Banho"
+                "name": "Casas de Banho",
+                "terms": "Casas de Banho, Instalações Sanitárias, Sanitário, Gabinete Sanitário, Toilette, lavabo, WC"
             },
             "amenity/townhall": {
-                "name": "Câmara Municipal / Junta de Freguesia"
+                "name": "Câmara Municipal / Junta de Freguesia",
+                "terms": "Junta, Câmara, Paços, Centro Administrativo, Capital de Concelho, Capital de Freguesia, Capital de Distrito, Capital de Região"
             },
             "amenity/university": {
                 "name": "Universidade",
-                "terms": "universidade,faculdade,instituto"
+                "terms": "Universidade, Faculdade, Instituto, Politécnico"
             },
             "amenity/vending_machine": {
-                "name": "Máquina automática de vendas"
+                "name": "Máquina de Vendas Automática",
+                "terms": "Vending Machine, Máquina Automática de Vendas"
             },
             "amenity/veterinary": {
-                "name": "Veterinária"
+                "name": "Veterinário",
+                "terms": "Veterinary, Veterinária, Animais"
             },
             "amenity/waste_basket": {
-                "name": "Caixote do Lixo"
+                "name": "Caixote do Lixo",
+                "terms": "Papeleira, Lixo, Reciclagem"
             },
             "area": {
-                "name": "Área"
+                "name": "Área",
+                "terms": "Espaço, Extensão, Zona"
             },
             "barrier": {
-                "name": "Barreira"
+                "name": "Barreira",
+                "terms": "Barreira, Muro"
             },
             "barrier/block": {
-                "name": "Bloco de Cimento / Pedra"
+                "name": "Bloco de Cimento / Pedra",
+                "terms": "Bloqueio, Obstáculo"
             },
             "barrier/bollard": {
-                "name": "Pilar"
+                "name": "Pilar",
+                "terms": "Bolardo, Poste de Amarração"
             },
             "barrier/cattle_grid": {
-                "name": "Grelha Anti-Gado"
+                "name": "Grelha Anti-Gado",
+                "terms": "Gado, Vaca, Porco, Boi, Cabra, Ovelha, Cavalo"
             },
             "barrier/city_wall": {
-                "name": "Muralha de Cidade"
+                "name": "Muralha de Cidade",
+                "terms": "Muro defensivo, Parede Defensiva, Muro Histórico, Fortificações"
             },
             "barrier/cycle_barrier": {
-                "name": "Barreira de Bicicletas"
+                "name": "Barreira de Bicicletas",
+                "terms": "Bicicleta"
             },
             "barrier/ditch": {
-                "name": "Fosso / Vala / Trincheira"
+                "name": "Fosso sem Água",
+                "terms": "Sem Água, Seca, Vala sem Água, Vala Seca, Trincheira sem Água, Trincheira  Seca"
             },
             "barrier/entrance": {
-                "name": "Entrada"
+                "name": "Entrada",
+                "terms": "Entrada, Acesso, Abertura, Porta, Pórtico, Portão"
             },
             "barrier/fence": {
-                "name": "Vedação"
+                "name": "Vedação",
+                "terms": "Cerca, Proteção"
             },
             "barrier/gate": {
-                "name": "Cancela / Portão"
+                "name": "Cancela / Portão",
+                "terms": "Grade"
             },
             "barrier/hedge": {
-                "name": "Sebe"
+                "name": "Sebe",
+                "terms": "Arbusto, Muro de Flores, Muro de Plantas"
             },
             "barrier/kissing_gate": {
-                "name": "Cancela de Encosto Anti-Gado"
+                "name": "Cancela de Encosto Anti-Gado",
+                "terms": "Grade de Gado"
             },
             "barrier/lift_gate": {
-                "name": "Cancela Elevatória"
+                "name": "Barreira Automática",
+                "terms": "Cancela Elevatória, Barreira de Estacionamento"
             },
             "barrier/retaining_wall": {
-                "name": "Muro de Contenção"
+                "name": "Muro de Contenção",
+                "terms": "Arrimo, Amparo"
             },
             "barrier/stile": {
-                "name": "Escadas de Passagem Anti-Gado"
+                "name": "Passagem Anti-Gado",
+                "terms": "Escada"
             },
             "barrier/toll_booth": {
-                "name": "Portagem"
+                "name": "Portagem",
+                "terms": "Pedágio, Tarifa, Pórtico"
             },
             "barrier/wall": {
-                "name": "Muro"
+                "name": "Muro",
+                "terms": "Parede, Muro"
             },
             "boundary/administrative": {
-                "name": "Fronteira Administrativa (Concelho, freguesia...)",
-                "terms": "Fronteira Admistrativa"
+                "name": "Fronteira Administrativa",
+                "terms": "Fronteira Administrativa, Concelho, Freguesia, Distrito, Região, Limite Adminsitrativo"
             },
             "building": {
-                "name": "Edifício"
+                "name": "Edifício",
+                "terms": "Edifício, Prédio"
             },
             "building/apartments": {
-                "name": "Apartamentos"
+                "name": "Apartamento",
+                "terms": "Apartamentos, Habitáculos"
+            },
+            "building/barn": {
+                "name": "Celeiro",
+                "terms": "Barn, Estábulo"
+            },
+            "building/bunker": {
+                "name": "Bunker",
+                "terms": "Bunker, Carvoeira"
+            },
+            "building/cabin": {
+                "name": "Cabine",
+                "terms": "Cabin, Praia, Campo, Cabana "
             },
             "building/cathedral": {
-                "name": "Catedral"
+                "name": "Catedral",
+                "terms": "Cathedral"
             },
             "building/chapel": {
-                "name": "Capela"
+                "name": "Capela",
+                "terms": "Chapel"
+            },
+            "building/church": {
+                "name": "Igreja",
+                "terms": "Church"
             },
             "building/commercial": {
-                "name": "Edifício comercial",
-                "terms": "Prédio comercial"
+                "name": "Escritório",
+                "terms": "Prédio Comercial, Edifício Comercial"
+            },
+            "building/construction": {
+                "name": "Edifício em Construção",
+                "terms": "Building Under Construction, Edifício sob Construção"
+            },
+            "building/detached": {
+                "name": "Casa Isolada",
+                "terms": "Detached Home, Cabana, Bangaló, Villa, Mansão"
+            },
+            "building/dormitory": {
+                "name": "Dormitório",
+                "terms": "Dormitory, Repousada, Albergue"
             },
             "building/entrance": {
-                "name": "Entrada"
+                "name": "Entrada / Saída",
+                "terms": "Entrance/Exit, Entrada, Acesso, Abertura, Porta, Pórtico, Portão"
             },
             "building/garage": {
-                "name": "Garagem"
+                "name": "Garagem",
+                "terms": "Garagem, Abrigo de Automoveis"
+            },
+            "building/garages": {
+                "name": "Garagens",
+                "terms": "Garages"
+            },
+            "building/greenhouse": {
+                "name": "Estufa",
+                "terms": "Greenhouse, Estufas"
+            },
+            "building/hospital": {
+                "name": "Edifício Hospitalar",
+                "terms": "Hospital Building"
+            },
+            "building/hotel": {
+                "name": "Edifício Hoteleiro",
+                "terms": "Hotel Building"
             },
             "building/house": {
-                "name": "Casa"
+                "name": "Casa",
+                "terms": "Casa, Domicílio, Moradia, Mansão, Solar, Vivenda"
             },
             "building/hut": {
                 "name": "Cabana",
                 "terms": "Barraca"
             },
             "building/industrial": {
-                "name": "Edifício industrial"
+                "name": "Industria",
+                "terms": "Edifício Industrial, Manufactura, Fábrica"
+            },
+            "building/public": {
+                "name": "Edifício Público",
+                "terms": "Public Building"
             },
             "building/residential": {
-                "name": "Edifício residencial",
-                "terms": "Prédio residencial"
+                "name": "Edifício Residencial",
+                "terms": "Prédio Residencial, Habitação"
+            },
+            "building/retail": {
+                "name": "Edifício de Retalho",
+                "terms": "Retail Building, Retalho, Varejo"
+            },
+            "building/roof": {
+                "name": "Telhado",
+                "terms": "Roof, Cobertura"
+            },
+            "building/school": {
+                "name": "Edifício Escolar",
+                "terms": "School Building, Pavilhão Escolar"
+            },
+            "building/shed": {
+                "name": "Barracão",
+                "terms": "Shed, Barraca, Edícula"
+            },
+            "building/stable": {
+                "name": "Estábulo",
+                "terms": "Stable, Cavalos"
+            },
+            "building/static_caravan": {
+                "name": "Casa Pré-Fabricada",
+                "terms": "Static Mobile Home, Trailer, Caravana, "
+            },
+            "building/terrace": {
+                "name": "Casas Geminadas",
+                "terms": "Row Houses, Terraced house, Terraços"
             },
             "building/train_station": {
-                "name": "Estação de Comboio"
+                "name": "Estação de Comboio",
+                "terms": "Train Station, Estação Ferroviária"
+            },
+            "building/university": {
+                "name": "Edifício Universitário",
+                "terms": "University Building, Edifício Universitário"
+            },
+            "building/warehouse": {
+                "name": "Armazém",
+                "terms": "Warehouse, Arrecadação"
+            },
+            "craft/basket_maker": {
+                "name": "Criador de Cestas",
+                "terms": "Basket Maker, Fabricante de Cestas, Fabricante de Cestos"
+            },
+            "craft/beekeeper": {
+                "name": "Apicultor",
+                "terms": "Beekeeper, Mel, Cuidador de Abelhas"
+            },
+            "craft/blacksmith": {
+                "name": "Ferreiro",
+                "terms": "Blacksmith, Forjador"
+            },
+            "craft/boatbuilder": {
+                "name": "Fabricante de Barcos",
+                "terms": "Boat Builder, Construtor de Barcos, Construtor de Iates"
+            },
+            "craft/bookbinder": {
+                "name": "Encadernador",
+                "terms": "Bookbinder, Plastificador"
+            },
+            "craft/brewery": {
+                "name": "Cervejaria",
+                "terms": "Brewery, Mestre Cervejeiro"
+            },
+            "craft/carpenter": {
+                "name": "Carpinteiro",
+                "terms": "Carpenter, Carpintaria, Madeiras"
+            },
+            "craft/carpet_layer": {
+                "name": "Colocador de Tapetes",
+                "terms": "Carpet Layer, Instalador de Carpetes"
+            },
+            "craft/caterer": {
+                "name": "Fornecedor",
+                "terms": "Caterer, Catering"
+            },
+            "craft/clockmaker": {
+                "name": "Relojoeiro",
+                "terms": "Clockmaker, Relógios"
+            },
+            "craft/confectionary": {
+                "name": "Confeitaria",
+                "terms": "Confectionary, Bolos, Sobremesas"
+            },
+            "craft/dressmaker": {
+                "name": "Costureira",
+                "terms": "Dressmaker, Costureiro, Estilista, Alfaiate, Modista"
+            },
+            "craft/electrician": {
+                "name": "Eletricista",
+                "terms": "Electrician, Homem da Luz"
+            },
+            "craft/gardener": {
+                "name": "Jardineiro",
+                "terms": "Gardener, Flores, Jardim, Erva"
+            },
+            "craft/glaziery": {
+                "name": "Vidreiro",
+                "terms": "Glaziery, Vidro"
+            },
+            "craft/handicraft": {
+                "name": "Artesão",
+                "terms": "Handicraft, Artesã"
+            },
+            "craft/hvac": {
+                "name": "AVAC",
+                "terms": "HVAC, Aquecimento, Ventilação, Ar Condicionado"
+            },
+            "craft/insulator": {
+                "name": "Isolador",
+                "terms": "Insulator"
+            },
+            "craft/jeweler": {
+                "name": "Joalheiro",
+                "terms": "Jeweler"
+            },
+            "craft/key_cutter": {
+                "name": "Chaveiro",
+                "terms": "Key Cutter"
+            },
+            "craft/locksmith": {
+                "name": "Serralheiro",
+                "terms": "Locksmith"
+            },
+            "craft/metal_construction": {
+                "name": "Construção Metálica",
+                "terms": "Metal Construction"
+            },
+            "craft/optician": {
+                "name": "Oculista",
+                "terms": "Optician"
+            },
+            "craft/painter": {
+                "name": "Pintor",
+                "terms": "Painter"
+            },
+            "craft/photographer": {
+                "name": "Fotógrafo",
+                "terms": "Photographer, Agência Fotográfica"
+            },
+            "craft/photographic_laboratory": {
+                "name": "Laboratório Fotográfico",
+                "terms": "Photographic Laboratory, Loja Fotográfica, Fotógrafo"
+            },
+            "craft/plasterer": {
+                "name": "Gesseiro",
+                "terms": "Plasterer"
+            },
+            "craft/plumber": {
+                "name": "Canalizador",
+                "terms": "Plumber, Picheleiro"
+            },
+            "craft/pottery": {
+                "name": "Oleiro",
+                "terms": "Pottery, Ceramista"
+            },
+            "craft/rigger": {
+                "name": "Armador",
+                "terms": "Rigger"
+            },
+            "craft/roofer": {
+                "name": "Telhador",
+                "terms": "Roofer"
+            },
+            "craft/saddler": {
+                "name": "Seleiro",
+                "terms": "Saddler, Selas, Selins, Arreios"
+            },
+            "craft/sailmaker": {
+                "name": "Veleiro",
+                "terms": "Sailmaker, Mastros, Vergas, Velas, Cordas, Barcos a Vela."
+            },
+            "craft/sawmill": {
+                "name": "Lenhador",
+                "terms": "Sawmill, Serraria"
+            },
+            "craft/scaffolder": {
+                "name": "Montador de Andaimes",
+                "terms": "Scaffolder, Colocador de Andaimes, Andaimes"
+            },
+            "craft/sculpter": {
+                "name": "Escultor",
+                "terms": "Sculpter"
+            },
+            "craft/shoemaker": {
+                "name": "Sapateiro",
+                "terms": "Shoemaker"
+            },
+            "craft/stonemason": {
+                "name": "Canteiro",
+                "terms": "Stonemason, Rocha"
+            },
+            "craft/sweep": {
+                "name": "Limpador de Chaminés",
+                "terms": "Chimney Sweep, Limpa Chaminés"
+            },
+            "craft/tailor": {
+                "name": "Alfaiate",
+                "terms": "Tailor"
+            },
+            "craft/tiler": {
+                "name": "Colocador de Azulejos / Pedras",
+                "terms": "Tiler"
+            },
+            "craft/tinsmith": {
+                "name": "Latoeiro",
+                "terms": "Tinsmith, Chapa, Zinco"
+            },
+            "craft/upholsterer": {
+                "name": "Tapeceiro",
+                "terms": "Upholsterer, Tapeceiro, Tapeçaria, Tecidos"
+            },
+            "craft/watchmaker": {
+                "name": "Relojoeiro",
+                "terms": "Watchmaker"
+            },
+            "craft/window_construction": {
+                "name": "Fabrico de Vidro",
+                "terms": "Window Construction"
+            },
+            "embankment": {
+                "name": "Aterro Elevado",
+                "terms": "Embankment, Elevação do Terreno"
             },
             "emergency/ambulance_station": {
-                "name": "Central de ambulâncias"
+                "name": "Central de Ambulâncias",
+                "terms": "Ambulance Station, Ambulância "
             },
             "emergency/fire_hydrant": {
-                "name": "Boca de incêndio"
+                "name": "Boca de Incêndio",
+                "terms": "Fire Hydrant, Hidrante, Marco de Água, Marco de Incêndio"
             },
             "emergency/phone": {
-                "name": "Telefone de Emergência"
+                "name": "Telefone de Emergência",
+                "terms": "Telefone de Emergência, 112"
             },
             "entrance": {
-                "name": "Entrada"
+                "name": "Entrada / Saída",
+                "terms": "Entrance/Exit, Entrada, Acesso, Abertura, Porta, Pórtico, Portão"
+            },
+            "footway/crossing": {
+                "name": "Passadeira",
+                "terms": "Crossing"
+            },
+            "footway/crosswalk": {
+                "name": "Passadeira",
+                "terms": "Crosswalk, Passagem de Peões"
+            },
+            "footway/sidewalk": {
+                "name": "Passeio",
+                "terms": "Sidewalk, Calçada"
+            },
+            "ford": {
+                "name": "Vau",
+                "terms": "Baixio, Banco, Parel"
+            },
+            "golf/bunker": {
+                "name": "Banco de Areia",
+                "terms": "Sand Trap"
+            },
+            "golf/fairway": {
+                "name": "Fairway",
+                "terms": "Fairway"
+            },
+            "golf/green": {
+                "name": "Green",
+                "terms": "Putting Green"
+            },
+            "golf/hole": {
+                "name": "Buraco de Golfe",
+                "terms": "Golf Hole"
+            },
+            "golf/lateral_water_hazard": {
+                "name": "Obstáculo de Água Lateral",
+                "terms": "Lateral Water Hazard"
+            },
+            "golf/rough": {
+                "name": "Rough",
+                "terms": "Rough"
+            },
+            "golf/tee": {
+                "name": "Tee",
+                "terms": "Tee Box"
+            },
+            "golf/water_hazard": {
+                "name": "Obstáculo de Água",
+                "terms": "Water Hazard"
             },
             "highway": {
-                "name": "Autoestrada",
-                "terms": "Auto-Estrada"
+                "name": "Rodovia",
+                "terms": "Estrada, Via, Trânsito, Carro, Veiculo"
             },
             "highway/bridleway": {
-                "name": "Caminhos Exclusivo para Cavalos"
+                "name": "Caminhos Exclusivo para Cavalos",
+                "terms": "Trilho para Cavalos, Trilho para Cavaleiros, Trilho Equestre, Caminho Equestre, Caminho para Cavalos, Caminho para Cavaleiros"
             },
             "highway/bus_stop": {
                 "name": "Paragem de Autocarro",
-                "terms": "Paragem de Autocarro"
+                "terms": "Paragem de Autocarro, Terminal de Autocarros"
             },
             "highway/crossing": {
-                "name": "Passadeira"
+                "name": "Passadeira",
+                "terms": "Zebra, Faixa de segurança, Passagem, Passagem de Peões, Riscas"
+            },
+            "highway/crosswalk": {
+                "name": "Passadeira",
+                "terms": "Crosswalk, Passagem de Peões"
             },
             "highway/cycleway": {
-                "name": "Ciclovia"
+                "name": "Ciclovia",
+                "terms": "Bicicleta"
             },
             "highway/footway": {
-                "name": "Via Pedonal"
+                "name": "Via Pedonal",
+                "terms": "Andar, Caminho, Estrada, Pé, Pedestre, Percurso, Rua, Ruela, Trajectória, Trilha, Trilho, Via, Viela, Caminho Pedonal"
             },
             "highway/living_street": {
-                "name": "Living Street (não existem em países lusófonos)"
+                "name": "Zonas de coexistência",
+                "terms": "Zona de Peões"
             },
             "highway/mini_roundabout": {
-                "name": "Mini-Rotunda"
+                "name": "Mini-Rotunda",
+                "terms": "Mini-Rotunda, Minirotunda, Rotunda Pintada"
             },
             "highway/motorway": {
-                "name": "Autoestrada"
+                "name": "Autoestrada",
+                "terms": "Auto-Estrada, Auto Estrada"
             },
             "highway/motorway_junction": {
-                "name": "Interseção de Autoestradas"
+                "name": "Interseção / Saída de Autoestradas",
+                "terms": "Motorway Junction / Exit, Junção de Autoestradas, Saída de Autoestradas"
             },
             "highway/motorway_link": {
-                "name": "Ligação a Autoestrada"
+                "name": "Nó de ligação a uma Autoestrada",
+                "terms": "Ligação Autoestrada, Entrada Autoestrada, Saída Autoestrada"
             },
             "highway/path": {
-                "name": "Caminho"
+                "name": "Trilho",
+                "terms": "Trilha, Caminho"
             },
             "highway/pedestrian": {
-                "name": "Rua Pedonal"
+                "name": "Praça / Rua Pedonal",
+                "terms": "Pedonal, Pedestre"
             },
             "highway/primary": {
-                "name": "Estrada Primária / Nacional"
+                "name": "Estrada Nacional (Primária)",
+                "terms": "Estrada Principal, Rodovia Principal, Estrada Primária, Rodovia Primária, Primário"
             },
             "highway/primary_link": {
-                "name": "Ligação a Estrada Primária / Nacional"
+                "name": "Nó de Ligação a uma Estrada Nacional (Primária)",
+                "terms": "Ligação Estrada Nacional, Ligação Rodovia Nacional, Ligação Nacional,  Ligação Estrada Principal, Entrada Estrada Nacional, Entrada Rodovia Nacional, Entrada Nacional, Entrada Estrada Nacional, Saída Nacional, Saída Rodovia Nacional, Saída Nacional, Saída Estrada Nacional,"
             },
             "highway/residential": {
-                "name": "Estrada Residencial"
+                "name": "Rua Residencial",
+                "terms": "Estrada Residencial, Rodovia Residencial, Estrada Urbana, Rodovia Urbana, Estrada Suburbana, Rodovia Suburbana, Estrada dentro de localidades, Rodovia dentro de localidades"
+            },
+            "highway/rest_area": {
+                "name": "Área de Descanso",
+                "terms": "Rest Area, Posto de Descanço"
             },
             "highway/road": {
-                "name": "Estrada Genérica"
+                "name": "Estrada Incógnita",
+                "terms": "Estrada Genérica, Rodovia Genérica, Estrada Desconhecida, Rodovia Desconhecida"
             },
             "highway/secondary": {
-                "name": "Estrada Secundária / Regional"
+                "name": "Estrada Regional (Secundária)",
+                "terms": "Estrada Secundária, Rodovia Secundária, Secundário"
             },
             "highway/secondary_link": {
-                "name": "Ligação a Estrada Secundária / Regional"
+                "name": "Nó de ligação a uma Estrada Regional (Secundária)",
+                "terms": "Ligação Estrada Regional, Ligação Rodovia Regional, Ligação Regional,  Ligação Estrada Secundária, Entrada Estrada Regional, Entrada Rodovia Regional, Entrada Regional, Entrada Estrada Secundária, Saída Regional, Saída Rodovia Regional, Saída Regional, Saída Estrada Secundária"
             },
             "highway/service": {
-                "name": "Estrada de Serviço"
+                "name": "Estrada de Serviço",
+                "terms": "Rodovia de Serviço"
             },
             "highway/service/alley": {
-                "name": "Rua de Traseiras"
+                "name": "Traseiras",
+                "terms": "Beco"
             },
             "highway/service/drive-through": {
-                "name": "Serviço ao volante"
+                "name": "Drive-Through",
+                "terms": "Drive-in, Serviço ao Volante"
             },
             "highway/service/driveway": {
-                "name": "Acesso a residência / serviço"
+                "name": "Acesso a residência / garagem",
+                "terms": "Rampa de Acesso, Corredor"
             },
             "highway/service/emergency_access": {
-                "name": "Acesso de Emergência"
+                "name": "Acesso de Emergência",
+                "terms": "Acesso de Emergência, Entrada de Emergência, Corredor de Emergência"
             },
             "highway/service/parking_aisle": {
-                "name": "Estrada de Parque de Estacionamento"
+                "name": "Corredor de Estacionamento",
+                "terms": "Pista de Estacionamento, Estacionar"
             },
             "highway/services": {
-                "name": "Área de Serviço"
+                "name": "Área de Serviço",
+                "terms": "Service Area, Posto de Serviço"
             },
             "highway/steps": {
-                "name": "Escadas"
+                "name": "Escadas",
+                "terms": "Escadaria, degraus"
             },
             "highway/stop": {
-                "name": "Sinal de stop"
+                "name": "Sinal de Stop",
+                "terms": "Stop Sign, Sinal de Paragem, Paragem Obrigatória, Sinal de paragem obrigatória no cruzamento ou entroncamento"
             },
             "highway/tertiary": {
-                "name": "Estrada Terciária / Municipal"
+                "name": "Estrada / Caminho Municipal (Terciária)",
+                "terms": "Estrada Terciária, Rodovia Terciária, Terciário, Caminho Municipal"
             },
             "highway/tertiary_link": {
-                "name": "Ligação a Estrada Terciária / Municipal"
+                "name": "Nó de ligação a uma Estrada / Caminho Municipal (Terciária)",
+                "terms": "Ligação Estrada Municipal, Ligação Rodovia Municipal, Ligação Municipal,  Ligação Estrada Terciária, Entrada Estrada Municipal, Entrada Rodovia Municipal, Entrada Municipal, Entrada Estrada Terciária, Saída Municipal, Saída Rodovia Municipal, Saída Municipal, Saída Estrada Municipal"
             },
             "highway/track": {
-                "name": "Carreiro Florestal / Agrícola"
+                "name": "Estrada Florestal / Agrícola",
+                "terms": "Estrada Rural"
             },
             "highway/traffic_signals": {
-                "name": "Semáforo"
+                "name": "Semáforos",
+                "terms": "Semáforo, Vermelho, Verde, Amarelo, Sinal, Sinal de Trânsito"
             },
             "highway/trunk": {
-                "name": "Via Rápida / IP / IC"
+                "name": "Via Rápida",
+                "terms": "Via Reservada a Automóveis e Motociclos, Estrada Reservada a Automóveis e Motociclos, Via Expressa, Via Reservada"
             },
             "highway/trunk_link": {
-                "name": "Ligação a Via Rápida / IP / IC"
+                "name": "Nó de ligação a uma Via Rápida",
+                "terms": "Ligação Via Rápida, Entrada Via Rápida, Saída Via Rápida, Ligação Via Reservada a Automóveis e Motociclos, Entrada Via Reservada a Automóveis e Motociclos, Saída Via Reservada a Automóveis e Motociclos, Ligação Via Expressa, Entrada Expressa, Saída Via Expressa, Ligação Via Reservada, Entrada Via Reservada, Saída Via Reservada"
             },
             "highway/turning_circle": {
-                "name": "Circulo de Viragem"
+                "name": "Circulo de Viragem",
+                "terms": "Inversão de Marcha"
             },
             "highway/unclassified": {
-                "name": "Estrada Sem Classificação Oficial"
+                "name": "Estrada Normal",
+                "terms": "Estrada Não-Classificada"
             },
             "historic": {
-                "name": "Local Histórico"
+                "name": "Local Histórico",
+                "terms": "Local Histórico"
             },
             "historic/archaeological_site": {
-                "name": "Sítio Arqueológico"
+                "name": "Sítio Arqueológico",
+                "terms": "Local Arqueológico"
             },
             "historic/boundary_stone": {
-                "name": "Marco de Fronteira"
+                "name": "Marco de Fronteira",
+                "terms": "Pilar de Fronteira"
             },
             "historic/castle": {
-                "name": "Castelo"
+                "name": "Castelo",
+                "terms": "Castelo, Fortaleza, Edificação, Medieval"
             },
             "historic/memorial": {
-                "name": "Memorial"
+                "name": "Memorial",
+                "terms": "Memorial, Homenagem"
             },
             "historic/monument": {
-                "name": "Monumento"
+                "name": "Monumento",
+                "terms": "Monumento, Marco"
             },
             "historic/ruins": {
-                "name": "Ruínas"
+                "name": "Ruínas",
+                "terms": "Ruínas, Abandonado"
             },
             "historic/wayside_cross": {
-                "name": "Cruzeiro / Cruz ao Ar Livre"
+                "name": "Cruzeiro",
+                "terms": " Cruz ao Ar Livre"
             },
             "historic/wayside_shrine": {
-                "name": "Alminhas / Nicho / Capelinha"
+                "name": "Alminhas / Nicho / Capelinha",
+                "terms": "Alminhas / Nicho / Capelinha"
             },
             "landuse": {
-                "name": "Uso do Solo"
+                "name": "Uso do Solo",
+                "terms": "Uso de Terra, Uso de Solo"
             },
             "landuse/allotments": {
-                "name": "Horta Urbana / Comunitária"
+                "name": "Hortas",
+                "terms": "Horta Comunitária, Horta Urbana"
             },
             "landuse/basin": {
-                "name": "Bacia Hidrográfica"
+                "name": "Bacia Hidrográfica",
+                "terms": "Bacia de Drenagem"
             },
             "landuse/cemetery": {
                 "name": "Cemitério",
-                "terms": "Cemitério"
+                "terms": "Cemitério, Vala"
+            },
+            "landuse/churchyard": {
+                "name": "Átrio da Igreja",
+                "terms": "Churchyard, Área da Igreja, Zona da Igreja, Praça da Igreja"
             },
             "landuse/commercial": {
-                "name": "Comercial"
+                "name": "Zona de Escritórios",
+                "terms": "Área comercial, Baixa Comercial"
             },
             "landuse/construction": {
-                "name": "Construção"
+                "name": "Construção",
+                "terms": "Construção, Obras, Em Curso"
             },
             "landuse/farm": {
-                "name": "Agricultura",
-                "terms": "Quinta"
+                "name": "Quinta",
+                "terms": "Quinta, Campo Agricula"
+            },
+            "landuse/farmland": {
+                "name": "Quinta",
+                "terms": "Farmland, Pasto"
             },
             "landuse/farmyard": {
-                "name": "Quinta"
+                "name": "Edifícios Agrícolas",
+                "terms": "Fazenda, Casa de Campo, Celeiro"
             },
             "landuse/forest": {
-                "name": "Floresta"
+                "name": "Floresta",
+                "terms": "Floresta, Área Verde"
             },
             "landuse/grass": {
-                "name": "Relva"
+                "name": "Relva",
+                "terms": "Relva, Grama"
             },
             "landuse/industrial": {
-                "name": "Industrial",
+                "name": "Zona Industrial",
                 "terms": "Industrial"
             },
+            "landuse/landfill": {
+                "name": "Aterro Sanitário",
+                "terms": "Landfill, Lixeira, Sucata"
+            },
             "landuse/meadow": {
-                "name": "Prado"
+                "name": "Prado",
+                "terms": "Meadow"
+            },
+            "landuse/military": {
+                "name": "Zona Militar",
+                "terms": "Military, Exército, Marinha, Forças Especiais, Força Aérea"
             },
             "landuse/orchard": {
-                "name": "Pomar"
+                "name": "Pomar",
+                "terms": "Plantação, Orchard"
             },
             "landuse/quarry": {
-                "name": "Pedreira"
+                "name": "Pedreira",
+                "terms": "Canteira, Quarry"
             },
             "landuse/residential": {
-                "name": "Residencial",
-                "terms": "Residencial"
+                "name": "Zona Residencial",
+                "terms": "Residencial, Urbano, Antrópico, Residential"
             },
             "landuse/retail": {
-                "name": "Área de Retalho",
-                "terms": "Retalho"
+                "name": "Zona de Retalhos",
+                "terms": "Retalho, Varejo, Compras, Vendas, Retail"
             },
             "landuse/vineyard": {
                 "name": "Vinha",
-                "terms": "Vinhas"
+                "terms": "Vinhas, Vinhedo, Vinhão, Vineyard"
             },
             "leisure": {
-                "name": "Lazer"
+                "name": "Lazer",
+                "terms": "Lazer, Diversão, Leisure"
             },
             "leisure/common": {
-                "name": "Comum"
+                "name": "Comum",
+                "terms": "Common"
             },
             "leisure/dog_park": {
-                "name": "Parque de cães",
-                "terms": "Parque para cães"
+                "name": "Parque de Cães",
+                "terms": "Parque para Cães, Dog Park"
+            },
+            "leisure/firepit": {
+                "name": "Fogueira",
+                "terms": "Firepit, Fogo controlado, Chama, Brasa"
             },
             "leisure/garden": {
-                "name": "Jardim"
+                "name": "Jardim",
+                "terms": "Jardim, Garden"
             },
             "leisure/golf_course": {
-                "name": "Campo de Golfe"
+                "name": "Campo de Golfe",
+                "terms": "Campo de Golf, Golf, Golf Course"
+            },
+            "leisure/ice_rink": {
+                "name": "Ringue de Patinagem",
+                "terms": "Ice Rink, Ringue de Gelo, Gelo, Pista de Gelo, Pista de Patinagem"
             },
             "leisure/marina": {
-                "name": "Marina"
+                "name": "Marina",
+                "terms": "Marina"
             },
             "leisure/park": {
-                "name": "Parque"
+                "name": "Parque",
+                "terms": "Bosque, Floresta, Jardim, Relva, Relvado"
+            },
+            "leisure/picnic_table": {
+                "name": "Mesa de Picnic",
+                "terms": "Picnic Table, Mesa de Merenda"
             },
             "leisure/pitch": {
-                "name": "Campo de Desporto"
+                "name": "Campo de Desporto",
+                "terms": "Campo de Desportos, Quadra Desportiva, Sport Pitch"
             },
             "leisure/pitch/american_football": {
-                "name": "Campo de Futebol Americano"
+                "name": "Campo de Futebol Americano",
+                "terms": "Campo de Futebol Americano, Rugby, Râguebi, American Football"
             },
             "leisure/pitch/baseball": {
-                "name": "Campo de Basebol"
+                "name": "Campo de Basebol",
+                "terms": "Campo de Baisebol, Baseball Diamond"
             },
             "leisure/pitch/basketball": {
-                "name": "Campo de Basquetebol"
+                "name": "Campo de Basquetebol",
+                "terms": "Campo de Basquetebol, Quadra de Basquetebol, Basketball Court"
             },
             "leisure/pitch/skateboard": {
-                "name": "Parque de skate"
+                "name": "Parque de Skate",
+                "terms": "Skate Park, Skate"
             },
             "leisure/pitch/soccer": {
-                "name": "Campo de Futebol"
+                "name": "Campo de Futebol",
+                "terms": "Campo de Futebol, Soccer Field"
             },
             "leisure/pitch/tennis": {
-                "name": "Campo de Ténis"
+                "name": "Campo de Ténis",
+                "terms": "Campo de Ténis, Quadra de Ténis, Tennis Court"
             },
             "leisure/pitch/volleyball": {
-                "name": "Campo de Voleibol"
+                "name": "Campo de Voleibol",
+                "terms": "Campo de Voleibol, Quadra de Voleibol, Volleyball Court"
             },
             "leisure/playground": {
-                "name": "Parque infantil"
+                "name": "Parque Infantil",
+                "terms": "Parque Infantil, Escorrega, Baloiço, Escorregas, Baloiços"
             },
             "leisure/slipway": {
-                "name": "Rampa para Barcos"
+                "name": "Rampa para Barcos",
+                "terms": "Slipway"
             },
             "leisure/sports_center": {
-                "name": "Centro desportivo"
+                "name": "Centro Desportivo / Ginásio",
+                "terms": "Sports Center / Gym, Exercício Físico"
             },
             "leisure/stadium": {
-                "name": "Estádio"
+                "name": "Estádio",
+                "terms": "Estádio, Stadium"
             },
             "leisure/swimming_pool": {
-                "name": "Piscina"
+                "name": "Piscina",
+                "terms": "Piscina, Swimming Pool"
             },
             "leisure/track": {
-                "name": "Pista de corridas"
+                "name": "Pista de Corrida",
+                "terms": "Race Track, Pista Automobilística, Circuito"
             },
             "line": {
-                "name": "Linha"
+                "name": "Linha",
+                "terms": "Linha, Line"
             },
             "man_made": {
-                "name": "Construção"
+                "name": "Estrutura Artificial",
+                "terms": "Construção Humana, Obra Humana, Man Made"
             },
             "man_made/breakwater": {
-                "name": "Quebra-mar / Molhe"
+                "name": "Quebra-mar / Molhe",
+                "terms": "Breakwater"
             },
             "man_made/cutline": {
-                "name": "Linha corta-fogo"
+                "name": "Linha corta-fogo",
+                "terms": "Cut line"
+            },
+            "man_made/embankment": {
+                "name": "Aterro Elevado",
+                "terms": "Embankment, Elevação do Terreno"
+            },
+            "man_made/flagpole": {
+                "name": "Estandarte",
+                "terms": "Estandarte"
             },
             "man_made/lighthouse": {
-                "name": "Farol"
+                "name": "Farol",
+                "terms": "Faról, Lighthouse"
             },
             "man_made/observation": {
-                "name": "Torre de observação"
+                "name": "Torre de Observação",
+                "terms": "Observatório Tower, Miradouro"
             },
             "man_made/pier": {
-                "name": "Pontão / Atracadouro"
+                "name": "Pontão / Atracadouro",
+                "terms": "Pier, Porto, Doca"
             },
             "man_made/pipeline": {
-                "name": "Pipeline"
+                "name": "Gasoduto / Oleoduto",
+                "terms": "Tubo, Pipeline"
             },
             "man_made/survey_point": {
-                "name": "Vértice Geodésico"
+                "name": "Vértice Geodésico / Talefe",
+                "terms": "Survey Point"
             },
             "man_made/tower": {
-                "name": "Torre"
+                "name": "Torre",
+                "terms": "Torre, Alto, Tower"
             },
             "man_made/wastewater_plant": {
-                "name": "ETAR"
+                "name": "ETAR",
+                "terms": "ETAR, E.T.A.R., Estação de Tratamento de Resíduos, Estação de Tratamento de Águas Residuais"
             },
             "man_made/water_tower": {
-                "name": "Depósito de Água"
+                "name": "Reservatório Elevado",
+                "terms": "Depósito de Água, Torre de Água, Water Tower"
             },
             "man_made/water_well": {
-                "name": "Poço de Água"
+                "name": "Poço de Água",
+                "terms": "Water well"
             },
             "man_made/water_works": {
-                "name": "Estação de Captação e Tratamento de Água"
+                "name": "Estação de Captação e Tratamento de Água",
+                "terms": "Water Works"
+            },
+            "military/airfield": {
+                "name": "Base Aérea",
+                "terms": "Airfield, Aeródromo Militar"
+            },
+            "military/barracks": {
+                "name": "Quartel",
+                "terms": "Barracks"
+            },
+            "military/bunker": {
+                "name": "Bunker",
+                "terms": "Bunker"
+            },
+            "military/range": {
+                "name": "Pista de Tiro",
+                "terms": "Military Range"
             },
             "natural": {
-                "name": "Natural"
+                "name": "Natural",
+                "terms": "Natural"
             },
             "natural/bay": {
-                "name": "Baía"
+                "name": "Baía",
+                "terms": "Baía"
             },
             "natural/beach": {
                 "name": "Praia",
                 "terms": "praia"
             },
             "natural/cliff": {
-                "name": "Falésia / Arriba"
+                "name": "Falésia / Arriba",
+                "terms": "Escarpa"
             },
             "natural/coastline": {
-                "name": "Linha Costeira"
+                "name": "Linha Costeira",
+                "terms": "Costa, Orla"
             },
             "natural/fell": {
-                "name": "Encosta"
+                "name": "Tunturi",
+                "terms": "Fell"
             },
             "natural/glacier": {
-                "name": "Glaciar"
+                "name": "Glaciar",
+                "terms": "Glaciar"
             },
             "natural/grassland": {
-                "name": "Pradaria"
+                "name": "Pradaria",
+                "terms": "Grassland, Verdes, Terra Verde"
             },
             "natural/heath": {
-                "name": "Charneca"
+                "name": "Charneca",
+                "terms": "Heath"
             },
             "natural/peak": {
-                "name": "Cume"
+                "name": "Cume",
+                "terms": "Cume, Montanha, Pináculo"
             },
             "natural/scree": {
-                "name": "Encosta de cascalho"
+                "name": "Encosta de Rochas Soltas",
+                "terms": "Sree, Cascalho, Pedras"
             },
             "natural/scrub": {
-                "name": "Matagal"
+                "name": "Matagal",
+                "terms": "Scrub"
             },
             "natural/spring": {
-                "name": "Nascente"
+                "name": "Nascente",
+                "terms": "Nascente, Nascente de Água"
             },
             "natural/tree": {
-                "name": "Árvore"
+                "name": "Árvore",
+                "terms": "Árvore"
             },
             "natural/water": {
-                "name": "Água"
+                "name": "Água",
+                "terms": "Água"
             },
             "natural/water/lake": {
-                "name": "Lago"
+                "name": "Lago",
+                "terms": "Jardim de Água, Jardim d'Água, Lagoa, Lagoinha, Pateira"
             },
             "natural/water/pond": {
-                "name": "Lagoa"
+                "name": "Lagoa",
+                "terms": "Jardim de Água, Jardim d'Água, Lagoinha, Pateira"
             },
             "natural/water/reservoir": {
-                "name": "Reservatório Artificial"
+                "name": "Reservatório Artificial",
+                "terms": "Reservatório, Reservatório de Água"
             },
             "natural/wetland": {
-                "name": "Zonas Encharcadas"
+                "name": " Zona húmida",
+                "terms": "Pântano"
             },
             "natural/wood": {
-                "name": "Bosque"
+                "name": "Bosque",
+                "terms": "Wood"
             },
             "office": {
-                "name": "Escritório"
+                "name": "Escritório",
+                "terms": "Office"
+            },
+            "office/accountant": {
+                "name": "Contabilista",
+                "terms": "Accountant, Contas"
+            },
+            "office/administrative": {
+                "name": "Escritório Administrativo",
+                "terms": "Administrative Office, Administrativo"
+            },
+            "office/architect": {
+                "name": "Arquiteto",
+                "terms": "Architect, Arquitetura"
+            },
+            "office/company": {
+                "name": "Escritório de Empresa",
+                "terms": "Company Office, Sede"
+            },
+            "office/educational_institution": {
+                "name": "Instituição de Ensino",
+                "terms": "Educacional Institution, Escola"
+            },
+            "office/employment_agency": {
+                "name": "Centro de Emprego",
+                "terms": "Employment Agency, Agência de Emprego"
+            },
+            "office/estate_agent": {
+                "name": "Agência Imobiliária",
+                "terms": "Real Estate Office, Imóveis, Mudanças, Compra de Casas"
+            },
+            "office/financial": {
+                "name": "Finanças",
+                "terms": "Financial Office, Posto de Finanças, Balcão de Finanças"
+            },
+            "office/government": {
+                "name": "Escritório Governamental",
+                "terms": "Government Office, Governo, Estado"
+            },
+            "office/insurance": {
+                "name": "Agência de Seguros",
+                "terms": "Insurance Office, Seguros"
+            },
+            "office/it": {
+                "name": "Escritório de Informática",
+                "terms": "IT Office"
+            },
+            "office/lawyer": {
+                "name": "Escritório de Advogados",
+                "terms": "Law Office, Agencia de Advocacia"
+            },
+            "office/newspaper": {
+                "name": "Jornal",
+                "terms": "Newspaper"
+            },
+            "office/ngo": {
+                "name": "Escritório de ONG",
+                "terms": "NGO Office"
+            },
+            "office/physician": {
+                "name": "Médico",
+                "terms": "Physician, Doutor"
+            },
+            "office/political_party": {
+                "name": "Partido Político",
+                "terms": "Political Party"
+            },
+            "office/research": {
+                "name": "Centro de Investigação",
+                "terms": "Research Office, Escritório de Investigação, Centro de Pesquisa"
+            },
+            "office/telecommunication": {
+                "name": "Escritório de Telecomunicações",
+                "terms": "Telecom Office, Telecomunicações, Internet, Televisão"
+            },
+            "office/therapist": {
+                "name": "Terapeuta",
+                "terms": "Therapist"
+            },
+            "office/travel_agent": {
+                "name": "Agência de Viagens",
+                "terms": "Travel Agency"
+            },
+            "piste": {
+                "name": "Pista de Ski",
+                "terms": "Piste/Ski Trail"
             },
             "place": {
-                "name": "Local"
+                "name": "Local",
+                "terms": "Lugar"
             },
             "place/city": {
-                "name": "Capital de DIstrito (cidade)"
+                "name": "Capital de DIstrito (cidade)",
+                "terms": "Cidade"
             },
             "place/hamlet": {
-                "name": "Aldeia / Lugar"
+                "name": "Aldeia",
+                "terms": "Hamlet, Aldeamento"
             },
             "place/island": {
-                "name": "Ilha"
+                "name": "Ilha",
+                "terms": "Arquipélago, Atol, Ilha, Ilhéu, Recife, Restinga"
             },
             "place/isolated_dwelling": {
-                "name": "Habitação Isolada"
+                "name": "Habitação Isolada",
+                "terms": "Isolated Dwelling"
             },
             "place/locality": {
-                "name": "Localidade"
+                "name": "Localidade",
+                "terms": "Localidade"
+            },
+            "place/neighbourhood": {
+                "name": "Vizinhança",
+                "terms": "Neigborhood, Bairro"
+            },
+            "place/suburb": {
+                "name": "Borough",
+                "terms": "Borough"
             },
             "place/town": {
-                "name": "Sede de Concelho (cidade, vila)"
+                "name": "Cidade",
+                "terms": "Town"
             },
             "place/village": {
-                "name": "Sede de freguesia"
+                "name": "Vila",
+                "terms": "Vila"
             },
             "point": {
-                "name": "Nó"
+                "name": "Nó",
+                "terms": "Ponto"
             },
             "power": {
-                "name": "Energia"
+                "name": "Energia",
+                "terms": "Energia"
             },
             "power/generator": {
-                "name": "Gerador elétrico"
+                "name": "Gerador elétrico",
+                "terms": "Gerador de Energia"
             },
             "power/line": {
-                "name": "Linha de Transmissão"
+                "name": "Linha de Transmissão",
+                "terms": "Linha de Eletricidade"
+            },
+            "power/minor_line": {
+                "name": "Linha de Transmissão Menor",
+                "terms": "Minor Power Line, Linha de Energia Menor"
             },
             "power/pole": {
-                "name": "Poste de Eletricidade"
+                "name": "Poste de Eletricidade",
+                "terms": "Poste de Eletricidade"
             },
             "power/sub_station": {
-                "name": "Sub-estação"
+                "name": "Subestação",
+                "terms": "Substation"
             },
             "power/tower": {
-                "name": "Torre de Alta Tensão"
+                "name": "Torre de Alta Tensão",
+                "terms": "Torre de Alta-Tensão, Poste de Alta-Tensão"
             },
             "power/transformer": {
-                "name": "Transformador de Distribuição"
+                "name": "Transformador de Distribuição",
+                "terms": "Transformador"
+            },
+            "public_transport/platform": {
+                "name": "Plataforma de Transporte Público",
+                "terms": "Platform"
+            },
+            "public_transport/stop_position": {
+                "name": "Paragem de Transporte Público",
+                "terms": "Stop Position"
             },
             "railway": {
-                "name": "Ferrovia"
+                "name": "Ferrovia",
+                "terms": "Carris, Linha de Carris"
             },
             "railway/abandoned": {
-                "name": "Ferrovia Abandonada (carris removidos)"
+                "name": "Ferrovia Abandonada",
+                "terms": "Carris Abandonados, Linha de Carris Abandonados"
             },
             "railway/disused": {
-                "name": "Ferrovia Não Usada"
+                "name": "Ferrovia Não Usada",
+                "terms": "Carris Fora de Serviço"
             },
             "railway/funicular": {
-                "name": "Funicular"
+                "name": "Funicular",
+                "terms": "Funicular, Plano Inclinado"
             },
             "railway/halt": {
-                "name": "Apeadeiro"
+                "name": "Apeadeiro",
+                "terms": "Railway Halt"
             },
             "railway/level_crossing": {
-                "name": "Passagem de Nível Ferroviária"
+                "name": "Passagem de Nível",
+                "terms": "Passagem em Nível, Passagem de Comboios"
             },
             "railway/monorail": {
-                "name": "Monocarril"
+                "name": "Monocarril",
+                "terms": "Monorail"
+            },
+            "railway/narrow_gauge": {
+                "name": "Via Estreita",
+                "terms": "Narrow Gauge Rail, Bitola Estreita, Via Métrica, Bitola Métrica"
             },
             "railway/platform": {
-                "name": "Plataforma Ferroviária"
+                "name": "Plataforma Ferroviária",
+                "terms": "Railway Platform"
             },
             "railway/rail": {
-                "name": "Carris"
+                "name": "Carris",
+                "terms": "Rail, Linha Férrea"
             },
             "railway/station": {
-                "name": "Estação Ferroviária"
+                "name": "Estação Ferroviária",
+                "terms": "Railway Station, Estação de Comboios"
             },
             "railway/subway": {
-                "name": "Metro"
+                "name": "Metro",
+                "terms": "Metro"
             },
             "railway/subway_entrance": {
-                "name": "Entrada de Metro"
+                "name": "Entrada de Metro",
+                "terms": "Entrada do Metro, Metro, Metropolitano, Subterrâneo "
             },
             "railway/tram": {
-                "name": "Elétrico"
+                "name": "Elétrico",
+                "terms": "Elétrico"
             },
             "relation": {
-                "name": "Relação"
+                "name": "Relação",
+                "terms": "Relação"
             },
             "route/ferry": {
-                "name": "Rota de Ferry"
+                "name": "Rota de Barca / Ferry",
+                "terms": "Rota do Ferry"
             },
             "shop": {
-                "name": "Loja"
+                "name": "Loja",
+                "terms": "Loja"
             },
             "shop/alcohol": {
-                "name": "Loja de Bebidas Alcoólicas"
+                "name": "Loja de Bebidas Alcoólicas",
+                "terms": "Alcool"
+            },
+            "shop/art": {
+                "name": "Loja de Arte",
+                "terms": "Art Shop, Venda de Arte, Exposição"
             },
             "shop/bakery": {
-                "name": "Padaria"
+                "name": "Padaria",
+                "terms": "Padaria"
             },
             "shop/beauty": {
-                "name": "Loja de Beleza"
+                "name": "Loja de Beleza",
+                "terms": "Loja de Beleza"
             },
             "shop/beverages": {
-                "name": "Loja de Bebidas"
+                "name": "Loja de Bebidas",
+                "terms": "Beverage Store"
             },
             "shop/bicycle": {
-                "name": "Loja de Bicicletas"
+                "name": "Loja de Bicicletas",
+                "terms": "Loja de Bicicletas"
+            },
+            "shop/bookmaker": {
+                "name": "Casa de Apostas",
+                "terms": "Bookmaker, Bolsa de apostas"
             },
             "shop/books": {
-                "name": "Livraria"
+                "name": "Livraria",
+                "terms": "Livraria"
             },
             "shop/boutique": {
-                "name": "Boutique"
+                "name": "Boutique",
+                "terms": "Boutique"
             },
             "shop/butcher": {
-                "name": "Talho"
+                "name": "Talho",
+                "terms": "Talho"
             },
             "shop/car": {
-                "name": "Loja de Automóveis"
+                "name": "Loja de Automóveis",
+                "terms": "Concessonária de Automomóveis"
             },
             "shop/car_parts": {
-                "name": "Loja de Acessórios para Automóvel"
+                "name": "Loja de Acessórios para Automóvel",
+                "terms": "Loja de Peças Automóveis"
             },
             "shop/car_repair": {
-                "name": "Oficina de Automóveis"
+                "name": "Oficina de Automóveis",
+                "terms": "Ofinina de Automóveis"
             },
             "shop/chemist": {
-                "name": "Drogaria"
+                "name": "Drogaria",
+                "terms": "Chemist"
             },
             "shop/clothes": {
-                "name": "Loja de Roupas"
+                "name": "Loja de Roupas",
+                "terms": "Loja de Roupa"
             },
             "shop/computer": {
-                "name": "Loja de Informática"
+                "name": "Loja de Informática",
+                "terms": "Loja de Informática"
             },
             "shop/confectionery": {
-                "name": "Confeitaria"
+                "name": "Confeitaria",
+                "terms": "Confectionery"
             },
             "shop/convenience": {
-                "name": "Loja de Conveniência"
+                "name": "Loja de Conveniência",
+                "terms": "Loja de Conviniência"
             },
             "shop/deli": {
-                "name": "Loja de Gourmet"
+                "name": "Loja de Gourmet / Delicacias",
+                "terms": "Deli"
             },
             "shop/department_store": {
-                "name": "Grande Armazém"
+                "name": "Grande Armazém",
+                "terms": "Department Store"
             },
             "shop/doityourself": {
-                "name": "Loja de Bricolagem"
+                "name": "Loja de Bricolagem",
+                "terms": "DIY Store, Obras, Bricolage"
             },
             "shop/dry_cleaning": {
-                "name": "Limpeza a Seco"
+                "name": "Limpeza a Seco",
+                "terms": "Dry Cleaners"
             },
             "shop/electronics": {
-                "name": "Loja de Eletrónica de Consumo"
+                "name": "Loja de Eletrónica de Consumo",
+                "terms": "Loja de Eletrodomésticos"
             },
             "shop/farm": {
-                "name": "Barraca de produtos do campo"
+                "name": "Barraca de Produtos do Campo",
+                "terms": "Barraca de Fruta, Barraca de Legumes, Barraca de Hortaliças, Barraca de Batatas"
             },
             "shop/fishmonger": {
-                "name": "Peixaria"
+                "name": "Peixaria",
+                "terms": "Fishmonger, Pesqueiro"
             },
             "shop/florist": {
-                "name": "Florista"
+                "name": "Florista",
+                "terms": "Florista"
+            },
+            "shop/funeral_directors": {
+                "name": "Agência Funerária",
+                "terms": "Funeral Home, Casa Funerária, Agência Mortuária, Casa Mortuária"
             },
             "shop/furniture": {
-                "name": "Loja de Mobiliário"
+                "name": "Loja de Mobiliário",
+                "terms": "Loja de Móveis"
             },
             "shop/garden_centre": {
-                "name": "Loja de Jardinagem"
+                "name": "Loja de Jardinagem",
+                "terms": "Garden Center, Flores"
             },
             "shop/gift": {
-                "name": "Loja de Lembranças"
+                "name": "Loja de Lembranças",
+                "terms": "Loja de Recordações"
             },
             "shop/greengrocer": {
-                "name": "Loja de Frutas e Verduras"
+                "name": "Loja de Frutas e Verduras",
+                "terms": "Greengrocer"
             },
             "shop/hairdresser": {
-                "name": "Cabeleireiro"
+                "name": "Cabeleireiro",
+                "terms": "Cabeleireiro"
             },
             "shop/hardware": {
-                "name": "Loja de Ferragens"
+                "name": "Loja de Ferragens",
+                "terms": "Hardware Store"
             },
             "shop/hifi": {
-                "name": "Loja de Alta Fidelidade"
+                "name": "Loja de Alta Fidelidade",
+                "terms": "Hifi Store, Som"
             },
             "shop/jewelry": {
-                "name": "Joalharia"
+                "name": "Joalharia",
+                "terms": "Jeweler"
             },
             "shop/kiosk": {
-                "name": "Quiosque"
+                "name": "Quiosque",
+                "terms": "Quiosque"
             },
             "shop/laundry": {
-                "name": "Lavandaria"
+                "name": "Lavandaria",
+                "terms": "Laundry, Roupa, Secagem"
             },
             "shop/locksmith": {
-                "name": "Serralheiro"
+                "name": "Serralheiro",
+                "terms": "Locksmith, Fechaduras"
+            },
+            "shop/lottery": {
+                "name": "Lotaria",
+                "terms": "Lottery Shop, Jogos Santa Casa, Euromilhões, Totoloto, Totobola, Joker, Raspadinha, Pé-de-Meia, Loja da Sorte"
             },
             "shop/mall": {
-                "name": "Centro Comercial"
+                "name": "Centro Comercial",
+                "terms": "Mall, Shopping"
             },
             "shop/mobile_phone": {
-                "name": "Loja de Telemóveis"
+                "name": "Loja de Telemóveis",
+                "terms": "Loja de Telemóveis"
             },
             "shop/motorcycle": {
-                "name": "Loja de Motas"
+                "name": "Loja de Motas",
+                "terms": "Loja de Motos"
             },
             "shop/music": {
-                "name": "Loja de Música"
+                "name": "Loja de Música",
+                "terms": "Loja de Música"
             },
             "shop/newsagent": {
-                "name": "Loja de Jornais e Revistas"
+                "name": "Loja de Jornais e Revistas",
+                "terms": "Newsagent"
             },
             "shop/optician": {
-                "name": "Ótica"
+                "name": "Loja de Ótica / Oculos",
+                "terms": "Optician"
             },
             "shop/outdoor": {
-                "name": "Loja de Artigos p/Atividades ao Ar Livre"
+                "name": "Loja de Artigos p/Atividades ao Ar Livre",
+                "terms": "Outdoor Store"
             },
             "shop/pet": {
-                "name": "Loja de Animais"
+                "name": "Loja de Animais",
+                "terms": "Loja de Animais"
+            },
+            "shop/photo": {
+                "name": "Loja de Fotografia",
+                "terms": "Photography Store, Fotográfo"
+            },
+            "shop/seafood": {
+                "name": "Loja de Frutos do Mar",
+                "terms": "Seafood Shop, Camarão, Lagosta, Caranguejo, Ameijoas, Mexilhões"
             },
             "shop/shoes": {
-                "name": "Sapataria"
+                "name": "Sapataria",
+                "terms": "Loja de Sapatos, Sapataria"
             },
             "shop/sports": {
-                "name": "Loja de Artigos de Desporto"
+                "name": "Loja de Artigos de Desporto",
+                "terms": "Loja de Desporto"
             },
             "shop/stationery": {
-                "name": "Papelaria"
+                "name": "Papelaria",
+                "terms": "Stationery Store"
             },
             "shop/supermarket": {
-                "name": "Supermercado"
+                "name": "Supermercado",
+                "terms": "Bazar, Centro Comercial, Compras, Feira, Hipermercado, Minimercado, Stand, Outlet"
             },
             "shop/toys": {
-                "name": "Loja de Brinquedos"
+                "name": "Loja de Brinquedos",
+                "terms": "Loja de Brinquedos"
             },
             "shop/travel_agency": {
-                "name": "Agência de Viagens"
+                "name": "Agência de Viagens",
+                "terms": "Agência de Viagens"
             },
             "shop/tyres": {
-                "name": "Loja de Pneus"
+                "name": "Loja de Pneus",
+                "terms": "Loja de Pneus, Casa dos Pneus"
             },
             "shop/vacant": {
-                "name": "Loja Vazia"
+                "name": "Loja Vazia",
+                "terms": "Vacant Shop"
             },
             "shop/variety_store": {
-                "name": "Loja de Descontos (1,99€...)"
+                "name": "Loja dos Chineses",
+                "terms": "Variety Store, Loja dos 300, Loja dos Trezentos javascript:;"
             },
             "shop/video": {
-                "name": "Videoclube"
+                "name": "Videoclube",
+                "terms": "Video Store"
+            },
+            "shop/wine": {
+                "name": "Loja de Vinhos",
+                "terms": "Wine Shop, Loja de Licor, Bebidas Alcoolicas"
             },
             "tourism": {
-                "name": "Turismo"
+                "name": "Turismo",
+                "terms": "Turismo"
             },
             "tourism/alpine_hut": {
-                "name": "Albergue de Montanha"
+                "name": "Albergue de Montanha",
+                "terms": "Alpine Hut"
             },
             "tourism/artwork": {
-                "name": "Obra de Arte"
+                "name": "Obra de Arte",
+                "terms": "Arte, Mural"
             },
             "tourism/attraction": {
-                "name": "Atração Turística"
+                "name": "Atração Turística",
+                "terms": "Atração Turística"
             },
             "tourism/camp_site": {
-                "name": "Parque de Campismo"
+                "name": "Parque de Campismo",
+                "terms": "Acampamento"
             },
             "tourism/caravan_site": {
-                "name": "Parque de Caravanas"
+                "name": "Parque de Caravanas",
+                "terms": "RV Park"
             },
             "tourism/chalet": {
-                "name": "Chalé"
+                "name": "Chalé / Casa de Férias",
+                "terms": "Chalet"
             },
             "tourism/guest_house": {
-                "name": "Casa de Hóspedes"
+                "name": "Casa de Hóspedes",
+                "terms": "Cama e Pequeno Almoço, Cama e Peq. Almoço, Cama e Almoço"
             },
             "tourism/hostel": {
-                "name": "Pousada / Hostel"
+                "name": "Pousada / Hostel",
+                "terms": "Hostel"
             },
             "tourism/hotel": {
-                "name": "Hotel"
+                "name": "Hotel",
+                "terms": "Hotel"
             },
             "tourism/information": {
-                "name": "Outros Pontos de Informação Turística"
+                "name": "Outros Pontos de Informação Turística",
+                "terms": "Informação"
             },
             "tourism/motel": {
-                "name": "Motel"
+                "name": "Motel",
+                "terms": "Motel"
             },
             "tourism/museum": {
-                "name": "Museu"
+                "name": "Museu",
+                "terms": "Exposição, Fundação, Galeria, Galeria de Arte, Instituição, Livraria, Salão"
             },
             "tourism/picnic_site": {
-                "name": "Parque de Merendas / Piqueniques"
+                "name": "Parque de Merendas / Piqueniques",
+                "terms": "Lugar de Merendas"
             },
             "tourism/theme_park": {
-                "name": "Parque de Diversões"
+                "name": "Parque de Diversões",
+                "terms": "Theme Park"
             },
             "tourism/viewpoint": {
-                "name": "Miradouro"
+                "name": "Miradouro",
+                "terms": "Viewpoint"
             },
             "tourism/zoo": {
-                "name": "Jardim Zoológico"
+                "name": "Jardim Zoológico",
+                "terms": "Zoológico, Zoo"
             },
             "type/boundary": {
-                "name": "Fronteira"
+                "name": "Fronteira",
+                "terms": "Fronteira"
             },
             "type/boundary/administrative": {
-                "name": "Fronteira Administrativa (Concelho, Freguesia...)"
+                "name": "Fronteira Administrativa",
+                "terms": "Fronteira Admistrativa"
             },
             "type/multipolygon": {
-                "name": "Multi-polígono"
+                "name": "Multipolígono",
+                "terms": "Multipolígono"
             },
             "type/restriction": {
-                "name": "Restrição"
+                "name": "Restrição",
+                "terms": "Restrição, Proibição"
+            },
+            "type/restriction/no_left_turn": {
+                "name": "Proibição de Virar à Esquerda",
+                "terms": "No Left Turn, Não Virar à Esquerda"
+            },
+            "type/restriction/no_right_turn": {
+                "name": "Proibição de Virar à Direita",
+                "terms": "No Right Turn, Não Virar à Direita"
+            },
+            "type/restriction/no_straight_on": {
+                "name": "Sentido Proibido",
+                "terms": "No Straight On, Proibido Seguir em Frente, Proibição de Seguir em Frente"
+            },
+            "type/restriction/no_u_turn": {
+                "name": "Proibição de Inversão do Sentido de Marcha",
+                "terms": "No U-turn, Não Inverter o Sentido"
+            },
+            "type/restriction/only_left_turn": {
+                "name": "Sentido Obrigatório para a Esquerda",
+                "terms": "Left Turn Only, Proibido Virar para a Direita"
+            },
+            "type/restriction/only_right_turn": {
+                "name": "Sentido Obrigatório para a Direita",
+                "terms": "Right Turn Only, Proibido Virar para a Esquerda"
+            },
+            "type/restriction/only_straight_on": {
+                "name": "Sentido Obrigatório para a Frente",
+                "terms": "No Turns, Proibido Virar"
             },
             "type/route": {
-                "name": "Rota"
+                "name": "Rota",
+                "terms": "Rota, Linha"
             },
             "type/route/bicycle": {
-                "name": "Rota de Bicicleta"
+                "name": "Rota de Bicicleta",
+                "terms": "Rota de Bicicletas"
             },
             "type/route/bus": {
-                "name": "Rota de Autocarro"
+                "name": "Rota de Autocarro",
+                "terms": "Rota de Autocarros, Linha de Autocarro"
             },
             "type/route/detour": {
-                "name": "Rota de Desvio"
+                "name": "Rota de Desvio",
+                "terms": "Detour Route"
             },
             "type/route/ferry": {
-                "name": "Rota de Ferry"
+                "name": "Rota de Barca / Ferry",
+                "terms": "Rota do Ferry"
             },
             "type/route/foot": {
-                "name": "Rota Pedestre"
+                "name": "Rota Pedestre",
+                "terms": "Foot Route"
             },
             "type/route/hiking": {
-                "name": "Rota de caminhada"
+                "name": "Rota de Caminhada",
+                "terms": "Hiking Route, Rota de Escalagem"
             },
             "type/route/pipeline": {
-                "name": "Rota de Pipeline"
+                "name": "Rota de Gasoduto / Oleoduto",
+                "terms": "Pipeline Route"
             },
             "type/route/power": {
-                "name": "Rota de Transmissão de Energia"
+                "name": "Rota de Transmissão de Energia",
+                "terms": "Linha de Eletricidade, Linha de Energia"
             },
             "type/route/road": {
-                "name": "Rota Rodoviária"
+                "name": "Rota Rodoviária",
+                "terms": "Percurso Rodoviário, Trajecto Rodoviário"
             },
             "type/route/train": {
-                "name": "Rota Ferroviária"
+                "name": "Rota Ferroviária",
+                "terms": "Train Route, Rota de Comboio, Rota de Metro, Rota de Elétrico, Rota de Caminhos de Ferro"
             },
             "type/route/tram": {
-                "name": "Rota de Elétrico"
+                "name": "Rota de Elétrico",
+                "terms": "Tram Route"
             },
             "type/route_master": {
-                "name": "Rede de Rotas"
+                "name": "Rede de Rotas",
+                "terms": "Route Master, Rota Mestre"
             },
             "vertex": {
-                "name": "Outro"
+                "name": "Outro",
+                "terms": "Outro"
             },
             "waterway": {
-                "name": "Curso de Água"
+                "name": "Curso de Água",
+                "terms": "Waterway"
             },
             "waterway/canal": {
-                "name": "Canal"
+                "name": "Canal",
+                "terms": "Canal"
             },
             "waterway/dam": {
-                "name": "Barragem"
+                "name": "Barragem",
+                "terms": "Barragem"
             },
             "waterway/ditch": {
-                "name": "Fosso / Vala / Trincheira"
+                "name": "Fosso",
+                "terms": "Vala, Trincheira, Represa"
             },
             "waterway/drain": {
-                "name": "Vala de Drenagem"
+                "name": "Vala de Drenagem",
+                "terms": "Drain"
             },
             "waterway/river": {
-                "name": "Rio"
+                "name": "Rio",
+                "terms": "Afluente, Barra, Barroca, Canal, Corga, Curso de Água, Delta, Estuário, Grota, Ria"
             },
             "waterway/riverbank": {
-                "name": "Margem de Rio"
+                "name": "Margem de Rio",
+                "terms": "Riverbank"
             },
             "waterway/stream": {
-                "name": "Ribeiro"
+                "name": "Ribeiro",
+                "terms": "Afluente, Barra, Barroca, Canal, Corga, Curso de Água, Delta, Estuário, Fio de Água, Grota, Regato, Rego, Riacho, Ribeira, Ribeiro, Ria, Vala, Valeiro"
             },
             "waterway/weir": {
-                "name": "Represa"
+                "name": "Represa",
+                "terms": "Weir"
             }
         }
     }
diff --git a/vendor/assets/iD/iD/locales/ro-RO.json b/vendor/assets/iD/iD/locales/ro-RO.json
index 9cf58b6e4..3fb526504 100644
--- a/vendor/assets/iD/iD/locales/ro-RO.json
+++ b/vendor/assets/iD/iD/locales/ro-RO.json
@@ -478,9 +478,6 @@
             "building": {
                 "name": "Clădire"
             },
-            "entrance": {
-                "name": "Intrare"
-            },
             "highway": {
                 "name": "Autostradă"
             },
diff --git a/vendor/assets/iD/iD/locales/ru.json b/vendor/assets/iD/iD/locales/ru.json
index 8ce5f7a92..f09a443e1 100644
--- a/vendor/assets/iD/iD/locales/ru.json
+++ b/vendor/assets/iD/iD/locales/ru.json
@@ -71,7 +71,8 @@
                 "line": "Линия превращена в окружность.",
                 "area": "Превратить контур в окружность."
             },
-            "not_closed": "Объект нельзя превратить в окружность: он незамкнут."
+            "not_closed": "Объект нельзя превратить в окружность: он незамкнут.",
+            "too_large": "Объект не может быть превращён в окружность, поскольку большая его часть скрыта."
         },
         "orthogonalize": {
             "title": "Выпрямить углы",
@@ -84,7 +85,8 @@
                 "line": "Выпрямлены углы в линии.",
                 "area": "Выпрямлены углы контура."
             },
-            "not_squarish": "Нельзя выпрямить углы — это не похоже на прямоугольник."
+            "not_squarish": "Нельзя выпрямить углы — это не похоже на прямоугольник.",
+            "too_large": "Углы объекта не могут быть выровнены, поскольку большая его часть скрыта."
         },
         "straighten": {
             "title": "Выпрямить",
@@ -180,6 +182,18 @@
             },
             "not_eligible": "Линии нельзя резать на концах.",
             "multiple_ways": "Слишком много линий для разрезания."
+        },
+        "restriction": {
+            "help": {
+                "select": "Кликните, чтобы выбрать сегмент дороги.",
+                "toggle": "Кликните, чтобы добавить/удалить запрет поворота.",
+                "toggle_on": "Кликните, чтобы добавить запрет «{restriction}».",
+                "toggle_off": "Кликните, чтобы удалить запрет «{restriction}»."
+            },
+            "annotation": {
+                "create": "Добавлен запрет поворота",
+                "delete": "Удалён запрет поворота"
+            }
         }
     },
     "undo": {
@@ -265,7 +279,8 @@
         "percent_brightness": "яркость {opacity}%",
         "none": "Нет",
         "custom": "Настраиваемый",
-        "custom_prompt": "Введите шаблон для тайлов. Допустимые переменные {z}, {x}, {y} для Z/X/Y и {u} для quadtile.",
+        "custom_button": "Редактировать личную подложку",
+        "custom_prompt": "Введите шаблон URL для тайлов. Допустимы переменные {z}, {x}, {y} для схемы Z/X/Y и {u} для схемы quadtile.",
         "fix_misalignment": "Поправить смещение",
         "reset": "сброс"
     },
@@ -409,6 +424,9 @@
             "category-rail": {
                 "name": "Рельсовый путь"
             },
+            "category-restriction": {
+                "name": "Запреты"
+            },
             "category-road": {
                 "name": "Дорога"
             },
@@ -582,6 +600,9 @@
             "entrance": {
                 "label": "Тип"
             },
+            "except": {
+                "label": "Исключения"
+            },
             "fax": {
                 "label": "Факс",
                 "placeholder": "+31 42 123 4567"
@@ -660,6 +681,9 @@
             "leisure": {
                 "label": "Тип"
             },
+            "length": {
+                "label": "Длина (метры)"
+            },
             "levels": {
                 "label": "Этажи",
                 "placeholder": "2, 4, 6..."
@@ -694,10 +718,16 @@
                 "label": "Тип"
             },
             "oneway": {
-                "label": "Одностороннее движение"
+                "label": "Одностороннее движение",
+                "options": {
+                    "undefined": "Предполагается «нет»"
+                }
             },
             "oneway_yes": {
-                "label": "Одностороннее движение"
+                "label": "Одностороннее движение",
+                "options": {
+                    "undefined": "Предполагается «да»"
+                }
             },
             "opening_hours": {
                 "label": "Часы работы"
@@ -730,6 +760,9 @@
             "place": {
                 "label": "Тип"
             },
+            "population": {
+                "label": "Население"
+            },
             "power": {
                 "label": "Тип"
             },
@@ -769,6 +802,9 @@
             "restriction": {
                 "label": "Тип"
             },
+            "restrictions": {
+                "label": "Запреты поворота"
+            },
             "route": {
                 "label": "Тип"
             },
@@ -864,6 +900,9 @@
             "wheelchair": {
                 "label": "Доступность для инвалидных колясок"
             },
+            "width": {
+                "label": "Ширина (метры)"
+            },
             "wikipedia": {
                 "label": "Википедия"
             },
@@ -1023,6 +1062,9 @@
                 "name": "Колледж",
                 "terms": "ПТУ, колледж, техникум"
             },
+            "amenity/compressed_air": {
+                "name": "Сжатый воздух"
+            },
             "amenity/courthouse": {
                 "name": "Суд",
                 "terms": "Суд"
@@ -1125,6 +1167,9 @@
                 "name": "Паб",
                 "terms": "Паб"
             },
+            "amenity/ranger_station": {
+                "name": "Лесничество"
+            },
             "amenity/recycling": {
                 "name": "Переработка мусора",
                 "terms": "Переработка мусора, Мусоропереработка, Утилизация мусора, Переработка отходов, Утилизация отходов"
@@ -1305,8 +1350,8 @@
                 "name": "Общежитие"
             },
             "building/entrance": {
-                "name": "Вход",
-                "terms": "вход, дверь, главный вход"
+                "name": "Вход/выход",
+                "terms": "вход, выход"
             },
             "building/garage": {
                 "name": "Гараж",
@@ -1368,7 +1413,8 @@
                 "name": "Здание университета, института "
             },
             "building/warehouse": {
-                "name": "Склад"
+                "name": "Склад",
+                "terms": " склад, складское помещение, товарный склад, пакгауз, хранилище"
             },
             "craft/basket_maker": {
                 "name": "Корзина",
@@ -1379,7 +1425,8 @@
                 "terms": "пчеловод, пасечник"
             },
             "craft/blacksmith": {
-                "name": "Кузнец"
+                "name": "Кузнец",
+                "terms": "ковка, кузнец, кузница, кузня"
             },
             "craft/boatbuilder": {
                 "name": "Строительство лодок"
@@ -1416,6 +1463,10 @@
                 "name": "Садовник",
                 "terms": "садовник"
             },
+            "craft/glaziery": {
+                "name": "Стекольная мастерская ",
+                "terms": "остекление, стекла, стёкла, стекольная мастерская, стекольщик"
+            },
             "craft/handicraft": {
                 "name": "Рукодельник"
             },
@@ -1448,8 +1499,8 @@
                 "name": "фотограф",
                 "terms": "фотограф, фото оператор"
             },
-            "craft/photographic_labratory": {
-                "name": "Фото лаборатория"
+            "craft/photographic_laboratory": {
+                "name": "Фотолаборатория"
             },
             "craft/plasterer": {
                 "name": "Скульптор"
@@ -1529,13 +1580,16 @@
                 "terms": "аварийный телефон, телефон спасения, 112, 911, 01, 02, 03, 04"
             },
             "entrance": {
-                "name": "Вход",
-                "terms": "вход, дверь, главный вход"
+                "name": "Вход/выход",
+                "terms": "вход, выход"
             },
             "footway/crossing": {
                 "name": "Пешеходный переход",
                 "terms": "Пешеходный переход"
             },
+            "footway/crosswalk": {
+                "name": "Пешеходный переход"
+            },
             "footway/sidewalk": {
                 "name": "Тротуар",
                 "terms": "Тротуар, Тротуарчик, Пешеходная обочина"
@@ -1588,6 +1642,9 @@
                 "name": "Пешеходный переход",
                 "terms": "перекресток, переезд, пересечение, железнодорожный переезд, переправа, скрещение"
             },
+            "highway/crosswalk": {
+                "name": "Пешеходный переход"
+            },
             "highway/cycleway": {
                 "name": "Велодорожка",
                 "terms": "велодорожка, велосипедная дорожка"
@@ -1608,9 +1665,6 @@
                 "name": "Автомагистраль",
                 "terms": "Автомагистраль, Скоростная автострада, Скоростное шоссе, Автобан, Скоростная автодорога, Хайвэй, Скоростна автотрасса"
             },
-            "highway/motorway_junction": {
-                "name": "Автомагистраль"
-            },
             "highway/motorway_link": {
                 "name": "Съезд с автомагистрали",
                 "terms": "Съезд с автомагистрали, Съезд со скоростной автострады, Съезд со скоростного шоссе, Съезд с автобана, Съезд со скоростной автодороги, Съезд с хайвэя, Съезд со скоростной автотрассы"
@@ -1881,10 +1935,6 @@
                 "name": "Стапель",
                 "terms": "Стапель"
             },
-            "leisure/sports_center": {
-                "name": "Спортивный Комплекс",
-                "terms": "Спортивный центр"
-            },
             "leisure/stadium": {
                 "name": "Стадион",
                 "terms": "Стадион, спортивная арена"
@@ -2092,6 +2142,10 @@
                 "name": "Страховая компания",
                 "terms": "Страховой агент, Страхование, Автострахование, Полис, ОМС, КАСКО, ОСАГО, Страховка,"
             },
+            "office/it": {
+                "name": "IT-офис",
+                "terms": "IT-офис, ИТ-офис, офис IT, офис IT-специалиста, офис ИТ, офис ИТ-специалиста"
+            },
             "office/lawyer": {
                 "name": "Юридические услуги",
                 "terms": "Адвокат, Нотариус, Адвокатская контора, Нотариальная контора, Юридическая консультация"
@@ -2488,6 +2542,9 @@
                 "name": "Видеомагазин",
                 "terms": "Видео салон, Продажа фильмов и видеозаписей"
             },
+            "shop/wine": {
+                "name": "Винный магазин"
+            },
             "tourism": {
                 "name": "Туризм",
                 "terms": "Туризм, Отдых, Путешествия"
@@ -2568,6 +2625,20 @@
                 "name": "Ограничение",
                 "terms": "Ограничение, Ограничение направлений движения, Ограничение манёвра"
             },
+            "type/restriction/no_left_turn": {
+                "name": "Поворот налево запрещён",
+                "terms": "запрет поворота налево, запрет правого поворота, запрещен поворот налево, запрещён поворот налево, запрещен левый поворот, запрещён левый поворот, поворот налево запрещен, поворот налево запрещён, левый поворот запрещен, запрещён левый поворот"
+            },
+            "type/restriction/no_right_turn": {
+                "name": "Поворот направо запрещён",
+                "terms": "запрет поворота направо, запрет правого поворота, запрещен поворот направо, запрещён поворот направо, запрещен правый поворот, запрещён правый поворот, поворот направо запрещен, поворот направо запрещён, правый поворот запрещен, запрещён правый поворот"
+            },
+            "type/restriction/no_straight_on": {
+                "name": "Движение направо или налево"
+            },
+            "type/restriction/no_u_turn": {
+                "name": "Разворот запрещён"
+            },
             "type/route": {
                 "name": "Маршрут",
                 "terms": "Маршрут"
diff --git a/vendor/assets/iD/iD/locales/sc.json b/vendor/assets/iD/iD/locales/sc.json
index 9e26dfeeb..8dc3813c7 100644
--- a/vendor/assets/iD/iD/locales/sc.json
+++ b/vendor/assets/iD/iD/locales/sc.json
@@ -1 +1,18 @@
-{}
\ No newline at end of file
+{
+    "modes": {
+        "browse": {
+            "title": "Circa"
+        }
+    },
+    "operations": {
+        "delete": {
+            "title": "Boga"
+        },
+        "move": {
+            "title": "Movi"
+        },
+        "split": {
+            "title": "Sperra"
+        }
+    }
+}
\ No newline at end of file
diff --git a/vendor/assets/iD/iD/locales/sk.json b/vendor/assets/iD/iD/locales/sk.json
index eebba5828..56943fad1 100644
--- a/vendor/assets/iD/iD/locales/sk.json
+++ b/vendor/assets/iD/iD/locales/sk.json
@@ -71,7 +71,8 @@
                 "line": "Usporiadanie čiary do kruhu.",
                 "area": "Usporiadanie plochy do kruhu."
             },
-            "not_closed": "Tento objekt nemožno usporiadať do kruhu, pretože nie je uzavretý do slučky."
+            "not_closed": "Tento objekt nemožno usporiadať do kruhu, pretože nie je uzavretý do slučky.",
+            "too_large": "Tento objekt nemožno usporiadať do kruhu, pretože niektoré jeho časti nie sú viditeľné."
         },
         "orthogonalize": {
             "title": "Usporiadaj do pravého uhla.",
@@ -84,7 +85,8 @@
                 "line": "Usporiadanie rohov čiary do pravého uhla.",
                 "area": "Usporiadanie rohov plochy do pravého uhla."
             },
-            "not_squarish": "Tento objekt nemožno usporiadať do pravého uhla, pretože nie je štvorcový."
+            "not_squarish": "Tento objekt nemožno usporiadať do pravého uhla, pretože nie je štvorcový.",
+            "too_large": "Tento objekt nemožno usporiadať do pravého uhla, pretože niektoré jeho časti nie sú viditeľné."
         },
         "straighten": {
             "title": "Vyrovnaj",
@@ -265,7 +267,8 @@
         "percent_brightness": "{opacity}% jas",
         "none": "Žiadne",
         "custom": "Voliteľné",
-        "custom_prompt": "Zadajte vzor pre mapový podklad. Platné znaky sú {z}, {x}, {y} pre Z/X/Y schému a {u} pre quadtile schému.",
+        "custom_button": "Upraviť volitelné pozadie",
+        "custom_prompt": "Zadajte URL pre vzor mapového podkladu. Platné znaky sú {z}, {x}, {y} pre Z/X/Y schému a {u} pre quadtile schému.",
         "fix_misalignment": "Oprav zarovnanie",
         "reset": "vynulovať"
     },
@@ -804,6 +807,9 @@
             "shop": {
                 "label": "Typ"
             },
+            "sloped_curb": {
+                "label": "Znížený obrubník"
+            },
             "smoking": {
                 "label": "Fajčenie"
             },
@@ -839,6 +845,9 @@
             "surface": {
                 "label": "Povrch"
             },
+            "tactile_paving": {
+                "label": "Taktilné značenie"
+            },
             "toilets/disposal": {
                 "label": "Odstraňovanie"
             },
@@ -1354,10 +1363,6 @@
                 "name": "Internát",
                 "terms": "internat,intrak,intrák"
             },
-            "building/entrance": {
-                "name": "Vstup",
-                "terms": "vchod,východ,vychod,únikový východ,unikovy vychod,brána,brana,dvere,vráta,vrata"
-            },
             "building/garage": {
                 "name": "Garáž",
                 "terms": "garaz,garáže,garaze,parkovanie,kryté parkovanie,kryte parkovanie"
@@ -1538,7 +1543,7 @@
                 "name": "Fotograf",
                 "terms": "fotografia,fotografovanie,fotka,fotky"
             },
-            "craft/photographic_labratory": {
+            "craft/photographic_laboratory": {
                 "name": "Fotografické laboratórium",
                 "terms": "fotograficke laboratorium,fotolab"
             },
@@ -1634,10 +1639,6 @@
                 "name": "Núdzový telefón",
                 "terms": "nudzovy telefon,SOS,tiesňová linka,tiesnova linka,núdzový telefón.nudzovy telefon"
             },
-            "entrance": {
-                "name": "Vstup",
-                "terms": "vchod,východ,vychod,únikový východ,unikovy vychod,brána,brana,dvere,vráta,vrata"
-            },
             "footway/crossing": {
                 "name": "Prechod",
                 "terms": "Prechod pre chodcov,zebra"
@@ -1714,10 +1715,6 @@
                 "name": "Diaľnica",
                 "terms": "dialnica,rýchlocesta,rychlocesta"
             },
-            "highway/motorway_junction": {
-                "name": "Diaľničná križovatka",
-                "terms": "Dialnicna krizovatka,krizovatka,dialnica,kríženie,krizenie"
-            },
             "highway/motorway_link": {
                 "name": "Diaľničný privádzač",
                 "terms": "Dialnicny privadzac,privadzac,privádzač,zjazd,vyjazd,výjazd,nájazd,najazd,pripojovací pruh,pripojovaci pruh"
@@ -1878,6 +1875,10 @@
                 "name": "Cintorín",
                 "terms": "cintorin,hroby,pohrebisko,hrobky,cmiter"
             },
+            "landuse/churchyard": {
+                "name": "Kostolný pozemok",
+                "terms": "kostolny pozemok,kostol"
+            },
             "landuse/commercial": {
                 "name": "Obchodné",
                 "terms": "obchodne,komercia,komercne,komerčné"
@@ -1918,6 +1919,10 @@
                 "name": "Lúka",
                 "terms": "luka,pastviny,trava,tráva,paša,pasa"
             },
+            "landuse/military": {
+                "name": "Armádne",
+                "terms": "armadne, armada"
+            },
             "landuse/orchard": {
                 "name": "Sad",
                 "terms": "sad,stromy,ovocie,ovocné stromy,ovocne stromy,ovocný sad,ovocny sad"
@@ -2018,10 +2023,6 @@
                 "name": "Spúšťanie lodí",
                 "terms": "Spustanie lodi,dok,lodenica,klzacka,kĺzačka"
             },
-            "leisure/sports_center": {
-                "name": "Športové centrum",
-                "terms": "sportove centrum,fitness centrum,fitnes centrum,fitko"
-            },
             "leisure/stadium": {
                 "name": "Štadión",
                 "terms": "stadion,futbal,futbalovy stadion,futbalový štadión,ihrisko"
@@ -2306,6 +2307,14 @@
                 "name": "Lokalita",
                 "terms": "oblast,oblasť,miestny názov,miestny nazov"
             },
+            "place/neighbourhood": {
+                "name": "Susedstvo",
+                "terms": "okrsok,oblast,oblasť,štvrť,stvrt"
+            },
+            "place/suburb": {
+                "name": "Mestská časť",
+                "terms": "mestska cast"
+            },
             "place/town": {
                 "name": "Mesto",
                 "terms": "mestecko,mestečko"
@@ -2530,6 +2539,10 @@
                 "name": "Kvetinárstvo",
                 "terms": "kvetinarstvo,kvety,kytice"
             },
+            "shop/funeral_directors": {
+                "name": "Pohrebný ústav",
+                "terms": "pohrebny ustav,pohreb,pohreb,pohrebníctvo,pohrebnictvo"
+            },
             "shop/furniture": {
                 "name": "Obchod s nábytkom",
                 "terms": "obchod s nabytkom,nabytok"
@@ -2614,6 +2627,10 @@
                 "name": "Obchod s fototechnikou",
                 "terms": "Fotoateliér,fotoatelier,fotostudio,fotoštúdio,fotografia"
             },
+            "shop/seafood": {
+                "name": "Obchod s morskými špecialitami",
+                "terms": "obchod s morskymi specialitami,plody mora,ryby,morské ryby,morske ryby,kreverty,treska,tuniak"
+            },
             "shop/shoes": {
                 "name": "Obchod s obuvov",
                 "terms": "obuv,topánky,topanky"
@@ -2654,6 +2671,10 @@
                 "name": "Videopožičovňa",
                 "terms": "videopozicovna,DVD,CD,VHS,blue-ray,blueray,blue ray,video"
             },
+            "shop/wine": {
+                "name": "Vináreň",
+                "terms": "vinaren,vinoteka,vínotéka,vino,víno"
+            },
             "tourism": {
                 "name": "Turizmus",
                 "terms": "turizmus,turistika,turisticke,turistické,hotel,motel,chata,muzeum,múzeum,atrakcia,zoo,park"
diff --git a/vendor/assets/iD/iD/locales/sl.json b/vendor/assets/iD/iD/locales/sl.json
index ffa7788f4..461ce8979 100644
--- a/vendor/assets/iD/iD/locales/sl.json
+++ b/vendor/assets/iD/iD/locales/sl.json
@@ -1002,10 +1002,6 @@
                 "name": "Poslovna stavba",
                 "terms": "Pisarne"
             },
-            "building/entrance": {
-                "name": "Vhod",
-                "terms": "Vrata, Izhod, Portal"
-            },
             "building/garage": {
                 "name": "Garaža",
                 "terms": "Garažna hiša"
@@ -1145,9 +1141,6 @@
                 "name": "Požarni hidrant",
                 "terms": "hidrant, vodni hidrant"
             },
-            "entrance": {
-                "name": "Vhod"
-            },
             "footway/crossing": {
                 "name": "Prehod za pešce",
                 "terms": "zebra"
@@ -1186,9 +1179,6 @@
             "highway/motorway": {
                 "name": "Avtocesta"
             },
-            "highway/motorway_junction": {
-                "name": "Avtocestno križišče"
-            },
             "highway/motorway_link": {
                 "name": "Avtocestni priključek"
             },
diff --git a/vendor/assets/iD/iD/locales/sr.json b/vendor/assets/iD/iD/locales/sr.json
index d77348900..2962ef7c7 100644
--- a/vendor/assets/iD/iD/locales/sr.json
+++ b/vendor/assets/iD/iD/locales/sr.json
@@ -264,7 +264,6 @@
         "percent_brightness": "{opacity}% прозирност",
         "none": "Ниједна",
         "custom": "Прилагођена",
-        "custom_prompt": "Унесите образац плочица. Важеће вредности су {z}, {x}, {y} за Z/X/Y шему и {u} за квадратну шему.",
         "fix_misalignment": "Поправи поравнање",
         "reset": "ресетовање"
     },
@@ -407,6 +406,9 @@
             "category-rail": {
                 "name": "Шина"
             },
+            "category-restriction": {
+                "name": "Ограничења"
+            },
             "category-road": {
                 "name": "Пут"
             },
@@ -582,6 +584,9 @@
             "entrance": {
                 "label": "Врста"
             },
+            "except": {
+                "label": "Изузеци"
+            },
             "fax": {
                 "label": "Факс",
                 "placeholder": "+31 42 123 4567"
@@ -595,6 +600,24 @@
             "fixme": {
                 "label": "Поправи ме"
             },
+            "fuel/biodiesel": {
+                "label": "Продаје биодизел"
+            },
+            "fuel/diesel": {
+                "label": "Продаје дизел"
+            },
+            "fuel/e10": {
+                "label": "Продаје Е10"
+            },
+            "fuel/e85": {
+                "label": "Продаје Е85"
+            },
+            "fuel/lpg": {
+                "label": "Продаје пропан"
+            },
+            "fuel/octane_98": {
+                "label": "Продаје премијум бензин"
+            },
             "gauge": {
                 "label": "Колосек"
             },
@@ -611,6 +634,7 @@
                 "placeholder": "Број рупе (1-18)"
             },
             "handicap": {
+                "label": "Хендикеп",
                 "placeholder": "1-18"
             },
             "highway": {
@@ -656,6 +680,9 @@
             "leisure": {
                 "label": "Врста"
             },
+            "length": {
+                "label": "Дужина (метара)"
+            },
             "levels": {
                 "label": "Нивои",
                 "placeholder": "2, 4, 6..."
@@ -723,6 +750,9 @@
             "place": {
                 "label": "Врста"
             },
+            "population": {
+                "label": "Насељеност"
+            },
             "power": {
                 "label": "Врста"
             },
@@ -762,6 +792,9 @@
             "restriction": {
                 "label": "Врста"
             },
+            "restrictions": {
+                "label": "Znaci zabrane kretanja"
+            },
             "route": {
                 "label": "Врста"
             },
@@ -771,6 +804,9 @@
             "sac_scale": {
                 "label": "Тежина стазе"
             },
+            "seasonal": {
+                "label": "Сезонско"
+            },
             "service": {
                 "label": "Врста"
             },
@@ -796,6 +832,9 @@
             "sport": {
                 "label": "Спорт"
             },
+            "sport_ice": {
+                "label": "Спорт"
+            },
             "structure": {
                 "label": "Грађевина",
                 "placeholder": "Непознато",
@@ -858,6 +897,9 @@
             "wheelchair": {
                 "label": "Прилаз за инвалидска колица"
             },
+            "width": {
+                "label": "Ширина (метара)"
+            },
             "wikipedia": {
                 "label": "Википедија"
             },
@@ -917,6 +959,9 @@
             "amenity/bar": {
                 "name": "Бар"
             },
+            "amenity/bbq": {
+                "name": "Роштиљ/печењара"
+            },
             "amenity/bench": {
                 "name": "Клупа"
             },
@@ -956,6 +1001,9 @@
             "amenity/college": {
                 "name": "Факултет"
             },
+            "amenity/compressed_air": {
+                "name": "Компримовани ваздух"
+            },
             "amenity/courthouse": {
                 "name": "Судница"
             },
@@ -1001,6 +1049,9 @@
             "amenity/nightclub": {
                 "name": "Ноћни клуб"
             },
+            "amenity/parking": {
+                "name": "Ауто паркинг"
+            },
             "amenity/pharmacy": {
                 "name": "Апотека"
             },
@@ -1176,7 +1227,7 @@
                 "name": "Студентски дом"
             },
             "building/entrance": {
-                "name": "Улаз"
+                "name": "Улаз/излаз"
             },
             "building/garage": {
                 "name": "Гаража"
@@ -1238,9 +1289,15 @@
             "craft/bookbinder": {
                 "name": "Књиговезац"
             },
+            "craft/brewery": {
+                "name": "Пивара"
+            },
             "craft/carpenter": {
                 "name": "Столар"
             },
+            "craft/carpet_layer": {
+                "name": "Паркетар"
+            },
             "craft/clockmaker": {
                 "name": "Сајџија"
             },
@@ -1301,6 +1358,9 @@
             "craft/tailor": {
                 "name": "Kројач"
             },
+            "craft/tiler": {
+                "name": "Керамичар"
+            },
             "craft/tinsmith": {
                 "name": "Калајџија"
             },
@@ -1323,11 +1383,14 @@
                 "name": "Телефон за хитне случајеве"
             },
             "entrance": {
-                "name": "Улаз"
+                "name": "Улаз/излаз"
             },
             "footway/crossing": {
                 "name": "Прелаз"
             },
+            "footway/crosswalk": {
+                "name": "Пешачки прелаз"
+            },
             "footway/sidewalk": {
                 "name": "Тротоар"
             },
@@ -1350,6 +1413,9 @@
             "highway/crossing": {
                 "name": "Прелаз"
             },
+            "highway/crosswalk": {
+                "name": "Пешачки прелаз"
+            },
             "highway/cycleway": {
                 "name": "Бициклистичка стаза"
             },
@@ -1365,9 +1431,6 @@
             "highway/motorway": {
                 "name": "Магистрални пут"
             },
-            "highway/motorway_junction": {
-                "name": "Магистрално чвориште"
-            },
             "highway/motorway_link": {
                 "name": "Прилаз аутопуту"
             },
@@ -1485,6 +1548,9 @@
             "landuse/cemetery": {
                 "name": "Гробље"
             },
+            "landuse/churchyard": {
+                "name": "Црквено двориште"
+            },
             "landuse/commercial": {
                 "name": "Пословна област"
             },
@@ -1494,6 +1560,9 @@
             "landuse/farm": {
                 "name": "Фарма"
             },
+            "landuse/farmland": {
+                "name": "Обрадиво земљиште"
+            },
             "landuse/farmyard": {
                 "name": "Сеоско двориште"
             },
@@ -1512,6 +1581,9 @@
             "landuse/meadow": {
                 "name": "Ливада"
             },
+            "landuse/military": {
+                "name": "Војска "
+            },
             "landuse/orchard": {
                 "name": "Воћњак"
             },
@@ -1533,6 +1605,9 @@
             "leisure/dog_park": {
                 "name": "Парк за псе"
             },
+            "leisure/firepit": {
+                "name": "Огњиште"
+            },
             "leisure/garden": {
                 "name": "Башта"
             },
@@ -1581,9 +1656,6 @@
             "leisure/slipway": {
                 "name": "Навоз"
             },
-            "leisure/sports_center": {
-                "name": "Спортски центар"
-            },
             "leisure/stadium": {
                 "name": "Стадион"
             },
@@ -1608,6 +1680,9 @@
             "man_made/embankment": {
                 "name": "Насип"
             },
+            "man_made/flagpole": {
+                "name": "Јарбол за заставу"
+            },
             "man_made/lighthouse": {
                 "name": "Светионик"
             },
@@ -1638,6 +1713,9 @@
             "man_made/water_works": {
                 "name": "Водовод"
             },
+            "military/airfield": {
+                "name": "Узлетиште"
+            },
             "military/barracks": {
                 "name": "Касарна"
             },
@@ -1707,9 +1785,18 @@
             "office": {
                 "name": "Канцеларија"
             },
+            "office/accountant": {
+                "name": "Рачуновођа"
+            },
+            "office/architect": {
+                "name": "Архитекта"
+            },
             "office/educational_institution": {
                 "name": "Образовна институција"
             },
+            "office/employment_agency": {
+                "name": "Служба за запошљавање"
+            },
             "office/lawyer": {
                 "name": "Адвокатска канцеларија"
             },
@@ -1740,6 +1827,9 @@
             "place/locality": {
                 "name": "Локалитет"
             },
+            "place/suburb": {
+                "name": "Варош"
+            },
             "place/town": {
                 "name": "Варош"
             },
@@ -1926,6 +2016,9 @@
             "shop/locksmith": {
                 "name": "Бравар"
             },
+            "shop/lottery": {
+                "name": "Лутрија"
+            },
             "shop/mall": {
                 "name": "Тржни центар"
             },
@@ -1950,6 +2043,9 @@
             "shop/pet": {
                 "name": "Продавница кућних љубимаца"
             },
+            "shop/seafood": {
+                "name": "Продавница морске хране "
+            },
             "shop/shoes": {
                 "name": "Продавница обуће"
             },
@@ -1980,6 +2076,9 @@
             "shop/video": {
                 "name": "Видео клуб"
             },
+            "shop/wine": {
+                "name": "Продавница вина"
+            },
             "tourism": {
                 "name": "Туризам"
             },
@@ -2043,6 +2142,27 @@
             "type/restriction": {
                 "name": "Ограничење"
             },
+            "type/restriction/no_left_turn": {
+                "name": "Забрана скретања улево"
+            },
+            "type/restriction/no_right_turn": {
+                "name": "Забрана скретања удесно"
+            },
+            "type/restriction/no_straight_on": {
+                "name": "Забрана саобраћаја у једном смеру"
+            },
+            "type/restriction/no_u_turn": {
+                "name": "Забрана полукружног окретања"
+            },
+            "type/restriction/only_left_turn": {
+                "name": "Обавезан смер - лево"
+            },
+            "type/restriction/only_right_turn": {
+                "name": "Обавезан смер - десно"
+            },
+            "type/restriction/only_straight_on": {
+                "name": "Обавезан смер - право"
+            },
             "type/route": {
                 "name": "Путања"
             },
diff --git a/vendor/assets/iD/iD/locales/sv.json b/vendor/assets/iD/iD/locales/sv.json
index a5824c7ee..6f1edc258 100644
--- a/vendor/assets/iD/iD/locales/sv.json
+++ b/vendor/assets/iD/iD/locales/sv.json
@@ -71,7 +71,8 @@
                 "line": "Gjorde en linje rund.",
                 "area": "Gjorde ett område runt."
             },
-            "not_closed": "Denna kan inte göras rund då den inte är en loop."
+            "not_closed": "Denna kan inte göras rund då den inte är en loop.",
+            "too_large": "Denna kan inte göras runt då inte tillräckligt är synligt för tillfället."
         },
         "orthogonalize": {
             "title": "Räta upp",
@@ -84,7 +85,8 @@
                 "line": "Gjort hörnen på en linje fyrkantiga.",
                 "area": "Gjort hörnen på ett område fyrkantiga."
             },
-            "not_squarish": "Denna kan inte rätas upp då den inte är fyrkantig."
+            "not_squarish": "Denna kan inte rätas upp då den inte är fyrkantig.",
+            "too_large": "Denna kan inte rätas upp då inte tillräckligt är synligt för tillfället."
         },
         "straighten": {
             "title": "Räta ut",
@@ -180,6 +182,18 @@
             },
             "not_eligible": "Linjer kan inte delas vid deras början eller slut.",
             "multiple_ways": "Det är för många linjer här för att kunna dela dem."
+        },
+        "restriction": {
+            "help": {
+                "select": "Klicka för att välja ett vägsegment.",
+                "toggle": "Klicka för att växla svängrestriktioner.",
+                "toggle_on": "Klicka för att lägga till en \"{restriction}\"-restriktion.",
+                "toggle_off": "Klicka för att ta bort \"{restriction}\"-restriktionen."
+            },
+            "annotation": {
+                "create": "Lagt till en svängrestriktion",
+                "delete": "Tagit bort en svängrestriktion"
+            }
         }
     },
     "undo": {
@@ -265,6 +279,7 @@
         "percent_brightness": "{opacity}% ljusstyrka",
         "none": "Ingen",
         "custom": "Anpassa",
+        "custom_button": "Ändra anpassad bakgrund",
         "fix_misalignment": "Justera bildplacering",
         "reset": "ta bort"
     },
@@ -374,7 +389,8 @@
             "road": "**Välj Väg från listan**",
             "residential": "Det finns olika typer av vägar. Den vanligaste är \"Residential\". **Välj vägtypen \"Residential\"**",
             "describe": "**Ge vägen ett namn och stäng objektredigeraren.**",
-            "restart": "Vägen behöver ha en korsning med Flower Street."
+            "restart": "Vägen behöver ha en korsning med Flower Street.",
+            "wrong_preset": "Du valde inte typen bostadsgata. **Klicka här för att välja igen**"
         },
         "startediting": {
             "title": "Börja redigera",
@@ -385,6 +401,9 @@
     },
     "presets": {
         "categories": {
+            "category-golf": {
+                "name": "Golf"
+            },
             "category-landuse": {
                 "name": "Landanvänding"
             },
@@ -394,6 +413,9 @@
             "category-rail": {
                 "name": "Spår"
             },
+            "category-restriction": {
+                "name": "Restriktioner"
+            },
             "category-road": {
                 "name": "Väg"
             },
@@ -521,6 +543,9 @@
             "entrance": {
                 "label": "Typ"
             },
+            "except": {
+                "label": "Undantag"
+            },
             "fax": {
                 "label": "Fax",
                 "placeholder": "+46 31 123 4567"
@@ -531,6 +556,22 @@
             "fixme": {
                 "label": "Ordna mig"
             },
+            "fuel/biodiesel": {
+                "label": "Säljer Biodiesel"
+            },
+            "fuel/diesel": {
+                "label": "Säljer Diesel"
+            },
+            "fuel/e85": {
+                "label": "Säljer E85"
+            },
+            "golf_hole": {
+                "placeholder": "Hålnummer (1-18)"
+            },
+            "handicap": {
+                "label": "Handikapp",
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "Typ"
             },
@@ -546,6 +587,9 @@
             "incline": {
                 "label": "Lutning"
             },
+            "information": {
+                "label": "Typ"
+            },
             "internet_access": {
                 "label": "Internetaccess",
                 "options": {
@@ -567,6 +611,9 @@
             "leisure": {
                 "label": "Typ"
             },
+            "length": {
+                "label": "Längd (meter)"
+            },
             "levels": {
                 "label": "Våningar",
                 "placeholder": "2, 4, 6..."
@@ -609,6 +656,10 @@
             "operator": {
                 "label": "Operatör"
             },
+            "par": {
+                "label": "Par",
+                "placeholder": "3, 4, 5..."
+            },
             "park_ride": {
                 "label": "Pendelparkering"
             },
@@ -649,6 +700,9 @@
             "restriction": {
                 "label": "Typ"
             },
+            "restrictions": {
+                "label": "Svängrestriktioner "
+            },
             "route": {
                 "label": "Typ"
             },
@@ -701,6 +755,9 @@
             "trail_visibility": {
                 "label": "Synlighet"
             },
+            "tunnel": {
+                "label": "Tunnel"
+            },
             "water": {
                 "label": "Typ"
             },
@@ -717,6 +774,9 @@
             "wheelchair": {
                 "label": "Handikappanpassat"
             },
+            "width": {
+                "label": "Bredd (meter)"
+            },
             "wikipedia": {
                 "label": "Wikipedia"
             },
@@ -773,6 +833,9 @@
                 "name": "Bar",
                 "terms": "Bar, krog, servering, matställe, pub, cocktailsalong, saloon"
             },
+            "amenity/bbq": {
+                "name": "Grillplats/Grill"
+            },
             "amenity/bench": {
                 "name": "Bänk"
             },
@@ -795,6 +858,9 @@
             "amenity/car_wash": {
                 "name": "Biltvätt"
             },
+            "amenity/charging_station": {
+                "name": "Laddstation"
+            },
             "amenity/childcare": {
                 "name": "Barnomsorg",
                 "terms": "Barnomsorg, Förskola, Dagis, Barnhem, Dagmamma"
@@ -803,6 +869,9 @@
                 "name": "Biograf",
                 "terms": "Bio, Biograf, Biografteater"
             },
+            "amenity/clock": {
+                "name": "Klocka"
+            },
             "amenity/courthouse": {
                 "name": "Domstol"
             },
@@ -839,6 +908,9 @@
             "amenity/parking": {
                 "name": "Bilparkering"
             },
+            "amenity/parking_entrance": {
+                "name": "In- och utfart parkeringsgarage"
+            },
             "amenity/pharmacy": {
                 "name": "Läkemedel"
             },
@@ -875,6 +947,10 @@
             "amenity/pub": {
                 "name": "Pub"
             },
+            "amenity/recycling": {
+                "name": "Återvinning",
+                "terms": "återvinning, återbruk, återvinningsstation, sopstation "
+            },
             "amenity/restaurant": {
                 "name": "Restaurang",
                 "terms": "Restaurang, matservering, matställe, servering, restauration, näringsställe, grillbar, bar, krog, värdshus, pub, bodega, brasserie, rotisseri, pizzeria, kafé, cafeteria, sylta"
@@ -904,6 +980,10 @@
             "amenity/university": {
                 "name": "Universitet"
             },
+            "amenity/veterinary": {
+                "name": "Veterinär ",
+                "terms": "Veterinär, djurläkare, djurdoktor"
+            },
             "amenity/waste_basket": {
                 "name": "Soptunna"
             },
@@ -970,12 +1050,21 @@
             "building/apartments": {
                 "name": "Lägenheter"
             },
-            "building/entrance": {
-                "name": "Entré"
+            "building/construction": {
+                "name": "Byggnad under konstruktion",
+                "terms": "Byggnad under konstruktion, Byggnad under uppförande, byggarbete, bygge, byggarbetsplats, byggnation, byggnadsplats"
             },
             "building/garage": {
                 "name": "Garage"
             },
+            "building/garages": {
+                "name": "Garage",
+                "terms": "skydd för bilar, bilstall, bilskjul, carport, parkeringshus, varmgarage, kallgarage, uppställningsplats, bilgarage, bilförvaring"
+            },
+            "building/greenhouse": {
+                "name": "Växthus",
+                "terms": "växthus, drivhus, orangeri, driveri, vinterträdgård, växtodling, blomsterhus, odlingshus"
+            },
             "building/house": {
                 "name": "Hus"
             },
@@ -990,7 +1079,7 @@
                 "name": "Nödtelefon"
             },
             "entrance": {
-                "name": "Entré"
+                "name": "In-/Utgång"
             },
             "highway": {
                 "name": "Väg",
@@ -1025,10 +1114,6 @@
             "highway/motorway": {
                 "name": "Motorväg"
             },
-            "highway/motorway_junction": {
-                "name": "Trafikplats",
-                "terms": "Motorvägkorsning, trafikplats, mot"
-            },
             "highway/motorway_link": {
                 "name": "Anslutning, motorväg"
             },
@@ -1206,6 +1291,9 @@
             "leisure/park": {
                 "name": "Park"
             },
+            "leisure/picnic_table": {
+                "name": "Picknickbord"
+            },
             "leisure/pitch": {
                 "name": "Idrottsplats"
             },
@@ -1581,6 +1669,9 @@
             "shop/video": {
                 "name": "Videobutik"
             },
+            "shop/wine": {
+                "name": "Vinaffär"
+            },
             "tourism": {
                 "name": "Turism"
             },
@@ -1644,6 +1735,34 @@
             "type/restriction": {
                 "name": "Restriktion"
             },
+            "type/restriction/no_left_turn": {
+                "name": "Ingen vänstersväng",
+                "terms": "Ingen vänstersväng, sväng ej vänster"
+            },
+            "type/restriction/no_right_turn": {
+                "name": "Ingen högersväng",
+                "terms": "Ingen högersväng, ej högersväng, sväng ej höger"
+            },
+            "type/restriction/no_straight_on": {
+                "name": "Ej rakt fram",
+                "terms": "Fortsätt ej framåt, ej rakt fram"
+            },
+            "type/restriction/no_u_turn": {
+                "name": "Ingen U-sväng",
+                "terms": "Ingen U-sväng, får ej vända"
+            },
+            "type/restriction/only_left_turn": {
+                "name": "Enbart vänstersväng",
+                "terms": "Enbart vänstersväng, bara vänstersväng, endast vänstersväng"
+            },
+            "type/restriction/only_right_turn": {
+                "name": "Enbart högersväng",
+                "terms": "enbart högersväng, endast högersväng, bara högersväng"
+            },
+            "type/restriction/only_straight_on": {
+                "name": "Inga svängar",
+                "terms": "Inga svängar, rakt fram, ingen sväng"
+            },
             "type/route": {
                 "name": "Rutt"
             },
diff --git a/vendor/assets/iD/iD/locales/ta.json b/vendor/assets/iD/iD/locales/ta.json
index 4c652e835..317f0e094 100644
--- a/vendor/assets/iD/iD/locales/ta.json
+++ b/vendor/assets/iD/iD/locales/ta.json
@@ -1,23 +1,45 @@
 {
     "modes": {
         "add_area": {
-            "title": "பரப்பளவு"
+            "title": "பரப்பளவு",
+            "description": "வரைபடத்தை பூங்காக்கள், கட்டிடங்கள், ஏரிகள் அல்லது மற்ற பகுதிகளில் சேர்.",
+            "tail": "பூங்கா, ஏரி, அல்லது கட்டிடம் வரைய வரைபடத்தை கிளிக் செய்க."
         },
         "add_line": {
-            "title": "கோடு"
+            "title": "கோடு",
+            "description": "வரைபடத்தை நெடுஞ்சாலைகள், தெருக்களில், பாதசாரி பாதைகள், கால்வாய்கள் அல்லது மற்ற வரிகளை சேர்க்கவும்.",
+            "tail": "சாலை, பாதை, அல்லது இந்த வரைபடத்தை கிளிக் செய்க."
         },
         "add_point": {
-            "title": "புள்ளி"
+            "title": "புள்ளி",
+            "description": "வரைபடத்தை உணவகங்கள், நினைவு சின்னங்கள், தபால் பெட்டிகள் அல்லது மற்ற சேர்க்கவும்.",
+            "tail": "ஒரு புள்ளி சேர்க்க வரைபடத்தை கிளிக் செய்க."
+        },
+        "browse": {
+            "title": "உலவ"
         }
     },
     "operations": {
+        "start": {
+            "annotation": {
+                "line": "வரி தொடங்கியது",
+                "area": "பகுதி தொடங்கியது"
+            }
+        },
         "continue": {
-            "key": "A"
+            "key": "A",
+            "annotation": {
+                "line": "வரி தொ ங்கியது"
+            }
+        },
+        "cancel_draw": {
+            "annotation": "வரைவது தவிர்கபட்டது "
         },
         "circularize": {
             "key": "O"
         },
         "orthogonalize": {
+            "title": "சதுரம்",
             "key": "S"
         },
         "straighten": {
@@ -31,19 +53,28 @@
             }
         },
         "disconnect": {
+            "title": "தொடர்பை -துண்டி",
             "key": "D"
         },
         "merge": {
+            "title": "இணை",
+            "description": "இந்த கோடுகளை இணை",
             "key": "C"
         },
         "move": {
             "title": "நகர்த்து",
-            "key": "M"
+            "key": "M",
+            "annotation": {
+                "point": "புள்ளி நகர்த்தப்பட்டது",
+                "area": "பரப்பை நகர்த்தபட்டது "
+            }
         },
         "rotate": {
+            "title": "திருப்பு",
             "key": "R"
         },
         "reverse": {
+            "title": "தலைகீழாக்கு",
             "key": "V"
         },
         "split": {
@@ -175,10 +206,14 @@
             "crossing": {
                 "label": "வகை"
             },
+            "emergency": {
+                "label": "அவசரநிலை"
+            },
             "entrance": {
                 "label": "வகை"
             },
             "fax": {
+                "label": "தொலைநகல்",
                 "placeholder": "+31 42 123 4567"
             },
             "fire_hydrant/type": {
@@ -205,6 +240,9 @@
             "information": {
                 "label": "வகை"
             },
+            "internet_access": {
+                "label": "இணைய அணுகல்"
+            },
             "landuse": {
                 "label": "வகை"
             },
@@ -212,10 +250,14 @@
                 "label": "சந்துகள்",
                 "placeholder": "1, 2, 3..."
             },
+            "layer": {
+                "label": "அடுக்கு"
+            },
             "leisure": {
                 "label": "வகை"
             },
             "levels": {
+                "label": "நிலைகள்",
                 "placeholder": "2, 4, 6..."
             },
             "location": {
@@ -234,6 +276,9 @@
             "natural": {
                 "label": "இயற்கையான"
             },
+            "network": {
+                "label": "நெட்வொர்க்"
+            },
             "note": {
                 "label": "குறிப்பு"
             },
@@ -249,6 +294,9 @@
             "opening_hours": {
                 "label": "மணிநேரங்கள்"
             },
+            "operator": {
+                "label": "இயக்குபவர்"
+            },
             "par": {
                 "placeholder": "3, 4, 5..."
             },
@@ -280,6 +328,7 @@
                     "christian": "கிறித்தவர்",
                     "muslim": "இசுலாமியர்",
                     "buddhist": "புத்த மதத்தினர்",
+                    "jewish": "ஜெவிஷ்",
                     "hindu": "இந்து"
                 }
             },
@@ -351,12 +400,18 @@
             "aeroway/aerodrome": {
                 "name": "விமானநிலையம்"
             },
+            "aeroway/helipad": {
+                "name": "சிறு விமானம் இறங்கும் தளம்"
+            },
             "amenity/bank": {
                 "name": "வங்கி"
             },
             "amenity/bicycle_parking": {
                 "name": "ஈருருளை நிறுத்தகம்"
             },
+            "amenity/bicycle_rental": {
+                "name": "சைக்கிள் வாடகை"
+            },
             "amenity/cafe": {
                 "name": "டீக்கடை"
             },
@@ -375,12 +430,18 @@
             "amenity/grave_yard": {
                 "name": "இடுகாடு"
             },
+            "amenity/hospital": {
+                "name": "மருத்துவமனை "
+            },
             "amenity/library": {
                 "name": "புத்தகச்சாலை"
             },
             "amenity/marketplace": {
                 "name": "பஜார்"
             },
+            "amenity/parking": {
+                "name": "கார் பார்க்கிங்"
+            },
             "amenity/pharmacy": {
                 "name": "மருந்தகம்"
             },
@@ -402,6 +463,9 @@
             "amenity/restaurant": {
                 "name": "உணவகம்"
             },
+            "amenity/school": {
+                "name": "பள்ளி மைதானத்தில்"
+            },
             "amenity/swimming_pool": {
                 "name": "நீச்சல் குளம்"
             },
@@ -414,6 +478,9 @@
             "amenity/toilets": {
                 "name": "கழிவறைகள்"
             },
+            "amenity/townhall": {
+                "name": "நகராட்சிமன்றம்"
+            },
             "amenity/university": {
                 "name": "பல்கலைக்கழகம்"
             },
@@ -438,9 +505,6 @@
             "building/apartments": {
                 "name": "அபார்ட்மண்டுகள்"
             },
-            "building/entrance": {
-                "name": "நுழைவுவாயில்"
-            },
             "building/house": {
                 "name": "வீடு"
             },
@@ -448,7 +512,7 @@
                 "name": "ஓவியர்"
             },
             "entrance": {
-                "name": "நுழைவுவாயில்"
+                "name": "நுழைவு / வெளியேறு"
             },
             "highway/bus_stop": {
                 "name": "பேருந்து நிலையம்"
diff --git a/vendor/assets/iD/iD/locales/te.json b/vendor/assets/iD/iD/locales/te.json
index acd4fb0ce..9049f7997 100644
--- a/vendor/assets/iD/iD/locales/te.json
+++ b/vendor/assets/iD/iD/locales/te.json
@@ -532,9 +532,6 @@
             "building/hut": {
                 "name": "గుడిసె"
             },
-            "entrance": {
-                "name": "ప్రవేశ ద్వారం"
-            },
             "highway/footway": {
                 "name": "కాల్దారి"
             },
diff --git a/vendor/assets/iD/iD/locales/tl.json b/vendor/assets/iD/iD/locales/tl.json
new file mode 100644
index 000000000..f44ea63df
--- /dev/null
+++ b/vendor/assets/iD/iD/locales/tl.json
@@ -0,0 +1,544 @@
+{
+    "modes": {
+        "add_area": {
+            "title": "Area o poligon",
+            "description": "Magdagdag ng mga parke, mga gusali, lawa o iba pang mga \"area\" sa mapa.",
+            "tail": "Mag-click sa mapa upang simulan ang pagguhit ng isang lugar, tulad ng isang parke, lawa, o gusali."
+        },
+        "add_line": {
+            "title": "Linya o guhit",
+            "description": "Magdagdag ng mga kalsada o kalye, mga daanang pantao, kanal o iba pang mga linya sa mapa.",
+            "tail": "Mag-click sa mapa upang simulan ang pagguhit ng isang linya tulad ng kalsada, daanang pantao, o ruta."
+        },
+        "add_point": {
+            "title": "Punto o tuldok",
+            "description": "Magdagdag ng kainan, monumento, \"postbox\" o iba pang mga punto o tuldok sa mapa.",
+            "tail": "Mag-click sa mapa upang magdagdag ng isang punto o tuldok."
+        },
+        "browse": {
+            "title": "Mag-browse",
+            "description": "I-pan at i-zoom ang mapa."
+        },
+        "draw_area": {
+            "tail": "I-click upang magdagdag ng mga node sa iyong polygon o area. I-click ang unang node upang isarado ang polygon o area."
+        },
+        "draw_line": {
+            "tail": "I-click upang magdagdag ng higit pang mga node sa linya. Mag-click sa iba pang mga linya upang kumonekta sa kanila, at i-double click upang tapusin ang linya."
+        }
+    },
+    "operations": {
+        "add": {
+            "annotation": {
+                "point": "Nagdagdag ng isang punto o tuldok.",
+                "vertex": "Nagdagdag ng node sa isang way.",
+                "relation": "Nagdagdag ng relation."
+            }
+        },
+        "start": {
+            "annotation": {
+                "line": "Nagsimula ng isang linya.",
+                "area": "Nagsimula sa isang area o polygon."
+            }
+        },
+        "continue": {
+            "key": "S",
+            "title": "Ipagpatuloy",
+            "description": "Ipagpatuloy ang linyang ito.",
+            "not_eligible": "Walang linyang maaring ipagpatuloy dito.",
+            "multiple": "Mga ilang mga linya ay maaaring ipagpatuloy dito. Upang pumili ng isang linya, pindutin ang ng Shift at i-click ito upang piliin.",
+            "annotation": {
+                "line": "Karugtong ng isang linya.",
+                "area": "Nagpatuloy sa pagguhit ng area o poligon."
+            }
+        },
+        "cancel_draw": {
+            "annotation": "Kinansela ang pagguhit."
+        },
+        "change_role": {
+            "annotation": "Binago ang role ng isang kasapi ng  relation."
+        },
+        "change_tags": {
+            "annotation": "Pinalitan ang mga tag."
+        },
+        "circularize": {
+            "title": "Pina-bilog",
+            "description": {
+                "line": "Gawing pabilog ang linyang ito.",
+                "area": "Gawing pabilog ang area o poligong ito."
+            },
+            "key": "O",
+            "annotation": {
+                "line": "Ginawang pabilog and isang linya.",
+                "area": "Ginawang pabilog and isang area o poligon."
+            },
+            "not_closed": "Hindi ito maaaring gawing pabilog dahil hindi ito isang \"loop\".",
+            "too_large": "Hindi na ito maaaring gawing pabilog dahil hindi sapat ang kasalukuyang nakikita sa mapa."
+        },
+        "orthogonalize": {
+            "title": "Iskawalado",
+            "description": {
+                "line": "Gawing iskwalado ang mga kanto ng linyang ito.",
+                "area": "Gawing iskwalado ang mga kanto ng area o poligong ito."
+            },
+            "key": "S",
+            "annotation": {
+                "line": "Ginawang iskawalado ang bawat kanto ng linya.",
+                "area": "Ginawang iskawalado ang bawat kanto ng area o poligon."
+            },
+            "not_squarish": "Hindi maaring gawing iskwalado.",
+            "too_large": "Hindi ito maaaring gawing iskuwalado dahil hindi sapat ang kasalukuyang nakikita sa mapa."
+        },
+        "straighten": {
+            "title": "Ituwid",
+            "description": "Ituwid ang linyang ito.",
+            "key": "S",
+            "annotation": "Naituwid ang linya.",
+            "too_bendy": "Hindi naituwid dahil masyadong kurbado."
+        },
+        "delete": {
+            "title": "Burahin",
+            "description": "Burahin ito sa mapa.",
+            "annotation": {
+                "point": "Binura ang isang point o tuldok.",
+                "vertex": "Binura ang isang node mula sa way o linya.",
+                "line": "Binura ang isang linya.",
+                "area": "Binary ang isang area o poligon.",
+                "relation": "Binura ang isang \"relation\".",
+                "multiple": "Binura ang {n} bagay sa mapa."
+            },
+            "incomplete_relation": "Hindi maaring mabura dahil ito ay hindi pa ganap na nai-download."
+        },
+        "add_member": {
+            "annotation": "Dinagdag ang kasapi o miyembro ng relation."
+        },
+        "delete_member": {
+            "annotation": "Inalis ang kasapi o miyembro ng relation."
+        },
+        "connect": {
+            "annotation": {
+                "point": "Dinugtong ang isang \"way\" sa isang punto o tuldok.",
+                "vertex": "Dinugtong ang isang \"way\" sa isa pang \"way\".",
+                "line": "Dinugtong ang isang \"way\" sa isang linya.",
+                "area": "Dinugtong ang isang \"way\" sa isang area o poligon."
+            }
+        },
+        "disconnect": {
+            "title": "Alisin ang pagkakadugtong",
+            "description": "Alisin sa pagkakadugtong ang mga linya / poligon.",
+            "key": "D",
+            "annotation": "Naalis sa pagkakadugtong ang mga linya / poligon.",
+            "not_connected": "Hindi sapat na bilang ng mga linya upang i-diskonekta o paghiwalayin."
+        },
+        "merge": {
+            "title": "Pagsamahin",
+            "description": "Pagdugtungin ang mga linyang ito.",
+            "key": "C",
+            "annotation": "Dinugtung ang {n} linya.",
+            "not_eligible": "Ang mga bagay na ito ay hindi maaaring pagsamahin.",
+            "not_adjacent": "Hindi mapagsama ang linyang ito dahil sila ay hindi konektado.",
+            "restriction": "Hindi maaaring ipagsama o i-merge dahil ang isa sa mga miyembro ng '{relation}\" ito ay hindi pa ganap na nai-download.",
+            "incomplete_relation": "Hindi maaaring ipagsama o i-merge dahil ang isa sa mga ito ay hindi pa ganap na nai-download."
+        },
+        "move": {
+            "title": "Ilipat ng posisyon",
+            "description": "Ilipat ang posisyon.",
+            "key": "M",
+            "annotation": {
+                "point": "Inilipat ang posisyon ng isang punto o tuldok.",
+                "vertex": "Inilipat ang posisyon ng isang \"node\" na sa isang \"way\".",
+                "line": "Inilipat ang posisyon ng isang linya.",
+                "area": "Inilipat ang posisyon ng isang area o poligon.",
+                "multiple": "Inilipat ang posisyon ang maraming bagay."
+            },
+            "incomplete_relation": "Hindi maaring ilipat ng posisyon dahil ito ay hindi pa ganap na nai-download."
+        },
+        "rotate": {
+            "title": "Paikutin",
+            "description": "Paikutin ang bagay na ito mula sa kanyang \"center point\".",
+            "key": "R",
+            "annotation": {
+                "line": "Pinaikot ang linya.",
+                "area": "Pinaikot ang area o poligon."
+            }
+        },
+        "reverse": {
+            "title": "Baliktarin",
+            "description": "Baliktarin ang direksyon ng linyang ito.",
+            "key": "V",
+            "annotation": "Binaliktad ang direksyon ng linya."
+        },
+        "split": {
+            "title": "Hatiin",
+            "description": {
+                "line": "Hatiin sa dalawa ang linya mula sa node na ito.",
+                "area": "Hatiin ang hangganan ng lugar na ito sa dalawa.",
+                "multiple": "Hatiin ang linya o hangganan ng lugar na ito sa dalawa."
+            },
+            "key": "X",
+            "annotation": {
+                "line": "Hatiin ang linya.",
+                "area": "Hatiin ang hangganan ng area o poligon.",
+                "multiple": "Hatiin ang {n} linya/area o poligon."
+            },
+            "not_eligible": "Hindi maaaring hatiin ang linya mula sa umpisa o dulong \"node\" nito.",
+            "multiple_ways": "Masyadong maraming mga linya dito upang hatiin."
+        }
+    },
+    "undo": {
+        "tooltip": "I-undo:{action}",
+        "nothing": "Walang ma-undo"
+    },
+    "redo": {
+        "tooltip": "i-redo: {action}",
+        "nothing": "Walang ma-redo."
+    },
+    "tooltip_keyhint": "Shortcut:",
+    "browser_notice": "Ang editor na ito ay suportado sa Firefox, Chrome, Safari, Opera, at Internet Explorer 9 at sa mas mataas pang bersion. I-upgrade ang inyong browser o gamitin Potlatch 2 upang i-edit ng mapa.",
+    "translate": {
+        "translate": "I-salin",
+        "localized_translation_label": "Multilingual name",
+        "localized_translation_language": "Pumili ng wika",
+        "localized_translation_name": "Pangalan"
+    },
+    "zoom_in_edit": "Mag-zoom-in para makapag-edit",
+    "logout": "Mag-logout",
+    "loading_auth": "Kumokonekta sa OpenStreetMap ...",
+    "report_a_bug": "I-ulat ang bug",
+    "status": {
+        "error": "Hindi maka-konekta sa API.",
+        "offline": "Kasalukuyang offline ang API. Subukang mag-edit muli sa ibang pagkakataon.",
+        "readonly": "Kasalukuyang nasa read-only ang API. Kailangan mong maghintay upang i-save ang iyong mga pagbabago."
+    },
+    "commit": {
+        "title": "I-save ang mga binago.",
+        "description_placeholder": "Maikling paglalarawan ng iyong mga ambag o edits",
+        "message_label": "Mag-commit mensahe",
+        "upload_explanation": "Ang mga pagbabagong na-upload ay makikita sa lahat ng mapang gumagamit ng datos ng OpenStreetMap.",
+        "upload_explanation_with_user": "Ang mga pagbabagong na-upload bilang {user} ay makikita sa lahat ng mapang gumagamit ng datos ng OpenStreetMap.",
+        "save": "I-save",
+        "cancel": "Kanselahin",
+        "warnings": "Mga babala",
+        "modified": "Binago",
+        "deleted": "Binura",
+        "created": "Nilikha"
+    },
+    "contributors": {
+        "list": "Edits nina {users}",
+        "truncated_list": "Edits nina {users} at {count} iba pa"
+    },
+    "geocoder": {
+        "search": "Maghanap sa buong mundo ...",
+        "no_results_visible": "Walang mga resulta sa kasalukuyang lugar sa mapa",
+        "no_results_worldwide": "Walang mga resultang natagpuan"
+    },
+    "geolocate": {
+        "title": "Ipakita ang kasalukuyang lokasyon."
+    },
+    "inspector": {
+        "no_documentation_combination": "Walang documentation para sa kumbinasyon ng mga tag na ginamit",
+        "no_documentation_key": "Walang \"documentation\" na magagamit para sa \"key\" na ito.",
+        "show_more": "Higit pang detalye",
+        "view_on_osm": "Tingnan sa openstreetmap.org",
+        "all_tags": "Lahat ng tags",
+        "all_members": "Lahat ng kasapi",
+        "all_relations": "Lahat ng \"relation\"",
+        "new_relation": "Bagong relation ...",
+        "role": "Kasapi",
+        "choose": "Pumili ng uri ng \"features\"",
+        "results": "{n} mga resulta para sa {search}",
+        "reference": "Tingnan sa OpenStreetMap Wiki",
+        "back_tooltip": "Baguhin ang \"feature\"",
+        "remove": "Alisin",
+        "search": "Mag-search",
+        "multiselect": "Napiling mga item",
+        "unknown": "Unknown",
+        "incomplete": "<not downloaded>",
+        "feature_list": "Mag-hanap ng \"feature\"",
+        "edit": "I-edit ang \"feature\"",
+        "none": "Wala",
+        "node": "Node",
+        "way": "Way",
+        "relation": "Relation",
+        "location": "Lokasyon"
+    },
+    "background": {
+        "title": "\"Background\" o \"imagery\"",
+        "description": "Mga setting ng \"background\" o \"imagery\"",
+        "percent_brightness": "{opacity}% Pagkalinaw",
+        "none": "Wala",
+        "custom": "Custom",
+        "custom_button": "I-edit ang custom na background",
+        "custom_prompt": "Magpasok ng template na tile URL. Ang wastong mga token ay {z}, {x}, {y} para sa Z/X/Y scheme at {u} naman para sa quadtile scheme.",
+        "fix_misalignment": "Ayusin ang pagkakahanay ng \"imagery\"",
+        "reset": "I-reset"
+    },
+    "restore": {
+        "heading": "Mayroon kang hindi na-save ng mga pagbabago",
+        "description": "Ibig mo bang ibalik ang mga hindi na-save na pagbabago mula sa isang nakaraang session sa pag-edit?",
+        "restore": "Ibalik",
+        "reset": "I-reset"
+    },
+    "save": {
+        "title": "I-save",
+        "help": "I-save ang mga pagbabago sa OpenStreetMap upang makita ng ibang gumagamit ng datos.",
+        "no_changes": "Walang mga pagbabago upang i-save.",
+        "error": "May error habang sinusubukang i-save",
+        "uploading": "Ina-upload ang mga pagbabago sa OpenStreetMap.",
+        "unsaved_changes": "Mayroon kang hindi na-save ng mga pagbabago"
+    },
+    "success": {
+        "edited_osm": "Nag-edit sa OSM!",
+        "just_edited": "Nag-edit ka sa OpenStreetMap!",
+        "view_on_osm": "Tingnan sa OSM",
+        "facebook": "I-share sa Facebook",
+        "twitter": "I-share sa Twitter",
+        "google": "I-share sa Google+",
+        "help_html": "Ang iyong nagawang mga pagbabago ay lilitaw sa \"Standard\" layer sa loob ng ilang minuto. Para sa iba pang mga layer at ang ilang mga tampok, maaaring mas matagal kaysa ilang minuto\n(<a href ='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map' target='_blank '>basahin ang detalye dito</ a>).\n"
+    },
+    "confirm": {
+        "okay": "Okay"
+    },
+    "splash": {
+        "welcome": "Maligayang pagdating sa iD OpenStreetMap editor",
+        "text": "Ang iD ay isang simple ngunit magandang editor para sa pag-edit ng libreng mapa ng buong mundo.  Ito ay bersyon {version}. Para sa karagdagang impormasyon tingnan ang {website} at i-ulat ang mga bugs sa {github}.",
+        "walkthrough": "Simulan ang \"Walkthrough\"",
+        "start": "Simulan ang pag-edit"
+    },
+    "source_switch": {
+        "live": "live",
+        "lose_changes": "Mayroon kang hindi na-save ang mga pagbabago. Mawawala ang pagbabagong ito kung lilipat sa ibang map server.   Sigurado ka bang gusto mong lumipat ng server?",
+        "dev": "dev"
+    },
+    "tag_reference": {
+        "description": "Paglalarawan",
+        "on_wiki": "{tag} sa wiki.osm.org",
+        "used_with": "Kabilang sa gingamait ang {type}"
+    },
+    "validations": {
+        "untagged_point": "Walang tag na punto o tuldok",
+        "untagged_line": "Walang tag na linya",
+        "untagged_area": "Walang tag na area o poligon",
+        "many_deletions": "Nagbura ka ng {n} bagay sa mapa. Sigurado ka bang gusto mong gawin ito? Ito ay tatanggalin sa mapa na nakikita sa openstreetmap.org.",
+        "tag_suggests_area": "Ang tag na {tag} ay kalimitang para sa mga area o poligon sublait ito ay nasa linya lamang.",
+        "untagged_tooltip": "Pumili ng uri ng \"feature\" na naglalarawan kung ano ang {geometry} na ito.",
+        "deprecated_tags": "Hindi na ginagamit na \"tag\": {tags}"
+    },
+    "zoom": {
+        "in": "i-zoom in",
+        "out": "I-zoom out"
+    },
+    "cannot_zoom": "Hindi na pwedeng mag-zoom out sa kasalukuyang \"mode\".",
+    "gpx": {
+        "local_layer": "Lokal na GPX file",
+        "drag_drop": "I-drag at i-drop ang .gpx file mula sa inyong \"computer\" sa pahinang ito, o i-click ang button sa kanan upang mag-browse",
+        "zoom": "I-zoom sa GPX track",
+        "browse": "Mag-browse ng .gpx file"
+    },
+    "help": {
+        "title": "Tulong",
+        "help": "# Help\n\nIto ay isang editor para sa [OpenStreetMap] (http://www.openstreetmap.org/), isang libre at maaaring i-edit na mapa ng mundo. Maaari mo itong gamitin upang idagdag at i-update ang iyong lugar, sa paggawa ng isang open-source at open-data na mapa ng mundo para magamit ng lahat.\n\nAng pag-edit na gagawin mo sa mapang ito ay makikita ng lahat ng gumagamit OpenStreetMap. Upang makapag-edit, kakailanganin mo ng [OpenStreetMap account] (https://www.openstreetmap.org/user/new). \n\nAng [iD editor] (http://ideditor.com/) ay isang collaborative proyekto,  ang [source code ay matatagpuan sa GitHub] (https://github.com/openstreetmap/iD).\n",
+        "editing_saving": "### Pag-edit & Saving\n\nEditor na ito ay dinisenyo upang gumana lalo na sa online, at ina-access mo ito sa pamamagitan ng isang website sa ngayon.\n\n### Pagpili ng Mga Tampok\n\nUpang pumili ng isang tampok ng mapa , tulad ng kalsada o punto ng interes , i-click \nsa ito sa mapa. Ito ay i-highlight ang mga napiling tampok , buksan ang isang panel na may \nmga detalye tungkol dito , at ipakita ang menu ng mga bagay na maaari mong gawin gamit ang tampok. \n\nUpang pumili ng maraming mga tampok , pindutin nang matagal ang 'Shift ' key. Pagkatapos ay i-click ang alinman sa \nsa ang tampok na gusto mong piliin , o i-drag sa mapa upang gumuhit ng parihaba . \nAy ito gumuhit ng isang kahon at piliin ang lahat ng mga punto sa loob nito.\n\n### Saving Pag-edit \n\nKapag gumawa ka ng mga pagbabago tulad ng pag-edit ng mga kalsada, gusali , at mga lugar, ang mga ito ay \nnaka-imbak sa isang lugar lamang hanggang sa i-save mo ang mga ito sa server. Huwag mag-alala kung gumawa ka \nisang pagkakamali - maaari mong i-undo ang mga pagbabago sa pamamagitan ng pag-click sa pindutan undo , at gawing muli ang \nmga pagbabago sa pamamagitan ng pag-click sa pindutan gawing muli.\n\nI-click ang 'I-save ' upang matapos sa isang pangkat ng mga pag-edit - halimbawa , kung nag- nakumpleto \nisang lugar ng bayan at nais na magsimula sa isang bagong lugar . Magkakaroon ka ng pagkakataong \nupang suriin kung ano ang iyong nagawa , at ang editor supplies nakakatulong na mga mungkahi\nat babala kung may isang bagay ay hindi tila karapatan tungkol sa mga pagbabago . \n\nKung mukhang maganda ang lahat ng bagay , maaari mong ipasok ang isang maikling komento na nagpapaliwanag ng mga pagbabago\nna ginawa mo , at i-click muli ang ' I-save' upang i-post ang mga pagbabago\nsa [ OpenStreetMap.org ] ( http://www.openstreetmap.org/ ), kung saan ang mga ito ay nakikita \nsa lahat ng iba pang mga gumagamit at magagamit para sa iba upang bumuo at pagbutihin sa.\n\nKung hindi mo maaaring tapusin ang iyong mga pag-edit sa isang sitting , maaari mong iwanan ang editor window at bumalik ( sa parehong browser at computer ) , at ang\neditor application ay mag-aalok upang ibalik ang iyong trabaho .\n\n"
+    },
+    "intro": {
+        "navigation": {
+            "title": "Navigation",
+            "drag": "Ang pangunahing lugar ng mapa ay nagpapakita ng datos ng na makikita sa OpenStreetMap. Maaari kang mag-navigate sa pamamagitan ng pag-drag at pag-scroll, tulad ng anumang webmap. **I-drag ang mapa!**",
+            "select": "Mga tampok ng mapa ay kinakatawan ng tatlong paraan: gamit ang mga puntos, mga linya o area/poligon. Ang lahat ng mga tampok ay maaaring piliin sa pamamagitan ng pag-click sa mga ito. **Mag-click sa punto upang piliin ito.**",
+            "header": "Ang \"header\" ay nagpapakita kung anong uri ng \"feature\" ito.",
+            "pane": "Kapag ang isang tampok ay pinili, ang feature editor ay ipinapakita. Ang header ay nagpapakita kung anong uri ng tampok at ipinapakita sa pangunahing pane ang mga katangian ng tampok, tulad ng pangalan at address. **Isara ang feature editor gamit ang close button na malapit sa kanang tuktok. **"
+        },
+        "points": {
+            "title": "Mga Punto o tuldok",
+            "add": "Ang mga puntos ay maaaring gamitin upang kumatawan sa mga tampok tulad ng mga tindahan, kainan at mga monumento. Markahan ang mga ito sa tukoy na lokasyon, at ilarawan kung ano ito. **I-click ang pindutan ng Point upang magdagdag ng bagong punto.**",
+            "place": "Gumawa ng punto sa pamamagitan ng pag-click sa mapa. **Ilagay ang tuldok sa tuktok ng gusali.**",
+            "search": "Maraming iba't ibang mga tampok ang pwedeng kumatawan bilang puntos. Ang puntong iyong nai-dagdag ay isang Cafe. **I-search ang '{name}'**",
+            "choose": "**Pumili ng Cafe mula sa talaan.**",
+            "describe": "Ang punto o tuldok na ito ay minarkahan bilang \"cafe\".  Gamit ang \"feature editor\", maari tayong magdagdag ng iba pang impormasyon. **Magdagdag ng pangalan**",
+            "close": "Ang feature editor ay maaring isara sa pamamagitan ng pag-click ng \"Close\". **Isara the feature editor**",
+            "reselect": "Kadalasan, may mga puntos nang nalikha ng ibang mappers, ngunit may mga mali o hindi kumpleto. Maaaring i-edit ang mga puntos na ito. **Piliin ang punto na nilikha mo kanina.**",
+            "fixname": "**Baguhin o magdagdag ng pangalan ng kalsada at isara ang \"feature editor\"**",
+            "reselect_delete": "Ang lahat ng mga nasa mapa ay maaring burahin. **Mag-click sa punto na nilikha mo.**",
+            "delete": "Ang menu sa paligid ng punto ay naglalaman ng mga operasyon na maaaring isagawa dito, tulad ng pagbura. **Burahin ang punto. **"
+        },
+        "areas": {
+            "title": "Mga area o poligon",
+            "add": "Ang mga area o poligon ay mas detalyadong paraan upang kumatawan sa mga tampok. Nagbibigay ang mga ito ng impormasyon sa mga hangganan o boundary ng lugar. Ang karamihan ng maaring i-mapa gamit ang puntos ay pwede rin i-katawan bilang area o poligon. **I-click ang button para sa Area upang magdagdag ng bagong area o poligon.**",
+            "corner": "Ang paglikha ng area o poligon ay sa pamamagitan ng paglalagay node sa paligid ng mga hangganan ng lugar. **Ilagay ang unang node sa isa sa mga sulok ng palaruan.**",
+            "place": "Ipagpatuloy ang pag-guhit ng area o pligon sa pamamagitan ng paglalagay ng higit pang mga node. Tapusin ito sa pamamagitan ng pag-click sa umpisang node. ** Gumuhit ng area o pilgon ng palaruan.**",
+            "search": "**Hanapin ang '{name}'.**",
+            "choose": "**Pliin ang \"Playground\" mula sa talaan.**",
+            "describe": "**Magdagdag ng pangalan at isara ang \"feature editor\"**"
+        },
+        "lines": {
+            "title": "Mga linya",
+            "add": "Ang mga linya ay ginagamit para kumatawan sa mga \"feature\" na gaya ng mga kalsada, riles ng tren at ilog. **I-click ang button para sa \"Linya\" upang magdagdag ng bagong linya. **",
+            "start": "**Simulan ang linya sa pamamagitan ng pag-click sa dulo ng kalsada.**",
+            "finish": "Ang mga linya ay matatapos sa pamamagitan ng pag-click muli sa huling node. **Taposin ang pagguhit ng kalsada.**",
+            "road": "**Piliin ang \"Road\" mula sa talaan**",
+            "residential": "Mayroong iba't ibang mga uri ng mga kalsada, ang pinaka-karaniwang ay residential. **Piliin ang residential na uri ng kalsada**",
+            "describe": "**Magdagdag ng pangalan ng kalsada at isara ang \"feature editor\"**",
+            "restart": "Kailangang i-intersect ang kalsada sa Flower Street.",
+            "wrong_preset": "Hindi ka pumili ang Residential na uri ng kalsada. **I-click dito upang piliin muli**"
+        },
+        "startediting": {
+            "title": "Umpisahan ang pag-edit",
+            "help": "Higit pang mga documentation at ang walkthrough ang makukuha dito.",
+            "save": "Huwag kalimutan na regular na i-save ang iyong mga binago!",
+            "start": "Simulan ang pagma-mapa!"
+        }
+    },
+    "presets": {
+        "fields": {
+            "address": {
+                "label": "Address",
+                "placeholders": {
+                    "number": "123",
+                    "street": "Kalsada",
+                    "city": "Siyudad"
+                }
+            },
+            "aerialway": {
+                "label": "Uri"
+            },
+            "aeroway": {
+                "label": "Uri"
+            },
+            "amenity": {
+                "label": "Uri"
+            },
+            "artwork_type": {
+                "label": "Uri"
+            },
+            "atm": {
+                "label": "ATM"
+            },
+            "barrier": {
+                "label": "Uri"
+            },
+            "bicycle_parking": {
+                "label": "Uri"
+            },
+            "boundary": {
+                "label": "Uri"
+            },
+            "building": {
+                "label": "Gusali"
+            },
+            "building_area": {
+                "label": "Gusali"
+            },
+            "capacity": {
+                "label": "Kapasidad"
+            },
+            "construction": {
+                "label": "Uri"
+            },
+            "crossing": {
+                "label": "Uri"
+            },
+            "entrance": {
+                "label": "Uri"
+            },
+            "fire_hydrant/type": {
+                "label": "Uri"
+            },
+            "generator/type": {
+                "label": "Uri"
+            },
+            "highway": {
+                "label": "Uri"
+            },
+            "historic": {
+                "label": "Uri"
+            },
+            "information": {
+                "label": "Uri"
+            },
+            "internet_access": {
+                "options": {
+                    "wlan": "Wifi"
+                }
+            },
+            "landuse": {
+                "label": "Uri"
+            },
+            "leisure": {
+                "label": "Uri"
+            },
+            "man_made": {
+                "label": "Uri"
+            },
+            "name": {
+                "label": "Pangalan"
+            },
+            "office": {
+                "label": "Uri"
+            },
+            "parking": {
+                "label": "Uri"
+            },
+            "piste/type": {
+                "label": "Uri"
+            },
+            "place": {
+                "label": "Uri"
+            },
+            "power": {
+                "label": "Uri"
+            },
+            "railway": {
+                "label": "Uri"
+            },
+            "relation": {
+                "label": "Uri"
+            },
+            "restriction": {
+                "label": "Uri"
+            },
+            "route": {
+                "label": "Uri"
+            },
+            "route_master": {
+                "label": "Uri"
+            },
+            "service": {
+                "label": "Uri"
+            },
+            "shelter_type": {
+                "label": "Uri"
+            },
+            "shop": {
+                "label": "Uri"
+            },
+            "studio_type": {
+                "label": "Uri"
+            },
+            "tourism": {
+                "label": "Uri"
+            },
+            "tracktype": {
+                "label": "Uri"
+            },
+            "tree_type": {
+                "label": "Uri"
+            },
+            "water": {
+                "label": "Uri"
+            },
+            "waterway": {
+                "label": "Uri"
+            },
+            "wetland": {
+                "label": "Uri"
+            },
+            "wood": {
+                "label": "Uri"
+            }
+        },
+        "presets": {
+            "building": {
+                "name": "Gusali"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/vendor/assets/iD/iD/locales/tr.json b/vendor/assets/iD/iD/locales/tr.json
index d301b70bc..5b77ce8bc 100644
--- a/vendor/assets/iD/iD/locales/tr.json
+++ b/vendor/assets/iD/iD/locales/tr.json
@@ -848,9 +848,6 @@
             "building/construction": {
                 "name": "Yapı İnşaat Aşamasında"
             },
-            "building/entrance": {
-                "name": "Giriş"
-            },
             "building/garage": {
                 "name": "Garaj"
             },
@@ -953,9 +950,6 @@
             "emergency/fire_hydrant": {
                 "name": "Yangın Musluğu"
             },
-            "entrance": {
-                "name": "Giriş"
-            },
             "footway/sidewalk": {
                 "name": "Kaldırım"
             },
diff --git a/vendor/assets/iD/iD/locales/uk.json b/vendor/assets/iD/iD/locales/uk.json
index 6cef70d4a..e2e98e401 100644
--- a/vendor/assets/iD/iD/locales/uk.json
+++ b/vendor/assets/iD/iD/locales/uk.json
@@ -71,7 +71,8 @@
                 "line": "Лінія перетворена на коло.",
                 "area": "Полігон перетворено на коло."
             },
-            "not_closed": "Неможливо перетворити на коло — лінія не замкнена."
+            "not_closed": "Неможливо перетворити на коло — лінія не замкнена.",
+            "too_large": "Неможливо перетворити на коло, не все що є видно."
         },
         "orthogonalize": {
             "title": "Випрямити кути",
@@ -84,7 +85,8 @@
                 "line": "Випрямлено кути лінії.",
                 "area": "Випрямлено кути полігону."
             },
-            "not_squarish": "Випрямити кути не вдалось, об’єкт не має відповідних кутів."
+            "not_squarish": "Випрямити кути не вдалось, об’єкт не має відповідних кутів.",
+            "too_large": "Неможливо зробити кути прямими, не все що є видно."
         },
         "straighten": {
             "title": "Випрямити",
@@ -134,7 +136,8 @@
             "annotation": "Об’єднати {n} ліній.",
             "not_eligible": "Ці об’єкти неможливо злити.",
             "not_adjacent": "Ці лінії неможливо злити, бо вони не з’єднані.",
-            "restriction": "Ці лінії не можуть бути об’єднані, принаймні одна з них є членом зв’язку \"{relation}\"."
+            "restriction": "Ці лінії не можуть бути об’єднані, принаймні одна з них є членом зв’язку \"{relation}\".",
+            "incomplete_relation": "Ці об’єкти не можуть бути об’єднані, принаймні один з них завантажений не повністю."
         },
         "move": {
             "title": "Пересунути",
@@ -264,7 +267,8 @@
         "percent_brightness": "прозорість {opacity}%",
         "none": "Пусте",
         "custom": "Власний фон",
-        "custom_prompt": "Введіть шаблон для квадратів мапи. Використовуй те  {z}, {x}, {y} для схеми Z/X/Y та {u} схеми QuadTiles.",
+        "custom_button": "Параметри власного фону",
+        "custom_prompt": "Введіть шаблон URL для квадратів мапи. Використовуйте  {z}, {x}, {y} для схеми Z/X/Y та {u} для схеми QuadTiles.",
         "fix_misalignment": "Виправити зсув",
         "reset": "скинути"
     },
@@ -962,7 +966,8 @@
                 "terms": "Marketplace, hbyjr,базар,базарна площа"
             },
             "amenity/parking": {
-                "name": "Автостоянка"
+                "name": "Автостоянка",
+                "terms": "стоянка, паркування, парковка, fdnjcnjzyrf"
             },
             "amenity/pharmacy": {
                 "name": "Аптека",
@@ -1142,10 +1147,6 @@
                 "name": "Комерційна нерухомість",
                 "terms": "Commercial Building,rjvthwsqyf ythejvscnm"
             },
-            "building/entrance": {
-                "name": "Вхід",
-                "terms": "Entrance,dsl,двері,ворота,вихід,фіртка"
-            },
             "building/garage": {
                 "name": "Гараж",
                 "terms": "Garage,ufhf"
@@ -1169,9 +1170,6 @@
             "craft/photographer": {
                 "name": "Фотограф"
             },
-            "craft/photographic_labratory": {
-                "name": "Фотолабораторія"
-            },
             "embankment": {
                 "name": "Насип"
             },
@@ -1187,10 +1185,6 @@
                 "name": "Телефон виклику екстрених служб",
                 "terms": "Emergency Phone,tekeajy dbrkbre trchtyb cke"
             },
-            "entrance": {
-                "name": "Вхід",
-                "terms": "Entrance,dsl,двері,ворота,вихід,фіртка"
-            },
             "footway/crossing": {
                 "name": "Перехрестя"
             },
@@ -1236,10 +1230,6 @@
                 "name": "Автомагістраль",
                 "terms": "Motorway,fdnjvfuscnhfkm"
             },
-            "highway/motorway_junction": {
-                "name": "З’єднання з автомагістраллю",
-                "terms": "Motorway Junction,plyfyyz p fdnjvfuscnhfkk, розв’язка,естакада,з’їзд,заїзд"
-            },
             "highway/motorway_link": {
                 "name": "З’їзд з/на автомагістраль",
                 "terms": "Motorway Link,ppl fdnjvfuscnhfkm,естакада,виїзд з,виїзд на,з’їзд з,з’їзд на"
@@ -1511,10 +1501,6 @@
                 "name": "Стапель",
                 "terms": "Slipway,cnfgtkm"
             },
-            "leisure/sports_center": {
-                "name": "Спортивний центр",
-                "terms": "Sports Center,cgjhnbdybq wtynh"
-            },
             "leisure/stadium": {
                 "name": "Стадіон",
                 "terms": "Stadium,cnflsjy"
diff --git a/vendor/assets/iD/iD/locales/vi.json b/vendor/assets/iD/iD/locales/vi.json
index c80218d6c..e546bc9d6 100644
--- a/vendor/assets/iD/iD/locales/vi.json
+++ b/vendor/assets/iD/iD/locales/vi.json
@@ -71,7 +71,8 @@
                 "line": "làm tròn một đường kẻ",
                 "area": "làm tròn một vùng"
             },
-            "not_closed": "Không thể làm tròn một đối tượng không phải là đa giác kín."
+            "not_closed": "Không thể làm tròn một đối tượng không phải là đa giác kín.",
+            "too_large": "Không thể làm tròn đối tượng này vì chỉ có thấy được một phần rất nhỏ."
         },
         "orthogonalize": {
             "title": "Làm Vuông góc",
@@ -84,7 +85,8 @@
                 "line": "làm vuông góc một đường kẻ",
                 "area": "làm vuông góc một vùng"
             },
-            "not_squarish": "Không thể làm vuông một đối tượng không phải vuông vuông."
+            "not_squarish": "Không thể làm vuông một đối tượng không phải vuông vuông.",
+            "too_large": "Không thể làm vuông đối tượng này vì chỉ có thấy được một phần rất nhỏ."
         },
         "straighten": {
             "title": "Làm thẳng",
@@ -180,6 +182,18 @@
             },
             "not_eligible": "Không thể cắt đôi đường kẻ vào đầu hoặc cuối đường.",
             "multiple_ways": "Có quá nhiều đường kẻ tại đây để cắt đôi."
+        },
+        "restriction": {
+            "help": {
+                "select": "Nhấn chuột để chọn một khúc đường.",
+                "toggle": "Nhấn chuột để thêm hoặc bỏ hạn chế rẽ.",
+                "toggle_on": "Nhấn chuột để thêm hạn chế “{restriction}”.",
+                "toggle_off": "Bấm để bỏ hạn chế “{restriction}”."
+            },
+            "annotation": {
+                "create": "thêm hạn chế rẽ",
+                "delete": "bỏ hạn chế rẽ"
+            }
         }
     },
     "undo": {
@@ -265,7 +279,8 @@
         "percent_brightness": "Độ sáng {opacity}%",
         "none": "Không có",
         "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.",
+        "custom_button": "Sửa hình nền tùy biến",
+        "custom_prompt": "Nhập định dạng URL của các mảnh bản đồ. Bạn có thể sử dụng các dấu hiệu {z}, {x}, {y} cho định dạng Z/X/Y hoặc {u} cho định dạng quadtile.",
         "fix_misalignment": "Điều chỉnh lại",
         "reset": "đặt lại"
     },
@@ -409,6 +424,9 @@
             "category-rail": {
                 "name": "Đường sắt"
             },
+            "category-restriction": {
+                "name": "Hạn chế"
+            },
             "category-road": {
                 "name": "Đường"
             },
@@ -591,6 +609,9 @@
             "entrance": {
                 "label": "Kiểu"
             },
+            "except": {
+                "label": "Ngoại lệ"
+            },
             "fax": {
                 "label": "Số Fax",
                 "placeholder": "+84 1 234 5678"
@@ -607,6 +628,33 @@
             "fuel": {
                 "label": "Nhiên liệu"
             },
+            "fuel/biodiesel": {
+                "label": "Bán Diesel Sinh học"
+            },
+            "fuel/diesel": {
+                "label": "Bán Diesel"
+            },
+            "fuel/e10": {
+                "label": "Bán E10"
+            },
+            "fuel/e85": {
+                "label": "Bán E85"
+            },
+            "fuel/lpg": {
+                "label": "Bán Prôpan"
+            },
+            "fuel/octane_100": {
+                "label": "Bán Xăng Xe đua"
+            },
+            "fuel/octane_91": {
+                "label": "Bán Xăng Bình thường"
+            },
+            "fuel/octane_95": {
+                "label": "Bán Xăng Trung hạng"
+            },
+            "fuel/octane_98": {
+                "label": "Bán Xăng Thượng hạng"
+            },
             "gauge": {
                 "label": "Khổ"
             },
@@ -670,6 +718,9 @@
             "leisure": {
                 "label": "Loại"
             },
+            "length": {
+                "label": "Chiều dài (Mét)"
+            },
             "levels": {
                 "label": "Số Tầng",
                 "placeholder": "2, 4, 6…"
@@ -704,10 +755,16 @@
                 "label": "Kiểu"
             },
             "oneway": {
-                "label": "Một chiều"
+                "label": "Một chiều",
+                "options": {
+                    "undefined": "Có lẽ Phải"
+                }
             },
             "oneway_yes": {
-                "label": "Một chiều"
+                "label": "Một chiều",
+                "options": {
+                    "undefined": "Có lẽ Không phải"
+                }
             },
             "opening_hours": {
                 "label": "Giờ Mở cửa"
@@ -741,6 +798,9 @@
             "place": {
                 "label": "Kiểu"
             },
+            "population": {
+                "label": "Dân số"
+            },
             "power": {
                 "label": "Kiểu"
             },
@@ -780,6 +840,9 @@
             "restriction": {
                 "label": "Kiểu"
             },
+            "restrictions": {
+                "label": "Hạn chế rẽ"
+            },
             "route": {
                 "label": "Kiểu"
             },
@@ -804,6 +867,9 @@
             "shop": {
                 "label": "Kiểu"
             },
+            "sloped_curb": {
+                "label": "Lề đường Dốc"
+            },
             "smoking": {
                 "label": "Hút thuốc"
             },
@@ -827,7 +893,8 @@
                     "bridge": "Cầu",
                     "tunnel": "Đường hầm",
                     "embankment": "Đường đắp cao",
-                    "cutting": "Đường xẻ"
+                    "cutting": "Đường xẻ",
+                    "ford": "Nơi Lội qua Sông"
                 }
             },
             "studio_type": {
@@ -839,6 +906,9 @@
             "surface": {
                 "label": "Mặt"
             },
+            "tactile_paving": {
+                "label": "Gạch dành cho Người Khiếm thị"
+            },
             "toilets/disposal": {
                 "label": "Phương pháp thải"
             },
@@ -882,6 +952,9 @@
             "wheelchair": {
                 "label": "Đi Xe lăn Được"
             },
+            "width": {
+                "label": "Chiều ngang (Mét)"
+            },
             "wikipedia": {
                 "label": "Wikipedia"
             },
@@ -1026,6 +1099,10 @@
                 "name": "Rửa xe",
                 "terms": "tiệm rửa xe, rửa xe, tiem rua xe, rua xe"
             },
+            "amenity/charging_station": {
+                "name": "Trạm Sạc Pin",
+                "terms": "trạm sạc pin, trạm sạc xe hơi điện, tram sac pin, tram sac xe hoi dien"
+            },
             "amenity/childcare": {
                 "name": "Giữ trẻ",
                 "terms": "giữ trẻ, giữ con nít, giữ đứa bé, giu tre, giu con nit, giu dua be"
@@ -1046,6 +1123,10 @@
                 "name": "Trường Cao đẳng",
                 "terms": "trường cao đẳng, cao đẳng, CĐ, truong cao dang, cao dang, CD"
             },
+            "amenity/compressed_air": {
+                "name": "Khí Nén",
+                "terms": "khí nén, không khí nén, khi nen, khong khi nen"
+            },
             "amenity/courthouse": {
                 "name": "Tòa",
                 "terms": "tòa án, tòa, toà án, toà, toa an, toa"
@@ -1058,6 +1139,10 @@
                 "name": "Bác sĩ",
                 "terms": "văn phòng bác sĩ, văn phòng bác sỹ, văn phòng thầy thuốc, van phong bac si, van phong bac sy, van phong thay thuoc"
             },
+            "amenity/dojo": {
+                "name": "Võ đường",
+                "terms": "võ đường, trường võ thuật, phòng tập võ thuật, võ thuật, karate, judo, nhu đạo, vo duong, truong vo thuat, phong tap vo thuat, vo thuat, nhu dao"
+            },
             "amenity/drinking_water": {
                 "name": "Nước Uống",
                 "terms": "máy nước, vòi nước uống, nước uống, uống, may nuoc, voi nuoc uong, nuoc uong, uong"
@@ -1083,8 +1168,8 @@
                 "terms": "cây xăng, cột xăng, xăng, ét xăng, ét-xăng, nhiên liệu, cay xang, cot xang, xang, et xang, et-xang, nhien lieu"
             },
             "amenity/grave_yard": {
-                "name": "Nghĩa địa",
-                "terms": "nghĩa địa, nghĩa trang, mộ, nghia dia, nghia trang, mo"
+                "name": "Nghĩa địa tại Nhà thờ",
+                "terms": "nghĩa địa tại nhà thờ, nghĩa trang, bãi tha ma, mộ, nghia dia tai nha tho, nghia trang, bai tha ma, mo"
             },
             "amenity/hospital": {
                 "name": "Sân Bệnh viện",
@@ -1110,6 +1195,10 @@
                 "name": "Bãi Đậu xe",
                 "terms": "bãi đậu xe, sân đậu xe, đậu xe, bãi đỗ xe, sân đỗ xe, đỗ xe, bai dau xe, san dau xe, dau xe, bai do xe, san do xe, do xe"
             },
+            "amenity/parking_entrance": {
+                "name": "Lối Ra vào Ga ra",
+                "terms": "lối ra vào ga ra, lối ra vào ga-ra, lối ra ga ra, lối vào ga ra, lối ra ga-ra, lối ra ga-ra, loi ra vao ga ra, loi ra vao ga-ra, loi ra ga ra, loi vao ga ra, loi ra ga-ra, loi ra ga-ra"
+            },
             "amenity/pharmacy": {
                 "name": "Nhà thuốc",
                 "terms": "nhà thuốc, tiệm thuốc, nha thuoc, tiem thuoc"
@@ -1355,8 +1444,8 @@
                 "terms": "ký túc xá, kí túc xá, ký túc sá, kí túc sá, cư xá, ky tuc xa, ki tuc xa, ky tuc sa, ki tuc sa, cu xa"
             },
             "building/entrance": {
-                "name": "Cửa vào",
-                "terms": "cửa vào, lối vào, cua vao, loi vao"
+                "name": "Cửa Ra vào",
+                "terms": "cửa ra vào, cửa ra, cửa vào, cổng vào, lối vào, cua ra vao, cua ra, cua vao, cong vao, loi vao"
             },
             "building/garage": {
                 "name": "Ga ra",
@@ -1538,7 +1627,7 @@
                 "name": "Chụp hình",
                 "terms": "nhà chụp hình, nhà nhiếp ảnh, phòng chụp hình, phòng nhiếp ảnh, cửa hàng chụp hình, tiệm chụp hình, tiệm nhiếp ảnh, cửa hàng nhiếp ảnh, chân dung, bức tranh, hình ảnh, máy ảnh, nha chup hinh, nha nhiep anh, phong chup hinh, phong nhiep anh, cua hang chup hinh, tiem chup hinh, tiem nhiep anh, cua hang nhiep anh, chan dung, buc tranh, hinh anh, may anh"
             },
-            "craft/photographic_labratory": {
+            "craft/photographic_laboratory": {
                 "name": "Rửa Hình",
                 "terms": "buồng tối, tiệm rửa ảnh, tiệm rửa hình, cửa hàng rửa ảnh, cửa hàng rửa hình, buong toi, tiem rua anh, tiem rua hinh, cua hang rua anh, cua hang rua hinh"
             },
@@ -1635,17 +1724,25 @@
                 "terms": "điện thoại khẩn cấp, dien thoai khan cap"
             },
             "entrance": {
-                "name": "Cửa vào",
-                "terms": "cửa vào, lối vào, cua vao, loi vao"
+                "name": "Lối Ra vào",
+                "terms": "lối vào, cửa ra vào, cửa ra, cửa vào, cổng vào, loi vao, cua ra vao, cua ra, cua vao, cong vao"
             },
             "footway/crossing": {
                 "name": "Lối Băng qua Đường",
                 "terms": "lối băng qua đường, lối qua đường, đường ngựa vằn, loi bang qua duong, loi qua duong, duong ngua van"
             },
+            "footway/crosswalk": {
+                "name": "Lối Băng qua Đường",
+                "terms": "lối băng qua đường, lối qua đường, đường ngựa vằn, loi bang qua duong, loi qua duong, duong ngua van"
+            },
             "footway/sidewalk": {
                 "name": "Lề đường",
                 "terms": "lề đường, vỉa hè, đường đi bộ, đường dạo, le duong, vie he, duong di bo, duong dao"
             },
+            "ford": {
+                "name": "Nơi Lội qua Sông",
+                "terms": "nơi lội qua sông, chỗ lội qua sông, nơi lội qua suối, chỗ lội qua suối, nơi cạn, chỗ cạn, noi loi qua song, cho loi qua song, noi lo qua suoi, cho loi qua suoi, noi can, cho can"
+            },
             "golf/bunker": {
                 "name": "Bẫy Cát",
                 "terms": "bẫy cát, hố cát, boongke, boong-ke, boong ke, bunker, bay cat, ho cat"
@@ -1694,6 +1791,10 @@
                 "name": "Lối Băng qua Đường",
                 "terms": "lối băng qua đường, lối qua đường, đường ngựa vằn, loi bang qua duong, loi qua duong, duong ngua van"
             },
+            "highway/crosswalk": {
+                "name": "Lối Băng qua Đường",
+                "terms": "lối băng qua đường, lối qua đường, đường ngựa vằn, loi bang qua duong, loi qua duong, duong ngua van"
+            },
             "highway/cycleway": {
                 "name": "Đường Xe đạp",
                 "terms": "đường xe đạp, đường mòn xe đạp, duong xe dap, duong mon xe dap"
@@ -1716,7 +1817,7 @@
             },
             "highway/motorway_junction": {
                 "name": "Giao lộ Đường Cao tốc",
-                "terms": "giao lộ đường cao tốc, giao lộ quốc lộ, giao lộ xa lộ liên tiểu bang, giao lộ xa lộ liên bang, giao lo duong cao toc, giao lo quoc lo, giao lo xa lo lien tieu bang, giao lo xa lo lien bang"
+                "terms": "giao lộ đường cao tốc, giao lộ quốc lộ, giao lộ xa lộ liên tiểu bang, giao lộ xa lộ liên bang, lối ra đường cao tốc, lối ra quốc lộ, lối ra xa lộ liên tiểu bang, lối ra xa lộ liên bang, giao lo duong cao toc, giao lo quoc lo, giao lo xa lo lien tieu bang, giao lo xa lo lien bang, loi ra duong cao toc, loi ra quoc lo, loi ra xa lo lien tieu bang, loi ra xa lo lien bang"
             },
             "highway/motorway_link": {
                 "name": "Nhánh Ra vào Đường Cao tốc",
@@ -1876,7 +1977,11 @@
             },
             "landuse/cemetery": {
                 "name": "Nghĩa địa",
-                "terms": "nghĩa địa, nghĩa trang, nghia dia, nghia trang"
+                "terms": "nghĩa địa, nghĩa trang, bãi tha ma, mộ, nghia dia, nghia trang, bai tha ma, mo"
+            },
+            "landuse/churchyard": {
+                "name": "Sân Nhà thờ",
+                "terms": "sân nhà thờ, khu đất nhà thờ, sân nhà thờ chính tòa, khu đất nhà thờ chính tòa, sân nhà thờ chính toà, khu đất nhà thờ chính toà, sân nhà thờ chánh tòa, khu đất nhà thờ chánh tòa, sân nhà thờ chánh toà, khu đất nhà thờ chánh tòa, san nha tho, khu dat nha tho, san nha tho chinh toa, khu dat nha tho chinh toa, san nha tho chanh toa, khu dat nha tho chanh toa"
             },
             "landuse/commercial": {
                 "name": "Thương mại",
@@ -1918,6 +2023,10 @@
                 "name": "Đồng cỏ",
                 "terms": "đồng cỏ, bãi cỏ, dong co, bai co"
             },
+            "landuse/military": {
+                "name": "Quân đội",
+                "terms": "quân đội, căn cứ quân đội, không quân, căn cứ không quân, hải quân, căn cứ hải quân, quân sự, lính, bộ đội, quan doi, can cu quan doi, khong quan, can cu khong quan, hai quan, can cu hai quan, quan su, linh, bo doi"
+            },
             "landuse/orchard": {
                 "name": "Vườn Cây",
                 "terms": "vườn cây, vườn trồng cây, vườn cây ăn trái, vườn cây ăn quả, vườn trái cây, vuon cay, vuon trong cay, vuon cay an trai, vuon cay an qua, vuon trai cay"
@@ -2019,8 +2128,8 @@
                 "terms": "đường trượt tàu, duong truot tau"
             },
             "leisure/sports_center": {
-                "name": "Trung tâm Thể thao",
-                "terms": "trung tâm thể thao, tòa nhà thể thao, toà nhà thể thao, trung tâm bơi lội, trung tâm spa, trung tâm thể dục, sân vận động trong nhà, SVĐ trong nhà, trung tam the thao, toa nha the thao, trung tam boi loi, trung tam spa, trung tam the duc, san van dong trong nha, svd trong nha"
+                "name": "Trung tâm Thể dục Thể thao",
+                "terms": "trung tâm thể thao, trung tâm thể dục, tòa nhà thể thao, toà nhà thể thao, tòa nhà thể dục, toà nhà thể dục, trung tâm bơi lội, trung tâm spa, trung tâm thể dục, sân vận động trong nhà, SVĐ trong nhà, trung tam the thao, trung tam theo duc, toa nha the thao, toa nha the duc, trung tam boi loi, trung tam spa, trung tam the duc, san van dong trong nha, svd trong nha"
             },
             "leisure/stadium": {
                 "name": "Sân vận động",
@@ -2306,6 +2415,14 @@
                 "name": "Địa phương",
                 "terms": "địa phương, dia phuong"
             },
+            "place/neighbourhood": {
+                "name": "Hàng xóm",
+                "terms": "hàng xóm, khu phố, hang xom, khu pho"
+            },
+            "place/suburb": {
+                "name": "Quận",
+                "terms": "quận, ngoại ô, phố, quan, ngoai o, pho"
+            },
             "place/town": {
                 "name": "Thị xã",
                 "terms": "thị xã, TX, thi xa"
@@ -2530,6 +2647,10 @@
                 "name": "Tiệm Hoa",
                 "terms": "quầy bán hoa, tiệm bán hoa, chỗ bán hoa, nơi bán hoa, cửa hàng hoa, cửa hàng bán hoa, nơi bán hoa, bông hoa, quay ban hoa, tiem ban hoa, cho ban hoa, noi ban hoa, cua hang hoa, cua hang ban hoa, noi ban hoa, bong hoa"
             },
+            "shop/funeral_directors": {
+                "name": "Nhà quàn",
+                "terms": "nhà quàn, nhà tang lễ, nha quan, nha tang le"
+            },
             "shop/furniture": {
                 "name": "Cửa hàng Nội thất",
                 "terms": "cửa hàng đồ đạc, chỗ đồ đạc, cửa hàng bán đồ đạc, tiệm bán đồ đạc, quầy bán đồ đạc, nơi bán đồ đạc, đồ gỗ, giường, bàn, ghế, đèn, cua hang do dac, cho do dac, cua hang ban do dac, tiem ban do dac, quay ban do dac, noi ban do dac, do go, giuong, ban, ghe, den"
@@ -2614,6 +2735,10 @@
                 "name": "Tiệm Chụp Hình",
                 "terms": "tiệm chụp hình, tiệm lấy hình, tiệm lấy ảnh, tiệm nhiếp ảnh, cửa hàng chụp hình, cửa hàng lấy hình, cửa hàng lấy ảnh, cửa hàng nhiếp ảnh, tiem chup hinh, tiem lay hinh, tiem lay anh, tiem nhiep anh, cua hang chup hinh, cua hang lay hinh, cua hang lay anh, cua hang nhiep anh"
             },
+            "shop/seafood": {
+                "name": "Tiệm Hải sản",
+                "terms": "tiệm hải sản, tiệm cá, tiem hai san, tiem ca"
+            },
             "shop/shoes": {
                 "name": "Tiệm Giày",
                 "terms": "tiệm giày, cửa hàng giày, chỗ bán giày, cửa hiệu giày, dép, tiem giay, cua hang giay, cho ban giay, cua hieu giay, dep"
@@ -2654,6 +2779,10 @@
                 "name": "Tiệm Phim",
                 "terms": "tiệm bán phim, tiệm bán video, tiệm mướn phim, tiệm mướn video, chỗ bán phim, chỗ mướn phim, cửa hàng phim, cửa hiệu phim, quầy bán phim, tiem ban phim, tiem ban video, tiem muon phim, tiem muon video, cho ban phim, cho muon phim, cua hang phim, cua hieu phim, quay ban phim"
             },
+            "shop/wine": {
+                "name": "Tiệm Rượu vang",
+                "terms": "tiệm rượu vang, nơi bán rượu vang, chỗ bán rượu vang, quầy bán rượu vang, cửa hàng rượu vang, cửa hàng bán rượu vang, tiệm bán rượu vang, tiem ruou vang, noi ban ruou vang, cho ban ruou vang, quay ban ruou vang, cua hang ruou vang, cua hang ban ruou vang, tiem ban ruou vang"
+            },
             "tourism": {
                 "name": "Du lịch",
                 "terms": "du lịch, máy bay, xe lửa, chuyến bay, nghỉ hè, du lich, may bay, xe lua, chuyen bay, nghi he"
@@ -2738,6 +2867,34 @@
                 "name": "Hạn chế",
                 "terms": "hạn chế, giới hạn, cấm chỉ, han che, gioi han, cam chi"
             },
+            "type/restriction/no_left_turn": {
+                "name": "Cấm Rẽ Trái",
+                "terms": "cấm rẽ trái, không rẽ trái, đừng rẽ trái, cấm quẹo trái, không quẹo trái, đừng quẹo trái, cấm ngoặt trái, không ngoặt trái, đừng ngoặt trái, cấm ngoắt trái, không ngoắt trái, đừng ngoắt trái, cấm quặt trái, không quặt trái, đừng quặt trái, cam re trai, khong re trai, dung re trai, cam queo trai, khong queo trai, dung queo trai, cam ngoat trai, khong ngoat trai, dung ngoat trai, cam ngoat trai, khong ngoat trai, dung ngoat trai, cam quat trai, khong quat trai, dung quat trai"
+            },
+            "type/restriction/no_right_turn": {
+                "name": "Cấm Rẽ Phải",
+                "terms": "cấm rẽ phải, không rẽ phải, đừng rẽ phải, cấm quẹo phải, không quẹo phải, đừng quẹo phải, cấm ngoặt phải, không ngoặt phải, đừng ngoặt phải, cấm ngoắt phải, không ngoắt phải, đừng ngoắt phải, cấm quặt phải, không quặt phải, đừng quặt phải, cam re phai, khong re phai, dung re phai, cam queo phai, khong queo phai, dung queo phai, cam ngoat phai, khong ngoat phai, dung ngoat phai, cam ngoat phai, khong ngoat phai, dung ngoat phai, cam quat phai, khong quat phai, dung quat phai"
+            },
+            "type/restriction/no_straight_on": {
+                "name": "Cấm Chạy Thẳng",
+                "terms": "cấm chạy thẳng, không chạy thẳng, đừng chạy thẳng, cam chay thang, khong chay thang, dung chay thang"
+            },
+            "type/restriction/no_u_turn": {
+                "name": "Cấm Quay Ngược",
+                "terms": "cấm quay ngược trở lại, không quay ngược trở lại, đừng quay ngược trở lại, cam quay nguoc tro lai, khong quay nguoc tro lai, dung quay nguoc tro lai, cam quay nguoc tro lai"
+            },
+            "type/restriction/only_left_turn": {
+                "name": "Chỉ Rẽ Trái",
+                "terms": "chỉ rẽ trái, chỉ cho phép rẽ trái, chỉ quẹo trái, chỉ cho phép quẹo trái, chỉ ngoặt trái, chỉ cho phép ngoặt trái, chỉ ngoắt trái, chỉ cho phép ngoắt trái, chỉ quặt trái, chỉ cho phép quặt trái, chi re trai, chi cho phep re trai, chi queo trai, chi cho phep queo trai, chi ngoat trai, chi cho phep ngoat trai, chi ngoat trai, chi cho phep ngoat trai, chi quat trai, chi cho phep quat trai"
+            },
+            "type/restriction/only_right_turn": {
+                "name": "Chỉ Rẽ Phải",
+                "terms": "chỉ rẽ phải, chỉ cho phép rẽ phải, chỉ quẹo phải, chỉ cho phép quẹo phải, chỉ ngoặt phải, chỉ cho phép ngoặt phải, chỉ ngoắt phải, chỉ cho phép ngoắt phải, chỉ quặt phải, chỉ cho phép quặt phải, chi re phai, chi cho phep re phai, chi queo phai, chi cho phep queo phai, chi ngoat phai, chi cho phep ngoat phai, chi ngoat phai, chi cho phep ngoat phai, chi quat phai, chi cho phep quat phai"
+            },
+            "type/restriction/only_straight_on": {
+                "name": "Cấm Rẽ Trái/Phải",
+                "terms": "cấm rẽ trái phải, không rẽ trái phải, đừng rẽ trái phải, cấm quẹo trái phải, không quẹo trái phải, đừng quẹo trái phải, chỉ chạy thẳng, chỉ cho phép chạy thẳng, cam re trai phai, khong re trai phai, dung re trai phai, cam queo trai phai, khong queo trai phai, dung queo trai phai, chi chay thang, chi cho phep chay thang"
+            },
             "type/route": {
                 "name": "Tuyến đường",
                 "terms": "tuyến đường, lộ trình, tuyen duong, lo trinh"
diff --git a/vendor/assets/iD/iD/locales/yue.json b/vendor/assets/iD/iD/locales/yue.json
index 83aa19ffa..52f246848 100644
--- a/vendor/assets/iD/iD/locales/yue.json
+++ b/vendor/assets/iD/iD/locales/yue.json
@@ -264,7 +264,6 @@
         "percent_brightness": "{opacity}% 光",
         "none": "無",
         "custom": "自訂",
-        "custom_prompt": "入個格模。有效字符係{z}、{x}、{y}對應Z/X/Y制及{u}對應四分格制。",
         "fix_misalignment": "校正對位誤差",
         "reset": "重設"
     },
@@ -1188,10 +1187,6 @@
                 "name": "商業樓宇",
                 "terms": "Commercial Building,商業建築物,商業樓宇"
             },
-            "building/entrance": {
-                "name": "入口",
-                "terms": "Entrance,入口"
-            },
             "building/garage": {
                 "name": "車庫",
                 "terms": "Garage,車庫"
@@ -1236,10 +1231,6 @@
                 "name": "求助電話",
                 "terms": "Emergency Phone,求助電話,緊急電話"
             },
-            "entrance": {
-                "name": "入口",
-                "terms": "Entrance,入口"
-            },
             "footway/crossing": {
                 "name": "路口",
                 "terms": "Crossing,路口"
@@ -1316,10 +1307,6 @@
                 "name": "高速公路",
                 "terms": "Motorway,高速公路"
             },
-            "highway/motorway_junction": {
-                "name": "高速公路口",
-                "terms": "Motorway Junction,高速公路交匯處,高速公路口,高速公路連接點"
-            },
             "highway/motorway_link": {
                 "name": "高速公路駁路",
                 "terms": "Motorway Link,高速公路匝道,高速公路引道,高速公路駁路"
@@ -1596,10 +1583,6 @@
                 "name": "船排",
                 "terms": "Slipway,船排,船架滑道,船臺"
             },
-            "leisure/sports_center": {
-                "name": "體育館",
-                "terms": "Sports Center,體育,體育中心,體育館"
-            },
             "leisure/stadium": {
                 "name": "大體育館",
                 "terms": "Stadium,大體育館,體育,體育場"
diff --git a/vendor/assets/iD/iD/locales/zh-CN.json b/vendor/assets/iD/iD/locales/zh-CN.json
index 542365244..372a15687 100644
--- a/vendor/assets/iD/iD/locales/zh-CN.json
+++ b/vendor/assets/iD/iD/locales/zh-CN.json
@@ -265,7 +265,7 @@
         "percent_brightness": "{opacity}%不透明度",
         "none": "空",
         "custom": "自定义",
-        "custom_prompt": "输入瓦片模板。Z/X/Y方案的有效标记是{z}，{x}，{y}，quadtile方案的有效标记是{u}。",
+        "custom_button": "编辑自定义背景",
         "fix_misalignment": "修复对齐",
         "reset": "重置"
     },
@@ -773,6 +773,9 @@
             "sport": {
                 "label": "运动"
             },
+            "sport_ice": {
+                "label": "体育"
+            },
             "structure": {
                 "label": "结构",
                 "placeholder": "未知种类",
@@ -1010,6 +1013,12 @@
                 "name": "墓地",
                 "terms": "墓地,坟地"
             },
+            "amenity/hospital": {
+                "name": "医院"
+            },
+            "amenity/kindergarten": {
+                "name": "幼儿园"
+            },
             "amenity/library": {
                 "name": "图书馆",
                 "terms": "图书馆"
@@ -1077,6 +1086,9 @@
                 "name": "餐馆",
                 "terms": "餐馆,餐厅,饭店,酒楼,酒家,茶楼"
             },
+            "amenity/school": {
+                "name": "学校"
+            },
             "amenity/shelter": {
                 "name": "亭",
                 "terms": "棚,棚屋"
@@ -1224,10 +1236,6 @@
             "building/construction": {
                 "name": "在建建筑"
             },
-            "building/entrance": {
-                "name": "入口",
-                "terms": "入口"
-            },
             "building/garage": {
                 "name": "车库",
                 "terms": "车库"
@@ -1274,6 +1282,16 @@
                 "name": "仓库",
                 "terms": "仓库,货栈"
             },
+            "craft/beekeeper": {
+                "name": "养蜂人"
+            },
+            "craft/blacksmith": {
+                "name": "铁匠"
+            },
+            "craft/bookbinder": {
+                "name": "装订工人",
+                "terms": "书籍钉装员,装订商,装订工,钉书匠"
+            },
             "craft/brewery": {
                 "name": "酿酒厂",
                 "terms": "酒厂,酿酒厂,酒坊"
@@ -1314,10 +1332,6 @@
                 "name": "紧急电话",
                 "terms": "紧急电话"
             },
-            "entrance": {
-                "name": "入口",
-                "terms": "入口"
-            },
             "footway/crossing": {
                 "name": "路口",
                 "terms": "路口"
@@ -1341,6 +1355,9 @@
                 "name": "开球区",
                 "terms": "开球区,发球台"
             },
+            "golf/water_hazard": {
+                "name": "障碍水池"
+            },
             "highway": {
                 "name": "道路",
                 "terms": "公路"
@@ -1377,10 +1394,6 @@
                 "name": "高速公路",
                 "terms": "高速公路"
             },
-            "highway/motorway_junction": {
-                "name": "高速公路连接点",
-                "terms": "高速公路连接点"
-            },
             "highway/motorway_link": {
                 "name": "高速公路匝道",
                 "terms": "高速公路匝道"
@@ -1629,6 +1642,9 @@
                 "name": "公园",
                 "terms": "公园"
             },
+            "leisure/picnic_table": {
+                "name": "野餐桌"
+            },
             "leisure/pitch": {
                 "name": "体育场",
                 "terms": "运动场,运动场所"
@@ -1669,10 +1685,6 @@
                 "name": "船台",
                 "terms": "船台"
             },
-            "leisure/sports_center": {
-                "name": "体育,体育中心",
-                "terms": "体育中心"
-            },
             "leisure/stadium": {
                 "name": "体育场",
                 "terms": "体育,体育场"
@@ -2252,6 +2264,9 @@
                 "name": "照相馆",
                 "terms": "照相馆"
             },
+            "shop/seafood": {
+                "name": "海鲜店"
+            },
             "shop/shoes": {
                 "name": "鞋店",
                 "terms": "鞋店"
diff --git a/vendor/assets/iD/iD/locales/zh-HK.json b/vendor/assets/iD/iD/locales/zh-HK.json
index 08ed4aacf..35a73a0a0 100644
--- a/vendor/assets/iD/iD/locales/zh-HK.json
+++ b/vendor/assets/iD/iD/locales/zh-HK.json
@@ -260,7 +260,6 @@
         "percent_brightness": "{opacity}% 光",
         "none": "無",
         "custom": "自訂",
-        "custom_prompt": "入個格模。有效字符係{z}、{x}、{y}對應Z/X/Y制及{u}對應四分格制。",
         "fix_misalignment": "校正對位誤差",
         "reset": "重設"
     },
@@ -1126,10 +1125,6 @@
                 "name": "商業樓宇",
                 "terms": "Commercial Building,商業建築物,商業樓宇"
             },
-            "building/entrance": {
-                "name": "入口",
-                "terms": "Entrance,入口"
-            },
             "building/garage": {
                 "name": "車庫",
                 "terms": "Garage,車庫"
@@ -1166,10 +1161,6 @@
                 "name": "求助電話",
                 "terms": "Emergency Phone,求助電話,緊急電話"
             },
-            "entrance": {
-                "name": "入口",
-                "terms": "Entrance,入口"
-            },
             "footway/crossing": {
                 "name": "路口",
                 "terms": "Crossing,路口"
@@ -1246,10 +1237,6 @@
                 "name": "高速公路",
                 "terms": "Motorway,高速公路"
             },
-            "highway/motorway_junction": {
-                "name": "高速公路口",
-                "terms": "Motorway Junction,高速公路交匯處,高速公路口,高速公路連接點"
-            },
             "highway/motorway_link": {
                 "name": "高速公路駁路",
                 "terms": "Motorway Link,高速公路匝道,高速公路引道,高速公路駁路"
@@ -1526,10 +1513,6 @@
                 "name": "船排",
                 "terms": "Slipway,船排,船架滑道,船臺"
             },
-            "leisure/sports_center": {
-                "name": "體育館",
-                "terms": "Sports Center,體育,體育中心,體育館"
-            },
             "leisure/stadium": {
                 "name": "大體育館",
                 "terms": "Stadium,大體育館,體育,體育場"
diff --git a/vendor/assets/iD/iD/locales/zh-TW.json b/vendor/assets/iD/iD/locales/zh-TW.json
index 7f43b4faa..298c666a1 100644
--- a/vendor/assets/iD/iD/locales/zh-TW.json
+++ b/vendor/assets/iD/iD/locales/zh-TW.json
@@ -71,7 +71,8 @@
                 "line": " 將線段變成環形。",
                 "area": "將一區域製成環形。"
             },
-            "not_closed": "非圈狀物件，不能環形化。"
+            "not_closed": "非圈狀物件，不能環形化。",
+            "too_large": "因物件尚未有足夠部份正在顯示，不能環形化。"
         },
         "orthogonalize": {
             "title": "方角化",
@@ -84,7 +85,8 @@
                 "line": "已將線段上的彎角換成直角。",
                 "area": "已將區域的彎角換成直角。"
             },
-            "not_squarish": "物件無法被方角化，因為它並非近似方形。"
+            "not_squarish": "物件無法被方角化，因為它並非近似方形。",
+            "too_large": "因物件尚未有足夠部份正在顯示，不能被方角化。"
         },
         "straighten": {
             "title": "拉直",
@@ -180,6 +182,18 @@
             },
             "not_eligible": "不能於線段的首尾進行分割。",
             "multiple_ways": "太多線段，未能進行分割。"
+        },
+        "restriction": {
+            "help": {
+                "select": "點擊以選擇一段道路",
+                "toggle": "點擊以切換轉向限制。",
+                "toggle_on": "點擊以增加\"{restriction}\"的限制。",
+                "toggle_off": "點擊以移除\"{restriction}\"的限制。"
+            },
+            "annotation": {
+                "create": "已增加轉向限制",
+                "delete": "已移除轉向限制"
+            }
         }
     },
     "undo": {
@@ -265,7 +279,8 @@
         "percent_brightness": "{opacity}%的光度",
         "none": "無",
         "custom": "客製化",
-        "custom_prompt": "輸入地圖影像區塊的模版。以 Z/X/Y 方式存取區塊的伺服器，可在模版中使用{z}, {x}, {y}作參數，而以quadtile存取區塊的伺服器，則可使用{u}作參數。",
+        "custom_button": "編輯自訂的背景",
+        "custom_prompt": "輸入地圖影像區塊的URL模版。以 Z/X/Y 方式存取區塊的伺服器，可在模版中使用{z}, {x}, {y}作參數，而以quadtile存取區塊的伺服器，則可使用{u}作參數。",
         "fix_misalignment": "校準",
         "reset": "重設"
     },
@@ -409,6 +424,9 @@
             "category-rail": {
                 "name": "鐵道"
             },
+            "category-restriction": {
+                "name": "限制"
+            },
             "category-road": {
                 "name": "道路"
             },
@@ -588,6 +606,9 @@
             "entrance": {
                 "label": "種類"
             },
+            "except": {
+                "label": "例外"
+            },
             "fax": {
                 "label": "傳真",
                 "placeholder": "+31 42 123 4567"
@@ -601,6 +622,9 @@
             "fixme": {
                 "label": "Fix Me"
             },
+            "fuel": {
+                "label": "加油站"
+            },
             "gauge": {
                 "label": "軌距"
             },
@@ -627,6 +651,9 @@
             "historic": {
                 "label": "種類"
             },
+            "hoops": {
+                "placeholder": "1, 2, 4..."
+            },
             "iata": {
                 "label": "IATA"
             },
@@ -694,10 +721,16 @@
                 "label": "種類"
             },
             "oneway": {
-                "label": "單行道"
+                "label": "單行道",
+                "options": {
+                    "undefined": "假設為否"
+                }
             },
             "oneway_yes": {
-                "label": "單程路"
+                "label": "單程路",
+                "options": {
+                    "undefined": "假設為是"
+                }
             },
             "opening_hours": {
                 "label": "小時"
@@ -770,6 +803,9 @@
             "restriction": {
                 "label": "種類"
             },
+            "restrictions": {
+                "label": "轉向限制"
+            },
             "route": {
                 "label": "種類"
             },
@@ -791,6 +827,9 @@
             "shop": {
                 "label": "種類"
             },
+            "smoking": {
+                "label": "吸煙"
+            },
             "social_facility_for": {
                 "label": "服務對象",
                 "placeholder": "露宿者，殘疾人士，小童等"
@@ -948,6 +987,9 @@
             "amenity/bar": {
                 "name": "酒吧"
             },
+            "amenity/bbq": {
+                "name": "燒烤"
+            },
             "amenity/bench": {
                 "name": "長椅"
             },
@@ -975,6 +1017,9 @@
                 "name": "洗車店",
                 "terms": "洗車行,洗車店"
             },
+            "amenity/charging_station": {
+                "name": "充電站"
+            },
             "amenity/childcare": {
                 "name": "托兒所",
                 "terms": "幼兒園,托兒所"
@@ -1036,6 +1081,9 @@
             "amenity/marketplace": {
                 "name": "市場"
             },
+            "amenity/nightclub": {
+                "name": "夜總會"
+            },
             "amenity/parking": {
                 "name": "停車場"
             },
@@ -1200,11 +1248,23 @@
             "building/apartments": {
                 "name": "分層公寓"
             },
+            "building/bunker": {
+                "name": "地堡"
+            },
+            "building/cathedral": {
+                "name": "大教堂"
+            },
+            "building/church": {
+                "name": "教堂"
+            },
             "building/commercial": {
                 "name": "商用樓宇"
             },
+            "building/construction": {
+                "name": "施工中屋宇"
+            },
             "building/entrance": {
-                "name": "入口"
+                "name": "入口/出口"
             },
             "building/garage": {
                 "name": "車庫"
@@ -1341,9 +1401,6 @@
             "craft/photographer": {
                 "name": "攝影店"
             },
-            "craft/photographic_labratory": {
-                "name": "沖印店"
-            },
             "craft/plasterer": {
                 "name": "批盪工程"
             },
@@ -1414,7 +1471,7 @@
                 "name": "緊急電話"
             },
             "entrance": {
-                "name": "入口"
+                "name": "入口/出口"
             },
             "footway/crossing": {
                 "name": "行人過路線"
@@ -1474,7 +1531,7 @@
                 "name": "高速公路"
             },
             "highway/motorway_junction": {
-                "name": "高速公路交匯處"
+                "name": "高速公路交匯處/出口"
             },
             "highway/motorway_link": {
                 "name": "高速公路引道"
@@ -1623,6 +1680,9 @@
             "landuse/industrial": {
                 "name": "工業區"
             },
+            "landuse/landfill": {
+                "name": "堆填區"
+            },
             "landuse/meadow": {
                 "name": "牧場"
             },
@@ -1695,7 +1755,7 @@
                 "name": "船架滑道"
             },
             "leisure/sports_center": {
-                "name": "體肓中心"
+                "name": "體肓中心/健身室"
             },
             "leisure/stadium": {
                 "name": "體育場"
@@ -2085,6 +2145,9 @@
             "shop/florist": {
                 "name": "花店"
             },
+            "shop/funeral_directors": {
+                "name": "殯儀館"
+            },
             "shop/furniture": {
                 "name": "傢具店"
             },
@@ -2241,6 +2304,27 @@
             "type/restriction": {
                 "name": "限制"
             },
+            "type/restriction/no_left_turn": {
+                "name": "不准左轉"
+            },
+            "type/restriction/no_right_turn": {
+                "name": "不准右轉"
+            },
+            "type/restriction/no_straight_on": {
+                "name": "不准直駛"
+            },
+            "type/restriction/no_u_turn": {
+                "name": "不准掉頭"
+            },
+            "type/restriction/only_left_turn": {
+                "name": "只准左轉"
+            },
+            "type/restriction/only_right_turn": {
+                "name": "只准右轉"
+            },
+            "type/restriction/only_straight_on": {
+                "name": "只准直駛"
+            },
             "type/route": {
                 "name": "路線"
             },
diff --git a/vendor/assets/iD/iD/locales/zh.json b/vendor/assets/iD/iD/locales/zh.json
index 77d17009e..14404c787 100644
--- a/vendor/assets/iD/iD/locales/zh.json
+++ b/vendor/assets/iD/iD/locales/zh.json
@@ -872,18 +872,12 @@
             "building/apartments": {
                 "name": "酒店公寓"
             },
-            "building/entrance": {
-                "name": "入口"
-            },
             "building/house": {
                 "name": "房屋"
             },
             "emergency/phone": {
                 "name": "紧急电话"
             },
-            "entrance": {
-                "name": "入口"
-            },
             "highway": {
                 "name": "公路"
             },
@@ -911,9 +905,6 @@
             "highway/motorway": {
                 "name": "高速公路"
             },
-            "highway/motorway_junction": {
-                "name": "高速公路连接点"
-            },
             "highway/motorway_link": {
                 "name": "高速公路匝道"
             },
diff --git a/vendor/assets/leaflet/leaflet.js b/vendor/assets/leaflet/leaflet.js
index e40bfbfaf..494709034 100644
--- a/vendor/assets/leaflet/leaflet.js
+++ b/vendor/assets/leaflet/leaflet.js
@@ -7,7 +7,7 @@
 var oldL = window.L,
     L = {};
 
-L.version = '0.7.2';
+L.version = '0.7.3';
 
 // define Leaflet for Node module pattern loaders, including Browserify
 if (typeof module === 'object' && typeof module.exports === 'object') {
@@ -2104,13 +2104,13 @@ L.Map = L.Class.extend({
 		var loading = !this._loaded;
 		this._loaded = true;
 
+		this.fire('viewreset', {hard: !preserveMapOffset});
+
 		if (loading) {
 			this.fire('load');
 			this.eachLayer(this._layerAdd, this);
 		}
 
-		this.fire('viewreset', {hard: !preserveMapOffset});
-
 		this.fire('move');
 
 		if (zoomChanged || afterZoomAnim) {
@@ -5083,7 +5083,8 @@ L.Path = (L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? L.Path :
 		}
 
 		this._requestUpdate();
-
+		
+		this.fire('remove');
 		this._map = null;
 	},
 
@@ -6605,12 +6606,12 @@ L.DomEvent = {
 		var timeStamp = (e.timeStamp || e.originalEvent.timeStamp),
 			elapsed = L.DomEvent._lastClick && (timeStamp - L.DomEvent._lastClick);
 
-		// are they closer together than 1000ms yet more than 100ms?
+		// are they closer together than 500ms yet more than 100ms?
 		// Android typically triggers them ~300ms apart while multiple listeners
 		// on the same event should be triggered far faster;
 		// or check if click is simulated on the element, and if it is, reject any non-simulated events
 
-		if ((elapsed && elapsed > 100 && elapsed < 1000) || (e.target._simulatedClick && !e._simulated)) {
+		if ((elapsed && elapsed > 100 && elapsed < 500) || (e.target._simulatedClick && !e._simulated)) {
 			L.DomEvent.stop(e);
 			return;
 		}
@@ -6708,6 +6709,7 @@ L.Draggable = L.Class.extend({
 		    offset = newPoint.subtract(this._startPoint);
 
 		if (!offset.x && !offset.y) { return; }
+		if (L.Browser.touch && Math.abs(offset.x) + Math.abs(offset.y) < 3) { return; }
 
 		L.DomEvent.preventDefault(e);
 
@@ -6718,7 +6720,8 @@ L.Draggable = L.Class.extend({
 			this._startPos = L.DomUtil.getPosition(this._element).subtract(offset);
 
 			L.DomUtil.addClass(document.body, 'leaflet-dragging');
-			L.DomUtil.addClass((e.target || e.srcElement), 'leaflet-drag-target');
+			this._lastTarget = e.target || e.srcElement;
+			L.DomUtil.addClass(this._lastTarget, 'leaflet-drag-target');
 		}
 
 		this._newPos = this._startPos.add(offset);
@@ -6734,9 +6737,13 @@ L.Draggable = L.Class.extend({
 		this.fire('drag');
 	},
 
-	_onUp: function (e) {
+	_onUp: function () {
 		L.DomUtil.removeClass(document.body, 'leaflet-dragging');
-		L.DomUtil.removeClass((e.target || e.srcElement), 'leaflet-drag-target');
+
+		if (this._lastTarget) {
+			L.DomUtil.removeClass(this._lastTarget, 'leaflet-drag-target');
+			this._lastTarget = null;
+		}
 
 		for (var i in L.Draggable.MOVE) {
 			L.DomEvent
@@ -7391,7 +7398,7 @@ L.Map.TouchZoom = L.Handler.extend({
 		    center = map.layerPointToLatLng(origin),
 		    zoom = map.getScaleZoom(this._scale);
 
-		map._animateZoom(center, zoom, this._startCenter, this._scale, this._delta);
+		map._animateZoom(center, zoom, this._startCenter, this._scale, this._delta, false, true);
 	},
 
 	_onTouchEnd: function () {
@@ -8376,8 +8383,8 @@ L.Control.Layers = L.Control.extend({
 
 	onRemove: function (map) {
 		map
-		    .off('layeradd', this._onLayerChange)
-		    .off('layerremove', this._onLayerChange);
+		    .off('layeradd', this._onLayerChange, this)
+		    .off('layerremove', this._onLayerChange, this);
 	},
 
 	addBaseLayer: function (layer, name) {
@@ -8918,9 +8925,11 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
 		return true;
 	},
 
-	_animateZoom: function (center, zoom, origin, scale, delta, backwards) {
+	_animateZoom: function (center, zoom, origin, scale, delta, backwards, forTouchZoom) {
 
-		this._animatingZoom = true;
+		if (!forTouchZoom) {
+			this._animatingZoom = true;
+		}
 
 		// put transform transition on all layers with leaflet-zoom-animated class
 		L.DomUtil.addClass(this._mapPane, 'leaflet-zoom-anim');
@@ -8934,14 +8943,16 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
 			L.Draggable._disabled = true;
 		}
 
-		this.fire('zoomanim', {
-			center: center,
-			zoom: zoom,
-			origin: origin,
-			scale: scale,
-			delta: delta,
-			backwards: backwards
-		});
+		L.Util.requestAnimFrame(function () {
+			this.fire('zoomanim', {
+				center: center,
+				zoom: zoom,
+				origin: origin,
+				scale: scale,
+				delta: delta,
+				backwards: backwards
+			});
+		}, this);
 	},
 
 	_onZoomTransitionEnd: function () {
diff --git a/vendor/assets/leaflet/leaflet.locate.js b/vendor/assets/leaflet/leaflet.locate.js
index 7e835c877..822b24da2 100644
--- a/vendor/assets/leaflet/leaflet.locate.js
+++ b/vendor/assets/leaflet/leaflet.locate.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2013 Dominik Moritz
+Copyright (c) 2014 Dominik Moritz
 
 This file is part of the leaflet locate control. It is licensed under the MIT license.
 You can find the project at: https://github.com/domoritz/leaflet-locatecontrol
@@ -34,6 +34,8 @@ L.Control.Locate = L.Control.extend({
             //color: '#FFA500',
             //fillColor: '#FFB000'
         },
+        icon: 'icon-location',  // icon-location or icon-direction
+        iconLoading: 'icon-spinner animate-spin',
         circlePadding: [0, 0],
         metric: true,
         onLocationError: function(err) {
@@ -41,17 +43,23 @@ L.Control.Locate = L.Control.extend({
             // that is not a time out error.
             alert(err.message);
         },
-        onLocationOutsideMapBounds: function(context) {
+        onLocationOutsideMapBounds: function(control) {
             // this event is repeatedly called when the location changes
+            control.stopLocate();
             alert(context.options.strings.outsideMapBoundsMsg);
         },
         setView: true, // automatically sets the map view to the user's location
+        // keep the current map zoom level when displaying the user's location. (if 'false', use maxZoom)
+        keepCurrentZoomLevel: false,
         strings: {
             title: "Show me where I am",
             popup: "You are within {distance} {unit} from this point",
             outsideMapBoundsMsg: "You seem located outside the boundaries of the map"
         },
-        locateOptions: {}
+        locateOptions: {
+            maxZoom: Infinity,
+            watch: true  // if you overwrite this, visualization cannot be updated
+        }
     },
 
     onAdd: function (map) {
@@ -62,9 +70,7 @@ L.Control.Locate = L.Control.extend({
         this._layer.addTo(map);
         this._event = undefined;
 
-        this._locateOptions = {
-            watch: true  // if you overwrite this, visualization cannot be updated
-        };
+        this._locateOptions = this.options.locateOptions;
         L.extend(this._locateOptions, this.options.locateOptions);
         L.extend(this._locateOptions, {
             setView: false // have to set this to false because we have to
@@ -79,7 +85,7 @@ L.Control.Locate = L.Control.extend({
         L.extend(tmp, this.options.circleStyle, this.options.followCircleStyle);
         this.options.followCircleStyle = tmp;
 
-        var link = L.DomUtil.create('a', 'control-button', container);
+        var link = L.DomUtil.create('a', 'control-button ' + this.options.icon, container);
         link.innerHTML = "<span class='icon geolocate'></span>";
         link.href = '#';
         link.title = this.options.strings.title;
@@ -88,7 +94,7 @@ L.Control.Locate = L.Control.extend({
             .on(link, 'click', L.DomEvent.stopPropagation)
             .on(link, 'click', L.DomEvent.preventDefault)
             .on(link, 'click', function() {
-                if (self._active && (map.getBounds().contains(self._event.latlng) || !self.options.setView ||
+                if (self._active && (self._event === undefined || map.getBounds().contains(self._event.latlng) || !self.options.setView ||
                     isOutsideMapBounds())) {
                     stopLocate();
                 } else {
@@ -109,9 +115,7 @@ L.Control.Locate = L.Control.extend({
                 startFollowing();
             }
             if (!self._event) {
-                L.DomUtil.addClass(self._container, "requesting");
-                L.DomUtil.removeClass(self._container, "active");
-                L.DomUtil.removeClass(self._container, "following");
+                setClasses('requesting');
             } else {
                 visualizeLocation();
             }
@@ -140,7 +144,7 @@ L.Control.Locate = L.Control.extend({
         };
 
         var startFollowing = function() {
-            map.fire('startfollowing');
+            map.fire('startfollowing', self);
             self._following = true;
             if (self.options.stopFollowingOnDrag) {
                 map.on('dragstart', stopFollowing);
@@ -148,7 +152,7 @@ L.Control.Locate = L.Control.extend({
         };
 
         var stopFollowing = function() {
-            map.fire('stopfollowing');
+            map.fire('stopfollowing', self);
             self._following = false;
             if (self.options.stopFollowingOnDrag) {
                 map.off('dragstart', stopFollowing);
@@ -172,7 +176,10 @@ L.Control.Locate = L.Control.extend({
                 if (isOutsideMapBounds()) {
                     self.options.onLocationOutsideMapBounds(self);
                 } else {
-                    map.fitBounds(self._event.bounds, { padding: self.options.circlePadding });
+                    map.fitBounds(self._event.bounds, {
+                        padding: self.options.circlePadding,
+                        maxZoom: self.options.keepCurrentZoomLevel ? map.getZoom() : self._locateOptions.maxZoom
+                    });
                 }
                 self._locateOnNextLocationFound = false;
             }
@@ -231,16 +238,34 @@ L.Control.Locate = L.Control.extend({
             if (!self._container)
                 return;
             if (self._following) {
-                L.DomUtil.removeClass(self._container, "requesting");
-                L.DomUtil.addClass(self._container, "active");
-                L.DomUtil.addClass(self._container, "following");
+                setClasses('following');
             } else {
-                L.DomUtil.removeClass(self._container, "requesting");
-                L.DomUtil.addClass(self._container, "active");
-                L.DomUtil.removeClass(self._container, "following");
+                setClasses('active');
             }
         };
 
+        var setClasses = function(state) {
+            if (state == 'requesting') {
+                L.DomUtil.removeClasses(self._container, "active following");
+                L.DomUtil.addClasses(self._container, "requesting");
+
+                L.DomUtil.removeClasses(link, self.options.icon);
+                L.DomUtil.addClasses(link, self.options.iconLoading);
+            } else if (state == 'active') {
+                L.DomUtil.removeClasses(self._container, "requesting following");
+                L.DomUtil.addClasses(self._container, "active");
+
+                L.DomUtil.removeClasses(link, self.options.iconLoading);
+                L.DomUtil.addClasses(link, self.options.icon);
+            } else if (state == 'following') {
+                L.DomUtil.removeClasses(self._container, "requesting");
+                L.DomUtil.addClasses(self._container, "active following");
+
+                L.DomUtil.removeClasses(link, self.options.iconLoading);
+                L.DomUtil.addClasses(link, self.options.icon);
+            }
+        }
+
         var resetVariables = function() {
             self._active = false;
             self._locateOnNextLocationFound = self.options.setView;
@@ -252,6 +277,9 @@ L.Control.Locate = L.Control.extend({
         var stopLocate = function() {
             map.stopLocate();
             map.off('dragstart', stopFollowing);
+            if (self.options.follow && self._following) {
+                stopFollowing();
+            }
 
             L.DomUtil.removeClass(self._container, "requesting");
             L.DomUtil.removeClass(self._container, "active");
@@ -265,7 +293,7 @@ L.Control.Locate = L.Control.extend({
 
         var onLocationError = function (err) {
             // ignore time out error if the location is watched
-            if (err.code == 3 && this._locateOptions.watch) {
+            if (err.code == 3 && self._locateOptions.watch) {
                 return;
             }
 
@@ -296,3 +324,17 @@ L.Map.addInitHook(function () {
 L.control.locate = function (options) {
     return new L.Control.Locate(options);
 };
+
+(function(){
+  // leaflet.js raises bug when trying to addClass / removeClass multiple classes at once
+  // Let's create a wrapper on it which fixes it.
+  var LDomUtilApplyClassesMethod = function(method, element, classNames) {
+    classNames = classNames.split(' ');
+    classNames.forEach(function(className) {
+        L.DomUtil[method].call(this, element, className);
+    });
+  };
+
+  L.DomUtil.addClasses = function(el, names) { LDomUtilApplyClassesMethod('addClass', el, names); }
+  L.DomUtil.removeClasses = function(el, names) { LDomUtilApplyClassesMethod('removeClass', el, names); }
+})();
diff --git a/vendor/assets/leaflet/leaflet.locationfilter.js b/vendor/assets/leaflet/leaflet.locationfilter.js
index 9a0af4db4..d120adc30 100644
--- a/vendor/assets/leaflet/leaflet.locationfilter.js
+++ b/vendor/assets/leaflet/leaflet.locationfilter.js
@@ -100,7 +100,8 @@ L.LocationFilter = L.Class.extend({
         },
         adjustButton: {
             text: "Select area within current zoom"
-        }
+        },
+        buttonPosition: 'topleft'
     },
 
     initialize: function(options) {
@@ -468,7 +469,10 @@ L.LocationFilter = L.Class.extend({
        toggles the location filter */
     _initializeButtonContainer: function() {
         var that = this;
-        this._buttonContainer = new L.Control.ButtonContainer({className: "location-filter button-container"});
+        this._buttonContainer = new L.Control.ButtonContainer({
+	    className: "location-filter button-container",
+	    position: this.options.buttonPosition
+	});
 
         if (this.options.enableButton) {
             this._enableButton = new L.Control.Button({