diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6c32b74b2..bc71f275f 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -134,8 +134,7 @@ class ApplicationController < ActionController::Base
 
   def check_api_readable
     if STATUS == :database_offline or STATUS == :api_offline
-      response.headers['Error'] = "Database offline for maintenance"
-      render :nothing => true, :status => :service_unavailable
+      report_error "Database offline for maintenance", :service_unavailable
       return false
     end
   end
@@ -143,16 +142,14 @@ class ApplicationController < ActionController::Base
   def check_api_writable
     if STATUS == :database_offline or STATUS == :database_readonly or
        STATUS == :api_offline or STATUS == :api_readonly
-      response.headers['Error'] = "Database offline for maintenance"
-      render :nothing => true, :status => :service_unavailable
+      report_error "Database offline for maintenance", :service_unavailable
       return false
     end
   end
 
   def require_public_data
     unless @user.data_public?
-      response.headers['Error'] = "You must make your edits public to upload new data"
-      render :nothing => true, :status => :forbidden
+      report_error "You must make your edits public to upload new data", :forbidden
       return false
     end
   end
@@ -165,7 +162,18 @@ class ApplicationController < ActionController::Base
   def report_error(message, status = :bad_request)
     # Todo: some sort of escaping of problem characters in the message
     response.headers['Error'] = message
-    render :text => message, :status => status
+
+    if request.headers['X-Error-Format'] and
+       request.headers['X-Error-Format'].downcase == "xml"
+      result = OSM::API.new.get_xml_doc
+      result.root.name = "osmError"
+      result.root << (XML::Node.new("status") << interpret_status(status))
+      result.root << (XML::Node.new("message") << message)
+
+      render :text => result.to_s, :content_type => "text/xml"
+    else
+      render :text => message, :status => status
+    end
   end
   
   def set_locale
diff --git a/app/models/user.rb b/app/models/user.rb
index 43f1bd851..79af5d71f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -10,7 +10,7 @@ class User < ActiveRecord::Base
   has_many :friends, :include => :befriendee, :conditions => "users.status IN ('active', 'confirmed')"
   has_many :tokens, :class_name => "UserToken"
   has_many :preferences, :class_name => "UserPreference"
-  has_many :changesets
+  has_many :changesets, :order => 'created_at DESC'
 
   has_many :client_applications
   has_many :oauth_tokens, :class_name => "OauthToken", :order => "authorized_at desc", :include => [:client_application]
@@ -108,7 +108,7 @@ class User < ActiveRecord::Base
     (languages & array.collect { |i| i.to_s }).first
   end
 
-  def nearby(radius = 50, num = 10)
+  def nearby(radius = NEARBY_RADIUS, num = NEARBY_USERS)
     if self.home_lon and self.home_lat 
       gc = OSM::GreatCircle.new(self.home_lat, self.home_lon)
       bounds = gc.bounds(radius)
diff --git a/app/views/browse/_changeset_details.html.erb b/app/views/browse/_changeset_details.html.erb
index 6e3cbdb2e..9fb9cb860 100644
--- a/app/views/browse/_changeset_details.html.erb
+++ b/app/views/browse/_changeset_details.html.erb
@@ -84,7 +84,7 @@
       <td>
         <table cellpadding="0">
           <% @relations.each do |relation| %>
-          <tr><td><%= link_to h(printable_name(relation, true)), { :action => "relation", :id => relation.id.to_s }, :class => "relation " %></td></tr>
+          <tr><td><%= link_to h(printable_name(relation, true)), { :action => "relation", :id => relation.id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %></td></tr>
           <% end %>
         </table>
       </td>
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 2eae3963a..4497e7e81 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -130,14 +130,14 @@
       <% end %>
 
       <div id="left_menu" class="left_menu">
-        <%= t 'layouts.help_and_wiki',
-            :help => link_to(t('layouts.help'), t('layouts.help_url'), :title => t('layouts.help_title')),
-            :wiki => link_to(t('layouts.wiki'), t('layouts.wiki_url'), :title => t('layouts.wiki_title'))
-        %><br />
-        <%= link_to t('layouts.copyright'), {:controller => 'site', :action => 'copyright'} %><br />
-        <a href="http://blogs.openstreetmap.org/" title="<%= t 'layouts.news_blog_tooltip' %>"><%= t 'layouts.news_blog' %></a><br />
-        <a href="<%= t 'layouts.shop_url' %>" title="<%= t 'layouts.shop_tooltip' %>"><%= t 'layouts.shop' %></a><br />
-        <%= yield :left_menu %>
+        <ul>
+          <li><%= link_to(t('layouts.help_centre'), t('layouts.help_url'), :title => t('layouts.help_title')) %></li>
+          <li><%= link_to(t('layouts.documentation'), t('layouts.wiki_url'), :title => t('layouts.documentation_title')) %></li>
+          <li><%= link_to t('layouts.copyright'), {:controller => 'site', :action => 'copyright'} %></li>
+          <li><a href="http://blogs.openstreetmap.org/" title="<%= t 'layouts.community_blogs_title' %>"><%= t 'layouts.community_blogs' %></a></li>
+          <li><a href="http://www.osmfoundation.org" title="<%= t 'layouts.foundation_title' %>"><%= t 'layouts.foundation' %></a></li>
+          <%= yield :left_menu %>
+        </ul>
       </div>
 
       <%= yield :optionals %>
diff --git a/app/views/site/_key.html.erb b/app/views/site/_key.html.erb
index e990071c8..6fc70ef46 100644
--- a/app/views/site/_key.html.erb
+++ b/app/views/site/_key.html.erb
@@ -29,5 +29,5 @@
 </script>
 
 <% content_for :left_menu do %>
-  <%= link_to_function t('site.key.map_key'), "openMapKey()", :title => t('site.key.map_key_tooltip') %>
+  <li><%= link_to_function t('site.key.map_key'), "openMapKey()", :title => t('site.key.map_key_tooltip') %></li>
 <% end %>
diff --git a/app/views/site/_potlatch.html.erb b/app/views/site/_potlatch.html.erb
index 68205b6ff..18e1c4cce 100644
--- a/app/views/site/_potlatch.html.erb
+++ b/app/views/site/_potlatch.html.erb
@@ -8,7 +8,7 @@
 
 <script type="text/javascript" defer="defer">
   var brokenContentSize = $("content").offsetWidth == 0;
-  var fo = new SWFObject("/potlatch/potlatch.swf?d="+Math.round(Math.random()*1000), "potlatch", "100%", "100%", "6", "#FFFFFF");
+  var fo = new SWFObject("<%= asset_path("/potlatch/potlatch.swf") %>", "potlatch", "100%", "100%", "6", "#FFFFFF");
   // 700,600 for fixed size, 100%,100% for resizable
   var changesaved=true;
   var winie=false; if (document.all && window.print) { winie=true; }
diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb
index a72975dd7..b2eda87d5 100644
--- a/app/views/site/_potlatch2.html.erb
+++ b/app/views/site/_potlatch2.html.erb
@@ -8,7 +8,7 @@
 
 <script type="text/javascript" defer="defer">
   var brokenContentSize = $("content").offsetWidth == 0;
-  var fo = new SWFObject("/potlatch2/potlatch2.swf?d="+Math.round(Math.random()*1000), "potlatch", "100%", "100%", "9", "#FFFFFF");
+  var fo = new SWFObject("<%= asset_path("/potlatch2/potlatch2.swf") %>", "potlatch", "100%", "100%", "9", "#FFFFFF");
   // 700,600 for fixed size, 100%,100% for resizable
   var changesaved=true;
   
@@ -27,9 +27,12 @@
     <% if params['gpx'] %>
     fo.addVariable('gpx' ,'<%= h(params['gpx']) %>');
     <% end %>
+    <% if params['tileurl'] %>
+    fo.addVariable('tileurl' ,'<%= h(params['tileurl']) %>');
+    <% end %>
     fo.addVariable("zoom",zoom);
-    fo.addVariable("api","http://<%= SERVER_URL %>/api/<%= API_VERSION %>/");
-    fo.addVariable("policy","http://<%= SERVER_URL %>/api/crossdomain.xml");
+    fo.addVariable("api","<%= request.protocol + request.host_with_port %>/api/<%= API_VERSION %>/");
+    fo.addVariable("policy","<%= request.protocol + request.host_with_port %>/api/crossdomain.xml");
     fo.addVariable("connection","XML");
     fo.addVariable("oauth_token","<%= token.token %>");
     fo.addVariable("oauth_token_secret","<%= token.secret %>");
diff --git a/app/views/site/_search.html.erb b/app/views/site/_search.html.erb
index 31b5af16f..f487e8f4a 100644
--- a/app/views/site/_search.html.erb
+++ b/app/views/site/_search.html.erb
@@ -41,7 +41,7 @@
                        :complete => "endSearch()",
                        :url => { :controller => :geocoder, :action => :search },
                        :html => { :method => "get", :action => url_for(:action => "index") }) do %>
-      <%= text_field_tag :query, h(params[:query]) %>
+      <%= text_field_tag :query, h(params[:query]), :tabindex => "1" %>
       <% if params[:action] == 'index' %>
         <%= hidden_field_tag :minlon %>
         <%= hidden_field_tag :minlat %>
diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index 7b1d874e7..0a0b7c1da 100644
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -1,6 +1,6 @@
 <% content_for :greeting do %>
 <% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
-  <%= link_to_function t('layouts.home'), "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)", { :title => t('layouts.home_tooltip') } %> |
+  <%= link_to_function t('layouts.home'), "setPosition(#{@user.home_lat}, #{@user.home_lon}, 15)", { :title => t('layouts.home_tooltip') } %> |
 <% end %>
 <% end %>
 
@@ -66,18 +66,17 @@ if params['node'] or params['way'] or params['relation']
     end
 end
 
+# Decide on a lat lon to initialise the map with. Various ways of doing this
 if params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat']
     bbox = true
     minlon = h(params['minlon'])
     minlat = h(params['minlat'])
     maxlon = h(params['maxlon'])
     maxlat = h(params['maxlat'])
+    layers = h(params['layers'])
     box = true if params['box']=="yes"
     object_zoom = false
-end
-
-# Decide on a lat lon to initialise the map with. Various ways of doing this
-if params['lon'] and params['lat']
+elsif params['lon'] and params['lat']
     lon =  h(params['lon'])
     lat =  h(params['lat'])
     zoom =  h(params['zoom'] || '5')
@@ -278,7 +277,7 @@ end
     $("linkloader").src = "http://127.0.0.1:8111/load_and_zoom?left=" + extent.left + "&top=" + extent.top + "&right=" + extent.right + "&bottom=" + extent.bottom;
 
     setTimeout(function () {
-      if (!loaded) alert("<%= t('site.index.remote_failed') %>");
+      if (!loaded) alert("<%= escape_javascript(t('site.index.remote_failed')) %>");
     }, 1000);
 
     event.stop();
diff --git a/app/views/user/_contact.html.erb b/app/views/user/_contact.html.erb
index e0babce7e..bcab838ba 100644
--- a/app/views/user/_contact.html.erb
+++ b/app/views/user/_contact.html.erb
@@ -1,5 +1,5 @@
 <tr>
-  <td rowspan="2">
+  <td rowspan="3">
     <%= user_thumbnail contact %>
   </td>
   <td>
@@ -14,6 +14,20 @@
     <% end %>
   </td>
 </tr>
+<tr>
+  <td>
+    <% changeset = contact.changesets.first %>
+    <% if changeset %>
+      <%= t('user.view.latest edit', :ago => t('user.view.ago', :time_in_words_ago => time_ago_in_words(changeset.created_at))) %>
+      <% comment = changeset.tags['comment'] ? changeset.tags['comment'] : t('changeset.changeset.no_comment') %>
+      "<%= link_to(comment,
+                          {:controller => 'browse', :action => 'changeset', :id => changeset.id},
+                          {:title => t('changeset.changeset.view_changeset_details')})
+      %>"
+    <% else %>
+     <%= t'changeset.changeset.no_edits' %>
+    <% end %>
+  </td>
 <tr>
   <td>
     <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => contact.display_name %>
diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index 72c768713..4515f412d 100644
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -1,67 +1,51 @@
-<h1><%= t 'user.login.heading' %></h1>
+<div id="login_wrapper">
 
-<p><%= t 'user.login.please login', :create_user_link => link_to(t('user.login.create_account'), :controller => 'user', :action => 'new', :referer => params[:referer]) %></p>
+  <div id="login_login">
+    <h1><%= t 'user.login.heading' %></h1>
 
-<% form_tag({ :action => "login" }, { :id => "login_form" }) do %>
-  <%= hidden_field_tag('referer', h(params[:referer])) %>
+    <% form_tag({ :action => "login" }, { :id => "login_form" }) do %>
+      <%= hidden_field_tag('referer', h(params[:referer])) %>
 
-  <div style="position: relative;">
-    <div class="loginBox">
-      <h3><%= t 'user.login.username_heading' %></h3>
-      <table>
+      <p><%= t 'user.login.with username' %></p>
+
+      <table id="loginForm">
+        <tr><td class="fieldName"><%= t 'user.login.email or username' %></td><td><%= text_field('user', 'email',{:value => "", :size => 28, :maxlength => 255, :tabindex => 1}) %></td></tr>
+        <tr><td class="fieldName"><%= t 'user.login.password' %></td><td><%= password_field('user', 'password',{:value => "", :size => 28, :maxlength => 255, :tabindex => 2}) %> <span class="minorNote">(<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)</span></td></tr>
+        <tr><td class="fieldName"><label for="remember_me"><%= t 'user.login.remember' %></label></td><td><%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %></td></tr>
+      </table>
+      <%= submit_tag t('user.login.login_button'), :tabindex => 3 %>
+
+      <p><%= t 'user.login.with openid' %></p>
+
+      <table id="login_openid_buttons">
         <tr>
-          <td class="fieldName"><label for="user_email"><%= t 'user.login.email or username' %></label></td>
-          <td><%= text_field_tag("username", "", { :size => 28, :maxlength => 255, :tabindex => 1 }) %></td>
+          <td>
+            <%=
+              link_to_function(image_tag("openid_large.png", :alt => t("user.login.openid_providers.openid.title")), nil, :title => t("user.login.openid_providers.openid.title")) do |page|
+                page[:login_form][:openid_url].value = "http://"
+                page[:login_openid_buttons].hide
+                page[:login_openid_url].show
+                page[:login_openid_submit].show
+              end
+            %>
+          </td>
+          <td><%= openid_button "yahoo", "me.yahoo.com" %></td>
+          <td><%= openid_button "google", "gmail.com" %></td>
         </tr>
         <tr>
-          <td class="fieldName"><label for="user_password"><%= t 'user.login.password' %></label></td>
-          <td><%= password_field_tag("password", "", { :size => 28, :maxlength => 255, :tabindex => 2 }) %></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td><span class="minorNote">(<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)</span></td>
-        </tr>
-        <tr>
-          <td class="fieldName"><label for="remember_me"><%= t 'user.login.remember' %></label></td>
-          <td><%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %></td>
+          <td><%= openid_button "myopenid", "myopenid.com" %></td>
+          <td><%= openid_button "wordpress", "wordpress.com" %></td>
+          <td><%= openid_button "myspace", "myspace.com" %></td>
         </tr>
       </table>
 
-      <%= submit_tag t('user.login.login_button'), :tabindex => 4 %>
-    </div>
-
-    <div style="float:left; width: 20px; padding: 10px;">
-    </div>
-
-    <div class="loginBox">
-      <h3><%= t 'user.login.openid_heading' %></h3>
-      <div id="openid_buttons">
-        <%=
-          link_to_function(image_tag("openid_large.png", :alt => t("user.login.openid_providers.openid.title")), nil, :title => t("user.login.openid_providers.openid.title")) do |page|
-            page[:login_form][:openid_url].value = "http://"
-            page[:openid_buttons].hide
-            page[:openid_url].show
-            page[:openid_url_hint].show
-            page[:openid_submit].show
-          end
-        %>
-        <%= openid_button "yahoo", "me.yahoo.com" %>
-        <%= openid_button "google", "gmail.com" %>
-        <%= openid_button "myopenid", "myopenid.com" %>
-        <%= openid_button "wordpress", "wordpress.com" %>
-        <%= openid_button "myspace", "myspace.com" %>
-      </div>
-
       <table>
-        <tr id="openid_url">
+        <tr id="login_openid_url">
           <td class="fieldName nowrap">
             <%= t 'user.login.openid', :logo => openid_logo %>
           </td>
-          <td><%= text_field_tag("openid_url", "", { :size => 28, :maxlength => 255, :tabindex => 3, :class => "openid_url" }) %></td>
-        </tr>
-        <tr id="openid_url_hint">
-          <td></td>
           <td>
+            <%= text_field_tag("openid_url", "", { :size => 28, :maxlength => 255, :tabindex => 3, :class => "openid_url" }) %>
             <span class="minorNote">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</span>
           </td>
         </tr>
@@ -71,15 +55,26 @@
         </tr>
       </table>
 
-      <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "openid_submit" %>
-    </div>
+      <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %>
+    <% end %>
+
+    <br clear="both">
   </div>
-<% end %>
+
+  <div id="login_signup">
+    <h2><%= t 'user.login.new to osm' %></h2>
+    <p><%= t 'user.login.to make changes' %></p>
+    <p><%= t 'user.login.create account minute' %></p></p>
+    <p><%= button_to t('user.login.register now'), :action => :new, :referer => params[:referer] %></p>
+
+    <br clear="both">
+  </div>
+
+</div>
 
 <%=
   update_page_tag do |page|
-    page[:openid_url].hide
-    page[:openid_url_hint].hide
-    page[:openid_submit].hide
+    page[:login_openid_url].hide
+    page[:login_openid_submit].hide
   end
 %>
diff --git a/config/environment.rb b/config/environment.rb
index 6d6c952fb..52cf5528c 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -25,7 +25,7 @@ Rails::Initializer.run do |config|
   config.gem 'httpclient'
   config.gem 'SystemTimer', :version => '>= 1.1.3', :lib => 'system_timer'
   config.gem 'sanitize'
-  config.gem 'i18n', :version => '>= 0.4.1'
+  config.gem 'i18n', :version => '= 0.4.1'
 
   # Only load the plugins named here, in the order given (default is alphabetical).
   # :all can be used as a placeholder for all plugins not explicitly named
diff --git a/config/example.application.yml b/config/example.application.yml
index c88d894a0..303c5626a 100644
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -41,6 +41,10 @@ standard_settings: &standard_settings
   # Quova authentication details
   #quova_username: ""
   #quova_password: ""
+  # Users to show as being nearby
+  nearby_users: 30
+  # Max radius, in km, for nearby users
+  nearby_radius: 50
   # Spam threshold
   spam_threshold: 50
   # Default legale (jurisdiction location) for contributor terms
diff --git a/config/initializers/asset_tag_helper.rb b/config/initializers/asset_tag_helper.rb
new file mode 100644
index 000000000..c1c2c94a4
--- /dev/null
+++ b/config/initializers/asset_tag_helper.rb
@@ -0,0 +1,9 @@
+module ActionView
+  module Helpers
+    module AssetTagHelper
+      def asset_path(source)
+        compute_public_path(source, nil)
+      end
+    end
+  end
+end
diff --git a/config/initializers/memory_limits.rb b/config/initializers/memory_limits.rb
index e2dcee23c..d3bd7a16b 100644
--- a/config/initializers/memory_limits.rb
+++ b/config/initializers/memory_limits.rb
@@ -18,7 +18,7 @@ if defined?(SOFT_MEMORY_LIMIT) and defined?(PhusionPassenger)
       
       # Restart if we've hit our memory limit
       if resident_size > SOFT_MEMORY_LIMIT
-        Process.kill("USR1", 0)
+        Process.kill("USR1", Process.pid)
       end
       
       # Return the result of this request
diff --git a/config/key.yml b/config/key.yml
index 83d47cdf5..f3dfc58ed 100644
--- a/config/key.yml
+++ b/config/key.yml
@@ -53,3 +53,39 @@ mapnik:
 
 osmarender:
   - { min_zoom: 0, max_zoom: 18, name: motorway, image: motorway.png }
+  - { min_zoom: 0, max_zoom: 18, name: trunk, image: trunk.png }
+  - { min_zoom: 7, max_zoom: 18, name: primary, image: primary.png }
+  - { min_zoom: 9, max_zoom: 18, name: secondary, image: secondary.png }
+  - { min_zoom: 13, max_zoom: 18, name: unsurfaced, image: unsurfaced.png }
+  - { min_zoom: 13, max_zoom: 18, name: track, image: track.png }
+  - { min_zoom: 13, max_zoom: 18, name: byway, image: byway.png }
+  - { min_zoom: 13, max_zoom: 18, name: bridleway, image: bridleway.png }
+  - { min_zoom: 13, max_zoom: 18, name: cycleway, image: cycleway.png }
+  - { min_zoom: 13, max_zoom: 18, name: footway, image: footway.png }
+  - { min_zoom: 8, max_zoom: 18, name: rail, image: rail.png }
+  - { min_zoom: 13, max_zoom: 18, name: subway, image: subway.png }
+  - { min_zoom: 13, max_zoom: 18, name: tram, image: tram.png }
+  - { min_zoom: 0, max_zoom: 18, name: admin, image: admin.png }
+  - { min_zoom: 9, max_zoom: 18, name: forest, image: forest.png }
+  - { min_zoom: 10, max_zoom: 18, name: wood, image: wood.png }
+  - { min_zoom: 10, max_zoom: 18, name: park, image: park.png }
+  - { min_zoom: 8, max_zoom: 18, name: resident, image: resident.png }
+  - { min_zoom: 10, max_zoom: 18, name: tourist, image: tourist.png }
+  - { min_zoom: 10, max_zoom: 18, name: common, image: common.png }
+  - { min_zoom: 10, max_zoom: 18, name: retail, image: retail.png }
+  - { min_zoom: 10, max_zoom: 18, name: industrial, image: industrial.png }
+  - { min_zoom: 10, max_zoom: 18, name: commercial, image: commercial.png }
+  - { min_zoom: 10, max_zoom: 18, name: heathland, image: heathland.png }
+  - { min_zoom: 7, max_zoom: 18, name: lake, image: lake.png }
+  - { min_zoom: 10, max_zoom: 18, name: farm, image: farm.png }
+  - { min_zoom: 10, max_zoom: 18, name: brownfield, image: brownfield.png }
+  - { min_zoom: 11, max_zoom: 18, name: cemetery, image: cemetery.png }
+  - { min_zoom: 11, max_zoom: 18, name: allotments, image: allotments.png }
+  - { min_zoom: 11, max_zoom: 18, name: pitch, image: pitch.png }
+  - { min_zoom: 11, max_zoom: 18, name: centre, image: centre.png }
+  - { min_zoom: 11, max_zoom: 18, name: reserve, image: reserve.png }
+  - { min_zoom: 11, max_zoom: 18, name: military, image: military.png }
+  - { min_zoom: 12, max_zoom: 18, name: school, image: school.png }
+  - { min_zoom: 12, max_zoom: 18, name: building, image: building.png }
+  - { min_zoom: 12, max_zoom: 18, name: station, image: station.png }
+  - { min_zoom: 12, max_zoom: 18, name: summit, image: summit.png }
diff --git a/config/locales/af.yml b/config/locales/af.yml
index 59fa5f751..b46a3b6ac 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -779,11 +779,7 @@ af:
     make_a_donation: 
       text: Maak 'n donasie
       title: Ondersteun OpenStreetMap met'n geldelike donasie
-    news_blog: Nuusjoernale
-    news_blog_tooltip: Nuusjoernaal oor OpenStreetMap, vrye geografiese data, ensovoorts.
     osm_read_only: Die OpenStreetMap-databasis kan op die oomblik slegs gelees word aangesien noodsaaklik onderhoud tans uitgevoer word.
-    shop: Winkel
-    shop_tooltip: Winkel met OpenStreetMap-produkte
     sign_up: registreer
     sign_up_tooltip: Skep 'n rekening vir wysigings
     tag_line: Die vrye wiki-wêreldkaart
diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index 7185efe70..2ce6f4f5c 100644
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -906,12 +906,8 @@ aln:
     make_a_donation: 
       text: Bëni një donacion
       title: OpenStreetMap Mbështetje me një donacion monetar
-    news_blog: Lajme blog
-    news_blog_tooltip: blog Lajmet rreth OpenStreetMap, të dhëna pa pagesë gjeografike, etj
     osm_offline: Baza e të dhanave të OpenStreetMap niher për niher jasht funksioni derisa disa punë themelore po kryhen në bazën e të dhanave.
     osm_read_only: Baza e të dhënave OpenStreetMap është aktualisht në mënyrë read-only ndërsa thelbësor bazës së të dhënave mirëmbajtjen puna është kryer.
-    shop: Dyqan
-    shop_tooltip: Dyqan me mallra të markës OpenStreetMap
     sign_up: regjistrohu
     sign_up_tooltip: Krijo një llogari për përpunim
     tag_line: Free Harta Wiki Botërore
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index fa42ad6af..fdb738b66 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -915,12 +915,8 @@ ar:
     make_a_donation: 
       text: تبرع
       title: ادعم خريطة الشارع المفتوحة بهبة نقدية
-    news_blog: مدونة الأخبار
-    news_blog_tooltip: مدونة أخبار حول خريطة الشارع المفتوحة، بيانات جغرافية حرة، وما إلى ذلك.
     osm_offline: حاليًا قاعدة بيانات خريطة الشارع المفتوحة مغلقة بينما يتم الانتهاء من أعمال الصيانة الأساسية لقاعدة البيانات.
     osm_read_only: حاليًا قاعدة بيانات خريطة الشارع المفتوحة في وضع القراءة بينما يتم الانتهاء من أعمال الصيانة الأساسية لقاعدة البيانات.
-    shop: المتجر
-    shop_tooltip: تسوق بضائع داعمة لخريطة الشارع المفتوحة
     sign_up: أنشئ حسابًا
     sign_up_tooltip: أنشئ حسابًا كي تستطيع المساهمة
     tag_line: ويكي خريطة العالم الحرة
diff --git a/config/locales/arz.yml b/config/locales/arz.yml
index e1549fe50..90c9946be 100644
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@@ -846,12 +846,8 @@ arz:
     make_a_donation: 
       text: تبرع
       title: ادعم خريطه الشارع المفتوحه بهبه نقدية
-    news_blog: مدونه الأخبار
-    news_blog_tooltip: مدونه أخبار حول خريطه الشارع المفتوحه، بيانات جغرافيه حره، وما إلى ذلك.
     osm_offline: حاليًا قاعده بيانات خريطه الشارع المفتوحه مغلقه بينما يتم الانتهاء من أعمال الصيانه الأساسيه لقاعده البيانات.
     osm_read_only: حاليًا قاعده بيانات خريطه الشارع المفتوحه فى وضع القراءه بينما يتم الانتهاء من أعمال الصيانه الأساسيه لقاعده البيانات.
-    shop: المتجر
-    shop_tooltip: تسوق بضائع داعمه لخريطه الشارع المفتوحة
     sign_up: أنشئ حسابًا
     sign_up_tooltip: أنشئ حسابًا كى تستطيع المساهمة
     tag_line: ويكى خريطه العالم الحرة
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 9b975413f..9ccdcc4c1 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -307,12 +307,8 @@ be:
     logout_tooltip: выйсці
     make_a_donation: 
       text: Зрабіць ахвяраванне
-    news_blog: Блог навінаў
-    news_blog_tooltip: Блог навін OpenStreetMap, дармовыя геаданыя, і г.д.
     osm_offline: База дадзеных OpenStreetMap зараз па-за сецівам, таму што праходзіць неабходная тэхнічная праца.
     osm_read_only: База дадзеных OpenStreetMap зараз даступная толькі для чытання, таму што праходзіць неабходная тэхнічная праца.
-    shop: Крама
-    shop_tooltip: Крама з фірмовай сімволікай OpenStreetMap
     sign_up: Зарэгістравацца
     sign_up_tooltip: Стварыць акаўнт для рэдагавання
     tag_line: Свабодная Wiki-карта свету
diff --git a/config/locales/br.yml b/config/locales/br.yml
index f2ff97a35..592f81f2d 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -282,6 +282,8 @@ br:
       title_bbox: Strolladoù kemmoù e-barzh {{bbox}}
       title_user: Strolladoù kemmoù gant {{user}}
       title_user_bbox: Strolladoù kemmoù gant {{user}} e-barzh {{bbox}}
+    timeout: 
+      sorry: Ho tigarez, re hir eo adtapout ar roll cheñchamantoù hoc'h eus goulennet.
   diary_entry: 
     diary_comment: 
       comment_from: Addispleg gant {{link_user}}  d'an {{comment_created_at}}
@@ -349,6 +351,17 @@ br:
       save_button: Enrollañ
       title: Deizlevr {{user}} | {{title}}
       user_title: Deizlevr {{user}}
+  editor: 
+    default: Dre ziouer ({{name}} er mare-mañ)
+    potlatch: 
+      description: Potlatch 1 (aozer enframmet er merdeer)
+      name: Potlatch 1
+    potlatch2: 
+      description: Potlatch 2 (aozer enframmet er merdeer)
+      name: Potlatch 2
+    remote: 
+      description: Aozer diavaez (JOSM pe Merkaartor)
+      name: Aozer diavaez
   export: 
     start: 
       add_marker: Ouzhpennañ ur merker d'ar gartenn
@@ -372,6 +385,7 @@ br:
       paste_html: Pegañ HTML evit bezañ enkorfet en ul lec'hienn web
       scale: Skeuliad
       too_large: 
+        body: Re vras eo an takad-mañ evit bezañ ezporzhiet evel roadennoù XML OpenStreetMap. Zoumit, mar plij, pe diuzit un takad bihanoc'h.
         heading: Zonenn re vras
       zoom: Zoum
     start_rjs: 
@@ -871,16 +885,23 @@ br:
       history_tooltip: Gwelet ar c'hemmoù er zonenn-se
       history_zoom_alert: Ret eo deoc'h zoumañ evit gwelet istor an aozadennoù
   layouts: 
+    community_blogs: Blogoù ar gumuniezh
+    community_blogs_title: Blogoù izili kumuniezh OpenStreetMap
     copyright: Copyright &amp; Aotre-implijout
+    documentation: Teuliadur
+    documentation_title: Teuliadur ar raktres
     donate: Skoazellit OpenStreetMap dre {{link}} d'an Hardware Upgrade Fund.
     donate_link_text: oc'h ober un donezon
     edit: Aozañ
+    edit_with: Kemmañ gant {{editor}}
     export: Ezporzhiañ
     export_tooltip: Ezporzhiañ roadennoù ar gartenn
+    foundation: Diazezadur
+    foundation_title: Diazezadur OpenStreetMap
     gps_traces: Roudoù GPS
     gps_traces_tooltip: Merañ ar roudoù GPS
     help: Skoazell
-    help_and_wiki: "{{help}} & {{wiki}}"
+    help_centre: Kreizenn skoazell
     help_title: Lec'hienn skoazell evit ar raktres
     history: Istor
     home: degemer
@@ -905,12 +926,8 @@ br:
     make_a_donation: 
       text: Ober un donezon
       title: Skoazellañ OpenStreetMap gant ur road arc'hant
-    news_blog: Blog keleier
-    news_blog_tooltip: Blog keleier diwar-benn OpenStreetMap, roadennoù douaroniel digoust, hag all.
     osm_offline: Ezlinenn eo diaz roadennoù OpenStreetMap evit bremañ e-pad ma pleder gant ul labour kempenn bras.
     osm_read_only: Diaz roadennoù OpenStreetMap zo da lenn hepken evit bremañ evit bremañ abalamour da labourioù kempenn bras.
-    shop: Stal
-    shop_tooltip: Stal gant produioù OpenStreetMap
     sign_up: En em enskrivañ
     sign_up_tooltip: Krouiñ ur gont evit aozañ
     tag_line: Kartenn digoust eus ar bed Wiki
@@ -925,10 +942,13 @@ br:
   license_page: 
     foreign: 
       english_link: orin e Saozneg
+      text: Ma vez digendalc'h etre ar bajenn troet-mañ hag {{english_original_link}} e teuio ar bajenn saoznek da gentañ
       title: Diwar-benn an droidigezh-mañ
+    legal_babble: "<h2>Copyright hag aotre-implijout</h2>\n<p>\n   OpenStreetMap zo un hollad <i>roadennoù digor</i>, a c'haller kaout dindan an aotre-implijout <a\n   href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n   Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA).\n</p>\n<p>\n  Libr oc'h da gopiañ, da skignañ, da gas ha da azasaat hor c'hartennoù\n  hag hor roadennoù, gant ma root kred da OpenStreetMap ha d'e\n  genlabourerien. Ma kemmit pe ma implijit hor c'hartennoù pe hor roadennoù e labourioù all,\n  ne c'hallit ket skignañ ar re-se dindan un aotre-implijout all. En \n  <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">destenn reolennoù\n  klok</a> e kavot munudoù ho kwirioù hag ho teverioù.\n</p>\n\n<h3>Penaos reiñ kred da OpenStreetMap</h3>\n<p>\n  Ma'z implijit skeudennoù OpenStreetMap, e c'houlennomp diganeoc'h\n  lakaat en ho kred ar meneg &ldquo;&copy; kenlabourerien OpenStreetMap\n  CC-BY-SA&rdquo;. Ma ne implijit nemet roadennoù ar c'hartennoù,\n  e c'houlennomp diganeoc'h lakaat &ldquo;Roadennoù ar gartenn &copy; kenlabourerien OpenStreetMap,\n  CC-BY-SA&rdquo;.\n</p>\n<p>\n  Pa vez posupl e tle OpenStreetMap bezañ ur gourliamm war-du <a\n  href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n  ha CC-BY-SA war-du <a\n  href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>.\n  Ma'z implijit ur skor ma ne c'haller ket krouiñ liammoù (da skouer :\n  un destenn moullet), ez aliomp ac'hanoc'h da gas ho lennerien da\n  www.openstreetmap.org (marteze en ur astenn\n  &lsquo;OpenStreetMap&rsquo; ar chomlec'h klok) ha da\n  www.creativecommons.org.\n</p>\n\n<h3>Titouroù ouzhpenn</h3>\n<p>\n  Ma fell deoc'h kaout muioc'h a ditouroù diwar-benn adimplij hor roadennoù, lennit <a\n  href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">FAG ar reolennoù</a>.\n</p>\n<p>\n  Degad a reomp da soñj da genlabourerien OSM ne zleont morse lakaat roadennoù a zeu\n  eus mammennoù dindan (da sk. : Google Maps pe kartennoù moullet) hep aotre\n  ezpleg ar re zo ar c'h-copyright ganto.\n</p>\n<p>\n  Daoust da OpenStreetMap bezañ un hollad roadennoù digor, n'omp ket evit pourchas\n  un API digoust evit an diorroerien diavaez.\n\n  Sellit ouzh hor <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">reolennoù evit implijout an API</a>,\n  <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">reolennoù evit implijout ar gartenn</a>\n  ha <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">reolennoù evit implijout Nominatim</a>.\n</p>\n\n<h3>Hor c'henlabourerien</h3>\n<p>\n  Hervez hon aotre-implijout CC-BY-SA e tleit &ldquo;reiñ kred a-walc'h \n  d'an aozer orin diouzh ar media a implijit&rdquo;.\n  Kartennourien hiniennel OSM ne c'houlennont ket\n  kred panevet &ldquo;kenlabourerien OpenStreetMap&rdquo;,\n  met pa vez ebarzhet roadennoù eus un ajañs kartennañ broadel\n  pe ur vammenn veur all en OpenStreetMap,\n  e c'hall bezañ fur reiñ kred dezho war-eeun\n  en doare a c'houlennont pe dre ul liamm war-du ar bajenn-mañ.\n</p>\n\n<!--\nTitouroù evit ar re a gemm ar bajenn-mañ\n\nEr roll-mañ ne gaver nemet an aozadurioù a c'houlenn an dereiñ\nevit ma vefe o roadennoù en OpenStreetMap. N'eo ket ur\nc'hatalog hollek eus an ouzhpennadennoù, ha ne zle ket bezañ implijet,\nnemet pa vez ret an dereiñ evit doujañ da aotre-implijout ar roadennoù enporzhiet.\n\nKement ouzhpennadenn graet amañ a zle bezañ breutaet a-raok gant merourien OSM.\n-->\n\n<ul id=\"contributors\">\n   <li><strong>Australia</strong>: Ennañ ar roadennoù diwar-benn an bannlevioù\n   diazezet war roadennoù Australian Bureau of Statistics.</li>\n   <li><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).</li>\n   <li><strong>Zeland-Nevez</strong>: Ennañ roadennoù eus\n   Land Information New Zealand. Crown Copyright reserved.</li>\n   <li><strong>Polonia</strong>: Ennañ roadennoù eus <a\n   href=\"http://ump.waw.pl/\">kartennoù UMP-pcPL</a>. Copyright\n   kenlabourerien UMP-pcPL.</li>\n   <li><strong>Rouantelezh-Unanet</strong>: Ennañ roadennoù eus Ordnance\n   Survey data &copy; Crown copyright and database right 2010.</li>\n</ul>\n\n<p>\n  Ebarzhiñ roadennoù en OpenStreetMap ne dalvez ket eo aprouet OpenStreetMap gant ar bourchaserien orin.\n</p>"
     native: 
       mapping_link: kregiñ da gemer perzh
       native_link: Stumm brezhonek
+      text: Emaoc'h o lenn stumm saoznek ar bajenn copyright. Gallout a rit distreiñ da {{native_link}} ar bajenn-mañ pe paouez da lenn ar bajenn-mañ ha {{mapping_link}}.
       title: Diwar-benn ar bajenn-mañ
   message: 
     delete: 
@@ -1150,8 +1170,10 @@ br:
     edit: 
       anon_edits_link_text: Kavit perak.
       flash_player_required: Ezhomm hoc'h eus eus ul lenner Flash evit implijout Potlatch, aozer flash OpenStreetMap. Gallout a rit <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">pellgargañ Flash Player diwar Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Meur a zibarzh</a> a c'haller kaout evit aozañ OpenStreetMap.
+      no_iframe_support: N'eo ket ho merdeer evit ober gant iframmoù HTML, hag ezhomm zo eus ar re-se evit an arc'hweladur-mañ.
       not_public: N'hoc'h eus ket lakaet hoc'h aozadennoù da vezañ foran.
       not_public_description: Ne c'hallit ket ken aozañ ar gartenn nemet e lakafec'h hoc'h aozadennoù da vezañ foran. Gallout a rit lakaat hoc'h aozadennoù da vezañ foran diwar ho {{user_page}}.
+      potlatch2_unsaved_changes: Kemmoù n'int ket enrollet zo ganeoc'h. (Evit enrollañ ho kemmoù e Potlach2, klikit war enrollañ)
       potlatch_unsaved_changes: Kemmoù n'int ket bet enrollet zo ganeoc'h. (Evit enrollañ e Potlatch, e tlefec'h diziuzañ an hent pe ar poent red m'emaoc'h oc'h aozañ er mod bev, pe klikañ war enrollañ ma vez ur bouton enrollañ ganeoc'h.)
       user_page_link: pajenn implijer
     index: 
@@ -1163,10 +1185,11 @@ br:
         notice: Dindan aotre-implijout {{license_name}} gant an {{project_name}} hag e genobererien.
         project_name: raktres OpenStreetMap
       permalink: Permalink
+      remote_failed: C'hwitet eo ar c'hemm - gwiriit hag-eñ eo karget JOSM or Merkaartor ha gweredekaet an dibarzh kontroll a-bell
       shortlink: Liamm berr
     key: 
       map_key: Alc'hwez ar gartenn
-      map_key_tooltip: Alc'hwez evit ar mapnik gant al live zoum-mañ
+      map_key_tooltip: Alc'hwez ar gartenn
       table: 
         entry: 
           admin: Bevenn velestradurel
@@ -1305,7 +1328,7 @@ br:
       help: Skoazell
       tags: Balizennoù
       tags_help: bevennet gant virgulennoù
-      upload_button: Kas
+      upload_button: Enporzhiañ
       upload_gpx: Kas ar restr GPX
       visibility: Gwelusted
       visibility_help: Petra a dalvez ?
@@ -1348,7 +1371,12 @@ br:
   user: 
     account: 
       contributor terms: 
+        agreed: Degemeret hoc'h eus diferadennoù nevez ar c'henlabourer.
+        agreed_with_pd: Disklêriet hoc'h eus ivez emañ ho tegasadennoù en domani foran.
+        heading: "Diferadennoù ar c'henlabourer :"
         link text: Petra eo se ?
+        not yet agreed: N'hoc'h eus ket degemeret c'hoazh diferadennoù nevez ar c'henlabourer.
+        review link text: Heuilhit al liamm-mañ evel ma karot evit sellet ouzh diferadennoù nevez ar c'henlabourer hag asantiñ dezho.
       current email address: "Chomlec'h postel a-vremañ :"
       delete image: Dilemel ar skeudenn a-vremañ
       email never displayed publicly: (n'eo ket diskwelet d'an holl morse)
@@ -1365,6 +1393,7 @@ br:
       new email address: "Chomlec'h postel nevez :"
       new image: Ouzhpennañ ur skeudenn
       no home location: N'hoc'h eus ket ebarzhet lec'hiadur ho kêr.
+      preferred editor: "Aozer karetañ :"
       preferred languages: "Yezhoù gwellañ karet :"
       profile description: "Deskrivadur ar profil :"
       public editing: 
@@ -1383,10 +1412,14 @@ br:
       title: Aozañ ar gont
       update home location on click: Hizivaat lec'hiadur ho kêr pa glikit war ar gartenn ?
     confirm: 
+      already active: Kadarnaet eo bet dija ar gont-mañ.
+      before you start: Gouzout a reomp ez eus mall warnoc'h kregiñ da gartennañ moarvat, met a-raok e c'hallfec'h reiñ muioc'h a ditouroù diwar ho penn er furmskrid amañ dindan.
       button: Kadarnaat
       heading: Kadarnaat kont un implijer
       press confirm button: Pouezit war ar bouton kadarnaat amañ dindan evit gweredekaat ho kont.
+      reconfirm: Ma'z oc'h enskrivet abaoe pell ho pefe kaout ezhomm da <a href="{{reconfirm}}">gas deoc'h-c'hwi ur postel kadarnaat all</a>.
       success: Kadarnaet eo ho kont, trugarez evit bezañ en em enskrivet !
+      unknown token: N'eus ket eus ar jedouer-se war a seblant.
     confirm_email: 
       button: Kadarnaat
       failure: Kadarnaet ez eus bet ur chomlec'h postel dija gant art jedouer-mañ.
@@ -1395,6 +1428,7 @@ br:
       success: Kadarnaet eo ho chomlec'h postel, trugarez evit bezañ en em enskrivet !
     confirm_resend: 
       failure: N'eo ket bet kavet an implijer {{name}}.
+      success: Kaset hon eus ur postel kadarnaat da {{email}}. Kerkent ha kadarnaet ho kont e c'hallot kregiñ da gartennañ.<br /><br />Ma implijit ur reizhiad enep-strob hag a gas goulennoù kadarnaat, lakait webmaster@openstreetmap.org en ho listenn wenn, mar plij, rak n'omp ket evit respont d'ar posteloù-se.
     filter: 
       not_an_administrator: Ret eo deoc'h bezañ merour evit kas an ober-mañ da benn.
     go_public: 
@@ -1411,22 +1445,29 @@ br:
       summary_no_ip: "{{name}} krouet d'an {{date}}"
       title: Implijerien
     login: 
-      account not active: Ho tigarez, n'eo ket oberiant ho kont c'hoazh. <br/>Klikit war al liamm er postel kadarnaat, mar plij, evit gweredekaat ho kont.
+      account not active: Ho tigarez, n'eo ket oberiant ho kont c'hoazh. <br/>Klikit war al liamm er postel kadarnaat, mar plij, evit gweredekaat ho kont, pe <a href="{{reconfirm}}">goulennit ur postel kadarnaat all</a> .
+      account suspended: Digarezit, arsavet eo bet ho kont abalamour d'un obererezh arvarus.<br />Kit e darempred gant ar {{webmaster}}, mar plij, m'hoc'h eus c'hoant da gaozeal diwar-benn an dra-se.
+      already have: Ur gont OpenStreetMap hoc'h eus dija ? Trugarez da gevreañ.
       auth failure: Ho tigarez, met n'eus ket bet gallet hoc'h anavezout gant an titouroù pourchaset.
+      create account minute: Krouiñ ur gont. Ne bad nemet ur vunutenn.
       create_account: krouiñ ur gont
       email or username: "Chomlec'h postel pe anv implijer :"
       heading: Kevreañ
       login_button: Kevreañ
-      lost password link: Kollet hoc'h eus ho ker-tremen ?
+      lost password link: Ha kollet hoc'h eus ho ker-tremen ?
+      new to osm: Nevez war OpenStreetMap ?
+      notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Gouzout hiroc'h diwar-benn ar cheñchamant aotre-implijout da zont gant OpenStreetMap</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">troidigezhioù</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">kendiviz</a>)
       password: "Ger-tremen :"
       please login: Kevreit, mar plij, pe {{create_user_link}}.
+      register now: En em enskrivañ bremañ
       remember: "Derc'hel soñj ac'hanon :"
       title: Kevreañ
+      to make changes: Evit kemmañ roadennoù OpenStreetMap e rankit kaout ur gont.
       webmaster: webmaster
     logout: 
       heading: Kuitaat OpenStreetMap
-      logout_button: Kuitaat
-      title: Kuitaat
+      logout_button: Digevreañ
+      title: Digevreañ
     lost_password: 
       email address: "Chomlec'h postel :"
       heading: Ankouaet hoc'h eus ho ker-tremen ?
@@ -1448,12 +1489,13 @@ br:
       display name description: Emañ hoc'h anv implijer a-wel d'an holl. Se a c'hallit cheñch diwezhatoc'h en ho penndibaboù.
       email address: "Chomlec'h postel :"
       fill_form: Leugnit ar furmskrid hag e kasimp deoc'h ur postel evit gweredekaat ho kont.
-      flash create success message: Krouet eo bet an implijer.  Gwelit ha resevet hoc'h eus ho postel kadarnaat, ha prest e viot da gartennañ diouzhtu.:-)<br /><br />Ho pezet soñj ne c'hallot ket kevreañ keit ha n'ho po ket resevet ar postel kadarnaat ha kadarnaet ho chomlec'h postel.<br /><br />Ma implijit ur reizhiad enep-strob hag a gas goulennoù kadarnaat, lakait webmaster@openstreetmap.org en ho liestenn wenn, mar plij, rak n'omp ket evit respont d'ar posteloù-se.
+      flash create success message: Trugarez deoc'h evit en em enskrivañ ! Kaset hon eus ur postel kadarnaat da {{email}}. Kerkent ha kadarnaet ho kont e c'hallot kregiñ da gartennañ.<br /><br />Ma implijit ur reizhiad enep-strob hag a gas goulennoù kadarnaat, lakait webmaster@openstreetmap.org en ho listenn wenn, mar plij, rak n'omp ket evit respont d'ar posteloù-se.
       heading: Krouiñ ur gont implijer
-      license_agreement: Dre grouiñ ur gont ez asantit e vefe an holl roadennoù a gasit d'ar raktres OpenStreetMap dindan an aotre-implijout <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons license (by-sa)</a> (peurgetket).
+      license_agreement: Pa gadarnaot ho kont e tleot asantiñ da <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">ziferadennoù ar c'henlabourer</a>.
       no_auto_account_create: Siwazh n'omp ket evit krouiñ ur gont evidoc'h ent emgefreek.
       not displayed publicly: N'eo ket diskwelet d'an holl (gwelet <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">hor c'harta prevezded</a>)
       password: "Ger-tremen :"
+      terms accepted: Trugarez deoc'h evit bezañ asantet da ziferadennoù nevez ar c'henlabourer !
       title: Krouiñ ur gont
     no_such_user: 
       body: Ho tigarez, n'eus implijer ebet en anv {{user}}. Gwiriit hag-eñ eo skrivet mat, pe marteze hoc'h eus kliket war ul liamm fall.
@@ -1477,16 +1519,23 @@ br:
     set_home: 
       flash success: Enrollet eo bet lec'hiadur ar gêr
     suspended: 
+      body: "<p>\n  Ho tigarez, arsavet eo bet ho kont abalamour d'un obererezh arvarus.\n</p>\n<p>\nGwiriet e vo an diviz-se a-benn nebeut gant ur merour. Gallout a rit mont e darempred gant ar{{webmaster}} m'hoc'h eus c'hoant da gaozeal diwar-benn an dra-se.\n</p>"
+      heading: Kont arsavet
+      title: Kont arsavet
       webmaster: webmaster
     terms: 
       agree: Mat eo din
+      consider_pd: Ouzhpenn an asant amañ a-us, ez anavezan emañ ma zegasadennoù en domani foran
       consider_pd_why: petra eo se ?
       decline: Nac'h
+      heading: Diferadennoù ar c'henlabourer
       legale_names: 
         france: Bro-C'hall
         italy: Italia
         rest_of_world: Peurrest ar bed
       legale_select: "Mar plij diuzit ar vro e lec'h m'emaoc'h o chom :"
+      read and accept: Lennit ar gevrat amañ dindan, mar plij, ha klikit war ar bouton asantiñ evit kadarnaat eo mat diferadennoù ar gevrat deoc'h evit a sell ho tegasadennoù tremenet ha da zont.
+      title: Diferadennoù ar c'henlabourer
     view: 
       activate_user: gweredekaat an implijer-mañ
       add as friend: Ouzhpennañ evel mignon
@@ -1507,6 +1556,7 @@ br:
       hide_user: kuzhat an implijer-mañ
       if set location: Ma lakait ho lec'hiadur e teuio ur gartenn vrav war wel dindani. Gallout a rit lakaat ho lec'hiadur war ho pajenn {{settings_link}}.
       km away: war-hed {{count}} km
+      latest edit: "Kemm ziwezhañ {{ago}} :"
       m away: war-hed {{count}} m
       mapper since: "Kartennour abaoe :"
       moderator_history: gwelet ar stankadurioù roet
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 1df3f22b0..9209450ac 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -118,7 +118,12 @@ ca:
       all: 
         next_changeset_tooltip: Conjunt de canvis següent
         next_node_tooltip: Node següent
+        next_relation_tooltip: Relació següent
+        next_way_tooltip: Via següent
         prev_changeset_tooltip: Conjunt de canvis anterior
+        prev_node_tooltip: Node anterior
+        prev_relation_tooltip: Relació anterior
+        prev_way_tooltip: Via anterior
       user: 
         name_changeset_tooltip: Visualitza les edicions feter per {{user}}
         prev_changeset_tooltip: Edició anterior per l'usuari {{user}}
@@ -203,6 +208,7 @@ ca:
       zoom_or_select: Ampliar o seleccionar una àrea del mapa per veure
     tag_details: 
       tags: "Etiquetes:"
+      wikipedia_link: L'article {{pàgina}} a la Viquipèdia
     timeout: 
       sorry: Hem trigat massa en obtenir les dades pel tipus {{type}} amb identificador {{id}}.
       type: 
@@ -271,6 +277,13 @@ ca:
     view: 
       login: Accés
       save_button: Desa
+  editor: 
+    default: Predeterminat (actualment {{name}})
+    potlatch: 
+      name: Potlatch 1
+    potlatch2: 
+      description: Potlatch 2 (editor al navegador)
+      name: Potlatch 2
   export: 
     start: 
       area_to_export: Àrea a exportar
@@ -409,6 +422,7 @@ ca:
           industrial: Edifici industrial
           public: Edifici públic
           school: Edifici escolar
+          shop: Botiga
           stadium: Estadi
           store: Magatzem
           tower: Torre
@@ -546,13 +560,16 @@ ca:
           chemist: Farmàcia
           fish: Peixateria
           florist: Floristeria
+          gift: Botiga de regals
           hairdresser: Perruqueria o barberia
           jewelry: Joieria
           laundry: Bugaderia
           mall: Centre comercial
           market: Mercat
+          optician: Òptica
           shoes: Sabateria
           supermarket: Supermercat
+          toys: Botiga de joguines
           travel_agency: Agència de viatges
         tourism: 
           alpine_hut: Cabanya alpina
@@ -590,9 +607,12 @@ ca:
         cycle_map: Cycle Map
         noname: NoName
   layouts: 
+    documentation: Documentació
+    donate_link_text: donatius
     edit: Modificació
     export: Exporta
     gps_traces: Traces de GPS
+    help: Ajuda
     history: Historial
     home: Inici
     intro_1: L'OpenStreetMap és un mapa editable i lliure de tot el món. Està fet per gent com vós.
@@ -603,7 +623,6 @@ ca:
     logout_tooltip: Sortir
     make_a_donation: 
       text: Fer una donació
-    shop: Botiga
     user_diaries: DIaris de usuari
     view: Veure
     view_tooltip: Visualitza els mapes
@@ -613,6 +632,8 @@ ca:
     foreign: 
       english_link: l'original en anglès
       title: Sobre aquesta traducció
+    native: 
+      title: Sobre aquesta pàgina
   message: 
     delete: 
       deleted: Missatge esborrat
@@ -672,6 +693,8 @@ ca:
       greeting: Hola,
     message_notification: 
       hi: Hola {{to_user}},
+    signup_confirm_html: 
+      more_videos_here: més de vídeos aquí
     signup_confirm_plain: 
       more_videos: "Hi ha més videos aquí:"
   oauth_clients: 
@@ -724,6 +747,9 @@ ca:
     sidebar: 
       close: Tanca
       search_results: Resultats de la cerca
+  time: 
+    formats: 
+      friendly: "%e %B %Y a les %H.%M"
   trace: 
     create: 
       upload_trace: Pujar traça de GPS
@@ -806,6 +832,8 @@ ca:
       visibility: "Visibilitat:"
   user: 
     account: 
+      contributor terms: 
+        link text: què és això?
       current email address: "Adreça de correu electrònic actual:"
       email never displayed publicly: (no es mostrarà mai en públic)
       image: "Imatge:"
@@ -874,6 +902,7 @@ ca:
       reset: Restablir contrasenya
       title: Restablir la contrasenya
     terms: 
+      agree: D'acord
       decline: Declinar
       legale_names: 
         france: França
@@ -937,6 +966,7 @@ ca:
       heading: Confirmi la concessió de rol
       title: Confirmi la concessió de rol
     revoke: 
+      are_you_sure: Esteu segur que voleu revocar el rol `{{role}}' de l'usuari `{{name}}'?
       confirm: Confirmar
       heading: Confirmar revocació de rol
       title: Confirmar revocació de rol
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 8c19dddc9..78d84c395 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -351,6 +351,17 @@ cs:
       save_button: Uložit
       title: Deníček uživatele {{user}} | {{title}}
       user_title: Deníček uživatele {{user}}
+  editor: 
+    default: Výchozí (v současné době {{name}})
+    potlatch: 
+      description: Potlatch 1 (editor v prohlížeči)
+      name: Potlatch 1
+    potlatch2: 
+      description: Potlatch 2 (editor v prohlížeči)
+      name: Potlatch 2
+    remote: 
+      description: Dálkové ovládání (JOSM nebo Merkaartor)
+      name: Dálkové ovládání
   export: 
     start: 
       add_marker: Přidat do mapy značku
@@ -715,16 +726,23 @@ cs:
       history_tooltip: Zobrazit editace této oblasti
       history_zoom_alert: Zobrazit editace této oblasti můžete jen ve větším přiblížení
   layouts: 
+    community_blogs: Komunitní blogy
+    community_blogs_title: Blogy členů komunity OpenStreetMap
     copyright: Copyright &amp; licence
+    documentation: Dokumentace
+    documentation_title: Dokumentace k projektu
     donate: Podpořte OpenStreetMap {{link}} Fondu na upgrady hardwaru
     donate_link_text: příspěvkem
     edit: Upravit
+    edit_with: Upravit pomocí {{editor}}
     export: Export
     export_tooltip: Exportovat mapová data
+    foundation: Nadace
+    foundation_title: Nadace OpenStreetMap Foundation
     gps_traces: GPS stopy
     gps_traces_tooltip: Spravovat GPS stopy
     help: Nápověda
-    help_and_wiki: "{{help}} & {{wiki}}"
+    help_centre: Centrum nápovědy
     help_title: Stránky s nápovědou k tomuto projektu
     history: Historie
     home: domů
@@ -752,12 +770,8 @@ cs:
     make_a_donation: 
       text: Pošlete příspěvek
       title: Podpořte OpenStreetMap finančním příspěvkem
-    news_blog: Novinkový blog
-    news_blog_tooltip: Blog s novinkami o OpenStreetMap, svobodných geografických datech atd.
     osm_offline: Databáze OpenStreetMap je momentálně kvůli probíhající neodkladné údržbě mimo provoz.
     osm_read_only: Databáze OpenStreetMap je momentálně kvůli probíhající neodkladné údržbě pouze pro čtení.
-    shop: Obchod
-    shop_tooltip: Obchod se zbožím s logem OpenStreetMap
     sign_up: zaregistrovat se
     sign_up_tooltip: Vytvořit si uživatelský účet pro editaci
     tag_line: Otevřená wiki-mapa světa
@@ -1213,6 +1227,7 @@ cs:
       new email address: "Nová e-mailová adresa:"
       new image: Přidat obrázek
       no home location: Nezadali jste polohu svého bydliště.
+      preferred editor: "Preferovaný editor:"
       preferred languages: "Preferované jazyky:"
       profile description: "Popis profilu:"
       public editing: 
@@ -1258,17 +1273,22 @@ cs:
     login: 
       account not active: Je mi líto, ale váš uživatelský účet dosud nebyl aktivován.<br />Svůj účet si můžete aktivovat kliknutím na odkaz v potvrzovacím e-mailu, případně si <a href="{{reconfirm}}">nechte poslat nový potvrzovací e-mail</a>.
       account suspended: Je nám líto, ale váš účet byl pozastaven kvůli podezřelé aktivitě.<br />Pokud to chcete řešit, kontaktujte {{webmaster}}.
+      already have: Už jste na OpenStreetMap zaregistrováni? Přihlaste se.
       auth failure: Je mi líto, ale s uvedenými údaji se nemůžete přihlásit.
+      create account minute: Založte si účet. Zabere to jen chvilku.
       create_account: vytvořit účet
       email or username: "E-mailová adresa nebo uživatelské jméno:"
       heading: Přihlášení
       login_button: Přihlásit
       lost password link: Ztratili jste heslo?
+      new to osm: Jste na OpenStreetMap noví?
       notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Zjistěte více o nadcházející změně licence OpenStreetMap</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">překlady</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">diskuse</a>)
       password: "Heslo:"
       please login: Prosím přihlaste se, nebo si můžete {{create_user_link}}.
+      register now: Zaregistrovat se
       remember: "Zapamatuj si mě:"
       title: Přihlásit se
+      to make changes: Pokud chcete upravovat OpenStreetMap, musíte mít uživatelský účet.
     logout: 
       heading: Odhlášení z OpenStreetMap
       logout_button: Odhlásit se
@@ -1355,6 +1375,7 @@ cs:
       hide_user: skrýt tohoto uživatele
       if set location: Když si nastavíte svou polohu, objeví se níže hezká mapka atp. Polohu domova si můžete nastavit na stránce {{settings_link}}.
       km away: "{{count}} km"
+      latest edit: "Poslední editace {{ago}}:"
       m away: "{{count}} m"
       mapper since: "Účastník projektu od:"
       moderator_history: zobrazit udělená zablokování
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 3644be0e1..be7d5ffc2 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -372,12 +372,8 @@ da:
     make_a_donation: 
       text: Doner
       title: Støt OpenStreetMap med en donation
-    news_blog: Nyheder (blog)
-    news_blog_tooltip: Blog med nyheder om OpenStreetMap, frie geografiske data, etc
     osm_offline: OpenStreetMap databasen er for øjeblikket offline på grund af database vedligeholdelse.
     osm_read_only: OpenStreetMap databasen er for øjeblikket ikke redigerbar på grund af database vedligeholdelse.
-    shop: Butik
-    shop_tooltip: Butik med OpenStreetMap produkter
     sign_up: opret en konto
     sign_up_tooltip: Opret en konto for redigering
     tag_line: Det frie Wiki-verdenskort
diff --git a/config/locales/de.yml b/config/locales/de.yml
index d8f0cc207..aed1715ae 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -370,15 +370,15 @@ de:
       user_title: "{{user}}s Blog"
   editor: 
     default: Standard (derzeit {{name}})
-    josm: 
-      description: JOSM (per ferngesteuertem Plugin)
-      name: JOSM
     potlatch: 
       description: Potlatch 1 (im Browser eingebetteter Editor)
       name: Potlatch 1
     potlatch2: 
       description: Potlatch 2 (im Browser eingebetteter Editor)
       name: Potlatch 2
+    remote: 
+      description: Remote Control (JOSM oder Merkaartor)
+      name: Remote Control
   export: 
     start: 
       add_marker: Markierung zur Karte hinzufügen
@@ -902,17 +902,23 @@ de:
       history_tooltip: Änderungen für diesen Bereich anzeigen
       history_zoom_alert: Du musst näher heranzoomen, um die Chronik zu sehen
   layouts: 
+    community_blogs: Blogs
+    community_blogs_title: Blogs von Mitwirkenden bei OpenStreetMap
     copyright: Urheberrecht + Lizenz
+    documentation: Dokumentation
+    documentation_title: Projektdokumentation
     donate: Unterstütze die OpenStreetMap-Hardwarespendenaktion durch eine eigene {{link}}.
     donate_link_text: Spende
     edit: Bearbeiten
     edit_with: Bearbeiten mit {{editor}}
     export: Export
     export_tooltip: Kartendaten exportieren
+    foundation: Stiftung
+    foundation_title: Die „OpenStreetMap Foundation“
     gps_traces: GPS-Tracks
     gps_traces_tooltip: GPS-Tracks verwalten
     help: Hilfe
-    help_and_wiki: "{{help}} + {{wiki}}"
+    help_centre: Hilfezentrale
     help_title: Hilfesite des Projekts
     history: Chronik
     home: Standort
@@ -937,12 +943,8 @@ de:
     make_a_donation: 
       text: Spenden
       title: Unterstütze OpenStreetMap mit einer Geldspende
-    news_blog: Neuigkeiten-Blog
-    news_blog_tooltip: News-Blog über OpenStreetMap, freie geographische Daten, etc.
     osm_offline: Die OpenStreetMap-Datenbank ist im Moment wegen wichtiger Wartungsarbeiten nicht verfügbar.
     osm_read_only: Die OpenStreetMap-Datenbank ist im Moment wegen wichtiger Wartungsarbeiten im „Nur-Lesen-Modus“.
-    shop: Shop
-    shop_tooltip: Shop für Artikel mit OpenStreetMap-Logo
     sign_up: Registrieren
     sign_up_tooltip: Ein Benutzerkonto zum Daten bearbeiten erstellen
     tag_line: Die freie Wiki-Weltkarte
@@ -1190,10 +1192,10 @@ de:
       no_iframe_support: Der Browser unterstützt keine HTML-Inlineframes (iframes), die zur Nutzung dieser Funktion unabdingbar sind.
       not_public: Deine Einstellungen sind auf anonymes Bearbeiten gestellt.
       not_public_description: Du musst deine Einstellungen auf öffentliches Bearbeiten umstellen. Dies kannst du auf deiner {{user_page}} tun.
+      potlatch2_unsaved_changes: Es gibt ungesicherte Änderungen. (Du musst in Potlatch 2 „speichern“ klicken.)
       potlatch_unsaved_changes: Du hast deine Arbeit noch nicht gespeichert. (Um sie in Potlach zu speichern, klicke auf eine leere Fläche bzw. deselektiere den Weg oder Punkt, wenn du im Live-Modus editierst oder klicke auf Speichern, wenn ein Speicherbutton vorhanden ist.)
       user_page_link: Benutzerseite
     index: 
-      josm_failed: Das Bearbeiten ist fehlgeschlagen. Stelle sicher, dass JOSM geladen wird und das Plugin zur Fernsteuerung aktiviert ist.
       js_1: Dein Browser unterstützt kein JavaScript oder du hast es deaktiviert.
       js_2: OpenStreetMap nutzt JavaScript für die Kartendarstellung.
       js_3: Solltest bei dir kein JavaScript möglich sein, kannst du auf der <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home Website</a> eine Version ohne JavaScript benutzen.
@@ -1202,6 +1204,7 @@ de:
         notice: Lizenziert unter {{license_name}} Lizenz durch das {{project_name}} und seine Mitwirkenden.
         project_name: OpenStreetMap Projekt
       permalink: Permanentlink
+      remote_failed: Das Bearbeiten ist fehlgeschlagen. Stelle sicher, dass JOSM oder Merkaartor gestartet ist und die Remote-Control-Option aktiviert ist.
       shortlink: Shortlink
     key: 
       map_key: Legende
@@ -1464,17 +1467,22 @@ de:
     login: 
       account not active: Leider wurde dein Benutzerkonto bislang noch nicht aktiviert.<br />Bitte aktiviere dein Benutzerkonto, indem du auf den Link in deiner Bestätigungs-E-Mail klickst oder <a href="{{reconfirm}}">eine neue Bestätigungs-E-Mail anforderst</a>.
       account suspended: Dein Benutzerkonto wurde aufgrund verdächtiger Aktivitäten gesperrt, um potentiellen Schaden von OpenStreetMap abzuwenden. <br /> Bitte kontaktiere den {{webmaster}}, sofern du diese Angelegenheit klären möchtest.
+      already have: Du hast bereits ein OpenStreetMap-Benutzerkonto? Bitte einloggen.
       auth failure: Sorry, Anmelden mit diesen Daten nicht möglich.
+      create account minute: Erstelle ein Benutzerkonto. Es dauert nur eine Minute.
       create_account: erstelle ein Benutzerkonto
       email or username: "E-Mail-Adresse oder Benutzername:"
       heading: Anmelden
       login_button: Anmelden
       lost password link: Passwort vergessen?
+      new to osm: Neu bei OpenStreetMap?
       notice: <a href="http://wiki.openstreetmap.org/wiki/DE:ODbL/Wir_wechseln_die_Lizenz">Informiere dich über den bevorstehenden Lizenzwechsel bei OpenStreetMap</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">Übersetzungen</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">Diskussion</a>)
       password: "Passwort:"
       please login: Bitte melde dich an oder {{create_user_link}}.
+      register now: Jetzt registrieren
       remember: "Anmeldedaten merken:"
       title: Anmelden
+      to make changes: Um Datenänderungen bei OpenStreetMap vornehmen zu können, musst Du ein Benutzerkonto haben.
       webmaster: Webmaster
     logout: 
       heading: Von OpenStreetMap abmelden
@@ -1568,6 +1576,7 @@ de:
       hide_user: Benutzer verstecken
       if set location: Wenn du deinen Standort angegeben hast, erscheint eine Karte am Seitenende. Du kannst deinen Standort in deinen {{settings_link}} ändern.
       km away: "{{count}} km entfernt"
+      latest edit: "Letzte Änderung {{ago}}:"
       m away: "{{count}} m entfernt"
       mapper since: "Mapper seit:"
       moderator_history: Vergebene Sperren anzeigen
diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index 1f0929b5b..3baac049f 100644
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -361,15 +361,15 @@ dsb:
       user_title: dnjownik wužywarja {{user}}
   editor: 
     default: Standard (tuchylu {{name}})
-    josm: 
-      description: JOSM (tykac za zdalokawóźenje)
-      name: JOSM
     potlatch: 
       description: Potlatch 1 (editor za wobźěłowanje we wobglědowaku)
       name: Potlatch 1
     potlatch2: 
       description: Potlatch 2 (editor za wobźěłowanje we wobglědowaku)
       name: Potlatch 2
+    remote: 
+      description: Zdalokawóźenje (JOSM abo Merkaartor)
+      name: Zdalokawóźenje
   export: 
     start: 
       add_marker: Kórśe marku pśidaś
@@ -893,17 +893,23 @@ dsb:
       history_tooltip: Změny za toś ten wobcerk pokazaś
       history_zoom_alert: Musyš powětšyś, aby wiźeł wobźěłowańsku historiju
   layouts: 
+    community_blogs: Blogi zgromaźeństwa
+    community_blogs_title: Blogi cłonkow zgromaźeństwa OpenStreetMap
     copyright: Awtorske pšawo a licenca
+    documentation: Dokumentacija
+    documentation_title: Dokumentacija za projekt
     donate: Pódprěj OpenStreetMap pśez {{link}} do fondsa aktualizacije hardware
     donate_link_text: dar
     edit: Wobźěłaś
     edit_with: Z {{editor}} wobźěłaś
     export: Eksport
     export_tooltip: Kórtowe daty eksportěrowaś
+    foundation: Załožba
+    foundation_title: Załožba OpenStreetMap
     gps_traces: GPS-slědy
     gps_traces_tooltip: GPS-slědy zastojaś
     help: Pomoc
-    help_and_wiki: "{{help}} + {{wiki}}"
+    help_centre: Centrum pomocy
     help_title: Sedło pomocy za projekt
     history: Historija
     home: domoj
@@ -930,12 +936,8 @@ dsb:
     make_a_donation: 
       text: Pósćiś
       title: Pódprěj OpenStreetMap z pjenjezneju pósćiwanku
-    news_blog: Blog powěsćow
-    news_blog_tooltip: Blog powěsćow wó OpenStreetMap, swobodnych geografiskich datach atd.
     osm_offline: Datowa banka OpenStreetMap jo tuchylu offline, dokulaž se wažne źěło za wótglědowanje datoweje banki pśewjedujo.
     osm_read_only: Datowa banka OpenStreetMap jo tuchylu w modusu "Jano cytaś", dokulaž se wažne źěło za wótglědowanje datoweje banki pśewjedujo.
-    shop: Pśedank
-    shop_tooltip: Pśedank wóry z logo OpenStreetMap
     sign_up: registrěrowaś
     sign_up_tooltip: Konto za wobźěłowanje załožyś
     tag_line: Licha wikikórta swěta
@@ -1181,10 +1183,10 @@ dsb:
       no_iframe_support: Twój wobglědowak njepódpěrujo HTML-elementy iframe, kótarež su trěbne za toś tu funkciju.
       not_public: Njejsy swóje změny ako zjawne markěrował.
       not_public_description: Njamóžoš wěcej kórtu wobzěłaś, snaźkuli cyniś to rowno. Móžoš swóje změny na swójom {{user_page}} ako zjawne markěrowaś.
+      potlatch2_unsaved_changes: Sy njeskładowane změny. (Aby je w Potlatch 2 składował, klikni na "Składowaś".)
       potlatch_unsaved_changes: Maš njeskłaźone změny. (Aby składował w Potlatch, ty by dejał aktualny puś abo dypk wótwóliś, jolic wobźěłujoš w livemodusu, abo klikni na Składowaś, jolic maš tłocašk Składowaś.)
       user_page_link: wužywarskem boku
     index: 
-      josm_failed: Wobźěłowanje jo se njeraźiło - pśeznań se, lěc JOSM jo zacytany a tykac za zdalokawóźenje jo zmóžnjony
       js_1: Pak wužywaš wobglědowak, kótaryž njepódpěra JavaScript, pak sy znjemóžnił JavaScript.
       js_2: OpenStreetMap wužywa JavaScript za suwatu kórtu.
       js_3: Móžoš teke <a href="http://tah.openstreetmap.org/Browse/">statiski kachlowy wobglědowak Tiles@Home</a> wužywaś, jolic njamóžoš JavaScript zmóžniś.
@@ -1193,6 +1195,7 @@ dsb:
         notice: Licencěrowany pód licencu {{license_name}} pśez {{project_name}} a jogo sobustatkujucych.
         project_name: Projekt OpenStreetMap
       permalink: Trajny wótkaz
+      remote_failed: Wobźěłowanje jo se njeraźiło - pśeznań se, lěc JOSM jo zacytany a opcija zdalokawóźenje jo zmóžnjona
       shortlink: Krotki wótkaz
     key: 
       map_key: Legenda
@@ -1454,17 +1457,22 @@ dsb:
     login: 
       account not active: Bóžko twojo konto hyšći njejo aktiwne.<br />Pšosym klikni na wótkaz w e-mailu za wobkšuśenje konta, aby aktiwěrował swójo konto abo <a href="{{reconfirm}}">pominaj nowu wobkšuśeńsku e-mail</a>.
       account suspended: Twójo konto jo se bóžko wupowěźeło dla pódglědneje aktiwity.<br />Staj se z {{webmaster}}, jolic coš wó tom diskutěrowaś.
+      already have: Maš južo konto OpenStreetMap? Pšosym pśizjaw se.
       auth failure: Bóžko, pśizjawjenje z toś tymi datami njejo móžno.
+      create account minute: Załož konto. Trajo jano minutku.
       create_account: załož konto
       email or username: "E-mailowa adresa abo wužywarske mě:"
       heading: Pśizjawjenje
       login_button: Pśizjawiś se
       lost password link: Sy swójo gronidło zabył?
+      new to osm: Nowy w OpenStreetMap?
       notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Wěcej wó pśichodnej licencnej změnje OpenStreetMap</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">pśełožki</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">diskusija</a>)
       password: "Gronidło:"
       please login: Pšosym pśizjaw se abo {{create_user_link}}.
+      register now: Něnto registrěrowaś
       remember: "Spomnjeś se:"
       title: Pśizjawjenje
+      to make changes: Aby daty OpenStreetMap změnił, musyš konto měś.
       webmaster: webmejstaŕ
     logout: 
       heading: Z OpenStreetMap se wótzjawiś
@@ -1558,6 +1566,7 @@ dsb:
       hide_user: toś togo wužywarja schowaś
       if set location: Jolic sy swójo městno nastajił, rědna kórta a někotare informacije pokažu se dołojce. Móžoś swójo stojnišćo na boku {{settings_link}} nastajiś.
       km away: "{{count}} km zdalony"
+      latest edit: "Nejnowša změna {{ago}}:"
       m away: "{{count}} m zdalony"
       mapper since: "Kartěrowaŕ wót:"
       moderator_history: Rozdane blokěrowanja pokazaś
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 72d111f8a..1fa2831ea 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -936,19 +936,20 @@ en:
     osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
     donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund."
     donate_link_text: donating
-    help_and_wiki: "{{help}} & {{wiki}}"
     help: Help
+    help_centre: Help Centre
     help_url: http://help.openstreetmap.org/
     help_title: Help site for the project
     wiki: Wiki
     wiki_url: http://wiki.openstreetmap.org/
     wiki_title: Wiki site for the project
+    documentation: Documentation
+    documentation_title: Documentation for the project
     copyright: "Copyright &amp; License"
-    news_blog: "News blog"
-    news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."
-    shop: Shop
-    shop_tooltip: Shop with branded OpenStreetMap merchandise
-    shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
+    community_blogs: "Community Blogs"
+    community_blogs_title: "Blogs from members of the OpenStreetMap community"
+    foundation: Foundation
+    foundation_title: The OpenStreetMap Foundation
     license:
       alt: CC by-sa 2.0
       title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License
@@ -1260,7 +1261,7 @@ en:
       submit_text: "Go"
       search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>"
     key:
-      map_key: "Map key"
+      map_key: "Map Key"
       map_key_tooltip: "Key for the map"
       table:
         entry:
@@ -1507,16 +1508,18 @@ en:
     login:
       title: "Login"
       heading: "Login"
-      please login: "Please login or {{create_user_link}}."
-      create_account: "create an account"
       email or username: "Email Address or Username:"
       password: "Password:"
       openid: "{{logo}} OpenID:"
-      username_heading: "Login with username and password:"
-      openid_heading: "Login with OpenID:"
       remember: "Remember me:"
       lost password link: "Lost your password?"
       login_button: "Login"
+      register now: Register now
+      with username: "Already have an OpenStreetMap account? Please login with your username and password:"
+      with openid: "Alternatively please use your OpenID to login:"
+      new to osm: New to OpenStreetMap?
+      to make changes: To make changes to the OpenStreetMap data, you must have an account.
+      create account minute: Create an account. It only takes a minute.
       account not active: "Sorry, your account is not active yet.<br />Please use the link in the account confirmation email to activate your account, or <a href=\"{{reconfirm}}\">request a new confirmation email</a>."
       account suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the {{webmaster}} if you wish to discuss this.
       webmaster: webmaster
@@ -1630,6 +1633,7 @@ en:
       add as friend: add as friend
       mapper since: "Mapper since:"
       ago: "({{time_in_words_ago}} ago)"
+      latest edit: "Latest edit {{ago}}:"
       email address: "Email address:"
       created from: "Created from:"
       status: "Status:"
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index c913e2a15..812c46247 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -365,9 +365,6 @@ eo:
     make_a_donation: 
       text: Donaci
       title: Subteni OpenStreetMap per mondonaco
-    news_blog: Novaĵblogo
-    news_blog_tooltip: Novaĵblogo (en la angla) pri OpenStreetMap, liberaj geografiaj datumoj, ktp.
-    shop: Butiko
     sign_up: aliĝi
     sign_up_tooltip: Krei konton por redaktado
     tag_line: La libera vikia mondmapo
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 1e9c2c126..b3b5de40b 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -353,6 +353,17 @@ es:
       save_button: Guardar
       title: Diario de {{user}} | {{title}}
       user_title: Diario de {{user}}
+  editor: 
+    default: Por defecto (en la actualidad {{name}})
+    potlatch: 
+      description: Potlatch 1 (editor en el navegador)
+      name: Potlatch 1
+    potlatch2: 
+      description: Potlatch 2 (editor en el navegador)
+      name: Potlatch 2
+    remote: 
+      description: Control remoto (JOSM o Merkaartor)
+      name: Control remoto
   export: 
     start: 
       add_marker: Añadir chinche en el mapa
@@ -876,16 +887,23 @@ es:
       history_tooltip: Ver ediciones para este área
       history_zoom_alert: Debe hacer más zoom para ver el histórico de ediciones
   layouts: 
+    community_blogs: Blogs de la comunidad
+    community_blogs_title: Blogs de miembros de la comunidad de OpenStreetMap
     copyright: Copyright y licencia
+    documentation: Documentación
+    documentation_title: Documentación del proyecto
     donate: Apoye a OpenStreetMap {{link}} al Fondo de Actualización de Hardware.
     donate_link_text: donando
     edit: Editar
+    edit_with: Editar con {{editor}}
     export: Exportar
     export_tooltip: Exportar datos del mapa
+    foundation: Fundación
+    foundation_title: La Fundación OpenStreetMap
     gps_traces: Trazas GPS
     gps_traces_tooltip: Gestiona las trazas GPS
     help: Ayuda
-    help_and_wiki: "{{help}} & {{wiki}}"
+    help_centre: Centro de ayuda
     help_title: Sitio de ayuda para el proyecto
     history: Historial
     home: inicio
@@ -910,12 +928,8 @@ es:
     make_a_donation: 
       text: Hacer una donación
       title: Apoye a OpenStreetMap con una donación monetaria
-    news_blog: Blog y noticias
-    news_blog_tooltip: Blog de noticias sobre OpenStreetMap, información geográfica libre, etc.
     osm_offline: La base de datos de OpenStreetMap no está disponible en estos momentos debido a trabajos de mantenimiento.
     osm_read_only: La base de datos de OpenStreetMap se encuentra en modo de sólo lectura debido a trabajos de mantenimiento.
-    shop: Tienda
-    shop_tooltip: Tienda con productos de OpenStreetMap
     sign_up: registrarse
     sign_up_tooltip: Cree una cuenta para editar
     tag_line: El WikiMapaMundi libre
@@ -1160,6 +1174,7 @@ es:
     edit: 
       anon_edits_link_text: Descubra a que se debe
       flash_player_required: Necesita un reproductor de Flash para usar Potlatch, el editor Flash de OpenStreetMap. Puede <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">descargar un reproductor Flash desde Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Otras opciones</a> también están disponibles para editar OpenStreetMap.
+      no_iframe_support: Su navegador no soporta iframes HTML, que son necesarios para esta funcionalidad.
       not_public: No has configurado tus ediciones como públicas.
       not_public_description: No puede seguir editando el mapa a menos que lo haga. Puede marcar sus ediciones como públicas desde su {{user_page}}.
       potlatch_unsaved_changes: Tiene cambios sin guardar. (Para guardarlos en Potlatch, debería deseleccionar la vía o punto actual si está editando en directo, o pulse sobre guardar si aparece un botón de guardar.)
@@ -1173,10 +1188,11 @@ es:
         notice: Bajo la licencia {{license_name}} a nombre de {{project_name}} y sus colaboradores.
         project_name: Proyecto OpenStreetMap
       permalink: Enlace permanente
+      remote_failed: Error de eición - asegúrese que JOSM o Merkaartor están cargados y con la opción de control remoto activada
       shortlink: Atajo
     key: 
       map_key: Leyenda del mapa
-      map_key_tooltip: Leyenda del renderizador mapnik para este nivel de zoom
+      map_key_tooltip: Leyenda del mapa
       table: 
         entry: 
           admin: Límites administrativos
@@ -1380,6 +1396,7 @@ es:
       new email address: "Nueva dirección de correo electrónico:"
       new image: Añadir una imagen
       no home location: No has introducido tu lugar de origen.
+      preferred editor: "Editor preferido:"
       preferred languages: "Idiomas preferidos:"
       profile description: "Descripción del perfil:"
       public editing: 
@@ -1429,17 +1446,22 @@ es:
     login: 
       account not active: Lo sentimos, su cuenta aun no está activa.<br />Por favor siga el enlace que hay en el correo de confirmación de cuenta para activarla.
       account suspended: Disculpa, tu cuenta ha sido suspendida debido a actividad sospechosa.<br />por favor contacta al {{webmaster}} si deseas discutir esto.
+      already have: ¿Ya tiene una cuenta de OpenStreetMap? Inicie la sesión.
       auth failure: Lo sentimos. No pudo producirse el acceso con esos datos.
+      create account minute: Cree una cuenta. Sólo se tarda un minuto.
       create_account: crear una cuenta
       email or username: Dirección de correo o nombre de usuario
       heading: Iniciar sesión
       login_button: Iniciar sesión
       lost password link: ¿Ha perdido su contraseña?
+      new to osm: ¿Nuevo en OpenStreetMap?
       notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Descubre más acerca del próximo cambio de licencia de OpenStreetMap</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">traducciones</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">discusión</a>)
       password: Contraseña
       please login: Por favor inicie sesión o {{create_user_link}}.
+      register now: Regístrese ahora
       remember: "Recordarme:"
       title: Iniciar sesión
+      to make changes: Para realizar cambios en los datos de OpenStreetMap, debe tener una cuenta.
       webmaster: webmaster
     logout: 
       heading: Salir de OpenStreetMap
@@ -1533,6 +1555,7 @@ es:
       hide_user: esconder este usuario
       if set location: Si ha configurado su lugar de origen, verá un mapa abajo. Puede configurar su lugar de origen en la página de {{settings_link}}.
       km away: "{{count}} km de distancia"
+      latest edit: "Última edición {{ago}}:"
       m away: "{{count}}m alejado"
       mapper since: "Mapeando desde:"
       moderator_history: ver los bloqueos impuestos
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 7519708ac..83eac33ea 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -3,11 +3,15 @@
 # Export driver: syck
 # Author: Avjoska
 # Author: Kanne
+# Author: WikedKentaur
 et: 
   activerecord: 
     attributes: 
       diary_entry: 
         language: Keel
+        latitude: Laiuskraad
+        longitude: Pikkuskraad
+        title: Pealkiri
         user: Kasutaja
       friend: 
         friend: Sõber
@@ -20,6 +24,7 @@ et:
         latitude: Laiuskraadid
         longitude: Pikkuskraadid
         name: Nimi
+        public: Avalik
         size: Suurus
         user: Kasutaja
         visible: Nähtav
@@ -31,34 +36,86 @@ et:
     models: 
       country: Riik
       language: Keel
+      message: Sõnum
+      old_node: Vana punkt
+      user: Kasutaja
+      way: Joon
+      way_node: Joone punkt
   browse: 
+    changeset: 
+      download: Laadi {{changeset_xml_link}} või {{osmchange_xml_link}}
+    changeset_details: 
+      belongs_to: "Kuulub:"
+      box: ala
+      closed_at: "Suletud:"
+      created_at: "Loodud:"
+    common_details: 
+      changeset_comment: "Kommentaar:"
+      edited_at: "Muudetud:"
+      edited_by: "Muutja:"
+      version: "Versioon:"
+    containing_relation: 
+      entry: Relatsioon {{relation_name}}
+      entry_role: Relatsioon {{relation_name}} (kui {{relation_role}})
     map: 
       deleted: kustutatud
+      larger: 
+        area: Vaata ala suuremal kaardil
+        node: Vaata punkti suuremal kaardil
+        relation: Vaata relatsiooni suuremal kaardil
+        way: Vaata joont suuremal kaardil
+      loading: Laen...
     navigation: 
       all: 
         next_node_tooltip: Järgmine sõlm
         next_relation_tooltip: Järgmine relatsioon
+        next_way_tooltip: Järgmine joon
         prev_node_tooltip: Eelmine sõlm
+        prev_relation_tooltip: Eelmine relatsioon
         prev_way_tooltip: Eelmine joon
       user: 
+        name_changeset_tooltip: Vaata kasutaja {{user}} muudatusi
+        next_changeset_tooltip: Kasutaja {{user}} järgmine muudatus
         prev_changeset_tooltip: Kasutaja {{user}} eelmine muudatus
     node: 
+      download: "{{download_xml_link}}, {{view_history_link}} või {{edit_link}}"
+      download_xml: Laadi XML
       edit: redigeeri
       node: sõlm
+      node_title: "Punkt: {{node_name}}"
       view_history: vaata redigeerimiste ajalugu
     node_details: 
       coordinates: "koordinaadid:"
+      part_of: "Osa joonest:"
+    node_history: 
+      download: "{{download_xml_link}} või {{view_details_link}}"
+      download_xml: Laadi XML
+      node_history: Punkti muudatusteajalugu
+      node_history_title: Punkti {{node_name}} ajalugu
+      view_details: vaata üksikasju
     not_found: 
+      sorry: Kohta {{type}} {{id}} ei ole olemas.
       type: 
         node: sõlm
         relation: relatsioon
         way: joon
+    paging_nav: 
+      of: " /"
+      showing_page: Näitan lehte
     relation: 
       download: "{{download_xml_link}} või {{view_history_link}}"
+      download_xml: Laadi XML
       relation: relatsioon
       relation_title: "Relatsioon: {{relation_name}}"
+      view_history: vaata ajalugu
     relation_details: 
       members: "Liikmed:"
+    relation_history: 
+      download: "{{download_xml_link}} või {{view_details_link}}"
+      download_xml: Laadi XML
+      relation_history: Relatsiooni muudatuste ajalugu
+      relation_history_title: Relatsiooni {{relation_name}} ajalugu
+      view_details: vaata üksikasju
     relation_member: 
       entry_role: "{{type}} {{name}} kui {{role}}"
       type: 
@@ -66,41 +123,145 @@ et:
         relation: relatsioon
         way: joon
     start_rjs: 
+      data_frame_title: Andmed
+      data_layer_name: Andmed
       details: Detailid
+      drag_a_box: Märgi kaardil hiirega uus ala
+      edited_by_user_at_timestamp: Viimati muudetud kasutaja [[user]] poolt kell [[timestamp]]
+      history_for_feature: Omaduse [[feature]] ajalugu
+      load_data: Laadi andmed
+      loading: Laadin andmeid...
+      manually_select: Vali uus ala
       object_list: 
         details: Detailid
+        history: 
+          type: 
+            node: Punkt [[id]]
+            way: Joon [[id]]
+        selected: 
+          type: 
+            node: Punkt [[id]]
+            way: Joon [[id]]
+        type: 
+          node: Punkt
+          way: Joon
       show_history: Näita ajalugu
+      unable_to_load_size: "Laadimine ebaõnnestus: valitud ala küjepikkus [[bbox_size]] on liiga suur (see peab olema väiksem kui {{max_bbox_size}})"
       wait: Oota...
+      zoom_or_select: Suumi lähemale või vali soovitud ala kaardil
+    tag_details: 
+      tags: "Sildid:"
+      wikipedia_link: Artikkel {{page}} Vikipeedias
+    timeout: 
+      type: 
+        node: punkt
+        relation: relatsioon
+        way: joon
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} või {{edit_link}}"
       download_xml: Lae XML
       edit: redigeeri
       view_history: vaata ajalugu
+      way: Joon
+      way_title: "Joon: {{way_name}}"
     way_details: 
+      also_part_of: 
+        one: on ka osa joonest {{related_ways}}
+        other: on ka osa joontest {{related_ways}}
       nodes: "Sõlmed:"
       part_of: "Osa:"
     way_history: 
+      download: "{{download_xml_link}} või {{view_details_link}}"
       download_xml: Lae alla XML-fail.
       view_details: vaata detaile
+      way_history: Joone muudatuste ajalugu
+      way_history_title: Joone {{way_name}} ajalugu
   changeset: 
+    changeset: 
+      anonymous: Anonüümne
+      big_area: (suur)
+      still_editing: redigeerimine pooleli
     changeset_paging_nav: 
+      next: Järgmine &raquo;
       previous: "&laquo; Eelmine"
     changesets: 
+      area: Ala
       comment: Kommentaar
+      id: ID
+      saved_at: Salvestatud
+      user: Kasutaja
+    list: 
+      description: Viimased muudatused
   diary_entry: 
+    diary_comment: 
+      confirm: Kinnita
+    diary_entry: 
+      comment_count: 
+        one: 1 kommentaar
+        other: "{{count}} kommentaari"
+      confirm: Kinnita
     edit: 
+      body: "Tekst:"
       language: "Keel:"
+      latitude: "Laiuskraad:"
+      location: "Asukoht:"
+      longitude: "Pikkuskraad:"
       save_button: Salvesta
       subject: "Teema:"
     list: 
+      newer_entries: Uuemad...
+      older_entries: Vanemad...
       title: Kasutajate päevikud
+      user_title: Kasutaja {{user}} päevik
     location: 
       edit: muuda
+      location: "Asukoht:"
+      view: Vaata
     no_such_user: 
       heading: Kasutajat {{user}} ei ole olemas
     view: 
+      leave_a_comment: Kommenteeri
       login: Logi sisse
+      login_to_leave_a_comment: kommenteerimiseks {{login_link}}
+      save_button: Salvesta
+      title: Kasutaja {{user}} päevik | {{title}}
+      user_title: Kasutaja {{user}} päevik
+  editor: 
+    default: Vaikimisi (praegu {{name}})
+    potlatch: 
+      name: Potlatch 1
+    potlatch2: 
+      name: Potlatch 2
+    remote: 
+      description: Remote Control (JOSM või Merkaartor)
+  export: 
+    start: 
+      add_marker: Lisa kaardile kohamärk
+      area_to_export: Eksporditav ala
+      export_button: Ekspordi
+      export_details: OpenStreetMapi andmed on avaldatud <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 litsentsi</a> tingimustel.
+      format: "Vorming:"
+      image_size: Pildi suurus
+      latitude: "Laius:"
+      licence: Litsents
+      longitude: "Pikkus:"
+      options: Sätted
+      output: Väljund
+      paste_html: Kopeeri ja lisa see HTML-kood oma veebilehele.
+      scale: Mõõtkava
+      too_large: 
+        heading: Ala on liiga suur
+      zoom: Suum
+    start_rjs: 
+      change_marker: Muuda märgi asukohta
+      export: Ekspordi
+      view_larger_map: Näita suuremat kaarti
   geocoder: 
+    description: 
+      types: 
+        cities: Linnad
+        places: Kohad
+        towns: Külad
     direction: 
       east: ida
       north: põhja
@@ -110,6 +271,18 @@ et:
       south_east: kagu
       south_west: edela
       west: lääne
+    results: 
+      more_results: Veel tulemusi
+      no_results: Ei leidnud midagi
+    search: 
+      title: 
+        ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a> tulemused
+        geonames: <a href="http://www.geonames.org/">GeoNames</a>i tulemused
+        osm_namefinder: <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMapi Namefinder</a>i tulemused
+        osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>i tulemused
+        us_postcode: <a href="http://geocoder.us/">Geocoder.us</a> tulemused
+    search_osm_namefinder: 
+      suffix_place: ", {{distance}} {{direction}} kohast {{placename}}"
     search_osm_nominatim: 
       prefix: 
         amenity: 
@@ -117,9 +290,11 @@ et:
           atm: Pangaautomaat
           auditorium: Auditoorium
           bank: Pank
+          bar: Baar
           bench: Pink
           bicycle_parking: Jalgrattaparkla
           bicycle_rental: Jalgrattarent
+          brothel: Lõbumaja
           bureau_de_change: Rahavahetus
           bus_station: Bussijaam
           cafe: Kohvik
@@ -136,6 +311,8 @@ et:
           driving_school: Autokool
           embassy: Saatkond
           fast_food: Kiirtoit
+          fire_station: Tuletõrjedepoo
+          fountain: Purskkaev
           fuel: Kütus
           grave_yard: Surnuaed
           hospital: Haigla
@@ -151,6 +328,7 @@ et:
           post_office: Postkontor
           preschool: Lasteaed
           prison: Vangla
+          pub: Pubi
           reception_area: Vastuvõtt
           restaurant: Restoran
           retirement_home: Vanadekodu
@@ -165,64 +343,96 @@ et:
           waste_basket: Prügikast
           wifi: WiFi
           youth_centre: Noortekeskus
+        boundary: 
+          administrative: Halduspiir
         building: 
           chapel: Kabel
           church: Kirik
+          commercial: Ärihoone
+          dormitory: Ühiselamu
+          faculty: Õppehoone
+          garage: Garaaž
           hotel: Hotell
           school: Koolihoone
           shop: Kauplus
           stadium: Staadion
+          store: Kauplus
           tower: Torn
           train_station: Raudteejaam
           university: Ülikoolihoone
           "yes": Hoone
         highway: 
+          bridleway: Ratsatee
           bus_stop: Bussipeatus
           cycleway: Jalgrattatee
           footway: Jalgrada
+          ford: Koolmekoht
+          motorway: Kiirtee
           pedestrian: Jalakäijatele
+          secondary: Tugimaantee
+          unsurfaced: Katteta tee
         historic: 
+          battlefield: Lahinguväli
+          building: Hoone
           castle: Kindlus
           church: Kirik
           icon: Ikoon
           manor: Mõis
+          mine: Kaevandus
           museum: Muuseum
           ruins: Varemed
           tower: Torn
+          wreck: Vrakk
         landuse: 
           cemetery: Surnuaed
           forest: Mets
+          mine: Kaevandus
           mountain: Mägi
+          nature_reserve: Looduskaitseala
+          park: Park
           railway: Raudtee
+          reservoir: Veehoidla
           wetland: Soo
+          wood: Mets
         leisure: 
           garden: Aed
           golf_course: Golfiväljak
           ice_rink: Uisuväli
           miniature_golf: Minigolf
+          nature_reserve: Looduskaitseala
           park: park
+          pitch: Spordiväljak
           playground: Mänguväljak
           sports_centre: Spordikeskus
           stadium: Saadion
           swimming_pool: ujula
           water_park: Veepark
         natural: 
+          bay: Laht
           beach: Rand
           cave_entrance: Koopa sissepääs
+          channel: Kanal
           coastline: Rannajoon
           crater: Kraater
           fjord: Fjord
           geyser: Geiser
+          glacier: Liustik
+          heath: Nõmm
           hill: Mägi
           island: Saar
+          moor: Raba
           mud: Muda
           peak: Mäetipp
+          reef: Riff
           river: Jõgi
           spring: Allikas
+          strait: Väin
           tree: Puu
+          valley: Org
           volcano: Vulkaan
           water: Vesi
           wetlands: Soo
+          wood: Mets
         place: 
           airport: lennujaam
           city: Linn
@@ -233,6 +443,7 @@ et:
           houses: Majad
           island: Saar
           islet: Saareke
+          moor: Raba
           municipality: Vald
           postcode: Sihtnumber
           sea: meri
@@ -240,10 +451,14 @@ et:
           town: Linn
           village: Küla
         railway: 
+          halt: Rongipeatus
+          platform: Raudteeperroon
           station: Raudteejaam
+          subway: Metroojaam
           tram: Trammitee
           tram_stop: Trammipeatus
         shop: 
+          bicycle: Rattapood
           books: Raamatupood
           car_repair: Autoparandus
           carpet: Vaibakauplus
@@ -269,9 +484,11 @@ et:
           toys: Mänguasjapood
           travel_agency: Reisiagentuur
         tourism: 
+          alpine_hut: Alpimaja
           attraction: Turismiatraktsioon
           camp_site: Laagriplats
           guest_house: külalistemaja
+          hostel: Hostel
           hotel: Hotell
           information: informatsioon
           motel: motell
@@ -279,16 +496,61 @@ et:
           picnic_site: piknikuplats
           theme_park: Teemapark
           zoo: Loomaaed
+        waterway: 
+          canal: Kanal
+          dam: Tamm
+          river: Jõgi
+          riverbank: Jõekallas
   javascripts: 
+    map: 
+      base: 
+        cycle_map: Rattakaart
     site: 
+      edit_disabled_tooltip: Kaardi redigeerimiseks suumi lähemale
       edit_tooltip: Töötle kaarti
+      history_tooltip: Vaata tehtud muudatusi
   layouts: 
+    copyright: Autoriõigused ja litsents
+    donate_link_text: annetused
     edit: Redigeeri
+    edit_with: Redigeeri {{editor}}-ga
+    export: Ekspordi
+    export_tooltip: Ekspordi kaardiandmed
+    gps_traces: GPS rajad
+    help: Juhend
+    history: Ajalugu
+    home: kodu
+    home_tooltip: Mine kodupaika
+    inbox: postkast ({{count}})
+    inbox_tooltip: 
+      one: Sul on üks lugemata sõnum
+      other: Sul on {{count}} lugemata sõnumit
+      zero: Sul ei ole lugemata sõnumeid
     log_in: logi sisse
+    log_in_tooltip: Logi sisse oma kasutajanimega
+    logo: 
+      alt_text: OpenStreetMapi logo
+    logout: logi välja
     logout_tooltip: Logi välja
-    shop: Kauplus
+    make_a_donation: 
+      text: Anneta
+      title: Toeta OpenStreetMappi rahaliselt
+    sign_up: registreeru
+    sign_up_tooltip: Redigeerimiseks loo omale konto
+    tag_line: Vaba viki-maailmakaart
+    user_diaries: Kasutajate päevikud
+    user_diaries_tooltip: Vaata kasutajate päevikuid
+    view: Vaata
+    view_tooltip: Vaata kaarti
+    welcome_user: Tere tulemast, {{user_link}}
     welcome_user_link_tooltip: Sinu kasutajaleht
+    wiki: Viki
+  license_page: 
+    foreign: 
+      title: Info selle tõlke kohta
   message: 
+    delete: 
+      deleted: Sõnum kustutatud
     inbox: 
       date: Kuupäev
       from: Saatja
@@ -306,14 +568,30 @@ et:
       read_button: Märgi loetuks
       reply_button: Vasta
       unread_button: Märgi mitteloetuks
+    new: 
+      body: Sisu
+      message_sent: Sõnum saadetud
+      send_button: Saada
+      send_message_to: Saada kasutajale {{name}} uus sõnum
+      subject: Teema
+      title: Saada sõnum
+    no_such_user: 
+      heading: Kasutajat ei leitud
+      title: Kasutajat ei leitud
     outbox: 
       date: Kuupäev
+      inbox: saabunud kirjad
+      my_inbox: "{{inbox_link}}"
+      people_mapping_nearby: lähedalolevad kaardistajad
       subject: Teema
+      to: Kellele
     read: 
+      back_to_inbox: Tagasi postkasti
       date: Kuupäev
       from: Kellelt
       reply_button: Vasta
       subject: Teema
+      title: Loe sõnumit
       to: Kellele
       unread_button: Märgi mitteloetuks
     sent_message_summary: 
@@ -321,10 +599,14 @@ et:
   notifier: 
     diary_comment_notification: 
       hi: Tere, {{to_user}}!
+    email_confirm: 
+      subject: "[OpenStreetMap] Kinnita oma e-posti aadress"
     email_confirm_html: 
       greeting: Tere,
     email_confirm_plain: 
       greeting: Tere,
+    friend_notification: 
+      subject: "[OpenStreetMap] {{user}} lisas sind oma sõbraks"
     gpx_notification: 
       greeting: Tere,
     lost_password_html: 
@@ -333,6 +615,13 @@ et:
       greeting: Tere,
     message_notification: 
       hi: Tere, {{to_user}},
+    signup_confirm: 
+      subject: "[OpenStreetMap] E-posti aadressi kinnitamine"
+    signup_confirm_plain: 
+      greeting: Hei!
+  oauth: 
+    oauthorize: 
+      allow_write_api: muuda kaarti.
   oauth_clients: 
     edit: 
       submit: Redigeeri
@@ -350,20 +639,79 @@ et:
     index: 
       license: 
         project_name: OpenStreetMap projekt
+      permalink: Püsilink
+      shortlink: Lühilink
     key: 
       map_key: Legend
+      map_key_tooltip: Kaardi legend
       table: 
         entry: 
+          admin: Halduspiir
+          allotments: Aiamaa
+          apron: 
+            - Lennujaama perroon
+            - terminal
+          bridge: Must ümbris = sild
+          bridleway: Ratsatee
+          brownfield: Ehitusmaa
+          building: Märkimisväärne hoone
+          cable: 
+            - Köisraudtee
+            - toolilift
           cemetery: Surnuaed
+          centre: Spordikeskus
+          commercial: Äripiirkond
+          common: 
+            - Heinamaa
+            - luht
+          construction: Ehitatavad teed
           cycleway: Jalgrattatee
+          destination: Üksnes läbisõiduks
+          farm: Põllumajanduslik maa
           footway: Jalgtee
+          forest: Tulundusmets
           golf: Golfiväljak
+          heathland: Nõmm
+          industrial: Tööstuspiirkond
+          lake: 
+            - Järv
+            - veehoidla
+          military: Sõjaväe kasutuses
+          motorway: Kiirtee
           park: Park
+          permissive: Pääs ainult lubadega
+          pitch: Spordiväljak
+          primary: Põhimaantee
+          private: Üksnes omanikule
+          rail: Raudtee
+          reserve: Looduskaitseala
+          resident: Elamurajoon
+          retail: Kaubanduspiirkond
+          runway: 
+            - Lennurada
+            - ruleerimistee
+          school: 
+            - Kool
+            - ülikool
+          secondary: Tugimaantee
           station: Raudteejaam
+          subway: Metroo
+          summit: 
+            - Mägi
+            - tipp
+          tourist: Turismimagnet
+          track: Rada
           tram: 
-            1: tramm
+            - Trammitee
+            - tramm
+          trunk: Esimese klassi tee
+          tunnel: Katkendlik ümbris = tunnel
+          unclassified: Klassifitseerimata tee
+          unsurfaced: Katteta tee
+          wood: Mets
     search: 
       search: Otsi
+      search_help: "näit.: 'Laagri', 'Pargi, Tartu' või 'ATM near Kohila' <a href='http://wiki.openstreetmap.org/wiki/Search'>veel näiteid...</a> (ingl. k)"
       submit_text: Otsi
       where_am_i: Kus ma olen?
     sidebar: 
@@ -385,20 +733,33 @@ et:
       points: "Punktid:"
       save_button: Salvesta muudatused
       start_coord: "Alguskoordinaadid:"
+      tags: "Sildid:"
+      uploaded_at: "Üles laaditud:"
       visibility: "Nähtavus:"
       visibility_help: Mida see tähendab?
     no_such_user: 
       title: Sellist kasutajat ei ole
     trace: 
+      count_points: 
+        one: "{{count}} punkt"
+        other: "{{count}} punkti"
+      edit: redigeeri
+      edit_map: Redigeeri kaarti
+      more: rohkem
       view_map: Vaata kaarti
     trace_form: 
       description: Kirjeldus
       help: Abi
       upload_button: Laadi üles
+      upload_gpx: "Laadi GPX-fail üles:"
       visibility: Nähtavus
       visibility_help: mida see tähendab?
     trace_header: 
       upload_trace: Lisa GPS-rada
+    trace_optionals: 
+      tags: Sildid
+    trace_paging_nav: 
+      next: Järgmine &raquo;
     view: 
       description: "Kirjeldus:"
       download: laadi alla
@@ -408,6 +769,8 @@ et:
       owner: "Omanik:"
       points: "Punktid:"
       start_coordinates: "Alguskoordinaadid:"
+      tags: "Sildid:"
+      uploaded: "Üles laaditud:"
       visibility: "Nähtavus:"
   user: 
     account: 
@@ -418,11 +781,15 @@ et:
       delete image: Eemalda praegune pilt
       email never displayed publicly: (mitte kunagi näidata avalikult)
       home location: "Kodu asukoht:"
+      image: "Pilt:"
       image size hint: (ruudukujuline pilt vähemalt 100x100 on sobiv)
       keep image: Säilitada praegune pilt
       latitude: "Laiuskraadid:"
       longitude: "Pikkuskraadid:"
+      my settings: Minu seaded
       new email address: "Uus e-posti aadress:"
+      no home location: Sa pole oma kodupaika märkinud.
+      preferred editor: "Vaikimisi redaktor:"
       preferred languages: "Eelistatud keeled:"
       profile description: "Profiili kirjeldus:"
       public editing: 
@@ -435,28 +802,32 @@ et:
       replace image: Asenda praegune pilt
       return to profile: Tagasi profiili
       save changes button: Salvesta muudatused
+      title: Redigeeri kasutajakontot
     confirm: 
       already active: See konto on juba kinnitatud.
       button: Kinnita
       heading: Kinnita kasutajakonto
     confirm_email: 
       button: Kinnita
+      heading: Kinnita e-posti aadressi muutmine
     confirm_resend: 
-      failure: Kasutaja {{nimi}} ei leitud.
+      failure: Kasutajat {{name}} ei leitud.
     filter: 
       not_an_administrator: Selle tegevuse sooritamiseks pead sa olema administraator.
     list: 
       empty: Sobivaid kasutajaid ei leitud!
       heading: Kasutajad
       hide: Peida valitud Kasutajad
-      summary_no_ip: "{{nimi}} loodud {{date}}"
+      summary_no_ip: "{{name}} loodud {{date}}"
       title: Kasutajad
     login: 
       create_account: Loo uus kasutajanimi
       email or username: "E-posti aadress või kasutajanimi:"
       heading: Logi sisse
       login_button: Logi sisse
+      lost password link: Salasõna ununes?
       password: "Parool:"
+      please login: Logi sisse või {{create_user_link}}.
       title: Sisselogimise lehekülg
     logout: 
       heading: Välju OpenStreetMap -st
@@ -465,6 +836,9 @@ et:
     lost_password: 
       email address: "E-posti aadress:"
       heading: Parool ununenud?
+      new password button: Saada mulle uus salasõna
+      notice email cannot find: Seda e-posti aadressi ei leitud.
+      title: Unustatud salasõna
     make_friend: 
       already_a_friend: Sa oled kasutajaga {{name}} juba sõber.
       success: "{{name}} on nüüd Sinu sõber."
@@ -547,6 +921,8 @@ et:
       back: Vaata kõiki blokeeringuid
     partial: 
       confirm: Oled Sa kindel?
+      edit: Redigeeri
+      show: Näita
     show: 
       back: Vaata kõiki blokeeringuid
       confirm: Oled Sa kindel?
@@ -556,5 +932,7 @@ et:
       status: Olek
       time_future: Lõpeb {{time}}
   user_role: 
+    grant: 
+      confirm: Kinnita
     revoke: 
       confirm: Kinnita
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index c3fe5f423..9d4c63e01 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -77,6 +77,7 @@ eu:
     node_history: 
       download: "{{download_xml_link}} edo {{view_details_link}}"
       download_xml: XML jaitsi
+      view_details: xehetasunak ikusi
     not_found: 
       type: 
         node: nodo
@@ -88,9 +89,12 @@ eu:
       relation: Erlazio
       relation_title: "{{relation_name}} erlazioa"
       view_history: historia ikusi
+    relation_details: 
+      members: "Kideak:"
     relation_history: 
       download: "{{download_xml_link}} edo {{view_details_link}}"
       download_xml: XML jaitsi
+      view_details: xehetasunak ikusi
     relation_member: 
       type: 
         node: Nodo
@@ -102,6 +106,9 @@ eu:
       details: Xehetasunak
       loading: Kargatzen...
       object_list: 
+        back: Objetu zerrenda erakutsi
+        details: Xehetasunak
+        heading: Objetu zerrenda
         history: 
           type: 
             node: "[[id]]. nodoa"
@@ -113,10 +120,14 @@ eu:
         type: 
           node: Nodo
           way: Bide
+      private_user: erabiltzaile pribatua
       show_history: Historia Ikusi
       wait: Itxoin...
     tag_details: 
       tags: "Etiketak:"
+    timeout: 
+      type: 
+        relation: erlazio
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} edo {{edit_link}}"
       download_xml: XML jaitsi
@@ -129,6 +140,7 @@ eu:
     way_history: 
       download: "{{download_xml_link}} edo {{view_details_link}}"
       download_xml: XML jaitsi
+      view_details: xehetasunak ikusi
   changeset: 
     changeset: 
       anonymous: Anonimoa
@@ -165,6 +177,11 @@ eu:
       leave_a_comment: Iruzkin bat utzi
       login: Saioa hasi
       save_button: Gorde
+  editor: 
+    potlatch: 
+      name: Potlatch 1
+    potlatch2: 
+      name: Potlatch 2
   export: 
     start: 
       export_button: Esportatu
@@ -215,6 +232,7 @@ eu:
           auditorium: Entzunareto
           bank: Banku
           bar: Taberna
+          bench: Eserleku
           bicycle_rental: Txirrindu Alokairua
           brothel: Putetxe
           bureau_de_change: Diru-truke Bulegoa
@@ -226,6 +244,7 @@ eu:
           cinema: Zinema
           clinic: Klinika
           club: Diskoteka
+          college: Kolegioa
           community_centre: Komunitate Zentroa
           courthouse: Epaitegia
           crematorium: Errauste labe
@@ -241,6 +260,7 @@ eu:
           fountain: Iturri
           grave_yard: Hilerri
           gym: Osasun Zentroa / Gimnasioa
+          hall: Aretoa
           health_centre: Osasun Zentroa
           hospital: Ospitalea
           hotel: Hotel
@@ -266,6 +286,7 @@ eu:
           public_market: Herri Azoka
           recycling: Birziklatze gune
           restaurant: Jatetxe
+          retirement_home: Nagusien etxea
           sauna: Sauna
           school: Ikastetxe
           shop: Denda
@@ -336,6 +357,8 @@ eu:
         landuse: 
           cemetery: Hilerri
           commercial: Merkataritza Eremua
+          construction: Eraikuntza
+          farm: Baserria
           forest: Baso
           meadow: Larre
           military: Eremu Militarra
@@ -467,6 +490,7 @@ eu:
           alpine_hut: Aterpe alpinoa
           attraction: Atrakzio
           bed_and_breakfast: Ohe eta gosari (B&B)
+          cabin: Kabina
           camp_site: Kanpin
           chalet: Txalet
           guest_house: Aterpe
@@ -496,6 +520,7 @@ eu:
   layouts: 
     edit: Aldatu
     export: Esportatu
+    help: Laguntza
     history: Historia
     home: hasiera
     inbox: sarrera-ontzia ({{count}})
@@ -509,14 +534,17 @@ eu:
     logout_tooltip: Saioa itxi
     make_a_donation: 
       text: Dohaintza egin
-    shop: Denda
     sign_up: izena eman
     view: Ikusi
     view_tooltip: Mapa ikusi
     welcome_user: Ongietorri, {{user_link}}
     welcome_user_link_tooltip: Zure lankide orrialdea
+    wiki: Wikia
   license_page: 
+    foreign: 
+      title: Itzulpen honi buruz
     native: 
+      native_link: Euskara version
       title: Orrialde honi buruz
   message: 
     delete: 
@@ -559,6 +587,8 @@ eu:
   notifier: 
     diary_comment_notification: 
       hi: Kaixo {{to_user}},
+    email_confirm: 
+      subject: "[OpenStreetMap] Baieztatu zure eposta helbidea"
     email_confirm_html: 
       greeting: Kaixo,
     email_confirm_plain: 
@@ -586,6 +616,8 @@ eu:
       submit: Aldatu
     form: 
       name: Izena
+    show: 
+      allow_write_api: mapa aldatu.
   site: 
     edit: 
       user_page_link: Lankide orria
@@ -635,6 +667,9 @@ eu:
       where_am_i: Non nago?
     sidebar: 
       close: Itxi
+  time: 
+    formats: 
+      friendly: "%e %B %Y %H:%M-ean"
   trace: 
     edit: 
       description: "Deskribapen:"
@@ -645,8 +680,10 @@ eu:
       owner: "Jabea:"
       points: "Puntuak:"
       save_button: Aldaketak gorde
+      start_coord: "Koordenatuak hasi:"
       tags: "Etiketak:"
       uploaded_at: "Noiz igota:"
+      visibility: Ikusgarritasuna;
       visibility_help: Zer esan nahi du honek?
     trace: 
       ago: duela {{time_in_words_ago}}
@@ -664,7 +701,9 @@ eu:
       help: Laguntza
       tags: "Etiketak:"
       upload_button: Kargatu
-      visibility: Ikuspen
+      upload_gpx: GPX fitxategi igo
+      visibility: Ikusgarritasuna
+      visibility_help: Zer esan nahi du honek?
     trace_optionals: 
       tags: Etiketak
     trace_paging_nav: 
@@ -676,17 +715,25 @@ eu:
       edit: aldatu
       filename: "Fitxategi-izena:"
       map: mapa
+      none: Ezer
       owner: "Jabea:"
       points: "Puntuak:"
       tags: "Etiketak:"
       uploaded: "Noiz igota:"
-      visibility: "Ikuspen:"
+      visibility: "Ikusgarritasuna:"
   user: 
     account: 
+      contributor terms: 
+        link text: zer da hau?
+      current email address: "Egungo eposta helbidea:"
       image: "Irudia:"
       latitude: "Latitude:"
       longitude: "Longitude:"
       my settings: Nire aukerak
+      new email address: "Eposta helbide berria:"
+      new image: Irudi bat gehitu
+      preferred editor: "Lehenetsitako Editorea:"
+      preferred languages: "Hobetsitako hizkuntzak:"
       profile description: "Profilaren Deskribapena:"
       public editing: 
         disabled link text: Zergatik ezin dut aldatu?
@@ -713,7 +760,10 @@ eu:
       login_button: Saioa hasi
       lost password link: Pasahitza ahaztu duzu?
       password: "Pasahitza:"
+      register now: Erregistratu orain
+      remember: "Gogora nazazu:"
       title: Saio-hasiera
+      webmaster: webmaster
     logout: 
       heading: OpenStreetMap-etik saioa itxi
       logout_button: Saioa itxi
@@ -722,10 +772,13 @@ eu:
       email address: "Eposta Helbidea:"
       heading: Pasahitza ahaztuta?
       new password button: Pasahitza berrezarri
+      notice email cannot find: Eposta helbide hori ezin izan dugu aurkitu, barkatu.
       title: Ahaztutako pasahitza
     new: 
       confirm email address: "Eposta Helbidea baieztatu:"
       confirm password: "Pasahitza berretsi:"
+      continue: Jarraitu
+      display name: "Erakusteko izena:"
       email address: "Helbide elektronikoa:"
       heading: Erabiltzaile Kontua sortu
       password: "Pasahitza:"
@@ -742,18 +795,28 @@ eu:
       password: "Pasahitza:"
       reset: Pasahitza berrezarri
       title: Pasahitza berrezarri
+    suspended: 
+      heading: Kontua bertan behera geratu da
+      title: Kontua bertan behera geratu da
+      webmaster: webmaster
     terms: 
+      agree: Ados
+      consider_pd_why: zer da hau?
       legale_names: 
         france: Frantzia
         italy: Italy
+      legale_select: "Mesedez bizi zaren herrialdean aukeratu:"
     view: 
       activate_user: erabiltzaile hau gaitu
       add as friend: lagun bezala
       ago: (duela {{time_in_words_ago}})
       confirm: Berretsi
       confirm_user: erabiltzaile hau baieztatu
+      create_block: Erabiltzaile hau blokeatu
       deactivate_user: erabiltzaile hau ezgaitu
+      delete_user: lankide hau ezabatu
       description: Deskribapen
+      diary: egunerokoa
       edits: aldaketak
       email address: "Helbide elektronikoa:"
       hide_user: Erabiltzaile hau ezkutatu
@@ -762,8 +825,14 @@ eu:
       mapper since: "Noiztik mapatzaile:"
       my edits: nire aldaketak
       my settings: nire aukerak
+      remove as friend: lagun bezala kendu
+      role: 
+        administrator: Lankide hau administratzailea da
+        moderator: Lankide hau moderatzailea da
       send message: mezua bidali
+      settings_link_text: hobespenak
       status: "Egoera:"
+      user location: Lankidearen kokapena
       your friends: Zure lagunak
   user_block: 
     partial: 
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 782776710..65fb3a0db 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -735,7 +735,6 @@ fi:
     export_tooltip: Karttatiedon vienti
     gps_traces: GPS-jäljet
     help: Ohje
-    help_and_wiki: "{{help}} ja {{wiki}}"
     history: Historia
     home: koti
     home_tooltip: Siirry kotisijaintiin
@@ -757,11 +756,8 @@ fi:
     make_a_donation: 
       text: Lahjoita
       title: Tue OpenStreetMapia rahallisella lahjoituksella.
-    news_blog: Uutisblogi
-    news_blog_tooltip: Uutisblogi OpenStreetMapista, vapaasta maantieteellisestä datasta jne.
     osm_offline: OpenStreetMapin tietokantaan ei toistaiseksi ole pääsyä välttämättömien ylläpitotöiden takia.
     osm_read_only: OpenStreetMapin tietokantaan ei toistaiseksi voi lähettää mitään välttämättömien ylläpitotöiden takia.
-    shop: Kauppa
     sign_up: rekisteröidy
     sign_up_tooltip: Muokkaaminen edellyttää käyttäjätunnusta
     tag_line: Vapaa wikimaailmankartta
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 1d6e390b6..aea51132e 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -5,11 +5,13 @@
 # Author: Crochet.david
 # Author: Damouns
 # Author: EtienneChove
+# Author: F.rodrigo
 # Author: IAlex
 # Author: Jean-Frédéric
 # Author: Litlok
 # Author: McDutchie
 # Author: Peter17
+# Author: Phoenamandre
 # Author: Quentinv57
 # Author: Urhixidur
 # Author: Verdy p
@@ -309,7 +311,7 @@ fr:
       reply_link: Répondre a cette entrée
     edit: 
       body: "Message:"
-      language: "Langue:"
+      language: "Langue :"
       latitude: "Latitude:"
       location: "Lieu:"
       longitude: "Longitude:"
@@ -361,15 +363,15 @@ fr:
       user_title: Journal de {{user}}
   editor: 
     default: Par défaut (actuellement {{name}})
-    josm: 
-      description: JOSM (par extension contrôlée à distance)
-      name: JOSM
     potlatch: 
       description: Potlatch 1 (éditeur intégré au navigateur)
       name: Potlatch 1
     potlatch2: 
       description: Potlatch 2 (éditeur intégré au navigateur)
       name: Potlatch 2
+    remote: 
+      description: Éditeur externe (JOSM ou Merkaartor)
+      name: Éditeur externe
   export: 
     start: 
       add_marker: Ajouter un marqueur à la carte
@@ -893,17 +895,23 @@ fr:
       history_tooltip: Voir les modifications dans cette zone
       history_zoom_alert: Vous devez zoomer pour voir l’historique des modifications
   layouts: 
+    community_blogs: Blogs de la communauté
+    community_blogs_title: Blogs de membres de la communauté OpenStreetMap
     copyright: Copyright &amp; Licence
+    documentation: Documentation
+    documentation_title: Documentation du projet
     donate: Soutenez OpenStreetMap, {{link}} au fond pour améliorer le matériel.
     donate_link_text: participez
     edit: Modifier
     edit_with: Modifier avec {{editor}}
     export: Exporter
     export_tooltip: Exporter les données de la carte
+    foundation: La Fondation
+    foundation_title: La Fondation OpenStreetMap
     gps_traces: Traces GPS
     gps_traces_tooltip: Gérer les traces GPS
     help: Aide
-    help_and_wiki: "{{help}} & {{wiki}}"
+    help_centre: Centre d'aide
     help_title: site d’aide pour le projet
     history: Historique
     home: Chez moi
@@ -928,12 +936,8 @@ fr:
     make_a_donation: 
       text: Faire un don
       title: Soutenez OpenStreetMap avec un don financier
-    news_blog: Blogue de nouvelles
-    news_blog_tooltip: Blogue de nouvelles sur OpenStreetMap, les données géographiques libres, etc.
     osm_offline: La base de données de OpenStreetMap est actuellement hors ligne; une maintenance essentielle à son bon fonctionnement est en cours.
     osm_read_only: La base de données de OpenStreetMap est actuellement en mode lecture seule ; une maintenance essentielle à son bon fonctionnement est en cours.
-    shop: Boutique
-    shop_tooltip: Boutique de produits OpenStreetMap
     sign_up: S'inscrire
     sign_up_tooltip: Créer un compte pour la modification
     tag_line: La carte coopérative libre
@@ -1180,10 +1184,10 @@ fr:
       no_iframe_support: Votre navigateur ne supporte pas les iframes HTML, qui sont nécessaires pour cette fonctionnalité.
       not_public: Vous n'avez pas réglé vos modifications pour qu'elles soient publiques.
       not_public_description: Vous ne pouvez plus modifier la carte à moins que vous ne rendiez vos modifications publiques. Vous pouvez rendre vos modifications publiques à partir de votre {{user_page}}.
+      potlatch2_unsaved_changes: Vous avez des modifications non sauvegardées. (Pour sauvegarder vos modifications dans Potlach2, cliquer sur save)
       potlatch_unsaved_changes: Vous avez des modifications non sauvegardées. (Pour sauvegarder dans Potlatch, vous devez dé-sélectionner le way ou le node en cours si vous modifiez en mode direct, ou cliquer sur sauvegarder si vous avez un bouton sauvegarder.)
       user_page_link: page utilisateur
     index: 
-      josm_failed: La modification a échoué - veuillez vous assurer que JOSM est chargé et que l’extension de contrôle à distance est activée
       js_1: Vous utilisez soit un navigateur qui ne supporte pas Javascript soit vous avez désactivé Javascript.
       js_2: OpenStreetMap utilise Javascript pour ses cartes glissantes.
       js_3: Si vous êtes dans l'incapacité d'utiliser Javascript, essayer d'utiliser le <a href='http://tah.openstreetmap.org/Browse/'>navigateur statique de Tiles@Home</a>.
@@ -1192,6 +1196,7 @@ fr:
         notice: Sous license {{license_name}} par le {{project_name}} et ses contributeurs.
         project_name: projet OpenStreetMap
       permalink: Lien permanent
+      remote_failed: Échec de la modification - vérifiez que JOSM ou Merkaartor sont ouverts et que le greffon de contrôle à distance RemoteControl est activé.
       shortlink: Lien court
     key: 
       map_key: Légende de la carte
@@ -1264,7 +1269,7 @@ fr:
           wood: Bois
     search: 
       search: Recherche
-      search_help: "exemples : « Ouagadougou », « Place Grenette, Grenoble », « H2Y 1C6 », ou « post office near Alger » <a href='http://wiki.openstreetmap.org/wiki/Search'>Autres exemples...</a>"
+      search_help: "exemples : « Ouagadougou », « Place Grenette, Grenoble », « H2Y 1C6 », ou « post office near Alger »<a href='http://wiki.openstreetmap.org/wiki/Search'>Autres exemples...</a>"
       submit_text: Ok
       where_am_i: Où suis-je ?
       where_am_i_title: Décrit la position actuelle en utilisant le moteur de recherche
@@ -1370,10 +1375,10 @@ fr:
       uploaded: "Envoyé le :"
       visibility: "Visibilité :"
     visibility: 
-      identifiable: Identifiable (affiché dans la liste des traces et comme identifiable, points ordonnés avec les dates)
+      identifiable: Identifiable (affiché dans la liste des traces et identifiable, points ordonnés avec les dates)
       private: Privé (partagé anonymement, points non ordonnés)
-      public: Public (affiché dans la liste des traces et anonymement, points non ordonnés)
-      trackable: Pistable (partagé seulement anonymement, points ordonnés avec les dates)
+      public: Public (affiché dans la liste des traces et anonyme, points non ordonnés)
+      trackable: Pistable (partagé uniquement de façon anonyme, points ordonnés avec les dates)
   user: 
     account: 
       contributor terms: 
@@ -1453,17 +1458,22 @@ fr:
     login: 
       account not active: Désolé, votre compte n'est pas encore actif.<br/>Veuillez cliquer sur le lien dans le courrier électronique de confirmation, pour activer votre compte, ou <a href="{{reconfirm}}">demandez un nouveau courrier de confirmation</a>.
       account suspended: Désolé, votre compte a été suspendu en raison d'une activité suspecte.<br />Veuillez contacter le {{webmaster}} si vous voulez en discuter.
+      already have: Vous avez déjà un compte OpenStreetMap ? Merci de vous connecter.
       auth failure: Désolé, mais les informations fournies n’ont pas permis de vous identifier.
+      create account minute: Se créer un compte. Ça ne prend qu'une minute.
       create_account: Créer un compte
       email or username: "Adresse e-mail ou nom d'utilisateur :"
       heading: Connexion
       login_button: Se connecter
       lost password link: Vous avez perdu votre mot de passe ?
+      new to osm: Nouveau sur OpenStreetMap ?
       notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">En savoir plus sur le futur changement de licence d’OpenStreetMap</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">traductions</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">discussion</a>)
       password: "Mot de passe :"
       please login: Veuillez vous connecter ou {{create_user_link}}.
+      register now: S'inscrire maintenant
       remember: "Se souvenir de moi :"
       title: Se connecter
+      to make changes: Pour apporter des modifications aux données OpenStreetMap, vous devez posséder un compte.
       webmaster: webmaster
     logout: 
       heading: Déconnexion d'OpenStreetMap
@@ -1557,6 +1567,7 @@ fr:
       hide_user: masquer cet utilisateur
       if set location: Si vous définissez un lieu, une jolie carte va apparaître en dessous. Vous pouvez définir votre lieu sur votre page {{settings_link}}.
       km away: "{{count}} km"
+      latest edit: "Dernière modification {{ago}} :"
       m away: distant de {{count}} m
       mapper since: "Mappeur depuis:"
       moderator_history: voir les blocages donnés
diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index bf80732e0..689083ae1 100644
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -64,9 +64,15 @@ fur:
       belongs_to: "Al è di:"
       closed_at: "Sierât ai:"
       created_at: "Creât ai:"
+      has_nodes: 
+        one: "Al à il grop ca sot:"
+        other: "Al à i {{count}} grops ca sot:"
       has_relations: 
-        one: "Al à la {{count}} relazion ca sot:"
+        one: "Al à la relazion ca sot:"
         other: "Al à lis {{count}} relazions ca sot:"
+      has_ways: 
+        one: "Al à la vie ca sot:"
+        other: "Al à lis {{count}} viis ca sot:"
       show_area_box: Mostre ricuadri de aree
     common_details: 
       changeset_comment: "Coment:"
@@ -81,14 +87,18 @@ fur:
       deleted: Eliminât
       larger: 
         area: Viôt la aree suntune mape plui grande
+        node: Viôt il grop suntune mape plui grande
         relation: Viôt la relazion suntune mape plui grande
+        way: Viôt la vie suntune mape plui grande
       loading: Daûr a cjamâ...
     navigation: 
       all: 
         next_changeset_tooltip: Grup di cambiaments sucessîf
         next_relation_tooltip: Relazion sucessive
         prev_changeset_tooltip: Grup di cambiaments precedent
+        prev_node_tooltip: Grop precedent
         prev_relation_tooltip: Relazion precedente
+        prev_way_tooltip: Vie precedente
       user: 
         name_changeset_tooltip: Vîot i cambiaments di {{user}}
         next_changeset_tooltip: Cambiament sucessîf di {{user}}
@@ -97,6 +107,7 @@ fur:
       download: "{{download_xml_link}}, {{view_history_link}} o {{edit_link}}"
       download_xml: Discjame XML
       edit: cambie
+      node: Grop
       view_history: cjale storic
     node_details: 
       coordinates: "Coordenadis:"
@@ -108,6 +119,7 @@ fur:
     not_found: 
       type: 
         changeset: "Non dal file:"
+        node: grop
         relation: relazion
     paging_nav: 
       of: su
@@ -130,6 +142,7 @@ fur:
     relation_member: 
       entry_role: "{{type}} {{name}} come {{role}}"
       type: 
+        node: Grop
         relation: Relazion
     start: 
       manually_select: Sielç a man une aree divierse
@@ -149,6 +162,8 @@ fur:
         back: Mostre liste dai ogjets
         details: Detais
         heading: di
+        type: 
+          node: Grop
       private_user: utent privât
       show_history: Mostre storic
       wait: Daûr a spietâ...
@@ -158,6 +173,8 @@ fur:
       wikipedia_link: L'articul su {{page}} te Wikipedia
     timeout: 
       type: 
+        changeset: grup di cambiaments
+        node: grop
         relation: relazion
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} o {{edit_link}}"
@@ -261,6 +278,14 @@ fur:
       save_button: Salve
       title: Diari di {{user}} | {{title}}
       user_title: Diari di {{user}}
+  editor: 
+    default: Predeterminât (par cumò {{name}})
+    potlatch: 
+      description: Potlatch 1 (editôr tal sgarfadôr)
+      name: Potlatch 1
+    potlatch2: 
+      description: Potlatch 2 (editôr tal sgarfadôr)
+      name: Potlatch 2
   export: 
     start: 
       add_marker: Zonte un segnalut ae mape
@@ -338,12 +363,15 @@ fur:
           auditorium: Auditori
           bank: Bancje
           bench: Bancjute
+          bicycle_rental: Nauli di bicicletis
           bureau_de_change: Ufizi di cambi
           bus_station: Stazion des corieris
+          car_rental: Nauli di machinis
           car_wash: Lavaç machinis
           casino: Casinò
           cinema: Cine
           clinic: Cliniche
+          community_centre: Centri civic
           dentist: Dentist
           doctors: Dotôrs
           drinking_water: Aghe potabil
@@ -364,6 +392,7 @@ fur:
           police: Polizie
           post_office: Pueste
           prison: Preson
+          pub: Pub
           public_building: Edifici public
           public_market: Marcjât public
           restaurant: Ristorant
@@ -383,11 +412,15 @@ fur:
           chapel: Capele
           church: Glesie
           city_hall: Municipi
+          entrance: Jentrade dal edifici
           house: Cjase
+          industrial: Edifici industriâl
+          public: Edifici public
           shop: Buteghe
           stadium: Stadi
           train_station: Stazion de ferade
           university: Edifici universitari
+          "yes": Edifici
         highway: 
           bus_stop: Fermade autobus
           emergency_access_point: Pont di acès di emergjence
@@ -457,19 +490,23 @@ fur:
           construction: Ferade in costruzion
           disused: Ferade bandonade
           disused_station: Stazion de ferade bandonade
+          halt: Fermade de ferade
           light_rail: Ferade lizere
           station: Stazion de ferade
+          tram_stop: Fermade dal tram
         shop: 
           bakery: Pancôr
           bicycle: Buteghe di bicicletis
           books: Librerie
           butcher: Becjarie
           car_repair: Riparazion di machinis
+          carpet: Buteghe di tapêts
           hairdresser: Piruchîr o barbîr
           insurance: Assicurazion
           laundry: Lavandarie
           market: Marcjât
           optician: Otic
+          pet: Buteghe di animâi
           supermarket: Supermarcjât
           toys: Negozi di zugatui
         tourism: 
@@ -496,15 +533,23 @@ fur:
       history_tooltip: Cjale i cambiaments in cheste aree
       history_zoom_alert: Tu scugnis cressi il zoom par viodi il storic dai cambiaments
   layouts: 
+    community_blogs: Blogs de comunitât
+    community_blogs_title: Blogs di bande dai membris de comunitât OpenStreetMap
     copyright: Copyright &amp; Licence
+    documentation: Documentazion
+    documentation_title: Documentazion dal progjet
     donate: Sosten OpenStreetMap {{link}} al font pal inzornament dal hardware.
     donate_link_text: donant
     edit: Cambie
+    edit_with: Cambie cun {{editor}}
     export: Espuarte
     export_tooltip: Espuarte i dâts de mape
+    foundation: Fondazion
+    foundation_title: La fondazion OpenStreetMap
     gps_traces: Percors GPS
     gps_traces_tooltip: Gjestìs i percors GPS
     help: Jutori
+    help_centre: Jutori
     help_title: Sît di jutori pal progjet
     history: Storic
     home: lûc iniziâl
@@ -529,12 +574,8 @@ fur:
     make_a_donation: 
       text: Done alc
       title: Sosten OpenStreetMap fasint une donazion monetarie
-    news_blog: Blog cu lis gnovis
-    news_blog_tooltip: Blog cu lis gnovis su OpenStreetMap, i dâts gjeografics libars e vie indevant.
     osm_offline: La base di dâts di OpenStreetMap e je par cumò fûr linie parcè che o sin daûr a fâ lavôrs essenziâi di manutenzion de base di dâts.
     osm_read_only: La base di dâts di OpenStreetMap e je par cumò dome in leture dilunc la esecuzion di lavôrs essenziâi di manutenzion de base di dâts.
-    shop: Buteghe
-    shop_tooltip: Buteghe cun prodots cu la marcje OpenStreetMap
     sign_up: regjistriti
     sign_up_tooltip: Cree un profîl par colaborâ
     tag_line: Il WikiMapeMont libar
@@ -643,7 +684,12 @@ fur:
       name: Non
   site: 
     edit: 
+      anon_edits_link_text: Discuvierç parcè che al è cussì.
       flash_player_required: Ti covente un riprodutôr Flash par doprâ Potlatch, l'editôr Flash di OpenStreetMap. Tu puedis <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">discjamâ il Flash Player di Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">E je cualchi altre opzion</a> par lavorâ su OpenStreetMap.
+      no_iframe_support: Il to sgarfadôr nol supuarte i iframes HTML, che a coventin par cheste funzion.
+      not_public: Tu âs impuestât i tiei cambiaments come no publics.
+      not_public_description: No tu puedis plui cambiâ la mape se tu lu fasis. Tu puedis impuestâ come publics i tiei cambiaments de tô {{user_page}}.
+      potlatch2_unsaved_changes: Tu âs cambiaments no salvâts. (Par salvâ in Potlatch 2, tu scugnis fracâ sul boton pal salvataç)
       potlatch_unsaved_changes: Tu âs cambiaments no salvâts. (Par salvâ in Potlatch, tu varessis di deselezionâ il percors o il pont atuâl, se tu stâs lavorant in modalitât live, o fracâ su Salve se tu viodis un boton Salve.)
       user_page_link: pagjine dal utent
     index: 
@@ -655,6 +701,7 @@ fur:
         notice: Dât fûr sot de licence {{license_name}} di {{project_name}} e i siei utents che a àn contribuît.
         project_name: progjet OpenStreetMap
       permalink: Leam permanent
+      remote_failed: Cambiament falît - siguriti che JOSM o Merkaartor a sedin inviâts e la opzion pal remote control e sedi ativade
       shortlink: Leam curt
     key: 
       map_key: Leiende
@@ -817,6 +864,8 @@ fur:
       success: Tu âs confermât la tô direzion di pueste, graziis par jessiti regjistrât
     confirm_resend: 
       failure: L'utent {{name}} nol è stât cjatât.
+    go_public: 
+      flash success: Ducj i tiei cambiaments a son cumò publics e tu puedis za scomençâ a lavorâ.
     list: 
       heading: Utents
       showing: 
@@ -878,6 +927,7 @@ fur:
         france: France
         italy: Italie
         rest_of_world: Rest dal mont
+      legale_select: "Sielç il stât dulà che tu âs la residences:"
       title: Tiermins par contribuî
     view: 
       add as friend: zonte ai amîs
@@ -896,6 +946,7 @@ fur:
       hide_user: plate chest utent
       if set location: Se tu impuestis la tô locazion, tu viodarâs culì une biele mape e altris informazions. Tu puedis impuestâ il to lûc iniziâl inte pagjine des {{settings_link}}.
       km away: a {{count}}km di distance
+      latest edit: "Ultin cambiament {{ago}}:"
       m away: "{{count}}m di distance"
       mapper since: "Al mape dai:"
       moderator_history: viôt i blocs ricevûts
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index dde5a0270..da03dba31 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -882,7 +882,6 @@ gl:
     gps_traces: Pistas GPS
     gps_traces_tooltip: Xestionar as pistas GPS
     help: Axuda
-    help_and_wiki: "{{help}} e {{wiki}}"
     help_title: Sitio de axuda do proxecto
     history: Historial
     home: inicio
@@ -907,12 +906,8 @@ gl:
     make_a_donation: 
       text: Facer unha doazón
       title: Apoie o OpenStreetMap cunha doazón
-    news_blog: Blogue de novas
-    news_blog_tooltip: Blogue de noticias sobre o OpenStreetMap, datos xeográficos libres etc.
     osm_offline: A base de datos do OpenStreetMap atópase desconectada mentres realizamos traballos de mantemento nela.
     osm_read_only: A base de datos do OpenStreetMap atópase en modo de só lectura mentres realizamos traballos de mantemento nela.
-    shop: Tenda
-    shop_tooltip: Tenda de produtos do OpenStreetMap
     sign_up: rexistrarse
     sign_up_tooltip: Crear unha conta para editar
     tag_line: O mapa mundial libre
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 3edfd29c2..b8180b98c 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -355,6 +355,17 @@ hr:
       save_button: Spremi
       title: Blog korisnika {{user}} | {{title}}
       user_title: "{{user}}ov dnevnik"
+  editor: 
+    default: Zadano (currently {{name}})
+    potlatch: 
+      description: Potlatch 1 (editor unutar web preglednika)
+      name: Potlatch 1
+    potlatch2: 
+      description: Potlatch 2 (editor unutar web preglednika)
+      name: Potlatch 2
+    remote: 
+      description: Remote Control (JOSM ili Merkaartor)
+      name: Remote Control
   export: 
     start: 
       add_marker: Dodaj marker na kartu
@@ -878,16 +889,23 @@ hr:
       history_tooltip: Prikaži izmjene za ovo područje
       history_zoom_alert: Morate zoomirati da bi vidjeli povijest izmjena
   layouts: 
+    community_blogs: Blogovi zajednice
+    community_blogs_title: Blogovi članova OpenStreetMap zajednice
     copyright: Autorska prava &amp; Dozvola
+    documentation: Dokumentacija
+    documentation_title: Dokumentacija za projekt
     donate: Podržite OpenStreetMap sa {{link}} Hardware Upgrade Fond.
     donate_link_text: donacije
     edit: Uredi
+    edit_with: Uredi s {{editor}}
     export: Izvoz
     export_tooltip: Izvoz podataka karte
+    foundation: Zaklada
+    foundation_title: OpenStreetMap zaklada
     gps_traces: GPS trase
     gps_traces_tooltip: Upravljaj GPS trasama
     help: Pomoć
-    help_and_wiki: "{{help}} & {{wiki}}"
+    help_centre: Centar pomoći
     help_title: Stranice pomoći za projekt
     history: Povijest
     home: dom
@@ -914,12 +932,8 @@ hr:
     make_a_donation: 
       text: Donirajte
       title: Podržite Openstreetmap novčanom donacijom
-    news_blog: Novosti - blog
-    news_blog_tooltip: Novosti - blog o OpenStreetMap-u, slobodnim geografskim podacima, itd.
     osm_offline: OpenStreetMap baza podataka je trenutno nedostupna dok se ne završe važni radovi na održavanju.
     osm_read_only: Zbog radova na održavanju baze podataka OpenStreetMapa, istu trenutačno nije moguće mijenjati.
-    shop: Trgovina
-    shop_tooltip: Trgovina sa proizvodima OpenStreetMap marke
     sign_up: otvori račun
     sign_up_tooltip: Otvori korisnički račun za uređivanje
     tag_line: Slobodna wiki karta Svijeta
@@ -1164,8 +1178,10 @@ hr:
     edit: 
       anon_edits_link_text: Otkrij zašto je to slučaj.
       flash_player_required: Trebate Flash player da bi koristili Potlatch, OpenStreetMap Flash editor. Možete <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">preuzeti Abode Flash Player sa Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Neke druge mogućnosti</a> su također dostupne za uređivanje OpenStreetMapa.
+      no_iframe_support: Vaš preglednik ne podržava HTML iframes, koji su potrebni za ovu značajku.
       not_public: Niste namjestili vaše promjene da budu javne.
       not_public_description: Ne možete više uređivati kartu dok to ne napravite. Možete namjestiti svoje promjene u javne sa {{user_page}}.
+      potlatch2_unsaved_changes: Neke promjene nisu spremljene. (Da biste spremili u Potlatch 2, trebali bi kliknuti Spremi.)
       potlatch_unsaved_changes: Niste spremili promjene. (Da bi spremili u Potlatchu, morate odznačiti trenutni put ili točku ako uređujete uživo; ili kliknite SPREMI ako imate taj gumb.)
       user_page_link: korisnička stranica
     index: 
@@ -1177,10 +1193,11 @@ hr:
         notice: Licencirano pod {{license_name}} licenca {{project_name}} i njenih suradnika.
         project_name: OpenStreetMap projekt
       permalink: Permalink
+      remote_failed: Uređivanje nije uspjelo - provjerite da li je JOSM ili Merkaartor učitan i da je opcija "remote control" omogućena
       shortlink: Shortlink
     key: 
       map_key: Legenda
-      map_key_tooltip: Legenda Mapnik karte na ovom zoom nivou.
+      map_key_tooltip: Legenda karte
       table: 
         entry: 
           admin: Administrativna granica
@@ -1384,6 +1401,7 @@ hr:
       new email address: "Nova E-mail adresa:"
       new image: Dodajte sliku
       no home location: Niste unjeli lokaciju vašeg doma.
+      preferred editor: "Preferirani editor:"
       preferred languages: "Željeni jezici:"
       profile description: "Opis profila:"
       public editing: 
@@ -1402,16 +1420,23 @@ hr:
       title: Uredi korisnički račun
       update home location on click: Ažuriraj lokaciju doma kada kliknem na kartu?
     confirm: 
+      already active: Ovaj račun je već potvrđen.
+      before you start: Znamo da ste vjerojatno u žurbi za početak mapiranja, ali prije nego što počnete, možda bi željeli ispuniti neke dodatne informacije o sebi u donji obrazac.
       button: Potvrdi
       heading: Potvrdi korisnički  račun
       press confirm button: Pritisni potvrdi da bi aktivirali svoj korisnički račun.
+      reconfirm: Ako je prošlo neko vrijeme otkad ste se prijavili možda će te morati <a href="{{reconfirm}}">poslati sebi novu e-poštu potvrde</a> .
       success: Tvoj račun je potvrđen , hvala na uključenju!
+      unknown token: Izgleda da taj token ne postoji.
     confirm_email: 
       button: Potvrdi
       failure: Email adresa je već potvrđena s ovim token-om.
       heading: Potvrdi promjenu email adrese.
       press confirm button: Pritsni potvrdno dugme ispod i potvrdi novu email adresu.
       success: Potvrđena je vaša email adresa, hvala za priključenje!
+    confirm_resend: 
+      failure: Korisnik {{name}} nije pronađen.
+      success: Poslali smo novu potvrdu na email {{email}} a čim potvrdite svoj račun, moći će te početi mapirati.<br /><br />Ako koristite antispam sustav koji šalje potvrdu zahtjeva, molimo Vas da provjerite je li webmaster@openstreetmap.org na tzv. "whitelisti", jer nismo u mogućnosti odgovarati na potvrde zahtjeva.
     filter: 
       not_an_administrator: Morate biti administrator za izvođenje ovih akcija.
     go_public: 
@@ -1428,19 +1453,24 @@ hr:
       summary_no_ip: "{{name}} napravljeno {{date}}"
       title: Korisnici
     login: 
-      account not active: Žao mi je, vaš korisnički račun još nije aktivan. <br />Klikni na link u informacijama o računu da bi aktivirali račun.
+      account not active: Žao nam je, Vaš korisnički račun još nije aktivan. <br /> Molimo vas da koristite link u e-pošti potvrde da biste aktivirali svoj račun, ili <a href="{{reconfirm}}">zatražiti novu e-poštu potvrde</a> .
       account suspended: Žao nam je, Vaš račun je suspendiran zbog sumnjive aktivnosti. <br /> Molimo kontaktirajte {{webmaster}}, ako želite razgovarati o tome.
+      already have: Već imate OpenStreetMap račun? Molimo, prijavite se.
       auth failure: Žao mi je, ne mogu prijaviti s ovim detaljima.
+      create account minute: Otvorite korisnički račun. To traje samo minutu.
       create_account: otvorite korisnički račun
       email or username: "Email adresa ili korisničko ime:"
       heading: "Prijava:"
       login_button: Prijava
       lost password link: Izgubljena lozinka?
+      new to osm: Novi na OpenStreetMap?
       notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Saznajte više o dolazećoj promjeni dozvole za OpenStreetMap</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">prijevodi</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">razgovor</a>)
       password: "Lozinka:"
       please login: Molimo prijavite se ili {{create_user_link}}.
+      register now: Registrirajte se sada
       remember: "Zapamti me:"
       title: Prijava
+      to make changes: Da bi napravili izmjene na OpenStreetMap podacima, morate imati korisnički račun.
       webmaster: webmaster
     logout: 
       heading: Odjava iz OpenStreetMap
@@ -1467,7 +1497,7 @@ hr:
       display name description: Javno prikazano korisničko ime. Možete ga promjeniti i kasnije u postavkama.
       email address: "Email:"
       fill_form: Ispuni formular i i ubrzo će te dobtiti email za aktivaciju korisničkog računa.
-      flash create success message: Korisnik je uspješno napravljen. Provjeri e-mail za potvrdu, i početi ćeš mapirati vrlo brzo :-)<br /><br />Upamtite da se nećeš moći prijaviti dok ne primio potvrdu e-mail adrese.<br /><br />Ako kortstiš antispam system koji šalje potvrde budi siguran da je na whitelisti webmaster@openstreetmap.org as jer nećemo moći odgovoriti na potvrdni zahtjev.
+      flash create success message: Hvala što ste se prijavili! Poslali smo vam e-mail za potvrdu na {{email}}, i čim potvrdite svoj račun možete  mapirati<br /><br />Ako kortstite antispam sustav koji šalje potvrde zahtjeva budite sigurni da je na tzv. "whitelisti" webmaster@openstreetmap.org jer nećemo moći odgovoriti na potvrdni zahtjev.
       heading: Otvori korisnički račun
       license_agreement: Kada potvrdite vaš račun morati će te pristati na <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">uvjete pridonositelja</a> .
       no_auto_account_create: Nažalost nismo u mogućnosti automatski otvarati korisničke račune.
@@ -1534,6 +1564,7 @@ hr:
       hide_user: sakrij ovog korisnika
       if set location: Ako namjestite svoju lokaciju, zgodna karta i stvari će se pojaviti ispod. Možete namjestiti lokaciju vašeg boravišta na {{settings_link}} stranici.
       km away: udaljen {{count}}km
+      latest edit: "Najnovija izmjena {{ago}}:"
       m away: "{{count}}m daleko"
       mapper since: "Maper od:"
       moderator_history: prikaži dane blokade
diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index adf11b748..114de34fa 100644
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -361,15 +361,15 @@ hsb:
       user_title: dźenik wužiwarja {{user}}
   editor: 
     default: Standard (tuchwilu {{name}}
-    josm: 
-      description: JOSM (přez tykač za dalokowodźenje)
-      name: JOSM
     potlatch: 
       description: Potlatch 1 (editor za wobdźěłowanje we wobhladowaku)
       name: Potlatch 1
     potlatch2: 
       description: Potlatch 2 (editor za wobdźěłowanje we wobhladowaku)
       name: Potlatch 2
+    remote: 
+      description: Dalokowodźenje (JOSM abo Merkaartor)
+      name: Dalokowodźenje
   export: 
     start: 
       add_marker: Marku karće přidać
@@ -893,17 +893,23 @@ hsb:
       history_tooltip: Změny za tutón wobłuk pokazać
       history_zoom_alert: Dyrbiš powjetšić, zo by wobdźěłowansku historiju widźał
   layouts: 
+    community_blogs: Blogi zhromadźenstwa
+    community_blogs_title: Blogi čłonow zhromadźenstwa OpenStreetMap
     copyright: Awtorske prawo a licenca
+    documentation: Dokumentacija
+    documentation_title: Dokumentacija za projekt
     donate: Podpěraj OpenStreetMap přez {{link}} k fondsej aktualizacije hardwary.
     donate_link_text: Darjenje
     edit: Wobdźěłać
     edit_with: Z {{editor}} wobdźěłać
     export: Eksport
     export_tooltip: Kartowe daty eksportować
+    foundation: Załožba
+    foundation_title: Załožba OpenStreetMap
     gps_traces: GPS-ćěrje
     gps_traces_tooltip: GPS-ćěrje zrjadować
     help: Pomoc
-    help_and_wiki: "{{help}} + {{wiki}}"
+    help_centre: Srjedźišćo pomocy
     help_title: Sydło pomocy za projekt
     history: Historija
     home: domoj
@@ -931,12 +937,8 @@ hsb:
     make_a_donation: 
       text: Darić
       title: OpenStreetMap z pjenježnym darom podpěrać
-    news_blog: Blog nowinkow
-    news_blog_tooltip: Blog nowinkow wo OpenStreetMap, swobodnych geografiskich datach atd.
     osm_offline: Datowa banka OpenStreetMap je tuchwilu offline, dokelž so wažne wobhladowankse dźěła na datowej bance přewjedu.
     osm_read_only: Datowa banka OpenStreetMap je tuchwilu jenož čitajomna, dokelž so wažne wothladowanske dźěła na datowej bance přewjedu.
-    shop: Předań
-    shop_tooltip: Předawarnja za markowe artikle OpenStreetMap
     sign_up: registrować
     sign_up_tooltip: Konto za wobdźěłowanje załožić
     tag_line: Swobodna swětowa karta
@@ -1182,10 +1184,10 @@ hsb:
       no_iframe_support: Twó wobhladowak njepodpěruje iframe-elementy, kotrež su za tutu funkciju trěbne.
       not_public: Njejsy swoje změny jako zjawne markěrowane.
       not_public_description: Njemožeš hižo kartu wobźěłać, chibazo činiš to. Móžeš swoje změny na swojej {{user_page}} jako zjawne markěrować.
+      potlatch2_unsaved_changes: Maš njeskładowane změny. (Zo by je w Potlatch 2 składował, dyrbiš na "składować" kliknyć.)
       potlatch_unsaved_changes: Nimaš njeskładowane změny. (Zo by w programje Potlatch składował, wotstroń woznamjenjenje aktualneho puća abo dypka, jeli w dynamiskim modusu wobdźěłuješ, abo klikń na Składować, jeli składowanske tłóčatko eksistuje.
       user_page_link: wužiwarskej stronje
     index: 
-      josm_failed: Wobdźěłowanje je so njeporadźiło - přeswědč so, zo JOSM je začitany a tykač za dalokowodźenje je zmóžnjeny
       js_1: Pak wužiwaš wobhladowak, kotryž JavaScript njepodpěruje, pak sy JavaScript znjemóžnił.
       js_2: OpenStreetMap JavaScript za slippy map wužiwa.
       js_3: Móžeš <a href="http://tah.openstreetmap.org/Browse/">wobhladowak Tiles@Home</a> wužiwać, jeli njemóžeš JavaScript znóžnić.
@@ -1194,6 +1196,7 @@ hsb:
         notice: Licencowany pod licencu {{license_name}} přez {{project_name}} a jeho sobuskutkowacych.
         project_name: Projekt OpenStreetMap
       permalink: Trajny wotkaz
+      remote_failed: Wobdźěłowanje je so njeporadźiło - zawěsć, zo JOSM abo Merkaartor je začitany a dalokowodźenska opcija je zmóžnjena
       shortlink: Krótki wotkaz
     key: 
       map_key: Legenda
@@ -1455,17 +1458,22 @@ hsb:
     login: 
       account not active: Bohužel je twoje konto hišće aktiwne njeje.<br />Prošu klikń na wotkaz w e-mejlu kontoweho wubkrućenja, zo by swoje konto aktiwizował, abo <a href="{{reconfirm}}">proš wo nowu wobkrućensku e-mejl</a>.
       account suspended: Twoje konto bu bohužel podhladneje aktiwity dla wupowědźene.<br />Stajće so prošu z {{webmaster}} do zwiska, jeli chceš wo tym diskutować.
+      already have: Maš hižo konto za OpenStreetMap? Přizjew so prošu.
       auth failure: Bohužel přizjewjenje z tutymi podaćemi móžno njeje.
+      create account minute: Załož konto. Traje jenož chwilku.
       create_account: załož konto
       email or username: "E-mejlowa adresa abo wužiwarske mjeno:"
       heading: Přizjewjenje
       login_button: Přizjewjenje
       lost password link: Swoje hesło zabył?
+      new to osm: Nowy w OpenStreetMap?
       notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Wjace wo bórzomnej licencnej změnje OpenStreetMap</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">přełožki</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">diskusija</a>)
       password: "Hesło:"
       please login: Prošu přizjew so abo {{create_user_link}}.
+      register now: Nětko registrować
       remember: "Spomjatkować sej:"
       title: Přizjewjenje
+      to make changes: Zo by daty OpenStreetMap změnił, dyrbiš konto měć.
       webmaster: webmišter
     logout: 
       heading: Z OpenStreetMap wotzjewić
@@ -1559,6 +1567,7 @@ hsb:
       hide_user: tutoho wužiwarja schować
       if set location: Jeli sy swoje stejnišćo podał, budźetej so deleka rjana karta a druhe material jewić. Móžeš swoje domjace stejnišćo na swojej stronje {{settings_link}} nastajić.
       km away: "{{count}} km zdaleny"
+      latest edit: "Najnowša změna {{ago}}:"
       m away: "{{count}} m zdaleny"
       mapper since: "Kartěrowar wot:"
       moderator_history: Date blokowanja pokazać
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 528f6b44f..0dbc1bf8c 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -353,6 +353,17 @@ hu:
       save_button: Mentés
       title: "{{user}} naplója | {{title}}"
       user_title: "{{user}} naplója"
+  editor: 
+    default: Alapértelmezett (jelenleg {{name}})
+    potlatch: 
+      description: Potlatch 1 (böngészőn belüli szerkesztő)
+      name: Potlatch 1
+    potlatch2: 
+      description: Potlatch 2 (böngészőn belüli szerkesztő)
+      name: Potlatch 2
+    remote: 
+      description: Távirányító (JOSM vagy Merkaartor)
+      name: Távirányító
   export: 
     start: 
       add_marker: Jelölő hozzáadása a térképhez
@@ -878,16 +889,23 @@ hu:
       history_tooltip: Szerkesztések megtekintése ezen a területen
       history_zoom_alert: Közelítened kell a szerkesztési előzmények megtekintéséhez
   layouts: 
+    community_blogs: Közösségi blogok
+    community_blogs_title: Blogok az OpenStreetMap közösség tagjaitól
     copyright: Szerzői jog és licenc
+    documentation: Dokumentáció
+    documentation_title: Dokumentáció a projekthez
     donate: Támogasd az OpenStreetMapot a Hardverfrissítési Alapba történő {{link}}sal.
     donate_link_text: adományozás
     edit: Szerkesztés
+    edit_with: "Szerkesztés a következővel: {{editor}}"
     export: Exportálás
     export_tooltip: Térképadatok exportálása
+    foundation: Alapítvány
+    foundation_title: Az „OpenStreetMap Foundation”
     gps_traces: Nyomvonalak
     gps_traces_tooltip: GPS nyomvonalak kezelése
     help: Sugó
-    help_and_wiki: "{{help}} és {{wiki}}"
+    help_centre: Súgóközpont
     help_title: A projekt sugóoldala
     history: Előzmények
     home: otthon
@@ -913,12 +931,8 @@ hu:
     make_a_donation: 
       text: Adományozz
       title: Támogasd az OpenStreetMapot pénzadománnyal
-    news_blog: Hírblog
-    news_blog_tooltip: Hírblog az OpenStreetMapról, szabad földrajzi adatokról stb.
     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.
-    shop: Bolt
-    shop_tooltip: Bolt márkás OpenStreetMap árukkal
     sign_up: regisztráció
     sign_up_tooltip: Új felhasználói fiók létrehozása szerkesztéshez
     tag_line: A szabad világtérkép
@@ -1133,7 +1147,7 @@ hu:
       no_apps: Van olyan alkalmazásod, amit szeretnél regisztrálni a velünk való használathoz a(z) {{oauth}} szabvány használatával? Regisztrálnod kell a webalkalmazásod, mielőtt OAuth kéréseket küld ehhez a szolgáltatáshoz.
       register_new: Alkalmazás regisztrálása
       registered_apps: "A következő kliensalkalmazások vannak regisztrálva:"
-      revoke: Visszavonás!"
+      revoke: Visszavonás!
       title: OAuth részletek
     new: 
       submit: Regisztrálás
@@ -1165,8 +1179,10 @@ hu:
     edit: 
       anon_edits_link_text: Nézz utána, miért van ez.
       flash_player_required: A Potlatch, az OpenStreetMap Flash szerkesztő használatához Flash Player szükséges. <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">Letöltheted a Flash Playert az Adobe.com-ról</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Számos más lehetőség</a> is elérhető az OpenStreetMap szerkesztéséhez.
+      no_iframe_support: A böngésződ nem támogatja a HTML-kereteket, amely ehhez a funkcióhoz szükséges.
       not_public: Nem állítottad a szerkesztéseidet nyilvánossá.
       not_public_description: Nem szerkesztheted tovább a térképet, amíg nem teszed meg. Nyilvánossá teheted szerkesztéseidet a {{user_page}}adról.
+      potlatch2_unsaved_changes: Mentetlen módosításaid vannak. (A mentéshez a Potlatch 2-ben kattintanod kell a mentésre.)
       potlatch_unsaved_changes: Nem mentett módosítások vannak. (Potlatchban való mentéshez szüntesd meg a jelenlegi vonal vagy pont kijelölését, ha élő módban szerkesztesz, vagy kattints a mentésre, ha van mentés gomb.)
       user_page_link: felhasználói oldal
     index: 
@@ -1180,6 +1196,7 @@ hu:
         project_name: OpenStreetMap projekt
         project_url: http://openstreetmap.org
       permalink: Permalink
+      remote_failed: A szerkesztés nem sikerült. Győződj meg róla, hogy a JOSM vagy a Merkaartor be van töltve, és a távirányító opció engedélyezve van
       shortlink: Shortlink
     key: 
       map_key: Jelmagyarázat
@@ -1387,6 +1404,7 @@ hu:
       new email address: "Új e-mail cím:"
       new image: Kép hozzáadása
       no home location: Nem adtad meg az otthonod helyét.
+      preferred editor: "Előnyben részesített szerkesztő:"
       preferred languages: "Előnyben részesített nyelvek:"
       profile description: "Profil leírása:"
       public editing: 
@@ -1440,17 +1458,22 @@ hu:
     login: 
       account not active: Sajnálom, a felhasználói fiókod még nincs aktiválva.<br />Fiókod aktiválásához kérlek, használd a fiókodat megerősítő emailben található hivatkozást, vagy <a href="{{reconfirm}}">kérj egy új megerősítő emailt</a>.
       account suspended: Sajnálom, felhasználói fiókod felfüggesztésre került gyanús tevékenységed miatt.<br />Kérlek, lépj kapcsolatba a {{webmaster}}rel, ha meg szeretnéd vitatni ezt.
+      already have: Már van OpenStreetMap-fiókod? Kérlek, jelentkezz be.
       auth failure: Sajnálom, ilyen adatokkal nem tudsz bejelentkezni.
+      create account minute: Hozz létre egy felhasználói fiókot. Csak egy percet vesz igénybe.
       create_account: hozz létre egy új felhasználói fiókot
       email or username: "E-mail cím vagy felhasználónév:"
       heading: Bejelentkezés
       login_button: Bejelentkezés
       lost password link: Elfelejtetted a jelszavad?
+      new to osm: Új vagy az OpenStreetMapnál?
       notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Tudj meg többet az OpenStreetMap közelgő licencváltozásáról</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">fordítások</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">vita</a>)
       password: "Jelszó:"
       please login: Jelentkezz be, vagy {{create_user_link}}.
+      register now: Regisztrálj most
       remember: "Emlékezz rám:"
       title: Bejelentkezés
+      to make changes: Ahhoz, hogy módosíthasd az OpenStreetMap-adatokat, rendelkezned kell egy felhasználói fiókkal.
       webmaster: webmester
     logout: 
       heading: Kijelentkezés az OpenStreetMapból
@@ -1522,7 +1545,7 @@ hu:
         italy: Olaszország
         rest_of_world: A világ többi része
       legale_select: "Kérlek, válaszd ki a lakóhelyed szerinti országot:"
-      read and accept: Kérlek, olvasd el az alábbi megállapodást, és nyomd meg az "egyetértek" gombot, hogy megerősítsd, elfogadod ezen megállapodás feltételeit a jelenlegi és jövőbeni hozzájárulásaidhoz.
+      read and accept: Kérlek, olvasd el az alábbi megállapodást, és nyomd meg az „egyetértek” gombot, amellyel megerősíted, hogy elfogadod ezen megállapodás feltételeit a jelenlegi és jövőbeni hozzájárulásaidhoz.
       title: Hozzájárulási feltételek
     view: 
       activate_user: felhasználó aktiválása
@@ -1544,6 +1567,7 @@ hu:
       hide_user: ezen felhasználó elrejtése
       if set location: Ha beállítod a helyedet, egy szép térkép fog megjelenni alább. Az otthonodat a {{settings_link}}nál állíthatod be.
       km away: "{{count}} km-re innen"
+      latest edit: "Utolsó szerkesztés {{ago}}:"
       m away: "{{count}} m-re innen"
       mapper since: "Térképszerkesztő ezóta:"
       moderator_history: kiosztott blokkolások megjelenítése
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index f08222a1c..b54acb2dc 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -349,6 +349,17 @@ ia:
       save_button: Salveguardar
       title: Diario de {{user}} | {{title}}
       user_title: Diario de {{user}}
+  editor: 
+    default: Predefinite (al momento {{name}})
+    potlatch: 
+      description: Potlatch 1 (editor in navigator del web)
+      name: Potlatch 1
+    potlatch2: 
+      description: Potlatch 2 (editor in navigator del web)
+      name: Potlatch 2
+    remote: 
+      description: Controlo remote (JOSM o Merkaartor)
+      name: Controlo remote
   export: 
     start: 
       add_marker: Adder un marcator al carta
@@ -872,16 +883,23 @@ ia:
       history_tooltip: Vider le modificationes de iste area
       history_zoom_alert: Tu debe facer zoom avante pro vider le historia de modification
   layouts: 
+    community_blogs: Blogs del communitate
+    community_blogs_title: Blogs de membros del communitate de OpenStreetMap
     copyright: Copyright &amp; Licentia
+    documentation: Documentation
+    documentation_title: Documentation pro le projecto
     donate: Supporta OpenStreetMap per {{link}} al Fundo de Actualisation de Hardware.
     donate_link_text: donation
     edit: Modificar
+    edit_with: Modificar con {{editor}}
     export: Exportar
     export_tooltip: Exportar datos cartographic
+    foundation: Fundation
+    foundation_title: Le fundation OpenStreetMap
     gps_traces: Tracias GPS
     gps_traces_tooltip: Gerer tracias GPS
     help: Adjuta
-    help_and_wiki: "{{help}} & {{wiki}}"
+    help_centre: Centro de adjuta
     help_title: Sito de adjuta pro le projecto
     history: Historia
     home: initio
@@ -908,12 +926,8 @@ ia:
     make_a_donation: 
       text: Facer un donation
       title: Supporta OpenStreetMap con un donation monetari
-    news_blog: Blog de novas
-    news_blog_tooltip: Blog de novas super OpenStreetMap, datos geographic libere, etc.
     osm_offline: Le base de datos de OpenStreetMap non es disponibile al momento debite a operationes de mantenentia essential.
     osm_read_only: Le base de datos de OpenStreetMap es al momento in modo de solmente lectura durante le execution de mantenentia essential.
-    shop: Boteca
-    shop_tooltip: Boteca con mercantias de OpenStreetMap
     sign_up: inscriber se
     sign_up_tooltip: Crear un conto pro modification
     tag_line: Le wiki-carta libere del mundo
@@ -1156,8 +1170,10 @@ ia:
     edit: 
       anon_edits_link_text: Lege proque isto es le caso.
       flash_player_required: Es necessari haber un reproductor Flash pro usar Potlatch, le editor Flash de OpenStreetMap. Tu pote <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">discargar Flash Player a Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Plure altere optiones</a> es tamben disponibile pro modificar OpenStreetMap.
+      no_iframe_support: Tu navigator non supporta le iframes in HTML, necessari pro iste functionalitate.
       not_public: Tu non ha configurate tu modificationes pro esser public.
       not_public_description: Tu non potera plus modificar le carta si tu non lo face. Tu pote configurar tu modificationes como public a partir de tu {{user_page}}.
+      potlatch2_unsaved_changes: Tu ha modificationes non salveguardate. (In Potlatch 2, tu debe cliccar super Salveguardar.)
       potlatch_unsaved_changes: Tu ha modificationes non salveguardate. (Pro salveguardar in Potlatch, tu debe deseliger le via o puncto actual si tu modifica in modo directe, o cliccar super le button Salveguardar si presente.)
       user_page_link: pagina de usator
     index: 
@@ -1169,6 +1185,7 @@ ia:
         notice: Publicate sub licentia {{license_name}} per le {{project_name}} e su contributores.
         project_name: Projecto OpenStreetMap
       permalink: Permaligamine
+      remote_failed: Modification fallite - assecura te que JOSM o Merkaartor es cargate e que le plug-in de controlo remote es activate
       shortlink: Ligamine curte
     key: 
       map_key: Legenda
@@ -1376,6 +1393,7 @@ ia:
       new email address: "Adresse de e-mail nove:"
       new image: Adder un imagine
       no home location: Tu non ha entrate tu position de origine.
+      preferred editor: "Editor preferite:"
       preferred languages: "Linguas preferite:"
       profile description: "Description del profilo:"
       public editing: 
@@ -1429,17 +1447,22 @@ ia:
     login: 
       account not active: Pardono, tu conto non es ancora active.<br />Per favor clicca super le ligamine in le e-mail de confirmation pro activar tu conto, o <a href="{{reconfirm}}">requesta un nove message de confirmation.</a>.
       account suspended: Pardono, tu conto ha essite suspendite debite a activitate suspecte.<br />Per favor contacta le {{webmaster}} si tu vole discuter isto.
+      already have: Tu possede ja un conto de OpenStreetMap? Per favor aperi session.
       auth failure: Pardono, non poteva aperir un session con iste detalios.
+      create account minute: Crea un conto. Isto dura solmente un minuta.
       create_account: crea un conto
       email or username: "Adresse de e-mail o nomine de usator:"
       heading: Aperir session
       login_button: Aperir session
       lost password link: Tu perdeva le contrasigno?
+      new to osm: Nove a OpenStreetMap?
       notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Informa te super le imminente cambio de licentia de OpenStreetMap</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">traductiones</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">discussion</a>)
       password: "Contrasigno:"
       please login: Per favor aperi un session o {{create_user_link}}.
+      register now: Registrar ora
       remember: "Memorar me:"
       title: Aperir session
+      to make changes: Pro facer modificationes in le datos de OpenStreetMap, es necessari haber un conto.
       webmaster: webmaster
     logout: 
       heading: Clauder le session de OpenStreetMap
@@ -1533,6 +1556,7 @@ ia:
       hide_user: celar iste usator
       if set location: Si tu ha definite tu position, il apparera ci infra un elegante carta e altere cosas. Tu pote definir tu position de origine in tu pagina de {{settings_link}}.
       km away: a {{count}} km de distantia
+      latest edit: "Ultime modification {{ago}}:"
       m away: a {{count}} m de distantia
       mapper since: "Cartographo depost:"
       moderator_history: vider blocadas date
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 73c84da60..be2f08452 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -601,13 +601,8 @@ is:
     make_a_donation: 
       text: Fjárframlagssíða
       title: Hjálpaðu OpenStreetMap verkefninu með fjárframlagi
-    news_blog: Fréttablogg
-    news_blog_tooltip: Blogg um OpenStreetMap, frjáls kortagögn o.fl.
     osm_offline: OpenStreetMap gagnagrunnurinn er niðri vegna viðhalds.
     osm_read_only: Ekki er hægt að skrifa í OpenStreetMap gagnagrunninn í augnablikinu vegna viðhalds.
-    shop: Verslun
-    shop_tooltip: Verslun með vörum tengdum OpenStreetMap
-    shop_url: http://wiki.openstreetmap.org/index.php?title=Merchandise&uselang=is
     sign_up: búa til aðgang
     sign_up_tooltip: Búaðu til aðgang til að geta breytt kortinu
     tag_line: Frjálsa wiki heimskortið
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 1632fa4c9..743de22f9 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -351,15 +351,15 @@ it:
       user_title: Diario dell'utente {{user}}
   editor: 
     default: Predefinito (al momento {{name}})
-    josm: 
-      description: JOSM (mediante l'estensione di controllo remoto)
-      name: JOSM
     potlatch: 
       description: Potlatch 1 (editor nel browser)
       name: Potlatch 1
     potlatch2: 
       description: Potlatch 2 (editor nel browser)
       name: Potlatch 2
+    remote: 
+      description: Controllo remoto (JOSM o Merkaartor)
+      name: Controllo remoto
   export: 
     start: 
       add_marker: Aggiungi un marcatore alla mappa
@@ -865,17 +865,23 @@ it:
       history_tooltip: Visualizza le modifiche per quest'area
       history_zoom_alert: Devi ingrandire per vedere la cronologia delle modifiche
   layouts: 
+    community_blogs: Blog della comunità
+    community_blogs_title: Blog dei membri della comunità OpenStreetMap
     copyright: Copyright e Licenza
+    documentation: Documentazione
+    documentation_title: Documentazione sul progetto
     donate: Supporta OpenStreetMap {{link}} al fondo destinato all'aggiornamento dell'hardware.
     donate_link_text: donando
     edit: Modifica
     edit_with: Modifica con {{editor}}
     export: Esporta
     export_tooltip: Esporta i dati della mappa
+    foundation: Fondazione
+    foundation_title: La Fondazione OpenStreetMap
     gps_traces: Tracciati GPS
     gps_traces_tooltip: Gestisci i tracciati GPS
     help: Aiuto
-    help_and_wiki: "{{help}} & {{wiki}}"
+    help_centre: Aiuto
     help_title: Sito di aiuto per il progetto
     history: Storico
     home: posizione iniziale
@@ -900,12 +906,8 @@ it:
     make_a_donation: 
       text: Fai una donazione
       title: Aiuta OpenStreetMap con una donazione in denaro
-    news_blog: Blog delle notizie
-    news_blog_tooltip: Blog di notizie su OpenStreetMap, dati geografici gratuiti, etc.
     osm_offline: Il database di OpenStreetMap è al momento non in linea per pemettere lo svolgimento di alcuni lavori essenziali su di esso.
     osm_read_only: Il database di OpenStreetMap è al momento in modalità sola-lettura per pemettere lo svolgimento di alcuni lavori essenziali su di esso.
-    shop: Negozio
-    shop_tooltip: Negozio di oggettistica col marchio OpenStreetMap
     sign_up: iscriviti
     sign_up_tooltip: Crea un profilo utente per apportare modifiche
     tag_line: La wiki-mappa Libera del Mondo
@@ -1137,6 +1139,7 @@ it:
       edit: Modifica dettagli
       key: "Chiave del consumatore:"
       requests: "Richieste le seguenti autorizzazioni da parte dell'utente:"
+      secret: "Codice segreto dell'utilizzatore:"
       support_notice: Supportiamo HMAC-SHA1 (consigliato), così come testo normale in modalità SSL.
       title: Dettagli OAuth per {{app_name}}
       url: "URL del token di richiesta:"
@@ -1149,10 +1152,10 @@ it:
       no_iframe_support: Il proprio browser non supporta gli iframe HTML, necessari per questa funzionalità.
       not_public: Non si sono impostate come pubbliche le proprie modifiche.
       not_public_description: Non è possibile modificare la mappa finché non lo si fa. Si possono impostare come pubbliche le proprie modifiche dalla propria {{user_page}}.
+      potlatch2_unsaved_changes: Ci sono delle modifiche non salvate. (Per salvare in Potlatch 2 è necessario premere il tasto di salvataggio.)
       potlatch_unsaved_changes: Ci sono modifiche non salvate. (Per salvare in Potlatch, si dovrebbe deselezionare il percorso o nodo corrente, se si sta editando nella modalità 'list', o cliccare sul bottone salva se presente.)
       user_page_link: pagina utente
     index: 
-      josm_failed: Modifica fallita - assicurarsi che JOSM sia avviato e che l'estensione di controllo remoto sia attiva
       js_1: Si sta utilizzando un browser che non supporta JavaScript, oppure è stato disabilitato JavaScript.
       js_2: OpenStreetMap utilizza JavaScript per le sua mappa.
       js_3: Se non si riesce ad abilitare JavaScript si può provare il <a href="http://tah.openstreetmap.org/Browse/">browser statico Tiles@Home</a>.
@@ -1161,6 +1164,7 @@ it:
         notice: Rilasciato sotto la licenza {{license_name}} dal {{project_name}} ed i suoi contributori.
         project_name: progetto OpenStreetMap
       permalink: Permalink
+      remote_failed: Modifica non riuscita - assicurarsi che JOSM o Merkaartor sia avviato e che l'opzione di controllo remoto sia abilitata
       shortlink: Collegamento breve
     key: 
       map_key: Legenda
@@ -1422,17 +1426,22 @@ it:
     login: 
       account not active: Spiacenti, il tuo profilo non è ancora attivo.<br />Si prega di utilizzare il collegamento presente nell'email di conferma per attivare il proprio profilo, oppure <a href="{{reconfirm}}">richiedere l'invio di una nuova email di conferma</a>.
       account suspended: Siamo spiacenti, il tuo account è stato sospeso a causa di attività sospette.<br />Contatta il {{webmaster}} se desideri discuterne.
+      already have: Hai già un account OpenStreetMap? Effettua il login.
       auth failure: Spiacenti, non si può accedere con questi dettagli.
+      create account minute: Crea un account. Richiede solo un minuto.
       create_account: crealo ora
       email or username: "Indirizzo email o nome utente:"
       heading: Entra
       login_button: Entra
       lost password link: Persa la password?
+      new to osm: Sei nuovo su OpenStreetMap?
       notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Leggi i dettagli sull'imminente cambio di licenza di OpenStreetMap</a> ( <a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">traduzioni</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">discussione</a> )
       password: "Password:"
       please login: Entra o {{create_user_link}}.
+      register now: Registrati ora
       remember: "Ricordati di me:"
       title: Entra
+      to make changes: Per apportare modifiche ai dati di OpenStreetMap, è necessario disporre di un account.
       webmaster: webmaster
     logout: 
       heading: Esci da OpenStreetMap
@@ -1526,6 +1535,7 @@ it:
       hide_user: nascondi questo utente
       if set location: Se si imposta una propria posizione, una bella mappa ed altre informazioni compariranno di seguito. E' possibile impostare la propria posizione sulla pagina delle {{settings_link}}.
       km away: distante {{count}} km
+      latest edit: "Ultima modifica {{ago}}:"
       m away: "{{count}}m di distanza"
       mapper since: "Mappatore dal:"
       moderator_history: visualizza i blocchi applicati
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index a5b863ef0..4f5e8c534 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -4,6 +4,7 @@
 # Author: Fryed-peach
 # Author: Higa4
 # Author: Hosiryuhosi
+# Author: Iwai.masaharu
 # Author: Mage Whopper
 # Author: Miya
 # Author: Nazotoko
@@ -740,12 +741,8 @@ ja:
     make_a_donation: 
       text: 寄付
       title: 金銭の寄贈でOpenStreetMapを支援する
-    news_blog: ニュースブログ
-    news_blog_tooltip: OpenStreetMap に関するニュースブログ。free geographical data, etc.
     osm_offline: OpenStreetMap のデータベースはメンテナンスのため一時的に停止しています。
     osm_read_only: OpenStreetMap のデータベースはメンテナンスのため一時的に読み込み専用モードになっています。
-    shop: ショップ
-    shop_tooltip: OpenStreetMap ブランドの店舗
     sign_up: 登録
     sign_up_tooltip: 編集できるアカウントを作成する
     tag_line: 自由なウィキ世界地図
@@ -1190,7 +1187,7 @@ ja:
       summary_no_ip: "{{name}} は{{date}}に作成されました。"
       title: ユーザー
     login: 
-      account not active: 申し訳ありません。あなたのアカウントはまだ有効ではありません。<br />アカウント確認メールに記載されている、アカウントを有効にするリンクをクリックしてください。
+      account not active: 申し訳ありません。あなたのアカウントはまだ有効ではありません。<br />アカウント確認メールに記載されている、アカウントを有効にするリンクをクリックするか、<a href="{{reconfirm}}">新しいアカウント確認メールの要求</a>をしてください。
       auth failure: 申し訳ありません、以下の理由によりログインできません。
       create_account: アカウント作成
       email or username: "Eメールアドレスかユーザ名:"
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 078d2bce7..5d9d0cc28 100644
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -401,7 +401,6 @@ lb:
       alt_text: OpenStreetMap Logo
     make_a_donation: 
       text: En Don maachen
-    shop: Geschäft
     user_diaries: Benotzer Bloggen
     view_tooltip: Kaart weisen
     welcome_user: Wëllkomm, {{user_link}}
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 50894bd20..e2594cf0a 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -151,7 +151,7 @@ mk:
       node_history_title: "Историја на јазолот: {{node_name}}"
       view_details: погледај детали
     not_found: 
-      sorry: Жалиам, но не најдов {{type}} со ид. бр. {{id}}.
+      sorry: Жалиам, но не најдов {{type}} со назнака {{id}}.
       type: 
         changeset: измени
         node: јазол
@@ -264,7 +264,7 @@ mk:
     changesets: 
       area: Површина
       comment: Коментар
-      id: ид. бр.
+      id: Назнака
       saved_at: Зачувано во
       user: Корисник
     list: 
@@ -286,7 +286,7 @@ mk:
     diary_comment: 
       comment_from: Коментар од {{link_user}}  во {{comment_created_at}}
       confirm: Потврди
-      hide_link: Сокриј го коментаров
+      hide_link: Скриј го коментаров
     diary_entry: 
       comment_count: 
         one: 1 коментар
@@ -294,7 +294,7 @@ mk:
       comment_link: Коментирај на оваа ставка
       confirm: Потврди
       edit_link: Уреди ја оваа ставка
-      hide_link: Сокриј ја ставкава
+      hide_link: Скриј ја ставкава
       posted_by: Испратено од {{link_user}} во {{created}} на {{language_link}}
       reply_link: Одговори на оваа ставка
     edit: 
@@ -336,7 +336,7 @@ mk:
       title: Нова дневничка ставка
     no_such_entry: 
       body: Жалиме, но нема дневничка ставка или коментар со ид.бр. {{id}}. Проверете дали сте напишале правилно, или да не сте кликнале на погрешна врска.
-      heading: "Нема ставка со ид. бр.: {{id}}"
+      heading: "Нема ставка со назнака: {{id}}"
       title: Нема таква дневничка ставка
     no_such_user: 
       body: Жалиме, но нема корисник по име {{user}}. Проверете дали сте напишале правилно, или да не сте кликнале на погрешна врска.
@@ -351,15 +351,15 @@ mk:
       user_title: дневник на {{user}}
   editor: 
     default: По основно (моментално {{name}})
-    josm: 
-      description: JOSM (преку приклучок за далечинско ракување)
-      name: JOSM
     potlatch: 
       description: Potlatch 1 (уредник во прелистувач)
       name: Potlatch 1
     potlatch2: 
       description: Potlatch 2 (уредник во прелистувач)
       name: Potlatch 2
+    remote: 
+      description: Далечинско управување (JOSM или Merkaartor)
+      name: Далечинско управување
   export: 
     start: 
       add_marker: Додај бележник на картата
@@ -870,6 +870,8 @@ mk:
           water_point: Пристап до вода
           waterfall: Водопад
           weir: Јаз
+  html: 
+    dir: ltr
   javascripts: 
     map: 
       base: 
@@ -883,17 +885,23 @@ mk:
       history_tooltip: Преглед на уредувањата во ова подрачје
       history_zoom_alert: Морате да приближите за да можете да ја видите историјата на уредувања
   layouts: 
+    community_blogs: Блогови на заедницата
+    community_blogs_title: Блогови од членови на заедницата на OpenStreetMap
     copyright: Авторски права и лиценца
+    documentation: Документација
+    documentation_title: Документација за проектот
     donate: Поддржете ја OpenStreetMap со {{link}} за Фондот за обнова на машинската опрема.
     donate_link_text: донирање
     edit: Уреди
     edit_with: Уреди со {{editor}}
     export: Извези
     export_tooltip: Извоз на податоци од картата
+    foundation: Фондација
+    foundation_title: Фондацијата OpenStreetMap
     gps_traces: GPS-траги
     gps_traces_tooltip: Работа со GPS траги
     help: Помош
-    help_and_wiki: "{{help}} и {{wiki}}"
+    help_centre: Центар за помош
     help_title: Помошна страница за проектот
     history: Историја
     home: дома
@@ -908,24 +916,20 @@ mk:
     intro_3: Вдомувањето на OpenStreetMap е овозможено од {{ucl}} и {{bytemark}}. Другите поддржувачи на проектот се наведени на {{partners}}.
     intro_3_bytemark: bytemark
     intro_3_partners: вики
-    intro_3_ucl: Центарот UCL VR
+    intro_3_ucl: UCL VR Centre
     license: 
       title: Податоците на OpenStreetMap се под Creative Commons Наведи извор-Сподели под исти услови 2.0 Нелокализирана лиценца
     log_in: најавување
     log_in_tooltip: Најава со постоечка сметка
     logo: 
       alt_text: Логотип на OpenStreetMap
-    logout: одјавување
-    logout_tooltip: Одјавување
+    logout: одјава
+    logout_tooltip: Одјава
     make_a_donation: 
       text: Донирајте
       title: Поддржете ја OpenStreetMap со парична донација
-    news_blog: Блог за новости
-    news_blog_tooltip: Блог со новости за OpenStreetMap, слободни географски податоци, и тн.
     osm_offline: Базата на податоци на  OpenStreetMap моментално е исклучена додека работиме на неопходни одржувања.
     osm_read_only: Базата на податоци на OpenStreetMap моментално може само да се чита, додека ги извршиме неопходните одржувања.
-    shop: Продавница
-    shop_tooltip: Купете OpenStreetMap производи
     sign_up: регистрација
     sign_up_tooltip: Создај сметка за уредување
     tag_line: Слободна вики-карта на светот
@@ -1097,6 +1101,7 @@ mk:
       user_wiki_1: Се препорачува да отворите корисничка вики-страница, каде ќе стојат
       user_wiki_2: ознаки за категории на кои ќе стои вашето место на живеење, како да речеме [[Category:Users_in_London]].
       wiki_signup: "Препорачуваме да се регистрирате на викито на OpenStreetMap на:"
+      wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&type=signup&returnto=MK%3AMain_Page&uselang=mk
   oauth: 
     oauthorize: 
       allow_read_gpx: ви ги чита вашите приватни GPS траги.
@@ -1164,6 +1169,8 @@ mk:
       url: "Побарај URL адреса на жетонот:"
     update: 
       flash: Клиентските информации се успешно ажурирани
+  printable_name: 
+    with_version: "{{id}}, вер. {{version}}"
   site: 
     edit: 
       anon_edits_link_text: Дознајте зошто ова е така.
@@ -1171,10 +1178,10 @@ mk:
       no_iframe_support: Вашиот прелистувач не поддржува „иРамки“ (iframes) со HTML, без кои оваа можност не може да работи.
       not_public: Не сте наместиле уредувањата да ви бидат јавни.
       not_public_description: Повеќе не можете да ја уредувате картата  ако не го направите тоа. Можете да наместите уредувањата да ви бидат јавни на вашата {{user_page}}.
+      potlatch2_unsaved_changes: Имате незачувани промени. (Зачувувањето во Potlatch 2 се врши со стискање на „зачувај“.)
       potlatch_unsaved_changes: Имате незачувани промени. (За да зачувате во Potlatch, треба го одселектирате тековниот пат или точка, ако уредувате во живо, или кликнете на „зачувај“ ако го имате тоа копче.)
       user_page_link: корисничка страница
     index: 
-      josm_failed: Уредувањето не успеа - проверете дали е вчитан JOSM и дали е овозможено далечинското ракување
       js_1: Или користите прелистувач кој не поддржува JavaScript, или пак сте го оневозможиле тој програм.
       js_2: OpenStreetMap користи JavaScript за нејзината лизгава карта.
       js_3: Препорачуваме да ја пробате <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home статичната карта</a> ако не можете да овозможите JavaScript.
@@ -1183,6 +1190,7 @@ mk:
         notice: Под лиценцата {{license_name}} од {{project_name}} и неговите учесници.
         project_name: проектот OpenStreetMap
       permalink: Постојана врска
+      remote_failed: Уредувањето не успеа - проверете дали е вчитан JOSM или Merkaartor и дали е овозможено далечинското управување
       shortlink: Кратка врска
     key: 
       map_key: Легенда
@@ -1210,7 +1218,7 @@ mk:
             - ливада
           construction: Патишта во изградба
           cycleway: Велосипедска патека
-          destination: Пристап кон дестинацијата
+          destination: Пристап до одредницата
           farm: Фарма
           footway: Пешачка патека
           forest: Шума
@@ -1434,7 +1442,7 @@ mk:
       confirm: Потврди ги одбраните корисници
       empty: Нема најдено такви корисници
       heading: Корисници
-      hide: Сокриј одбрани корисници
+      hide: Скриј одбрани корисници
       showing: 
         one: Прикажана е страницата {{page}} ({{first_item}} од {{items}})
         other: Прикажани се страниците {{page}} ({{first_item}}-{{last_item}} од {{items}})
@@ -1444,20 +1452,25 @@ mk:
     login: 
       account not active: Жалиме, но сметката сè уште не е активна.<br />Кликнете на врската наведена во пораката со која ви ја потврдуваме сметката за да ја активирате, или пак <a href="{{reconfirm}}">побарајте нова потврдна порака</a>.
       account suspended: Нажалост, вашата сметка е закочена поради сомнителна активност.<br />Обратете се кај {{webmaster}} ако сакате да продискутирате за проблемот.
+      already have: Веќе имате сметка на OpenStreetMap? Тогаш, најавете се.
       auth failure: Жалиме, не можевме да ве најавиме со тие податоци.
+      create account minute: Направете сметка. Ова трае само една минута.
       create_account: создај сметка
       email or username: Е-пошта или корисничко име
       heading: Најавување
       login_button: Најавување
-      lost password link: Си ја загубивте лозинката?
+      lost password link: Ја заборавивте лозинката?
+      new to osm: За новодојденци на OpenStreetMap
       notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Дознајте повеќе за престојната промена на лиценцата на OpenStreetMap</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">преводи</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">разговор</a>)
       password: "Лозинка:"
       please login: Најавете се или {{create_user_link}}.
+      register now: Регистрација
       remember: "Запомни ме:"
       title: Најавување
+      to make changes: Мора да имате сметка за да можете да правите измени на податоците на OpenStreetMap.
       webmaster: мреж. управник
     logout: 
-      heading: Одјавување од OpenStreetMap
+      heading: Одјава од OpenStreetMap
       logout_button: Одјава
       title: Одјава
     lost_password: 
@@ -1545,9 +1558,10 @@ mk:
       diary: дневник
       edits: уредувања
       email address: Е-пошта
-      hide_user: сокриј го корисников
+      hide_user: скриј го корисников
       if set location: Ако ја наместите вашата местоположба, под ова ќе ви се појави убава карта и други работи. Матичната местоположба можете да си ја наместите на страницата {{settings_link}}.
       km away: "{{count}}km од вас"
+      latest edit: "Последно уредување {{ago}}:"
       m away: "{{count}}m од вас"
       mapper since: "Картограф од:"
       moderator_history: погледај добиени блокови
@@ -1627,7 +1641,7 @@ mk:
       tried_waiting: На корисникот му дадов разумен рок за да одговори на тие преписки.
     not_found: 
       back: Назад кон индексот
-      sorry: Жалиме, но нема пронајдено кориснички блок со ид. бр. {{id}}
+      sorry: Жалиме, но нема пронајдено кориснички блок со назнака {{id}}
     partial: 
       confirm: Дали сте сигурни?
       creator_name: Создавач
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index b71def69b..469f789b9 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -354,15 +354,15 @@ nl:
       user_title: Dagboek van {{user}}
   editor: 
     default: Standaard (op dit moment {{name}})
-    josm: 
-      description: JOSM (via remote-control plug-in)
-      name: JOSM
     potlatch: 
       description: Potlatch 1 (in-browser kaartbewerkingsprogramma)
       name: Potlatch 1
     potlatch2: 
       description: Potlatch 2 (in-browser kaartbewerkingsprogramma)
       name: Potlatch 2
+    remote: 
+      description: Remote Control (JOSM of Merkaartor)
+      name: Remote Control
   export: 
     start: 
       add_marker: Marker op de kaart zetten
@@ -886,17 +886,23 @@ nl:
       history_tooltip: Bewerkingen voor dit gebied bekijken
       history_zoom_alert: U moet inzoomen om de kaart te bewerkingsgeschiedenis te bekijken
   layouts: 
+    community_blogs: Gemeenschapsblogs
+    community_blogs_title: Blogs van leden van de OpenStreetMap-gemeenschap
     copyright: Auteursrechten &amp; licentie
+    documentation: Documentatie
+    documentation_title: Projectdocumentatie
     donate: Ondersteun OpenStreetMap door te {{link}} aan het Hardware Upgrade-fonds.
     donate_link_text: doneren
     edit: Bewerken
     edit_with: Bewerken met {{editor}}
     export: Exporteren
     export_tooltip: Kaartgegevens exporteren
+    foundation: Stichting
+    foundation_title: De OpenStreetMap Foundation
     gps_traces: GPS-tracks
     gps_traces_tooltip: GPS-tracks beheren
     help: Hulp
-    help_and_wiki: "{{help}} en {{wiki}}"
+    help_centre: Helpcentrum
     help_title: Helpsite voor dit project
     history: Geschiedenis
     home: home
@@ -921,12 +927,8 @@ nl:
     make_a_donation: 
       text: Doneren
       title: Steun OpenStreetMap met een donatie
-    news_blog: Nieuwsblog
-    news_blog_tooltip: Nieuwsblog over OpenStreetMap, vrije geografische gegevens, enzovoort
     osm_offline: De OpenStreetMap-database is op het moment niet beschikbaar wegens het uitvoeren van onderhoudswerkzaamheden.
     osm_read_only: De OpenStreetMap-database kan op het moment niet gewijzigd worden wegens het uitvoeren van onderhoudswerkzaamheden.
-    shop: Winkel
-    shop_tooltip: Winkel met OpenStreetMap-producten
     sign_up: registreren
     sign_up_tooltip: Gebruiker voor bewerken aanmaken
     tag_line: De vrije wikiwereldkaart
@@ -1172,10 +1174,10 @@ nl:
       no_iframe_support: Uw browser ondersteunt geen iframes HTML die nodig zijn voor deze functie.
       not_public: U hebt ingesteld dat uw bewerkingen niet openbaar zijn.
       not_public_description: U kunt de kaart niet meer bewerken, behalve als u uw bewerkingen openbaar maakt. U kunt deze instelling maken op uw {{user_page}}.
+      potlatch2_unsaved_changes: U hebt wijzigingen die nog niet zijn opgeslagen. Om op te slaan in Potlatch 2 moet u op "Opslaan" klikken.
       potlatch_unsaved_changes: U hebt wijzigingen gemaakt die nog niet zijn opgeslagen. Om op te slaan in Potlach, deselecteert u de huidige weg of het huidige punt als u in livemodus bewerkt, of klikt u op de knop Opslaan.
       user_page_link: gebruikerspagina
     index: 
-      josm_failed: Het bewerken is mislukt. Zorg ervoor dat JOSM is geladen en dat de plug-in voor remote control is ingeschakeld.
       js_1: U gebruikt een browser die JavaScript niet ondersteunt, of u hebt JavaScript uitgeschakeld.
       js_2: OpenStreetMap gebruikt JavaScript voor de slippy-kaart.
       js_3: Gebruik de <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home statische tilebrowser</a> als u niet de mogelijkheid hebt om JavaScript aan te zetten.
@@ -1184,6 +1186,7 @@ nl:
         notice: Gelicenseerd onder de {{license_name}} licentie door het {{project_name}} en zijn bijdragers.
         project_name: OpenStreetMap-project
       permalink: Permanente verwijzing
+      remote_failed: Bewerken is mislukt. Zorg dat JOSM of Merkaartor is geladen en dat de instelling voor Remote Control is ingeschakeld
       shortlink: Korte verwijzing
     key: 
       map_key: Legenda
@@ -1446,17 +1449,22 @@ nl:
     login: 
       account not active: Sorry, uw gebruiker is nog niet actief.<br />Klik op de verwijzing in de bevestigingse-mail om deze te activeren of <a href="{{reconfirm}}">vraag een nieuwe bevestigingse-mail aan</a>.
       account suspended: Uw gebruiker is automatisch opgeschort vanwege verdachte activiteit.<br />Neem contact op met de {{webmaster}} als u deze handeling wilt bespreken.
+      already have: Hebt u al een gebruiker bij OpenStreetMap? Meld u dan aan.
       auth failure: Sorry, met deze gegevens kunt u niet aanmelden.
+      create account minute: Maak een gebruiker aan. Dat is snel gebeurd.
       create_account: registreren
       email or username: "E-mailadres of gebruikersnaam:"
       heading: Aanmelden
       login_button: Aanmelden
       lost password link: Wachtwoord vergeten?
+      new to osm: Is OpenStreetMap nieuw voor u?
       notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Lees meer over de aanstaande licentiewijziging voor OpenStreetMap</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">vertalingen</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">overleg</a>)
       password: "Wachtwoord:"
       please login: Aanmelden of {{create_user_link}}.
+      register now: Nu inschrijven
       remember: "Aanmeldgegevens onthouden:"
       title: Aanmelden
+      to make changes: Om wijzigingen in OpenStreetMap te maken, moet u een gebruiker hebben.
       webmaster: webmaster
     logout: 
       heading: Afmelden van OpenStreetMap
@@ -1550,6 +1558,7 @@ nl:
       hide_user: gebruikers verbergen
       if set location: Als u uw locatie instelt, verschijnt er hieronder een kaart. U kunt de locatie instellen in uw {{settings_link}}.
       km away: "{{count}} km verwijderd"
+      latest edit: "Laatste bewerking {{ago}}:"
       m away: "{{count}} m verwijderd"
       mapper since: "Mapper sinds:"
       moderator_history: ingestelde blokkades bekijken
@@ -1632,7 +1641,7 @@ nl:
       sorry: De gebruiker met het nummer {{id}} is niet aangetroffen.
     partial: 
       confirm: Weet u het zeker?
-      creator_name: Aanmaker
+      creator_name: Auteur
       display_name: Geblokkeerde gebruiker
       edit: Bewerken
       not_revoked: (niet ingetrokken)
diff --git a/config/locales/no.yml b/config/locales/no.yml
index b77f701ce..781e533a4 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -354,6 +354,17 @@
       save_button: Lagre
       title: "{{user}} sin dagbok | {{title}}"
       user_title: Dagboken for {{user}}
+  editor: 
+    default: Standard (nåværende {{name}})
+    potlatch: 
+      description: Potlatch 1 (rediger i nettleseren)
+      name: Potlatch 1
+    potlatch2: 
+      description: Potlatch 2 (rediger i nettleseren)
+      name: Potlatch 2
+    remote: 
+      description: Lokalt installert program (JOSM eller Merkaartor)
+      name: Lokalt installert program
   export: 
     start: 
       add_marker: Legg til en markør på kartet
@@ -426,6 +437,7 @@
         uk_postcode: Resultat fra <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Resultat fra <a href="http://geocoder.us/">Geocoder.us</a>
     search_osm_namefinder: 
+      prefix: "{{type}}"
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} av {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} av {{placename}}"
     search_osm_nominatim: 
@@ -861,11 +873,16 @@
           water_point: Vannpunkt
           waterfall: Foss
           weir: Overløpskant \
+      prefix_format: "{{name}}"
   javascripts: 
     map: 
       base: 
         cycle_map: Sykkelkart
+        mapnik: Mapnik
         noname: IntetNavn
+        osmarender: Osmarender
+      overlays: 
+        maplint: Maplint
     site: 
       edit_disabled_tooltip: Zoom inn for å redigere kartet
       edit_tooltip: Rediger kartet
@@ -874,16 +891,23 @@
       history_tooltip: Vis redigeringer for dette området
       history_zoom_alert: Du må zoome inn for å vise redigeringer i dette området
   layouts: 
+    community_blogs: Fellesskapsblogger
+    community_blogs_title: Blogger fra medlemmene i OpenStreetMap-felleskapet
     copyright: Opphavsrett &amp; lisens
+    documentation: Dokumentasjon
+    documentation_title: Dokumentasjon for prosjektet
     donate: Støtt OpenStreetMap ved {{link}} til Hardware Upgrade Fund (et fond for maskinvareoppgraderinger).
     donate_link_text: donering
     edit: Rediger
+    edit_with: Rediger med {{editor}}
     export: Eksporter
     export_tooltip: Eksporter kartdata
+    foundation: Stiftelse
+    foundation_title: OpenStreetMap stiftelsen
     gps_traces: GPS-spor
     gps_traces_tooltip: Behandle GPS-spor
     help: Hjelp
-    help_and_wiki: "{{help}} & {{wiki}}"
+    help_centre: Brukerstøtte
     help_title: Hjelpenettsted for prosjektet
     history: Historikk
     home: hjem
@@ -908,12 +932,11 @@
     make_a_donation: 
       text: Doner
       title: Støtt OpenStreetMap med en donasjon
-    news_blog: Nyhetsblogg
-    news_blog_tooltip: Nyhetsblogg om OpenStreetMap, frie geografiske data, osv.
     osm_offline: OpenStreetMap databasen er for øyeblikket utilgjengelig mens essensielt vedlikeholdsarbeid utføres.
     osm_read_only: OpenStreetMap databasen er for øyeblikket i kun-lese-modus mens essensielt vedlikeholdsarbeid utføres.
-    shop: Butikk
-    shop_tooltip: Butikk med OpenStreetMap-merkevarer
+    project_name: 
+      h1: OpenStreetMap
+      title: OpenStreetMap
     sign_up: registrer
     sign_up_tooltip: Opprett en konto for redigering
     tag_line: Fritt Wiki-verdenskart
@@ -1053,6 +1076,7 @@
       footer2: og du kan svare til {{replyurl}}
       header: "{{from_user}} har sendt deg en melding gjennom OpenStreetMap med emnet {{subject}}:"
       hi: Hei {{to_user}},
+      subject_header: "[OpenStreetMap] {{subject}}"
     signup_confirm: 
       subject: "[OpenStreetMap] Bekreft din e-postadresse"
     signup_confirm_html: 
@@ -1099,6 +1123,8 @@
   oauth_clients: 
     create: 
       flash: Vellykket registrering av informasjonen
+    destroy: 
+      flash: Ødelagt klientapplikasjonsregistreringen
     edit: 
       submit: Rediger
       title: Rediger ditt programvare
@@ -1151,8 +1177,10 @@
     edit: 
       anon_edits_link_text: Finn ut hvorfor dette er tilfellet.
       flash_player_required: Du trenger en Flash-spiller for å kunne bruke Potlatch, Flasheditoren for OpenStreetMap. Du kan <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">laste ned Flash Player fra Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Flere andre alternativ</a> er også tilgjengelig for redigering av OpenStreetMap.
+      no_iframe_support: Nettleseren din støtter ikke HTML iframes som er nødvendig for denne egenskapen.
       not_public: Du har ikke satt dine redigeringer til å være offentlige.
       not_public_description: Du kan ikke lenger redigere kartet om du ikke gjør det. Du kan gjøre dine redigeringer offentlige fra din {{user_page}}.
+      potlatch2_unsaved_changes: Du har endringer som ikke er lagret. (For å lagre i Potlatch 2, må du klikke lagre.)
       potlatch_unsaved_changes: Du har ulagrede endringer. (For å lagre i Potlatch, må du fjerne markeringen av gjeldende vei eller punkt hvis du redigerer i live-modues eller klikke lagre hvis du har en lagreknapp.)
       user_page_link: brukerside
     index: 
@@ -1164,10 +1192,11 @@
         notice: Lisensiert under lisensen {{license_name}} av {{project_name}} og dets bidragsytere.
         project_name: OpenStreetMap-prosjekt
       permalink: Permanent lenke
+      remote_failed: Klarte ikke redigere - forsikre deg at JOSM eller Merkaartor er lastet og fjernkontrollvalget er aktivert
       shortlink: Kort lenke
     key: 
       map_key: Kartforklaring
-      map_key_tooltip: Kartforklaring for Mapnik-visningen på dette zoom-nivået
+      map_key_tooltip: Forklaring for kartet
       table: 
         entry: 
           admin: Administrativ grense
@@ -1371,6 +1400,7 @@
       new email address: "Ny e-postadresse:"
       new image: Legg til et bilde
       no home location: Du har ikke skrevet inn din hjemmelokasjon.
+      preferred editor: Foretrukket redigeringsverktøy
       preferred languages: "Foretrukne språk:"
       profile description: "Profilbeskrivelse:"
       public editing: 
@@ -1382,22 +1412,29 @@
         heading: "Offentlig redigering:"
       public editing note: 
         heading: Offentlig redigering
+        text: For øyeblikket er redigeringene dine anonyme og folk kan ikke sende deg meldinger eller se posisjonen din. For å vise hva du redigerte og tillate folk å kontakte deg gjennom nettsiden, klikk på knappen nedenfor. <b>Siden overgangen til 0.6 API-et, kan kun offentlige brukere redigere kartdata.</b> ( <a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">Finn ut hvorfor</a> ). <ul><li> Din e-postadresse vil ikke bli avslørt ved å bli offentlig. </li><li> Denne handlingen kan ikke omgjøres, og alle nye brukere er nå offentlig tilgjengelig som standard. </li></ul>
       replace image: Erstatt gjeldende bilde
       return to profile: Returner til profil
       save changes button: Lagre endringer
       title: Rediger konto
       update home location on click: Oppdater hjemmelokasjon når jeg klikker på kartet?
     confirm: 
+      already active: Denne kontoen har allerede blitt bekreftet.
+      before you start: Vi vet du sannsynligvis har hastverk med å begynne å lage kart, men før du gjør dette kan du fylle inn litt informasjon om deg selv i skjemaet under.
       button: Bekreft
       heading: Bekreft en brukerkonto
       press confirm button: Klikk bekreftknappen nedenfor for å aktivere kontoen din.
+      reconfirm: Hvis det er en stund siden du registrerte deg kan det hende du må <a href={{reconfirm}}">sende degselv en ny bekreftelsesepost</a>.
       success: Kontoen din er bekreftet - takk for at du registrerte deg.
+      unknown token: Den koden ser ikke ut til å eksistere.
     confirm_email: 
       button: Bekreft
       failure: En e-postadresse er allerede bekreftet med denne nøkkelen.
       heading: Bekreft endring av e-postadresse
       press confirm button: Klikk bekreftknappen nedenfor for å bekrefte din nye e-postadressse.
       success: E-postadressen din er bekreftet - takk for at du registrerte deg.
+    confirm_resend: 
+      failure: Fant ikke brukeren {{name}}.
     filter: 
       not_an_administrator: Du må være administrator for å gjøre det.
     go_public: 
@@ -1414,19 +1451,24 @@
       summary_no_ip: "{{name}} opprettet {{date}}"
       title: Brukere
     login: 
-      account not active: Beklager,kontoen din er ikke aktivert ennå.<br />Vennligst klikk på lenken i e-posten med kontobekreftelsen for å aktivere kontoen din.
+      account not active: Beklager, kontoen din er ikke aktivert ennå.<br />Bruk lenka i kontobekreftelseseposten for å aktivere kontoen din, eller <a href="{{reconfirm}}">be om en ny bekreftelsesepost</a>.
       account suspended: Beklager, kontoen din er deaktivert på grunn av mistenkelig aktivitet.<br />Vennligst kontakt {{webmaster}} hvis du ønsker å diskutere dette.
+      already have: Har du allerede en OpenStreetMap-konto? Logg inn.
       auth failure: Beklager, kunne ikke logge inn med den informasjonen
+      create account minute: Opprett en konto. Det tar bare ett minutt.
       create_account: opprett en konto
       email or username: "E-postadresse eller brukernavn:"
       heading: Logg inn
       login_button: Logg inn
       lost password link: Mistet passordet ditt?
+      new to osm: Ny på OpenStreetMap?
       notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Finn ut mer om OpenStreetMap sitt kommende bytte av lisens</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">oversettelser</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">diskusjon</a>)
       password: "Passord:"
       please login: Logg inn eller {{create_user_link}}.
+      register now: Registrer deg nå
       remember: "Huske meg:"
       title: Logg inn
+      to make changes: For å gjøre endringer på OpenStreetMap-data, må du ha en konto.
       webmaster: webmaster
     logout: 
       heading: Logg ut fra OpenStreetMap
@@ -1520,6 +1562,7 @@
       hide_user: skjul denne brukeren
       if set location: Hvis du setter din posisjon, så vil et fint kart og ting vises her. Du kan sette din hjemmeposisjon på din {{settings_link}}-side.
       km away: "{{count}}km unna"
+      latest edit: "Siste redigering {{ago}}:"
       m away: "{{count}}m unna"
       mapper since: "Bruker siden:"
       moderator_history: vis tildelte blokkeringer
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 83a84bcd3..d477ef762 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1,8 +1,10 @@
 # Messages for Polish (Polski)
 # Exported from translatewiki.net
 # Export driver: syck
+# Author: Ajank
 # Author: BdgwksxD
 # Author: Deejay1
+# Author: RafalR
 # Author: Soeb
 # Author: Sp5uhe
 # Author: Wpedzich
@@ -357,15 +359,15 @@ pl:
       user_title: Dziennik dla {{user}}
   editor: 
     default: Domyślnie (obecnie {{name}})
-    josm: 
-      description: JOSM (poprzez zdalnie sterowaną wtyczkę)
-      name: JOSM
     potlatch: 
       description: Potlatch 1 (edycja w przeglądarce)
-      name: Potlatch
+      name: Potlatch 1
     potlatch2: 
       description: Potlatch 2 (edycja w przeglądarce)
       name: Potlatch 2
+    remote: 
+      description: JOSM albo Merkaartor
+      name: Remote Control
   export: 
     start: 
       add_marker: Dodaj pinezkę na mapie
@@ -881,19 +883,29 @@ pl:
         cycle_map: Mapa Rowerowa
         noname: BrakNazwy
     site: 
+      edit_disabled_tooltip: Powiększ, aby edytować mapę
       edit_tooltip: Edytuje mapę
       edit_zoom_alert: Musisz przybliżyć się, by edytować mape
+      history_disabled_tooltip: Powiększ, aby zobaczyć zmiany w tym obszarze
       history_tooltip: Wyświetla przeprowadzone edycje dla tego obszaru
       history_zoom_alert: Musisz przybliżyć się, by odczytać historię edycji
   layouts: 
-    copyright: Prawa autorskie i licencja
+    community_blogs_title: Blogi członków społeczności OpenStreetMap
+    copyright: Prawa autorskie i&nbsp;licencja
+    documentation: Dokumentacja
+    documentation_title: Dokumentacja projektu
     donate: Wspomóż Projekt OpenStreetMap {{link}} na Konto Aktualizacji Naszego Sprzętu.
     donate_link_text: dokonując darowizny
     edit: Edycja
+    edit_with: Edytuj w {{editor}}
     export: Eksport
     export_tooltip: Eksport danych mapy
+    foundation: Fundacja
     gps_traces: Ślady GPS
     gps_traces_tooltip: Zarządzanie śladami GPS
+    help: Pomoc
+    help_centre: Centrum pomocy
+    help_title: Witryna pomocy dla projektu
     history: Zmiany
     home: główna
     home_tooltip: Przejdź do strony głównej
@@ -905,6 +917,7 @@ pl:
     intro_1: OpenStreetMap to mapa całego świata którą możesz swobodnie edytować.  Tworzona przez ludzi takich jak Ty.
     intro_2: OpenStreetMap pozwala oglądać, korzystać, i kolaboratywnie tworzyć dane geograficzne z dowolnego miejsca na Ziemi.
     intro_3: Hosting OpenStreetMap jest wspomagany przez {{ucl}} oraz {{bytemark}}. Pozostali wymienieni są na stronie {{partners}}.
+    intro_3_partners: wiki
     license: 
       title: Dane OpenStreetMap są licencjonowane przez Creative Commons Attribution-Share Alike 2.0 Generic License
     log_in: zaloguj się
@@ -916,12 +929,8 @@ pl:
     make_a_donation: 
       text: Przekaż darowiznę
       title: Wspomóż OpenStreetMap za pomocą darowizny pieniężnej
-    news_blog: Blog informacyjny
-    news_blog_tooltip: Blog z wiadomościami o OpenStreetMap, wolnych danych geograficznych, itp.
     osm_offline: Baza danych OpenStreetMap jest niedostępna na czas ważnych zadań administracyjnych które są w tym momencie wykonywane.
     osm_read_only: Baza danych OpenStreetMap jest w trybie tylko-do-odczytu na czas ważnych zadań administracyjnych które są w tym momencie wykonywane.
-    shop: Zakupy
-    shop_tooltip: Sklep z markowymi towarami OpenStreetMap
     sign_up: zarejestruj
     sign_up_tooltip: Załóż konto, aby edytować
     tag_line: Swobodna Wiki-Mapa Świata
@@ -931,15 +940,16 @@ pl:
     view_tooltip: Zobacz mapę
     welcome_user: Witaj, {{user_link}}
     welcome_user_link_tooltip: Strona użytkownika
+    wiki: Wiki
   license_page: 
     foreign: 
       english_link: oryginalna angielska wersja
-      text: W przypadku konfliktu pomiędzy tą tłumaczoną stroną a {{english_original_link}}, angielska strona ma pierwszeństwo.
+      text: W przypadku konfliktu pomiędzy tym tłumaczeniem a {{english_original_link}}, preferowana jest strona w języku angielskim.
       title: Informacje o tłumaczeniu
     native: 
-      mapping_link: rozpoczęcie mapowania
-      native_link: Polska wersja
-      text: Przeglądasz angielską wersję strony o prawach autorskich. Możesz wrócić do {{native_link}} tej strony albo możesz przestać czytać o prawach autorskich i {{mapping_link}}.
+      mapping_link: rozpocząć tworzenie mapy
+      native_link: wersji po polsku
+      text: Przeglądasz wersję po angielsku strony dotyczącej praw autorskich. Możesz wrócić do {{native_link}} tej strony lub przestać czytać o prawach autorskich i {{mapping_link}}.
       title: O stronie
   message: 
     delete: 
@@ -971,6 +981,9 @@ pl:
       send_message_to: Wyślij nową wiadomość do {{name}}
       subject: Temat
       title: Wysyłanie wiadomości
+    no_such_message: 
+      heading: Nie ma takiej wiadomości
+      title: Nie ma takiej wiadomości
     no_such_user: 
       body: Niestety nie ma użytkownika o takiej nazwie.
       heading: Nie ma takiego użytkownika
@@ -1125,7 +1138,7 @@ pl:
       shortlink: Shortlink
     key: 
       map_key: Legenda
-      map_key_tooltip: Klucz mapy dla mapnika renderuje na tym poziomie powiększenia
+      map_key_tooltip: Legenda mapy
       table: 
         entry: 
           admin: Granica administracyjna
@@ -1294,7 +1307,7 @@ pl:
       pending: OCZEKUJE
       points: "Punktów:"
       start_coordinates: "Współrzędne początkowe:"
-      tags: Tagi
+      tags: "Znaczniki:"
       title: Przeglądanie śladu {{name}}
       trace_not_found: Ślad nie znaleziony!
       uploaded: "Dodano:"
@@ -1306,6 +1319,8 @@ pl:
       trackable: Niezidentyfikowany (udostępniany jedynie jako anonimowy, uporządkowane punkty ze znacznikami czasu)
   user: 
     account: 
+      contributor terms: 
+        link text: co to jest?
       current email address: "Aktualny adres e-mail:"
       delete image: Usuń obecną grafikę
       email never displayed publicly: (nie jest wyświetlany publicznie)
@@ -1314,6 +1329,7 @@ pl:
       home location: "Lokalizacja domowa:"
       image: "Grafika:"
       image size hint: (najlepiej sprawdzają się kwadratowe obrazy o rozmiarach przynajmniej 100x100)
+      keep image: Pozostaw dotychczasową ilustrację
       latitude: "Szerokość:"
       longitude: "Długość geograficzna:"
       make edits public button: Niech wszystkie edycje będą publiczne.
@@ -1339,16 +1355,20 @@ pl:
       title: Zmiana ustawień konta
       update home location on click: Aktualizować lokalizację kiedy klikam na mapie?
     confirm: 
+      already active: To konto zostało potwierdzone.
       button: Potwierdzam
       heading: Potwierdzenie nowego użytkownika
       press confirm button: Użyj poniższego przycisku aby aktywować Twoje konto.
       success: Twoje konto zostało zatwierdzone, cieszymy się że do nas dołączyłeś!
+      unknown token: Wygląda na to, że ten żeton nie istnieje.
     confirm_email: 
       button: Potwierdzam
       failure: Adres email o tym kodzie był już potwierdzony.
       heading: Porwierdzenie zmiany adresu mailowego
       press confirm button: Użyj poniższego przycisku aby potwierdzić Twój nowy adres e-mail.
       success: Twój nowy adres został zatwierdzony, cieszymy się że do nas dołączyłeś!
+    confirm_resend: 
+      failure: Brak użytkownika {{name}}.
     filter: 
       not_an_administrator: Musisz mieć uprawnienia administratora do wykonania tego działania.
     go_public: 
@@ -1359,7 +1379,7 @@ pl:
       hide: Ukryj zaznaczonych użytkowników
       title: Użytkownicy
     login: 
-      account not active: Niestety Twoje konto nie jest jeszcze aktywne.<br />Otwórz link zawarty w mailu potwierdzenia założenia konta aby je aktywować.
+      account not active: Niestety Twoje konto nie jest jeszcze aktywne.<br />Otwórz link zawarty w mailu potwierdzenia założenia konta, aby je aktywować lub <a href="{{reconfirm}}">poproś o ponowne przesłanie maila</a>.
       auth failure: Niestety podane dane nie pozwoliły na zalogowanie Cię.
       create_account: załóż konto
       email or username: "Adres email lub nazwa użytkownika:"
@@ -1395,7 +1415,7 @@ pl:
       display name description: Twoja publiczna nazwa użytkownika. Można ją później zmienić w ustawieniach.
       email address: "Adres e-mail:"
       fill_form: Po wypełnieniu formularza otrzymasz e-mail z instrukcjami dotyczącymi aktywacji konta.
-      flash create success message: Nowy użytkownik został dodany.  Sprawdź czy już przyszedł mail potwierdzający, a już za moment będziesz mapował(a) :-)<br /><br />Zauważ, że nie można zalogować się przed otrzymaniem tego maila i potwierdzeniem adresu.<br /><br />Jeśli korzystasz z rozwiązania antyspamowego które prosi nowych nadawców o potwierdzenia, będziesz musiał(a) dodać adres webmaster@openstreetmap.org do znanych adresów bo nie jesteśmy w stanie odpowiadać na zapytania takich systemów.
+      flash create success message: Rejestracja udana. Sprawdź czy na adres {{email}} przyszedł mail potwierdzający, a już za moment będziesz edytować mapę.<br /><br />Jeśli korzystasz z rozwiązania antyspamowego, które prosi nowych nadawców o potwierdzenie, będziesz musiał dodać adres webmaster@openstreetmap.org do znanych adresów, bo nie jesteśmy w stanie odpowiadać na zapytania takich systemów.
       heading: Zakładanie konta
       license_agreement: Zakładając konto użytkownika wyrażasz zgodę na <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">warunki użytkowania dla edytorów</a>.
       no_auto_account_create: Niestety nie możemy aktualnie stworzyć Ci konta automatycznie.
@@ -1428,13 +1448,17 @@ pl:
       title: Konto zawieszone
     terms: 
       agree: Akceptuję
-      consider_pd_why: co to?
+      consider_pd: Oprócz powyższych warunków, stwierdzam również, że mój wkład jest w domenie publicznej
+      consider_pd_why: co to oznacza?
       decline: Nie akceptuję
+      heading: Warunki współtworzenia
       legale_names: 
         france: Francja
         italy: Włochy
         rest_of_world: Reszta świata
       legale_select: "Proszę wybrać kraj zamieszkania:"
+      read and accept: Prosimy przeczytać umowę zamieszczoną poniżej i nacisnąć "Akceptuję". Klikając ten przycisk akceptujesz warunki umowy.
+      title: Warunki współtworzenia
     view: 
       activate_user: aktywuj tego użytkownika
       add as friend: dodaj do znajomych
@@ -1443,6 +1467,7 @@ pl:
       blocks by me: nałożone blokady
       blocks on me: otrzymane blokady
       confirm: Potwierdź
+      confirm_user: zatwierdź tego użytkownika
       create_block: zablokuj tego użytkownika
       created from: "Stworzony z:"
       deactivate_user: dezaktywuj tego użytkownika
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 2cc6c20d0..82e002b6e 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -313,7 +313,7 @@ pt-BR:
       reply_link: Responder esta entrada
     edit: 
       body: "Texto:"
-      language: "Idioma:"
+      language: "Língua:"
       latitude: "Latitude:"
       location: "Localização:"
       longitude: "Longitude:"
@@ -363,6 +363,17 @@ pt-BR:
       save_button: Salvar
       title: Diário de {{user}} | {{title}}
       user_title: Diário de {{user}}
+  editor: 
+    default: Padrão (atualmente {{name}})
+    potlatch: 
+      description: Potlatch 1 (editar no navegador)
+      name: Potlatch 1
+    potlatch2: 
+      description: Potlatch 2 (editar no navegador)
+      name: Potlatch 2
+    remote: 
+      description: Controle Remoto (JOSM ou Merkaartor)
+      name: Controle Remoto
   export: 
     start: 
       add_marker: Adicionar um marcador ao mapa
@@ -875,6 +886,7 @@ pt-BR:
           water_point: Ponto de água
           waterfall: Queda de água
           weir: Açude
+      prefix_format: "{{name}}"
   html: 
     dir: ltr
   javascripts: 
@@ -894,17 +906,25 @@ pt-BR:
       history_tooltip: Veja as edições desta área
       history_zoom_alert: Você deve aumentar o zoom para ver o histórico de edição
   layouts: 
+    community_blogs: Blogs da Comunidade
+    community_blogs_title: Blogs de membros da comunidade OpenStreetMap
     copyright: Direitos Autorais &amp; Licença
+    documentation: Documentação
+    documentation_title: Documentação do projeto
     donate: "Ajude o OpenStreetMap fazendo doações para o Fundo de Upgrade de Hardware: {{link}}."
     donate_link_text: doando
     edit: Editar
+    edit_with: Edite com {{editor}}
     export: Exportar
     export_tooltip: Exportar dados do mapa
+    foundation: Fundação
+    foundation_title: A Fundação OpenStreetMap
     gps_traces: Trilhas GPS
     gps_traces_tooltip: Gerenciar trilhas GPS
     help: Ajuda
-    help_and_wiki: "{{help}} & {{wiki}}"
+    help_centre: Central de Ajuda
     help_title: Site de ajuda para o projeto
+    help_url: http://help.openstreetmap.org/
     history: Histórico
     home: início
     home_tooltip: Ir para a sua localização
@@ -932,16 +952,11 @@ pt-BR:
     make_a_donation: 
       text: Faça uma doação
       title: Ajude o OpenStreetMap com uma doação monetária
-    news_blog: Blog de notícias
-    news_blog_tooltip: Blog de notícias sobre o OpenStreetMap, dados geográficos livres, etc.
     osm_offline: A base de dados do OpenStreetMap está off-line devido a operações de manutenção.
     osm_read_only: A base de dados do OpenStreetMap está em modo somente leitura devido a operações de manutenção.
     project_name: 
       h1: OpenStreetMap
       title: OpenStreetMap
-    shop: Produtos
-    shop_tooltip: Compre produtos com a marca OpenStreetMap
-    shop_url: http://wiki.openstreetmap.org/wiki/Merchandise?uselang=pt-br
     sign_up: registrar
     sign_up_tooltip: Criar uma conta para editar
     tag_line: O Wiki de Mapas Livres
@@ -953,6 +968,7 @@ pt-BR:
     welcome_user_link_tooltip: Sua Página de usuário
     wiki: Wikia
     wiki_title: Site wiki para o projeto
+    wiki_url: http://wiki.openstreetmap.org/wiki/Pt-br:Main_Page
   license_page: 
     foreign: 
       english_link: o original em Inglês
@@ -1083,6 +1099,7 @@ pt-BR:
       footer2: e pode respondê-la em {{replyurl}}
       header: "{{from_user}} enviou uma mensagem pelo OpenStreetMap para você com o assunto {{subject}}:"
       hi: Olá {{to_user}},
+      subject_header: "[OpenStreetMap] {{subject}}"
     signup_confirm: 
       subject: "[OpenStreetMap] Confirme seu endereço de e-mail"
     signup_confirm_html: 
@@ -1193,8 +1210,10 @@ pt-BR:
       anon_edits_link: http://wiki.openstreetmap.org/wiki/Pt-br:Disabling_anonymous_edits
       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.
+      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.
       not_public_description: Você não pode editar o mapa até que você configure suas edições para serem públicas, o que pode fazer na sua {{user_page}}.
+      potlatch2_unsaved_changes: Você tem alterações não salvas. (Para salvar no potlatch 2, você deve clicar em Salvar)
       potlatch_unsaved_changes: Você tem alterações não salvas. (Para salvar no Potlatch, você deve deselecionar a linha ou ponto atual, se editando no modo de edição ao vivo, ou clicar em salvar se estiver editando offline.
       user_page_link: página de usuário
     index: 
@@ -1208,6 +1227,7 @@ pt-BR:
         project_name: Projeto OpenStreetMap
         project_url: http://openstreetmap.org
       permalink: Link Permanente
+      remote_failed: Edição falhou - certifique-se de que o JOSM ou o Merkaartor estão carregados e que o Controle Remoto está ativado
       shortlink: Atalho
     key: 
       map_key: Legenda
@@ -1399,6 +1419,7 @@ pt-BR:
         agreed: Você aceitou os novos Termos de Contribuição.
         agreed_with_pd: Você também declara que considera suas edições em Domínio Público.
         heading: "Termos de Contribuição:"
+        link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: o que é isso?
         not yet agreed: Você não aceitou os novos Termos de Contribuição.
         review link text: Por favor siga este link quando você puder para revisar e aceitar os novos Termos de Contribuição.
@@ -1418,6 +1439,7 @@ pt-BR:
       new email address: "Novo endereço de e-mail:"
       new image: Adicionar uma imagem
       no home location: Você ainda não entrou a sua localização.
+      preferred editor: "Editor preferido:"
       preferred languages: "Preferência de Idioma:"
       profile description: "Descrição do Perfil:"
       public editing: 
@@ -1471,17 +1493,22 @@ pt-BR:
     login: 
       account not active: Desculpe, sua conta não está ativa ainda.<br />Por favor use o link do e-mail de confirmação para ativar sua conta ou <a href="{{reconfirm}}">solicite uma nova confirmação por e-mail</a>.
       account suspended: Desculpe, mas sua conta foi suspensa por conta de atividade suspeita. <br />Por favor, contate o {{webmaster}} se você deseja discutir esta decisão.
+      already have: Já tem uma conta no OpenStreetMap? Então faça o login.
       auth failure: Desculpe, impossível entrar com estas informações.
+      create account minute: Crie uma conta. Leva apenas um minuto.
       create_account: crie uma nova conta
       email or username: "Email ou Nome de Usuário:"
       heading: Entrar
       login_button: Entrar
       lost password link: Esqueceu sua senha?
+      new to osm: Primeira vez no OpenStreetMap?
       notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Saiba mais sobre a mudança na licença do OpenStreetMap</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">traduções</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">discussão</a>)
       password: "Senha:"
       please login: Por favor entre as informações de sua conta para entrar, ou {{create_user_link}}.
+      register now: Registre agora
       remember: Lembrar neste computador
       title: Entrar
+      to make changes: Para fazer alterações nos dados do OpenStreetMap, você precisa criar uma conta.
       webmaster: webmaster
     logout: 
       heading: Sair do OpenStreetMap
@@ -1546,7 +1573,9 @@ pt-BR:
       agree: Concordo
       consider_pd: Em adição ao disposto acima, eu desejo que minhas contribuições sejam de Domínio Público
       consider_pd_why: o que é isso?
+      consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
       decline: Discordo
+      declined: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
       heading: Termos do Colaborador
       legale_names: 
         france: França
@@ -1575,6 +1604,7 @@ pt-BR:
       hide_user: esconder esse usuário
       if set location: Se você definir a sua localização, um mapa bonito vai aparecer abaixo. Você pode definir sua localização na página de {{settings_link}}.
       km away: "{{count}}km de distância"
+      latest edit: "Última edição {{ago}}:"
       m away: "{{count}}m de distância"
       mapper since: "Mapeador desde:"
       moderator_history: ver bloqueios aplicados
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 49993ca38..6a20e42d7 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -359,6 +359,17 @@ ru:
       save_button: Сохранить
       title: Дневник пользователя {{user}} | {{title}}
       user_title: Дневник пользователя {{user}}
+  editor: 
+    default: По умолчанию (назначен {{name}})
+    potlatch: 
+      description: Potlatch 1 (редактор в браузере)
+      name: Potlatch 1
+    potlatch2: 
+      description: Potlatch 2 (редактор в браузере)
+      name: Potlatch 2
+    remote: 
+      description: Дистанционное управление (JOSM или Merkaartor)
+      name: Дистанционное управление
   export: 
     start: 
       add_marker: Поставить на карту маркер
@@ -886,16 +897,23 @@ ru:
       history_tooltip: Просмотр правок в этой области
       history_zoom_alert: Необходимо увеличить масштаб карты, чтобы увидеть историю правок
   layouts: 
+    community_blogs: Блоги сообщества
+    community_blogs_title: Блоги членов сообщества OpenStreetMap
     copyright: Авторское право и лицензия
+    documentation: Документация
+    documentation_title: Документация по проекту
     donate: Поддержите OpenStreetMap {{link}} в Фонд обновления оборудования.
     donate_link_text: пожертвованиями
     edit: Правка
+    edit_with: Править с помощью {{editor}}
     export: Экспорт
     export_tooltip: Экспортировать данные карты
+    foundation: Фонд
+    foundation_title: Фонд OpenStreetMap
     gps_traces: GPS-треки
     gps_traces_tooltip: Работать с GPS треками
     help: Помощь
-    help_and_wiki: "{{help}} & {{wiki}}"
+    help_centre: Справочный центр
     help_title: Сайт помощи проекта
     history: История
     home: домой
@@ -921,12 +939,8 @@ ru:
     make_a_donation: 
       text: Поддержать проект
       title: Поддержка OpenStreetMap денежно-кредитным пожертвованием
-    news_blog: Блог новостей
-    news_blog_tooltip: Новостной блог OpenStreetMap, свободные геоданные, и т. д.
     osm_offline: База данных OpenStreetMap в данный момент не доступна, так как проводится необходимое техническое обслуживание.
     osm_read_only: База данных OpenStreetMap в данный момент доступна только для чтения, так как проводится необходимое техническое обслуживание.
-    shop: Магазин
-    shop_tooltip: Магазин с фирменной символикой OpenStreetMap
     sign_up: регистрация
     sign_up_tooltip: Создать учётную запись для редактирования
     tag_line: Свободная вики-карта мира
@@ -1172,8 +1186,10 @@ ru:
     edit: 
       anon_edits_link_text: Выяснить, в чём дело.
       flash_player_required: Для использования редактора Potlatch необходим Flash-плеер. Вы можете <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">загрузить Flash-плеер с Adobe.com</a>. Существуют и <a href="http://wiki.openstreetmap.org/index.php?title=RU:Editing&uselang=ru">другие способы</a> редактирования OpenStreetMap.
+      no_iframe_support: Ваш браузер не поддерживает рамки в HTML, а они нужны для этого режима.
       not_public: Вы не сделали свои правки общедоступными.
       not_public_description: "Вы не можете больше анонимно редактировать карту. Вы можете сделать ваши правки общедоступными здесь: {{user_page}}."
+      potlatch2_unsaved_changes: Имеются несохранённые изменения. (Для сохранения в Potlatch 2, следует нажать «сохранить».)
       potlatch_unsaved_changes: Имеются несохранённые изменения. (Для сохранения в Potlatch снимите выделение с пути или точки, если редактируете в «живом» режиме, либо нажмите кнопку «сохранить», если вы в режиме отложенного сохранения.)
       user_page_link: страница пользователя
     index: 
@@ -1185,6 +1201,7 @@ ru:
         notice: Лицензировано на условиях {{license_name}} проектом {{project_name}} и его пользователями.
         project_name: OpenStreetMap
       permalink: Постоянная ссылка
+      remote_failed: Редактирование не удалось. Убедитесь, что JOSM или Merkaartor загружены и включена настройка дистанционного управления
       shortlink: Короткая ссылка
     key: 
       map_key: Условные знаки
@@ -1395,6 +1412,7 @@ ru:
       new email address: "Новый адрес эл. почты:"
       new image: Добавить изображение
       no home location: Вы не обозначили свое основное местоположение.
+      preferred editor: "Предпочтительный редактор:"
       preferred languages: "Предпочитаемые языки:"
       profile description: "Описание профиля:"
       public editing: 
@@ -1448,17 +1466,22 @@ ru:
     login: 
       account not active: Извините, ваша учётная запись ещё не активирована.<br />Чтобы активировать её, пожалуйста, нажмите на ссылку в отправленном вам письме, или <a href="{{reconfirm}}">запросите отправку нового письма-подтверждения</a>.
       account suspended: Извините, ваша учётная запись была приостановлена из-за подозрительной активности.<br />Пожалуйста, свяжитесь с {{webmaster}}, если вы хотите выяснить подробности.
+      already have: Уже есть учётная запись OpenStreetMap? Пожалуйста, представьтесь.
       auth failure: Извините, вход с этими именем или паролем невозможен.
+      create account minute: Создать учётную запись. Это займёт не больше минуты.
       create_account: зарегистрируйтесь
       email or username: "Эл. почта или имя пользователя:"
       heading: Представьтесь
       login_button: Представиться
       lost password link: Забыли пароль?
+      new to osm: Впервые на OpenStreetMap?
       notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Узнайте больше о предстоящем изменении лицензии OpenStreetMap</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">переводы</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">обсуждение</a>)
       password: "Пароль:"
       please login: Пожалуйста, представьтесь или {{create_user_link}}.
+      register now: Зарегистрируйтесь
       remember: "\nЗапомнить меня:"
       title: Представьтесь
+      to make changes: Чтобы вносить изменения в данные OpenStreetMap, вы должны иметь учётную запись.
       webmaster: веб-мастер
     logout: 
       heading: Выйти из OpenStreetMap
@@ -1552,6 +1575,7 @@ ru:
       hide_user: скрыть этого пользователя
       if set location: Если вы укажете свое местоположение, карта и дополнительные инструменты появятся ниже. Вы можете установить ваше местоположение на вашей странице {{settings_link}}.
       km away: "{{count}} км от вас"
+      latest edit: "Последняя правка {{ago}}:"
       m away: "{{count}} м от вас"
       mapper since: "Зарегистрирован:"
       moderator_history: созданные блокировки
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index f1ef13527..6f22452ea 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -852,12 +852,8 @@ sk:
     make_a_donation: 
       text: Darovanie
       title: Podpora OpenStreetMap s finančnou podporou
-    news_blog: Novinky blog
-    news_blog_tooltip: Spravodajský blog o OpenStreetMap, voľné zemepisné dáta, etc.
     osm_offline: OpenStreetMap databáza je teraz offline, zatiaľ čo potrebná údržba databázy naďalej prebieha.
     osm_read_only: OpenStreetMap databáza je teraz len v móde čítania (bez možnosti zapisovania), zatiaľ čo potrebná údržba databázy naďalej prebieha.
-    shop: Obchod
-    shop_tooltip: Obchod so značkovým OpenStreetMap tovarom
     sign_up: zaregistrovať sa
     sign_up_tooltip: Vytvorte si účet pre úpravy
     tag_line: Voľná Wiki Mapa sveta
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 4f78d6bd6..8f4cdfc91 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -504,12 +504,8 @@ sl:
     make_a_donation: 
       text: Prispevajte finančna sredstva
       title: Podprite OpenStreetMap z denarnim prispevkom
-    news_blog: Novice
-    news_blog_tooltip: Novice o OpenStreetMap, prostih geografskih podatkih, ipd.
     osm_offline: Baza OpenStreetMap zaradi izvajanja nujnih vzdrževalnih del trenutno ni dostopna.
     osm_read_only: Baza OpenStreetMap je zaradi izvajanja nujnih vzdrževalnih del trenutno dostopna le za branje.
-    shop: Trgovina
-    shop_tooltip: Nakup izdelkov z OpenStreetMap logotipi
     sign_up: vpis
     sign_up_tooltip: Ustvarite si nov uporabniški račun za urejanje
     tag_line: Prost wiki zemljevid sveta
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 968dc8bcf..071a8f2f2 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -3,6 +3,7 @@
 # Export driver: syck
 # Author: Mdupont
 # Author: MicroBoy
+# Author: Mikullovci11
 # Author: Techlik
 sq: 
   activerecord: 
@@ -10,7 +11,7 @@ sq:
       message: 
         title: Titulli
       trace: 
-        name: Emni
+        name: Emri
     models: 
       language: Gjuha
   browse: 
@@ -133,7 +134,7 @@ sq:
       object_list: 
         api: Merre qet zon prej API
         back: Kqyre listen e seneve
-        details: Detalet
+        details: Detajet
         heading: Lista e seneve
         history: 
           type: 
@@ -207,6 +208,17 @@ sq:
     view: 
       leave_a_comment: Lene naj koment
       save_button: Ruaj
+  editor: 
+    default: Default (momentalisht {{name}})
+    potlatch: 
+      description: Potlatch 1 (editor në shfletues)
+      name: Potlatch 1
+    potlatch2: 
+      description: Potlatch 2 (editor në shfletues)
+      name: Potlatch 2
+    remote: 
+      description: Kontrollë prej së largu (JOSM apo Merkaartor)
+      name: Kontrollë prej së largu
   export: 
     start: 
       area_to_export: Zona per Eksport
@@ -443,7 +455,7 @@ sq:
       trackable: E GJURMUESHME
       view_map: Kshyre Harten
     trace_form: 
-      description: Pershkrimi
+      description: Përshkrimi
       help: Ndihma
       tags: Etiketat
       tags_help: Presje e kufizume
@@ -489,6 +501,13 @@ sq:
       trackable: Mund të përcilelt (vetëm e shkëmbyer në formë anonime, duke porositur pikë me vula kohore)
   user: 
     account: 
+      contributor terms: 
+        agreed: Ju duhet të jeni pajtuar me Kushtet e reja të Kontribuesit.
+        agreed_with_pd: Ju gjithashtu keni deklaruar se ju konsideroni që editimet tuaja të jenë në Domenin Publik.
+        heading: "Kushtet e Kontribimit:"
+        link text: Çka është kjo?
+        not yet agreed: Ju ende nuk jeni pajtuar me Kushtet e reja për Kontribues.
+        review link text: Ju lutemi që të përcillni këtë link për të lehtësinë tuaj për të rishikuar dhe pranuar Kuhstet e Kontribuesit.
       current email address: "Email adresa e tanishme:"
       delete image: Heke imazhin e tanishem
       email never displayed publicly: (asniher su kan publike)
@@ -505,6 +524,7 @@ sq:
       new email address: "Email adresa e re:"
       new image: Shto një imazh
       no home location: Ju se keni caktu venin e juj.
+      preferred editor: "Editor i parapëlqyer:"
       preferred languages: "Gjuhët e parapëlqyera:"
       profile description: "Pershkrimi i profilit:"
       public editing: 
@@ -529,16 +549,30 @@ sq:
       press confirm button: Shtypni butonin e mëposhtëm për të aktivizuar llogarinë tuaj.
       reconfirm: Nëse ka kaluar një kohë qysh prej se jeni abonuar ju mund të keni nevojë për t'i <a href="{{reconfirm}}">dërguar vetës një email të ri konfirmimi</a> .
       success: Akounti juaj u konfirmua, ju falemnderit per regjistrim!
+      unknown token: Ajo shenjë duket se nuk ekziston.
     confirm_email: 
       button: Konfirmo
       failure: Ni email adres tashma osht konfirmue me ket token.
       heading: Konfirmo ni ndryshim te email adreses
       press confirm button: Shtypni butonin e mëposhtëm për të konfirmuar e-mail adresën tuaj të re.
       success: Emaili juaj është konfirmuar, faleminderit që jeni regjistruar!
+    confirm_resend: 
+      failure: Përdoruesi {{name}} nuk u gjet.
+      success: Ne kemi dërguar një shënim konfrimimi tek {{email}} juaj dhe sapo të konfirmoni llogarnië ju do të jeni në gjendje të filloni punën me harta.<br /><br />Nëse ju përdorni një antispam sistem që dërgon kërkesat e konfirmimit atëherë ju lutem që të shtoni në listën e bardhë webmaster@openstreetmap.org pasi që ne nuk do të jemi në gjendje të përgjigjemi ndaj çfarëdo kërkese për konfirmim.
     filter: 
       not_an_administrator: Ju duhet te jeni administrator per me performu ket aksion.
     go_public: 
       flash success: Gjitha ndryshimet tuja janë publike tash, edhe tash t'lejohet me ndryshue
+    list: 
+      confirm: Konfirmo përdoruesit e zgjedhur
+      empty: Asnjë përdorues i përafërt nuk u gjet
+      heading: Përdorues
+      hide: Fshih përdoruesit e zgjedhur
+      showing: 
+        other: një=Faqe e shfaqur {{page}} ({{first_item}} e {{items}})
+      summary: "{{name}} krijuar nga {{ip_address}} më {{date}}"
+      summary_no_ip: "{{name}} krijuar më {{date}}"
+      title: Përdoruesit
     login: 
       account not active: Na vjen keq, akounti juej nuk asht hala aktiv<br /> Ju lutemi klikoni ne linkun e derguem ne email per me aktivizu akountin tuej.
       auth failure: Na vjen keq, smunem me ju kyc me ato detaje.
@@ -571,16 +605,18 @@ sq:
       confirm email address: "Konfirmo Adresen e Emailit:"
       confirm password: "Konfirmo fjalekalimin:"
       contact_webmaster: Ju lutna kontaktoni <a href="mailto:webmaster@openstreetmap.org">webmasterin</a> per me caktu ni akount qe te ju krijohet - na do te merremi me kerkesat sa ma shpejt qe tjet e mundshme.
+      continue: Vazhdo
       display name: "Emri i pamshem:"
       display name description: Emni jot publik. Ju muni me ndrry ne preferencat ma von.
       email address: "Email Adresa:"
       fill_form: Plotsoni formularin edhe na do t'ja dergojm ni email per me akivizu.
-      flash create success message: Llogaria është krijuar me sukses. Kontrolloni emailin tuaj për një shënim për konfirmim, dhe ju do të nisni të bëni harta shumë shpejt :-)<br /><br />Ju lutem kujtohuni se ju nuk do mund të hyni deri sa ta pranoni dhe konfirmoni email adresën tuaj.<br /><br />Nëse ju përdorni një sistem antispam atëherë sigurohuni që emaili webmaster@openstreetmap.org është në listën tuaj të bardh pasi që ne nuk jemi në gjendje të përgjigjemi në kërkesat e konfirmimit.
+      flash create success message: Faleminderit që jeni abonuar. Ne kemi dërguar një shënim konfirmimi në {{email}} tuaj dhe sapo ta konfirmoni llogarinë tuaj ju do të jeni në gjendje të filloni punën me hartat. <br /><br />Nëse ju përdorni një antispam sistem që dërgon kërkesat e konfirmimit atëherë ju lutem që të shtoni në listën e bardhë webmaster@openstreetmap.org pasi që ne nuk do të jemi në gjendje të përgjigjemi ndaj çfarëdo kërkese për konfirmim.
       heading: Krijo nje akount shfrytezimi
-      license_agreement: Tu kriju një llogari, ju pranoni krejtë të dhanat që i paraqiteni në projektin e OpenStreetMap-it kan me qenë në licensen <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.
+      license_agreement: Kur ju konfirmoni llogranië tuaj, ju duhet të pajtoheni me <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms"> kushtet e përdoruesit</a>.
       no_auto_account_create: Per momentin spo mujm me ju kriju akount automatikisht.
       not displayed publicly: Nuk u shfaq publikisht (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)
       password: "Fjalëkalimi:"
+      terms accepted: Faleminderit që keni pranuar kushtet e reja për kontribues!
       title: Krijo llogari
     no_such_user: 
       body: Na vje keq, ska shfrytzues me ket emen {{user}}. Ju lutmi kontrolloni shkrimin, ose nashta linku ku keni kliku asht gabim.
@@ -624,11 +660,12 @@ sq:
       blocks by me: bllokimet e dhana nga un
       blocks on me: bllokimet e mia
       confirm: Konfirmo
+      confirm_user: konfirmoje këtë përdorues
       create_block: blloko ket shfrytzues
       created from: "Krijuar nga:"
       deactivate_user: c'aktivizoje ket shfrytezues
-      delete_user: fshije ket shfrytzues
-      description: Pershkrimi
+      delete_user: fshije këtë përdoruesin
+      description: Përshkrimi
       diary: ditari
       edits: ndryshimet
       email address: "Email adresa:"
@@ -646,12 +683,21 @@ sq:
       new diary entry: hyrje e re ne ditar
       no friends: Hala nuk ke shtue asni shoq.
       no nearby users: Hala nuk ka shfrytezues qe pranon hartimin e aftert.
+      oauth settings: Konfigurimet oauth
       remove as friend: heke si shok
       role: 
         administrator: Ky përdorues është një administrator
+        grant: 
+          administrator: Mundëso qasje administratorit
+          moderator: Mundeso qasje për moderatorin
         moderator: Ky përdorues është një moderator
+        revoke: 
+          administrator: heq qasjen e administratorit
+          moderator: heq qasjen e moderatorit
       send message: dergo mesazh
       settings_link_text: ndryshimet
+      spam score: "Rezultati me Spam:"
+      status: "Statusi:"
       traces: gjurmet
       unhide_user: shfaqe ket shfrytzues
       user location: Veni i shfyrtezuesit
diff --git a/config/locales/sr-EC.yml b/config/locales/sr-EC.yml
index 3de83c545..7273a9461 100644
--- a/config/locales/sr-EC.yml
+++ b/config/locales/sr-EC.yml
@@ -1,7 +1,8 @@
-# Messages for Serbian Cyrillic ekavian (Српски (ћирилица))
+# Messages for Serbian Cyrillic ekavian (‪Српски (ћирилица)‬)
 # Exported from translatewiki.net
 # Export driver: syck
 # Author: Nikola Smolenski
+# Author: Rancher
 # Author: Sawa
 # Author: Жељко Тодоровић
 # Author: Милан Јелисавчић
@@ -10,7 +11,7 @@ sr-EC:
   activerecord: 
     attributes: 
       diary_comment: 
-        body: Тело
+        body: Текст
       diary_entry: 
         language: Језик
         latitude: Географска ширина
@@ -21,7 +22,7 @@ sr-EC:
         friend: Пријатељ
         user: Корисник
       message: 
-        body: Тело
+        body: Текст
         recipient: Прималац
         sender: Пошиљалац
         title: Наслов
@@ -141,7 +142,7 @@ sr-EC:
       edit: уреди
       node: Чвор
       node_title: "Чвор: {{node_name}}"
-      view_history: погледај историју
+      view_history: прикажи историјат
     node_details: 
       coordinates: "Координате:"
       part_of: "Део:"
@@ -150,7 +151,7 @@ sr-EC:
       download_xml: Преузми XML
       node_history: Историја чвора
       node_history_title: "Историја чвора: {{node_name}}"
-      view_details: погледај детаље
+      view_details: прикажи детаље
     not_found: 
       sorry: Нажалост, {{type}} са ИД-ом {{id}} не може бити пронађен.
       type: 
@@ -166,14 +167,14 @@ sr-EC:
       download_xml: Преузми XML
       relation: Однос
       relation_title: "Однос: {{relation_name}}"
-      view_history: погледај историју
+      view_history: прикажи историјат
     relation_details: 
       members: "Чланови:"
       part_of: "Део:"
     relation_history: 
       download: "{{download_xml_link}} или {{view_details_link}}"
       download_xml: Преузми XML
-      relation_history: Историја односа
+      relation_history: Историјат односа
       relation_history_title: "Историја односа: {{relation_name}}"
       view_details: види детаље
     relation_member: 
@@ -233,7 +234,7 @@ sr-EC:
       download: "{{download_xml_link}}, {{view_history_link}} или {{edit_link}}"
       download_xml: Преузми XML
       edit: уреди
-      view_history: погледај историју
+      view_history: прикажи историјат
       way: Путања
       way_title: "Путања: {{way_name}}"
     way_details: 
@@ -245,7 +246,7 @@ sr-EC:
     way_history: 
       download: "{{download_xml_link}} или {{view_details_link}}"
       download_xml: Преузми XML
-      view_details: погледај детаље
+      view_details: прикажи детаље
       way_history: Историја путање
       way_history_title: "Историја путање: {{way_name}}"
   changeset: 
@@ -264,7 +265,7 @@ sr-EC:
     changesets: 
       area: Област
       comment: Напомена
-      id: ИД
+      id: ID
       saved_at: Сачувано у
       user: Корисник
     list: 
@@ -297,12 +298,12 @@ sr-EC:
       posted_by: Поставио {{link_user}} у {{created}} на {{language_link}}
       reply_link: Одговорите на овај унос
     edit: 
-      body: "Тело:"
+      body: "Текст:"
       language: "Језик:"
       latitude: "Географска ширина:"
       location: "Локација:"
       longitude: "Географска дужина:"
-      save_button: Сними
+      save_button: Сачувај
       subject: "Тема:"
       title: Уреди дневнички унос
       use_map_link: користи мапу
@@ -331,7 +332,7 @@ sr-EC:
       leave_a_comment: Оставите коментар
       login: Пријави се
       login_to_leave_a_comment: "{{login_link}} да оставите коментар"
-      save_button: Сними
+      save_button: Сачувај
       title: "{{user}} дневник | {{title}}"
       user_title: Дневник корисника {{user}}
   export: 
@@ -393,7 +394,7 @@ sr-EC:
       zero: мање од километра
     results: 
       more_results: Још резултата
-      no_results: Нема резултата претраге
+      no_results: Нема резултата
     search: 
       title: 
         ca_postcode: Резултати од <a href="http://geocoder.ca/">Geocoder.ca</a>
@@ -722,7 +723,7 @@ sr-EC:
           guest_house: Гостинска кућа
           hostel: Хостел
           hotel: Хотел
-          information: Информације
+          information: Подаци
           motel: Мотел
           museum: Музеј
           picnic_site: Место за пикник
@@ -765,8 +766,7 @@ sr-EC:
     gps_traces: ГПС трагови
     gps_traces_tooltip: Управљање ГПС траговима
     help: Помоћ
-    help_and_wiki: "{{help}} и {{wiki}}"
-    history: Историја
+    history: Историјат
     home: мој дом
     home_tooltip: Иди на почетну локацију
     inbox: поруке ({{count}})
@@ -786,13 +786,10 @@ sr-EC:
     logo: 
       alt_text: OpenStreetMap лого
     logout: одјавите се
-    logout_tooltip: Одјави се
+    logout_tooltip: Одјави ме
     make_a_donation: 
       text: Донирајте
       title: Подржите OpenStreetMap новчаним прилогом
-    news_blog: Вести на блогу
-    shop: Продавница
-    shop_tooltip: пазарите у регистрованој OpenStreetMap продавници
     sign_up: региструјте се
     sign_up_tooltip: Направите налог како бисте уређивали мапе
     user_diaries: Кориснички дневници
@@ -823,7 +820,7 @@ sr-EC:
       outbox: послате
       people_mapping_nearby: маперима у вашој околини
       subject: Тема
-      title: Моје примљене поруке
+      title: Примљене
       you_have: Имате {{new_count}} нових порука и {{old_count}} старих порука
     mark: 
       as_read: Порука је означена као прочитана
@@ -835,7 +832,7 @@ sr-EC:
       unread_button: Означи као непрочитано
     new: 
       back_to_inbox: Назад на примљене
-      body: Тело
+      body: Текст
       message_sent: Порука је послата
       send_button: Пошаљи
       send_message_to: Пошаљи нову поруку {{name}}
@@ -850,7 +847,7 @@ sr-EC:
       title: Овде таквог нема
     outbox: 
       date: Датум
-      inbox: примљене поруке
+      inbox: примљене
       my_inbox: Моје {{inbox_link}}
       no_sent_messages: Тренутно немате послатих порука. Зашто не успоставите контакт са {{people_mapping_nearby_link}}?
       outbox: послате
@@ -937,7 +934,7 @@ sr-EC:
       register_new: Региструј своју апликацију
       revoke: Опозови!
     new: 
-      submit: Региструј
+      submit: Отвори налог
       title: Региструј нову апликацију
     not_found: 
       sorry: Жао нам је, {{type}} није могло бити пронађено.
@@ -1013,7 +1010,7 @@ sr-EC:
     search: 
       search: Претрага
       search_help: "примери: 'Берлин', 'Војводе Степе, Београд', 'CB2 5AQ' <a href='http://wiki.openstreetmap.org/wiki/Search'>још примера...</a>"
-      submit_text: Иди
+      submit_text: Пређи
       where_am_i: Где сам?
       where_am_i_title: Установите тренутну локацију помоћу претраживача
     sidebar: 
@@ -1032,7 +1029,7 @@ sr-EC:
       description: "Опис:"
       download: преузми
       edit: уреди
-      filename: "Име фајла:"
+      filename: "Назив датотеке:"
       heading: Уређивање трага {{name}}
       map: мапа
       owner: "Власник:"
@@ -1042,7 +1039,7 @@ sr-EC:
       tags: "Ознаке:"
       tags_help: раздвојене зарезима
       title: Мењање трага {{name}}
-      uploaded_at: "Послато:"
+      uploaded_at: "Отпремљено:"
       visibility: "Видљивост:"
       visibility_help: шта ово значи?
     list: 
@@ -1064,7 +1061,7 @@ sr-EC:
       edit_map: Уреди мапу
       in: у
       map: мапа
-      more: још
+      more: више
       pending: НА_ЧЕКАЊУ
       private: ПРИВАТНО
       public: ЈАВНО
@@ -1075,7 +1072,7 @@ sr-EC:
       help: Помоћ
       tags: Ознаке
       tags_help: раздвојене зарезима
-      upload_button: Пошаљи
+      upload_button: Отпреми
       upload_gpx: Пошаљи GPX фајл
       visibility: Видљивост
       visibility_help: Шта ово значи?
@@ -1097,7 +1094,7 @@ sr-EC:
       download: преузми
       edit: уреди
       edit_track: Уреди ову стазу
-      filename: "Име фајла:"
+      filename: "Назив датотеке:"
       heading: Преглед трага {{name}}
       map: мапа
       none: Нема
@@ -1108,7 +1105,7 @@ sr-EC:
       tags: "Ознаке:"
       title: Преглед трага {{name}}
       trace_not_found: Траг није пронађен!
-      uploaded: "Послато:"
+      uploaded: "Отпремљено:"
       visibility: "Видљивост:"
     visibility: 
       identifiable: Омогућавају препознавање (приказани у списку трагова и као јавне, поређане и датиране тачке)
@@ -1136,7 +1133,7 @@ sr-EC:
       longitude: "Географска дужина:"
       make edits public button: Нека све моје измене буду јавне
       my settings: Моја подешавања
-      new email address: "Нова адреса е-поште:"
+      new email address: "Нова е-адреса:"
       new image: Додајте вашу слику
       no home location: Нисте унели ваше место становања.
       preferred languages: "Подразумевани језици:"
@@ -1168,20 +1165,20 @@ sr-EC:
       account not active: Извињавамо се, ваш налог још није активиран. <br />Молимо пратите везу у е-мејлу за потврду налога како бисте га активирали.
       create_account: направите налог
       email or username: "Адреса е-поште или корисничко име:"
-      heading: Пријављивање
+      heading: Пријава
       login_button: Пријавите се
-      lost password link: Изгубили сте лозинку?
+      lost password link: Заборавили сте лозинку?
       notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Сазнајте више о предстојећој OpenStreetMap промени лиценце</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">преводи</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">дискусије</a>)
       password: "Лозинка:"
       please login: Молимо пријавите се или {{create_user_link}}.
       remember: "Запамти ме:"
-      title: Пријављивање
+      title: Пријава
       webmaster: администратор
     logout: 
-      logout_button: Одјави се
-      title: Одјави се
+      logout_button: Одјави ме
+      title: Одјави ме
     lost_password: 
-      email address: "Адреса е-поште:"
+      email address: "Е-адреса:"
       heading: Заборављена лозинка?
       help_text: Унесите адресу е-поште коју сте користили за пријављивање, и на њу ћемо вам послати везу коју можете кликнути како бисте ресетовали лозинку.
       new password button: Обнови лозинку
@@ -1189,12 +1186,12 @@ sr-EC:
     make_friend: 
       success: "{{name}} је постао ваш пријатељ."
     new: 
-      confirm email address: "Потврдите адресу е-поште:"
+      confirm email address: "Потврдите е-адресу:"
       confirm password: "Потврдите лозинку:"
       continue: Настави
       display name: "Приказано име:"
       display name description: Име вашег корисничког налога. Можете га касније променити у подешавањима.
-      email address: "Адреса е-поште:"
+      email address: "Е-адреса:"
       fill_form: Попуните упитник и убрзо ћемо вам послати мејл како бисте активирали налог.
       heading: Направите кориснички налог
       license_agreement: Креирањем налога, прихватате услове да сви подаци које шаљете на Openstreetmap пројекат буду (неискључиво) лиценциран под <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.sr">овом Creative Commons лиценцом (by-sa)</a>.
@@ -1241,7 +1238,7 @@ sr-EC:
       description: Опис
       diary: дневник
       edits: измене
-      email address: "Адреса е-поште:"
+      email address: "Е-адреса:"
       km away: "{{count}}km далеко"
       m away: "{{count}}m далеко"
       mapper since: "Мапер од:"
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 445d669f5..a324ecfb9 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -461,16 +461,20 @@ sv:
           waste_basket: Papperskorg
           youth_centre: Ungdomscenter
         building: 
+          apartments: Flerfamiljshus
           chapel: Kapell
           church: Kyrka
+          flats: Lägenheter
           garage: Garage
           hospital: Sjukhusbyggnad
           hotel: Hotell
           house: Hus
+          industrial: Industribyggnad
           office: Kontorsbyggnad
           school: Skolbyggnad
           shop: Affär
           terrace: Terass
+          tower: Torn
           train_station: Järnvägsstation
         highway: 
           bridleway: Ridstig
@@ -515,6 +519,7 @@ sv:
           military: Militärområde
           mine: Gruva
           park: Park
+          quarry: Stenbrott
           residential: Bostadsområde
           vineyard: Vingård
         leisure: 
@@ -622,11 +627,15 @@ sv:
           bicycle: Cykelaffär
           books: Bokhandel
           butcher: Slaktare
+          car: Bilhandlare
           car_dealer: Bilförsäljare
           car_parts: Bildelar
           car_repair: Bilverkstad
+          carpet: Mattaffär
+          chemist: Apotek
           computer: Datorbutik
           convenience: Närköp
+          drugstore: Apotek
           dry_cleaning: Kemtvätt
           florist: Blommor
           food: Mataffär
@@ -690,13 +699,17 @@ sv:
       history_tooltip: Visa ändringar för detta område
       history_zoom_alert: Du måste zooma in för att kunna se karteringshistorik.
   layouts: 
+    documentation_title: Projektdokumentation
     donate: Donera till OpenStreetMap via {{link}} till hårdvaruuppgraderingsfonden.
     donate_link_text: donera
     edit: Redigera
     export: Exportera
     export_tooltip: Exportera kartdata som bild eller rådata
+    foundation_title: OpenStreetMap stiftelsen
     gps_traces: GPS-spår
     gps_traces_tooltip: Visa, ladda upp och ändra GPS-spår.
+    help: Hjälp
+    help_centre: Hjälpcentral
     history: Historik
     home: hem
     home_tooltip: Gå till hempositionen
@@ -707,7 +720,8 @@ sv:
       zero: Du har inga olästa meddelanden.
     intro_1: Openstreetmap är en fri redigeringsbar karta av hela världen, den görs av folk precis som du.
     intro_2: Openstreetmap låter dig i samarbete med andra visa, ändra på och använda geografisk data från hela världen.
-    intro_3: OpenStreetMap får serverplats av {{ucl}} och {{bytemark}}.
+    intro_3: OpenStreetMaps serverplats stöds av {{ucl}} och {{bytemark}}. Andra som stödjer projektet listas i {{partners}}.
+    intro_3_partners: wiki
     license: 
       title: Openstreetmap datat licensieras som Creative Commons Attribution-Share Alike 2.0 Generic License.
     log_in: logga in
@@ -719,12 +733,8 @@ sv:
     make_a_donation: 
       text: Donera
       title: Stöd OpenStreetMap med en monetär donation
-    news_blog: Nyhetsblogg
-    news_blog_tooltip: Blogg om OpenStreetMap, fri geografiska data osv.
     osm_offline: OpenStreetMap-databasen är inte tillgänglig just nu, då databasunderhåll pågår.
     osm_read_only: Det går bara att läsa från OpenStreetMap-databasen just nu, då viktigt underhåll utförs på databasen.
-    shop: Butik
-    shop_tooltip: Affär med Openstreetmap loggan på alla grejer
     sign_up: registrera
     sign_up_tooltip: Skapa ett konto för kartering
     tag_line: Den fria wiki-världskartan
@@ -734,6 +744,7 @@ sv:
     view_tooltip: Visa kartorna
     welcome_user: Välkommen {{user_link}}
     welcome_user_link_tooltip: Din användarsida
+    wiki: Wiki
   license_page: 
     foreign: 
       english_link: det engelska originalet
@@ -768,6 +779,10 @@ sv:
       send_message_to: Skicka nytt meddelande till {{name}}
       subject: Ärende
       title: Skicka meddelande
+    no_such_message: 
+      body: Det finns inget meddelande med det ID-et.
+      heading: Inget sådant meddelande
+      title: Inget sådant meddelande
     no_such_user: 
       body: Det finns ingen användare eller meddelande med that namnet eller id't
       heading: Ingen sådan användare eller meddelande
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 636677969..11cf51875 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -3,6 +3,8 @@
 # Export driver: syck
 # Author: Alerque
 # Author: Katpatuka
+# Author: SalihB
+# Author: Szoszv
 tr: 
   activerecord: 
     attributes: 
@@ -39,6 +41,8 @@ tr:
       language: Dil
       message: Mesaj
       user: Kullanıcı
+      way: Yol
+      way_node: Yol Noktası
   browse: 
     changeset: 
       changeset: "Değişiklik takımı: {{id}}"
@@ -47,6 +51,7 @@ tr:
       feed: 
         title: Değişiklik takımı {{id}}
         title_comment: Değişiklik takımı {{id}} - {{comment}}
+      osmchangexml: osmChange XML
       title: Değişiklik takımı
     changeset_details: 
       belongs_to: "Ait olduğu değişiklik takımı:"
@@ -61,11 +66,15 @@ tr:
       edited_by: "Düzenleyen:"
       in_changeset: "Değişiklik takımı içinde:"
       version: "Sürüm:"
+    containing_relation: 
+      entry: İlişki {{relation_name}}
+      entry_role: İlişki {{relation_name}} ({{relation_role}} olarak)
     map: 
       deleted: Silindi
       larger: 
         area: Alanı büyük haritada görüntüle
         node: Noktayı büyük haritada görüntüle
+        relation: İlişki büyük haritada görüntüle
         way: Yolu büyük haritada görüntüle
       loading: Yükleniyor...
     navigation: 
@@ -78,6 +87,10 @@ tr:
         prev_node_tooltip: Önceki nokta
         prev_relation_tooltip: Önceki ilişki
         prev_way_tooltip: Önceki yol
+      user: 
+        name_changeset_tooltip: "{{user}} tarafından düzenlemeleri görüntüle"
+        next_changeset_tooltip: "{{user}} tarafından sonraki düzenleme"
+        prev_changeset_tooltip: "{{user}} tarafından önceki düzenleme"
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} veya {{edit_link}}"
       download_xml: XML İndir
@@ -89,6 +102,7 @@ tr:
       coordinates: "Koordinatları:"
       part_of: "Ortak parça:"
     node_history: 
+      download: "{{download_xml_link}} veya {{view_details_link}}"
       download_xml: XML indir
       node_history: Nokta Geçmişi
       node_history_title: "Nokta geçmişi: {{node_name}}"
@@ -157,10 +171,10 @@ tr:
       wait: Bekleyin...
       zoom_or_select: Yakınlaştır ya da haritada bir alan seç
     tag_details: 
-      tags: "Etiketler:"
+      tags: "Parametreler:"
       wiki_link: 
-        key: "{{key}} etiketi için Viki açıklaması"
-        tag: "{{key}}={{value}} etiketi için Viki açıklaması"
+        key: "{{key}} parametresi için Viki açıklaması"
+        tag: "{{key}}={{value}} parametresi için Viki açıklaması"
       wikipedia_link: "{{page}} hakkında Vikipedi maddesi"
     timeout: 
       type: 
@@ -244,6 +258,7 @@ tr:
       use_map_link: Haritayı kullanarak belirt
     feed: 
       all: 
+        description: OpenStreetMap kullanıcıların en son günlük kayıtları
         title: OpenStreetMap günlük girdileri
       language: 
         description: Kullanıcıların {{language_name}} dillindeki en son günlük girdileri
@@ -276,24 +291,24 @@ tr:
       user_title: "{{user}} (Günlük)"
   editor: 
     default: Varsayılan (kullanılan {{name}})
-    josm: 
-      description: JOSM (uzaktan kumanda eklentisi kullanarak)
-      name: JOSM
     potlatch: 
       description: Potlatch 1 (flash tarayıcı düzenleyici, eski)
       name: Potlatch 1
     potlatch2: 
       description: Potlatch 2 (flash tarayıcı düzenleyici, yeni)
       name: Potlatch 2
+    remote: 
+      description: Uzaktan Kumanda (JOSM veya Merkaartor)
+      name: Uzaktan Kumanda
   export: 
     start: 
       add_marker: Haritaya bir işaret ekle
-      area_to_export: Dışalım alanı
+      area_to_export: Çıkartılacak alan
       embeddable_html: Gömülebilir HTML
-      export_button: Dışalım
+      export_button: Çıkart
       export_details: OpenStreetMap veri, <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 lisansı</a> altında lisanslanmıştır.
       format: Biçim
-      format_to_export: Dışalım biçimi
+      format_to_export: Çıkartma biçimi
       image_size: Resim Boyutu
       latitude: "Enlem:"
       licence: Lisans
@@ -305,7 +320,7 @@ tr:
       osm_xml_data: OpenStreetMap XML Veri
       osmarender_image: Osmarender resim
       output: Çıktı
-      paste_html: Aşağıdaki HTML kopyalayıp websitesinde yapıştırabilirsin
+      paste_html: Yukarıdaki HTML kodu kopyalayıp websitesinde yapıştırabilir
       scale: Ölçek
       too_large: 
         body: Bu alan OpenStreetMap XML verisi olarak verilmesine kadar büyüktür. Lütfen yakınlaştır veya daha küçük bir alan seç.
@@ -316,7 +331,7 @@ tr:
       change_marker: İşaretinin konumu değiştir
       click_add_marker: İşareti eklemek için harita üzerine tıklayınız
       drag_a_box: Fare kullanarak harita üzerinde bir alan seç
-      export: Dışalım
+      export: Çıkart
       manually_select: Fare kullanarak farklı bir alan seç
       view_larger_map: Haritayı daha büyük göster
   geocoder: 
@@ -455,10 +470,12 @@ tr:
           hotel: Hotel
           house: Ev
           industrial: Sınai Bina
+          public: Kamu Binası
           school: Okul Binası
           shop: Dükkan
           stadium: Stadyum
           store: Mağaza
+          terrace: Teras
           tower: Kule
           train_station: Gar
           university: Üniversite Binası
@@ -502,12 +519,48 @@ tr:
           unclassified: Sınıflandırılmamış yolu
           unsurfaced: Ham yolu
         historic: 
+          archaeological_site: Arkeolojik Alan
           battlefield: Savaş alanı
+          boundary_stone: Sınır Taşı
+          building: Bina
+          castle: Kale
           church: Kilise
+          house: Tarihi Konak
           icon: Simge
+          memorial: Anıt
+          mine: Maden Ocağı
+          monument: Anıt
+          museum: Müze
           ruins: Harabe
           tower: Kule
           wreck: Batık Gemi
+        landuse: 
+          allotments: Bostan
+          cemetery: Mezarlık
+          commercial: Ticari Bölge
+          construction: İnşaat
+          farm: Çiftlik
+          farmland: Tarım arazisi
+          farmyard: Çiftlik avlusu
+          forest: Orman
+          grass: Çim
+          industrial: Sanayi
+          meadow: Çayır
+          military: Askeri Bölge
+          mine: Maden Ocağı
+          mountain: Dağ
+          nature_reserve: Doğa Koruma Alanı
+          park: Park
+          plaza: Meydan
+          quarry: Ocak
+          railway: Demiryolu
+          recreation_ground: Eğlence Parkı
+          reservoir: Baraj Gölü
+          residential: Yerleşim Bölgesi
+          retail: Esnaf
+          vineyard: Bağ
+          wetland: Sulak Alan
+          wood: Orman
         leisure: 
           beach_resort: Plajlı tatilköyü
           fishing: Balıkçılık alanı
@@ -605,12 +658,22 @@ tr:
           tram_stop: Tramvay Durağı
         shop: 
           alcohol: Tekel bayii
+          bakery: Fırın
+          bicycle: Bisikletçi
           books: Kitap Evi
           butcher: Kasap
           car_repair: Oto tamir
           carpet: Halı Dükkanı
+          clothes: Giysi Dükkanı
+          estate_agent: Emlakçı
           gift: Hediye eşya
+          greengrocer: Manav
+          hairdresser: Kuaför
+          insurance: Sigorta
+          jewelry: Kuyumcu
           market: Market
+          mobile_phone: Cep Telefonu Dükkanı
+          shoes: Ayakkabı Dükkanı
           shopping_centre: Alışveriş Merkezi
           supermarket: Süpermarket
           travel_agency: Seyahat Acentası
@@ -637,6 +700,14 @@ tr:
           zoo: Hayvanat bahçesi
         waterway: 
           canal: Kanal
+          dam: Baraj
+          drain: Atık su kanalı
+          mineral_spring: Maden Suyu
+          river: Nehir
+          riverbank: Irmak kenarı
+          stream: Çay
+          wadi: Vadi
+          waterfall: Şelale
   javascripts: 
     map: 
       base: 
@@ -644,25 +715,37 @@ tr:
         noname: Arkaplan Boş
     site: 
       edit_disabled_tooltip: Harita düzenlemek için yakınlaştırmak gerek
+      edit_tooltip: Haritayı düzenle
       edit_zoom_alert: Harita düzenleyebilmek için yakınlaştırman gerek
   layouts: 
+    community_blogs: Üye Blogları
+    community_blogs_title: OpenStreetMap üyelerinin blogları
     copyright: Telif hakkı & Lisans
+    documentation: Viki Belgelenmesi
+    documentation_title: Harita Projesinin Belgeleme Sistemi
     donate: OpenStreetMap {{link}} ile Donanım Yükseltme Fonu'na destek veriniz.
     donate_link_text: Bağış
     edit: Düzenle
     edit_with: "{{editor}} kullanarak düzenle"
     export: Dışalım
     export_tooltip: Harita verisinin dışalımı
+    foundation: Vakıf
+    foundation_title: OpenStreetMap Vakfı
     gps_traces: GPS İzleri
     gps_traces_tooltip: GPS izleri yönet
     help: Yardım
+    help_centre: Yardım & Soru Bankası
     help_title: Projenin yardım sayfaları
     history: Geçmiş
-    home: Konum
+    home: konum
     home_tooltip: Kendin konuma git
-    inbox: gelen kutusu ({{count}})
+    inbox: mesajlar ({{count}})
+    inbox_tooltip: 
+      one: Bir tane okunmamış mesajın var
+      other: "{{count}} okunmamış mesaj var"
+      zero: Okunmamış mesajın yok
     intro_1: OpenStreetMap herkese serbest ve ücretsiz senin gibi insanlar tarafından oluşturduğu bir dünya haritasıdır.
-    intro_2: OpenStreetMap dünyanın her köşesinden ortak bir şekilde hariatları görüntülemek, düzenlemek ve serbest kullanmak sağlar.
+    intro_2: OpenStreetMap dünyanın her köşesinden ortak bir şekilde haritaları görüntülemeyi, düzenlemeyi ve serbestçe kullanmayı sağlar.
     intro_3: OpenStreetMap barındırma servisleri {{ucl}} ve {{bytemark}} çok teşekkür ederiz. Diğer destekçilerimizi {{partners}} listesinde bulunmaktadır.
     intro_3_bytemark: bytemark
     intro_3_partners: Viki
@@ -672,25 +755,26 @@ tr:
     log_in: Oturum aç
     logo: 
       alt_text: OpenStreetMap logosu
-    logout: Çıkış
+    logout: çıkış
+    logout_tooltip: Oturumu kapat
     make_a_donation: 
       text: Bir bağışta bulunun
       title: OpenStreetMap para bağışı ile destek verebilirsiniz
-    news_blog: Haber Blogu
-    news_blog_tooltip: OpenStreetMap hakkında haberler, serbest kullanımda coğrafi veriler, v.b.
-    shop: Dükkan
-    shop_tooltip: OpenStreetMap markalı ürünleri
     sign_up: Kaydol
     sign_up_tooltip: Düzenleme moduna girmek için bir hesap oluştur
-    tag_line: Serbest Viki Dünya Haritası
-    user_diaries: Günlükler
-    view: Görüntüle
+    tag_line: Özgür bir Viki Dünya Haritası
+    user_diaries: Günlük
+    user_diaries_tooltip: Kullanıcı günlükleri görüntüle
+    view: Harita
     view_tooltip: Haritayı göster
-    welcome_user: Hoşgeldin, {{user_link}}
+    welcome_user: Merhaba, {{user_link}}
     welcome_user_link_tooltip: Senin kullanıcı sayfan
     wiki: Viki
     wiki_title: Projenin viki sayfaları
   license_page: 
+    foreign: 
+      english_link: İngilizce orijinal
+      title: Bu çeviri hakkında
     native: 
       mapping_link: harita çizmeye başla
       native_link: THIS_LANGUAGE_NAME_HERE sürümü
@@ -767,6 +851,8 @@ tr:
       greeting: Merhaba,
       success: 
         subject: "[OpenStreetMap] GPX dosyası başarıyla alındı"
+    lost_password: 
+      subject: "[OpenStreetMap] Şifre sıfırlama isteği"
     lost_password_html: 
       greeting: Merhaba,
     lost_password_plain: 
@@ -792,9 +878,10 @@ tr:
       license: 
         project_name: OpenStreetMap projesi
       permalink: Kalıcı Bağlantı
-      shortlink: Kıpkısa Bağlantı
+      shortlink: Kısa Bağlantı
     key: 
-      map_key_tooltip: Haritanın lejant
+      map_key: Harita Anahtarı (Lejant)
+      map_key_tooltip: Haritanın anahtarı
       table: 
         entry: 
           admin: İdari sınırı
@@ -802,6 +889,7 @@ tr:
           apron: 
             - Havaalanı apronu
             - terminal
+          bridge: Siyah kenar = köprü
           bridleway: Binici yolu
           brownfield: Nadas
           building: Önemli yapı
@@ -812,10 +900,15 @@ tr:
           cemetery: Mezarlık
           centre: Spor merkezi
           commercial: Ticari bölge
+          common: 
+            - Çimen
+            - çayır
+          construction: yapım aşamasında yolu
           cycleway: Bisiklet yolu
           farm: Çiftlik
           footway: Yaya yolu
           forest: Orman
+          golf: Golf sahası
           heathland: Fundalık
           industrial: Sanayi bölgesi
           lake: 
@@ -844,16 +937,20 @@ tr:
             - Zirve
             - Dağ
           tourist: Turistik yer
+          track: Toprak yolu
           tram: 
             - Dar raylı demiryolu
             - tramvay
           trunk: Bölünmüş anayol
+          tunnel: çizgili kenar = tünel
+          unclassified: Sınıflandırılmamış yol
+          unsurfaced: Ham yolu
           wood: Orman
     search: 
       search: Ara
       search_help: "örneğin: 'demirkazık', 'istiklal caddesi, istanbul', '50500', veya 'post office near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>daha fazla örnek...</a>"
       submit_text: Git
-      where_am_i: Neredeyim ben?
+      where_am_i: Ben neredeyim?
       where_am_i_title: Arama motoru kullanarak geçerli konumunu tanımlar
     sidebar: 
       close: Kapat
@@ -878,6 +975,7 @@ tr:
       start_coord: "Başlangıç koordinat:"
       tags: "Etiketler:"
       tags_help: virgülle ayrılmış
+      title: "{{name}} izisi düzenleniyor"
       uploaded_at: "Gönderme tarihi:"
       visibility: Görünürlük
       visibility_help: Bu ne demek?
@@ -897,11 +995,12 @@ tr:
       edit: değiştir
       edit_map: Haritayı Düzenle
       identifiable: TANIMLANABİLİR
-      in: içinde
+      in: "etiketler:"
       map: harita
-      more: daha fazla
+      more: ayrıntı
       pending: BEKLEMEDE
       private: ÖZEL
+      public: KAMU
       trace_details: İz Ayrıntılarını Görüntüle
       view_map: Harita Görüntüle
     trace_form: 
@@ -992,16 +1091,21 @@ tr:
       title: Kullanıcılar
     login: 
       account not active: Üzgünüz, hesabınız henüz aktif değil.<br />Lütfen aldığın onaylama e-postasında ki bağlantı tıkla veya <a href="{{reconfirm}}">yeni bir onaylama e-posta</a> iste.
+      already have: Zaten bir OpenStreetMap hesabın var mı? O zaman giriş yapabilirsin...
       auth failure: Üzgünüz, bu giriş ile oturum açılamadı.
+      create account minute: Bir hesap oluştur. Bir dakika bile sürmez.
       create_account: Kayıt ol
       email or username: "E-posta Adresi veya Kullanıcı Adı:"
       heading: Giriş
       login_button: Gir
       lost password link: Şifren mi unuttun?
+      new to osm: OpenStreetMap sitesinde yeni misiniz?
       password: "Şifre:"
       please login: Lütfen giriş yap veya {{create_user_link}}.
+      register now: Şimdi kayıt ol
       remember: "Beni hatırla:"
       title: Giriş
+      to make changes: OpenStreetMap verileri değiştirmek için bir hesabın olması gerekir.
     logout: 
       heading: OpenStreetMap'den çıkış
       logout_button: Çıkış
@@ -1037,7 +1141,7 @@ tr:
     reset_password: 
       confirm password: "Sifre Onayla:"
       flash changed: Şifren başarıyla değiştirildi.
-      heading: "{{Kullanıcı}} için şifresini sıfırla"
+      heading: "{{user}} için şifre sıfırla"
       password: "Şifre:"
       reset: Şifre Sıfırla
       title: Şifreyi sıfırla
@@ -1077,7 +1181,7 @@ tr:
       my edits: katkılarım
       my settings: tercihlerim
       my traces: GPS izlerim
-      nearby users: Yakın çevredeki başka kullanıcılar
+      nearby users: Yakın çevrede bulunan kullanıcılar
       new diary entry: yeni kayıt
       no friends: Henüz herhangi bir arkadaş eklemediniz.
       no nearby users: Yakın çevredeki herhangi başka kullanıcı henüz yok.
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 7b3071703..72631227c 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -361,15 +361,15 @@ uk:
       user_title: Щоденник користувача {{user}}
   editor: 
     default: Типовий (зараз {{name}})
-    josm: 
-      description: JOSM (через плагін дистанційного керування)
-      name: JOSM
     potlatch: 
       description: Потлач 1 (редактор в оглядачі)
       name: Потлач 1
     potlatch2: 
       description: Потлач 2 (редактор в оглядачі)
       name: Потлач 2
+    remote: 
+      description: Дистанційне керування (JOSM або Merkaartor)
+      name: Дистанційне керування
   export: 
     start: 
       add_marker: Додати маркер на мапу
@@ -893,17 +893,23 @@ uk:
       history_tooltip: Перегляд правок для цієї ділянки
       history_zoom_alert: Потрібно збільшити масштаб мапи, щоб побачити історію правок
   layouts: 
+    community_blogs: Блоги спільноти
+    community_blogs_title: Блоги членів спільноти OpenStreetMap
     copyright: Авторські права &amp; Ліцензія
+    documentation: Документація
+    documentation_title: Документація проекту
     donate: Підтримайте OpenStreetMap {{link}} у фонді оновлення обладнання.
     donate_link_text: пожертвування
     edit: Правка
     edit_with: Правити у {{editor}}
     export: Експорт
     export_tooltip: Експортувати картографічні дані
+    foundation: Фонд
+    foundation_title: Фонд OpenStreetMap
     gps_traces: GPS-треки
     gps_traces_tooltip: Управління GPS треками
     help: Довідка
-    help_and_wiki: "{{help}} та {{wiki}}"
+    help_centre: Довідковий центр
     help_title: Питання та відповіді
     history: Історія
     home: додому
@@ -931,12 +937,8 @@ uk:
     make_a_donation: 
       text: Підтримайте проект
       title: Підтримайте OpenStreetMap грошима
-    news_blog: Блог новин
-    news_blog_tooltip: Блог новин OpenStreetMap, вільні гео-дані та т.і.
     osm_offline: База даних OpenStreetMap в даний момент не доступна, так як проводиться необхідне технічне обслуговування.
     osm_read_only: База даних OpenStreetMap в даний момент доступна тільки для читання, тому що проводиться необхідне технічне обслуговування.
-    shop: Магазин
-    shop_tooltip: Магазин з фірмовою символікою OpenStreetMap
     sign_up: реєстрація
     sign_up_tooltip: Створити обліковий запис для редагування
     tag_line: Вільна Вікі-мапа Світу
@@ -1184,10 +1186,10 @@ uk:
       no_iframe_support: Ваш оглядач не підтримує фрейми HTML, які необхідні для цієї функції.
       not_public: Ви не зробили свої правки загальнодоступними.
       not_public_description: "Ви не можете більше анонімно редагувати мапу. Ви можете зробити ваші редагування загальнодоступними тут: {{user_page}}."
+      potlatch2_unsaved_changes: Ви маєте незбережені зміни. (Для збереження в Потлач 2, ви повинні натиснути Зберегти.)
       potlatch_unsaved_changes: Є незбережені зміни. (Для збереження в Potlatch зніміть виділення з колії або точки, якщо редагуєте «вживу», або натисніть кнопку «зберегти», якщо ви в режимі відкладеного збереження.)
       user_page_link: сторінка користувача
     index: 
-      josm_failed: Редагування не вдалося — переконайтеся, що JOSM завантажений та втулок дистанційного керування увімкнений.
       js_1: Ви користуєтесь оглядачем, в якому не підтримується або відключений JavaScript.
       js_2: OpenStreetMap використовує JavaScript для мапи.
       js_3: Ви можете спробувати <a href "http://tah.openstreetmap.org/Browse/">статичну мапу від Tiles@Home</a>, якщо ви не в змозі включити JavaScript.
@@ -1196,6 +1198,7 @@ uk:
         notice: Ліцензовано на умовах {{license_name}} проектом  {{project_name}} та його користувачами.
         project_name: OpenStreetMap
       permalink: Постійне посилання
+      remote_failed: Редагування не вдалося — переконайтеся, що JOSM або Merkaartor завантажений та втулок дистанційного керування увімкнений.
       shortlink: Коротке посилання
     key: 
       map_key: Умовні знаки
@@ -1459,17 +1462,22 @@ uk:
     login: 
       account not active: Вибачте, ваш обліковий запис ще не активовано. <br /> Щоб його активувати, будь ласка, перевірте вашу поштову скриньку та натисніть на посилання в листі з проханням про підтвердження, або <a href="{{reconfirm}}"> запросіть нове підтвердження по електронній пошті</a>.
       account suspended: На жаль, ваш обліковий запис був заблокований через підозрілу діяльність. <br />Будь ласка, зв'яжіться з {{webmaster}}, якщо ви хочете обговорити це.
+      already have: Вже маєте обліковий запис OpenStreetMap? Будь ласка, Увійдіть.
       auth failure: Вибачте, вхід з цими ім'ям або паролем неможливий.
+      create account minute: Створити обліковий запис. Це займе всього хвилину.
       create_account: зареєструйтесь
       email or username: "Ел. пошта або ім'я користувача:"
       heading: Представтесь
       login_button: Увійти
       lost password link: Забули пароль?
+      new to osm: Вперше на OpenStreetMap?
       notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Дізнайтеся більше про майбутні зміни ліцензії OpenStreetMap</a> ( <a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">переклади</a> ) ( <a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">обговорення</a> )
       password: "Пароль:"
       please login: Будь ласка, представтесь або {{create_user_link}}.
+      register now: Зареєструйтеся зараз
       remember: "Запам'ятати мене:"
       title: Представтесь
+      to make changes: Щоб вносити зміни до даних OpenStreetMap, ви повинні мати обліковий запис.
       webmaster: веб-майстер
     logout: 
       heading: Вийти з OpenStreetMap
@@ -1563,6 +1571,7 @@ uk:
       hide_user: приховати цього користувача
       if set location: Якщо ви вкажете своє місце розташування, мапа і додаткові інструменти з'являться нижче. Ви можете встановити ваше місце розташування на вашій сторінці {{settings_link}}.
       km away: "{{count}} км від вас"
+      latest edit: "Остання правка {{ago}}:"
       m away: "{{count}} м від вас"
       mapper since: "Зареєстрований:"
       moderator_history: створені блокування
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 30d8ad3d3..b7a7773ab 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -352,15 +352,15 @@ vi:
       user_title: Nhật ký của {{user}}
   editor: 
     default: Mặc định (hiện là {{name}})
-    josm: 
-      description: JOSM (qua phần bổ trợ điều khiển từ xa)
-      name: JOSM
     potlatch: 
       description: Potlatch 1 (trình vẽ trong trình duyệt)
       name: Potlatch 1
     potlatch2: 
       description: Potlatch 2 (trình vẽ trong trình duyệt)
       name: Potlatch 2
+    remote: 
+      description: phần điều khiển từ xa (JOSM hoặc Merkaartor)
+      name: phần điều khiển từ xa
   export: 
     start: 
       add_marker: Đánh dấu vào bản đồ
@@ -447,6 +447,7 @@ vi:
           bench: Ghế
           bicycle_parking: Chỗ Đậu Xe đạp
           bicycle_rental: Chỗ Mướn Xe đạp
+          brothel: Nhà chứa
           bureau_de_change: Tiệm Đổi tiền
           bus_station: Trạm Xe buýt
           cafe: Quán Cà phê
@@ -455,6 +456,7 @@ vi:
           car_wash: Tiệm Rửa Xe
           casino: Sòng bạc
           cinema: Rạp phim
+          clinic: Phòng khám
           club: Câu lạc bộ
           college: Trường Cao đẳng
           community_centre: Trung tâm Cộng đồng
@@ -529,6 +531,7 @@ vi:
           house: Nhà ở
           industrial: Tòa nhà Công nghiệp
           office: Tòa nhà Văn phòng
+          public: Tòa nhà Công cộng
           residential: Nhà ở
           school: Nhà trường
           shop: Tiệm
@@ -547,6 +550,7 @@ vi:
           cycleway: Đường Xe đạp
           distance_marker: Cây số
           footway: Đường bộ
+          ford: Khúc Sông Cạn
           gate: Cổng
           living_street: Đường Hàng xóm
           minor: Đường Nhỏ
@@ -592,6 +596,7 @@ vi:
           tower: Tháp
           wayside_cross: Thánh Giá Dọc đường
           wayside_shrine: Đền thánh Dọc đường
+          wreck: Xác Tàu Đắm
         landuse: 
           allotments: Khu Vườn Gia đình
           basin: Lưu vực
@@ -625,6 +630,7 @@ vi:
           wood: Rừng
         leisure: 
           beach_resort: Khu Nghỉ mát Ven biển
+          common: Đất Công
           fishing: Hồ Đánh cá
           garden: Vườn
           golf_course: Sân Golf
@@ -636,9 +642,11 @@ vi:
           pitch: Bãi Thể thao
           playground: Sân chơi
           recreation_ground: Sân Giải trí
+          slipway: Bến tàu
           sports_centre: Trung tâm Thể thao
           stadium: Sân vận động
           swimming_pool: Hồ Bơi
+          track: Đường Chạy
           water_park: Công viên Nước
         natural: 
           bay: Vịnh
@@ -649,6 +657,7 @@ vi:
           cliff: Vách đá
           coastline: Bờ biển
           crater: Miệng Núi
+          fell: Đồi đá
           fjord: Vịnh hẹp
           geyser: Mạch nước Phun
           glacier: Sông băng
@@ -658,12 +667,14 @@ vi:
           land: Đất
           marsh: Đầm lầy
           moor: Truông
+          mud: Bùn
           peak: Đỉnh
           point: Mũi đất
           reef: Rạn san hô
           ridge: Luống đất
           river: Sông
           rock: Đá
+          scree: Bãi Đá
           spring: Suối
           strait: Eo biển
           tree: Cây
@@ -712,6 +723,8 @@ vi:
           yard: Sân ga
         shop: 
           bakery: Tiệm Bánh
+          beauty: Tiệm Mỹ phẩm
+          beverages: Tiệm Đồ uống
           bicycle: Tiệm Xe đạp
           books: Tiệm Sách
           butcher: Tiệm Thịt
@@ -734,6 +747,7 @@ vi:
           florist: Tiệm Hoa
           food: Tiệm Thực phẩm
           funeral_directors: Nhà tang lễ
+          general: Tiệm Đồ
           grocery: Tiệm Tạp phẩm
           hairdresser: Tiệm Làm tóc
           hardware: Tiệm Ngũ kim
@@ -765,6 +779,7 @@ vi:
           cabin: Túp lều
           camp_site: Nơi Cắm trại
           chalet: Nhà ván
+          guest_house: Nhà khách
           hostel: Nhà trọ
           hotel: Khách sạn
           information: Thông tin
@@ -779,12 +794,18 @@ vi:
         waterway: 
           canal: Kênh
           dam: Đập
+          derelict_canal: Kênh Bỏ rơi
+          ditch: Mương
+          dock: Vũng tàu
+          drain: Cống
+          lock: Âu tàu
           rapids: Thác ghềnh
           river: Sông
           riverbank: Bờ sông
           stream: Dòng suối
           wadi: Dòng sông Vào mùa
           waterfall: Thác
+          weir: Đập Cột nước Thấp
   javascripts: 
     map: 
       base: 
@@ -802,17 +823,23 @@ vi:
       history_tooltip: Xem danh sách sửa đổi trong khu vực này
       history_zoom_alert: Hãy phóng to hơn để xem lịch sử sửa đổi
   layouts: 
+    community_blogs: Blog của Cộng đồng
+    community_blogs_title: Các blog của thành viên cộng đồng OpenStreetMap
     copyright: Bản quyền &amp; Giấy phép
+    documentation: Tài liệu
+    documentation_title: Tài liệu về dự án
     donate: Hỗ trợ OpenStreetMap bằng cách {{link}} cho Quỹ Nâng cấp Phần cứng.
     donate_link_text: quyên góp
     edit: Sửa đổi
     edit_with: Sửa đổi dùng {{editor}}
     export: Xuất
     export_tooltip: Xuất dữ liệu bản đồ
+    foundation: Quỹ OpenStreetMap
+    foundation_title: Quỹ Hỗ trợ OpenStreetMap
     gps_traces: Tuyến đường GPS
     gps_traces_tooltip: Quản lý tuyến đường GPS
     help: Trợ giúp
-    help_and_wiki: "{{help}} & {{wiki}}"
+    help_centre: Trung tâm Trợ giúp
     help_title: Trang trợ giúp của dự án
     history: Lịch sử
     home: nhà
@@ -839,13 +866,8 @@ vi:
     make_a_donation: 
       text: Quyên góp
       title: Quyên góp tiền để hỗ trợ OpenStreetMap
-    news_blog: Blog Tin tức
-    news_blog_tooltip: Blog có tin tức về OpenStreetMap, dữ liệu địa lý mở, v.v.
     osm_offline: Cơ sở dữ liệu OpenStreetMap đang ngoại tuyến trong lúc đang thực hiện những công việc bảo quản cơ sở dữ liệu cần thiết.
     osm_read_only: Cơ sở dữ liệu OpenStreetMap đang bị khóa không được sửa đổi trong lúc đang thực hiện những công việc bảo quản cơ sở dữ liệu cần thiết.
-    shop: Tiệm
-    shop_tooltip: Tiệm bán hàng hóa OpenStreetMap
-    shop_url: http://wiki.openstreetmap.org/wiki/Merchandise?uselang=vi
     sign_up: đăng ký
     sign_up_tooltip: Mở tài khoản để sửa đổi
     tag_line: Bản đồ Wiki của Thế giới Mở
@@ -857,6 +879,7 @@ vi:
     welcome_user_link_tooltip: Trang cá nhân của bạn
     wiki: Wiki
     wiki_title: Trang wiki của dự án
+    wiki_url: http://wiki.openstreetmap.org/wiki/Vi:Main_Page?uselang=vi
   license_page: 
     foreign: 
       english_link: nguyên bản tiếng Anh
@@ -1094,10 +1117,10 @@ vi:
       no_iframe_support: Tính năng này cần trình duyệt hỗ trợ khung nội bộ (iframe) trong HTML.
       not_public: Bạn chưa đưa ra công khai các sửa đổi của bạn.
       not_public_description: Nếu không đưa ra công khai, bạn không còn được phép sửa đổi bản đồ. Bạn có thể đưa ra công khai tại {{user_page}}.
+      potlatch2_unsaved_changes: Bạn chưa lưu một số thay đổi. (Trong Potlatch 2, bấm nút “Save” để lưu thay đổi.)
       potlatch_unsaved_changes: Bạn có thay đổi chưa lưu. (Để lưu trong Potlatch, hãy bỏ chọn lối hoặc địa điểm đang được chọn, nếu đến sửa đổi trong chế độ Áp dụng Ngay, hoặc bấm nút Lưu nếu có.)
       user_page_link: trang cá nhân
     index: 
-      josm_failed: Thất bại mở trình vẽ – hãy chắc chắn rằng JOSM đã khởi động và phần mở rộng điều khiển từ xa được kích hoạt
       js_1: Hoặc trình duyệt của bạn không hỗ trợ JavaScript, hoặc bạn đã tắt JavaScript.
       js_2: OpenStreetMap sử dụng JavaScript cho chức năng bản đồ trơn.
       js_3: Bạn vẫn có thể sử dụng <a href="http://tah.openstreetmap.org/Browse/">bản đồ tĩnh Tiles@Home</a> nếu không bật lên JavaScript được.
@@ -1106,6 +1129,7 @@ vi:
         notice: "{{project_name}} và những người đóng góp cho phép sử dụng theo giấy phép {{license_name}}."
         project_name: Dự án OpenStreetMap
       permalink: Liên kết Thường trực
+      remote_failed: Thất bại mở trình vẽ – hãy chắc chắn rằng JOSM hoặc Markaartor đã khởi động và tùy chọn phần điều khiển từ xa được kích hoạt
       shortlink: Liên kết Ngắn gọn
     key: 
       map_key: Chú giải
@@ -1370,17 +1394,22 @@ vi:
     login: 
       account not active: Rất tiếc, tài khoản của bạn chưa được kích hoạt.<br />Xin hãy nhấn chuột vào liên kết trong thư điện tử xác nhận tài khoản để kích hoạt tài khoản, hoặc <a href="{{reconfirm}}">yêu cầu thư xác nhận mới</a>.
       account suspended: Đáng tiếc, tài khoản của bạn đang bị cấm do các hoạt động nghi ngờ.<br />Vui lòng liên lạc với {{webmaster}} để thảo luận về vụ cấm này.
+      already have: Đã có một tài khoản OpenStreetMap? Xin vui lòng đăng nhập.
       auth failure: Rất tiếc, không thể đăng nhập với những chi tiết đó.
+      create account minute: Chỉ mất một phút để mở tài khoản mới.
       create_account: mở tài khoản
       email or username: "Địa chỉ Thư điện tử hoặc Tên đăng ký:"
       heading: Đăng nhập
       login_button: Đăng nhập
       lost password link: Quên mất Mật khẩu?
+      new to osm: Mới đến OpenStreetMap?
       notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License?uselang=vi">Tìm hiểu thêm về thay đổi giấy phép sắp tới của OpenStreetMap</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License?uselang=vi">bản dịch</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming?uselang=vi">thảo luận</a>)
       password: "Mật khẩu:"
       please login: Xin hãy đăng nhập hoặc {{create_user_link}}.
+      register now: Đăng ký ngay
       remember: "Nhớ tôi:"
       title: Đăng nhập
+      to make changes: Bạn phải có tài khoản để thay đổi dữ liệu OpenStreetMap.
       webmaster: chủ trang
     logout: 
       heading: Đăng xuất OpenStreetMap
@@ -1474,6 +1503,7 @@ vi:
       hide_user: ẩn tài khoản này
       if set location: Nếu đặt vị trí, bản đồ đẹp đẽ và những thứ đó sẽ được hiển thị ở dưới. Bạn có thể đặt vị trí nhà tại trang {{settings_link}}.
       km away: cách {{count}} km
+      latest edit: "Sửa đổi gần đây nhất cách đây {{ago}}:"
       m away: cách {{count}} m
       mapper since: "Tham gia:"
       moderator_history: xem các tác vụ cấm bởi người này
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 6e24b170d..69f4c044d 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: syck
 # Author: Liangent
+# Author: Mmyangfl
 # Author: PhiLiP
 # Author: Shizhao
 zh-CN: 
@@ -49,15 +50,16 @@ zh-CN:
       friend: 朋友
       language: 语言
       message: 信息
-      node: 结点
-      node_tag: 结点标签
-      old_node: 旧结点
+      node: 节点
+      node_tag: 节点标签
+      notifier: 通知
+      old_node: 旧节点
       old_node_tag: 旧结点标签
       old_relation: 旧关系
       old_relation_member: 旧关系对象
       old_relation_tag: 旧关系标签
       old_way: 旧路径
-      old_way_node: 旧路径结点
+      old_way_node: 旧路径节点
       old_way_tag: 旧路径标签
       relation: 关系
       relation_member: 关系对象
@@ -67,13 +69,23 @@ zh-CN:
       tracetag: 跟踪标签
       user: 用户
       user_preference: 用户选择
-      way: 路经
-      way_node: 路经结点
-      way_tag: 路经标签
+      way: 路径
+      way_node: 路径节点
+      way_tag: 路径标签
+  application: 
+    require_cookies: 
+      cookies_needed: 您似乎已禁用了 cookies - 请在浏览器中启用 cookies，然后继续。
+    setup_user_auth: 
+      blocked: 您对 API 的存取已经被阻挡了。请登录到网站以了解更多信息。
   browse: 
     changeset: 
       changeset: "修改集合: {{id}}"
+      changesetxml: 修改集合 XML
       download: 下载 {{changeset_xml_link}} 或 {{osmchange_xml_link}}
+      feed: 
+        title: 更改组合 {{id}}
+        title_comment: 更改组合 {{id}} - {{comment}}
+      osmchangexml: osmChange XML
       title: 修改集合
     changeset_details: 
       belongs_to: "属于:"
@@ -83,24 +95,46 @@ zh-CN:
       created_at: "创建于:"
       has_nodes: "有如下{{count}}个点:"
       has_relations: "有如下{{count}}种关系:"
-      has_ways: "有如下路径 {{count}} :"
+      has_ways: "有如下{{count}}条路径:"
       no_bounding_box: 没有为该修改集合所储存的限定窗口。
       show_area_box: 显示区域窗口
     common_details: 
+      changeset_comment: "注释:"
+      edited_at: "于:"
+      edited_by: "编辑:"
       in_changeset: "在修改集合中:"
       version: "版本:"
     containing_relation: 
       entry: 关系 {{relation_name}}
-      entry_role: 关系{{relation_name}}（作为{{relation_role}}）
+      entry_role: 关系 {{relation_name}} (作为 {{relation_role}})
     map: 
       deleted: 删除
+      larger: 
+        area: 在较大的地图查看区域
+        node: 在较大的地图查看节点
+        relation: 在较大的地图查看关系
+        way: 在较大的地图查看路径
       loading: 读取中...
+    navigation: 
+      all: 
+        next_changeset_tooltip: 下个修改集合
+        next_node_tooltip: 下个节点
+        next_relation_tooltip: 下个关系
+        next_way_tooltip: 下个路径
+        prev_changeset_tooltip: 上个修改集合
+        prev_node_tooltip: 上个节点
+        prev_relation_tooltip: 上个关系
+        prev_way_tooltip: 上个路径
+      user: 
+        name_changeset_tooltip: 查看 {{user}} 的编辑
+        next_changeset_tooltip: 下一个 {{user}} 的编辑
+        prev_changeset_tooltip: 上一个 {{user}} 的编辑
     node: 
-      download: "{{download_xml_link}}、{{view_history_link}}或{{edit_link}}"
+      download: "{{download_xml_link}}，{{view_history_link}} 或 {{edit_link}}"
       download_xml: 下载 XML
       edit: 编辑
       node: 节点
-      node_title: 结点：{{node_name}}
+      node_title: 节点：{{node_name}}
       view_history: 查看历史
     node_details: 
       coordinates: "坐标:"
@@ -108,15 +142,18 @@ zh-CN:
     node_history: 
       download: "{{download_xml_link}} 或者 {{view_details_link}}"
       download_xml: 下载 XML
-      node_history: 结点历史
-      view_details: 浏览具体内容
+      node_history: 节点历史
+      node_history_title: "节点历史: {{node_name}}"
+      view_details: 查看详细信息
     not_found: 
-      sorry: 抱歉, 无法找到id为{{id}}的类型{{type}}。
+      sorry: 抱歉，无法找到 id 为 {{id}} 的类型 {{type}} 。
       type: 
-        node: 结点
+        changeset: 修改集合
+        node: 节点
         relation: 关系
         way: 路径
     paging_nav: 
+      of: /
       showing_page: 显示网页
     relation: 
       download: "{{download_xml_link}} 或者 {{view_history_link}}"
@@ -128,8 +165,11 @@ zh-CN:
       members: "成员:"
       part_of: "部分:"
     relation_history: 
+      download: "{{download_xml_link}} 或 {{view_details_link}}"
+      download_xml: 下载 XML
       relation_history: 关系历史
       relation_history_title: "关系历史: {{relation_name}}"
+      view_details: 查看详细信息
     relation_member: 
       entry_role: "{{type}} {{name}} 作为 {{role}}"
       type: 
@@ -141,13 +181,31 @@ zh-CN:
       view_data: 查看关于本地图的数据
     start_rjs: 
       data_frame_title: 数据
-      details: 细节
+      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]] features. 通常，一些浏览器不能很好显示高精度的数据。一般来讲，当像素点在100一下浏览器的显示效果最好。如果再做别的任务，可能会导致您的浏览器变慢/不响应如果您确定您想要显示这些数据，您可能要点击下面的按钮。
-      loading: 读取中
+      load_data: 加载数据
+      loaded_an_area_with_num_features: 你已经选择了包含[[num_features]]项特征的区域。通常，有些浏览器无法正常显示这么多的数据。一般而言，浏览器一次显示100个以下特征时效果最好；超过这个数量会使您的浏览器变慢/无响应。如果确定要显示这个数据，请按下面的按钮。
+      loading: 加载中...
       manually_select: 手动选择一个不同区域
+      object_list: 
+        api: 从 API 取回这一区域
+        back: 显示对象列表
+        details: 详细信息
+        heading: 对象列表
+        history: 
+          type: 
+            node: 节点 [[id]]
+            way: 路径 [[id]]
+        selected: 
+          type: 
+            node: 节点 [[id]]
+            way: 路径 [[id]]
+        type: 
+          node: 节点
+          way: 路径
       private_user: 个人用户
       show_history: 显示历史
       unable_to_load_size: 无法读取：限制窗口的尺寸[[bbox_size]] 过大 (需小于 {{max_bbox_size}})
@@ -155,8 +213,19 @@ zh-CN:
       zoom_or_select: 放大或选择查看一个地图区域
     tag_details: 
       tags: "标签:"
+      wiki_link: 
+        key: "{{key}} 标签的 wiki 描述页面"
+        tag: "{{key}}={{value}} 标签的 wiki 描述页面"
+      wikipedia_link: 维基百科上的 {{page}} 文章
+    timeout: 
+      sorry: 很抱歉，取得 ID {{id}} 的 {{type}} 资料花了太长的时间。
+      type: 
+        changeset: 修改集合
+        node: 节点
+        relation: 关系
+        way: 路径
     way: 
-      download: "{{download_xml_link}} 或 {{view_history_link}}"
+      download: "{{download_xml_link}}，{{view_history_link}} 或 {{edit_link}}"
       download_xml: 下载 XML
       edit: 编辑
       view_history: 查看历史
@@ -169,7 +238,7 @@ zh-CN:
     way_history: 
       download: "{{download_xml_link}} 或者 {{view_details_link}}"
       download_xml: 下载 XML
-      view_details: 查看详细情况
+      view_details: 查看详细信息
       way_history: 路径历史
       way_history_title: 路径历史：{{way_name}}
   changeset: 
@@ -182,59 +251,115 @@ zh-CN:
       still_editing: (仍在编辑中)
       view_changeset_details: 查看详细变更
     changeset_paging_nav: 
-      showing_page: 显示网页
+      next: 下一页 &raquo;
+      previous: "&laquo; 上一页"
+      showing_page: 显示第 {{page}} 页
     changesets: 
       area: 区域
       comment: 评论
+      id: ID
       saved_at: 保存在
       user: 用户
+    list: 
+      description: 最近更改
+      description_bbox: "{{bbox}} 内的修改集合"
+      description_user: "{{user}} 的修改集合"
+      description_user_bbox: "{{user}} 在 {{bbox}} 内的修改集合"
+      heading: 修改集合
+      heading_bbox: 修改集合
+      heading_user: 修改集合
+      heading_user_bbox: 修改集合
+      title: 修改集合
+      title_bbox: "{{bbox}} 内的修改集合"
+      title_user: "{{user}} 的修改集合"
+      title_user_bbox: "{{user}} 在 {{bbox}} 内的修改集合"
+    timeout: 
+      sorry: 对不起，您要求的修改集合列表取回时花了太长时间。
   diary_entry: 
+    diary_comment: 
+      comment_from: 由 {{link_user}}  于 {{comment_created_at}} 发表的评论
+      confirm: 确认
+      hide_link: 隐藏此评论
     diary_entry: 
       comment_count: 
         one: 1回复
         other: "{{count}} 回复"
       comment_link: 关于此篇评论
+      confirm: 确认
       edit_link: 编辑此篇
+      hide_link: 隐藏此项目
+      posted_by: 由 {{link_user}} 于 {{created}} 以 {{language_link}} 发表
       reply_link: 对此篇进行回复
     edit: 
-      body: "主体:"
+      body: "正文:"
       language: "语言:"
       latitude: "纬度:"
-      location: "地区:"
+      location: "位置:"
       longitude: "经度:"
       marker_text: 日记条目位置
       save_button: 保存
       subject: "标题:"
       title: 编辑日志条目
       use_map_link: 使用地图
+    feed: 
+      all: 
+        description: 用户最近的 OpenStreetMap 日记
+        title: OpenStreetMap 日记
+      language: 
+        description: 用户最近的 OpenStreetMap 日记(语言为 {{language_name}})
+        title: OpenStreetMap 日记(语言为 {{language_name}})
+      user: 
+        description: "{{user}} 最近的 OpenStreetMap 日记"
+        title: "{{user}} 的 OpenStreetMap 日记"
     list: 
+      in_language_title: 日记(语言为 {{language}})
       new: 新日志条目
       new_title: 在您的用户日志中创建一个新条目
       newer_entries: 更新的条目
       no_entries: 没有日记条目
       older_entries: 更早的条目
-      recent_entries: "最近的日志条目:"
+      recent_entries: "最近的日记条目:"
       title: 用户的日志
-      user_title: "{{user}}的日志"
+      user_title: "{{user}} 的日记"
+    location: 
+      edit: 编辑
+      location: "位置:"
+      view: 查看
     new: 
       title: 新用户条目
     no_such_entry: 
-      body: 抱歉， 没有关于此id {{id}}的日记条目或者评论。请检查拼写，或者您点击的链接有误。
-      heading: "关于此id: {{id}}没有条目"
+      body: 抱歉， 没有关于此 id {{id}} 的日记条目或者评论。请检查拼写，或者您点击的链接有误。
+      heading: "关于此 id: {{id}} 没有条目"
+      title: 没有这个日记条目
     no_such_user: 
-      body: 抱歉，没有名叫{{user}}的用户。请检查拼写，或者您点击的链接有误。
-      heading: 此用户{{user}}不存在
+      body: 抱歉，没有名为 {{user}} 的用户。请检查拼写，或者您点击的链接有误。
+      heading: 用户 {{user}} 不存在
       title: 没有这个用户
     view: 
       leave_a_comment: 留下评论
+      login: 登录
+      login_to_leave_a_comment: "{{login_link}} 以留下评论"
       save_button: 保存
-      title: 用户日志| {{user}}
+      title: 用户 {{user}} 的日记 | {{title}}
+      user_title: "{{user}} 的日记"
+  editor: 
+    default: 默认 (目前 {{name}})
+    potlatch: 
+      description: Potlatch 1 (在浏览器中编辑)
+      name: Potlatch 1
+    potlatch2: 
+      description: Potlatch 2 (在浏览器中编辑)
+      name: Potlatch 2
+    remote: 
+      description: 远程控制 (JOSM 或 Merkaartor)
+      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/">创作共用 CC 署名-相同方式 2.0 许可</a>授权。
       format: 格式
       format_to_export: 输出格式
       image_size: 图像尺寸
@@ -250,6 +375,9 @@ zh-CN:
       output: 输出
       paste_html: 在网页上粘贴 HTML
       scale: 比率
+      too_large: 
+        body: 这个区域太大，无法导出 OpenStreetMap XML 数据。请放大或选择一个较小的区域。
+        heading: 区域太大
       zoom: 变焦
     start_rjs: 
       add_marker: 标记地图
@@ -260,7 +388,32 @@ zh-CN:
       manually_select: 手动选择一个不同区域
       view_larger_map: 查看放大地图
   geocoder: 
+    description: 
+      title: 
+        geonames: 位置 从 <a href="http://www.geonames.org/">GeoNames</a>
+        osm_namefinder: "{{types}} 从 <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
+        osm_nominatim: 位置 从 <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
+      types: 
+        cities: 城市
+        places: 地区
+        towns: 乡镇
+    description_osm_namefinder: 
+      prefix: "{{distance}} {{direction}} ／ {{type}}"
+    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: 
@@ -268,16 +421,370 @@ zh-CN:
         geonames: 结果 从 <a href="http://www.geonames.org/">GeoNames</a>
         latlon: 结果 从 <a href="http://openstreetmap.org/">Internal</a>
         osm_namefinder: 结果 从 <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        osm_nominatim: 结果 从 <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_namefinder: 
+      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} ／ {{parentname}})"
+      suffix_place: ", {{direction}} {{distance}} ／ {{placename}}"
+    search_osm_nominatim: 
+      prefix: 
+        amenity: 
+          airport: 机场
+          arts_centre: 艺术中心
+          atm: 自动柜员机(ATM)
+          bank: 银行
+          bar: 酒吧
+          bench: 长凳
+          bicycle_parking: 自行车停车
+          bus_station: 公交主站
+          cafe: 咖啡馆
+          car_rental: 租车服务
+          car_sharing: 汽车共享
+          car_wash: 洗车
+          cinema: 电影院
+          club: 俱乐部
+          college: 学院
+          community_centre: 社区中心
+          crematorium: 火葬场
+          drinking_water: 饮用水
+          driving_school: 驾驶学校
+          emergency_phone: 紧急电话
+          fast_food: 快餐
+          fire_hydrant: 消防栓
+          fire_station: 消防局
+          fountain: 喷泉
+          fuel: 燃料
+          gym: 健身中心/健身
+          hall: 小山
+          health_centre: 健康中心
+          hospital: 医院
+          hotel: 酒店
+          ice_cream: 冰淇淋
+          kindergarten: 幼儿园
+          library: 图书馆
+          market: 市场
+          nightclub: 夜总会
+          office: 办公室
+          park: 公园
+          parking: 停车场
+          place_of_worship: 宗教场所
+          police: 警察
+          post_box: 邮箱
+          post_office: 邮局
+          preschool: 学前教育
+          pub: 酒馆
+          public_market: 集市
+          recycling: 回收点
+          restaurant: 餐厅
+          retirement_home: 养老院
+          school: 学校
+          shelter: 庇护所
+          shop: 商店
+          shopping: 购物
+          social_club: 社交俱乐部
+          studio: 工作室
+          supermarket: 超市
+          taxi: 出租车
+          telephone: 公共电话
+          theatre: 剧院
+          toilets: 洗手间
+          university: 大学
+          vending_machine: 自动售货机
+          waste_basket: 废纸篓
+          wifi: WiFi 接入
+          youth_centre: 青少年中心
+        boundary: 
+          administrative: 行政区边界
+        building: 
+          church: 教堂
+          commercial: 商业建筑物
+          entrance: 建筑入口
+          farm: 农场建筑物
+          flats: 公寓
+          garage: 车库
+          hall: 小山
+          hospital: 医院建筑物
+          hotel: 酒店
+          house: 房屋
+          industrial: 工业建筑物
+          office: 办公楼
+          public: 公共建筑物
+          residential: 住宅建筑物
+          retail: 零售建筑物
+          school: 学校建筑物
+          shop: 商店
+          stadium: 体育场
+          store: 商店
+          tower: 塔
+          train_station: 火车站
+          university: 大学建筑物
+          "yes": 建筑物
+        highway: 
+          bus_guideway: 导轨公交专用道
+          bus_stop: 公交停靠站
+          construction: 在建道路
+          emergency_access_point: 紧急接入点
+          gate: 门
+          living_street: 生活街道
+          motorway: 高速公路
+          motorway_junction: 高速公路连接线
+          motorway_link: 高速公路
+          path: 小径
+          platform: 站台
+          primary: 一级道路
+          primary_link: 一级道路
+          residential: 住宅
+          road: 道路
+          secondary: 二级公路
+          secondary_link: 二级公路
+          service: 服务道路
+          services: 高速公路服务区
+          steps: 楼梯
+          tertiary: 三级道路
+          track: 辙迹
+          trunk: 主干道路
+          trunk_link: 主干道路
+          unclassified: 未分类道路
+          unsurfaced: 无铺面道路
+        historic: 
+          boundary_stone: 边界石
+          building: 建筑物
+          house: 房屋
+          icon: 图标
+          museum: 博物馆
+          tower: 塔
+        landuse: 
+          basin: 盆地
+          brownfield: 棕色地带
+          cemetery: 公墓
+          commercial: 商业区
+          construction: 建设
+          farm: 农场
+          farmland: 农田
+          farmyard: 农家庭院
+          forest: 森林
+          grass: 草地
+          greenfield: 棕色地带
+          industrial: 工业区
+          landfill: 垃圾填埋场
+          mountain: 山
+          nature_reserve: 自然保护区
+          park: 公园
+          plaza: 广场
+          railway: 铁路
+          reservoir: 水库
+          residential: 住宅区
+          wetland: 湿地
+          wood: 林
+        leisure: 
+          beach_resort: 海滩度假村
+          fishing: 垂钓区
+          garden: 花园
+          golf_course: 高尔夫球场
+          ice_rink: 冰场
+          marina: 码头
+          miniature_golf: 迷你高尔夫
+          nature_reserve: 自然保护区
+          park: 公园
+          playground: 游乐场
+          recreation_ground: 游乐场
+          slipway: 船台
+          sports_centre: 体育馆
+          stadium: 体育场
+          swimming_pool: 游泳池
+          track: 赛道
+          water_park: 水上乐园
+        natural: 
+          bay: 海湾
+          beach: 海滩
+          cave_entrance: 洞口
+          cliff: 悬崖
+          coastline: 海岸线
+          glacier: 冰川
+          hill: 小山
+          island: 岛
+          land: 陆地
+          moor: 泊
+          mud: 泥地
+          peak: 山顶
+          point: 点
+          reef: 礁
+          river: 河
+          rock: 岩
+          spring: 泉
+          strait: 海峡
+          tree: 树
+          valley: 山谷
+          water: 水
+          wetland: 湿地
+          wetlands: 湿地
+          wood: 林
+        place: 
+          airport: 机场
+          city: 城市
+          country: 国家
+          county: 县
+          farm: 农场
+          hamlet: 村庄
+          house: 房屋
+          houses: 房屋
+          island: 岛
+          islet: 屿
+          locality: 地区
+          postcode: 邮编
+          region: 区
+          sea: 海
+          state: 国家
+          suburb: 郊区
+          town: 镇
+          village: 村
+        railway: 
+          abandoned: 废弃铁路
+          construction: 在建铁路
+          disused: 不使用的铁路
+          disused_station: 废弃的火车站
+          funicular: 缆索铁路
+          halt: 火车停靠站
+          historic_station: 历史火车站
+          junction: 铁路枢纽
+          level_crossing: 平交道口
+          light_rail: 轻轨
+          monorail: 单轨
+          narrow_gauge: 窄轨铁路
+          platform: 月台
+          preserved: 保留铁路
+          spur: 铁路支线
+          station: 火车站
+          subway: 地铁站
+          subway_entrance: 地铁入口
+          switch: 铁路点
+          tram: 缆车
+          tram_stop: 有轨电车停靠站
+          yard: 铁路货场
+        shop: 
+          apparel: 服饰店
+          art: 艺术品店
+          bakery: 面包店
+          beauty: 美容店
+          beverages: 饮料店
+          bicycle: 自行车店
+          books: 书店
+          butcher: 屠宰
+          car: 车店
+          car_dealer: 汽车经销商
+          car_parts: 汽车零件
+          car_repair: 汽车维修
+          carpet: 地毯店
+          charity: 慈善商店
+          clothes: 服装店
+          computer: 电脑店
+          confectionery: 糖果店
+          convenience: 便利店
+          copyshop: 复印店
+          cosmetics: 化妆品店
+          department_store: 百货商店
+          doityourself: DIY
+          drugstore: 药店
+          dry_cleaning: 干洗
+          electronics: 电子产品商店
+          estate_agent: 地产代理
+          farm: 农家店
+          fashion: 时装店
+          fish: 鱼店
+          food: 食品店
+          funeral_directors: 丧葬
+          furniture: 家具
+          general: 一般商店
+          gift: 礼品店
+          greengrocer: 蔬菜水果店
+          grocery: 杂货店
+          hairdresser: 理发店
+          hardware: 五金店
+          hifi: Hi-Fi
+          insurance: 保险
+          jewelry: 珠宝店
+          kiosk: 礼品店
+          laundry: 洗衣房
+          market: 市场
+          mobile_phone: 手机店
+          motorcycle: 摩托车店
+          music: 音乐店
+          newsagent: 报摊
+          optician: 配镜
+          organic: 有机食品店
+          outdoor: 户外店
+          pet: 宠物店
+          photo: 照相馆
+          shoes: 鞋店
+          shopping_centre: 购物中心
+          sports: 体育用品店
+          stationery: 文具店
+          supermarket: 超市
+          toys: 玩具店
+          video: 影视店
+        tourism: 
+          alpine_hut: 高山小屋
+          artwork: 艺术品
+          bed_and_breakfast: 床和早餐
+          cabin: 小木屋
+          camp_site: 野营地
+          caravan_site: 拖车营地
+          guest_house: 宾馆
+          hostel: 旅馆
+          hotel: 酒店
+          information: 信息
+          motel: 汽车旅馆
+          museum: 博物馆
+          picnic_site: 野餐地
+          theme_park: 主题公园
+          valley: 谷
+          viewpoint: 景点
+          zoo: 动物园
+        waterway: 
+          canal: 运河
+          dam: 水坝
+          derelict_canal: 废弃的运河
+          ditch: 沟
+          dock: 码头
+          drain: 渠
+          lock_gate: 闸门
+          river: 河
+          riverbank: 河岸
+          stream: 溪流
+          water_point: 水路点
+          waterfall: 瀑布
+  javascripts: 
+    map: 
+      base: 
+        cycle_map: Cycle Map
+        noname: NoName
+    site: 
+      edit_disabled_tooltip: 放大以编辑地图
+      edit_tooltip: 编辑地图
+      edit_zoom_alert: 您必须放大以编辑地图
+      history_disabled_tooltip: 放大以编辑此区域
+      history_tooltip: 查看对此区域的编辑
+      history_zoom_alert: 您必须先放大才能编辑此区域
   layouts: 
-    donate: 通过下面的{{link}}到Hardware Upgrade Fund来支持。
+    community_blogs: 社区博客
+    community_blogs_title: OpenStreetMap 社区成员的博客
+    copyright: 版权及许可
+    documentation: 文档
+    documentation_title: 该项目的文档
+    donate: 通过下面的{{link}}到硬件升级基金来支持 OpenStreetMap。
     donate_link_text: 捐款
     edit: 编辑
+    edit_with: 使用 {{editor}} 编辑
     export: 输出
     export_tooltip: 输出地图数据
-    gps_traces: GPS 追踪
-    gps_traces_tooltip: 管理追踪
+    foundation: 基金会
+    foundation_title: OpenStreetMap 基金会
+    gps_traces: GPS 轨迹
+    gps_traces_tooltip: 管理 GPS 轨迹
+    help: 帮助
+    help_centre: 帮助中心
+    help_title: 项目的帮助网站
     history: 历史
     home: 主页
     home_tooltip: 回到主页位置
@@ -287,17 +794,21 @@ zh-CN:
       other: 您的收件箱有{{count}}封未读消息
       zero: 您的收件箱没有未读消息
     intro_1: OpenStreetMap是一个可供自由编辑的世界地图，它是由像您这样的用户创造的
-    intro_2: OpenStreetMap允许您查看，编辑或者使用世界各地的地理数据来帮助您。
-    intro_3: OpenStreetMap软件是由{{ucl}} 和{{bytemark}}共同开发维护的。
+    intro_2: OpenStreetMap 允许您查看，编辑或者使用世界各地的地理数据来帮助您。
+    intro_3: OpenStreetMap 的主机是由 {{ucl}} 和 {{bytemark}} 大力支持的。这个项目的其他支持者都列在 {{partners}}。
+    intro_3_partners: 维基
+    license: 
+      title: OpenStreetMap 数据是以创作共用 CC 署名-相同方式共享 2.0 通用许可授权
     log_in: 登录
     log_in_tooltip: 用已存在账户登录
+    logo: 
+      alt_text: OpenStreetMap 徽标
     logout: 退出
     logout_tooltip: 退出
     make_a_donation: 
       text: 捐款
-    news_blog: 新闻博客
-    news_blog_tooltip: 关于OpenStreetMap的新闻博客，免费地理数据等等。
-    osm_offline: OpenStreetMap的数据库目前没有连线，数据库的维护工作正在进行。
+      title: 捐款支持 OpenStreetMap
+    osm_offline: OpenStreetMap 的数据库目前离线中，直到必要的数据库维护工作完成为止。
     osm_read_only: OpenStreetMap数据库目前处于只读模式中，数据库的维护工作正在进行中。
     sign_up: 注册
     sign_up_tooltip: 创建一个可编辑账户
@@ -308,7 +819,21 @@ zh-CN:
     view_tooltip: 查看地图
     welcome_user: 欢迎, {{user_link}}
     welcome_user_link_tooltip: 您的用户页面
+    wiki: 维基
+    wiki_title: 项目的维基网站
+  license_page: 
+    foreign: 
+      english_link: 英文原文
+      text: 这个翻译页面和{{english_original_link}}在事件上有冲突时，以英文(English)为准
+      title: 关于这个翻译
+    native: 
+      mapping_link: 开始制图
+      native_link: 简体中文版
+      text: 您正在查看英文版的版权页。你可以返回这个网页的{{native_link}}，或者您可以停止阅读版权并{{mapping_link}}。
+      title: 关于此页
   message: 
+    delete: 
+      deleted: 已删除邮件
     inbox: 
       date: 日期
       from: 来自
@@ -317,20 +842,33 @@ zh-CN:
       outbox: 发件箱
       people_mapping_nearby: 在您附近的人
       subject: 标题
-      you_have: 您有 {{new_count}} 新消息和{{old_count}} 旧消息
+      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}}
+      send_message_to: 发新消息给 {{name}}
       subject: 标题
+      title: 发送消息
+    no_such_message: 
+      body: 对不起，没有具有该 id 的消息。
+      heading: 没有此消息
+      title: 没有此消息
     no_such_user: 
-      body: 对不起，没有关于此名字或id的用户或消息
-      heading: 没有此用户或信息
+      body: 对不起，没有使用该名称的用户。
+      heading: 没有此用户
+      title: 没有此用户
     outbox: 
       date: 日期
       inbox: 收件箱
@@ -338,9 +876,10 @@ zh-CN:
       no_sent_messages: 您尚未发送信息。何不联系一些{{people_mapping_nearby_link}}?
       outbox: 发件箱
       people_mapping_nearby: 在您附近的人
-      subject: 主体
+      subject: 主题
+      title: 发件箱
       to: 给
-      you_have_sent_messages: 您有{{count}} 已发送邮件
+      you_have_sent_messages: 您有{{count}}个已发送信息
     read: 
       back_to_inbox: 返回收件箱
       back_to_outbox: 返回发件箱
@@ -350,106 +889,291 @@ zh-CN:
       reading_your_sent_messages: 正在阅读您所发送的信息
       reply_button: 回复
       subject: 主题
+      title: 阅读消息
       to: 给
       unread_button: 标记为未读
+      wrong_user: 您已经以 '{{user}}' 的身份登录，但是您想要阅读的消息并非寄给这个用户。请以正确的用户身份登录以阅读这个消息。
+    reply: 
+      wrong_user: 您已经以 '{{user}}' 的身份登录，但是您想要回复的消息并非寄给这个用户。请以正确的用户身份登录以回复这个消息。
+    sent_message_summary: 
+      delete_button: 删除
   notifier: 
     diary_comment_notification: 
       footer: 您也可以通过{{readurl}}来读取评论，并且在{{commenturl}}来撰写评论或者通过{{replyurl}}回复
       header: "{{from_user}}通过标题{{subject}}对您最近的OpenStreetMap日志条目进行评论。"
       hi: 您好 {{to_user}},
-    friend_notification: 
-      had_added_you: "{{user}}已经在Openstreetmap上加您为好友。"
-      see_their_profile: 您可以在{{userurl}}上查看他们的个人信息，并且如果您愿意，可以将他们加为您的好友。
-      subject: "[OpenStreetMap] {{user}}已加您为好友"
-    gpx_notification: 
+      subject: "[OpenStreetMap] {{user}} 在您的日记项目留下了评论"
+    email_confirm: 
+      subject: "[OpenStreetMap] 确认您的电子邮件地址"
+    email_confirm_html: 
+      click_the_link: 如果这是你，请点击下面的链接以确认更改。
       greeting: 您好，
+      hopefully_you: 某人(希望是您)想要改变他的电子邮件地址 {{server_url}} 为 {{new_address}}。
+    email_confirm_plain: 
+      click_the_link: 如果这是你，请点击下面的链接以确认更改。
+      greeting: 您好，
+      hopefully_you_1: 某人(希望是您)想要更改他们的电子邮件地址到此
+      hopefully_you_2: "{{server_url}} 为 {{new_address}}。"
+    friend_notification: 
+      befriend_them: 您可以在 {{befriendurl}} 把他们加为朋友。
+      had_added_you: "{{user}} 已经在 Openstreetmap 上加您为好友。"
+      see_their_profile: 您可以在 {{userurl}} 上查看他们的个人信息。
+      subject: "[OpenStreetMap] {{user}} 已加您为好友"
+    gpx_notification: 
+      and_no_tags: 并且没有标签。
+      and_the_tags: "和以下标签:"
+      failure: 
+        failed_to_import: "导入失败。下面是错误信息:"
+        more_info_1: 更多有关 GPX 导入失败的详细信息，以及如何避免
+        more_info_2: 他们可以在这里找到：
+        subject: "[OpenStreetMap] GPX 导入失败"
+      greeting: 您好，
+      success: 
+        loaded_successfully: 成功载入可能 {{possible_points}} 点中的 {{trace_points}} 点。
+        subject: "[OpenStreetMap] GPX 导入成功"
+      with_description: 带有描述
+      your_gpx_file: 看起来像是你的 GPX 文件
+    lost_password: 
+      subject: "[OpenStreetMap] 密码重设请求"
+    lost_password_html: 
+      click_the_link: 如果这是你，请点击下面的链接重置您的密码。
+      greeting: 您好，
+      hopefully_you: 某人(可能是你)已要求对此电子邮件地址上的 openstreetmap.org 账户重置密码
+    lost_password_plain: 
+      click_the_link: 如果这是你，请点击下面的链接重置您的密码。
+      greeting: 您好，
+      hopefully_you_1: 某人(可能是你)已要求对此重置密码
+      hopefully_you_2: 的 openstreetmap.org 帐号密码。
     message_notification: 
-      footer1: 您可以在{{readurl}}阅读这条消息
-      footer2: 并且您可以在{{replyurl}}回复
-      header: "{{from_user}}已经通过OpenStreetMap向您发送标题为{{subject}}的消息:"
-      hi: 您好{{to_user}},
+      footer1: 您可以在 {{readurl}} 阅读这条消息
+      footer2: 并且您可以在 {{replyurl}} 回复
+      header: "{{from_user}} 已经通过 OpenStreetMap 向您发送标题为 {{subject}} 的消息:"
+      hi: 您好 {{to_user}},
+    signup_confirm: 
+      subject: "[OpenStreetMap] 确认您的电子邮件地址"
     signup_confirm_html: 
-      click_the_link: 如果是您本人，那么欢迎您！请点击一下链接确认帐户并阅读更多关于OpenStreetMap的信息
+      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: 开始阅读在wiki上关于OpenStreetMap的信息 <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"></a> 或  <a href="http://www.opengeodata.org/">在 opengeodata blog</a> 上也有<a href="http://www.opengeodata.org/?cat=13">podcasts 可以倾听</a>!
+      get_reading: 在 <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"> wiki 中</a>阅读更多关于 OpenStreetMap 的资料或通过 <a href="http://blog.openstreetmap .org/">OpenStreetMap 博客</a>及 <a href="http://twitter.com/openstreetmap">Twitter</a> 了解最新的消息。或是浏览 OpenStreetMap 创始人 Steve Coast 的 <a href="http://www.opengeodata.org/">OpenGeoData blog</a> 了解这个计划的历史，其中也有 <a href="http:// www.opengeodata.org/?cat=13">podcasts 可以听</a>!
       greeting: 您好!
-      hopefully_you: 某人 (希望是您) 想要建立一个账户
-      introductory_video: 您可以观看一部{{introductory_video_link}}.
-      more_videos: 这里{{more_videos_link}}.
+      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>.
+      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: 
+      blog_and_twitter: "通过 OpenStreetMap 的博客或 Twitter 以了解最新消息:"
       click_the_link_1: 欢迎！如果您是用户本人，请点击下面的链接来确认您的
       click_the_link_2: 帐户并读取更多关于OpenStreetMap的信息.
       current_user_1: 一个当前不同分类的用户列表，他们是基于所在地理位置来分类
       current_user_2: "来自于:"
       greeting: 您好!
-      hopefully_you: 某人（您）希望创建一个账号
+      hopefully_you: 某人(希望是您)希望创建一个账号
       introductory_video: "您可以在这里观看关于OpenStreetMap的介绍视频:"
       more_videos: "更多的视频请看这里:"
-      opengeodata: "OpenGeoData.org是OpenStreetMap的博客，我们在上面也有播客:"
+      opengeodata: "OpenGeoData.org 是 OpenStreetMap 创始人 Steve Coast 的博客，在上面也有播客:"
       the_wiki: "查看Wiki上的OpenStreetMap介绍:"
       user_wiki_1: 推荐您创建一个wiki的用户页，它包括
       user_wiki_2: 分类标签表明您的位置，例如[[Category:Users_in_London]].
       wiki_signup: "你可能想要登录到OpenStreetMap wiki:"
+  oauth: 
+    oauthorize: 
+      allow_read_gpx: 读取您的私人 GPS 轨迹。
+      allow_read_prefs: 读取您的首选项。
+      allow_write_api: 修改地图。
+      allow_write_gpx: 上传 GPS 轨迹。
+      allow_write_prefs: 修改您的用户首选项。
+    revoke: 
+      flash: 您已经注销 {{application}} 的记号。
+  oauth_clients: 
+    create: 
+      flash: 注册信息成功
+    destroy: 
+      flash: 已破坏此客户端应用程序注册
+    edit: 
+      submit: 编辑
+      title: 编辑您的应用程序
+    form: 
+      allow_read_prefs: 读取他们的用户首选项。
+      allow_write_api: 修改地图。
+      allow_write_gpx: 上传 GPS 轨迹。
+      name: 名称
+      requests: "向用户要求下列权限:"
+      required: 必要的
+      support_url: 支持 URL
+      url: 主要应用程序 URL
+    index: 
+      application: 应用程序名称
+      issued_at: 发出于
+      my_apps: 我的客户端应用程序
+      my_tokens: 我的已授权应用程序
+      register_new: 注册您的应用程序
+      registered_apps: "您已经注册下列客户端应用程序:"
+      revoke: 撤销!
+      title: 我的 OAuth 的详细信息
+    new: 
+      submit: 注册
+      title: 注册新的应用程序
+    not_found: 
+      sorry: 对不起，找不到 {{type}}。
+    show: 
+      allow_read_gpx: 读取他们私人的 GPS 轨迹。
+      allow_read_prefs: 读取他们的用户首选项。
+      allow_write_api: 修改地图。
+      allow_write_diary: 创建日记，评论和交朋友。
+      allow_write_gpx: 上传 GPS 轨迹。
+      allow_write_prefs: 修改他们的用户首选项。
+      edit: 编辑详细信息
+      requests: "要向用户要求下列权限:"
+      title: "{{app_name}} 的 OAuth 详细信息"
+    update: 
+      flash: 更新客户端信息成功
   site: 
     edit: 
-      flash_player_required: 您需要一个Flash Player来使用OpenStreetMap的Flash编辑器Potlatch。您可以通过<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.
+      anon_edits_link_text: 了解为什么这很重要。
+      flash_player_required: 您需要 Flash Player 来使用 OpenStreetMap Flash 编辑器 Potlatch。您可以<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。
+      no_iframe_support: 您的浏览器不支持 HTML 嵌入式框架，这是此功能所需要的。
       not_public: 您尚未公开您的编辑。
       not_public_description: 您将无法再编辑此地图，直到您做到如上所述。您可以公开您的编辑，通过您的{{user_page}}。
-      potlatch_unsaved_changes: 您有尚未保存的改动. (为保存到Potlatch, 如果在列表模式下编辑，您需要取消当前所选择的路径或结点，或者点击保存，如果您看到保存按钮。)
+      potlatch2_unsaved_changes: 您有尚未保存的修改。(要在 Potlatch 2 中保存，您应该点击保存。)
+      potlatch_unsaved_changes: 您有尚未保存的修改。(要在 Potlatch 中保存，如果在在线模式下编辑，您需要取消当前所选择的路径或节点；或者点击保存，如果有保存按钮。)
       user_page_link: 用户页
     index: 
-      js_1: 或许您正在使用的浏览器不支持JavaScript, 或许您禁用了JavaScript.
+      js_1: 您或许正在使用不支持 JavaScript 的浏览器，或许您禁用了 JavaScript。
+      js_2: OpenStreetMap 使用 JavaScript 让地图更平滑。
       js_3: 您或许可以尝试 <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> 如果您无法启用JavaScript.
       license: 
+        license_name: 创作共用 CC 署名-相同方式共享 2.0
         license_url: http://creativecommons.org/licenses/by-sa/2.0/
+        notice: 由 {{project_name}} 和它的贡献者依 {{license_name}} 条款授权。
+        project_name: OpenStreetMap 项目
         project_url: http://openstreetmap.org
+      permalink: 永久链接
+      remote_failed: 编辑失败 - 请确保已加载 JOSM 或 Merkaartor 并启用了远程控制
+      shortlink: 短链接
     key: 
-      map_key: 地图符号
+      map_key: 图例
+      map_key_tooltip: 地图的图例
+      table: 
+        entry: 
+          admin: 行政区边界
+          apron: 
+            - 机场停机坪
+            - 航站楼
+          bridge: 黑色套管 = 桥
+          brownfield: 棕色地块
+          building: 特殊建筑物
+          byway: 小路
+          cable: 
+            - 缆车
+            - 升降椅
+          centre: 体育馆
+          common: 
+            1: 草地
+          construction: 在建道路
+          cycleway: 自行车道
+          farm: 农场
+          footway: 步道
+          forest: 森林
+          golf: 高尔夫球场
+          industrial: 工业区
+          lake: 
+            - 湖
+          motorway: 高速公路
+          park: 公园
+          primary: 一级道路
+          private: 私人
+          rail: 铁路
+          reserve: 自然保护区
+          resident: 住宅区
+          retail: 零售区
+          runway: 
+            - 机场跑道
+            - 滑行道
+          school: 
+            - 学校
+            - 大学
+          secondary: 二级公路
+          station: 火车站
+          subway: 地铁
+          tourist: 旅游景点
+          track: 辙迹
+          tram: 
+            - 轻轨
+            - 电车
+          trunk: 主干道路
+          tunnel: 虚线套管 = 隧道
+          unclassified: 未分类道路
+          unsurfaced: 无铺面道路
+          wood: 林
     search: 
       search: 搜索
-      search_help: "例如: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', 或者 'post offices near L??nen' <a href='http://wiki.openstreetmap.org/wiki/Search'>更多例子...</a>"
+      search_help: "例如: 'Alkmaar', '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 跟踪
+      upload_trace: 上传 GPS 轨迹
     delete: 
       scheduled_for_deletion: 计划被删除的路径
     edit: 
       description: "描述:"
+      download: 下载
       edit: 编辑
       filename: "文件名:"
+      heading: 编辑轨迹 {{name}}
+      map: 地图
+      owner: "所有者:"
       points: "坐标点:"
       save_button: 保存修改
       start_coord: "开始坐标:"
       tags: "标签:"
+      tags_help: 用逗号分隔
+      title: 编辑轨迹 {{name}}
+      uploaded_at: "上传时间:"
+      visibility: "可见性:"
+      visibility_help: 这是什么意思？
     list: 
-      public_traces: 公共GPS追踪路径
-      public_traces_from: 公共 GPS 追踪路径来自 {{user}}
+      public_traces: 公开的 GPS 轨迹
+      public_traces_from: "{{user}} 的公开 GPS 轨迹"
       tagged_with: " 标记为 {{tags}}"
-      your_traces: 您的GPS追踪路径
+      your_traces: 您的 GPS 轨迹
     make_public: 
       made_public: 公开化路径
     no_such_user: 
-      body: 对不起，没有此名{{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: 可识别
+      in: 于
       map: 地图
       more: 更多
+      pending: 挂起
       private: 私有
       public: 公开
       trace_details: 查看路径详情
+      trackable: 可追踪
       view_map: 查看地图
     trace_form: 
       description: 描述
@@ -457,12 +1181,20 @@ zh-CN:
       tags: 标签
       upload_button: 上传
       upload_gpx: 上传 GPX 文件
+      visibility: 可见性
+      visibility_help: 这是什么意思？
     trace_header: 
-      see_all_traces: 查看所有的追踪路径
-      see_your_traces: 查看您所有的追踪路径
+      see_all_traces: 查看所有轨迹
+      see_your_traces: 查看您的所有轨迹
       traces_waiting: 您有 {{count}} 条追踪路径正等待上传，请再您上传更多路径前等待这些传完，以确保不会给其他用户造成队列拥堵。
+      upload_trace: 上传轨迹
+      your_traces: 只查看您的轨迹
     trace_optionals: 
       tags: 标签
+    trace_paging_nav: 
+      next: 下一页 &raquo;
+      previous: "&laquo; 上一页"
+      showing_page: 显示第 {{page}} 页
     view: 
       delete_track: 删除这条路径
       description: "描述:"
@@ -474,21 +1206,44 @@ zh-CN:
       map: 地图
       none: 空
       owner: "所有者:"
+      pending: 挂起
       points: "结点:"
       start_coordinates: "开始坐标:"
       tags: 标签
-      trace_not_found: 路径为找到!
+      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: 您还没有同意新的贡献者条款。
+      current email address: "当前电子邮件地址:"
+      delete image: 删除当前图片
       email never displayed publicly: (从不公开显示)
       flash update success: 成功更新用户信息。
       flash update success confirm needed: 成功更新用户信息。 查看您的邮箱以确认您的新邮箱地址。
       home location: "所在位置:"
+      image: "图像:"
+      image size hint: (方形图片至少 100x100 的效果最好)
+      keep image: 保持当前图片
       latitude: "纬度:"
       longitude: "经度:"
       make edits public button: 公开我所有的编辑
       my settings: 我的设置
+      new email address: "新电子邮件地址:"
+      new image: 添加图片
       no home location: 您尚未输入所在位置。
+      preferred editor: "喜欢的编辑器:"
       preferred languages: "选择语言:"
       profile description: "基本信息描述:"
       public editing: 
@@ -498,85 +1253,264 @@ zh-CN:
         enabled link: http://wiki.openstreetmap.org/wiki/Disabling_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: 替换当前的图像
       return to profile: 返回基本信息
       save changes button: 保存更改
       title: 编辑账户
       update home location on click: 点击地图时更新所在位置?
     confirm: 
+      already active: 已确认此帐户。
       button: 确认
       heading: 确认用户帐户
       press confirm button: 按下面的确认键激活您的帐户。
-      success: 确认您的账号，感谢您的注册！
+      success: 已确认您的账号，感谢您的注册！
+      unknown token: 该标记似乎不存在。
+    confirm_email: 
+      button: 确认
+      failure: 具有此记号的电子邮件地址已经确认过了。
+      heading: 确认电子邮件地址变更
+      press confirm button: 按下面的确认按钮以确认您的新电子邮件地址。
+      success: 已确认您的电子邮件地址，感谢您的注册！
+    confirm_resend: 
+      failure: 用户 {{name}} 未找到。
+    filter: 
+      not_an_administrator: 您必须是管理员才能执行该操作。
     go_public: 
       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}}"
+      title: 用户
     login: 
-      account not active: 抱歉，您的账户尚未激活。<br />请点击在账户确认邮件中的链接来激活您的账户。
+      account not active: 对不起，您的账户尚未激活。<br />请点击在账户确认邮件中的链接来激活您的账户，或<a href="{{reconfirm}}">请求新的确认电子邮件</a>。
+      account suspended: 对不起，您的帐号已因可疑活动被暂停了。 <br />如果你想讨论这一点，请联系{{webmaster}}。
+      already have: 已经有 OpenStreetMap 的帐户?请登录。
       auth failure: 抱歉，凭这些信息您无法登录。
+      create account minute: 创建一个帐户。只需要一分钟。
       create_account: 创建一个账户
       email or username: "邮箱或用户名:"
       heading: 登录
       login_button: 登录
       lost password link: 找回密码?
+      new to osm: 第一次来到 OpenStreetMap？
+      notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">了解更多有关 OpenStreetMap 即将更换协议</a>  (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">翻译</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">讨论</a>)
       password: "密码:"
       please login: 请登录或{{create_user_link}}.
+      register now: 立即注册
+      remember: "记住我:"
       title: 登录
+      to make changes: 要修改 OpenStreetMap 的数据，您必须拥有一个帐户。
+      webmaster: 网站管理员
+    logout: 
+      heading: 从 OpenStreetMap 注销
+      logout_button: 注销
+      title: 注销
     lost_password: 
       email address: "邮箱:"
       heading: 忘记密码?
+      help_text: 输入您的电子邮件地址来注册，我们会寄出链接给它，而您可以用它来重设密码。
       new password button: 发送新密码
       notice email cannot find: 对不起，无法找到邮箱。
       notice email on way: 抱歉您的密码丢失 :-( 但是您可以根据发送的邮件重设密码。
       title: 丢失密码
     make_friend: 
-      already_a_friend: 您已经是朋友了
-      failed: 对不起，加{{name}} 为好友失败。
-      success: "{{name}}现在是您的朋友"
+      already_a_friend: 您已经和 {{name}} 是朋友了
+      failed: 对不起，未能添加 {{name}} 为好友。
+      success: "{{name}} 现在是您的朋友"
     new: 
       confirm email address: "确认邮箱:"
       confirm password: "密码确认:"
       contact_webmaster: 请联系 <a href="mailto:webmaster@openstreetmap.org">webmaster</a> 来安排一个账户创立 - 我们将尽快尝试处理您的请求。
+      continue: 继续
       display name: "显示姓名:"
+      display name description: 您公开显示的用户名。您可以稍后在首选项中更改。
       email address: "邮箱:"
       fill_form: 填写表格，我们将尽快向您发送一封邮件来激活您的帐户。
-      flash create success message: 成功创建用户。查看确认邮件，Check your email for a confirmation note, and you\'ll be mapping in no time :-)<br /><br />请注意您尚不能登录直到您收到并确认您的邮箱地址。<br /><br />如果您使用反垃圾系统发送确认请求，请保证将webmaster@openstreetmap.org列入友好名单，因为我们不能回复任何确认请求。
+      flash create success message: 感谢您的注册。我们已经寄出确认邮件到 {{email}}，只要您确认您的帐号后就可以制作地图了。 <br /><br />如果您使用会送出确认要求的防垃圾信系统，请确定您将 webmaster@openstreetmap.org 加入白名单中，因为我们无法回复任何确认请求。
       heading: 创建用户帐号
-      license_agreement: 创立此账户，意味您同意所有上传到openstreetmap.org的工作以及所有利用与openstreetmap.org相关的工具所创建的任何数据都将（非独家）授权于<a href="http://creativecommons.org/licenses/by-sa/2.0/">这种创作共用协议 (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 privacy policy including section on email addresses">隐私政策</a>)
       password: "密码:"
+      terms accepted: 感谢您接受新的贡献条款！
+      title: 创建帐户
     no_such_user: 
-      body: 对不起，没有此名{{user}}所对应的用户。请检查您的拼写，或者可能您点击了错误链接。
-      heading: 这个用户{{user}} 不存在
+      body: 对不起，没有此名 {{user}} 所对应的用户。请检查您的拼写，或者可能您点击了错误链接。
+      heading: 用户 {{user}} 不存在
       title: 没有此用户
     popup: 
+      friend: 朋友
       nearby mapper: 附近用户
       your location: 您的位置
     remove_friend: 
-      not_a_friend: "{{name}}不是您的朋友。"
-      success: "{{name}} 从您的朋友中删除。"
+      not_a_friend: "{{name}} 不是您的朋友。"
+      success: "{{name}} 已从您的朋友中删除。"
     reset_password: 
-      flash token bad: 未找到代符, 建议查看URL?
-      title: 重设密码
+      confirm password: "确认密码:"
+      flash changed: 您的密码已更改。
+      flash token bad: 未找到标记, 建议查看URL?
+      heading: 重置 {{user}} 的密码
+      password: "密码:"
+      reset: 重置密码
+      title: 重置密码
     set_home: 
       flash success: 成功保存您所在位置
+    suspended: 
+      body: "<p>\n对不起，您的帐户已因可疑\n活动被自动暂停。\n</p>\n<p>\n这项决定将在短期内由管理员审核，或是如果你想讨论这一点\n，可以联系{{webmaster}}。\n</p>"
+      heading: 帐户已暂停
+      title: 帐户已暂停
+      webmaster: 网站管理员
+    terms: 
+      agree: 同意
+      consider_pd: 除了上述协议，我同意将我的贡献授权为公共领域
+      consider_pd_why: 这是什么？
+      heading: 贡献者条款
+      legale_names: 
+        france: 法国
+        italy: 意大利
+        rest_of_world: 世界其他地区
+      legale_select: "请选择你居住的国家:"
+      title: 贡献者条款
     view: 
+      activate_user: 启用该用户
       add as friend: 添加为好友
       ago: ({{time_in_words_ago}} 以前)
+      block_history: 查看接受的封禁
+      blocks by me: 被我所封禁
+      blocks on me: 对我的封禁
+      confirm: 确认
+      confirm_user: 确认此用户
+      create_block: 阻止此用户
+      created from: "建立于:"
+      deactivate_user: 停用该用户
+      delete_user: 删除此用户
       description: 描述
-      diary: 日志
+      diary: 日记
       edits: 编辑
+      email address: "电子邮件地址:"
+      hide_user: 隐藏此用户
       if set location: 如果您设定您的位置，一张精美的地图及其他相关信息将出现在下方。您可以通过您的{{settings_link}}页面来设置您的位置。
       km away: "{{count}}公里之外"
+      latest edit: "上次编辑于 {{ago}}:"
+      m away: "{{count}}米远"
+      mapper since: "成为制图者于:"
+      moderator_history: 查看封禁来自
       my diary: 我的日志
       my edits: 我的编辑
       my settings: 我的设置
       my traces: 我的追踪路径
-      nearby users: "附近用户:"
-      new diary entry: 新日志入口
+      nearby users: 附近的其他用户
+      new diary entry: 新日记入口
       no friends: 您还没有添加任何好友。
-      no nearby users: 这里没有在您附近的用户。
+      no nearby users: 附近没有在进行制图的用户。
+      oauth settings: OAuth 设置
       remove as friend: 删除好友
+      role: 
+        administrator: 此用户是管理员
+        grant: 
+          administrator: 授予管理员权限
+        moderator: 此用户是版主
+        revoke: 
+          administrator: 撤销管理员权限
       send message: 发送信息
       settings_link_text: 设定
+      spam score: "垃圾邮件分数:"
+      status: "状态:"
+      traces: 轨迹
+      unhide_user: 取消隐藏此用户
       user location: 用户位置
       your friends: 您的朋友
+  user_block: 
+    blocks_on: 
+      heading: 对 {{name}} 的封禁列表
+      title: 对 {{name}} 的封禁
+    create: 
+      flash: 已建立对用户 {{name}} 的封禁
+    edit: 
+      back: 查看所有封禁
+      reason: "{{name}} 之所以被封禁的原因。请以冷静、合理的态度，尽量详细的说明有关情况。请记住，并非所有用户都了解社区的术语，所以请尝试使用较通俗的说法。"
+      show: 查看此封禁
+      submit: 更新封禁
+    filter: 
+      not_a_moderator: 您必须是管理员才能执行该操作。
+    helper: 
+      time_future: 结束于 {{time}}。
+      until_login: 作用到此用户登录为止。
+    index: 
+      empty: 尚未设置任何封禁。
+      heading: 用户封禁列表
+      title: 用户的封禁
+    new: 
+      back: 查看所有封禁
+      needs_view: 用户需要先登录，然后此封禁将被清除。
+      period: 从现在开始，此用户将被 API 阻挡的时间。
+      reason: "{{name}} 之所以被封禁的原因。请以冷静、合理的态度，尽量详细的说明有关情况。请记住，该信息将被公开。并非所有用户都了解社区的术语，所以请尝试使用较通俗的说法。"
+      submit: 创建封禁
+      tried_contacting: 我已联系此用户并请他们停止。
+    not_found: 
+      back: 返回索引
+      sorry: 抱歉，未找到 ID {{id}} 的用户封禁。
+    partial: 
+      confirm: 您确定吗？
+      creator_name: 创建者
+      not_revoked: (不撤销)
+      reason: 封禁的原因
+      revoke: 撤销!
+      revoker_name: 撤销由
+      show: 显示
+      status: 状态
+    period: 
+      one: 1 小时
+      other: "{{count}} 小时"
+    revoke: 
+      confirm: 你确定要撤销此封禁？
+      flash: 此封禁已被撤销。
+      heading: 正在撤销 {{block_by}} 对 {{block_on}} 的封禁
+      past: 此封禁已在 {{time}} 之前结束，现在不能被撤销。
+      revoke: 撤销!
+      time_future: 此封禁将于 {{time}} 结束。
+      title: 正在撤销对 {{block_on}} 的封禁
+    show: 
+      back: 查看所有封禁
+      confirm: 您确定吗？
+      edit: 编辑
+      heading: "{{block_on}} 被 {{block_by}} 封禁"
+      needs_view: 用户需要先登录，然后此封禁将被清除。
+      reason: "封禁的原因:"
+      revoke: 撤销!
+      revoker: "撤销者:"
+      show: 显示
+      status: 状态
+      time_future: 结束于 {{time}}
+      time_past: 结束于 {{time}} 之前
+      title: "{{block_on}} 被 {{block_by}} 封禁"
+    update: 
+      success: 封禁已更新。
+  user_role: 
+    filter: 
+      already_has_role: 这个用户已经有角色 {{role}}。
+      doesnt_have_role: 这个用户没有角色 {{role}}。
+      not_a_role: 字串 '{{role}}' 不是有效的角色。
+      not_an_administrator: 只有管理员可以执行用户角色管理，而你不是管理员。
+    grant: 
+      are_you_sure: 您确定要赋予用户 '{{name}}' 角色 '{{role}}' 吗?
+      confirm: 确认
+      fail: 无法授予用户 '{{name}}' 角色 '{{role}}'。请检查用户和角色是否都正确。
+      heading: 确认角色授予
+      title: 确认角色授予
+    revoke: 
+      are_you_sure: 您确定要吊销用户 '{{name}}' 角色 '{{role}}' 吗?
+      confirm: 确认
+      fail: 无法吊销用户 '{{name}}' 角色 '{{role}}'。请检查用户和角色是否都正确。
+      heading: 确认角色吊销
+      title: 确认角色吊销
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index f1bfc2ad2..51a6de1ef 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1,6 +1,7 @@
 # Messages for Chinese (Taiwan) (‪中文(台灣)‬)
 # Exported from translatewiki.net
 # Export driver: syck
+# Author: Mmyangfl
 # Author: Pesder
 zh-TW: 
   activerecord: 
@@ -313,7 +314,7 @@ zh-TW:
         description: 使用者最近的 OpenStreetMap 日記
         title: OpenStreetMap 日記
       language: 
-        description: R使用者最近的 OpenStreetMap (語言為 {{language_name}})
+        description: 使用者最近的 OpenStreetMap 日記(語言為 {{language_name}})
         title: OpenStreetMap 日記 (語言為 {{language_name}})
       user: 
         description: "{{user}} 最近的 OpenStreetMap 日記"
@@ -446,14 +447,24 @@ zh-TW:
       history_tooltip: 檢視對這個區域的編輯
       history_zoom_alert: 您必須先拉近才能編輯這個區域
   layouts: 
+    community_blogs: 社群部落格
+    community_blogs_title: OpenStreetMap 社群成員的部落格
     copyright: 版權 &amp; 授權條款
+    documentation: 文件
+    documentation_title: 該專案的文件
     donate: 以 {{link}} 給硬體升級基金來支援 OpenStreetMap。
     donate_link_text: 捐獻
     edit: 編輯
+    edit_with: 以 {{editor}} 編輯
     export: 匯出
     export_tooltip: 匯出地圖資料
+    foundation: 基金會
+    foundation_title: OpenStreetMap 基金會
     gps_traces: GPS 軌跡
     gps_traces_tooltip: 管理 GPS 軌跡
+    help: 求助
+    help_centre: 求助中心
+    help_title: 專案的說明網站
     history: 歷史
     home: 家
     home_tooltip: 移至家位置
@@ -477,12 +488,8 @@ zh-TW:
     make_a_donation: 
       text: 進行捐款
       title: 以捐贈金錢來支持 OpenStreetMap
-    news_blog: 新聞部落格
-    news_blog_tooltip: 關於 OpenStreetMap、自由地圖資料等的新聞部落格
     osm_offline: OpenStreetMap 資料庫目前離線中，直到必要的資料庫維護工作完成為止。
     osm_read_only: OpenStreetMap 資料庫目前是唯讀模式，直到必要的資料庫維護工作完成為止。
-    shop: 購買
-    shop_tooltip: 購買 OpenStreetMap 相關廠商的產品
     sign_up: 註冊
     sign_up_tooltip: 建立一個帳號以便能編輯
     tag_line: 自由的 Wiki 世界地圖
@@ -492,6 +499,8 @@ zh-TW:
     view_tooltip: 檢視地圖
     welcome_user: 歡迎，{{user_link}}
     welcome_user_link_tooltip: 您的使用者頁面
+    wiki: Wiki
+    wiki_title: 專案的 Wiki 網站
   license_page: 
     foreign: 
       english_link: 英文原文
@@ -499,7 +508,7 @@ zh-TW:
       title: 關於這個翻譯
     native: 
       mapping_link: 開始製圖
-      native_link: 中文版
+      native_link: 正體中文版
       text: 您正在檢閱英文版本的版權頁。你可以返回這個網頁的 {{native_link}} 或者您可以停止閱讀版權並{{mapping_link}}。
       title: 關於此頁
   message: 
@@ -720,8 +729,10 @@ zh-TW:
     edit: 
       anon_edits_link_text: 了解為什麼這很重要。
       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。
+      no_iframe_support: 您的瀏覽器不支持 HTML 嵌入式框架，這是這項功能所必要的。
       not_public: 您尚未將您的編輯開放至公領域。
       not_public_description: 在您這麼做之前將無法再編輯地圖。您可以在您的{{user_page}}將自己的編輯設定為公領域。
+      potlatch2_unsaved_changes: 您有未儲存的更改。（要在 Potlatch 2 中儲存，您應按一下儲存。)
       potlatch_unsaved_changes: 您還有未儲存的變更。 (要在 Potlatch 中儲存，您應該取消選擇目前的路徑或節點(如果是在清單模式編輯)，或是點選儲存(如果有儲存按鈕)。)
       user_page_link: 使用者頁面
     index: 
@@ -733,6 +744,7 @@ zh-TW:
         notice: 由 {{project_name}} 和它的貢獻者依 {{license_name}} 條款授權。
         project_name: OpenStreetMap 計畫
       permalink: 靜態連結
+      remote_failed: 編輯失敗 - 請確定已載入 JOSM 或 Merkaartor 並啟用遠端控制選項
       shortlink: 簡短連結
     key: 
       map_key: 圖例
@@ -905,6 +917,8 @@ zh-TW:
       trackable: 可追蹤 (以匿名方式分享，節點有時間戳記)
   user: 
     account: 
+      contributor terms: 
+        link text: 這是什麼？
       current email address: 目前的電子郵件位址：
       delete image: 移除目前的圖片
       email never displayed publicly: (永遠不公開顯示)
@@ -949,6 +963,8 @@ zh-TW:
       heading: 確認電子郵件位址的變更
       press confirm button: 按下確認按鈕以確認您的新電子郵件位址。
       success: 已確認您的電子郵件位址，感謝您的註冊！
+    confirm_resend: 
+      failure: 找不到使用者 {{name}}。
     filter: 
       not_an_administrator: 您需要一個管理者來執行該動作。
     go_public: 
@@ -965,18 +981,23 @@ zh-TW:
       summary_no_ip: "{{name}} 建立於： {{date}}"
       title: 使用者
     login: 
-      account not active: 抱歉，您的帳號尚未啟用。<br />請點選帳號確認電子郵件中的連結來啟用您的帳號。
+      account not active: 抱歉，您的帳號尚未啟用。<br />請點選帳號確認電子郵件中的連結來啟用您的帳號，或是<a href="{{reconfirm}}">要求寄一封新的確認信</a>。
       account suspended: 對不起，您的帳號已因可疑活動被暫停了。 <br />如果你想討論這一點，請聯繫{{webmaster}}。
+      already have: 已經有 OpenStreetMap 的帳號？請登入。
       auth failure: 抱歉，無法以這些資料登入。
+      create account minute: 建立一個帳號。只需要一分鐘。
       create_account: 建立一個帳號
       email or username: 電子郵件位址或使用者名稱：
       heading: 登入
       login_button: 登入
       lost password link: 忘記您的密碼？
+      new to osm: 第一次來到 OpenStreetMap？
       password: 密碼：
       please login: 請登入或{{create_user_link}}。
+      register now: 立即註冊
       remember: 記住我：
       title: 登入
+      to make changes: 要更改的 OpenStreetMap 的資料，您必須擁有一個帳號。
       webmaster: 網站管理員
     logout: 
       heading: 從 OpenStreetMap 登出
@@ -1003,12 +1024,13 @@ zh-TW:
       display name description: 您公開顯示的使用者名稱。您可以稍後在偏好設定中改變它。
       email address: 電子郵件位址：
       fill_form: 填好下列表單，我們會寄給您一封電子郵件來啟用您的帳號。
-      flash create success message: 使用者已成功建立。檢查您的電子郵件有沒有確認信，接著就要忙著製作地圖了 :-)<br /><br />請注意在收到並確認您的電子郵件位址前是無法登入的。<br /><br />如果您使用會送出確認要求的防垃圾信系統，請確定您將 webmaster@openstreetmap.org 加入白名單中，因為我們無法回覆任何確認要求。
+      flash create success message: 感謝您的註冊。我們已經寄出確認信到 {{email}}，只要您確認您的帳號後就可以製作地圖了。<br /><br />如果您使用會送出確認要求的防垃圾信系統，請確定您將 webmaster@openstreetmap.org 加入白名單中，因為我們無法回覆任何確認要求。
       heading: 建立使用者帳號
       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>)
       password: 密碼：
+      terms accepted: 感謝您接受新的貢獻條款！
       title: 建立帳號
     no_such_user: 
       body: 抱歉，沒有名為 {{user}} 的使用者。請檢查您的拼字，或者可能是按到錯誤的連結。
@@ -1063,6 +1085,7 @@ zh-TW:
       hide_user: 隱藏這個使用者
       if set location: 如果您設定了位置，一張漂亮的地圖和小指標會出現在下面。您可以在{{settings_link}}頁面設定您的家位置。
       km away: "{{count}} 公里遠"
+      latest edit: 上次編輯於 {{ago}}：
       m away: "{{count}} 公尺遠"
       mapper since: 成為製圖者於：
       moderator_history: 檢視阻擋來自
diff --git a/config/potlatch/locales/be-TARASK.yml b/config/potlatch/locales/be-TARASK.yml
index 8c5b08cf6..e004c9985 100644
--- a/config/potlatch/locales/be-TARASK.yml
+++ b/config/potlatch/locales/be-TARASK.yml
@@ -1,4 +1,4 @@
-# Messages for Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
+# Messages for Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
 # Exported from translatewiki.net
 # Export driver: syck
 # Author: EugeneZelenko
@@ -9,12 +9,14 @@ be-TARASK:
   action_addpoint: даданьне пункту ў канец дарогі
   action_cancelchanges: скасаваньне зьменаў да
   action_changeway: зьмены дарогі
+  action_createparallel: стварыць паралельныя дарогі
   action_createpoi: стварэньне пункту інтарэсу
   action_deletepoint: выдаленьне пункту
   action_insertnode: даданьне пункту на дарогу
   action_mergeways: аб'яднаньне двух дарогаў
   action_movepoi: перанос пункту інтарэсу
   action_movepoint: перамяшчэньне пункту
+  action_moveway: перанос дарогі
   action_pointtags: устаноўка тэгаў на пункты
   action_poitags: устаноўка тэгаў на пункт інтарэсу
   action_reverseway: зьмена напрамку дарогі
@@ -31,6 +33,7 @@ be-TARASK:
   advanced_tooltip: Дзеяньні палепшанага рэдагаваньня
   advanced_undelete: Аднавіць
   advice_bendy: Занадта выгнутае каб выпраміць (SHIFT каб выпраміць)
+  advice_conflict: Канфлікт на сэрвэры. Верагодна, Вам неабходна паўторнае захаваньне
   advice_deletingpoi: Выдаленьне пункту інтарэсу (Z для адмены)
   advice_deletingway: Выдаленьне дарогі (Z для адмены)
   advice_microblogged: "Ваш статус абноўлены: $1"
@@ -39,11 +42,14 @@ be-TARASK:
   advice_revertingway: Вяртаньне да апошняй захаванай вэрсіі (Z для адмены)
   advice_tagconflict: Тэгі не супадаюць. Калі ласка, праверце (Z для адмены)
   advice_toolong: Занадта доўгая для разблякваньня. Калі ласка, падзяліце на больш кароткія дарогі
+  advice_uploadempty: Няма чаго загружаць
   advice_uploadfail: Загрузка спыненая
   advice_uploadsuccess: Усе зьвесткі пасьпяхова загружаныя
+  advice_waydragged: Дарога перанесеная (Z для адмены)
   cancel: Адмяніць
   closechangeset: Закрыцьцё набору зьменаў
   conflict_download: Загрузіць іх вэрсію
+  conflict_overwrite: Замяніць вэрсію
   conflict_poichanged: Пасьля таго, як Вы пачалі рэдагаваньне, нехта зьмяніў пункт $1$2.
   conflict_relchanged: Пасьля таго, як Вы пачалі рэдагаваньне, нехта зьмяніў адносіны $1$2.
   conflict_visitpoi: Націсьніце 'Добра' каб паказаць пункт.
@@ -55,7 +61,9 @@ be-TARASK:
   deleting: выдаленьне
   drag_pois: Перацягніце і адпусьціце пункты інтарэсаў
   editinglive: Рэдагаваць ужывую
+  editingoffline: Рэдагаваньне афляйн
   emailauthor: "\\n\\nКалі ласка, дашліце паведамленьне пра памылку на адрас: richard@systemeD.net, пазначыўшы якія дзеяньні Вы выконвалі."
+  error_anonymous: Вы ня можаце кантактаваць з ананімным картографам.
   error_connectionfailed: Прабачце, немагчыма злучыцца з сэрвэрам OpenStreetMap. Усе апошнія зьмены не былі захаваныя.\n\nВы жадаеце паспрабаваць зноў?
   error_microblog_long: "Памылка адпраўкі да $1:\nHTTP-код: $2\nПаведамленьне пра памылку: $3\n$1 памылка: $4"
   error_nopoi: Пункт інтарэсу ня знойдзены (верагодна Вы адхіліліся ў бок?), таму немагчыма адменіць.
@@ -76,6 +84,7 @@ be-TARASK:
   hint_drawmode: націсьніце каб дадаць пункт\n, націсьніце двойчы/Return\n, каб скончыць лінію
   hint_latlon: "шырата $1\nдаўгата $2"
   hint_loading: загрузка зьвестак
+  hint_overendpoint: над канцавым пунктам ($1)\nклікніце каб далучыць\nshift-клікніце каб аб'яднаць
   hint_overpoint: над пунктам ($1)\nнацісьніце каб далучыць
   hint_pointselected: пункт выбраны\n(націсьніце з Shift на пункт\nкаб пачаць новую лінію)
   hint_saving: захаваньне зьвестак
@@ -98,6 +107,7 @@ be-TARASK:
   login_retry: Вашае імя удзельніка не было распазнанае. Калі ласка, паспрабуйце зноў.
   login_title: Немагчыма ўвайсьці
   login_uid: "Імя ўдзельніка:"
+  mail: Пошта
   more: Болей
   newchangeset: "Калі ласка, паспрабуйце зноў: Potlatch пачне новы набор зьменаў."
   "no": Не
@@ -105,11 +115,14 @@ be-TARASK:
   norelations: Няма сувязяў у цяперашняй вобласьці
   offset_broadcanal: Набярэжная шырокага канала
   offset_choose: Выбраць зьмяшчэньне (m)
+  offset_dual: Дарога з разьдзяляльнай паласой (D2)
   offset_motorway: Аўтамагістраль (D3)
   offset_narrowcanal: Набярэжная вузкага каналу
   ok: Добра
   openchangeset: Адкрыцьцё набору зьменаў
+  option_custompointers: Выкарыстоўваць курсоры пяра і рукі
   option_external: "Вонкавы запуск:"
+  option_fadebackground: Бляклы фон
   option_layer_cycle_map: OSM — мапа для раварыстаў
   option_layer_maplint: OSM - Maplint (памылкі)
   option_layer_nearmap: "Аўстралія: NearMap"
@@ -119,24 +132,35 @@ be-TARASK:
   option_layer_ooc_scotland: "Гісторыя Вялікабрытаніі: Шатляндыя"
   option_layer_os_streetview: "Вялікабрытанія: OS StreetView"
   option_layer_streets_haiti: "Гаіці: назвы вуліц"
+  option_layer_surrey_air_survey: "UK: Surrey Air Survey"
   option_layer_tip: Выберыце фон для паказу
+  option_limitways: Папярэджваць, калі загружаецца зашмат зьвестак
+  option_microblog_id: "Назва мікраблёга:"
+  option_microblog_pwd: "Пароль мікраблёга:"
   option_noname: Падсьвечваць дарогі без назваў
   option_photo: "KML з фота:"
   option_thinareas: Выкарыстоўваць больш тонкія лініі для абшараў
   option_thinlines: Выкарыстоўваць тонкія лініі ва ўсіх маштабах
   option_tiger: Пазначаць нязьменныя TIGER
   option_warnings: Паказваць разгортваемыя папярэджаньні
+  point: Пункт
+  preset_icon_airport: Аэрапорт
   preset_icon_bar: Бар
   preset_icon_bus_stop: Аўтобусны прыпынак
+  preset_icon_cafe: Кавярня
   preset_icon_cinema: Кінатэатар
   preset_icon_convenience: Мінімаркет
   preset_icon_disaster: Гаіцянскі будынак
+  preset_icon_fast_food: Забягайлаўка
   preset_icon_ferry_terminal: Паром
   preset_icon_fire_station: Пажарны пастарунак
   preset_icon_hospital: Шпіталь
   preset_icon_hotel: Гатэль
   preset_icon_museum: Музэй
+  preset_icon_parking: Стаянка
   preset_icon_pharmacy: Аптэка
+  preset_icon_place_of_worship: Культавае збудаваньне
+  preset_icon_police: Паліцэйскі пастарунак
   preset_icon_post_box: Паштовая скрыня
   preset_icon_pub: Паб
   preset_icon_recycling: Сьметніца
@@ -144,6 +168,7 @@ be-TARASK:
   preset_icon_school: Школа
   preset_icon_station: Чыгуначная станцыя
   preset_icon_supermarket: Супэрмаркет
+  preset_icon_taxi: Стаянка таксі
   preset_icon_telephone: Тэлефон
   preset_icon_theatre: Тэатар
   preset_tip: Выберыце з мэню існуючыя тэгі, якія апісваюць $1
@@ -157,9 +182,11 @@ be-TARASK:
   prompt_launch: Перайсьці па вонкавай URL-спасылцы
   prompt_live: Падчас рэдагаваньня ўжывую, кожны элемэнт, які Вы мяняеце, будзе захаваны ў базу зьвестак OpenStreetMap адразу. Гэты рэжым не рэкамэндуецца для пачаткоўцаў. Вы ўпэўнены?
   prompt_manyways: Гэты абшар утрымлівае шмат элемэнтаў і будзе доўга загружацца. Можа лепей наблізіцца?
+  prompt_microblog: Даслаць да $1 (засталося $2)
   prompt_revertversion: "Вярнуцца да папярэдняй захаванай вэрсіі:"
   prompt_savechanges: Захаваць зьмены
   prompt_taggedpoints: Некаторыя пункты на гэтай дарозе ўтрымліваюць апісаньне ці маюць адносіны. Сапраўды выдаліць?
+  prompt_track: Пераўтварыць GPS-трэк у дарогі
   prompt_unlock: Націсьніце, каб разблякаваць
   prompt_welcome: Вітаем у OpenStreetMap!
   retry: Паспрабаваць
@@ -170,7 +197,9 @@ be-TARASK:
   tags_findatag: Знайсьці тэг
   tags_findtag: Знайсьці тэг
   tags_matching: Папулярныя тэгі, якія адпавядаюць '$1'
+  tags_typesearchterm: "Увядзіце слова для пошуку:"
   tip_addrelation: Дадаць да сувязі
+  tip_addtag: Дадаць новы тэг
   tip_alert: Узьнікла памылка. Націсьніце, каб атрымаць падрабязнасьці
   tip_anticlockwise: Акружная дарога супраць гадзіньнікавай стрэлцы — націсьніце, каб зьмяніць напрамак
   tip_clockwise: Акружная дарога па гадзіньнікавай стрэлцы — націсьніце, каб зьмяніць напрамак
@@ -181,6 +210,8 @@ be-TARASK:
   tip_photo: Загрузка фота
   tip_presettype: Выберыце які тып шаблёнаў паказваць ў мэню.
   tip_repeattag: Паўтарыць тэг з папярэдняй выбранай дарогі (R)
+  tip_revertversion: Выберыце дату для вяртаньня да
+  tip_selectrelation: Дадаць да выбранага маршруту
   tip_splitway: Падзяліць дарогу ў выбраным пункце (X)
   tip_tidy: Уладкаваць пункты на дарогі (T)
   tip_undo: Адмяніць $1 (Z)
@@ -190,6 +221,7 @@ be-TARASK:
   uploading_poi: Загрузка пункту інтарэсу $1
   uploading_poi_name: Загрузка пункту інтарэсы $1, $2
   uploading_relation: Загрузка сувязі $1
+  uploading_relation_name: Загрузка сувязі $1, $2
   uploading_way: Загрузка дарогі $1
   uploading_way_name: Загрузка шляху $1, $2
   warning: Папярэджаньне!
diff --git a/config/potlatch/locales/br.yml b/config/potlatch/locales/br.yml
index 8b0a4fbc0..dd3709107 100644
--- a/config/potlatch/locales/br.yml
+++ b/config/potlatch/locales/br.yml
@@ -79,7 +79,7 @@ br:
   heading_pois: Kregiñ ganti
   heading_quickref: Dave prim
   heading_surveying: Oc'h evezhiañ
-  heading_tagging: O valizennañ
+  heading_tagging: O tikedenniñ
   heading_troubleshooting: Kudennoù
   help: Skoazell
   help_html: "<!--\n\n========================================================================================================================\nPajenn 1 : Digoradur\n\n--><headline>Degemer mat e Potlatch</headline>\n<largeText>Potlatch zo anezhañ ur programm aes da implijout evit degas kemmoù war OpenStreetMap. Tresit hentoù, gwenodennoù, merkoù war an douar ha stalioù diwar ho roadennoù GPS, skeudennoù dre loarell pe kartennoù kozh.\n\nGant ar pajennoù skoazell-mañ e vo desket deoc'h implij diazez Potlatch hag e vo lavaret deoc'h penaos gouzout hiroc'h. Klikit war an titloù amañ a-us evit kregiñ ganti.\n\nPa vo echu ganeoc'h, n'ho po nemet klikañ en ul lec'h bennak all war ar bajenn.\n\n</largeText>\n\n<column/><headline>Traoù mat da c'houzout</headline>\n<bodyText>Arabat eiltresañ kartennoù all !\n\nMa tibabit 'Kemmañ war-eeun' e vo kaset an holl gemmoù degaset ganeoc'h d'ar bank titouroù a-feur ma tresit anezho (<i>diouzhtu-dak</i>!). Ma n'oc'h ket arroutet-kaer, grit gant 'Kemmañ dre enrollañ' ha ne vo kaset ho kemmoù nemet goude bezañ kliket war 'enrollañ'.\n\nDre-vras e vo diskouezet war ar gartenn ar c'hemmoù graet ganeoc'h un eurvezh pe ziv goude ma vint bet graet (tammoù traoù a c'hall padout ur sizhunvezh). N'emañ ket pep tra war ar gartenn rak amsklaer e teufe da vezañ. Koulskoude, p'eo frank a wirioù roadennoù OpenStreetMap, e c'hall pep hini sevel kartennoù a ziskouez elfennoù disheñvel - evel <a href=\"http://www.opencyclemap.org/\" target=\"_blank\">OpenCycleMap</a> pe <a href=\"http://maps.cloudmade.com/?styleId=999\" target=\"_blank\">Midnight Commander</a>.\n\nHo pet soñj ez eo, <i>war un dro</i> ur gartenn blijus da welet (tresit 'ta krommennoù brav evit ar c'hornblegoù) hag un diagramm (gwiriit mat emañ stok-ha-stok an hentoù er poentoù kej).\n\nHa lavaret hon eus deoc'h c'hoazh eo arabat eiltresañ kartennoù all ?\n</bodyText>\n\n<column/><headline>Gouzout hiroc'h</headline>\n<bodyText><a href=\"http://wiki.openstreetmap.org/wiki/Potlatch\" target=\"_blank\">Dornlevr Potlatch</a>\n<a href=\"http://lists.openstreetmap.org/\" target=\"_blank\">Rolloù skignañ</a>\n<a href=\"http://irc.openstreetmap.org/\" target=\"_blank\">Flap enlinenn (skoazell war-eeun)</a>\n<a href=\"http://forum.openstreetmap.org/\" target=\"_blank\">Forom web</a>\n<a href=\"http://wiki.openstreetmap.org/\" target=\"_blank\">Wiki ar gumuniezh</a>\n<a href=\"http://trac.openstreetmap.org/browser/applications/editors/potlatch\" target=\"_blank\">Kod tarzh Potlatch</a>\n</bodyText>\n<!-- News etc. goes here -->\n\n<!--\n========================================================================================================================\nPajenn 2 : Kregiñ ganti\n\n--><page/><headline>Kregiñ ganti</headline>\n<bodyText>Bremañ m'eo digor Potlatch ganeoc'h, klikit war \"Aozañ gant enrolladennoù\" evit kregiñ ganit.\n\nSetu m'oc'h prest da dresañ ur gartenn. Ar pep aesañ, evit kregiñ ganti, eo lakaat un nebeud lec'hioù dedennus - pe \"LDoù\". Ar re-se a c'hall bezañ tavarnioù, ilizoù, porzhioù-houarn... ar pezh a garit.</bodytext>\n\n<column/><headline>Riklañ-dilec'hiañ</headline>\n<bodyText>Evit aesaat ar jeu deoc'h e c'hallot gwelet un dibab LDoù, just e traoñ ho kartenn. Ken eeun ha tra eo merkañ unan war ar gartenn : n'hoc'h eus ken nemet riklañ-dilec'hiañ unan davet e lec'hiadur war ar gartenn. Ha na rit ket biloù ma ne zeuit ket a-benn d'e lec'hiañ diwar ar c'hentañ taol : gallout a rit e zilec'hiañ betek ma vo el lec'h mat. Notit mat eo dreistlinennet an LD e melen, da ziskouez eo bet diuzet.\n\nUr wezh ma vo bet graet an dra-se ganeoc'h e fello deoc'h reiñ un anv d'an davarn (pe iliz pe ti-gar). Gwelet a reot un daolennig o tont war wel en traoñ. Unan eus ar monedoù a vo 'anv' heuliet gant \"(skrivañ an anv amañ)\". Grit se, klikit war an destenn-se ha skrivit an anv.\n\nKlikit en ul lec'h bennak all war ar gartenn evit diziuzañ an LD, ha dont a ray ar banell vihan e liv war wel adarre.\n\nAes eo, neketa ? Klikit war \"Enrollañ\" (en traoñ a-zehou) p'ho po echu.\n</bodyText><column/><headline>Dilec'hiañ</headline>\n<bodyText>Evit mont d'ul lodenn disheñvel eus ar gartenn, riklit un takad goullo eus ar gartenn. Karget e vo ar roadennoù gant Potlatch (sellit en nec'h hag a-zehou).\n\nLavaret ez eus bet deoc'h klikañ war \"Aozañ gant enrollañ\" met gallout a rit ivez 'enrollañ war-eeun'. Ma rit se ez aio diouzhtu ar c'hemmoù degaset ganeoc'h er bank titouroù. Setu aze n'eus bouton 'Enrollañ' ebet. Talvoudus eo evit degas kemmoù bihan hag evit <a href=\"http://wiki.openstreetmap.org/wiki/Current_events\" target=\"_blank\">abadennoù kartennaouiñ</a>.</bodyText>\n\n<headline>Pazennoù da-heul</headline>\n<bodyText>Laouen oc'h gant kement-se ? Mat. Klikit war ar bouton \"En em lec'hiañ\" evit kavout penaos dont da vezañ ur <i>gwir</i> gartennour !</bodyText>\n\n<!--\n========================================================================================================================\nPajenn 3 : En em lec'hiañ\n\n--><page/><headline>En em lec'hiañ gant ur GPS</headline>\n<bodyText>Mennozh bras OpenStreetMap eo sevel ur gartenn hep ar gwirioù aozer stag ouzh ar c'hartennoù all. Talvezout a ra n'hallot ket tresañ forzh petra : ret eo deoc'h mont war an dachenn hoc'h-unan. Dre chañs, n'eus nemet plijadur da gaout !\nAn doare aesañ d'en ober eo implijout ur GPS chakod. Kavit un takad digartenn, kit di war droad pe war velo en ur weredekaat ho k/GPS. Merkit anvioù ar straedoù ha kement tra dedennus all a verzot (tavarnioù, ilizoù...) e-ser ho pourmenadenn.\n\nPa zistroot d'ar gêr, e vo gant ho k/GPS un enrolladenn \"tracklog\" eus kement lec'h m'oc'h bet. Gallout a rit kargañ an traoù-se en OpenStreetMap.\n\nAr GPSoù gwellañ eo ar re a enroll al lec'hiadur aliezik (bep eilenn pe ziv) ha dezho ur memor bras. Ur bern eus hor c'hartennourien a ra gant GPSoù chakod Gamin pe unvezioù Bluetooth bihan. War hor wiki e vo kavet <a href=\"http://wiki.openstreetmap.org/wiki/GPS_Reviews\" target=\"_blank\">burutelladennoù GPS</a> dre ar munud.</bodyText>\n\n<column/><headline>Kargañ ho roudenn</headline>\n<bodyText>Bremañ e rankit eztennañ ho roadnnoù er-maez eus ar GPS. Marteze e teu ho k/GPS gant un tamm meziant pe e c'hallit eilañ ar restroù gant un alc'hwez USB. Ma n'emañ ket kont evel-se, klaskit <a href=\"http://www.gpsbabel.org/\" target=\"_blank\">GPSBabel</a>. Ne vern an doare, ret eo d'ar roadennoù bezañ er furmad GPX.\n\nDa c'houde, grit gant an ivinenn 'roudennoù GPS' da enporzhiañ ho roudenn war OpenStreetMap. Kement-se n'eo nemet an deroù. Evit ar mare n'emañ ket an traoù war ar gartenn c'hoazh. Ret eo deoc'h tresañ ha merkañ anvioù ar straedoù c'hwi hoc'h-unan en ur ober gant ur roudenn evit heñchañ ac'hanoc'h.</bodyText>\n<headline>Implijout ho roudenn</headline>\n<bodyText>Klaskit ar roudennoù enporzhiet er roll 'roudennoù GPS' ha klikit war 'aozañ' <i>just e-kichenik</i>. Loc'hañ a raio Potlach gant ar roudenn-se karget hag an holl valizennoù. Prest oc'h da dresañ !\n\n<img src=\"gps\">Klikañ war ar bouton a c'hallit ober ivez da welet roudennoù GPS ar re all (nemet ar balizennoù ne welot ket) evit an takad a labourit warnañ. Dalc'hit war Pennlizh. mar fell deoc'h diskwel ho roudennoù deoc'h nemetken.</bodyText>\n<column/><headline>Implijout luc'hskeudennoù dre loarell</headline>\n<bodyText>Ma n'eus GPS ebet ganeoc'h, arabat en em chalañ. E kêrioù zo hon eus luc'hskeudennoù dre loarell a c'haller tresañ warno, pourchaset gant skoazell hegarat Yahoo! (trugarez dezhañ !). Kit d'ober un dro da notennañ anvioù ar straedoù, ha neuze distroit ha tresit war al linennoù.\n\n<img src='prefs'>Ma ne welit ket ar skeudenn dre loarell, klikit war ar bouton dibaboù ha gwiriit hag-eñ eo diuzet \"Yahoo!\". Ma n'he gwelit ket c'hoazh, marteze n'eus ket anezhi evit ho kêr, pe ezhomm zo da zoumañ un tammig pelloc'h.\n\nWar ar bouton dibarzhioù-se e kavot dibaboù all, evel ur gartenn hep gwirioù aozer eus Breizh-Veur hag OpenTopoMap evit SUA. Diuzet int bet a-ratozh peogwir omp aotreet d'ober ganto. Na eiltresit ket diwar kartennoù pe skeudennoù dre nij (abalamout d'ar gwirioù aozer).\n\nA-wezhioù e vez un tammig dilec'hiet ar skeudennoù dre loarell e-keñver al lec'h m'emañ an hentoù e gwirionez. M'en em gavit gant se, pouezit war Esaouenn ha dilec'hiit an drekleur betek ma vo el lec'h mat. Fiziit atav muioc'h er roudennoù GPS eget er skeudennoù dre loarell.</bodytext>\n\n<!--\n========================================================================================================================\nPajenn 4 : Tresañ\n\n--><page/><headline>Tresañ hentoù</headline>\n<bodyText>Evit tresañ un hent (pe ur 'wenodenn') a grog en ul lec'h gwerc'h war ar gartenn, klikit war al lec'h a fell deoc'h; goude-se klikit ivez war kement poent eus an hent. Ur wezh echu ganeoc'h, daouglikit pe pouezit war Enmont - ha goude-se klikit un tu bennak all evit diziuzañ an hent.\n\nEvit tresañ un hent en ur gregiñ adalek un hent all, klikit war an hent-se d'e ziuzañ; ruz e vo merket ar poentoù anezhañ. Pouezit war Pennlizh. ha klikit war unan eus ar poentoù-se da gregiñ gant un hent all. (ma n'eus poent ruz ebet er poent kej, grit pennlizh.+klik el lec'h mar fell deoc'h lakaat unan).\n\nKlikit war « Enrollañ » (en traoñ a-zehou) pa vo echu ganeoc'h. Enrollit alies, betek-gouzout e vefe ur gudenn gant ar servijer.\n\nNe vo ket diskouezet diouzhtu ho kemmoù war ar benngartenn. Ret eo gortoz un eurvezh pe ziv peurliesañ, ha betek ur sizhunvezh a-wechoù.\n</bodyText><column/><headline>Ober kroashentoù</headline>\n<bodyText>Pouezus-meurbet eo e vefe ur poent (pe ur 'skoulm') el lec'h ma kej daou hent. Implijet e vez an dra-se gant an dreserien hentadoù da c'houzout pelec'h treiñ.\n\nPotlach a ra war-dro an dra-se gant ma'z po taolet evezh da glikañ <i>rik</i> war an hent a fell deoc'h kejañ gantañ. Arouezioù zo a harp ac'hanoc'h : dont a ra ar poentoù da vezañ glas, cheñch a ra ar poenterioù hag ur wezh echu e vo du trolinenn ar poent kej.</bodyText>\n<headline>Dilec'hiañ ha dilemel</headline>\n<bodyText>Mont a ra en-dro evel ma oac'h o c'hortoz. Evit dilemel ur poent, diuzit-eñ ha pouezit war Dil. Evit dilemel un hent a-bezh, pouezit war Pennlizh.-Dil.\n\nEvit dilec'hiañ un dra bennak eo trawalc'h riklañ-eñ. (Ret e vo deoc'h klikañ ha gortoz ur pennad a-raok riklañ un hent evit ma ne vefe ket graet ganeoc'h hep rat.)</bodyText>\n<column/><headline>Tresañ traoù kempleshoc'h</headline>\n<bodyText><img src=\"scissors\">Ma vez daou anv disheñvel gant div lodenn eus an hevelep hent e vo ret deoc'h o disrannañ. Klikit war an hent ha war ar poent dispartiañ; klikit war ar sizhailh. (gallout a rit kendeuziñ hentoù en ur glikañ war Kontroll, pe alc'hwez an Aval war Mac, met na gendeuzit ket daou seurt hent pe daou hent dezho anvioù disheñvel).\n\n<img src=\"tidy\">Un tammig eo diaes ar c'hroashentoù-tro da dresañ. Potlach a c'hall skoazellañ ac'hanoc'h. Brastresit al lagadenn ha taolit evezh e vo skoulmet mat an dro; goude-se klikit war an arlun-mañ evit ma vo peurgelc'hiek. (An dra-se a c'hallit ober war an hentoù ivez, evit eeunaat anezho).</bodyText>\n<headline>Lec'hioù dedennus</headline>\n<bodyText>Tra gentañ hoc'h eus desket a oa riklañ-dilec'hiañ ul lec'h dedennus. Gallout a rit ivez krouiñ unan en ur zaouglikañ war ar gartenn : dont a ra ur c'helc'h gwer war wel. Penaos an diaoul merkañ ez eo un davarn , un iliz pe un dra bennak all c'hoazh ? Klikit war 'Balizennañ' a-is evit gouzout !\n\n<!--\n========================================================================================================================\nPajenn 4 : Balizennañ\n\n--><page/><headline>Peseurt hent eo ?</headline>\n<bodyText>Ur wezh treset un hent ganeoc'h, e tlfec'h lavaret petra eo. Un hent bras, ur wenodenn pe ur stêr ? Pe anv eo ? Daoust ha reolennoù difer zo (da sk. \"berzet ouzh ar marc'hoù-houarn\") ?\n\nE OpenStreetMap eo termenet an dra-se en ur ober gant 'balizennoù'. Div lodenn zo dezho ha gallout a rit kaout kement anezho ha ma karit. Da sk. e c'hallit ouzhpennañ <i>highway | trunk</i> da verkañ ez eo ur pennhent; <i>highway | residential</i> da verkañ eo un hent annezet; pe <i>highway | footway</i> da verkañ ez eo un hent bale. Mard eo berzet ouzh ar marc'hoù-houarn e c'hallit ouzhpennañ <i>bicycle | no</i>. Goude-se, evit merkañ an anv anezhañ, ouzhpennit <i>name | Straed ar Marc'hallac'h</i>.\n\nE Potlach e teu war wel ar balizennoù e traoñ ar skramm : klikit war un hent hag e welot ar balizennoù anezhañ. Klikit war an arouezenn '+' (en traoñ a-zehou) da ouzhpennañ ur valizenn nevez. Evit he diverkañ, klikañ war an 'x' en he c'hichen.\n\nBalizennañ hentoù penn-da-benn a c'hallit ober; ar poentoù war an hentoù (da sk., un treizhaj pe gouleier tremenerezh) hag al lec'hioù dedennus.</bodytext>\n<column/><headline>Implijout balizennoù rakdiuzet</headline>\n<bodyText>Evit ho sikour da gregiñ ganti, Polatch en deus balizennoù prest-ha-tout.\n\n<img src=\"preset_road\">Diuzit un hent, ha kit dre anholl arouezennoù betek ma kavot unan a zere. Da c'houde, dibabit an dibarzhioù a glot ar gwellañ el lañser.\n\nSe a leunio ar balizennoù. Lod a chomo peuzgoullo da vezañ leuniet ganeoc'h, da skouer, gant anv an straed hag an niverenn.</bodyText>\n<headline>Hentoù unroud</headline>\n<bodyText>Marteze e fello deoch' ouzhpennañ ur valizenn evel <i>oneway | yes</i> - met penaos merkañ an tu ? Ur bir zo en traoñ a-gleiz a verk tu an hent, eus an disparti a-gleiz. Klikit warnañ da eilpennañ an tu.</bodyText>\n<column/><headline>Dibab ho palizennoù deoc'h-c'hwi</headline>\n<bodyText>Evel-just, n'oc'h ket rediet d'ober gant ar balizennoù raktermenet hepken. Dre implijout ar bouton « + », e c'hallit implijout forzh peseurt balizenn all.\n\nGwelet peseurt balizenoù a vez implijet gant an dud all a c'hallit war <a href=\"http://osmdoc.com/en/tags/\" target=\"_blank\">OSMdoc</a>, hag unhir a roll balizennoù implijet-kenañ zo war hor wiki anvet <a href=\"http://wiki.openstreetmap.org/wiki/Map_Features\" target=\"_blank\">Map Features</a>. Met kement-se n'eo <i>nemet kinnigoù, n'int ket reolennoù</i>. Gallout a rit ijinañ ar balizennoù a fell deoc'h pe amprestañ re an implijerien all.\n\nAbalamour ma vez implijet OpenStreetMap evit ober kalz kartennoù disheñvel, e vo diskouezet gant pep kartenn he dibab balizennoù dezhi.</bodyText>\n<headline>Darempredoù</headline>\n<bodyText>A-wezhioù n'eus ket trawalc'h gant ar balizennoù hag e fell deoc'h 'bodañ ' daou hent pe muioc'h. Marteze eo difennet treiñ eus un eil hent d'egile pe 20 hent asambles a ya d'ober un hent divrodegoù balizennet. Gallout a rit ober an dra-se gant un arc'hwel anvet 'darempredoù'. <a href=\"http://wiki.openstreetmap.org/wiki/Relations\" target=\"_blank\">Gouzout hiroc'h</a> war ar wiki.</bodyText>\n\n<!--\n========================================================================================================================\nPajenn 6 : Kudennoù\n\n--><page/><headline>Dizober fazioù</headline>\n<bodyText><img src=\"undo\">Hemañ eo ar bouton dizober (gallout a rit ivez pouezañ war Z) - dizober a raio an dra ziwezhañ hoc'h eus graet.\n\nGallout a rit 'distreiñ' da stumm kent unhent pe ur poent bennak.  Diuzit-eñ ha klikit war an ID anezhañ (an niver en traoñ a-gleiz) ha pouezit war H (evit 'istor'). Gwelet a reot roll an holl dud o deus kemmet anezhañ ha pegoulz. Dibabit ur stumm da assevel ha klikit war dizober.\n\nM'hoc'h eus diverket un hent dre fazi hag enrollet an traoù, klikit war U (evit 'Undelete', diziverkañ e saozneg). Dont a raio war wel an holl hentoù diverket. Dibabit an hini a fell deoc'h, dibrennit anezhañ en ur glikañ war ar c'hadranas ruz hag enrollit evel boas.\n\nSoñjal a ra deoc'h ez eus bet graet ur fazi gant unan bennak all ? Kasit ur gemennadenn jentil dezhañ. Implijit an istor (H) evit diuzañ e anv ha goude-se klikit war \"Postel\".\n\nImplijit an Enseller (el lañser \"Araokaet\") evit kaout titouroù talvoudus diwar-benn an hent pe ar poent red.\n</bodyText><column/><headline>FAGoù</headline>\n<bodyText><b>Penaos e c'hallan gwelet ma foentoù tro ?</b>\nAr poentoù tro ne zeuont war wel nemet ma klikit war 'aozañ' e-kichen anv ar roudenn adalek 'Roudennoù GPS'. Ret eo d'ar restr bezañ poentoù tro ha roudennoù enni. Disteuler a ra ar servijer kement restr enni poentoù tro nemetken.\n\nFAGoù all evit <a href=\"http://wiki.openstreetmap.org/wiki/Potlatch/FAQs\" target=\"_blank\">Potlatch</a> hag <a href=\"http://wiki.openstreetmap.org/wiki/FAQ\" target=\"_blank\">OpenStreetMap</a>.\n</bodyText>\n\n\n<column/><headline>Labourat buanoc'h</headline>\n<bodyText>Seul belloc'h e zoumit seul vuioc'h a roadennoù a zle bezañ karget gant Potlatch. Zoumit tostoc'h a-raok klikañ war \"Aozañ\".\n\nDiweredekait an dibarzh 'Erlec'hiañ al logodenn gant ar C'hreion hag an Dorn' (e prenestr an dibarzhioù) evit un tizh brasoc'h.\n\nMard eo gorrek ar servijer, distroit diwezhatoc'hik. <a href=\"http://wiki.openstreetmap.org/wiki/Platform_Status\" target=\"_blank\">Gwiriit war ar wiki</a> evit ar c'hudennoù anavezet. MAreoù zo, evel ar Sul da noz a vez soulgarget dalc'hmat.\n\nLakait Potlatch da gaout soñj eus ar rikoù balizennañ a implijit ar muiañ/ Diuzit un hent pe ur poent gant ar balizennoù-se ha pouezit war Ktrl, Pennlizh. hag un niver etre 1 ha 9. Da c'houde, evit o lakaat en-dro, pouezit Pennlizh. hag an niverenn-se. (Aze e vint bep tro ha ma implijot Potlatch war an urzhiataer-mañ).\n\nGrit un hent gant ho roudenn GPS en ur gavout anezhañ er roll 'Roudennoù GPS' da gentañ, en ur glikañ war 'Aozañ' e-kichen, hag en ur glikañ war ar bouton 'amdreiñ' er fin. Prennet e vo, e ruz, e-giz-se ne vo ket enrollet.  Aozit-eñ da gentañ a-raok klikañ war ar c'hadranas ruz evit e zibrennañ pa viot prest d'e enrollañ.</bodytext>\n\n<!--\n========================================================================================================================\nPajenn 7 : Berr-ha-berr\n\n--><page/><headline>War betra klikañ</headline>\n<bodyText><b>Riklañ ar gartenn</b> evit dilec'hiañ.\n<b>Daou glik</b> evit krouiñ un LD nevez.\n<b>Ur c'hlik</b> evit kregiñ gant un hent nevez.\n<b>Derc'hel ha riklañ un LD</b> evit e zilec'hiañ.</bodyText>\n<headline>Pa dreser un hent</headline>\n<bodyText><b>Daouglikit</b> pe <b>pouezit war ar bouton Enmont</b> evit echuiñ tresañ.\n<b>Klikit</b> war un hent all evit ober ur c'hroashent.\n<b>Pennlizh+klik dibenn un hent all</b> evit kendeuziñ.</bodyText>\n<headline>Pa vez diuzet un hent</headline>\n<bodyText><b>Klikit war ur poent</b> evit e ziuzañ.\n<b>Pennlizh+klik war an hent</b> da zegas ur poent nevez.\n<b>Pennlizh+klik war ur poent</b> da voulc'hañ un hent nevez alese.\n<b>Kontroll+klik war un hent all</b> evit kendeuziñ.</bodyText>\n</bodyText>\n<column/><headline>Berradurioù klavier</headline>\n<bodyText><textformat tabstops='[25]'>B Ouzhpennañ ur valizenn mammenn eus an drekleur\nC Serriñ ar strollad kemmoù\nG Diskouez ar roudennoù <u>G</u>PS\nH Diskouez an istor\nI Diskouez an enseller\nJ <u>J</u>untrañ ar poent d'ur c'hroashent\n(+Shift) Unjoin from other ways\nK Prennañ/dibrennañ an diuzadenn red\nL Diskouez al <u>l</u>edred/hedred red\nM Brasaat ar prenestr aozañ\nP Krouiñ un hent kenstur\nR Adskrivañ ar balizennoù\nS Enrollañ (nemet e vefed oc'h aozañ war-eeun)\nT Aozañ en ul linenn eeun/kelc'h\nU Assevel (diskouez an hentoù diverket)\nX Troc'hañ an hent etre daou\nZ Dizober\n- Lemel ar poent eus an hent-mañ hepken\n+ Ouzhpennañ ur valizenn nevez\n/ Diuzañ un hent all a rann ar poent-se\n</textformat><textformat tabstops='[50]'>Dil Dilemel ar poent\n  (+Pennlizh.) Diverkañ an hent a-bezh\nKas Echuiñ tresañ al linenn\nSpace Derc'hel ha dilec'hiañ an drekleur\nEsc Dilezel ar c'hemmoù; adkargañ adalek ar servijer\n0 Lemel an holl valizennoù\n1-9 Diuzañ ar balizennoù rakdiuzet\n  (+Shift) Dibab ar balizennoù enrollet\n  (+S/Ktrl) Memoriñ ar balizennoù\n§ or ` Kelc'hiad etre ar strolladoù balizennoù\n</textformat>\n</bodyText>"
diff --git a/config/potlatch/locales/ca.yml b/config/potlatch/locales/ca.yml
index 624f7034b..e594faf66 100644
--- a/config/potlatch/locales/ca.yml
+++ b/config/potlatch/locales/ca.yml
@@ -12,9 +12,9 @@ ca:
   action_createparallel: crea vies paralel·les
   action_createpoi: Crea un punt d'interès (POI)
   action_deletepoint: Esborra un punt
-  action_insertnode: afegir un node a una via
+  action_insertnode: addició d'un node a una via
   action_mergeways: fusió de dues vies
-  action_movepoi: moure un punt d'interès (POI)
+  action_movepoi: s'estaà movent un punt d'interès (POI)
   action_movepoint: Moure un punt
   action_moveway: moviment d'una via
   action_pointtags: Posa etiquetes en un punt
@@ -22,9 +22,9 @@ ca:
   action_reverseway: inverteix el sentit de la via
   action_revertway: reverteix una via
   action_splitway: Divideix una via
-  action_waytags: establir etiquetes d'una via
+  action_waytags: l'establiment d'etiquetes d'una via
   advanced: Avançat
-  advanced_close: Tancar conjunt de canvis
+  advanced_close: Tanca el conjunt de canvis
   advanced_history: Historial de la via
   advanced_inspector: Inspector
   advanced_maximise: Maximitzar la finestra
@@ -34,7 +34,7 @@ ca:
   advanced_undelete: Restaura
   advice_bendy: Massa corbes per a redreçar (shift per a forçar)
   advice_conflict: Conflicte en el servidor - pot ser que hagi de guardar de nou
-  advice_deletingpoi: Esborrant POI (Z per a desfer)
+  advice_deletingpoi: S'estan esborrant els punts d'interès (Z per desfer)
   advice_deletingway: Esborra via (Z per desfer)
   advice_microblogged: Actualitzat el seu estat de $1
   advice_nocommonpoint: Les vies no comparteixen un punt en comú
@@ -44,16 +44,16 @@ ca:
   advice_toolong: Massa llarg per desbloquejar - si us plau, divideixi'l  en vies més curtes
   advice_uploadempty: No hi ha gens que pujar
   advice_uploadfail: Pujada detinguda
-  advice_uploadsuccess: Totes les dades han pujat correctament
+  advice_uploadsuccess: Totes les dades s'han tramès correctament
   advice_waydragged: Via desplaçada (Z per desfer)
   cancel: Cancel·la
   closechangeset: Tanca conjunt de canvis
   conflict_download: Descarrega la seva versió
   conflict_overwrite: Sobreescriu la seva versió
-  conflict_poichanged: Des que va començar a editar algú ha canviat el punt $1$2.
-  conflict_relchanged: Des que va començar a editar algú ha canviat la relació $1$2.
+  conflict_poichanged: Des que vau començar a editar, algú ha canviat el punt $1$2.
+  conflict_relchanged: Des que vau començar a editar, algú ha canviat la relació $1$2.
   conflict_visitpoi: Feu clic a 'D'acord' per mostrar el punt.
-  conflict_visitway: Cliqueu "D'acord" per a mostrar la via.
+  conflict_visitway: Cliqueu "D'acord" per mostrar la via.
   conflict_waychanged: Des que va començar a editar, algú ha canviat la via $1$2.
   createrelation: Crea una relació nova
   custom: "Personalitzat:"
@@ -65,9 +65,9 @@ ca:
   emailauthor: Si us plau, enviï un correu a richard@systemeD.net amb un informe d'error, dient que el que estava fent en aquell moment.
   error_anonymous: No pot contactar a un mapeador anònim
   error_connectionfailed: Ho sentim - la connexió amb el servidor de OpenStreetMap va fallar. Qualsevol canvi recent no s'ha guardat. \n\nVoleu provar una altra vegada?
-  error_microblog_long: "Enviament a $1 ha fallat:\ncodi HTTP: $2\nmissatge d'error: $3 \n$1 error: $4"
-  error_nopoi: El POI no es pot trobar (potser hagis mogut lluny?), així que no es pot desfer.
-  error_nosharedpoint: Les vies $1 i $2 ja no comparteixen un punt comú, així que no es pot desfer la divisió.
+  error_microblog_long: "L'enviament a $1 ha fallat:\ncodi HTTP: $2\nmissatge d'error: $3 \n$1 error: $4"
+  error_nopoi: El POI no es pot trobar (potser us heu mogut lluny?), així que no es pot desfer.
+  error_nosharedpoint: Les vies $1 i $2 ja no comparteixen cap punt en comú, així que no es pot desfer la divisió.
   error_noway: La via $1 no es pot trobar (igual vostè s'ha desplaçat a una altra zona?), per tant no es pot desfer.
   error_readfailed: Ho sentim - el servidor de OpenStreetMap no ha respost a la sol·licitud de dades.\n\nVoleu tornar a intentar?
   existingrelation: Afegir a una relació existent
@@ -87,11 +87,11 @@ ca:
   hint_overendpoint: sobre punt final ($1)\nfeu clic per unir\nshift-click per fusionar
   hint_overpoint: sobre el punt ($1)\nFeu clic per unir
   hint_pointselected: Punt seleccionat\n(fes shift-clic en el punt per\ncomençar una nova línia)
-  hint_saving: guardant les dades
+  hint_saving: s'estan desant les dades
   hint_saving_loading: pujant/descarregant dades
   inspector: Inspector
   inspector_duplicate: Duplicat de
-  inspector_in_ways: dins vies
+  inspector_in_ways: Dins vies
   inspector_latlon: "Lat $1\nLon $2"
   inspector_locked: Bloquejat
   inspector_node_count: ($ 1 vegades)
@@ -104,7 +104,7 @@ ca:
   inspector_way_nodes_closed: $1 nodes (tancats)
   loading: S'està carregant…
   login_pwd: "Contrasenya:"
-  login_retry: El nom d'usuari no va ser reconegut. Torneu-ho de nou.
+  login_retry: El nom d'usuari no s'ha reconegut. Intenteu-ho de nou.
   login_title: No s'ha pogut iniciar sessió
   login_uid: "Nom d'usuari:"
   mail: Correu
@@ -119,18 +119,18 @@ ca:
   offset_motorway: Autopista (D3)
   offset_narrowcanal: Camí de sirga estret
   ok: D'acord
-  openchangeset: Obrir conjunt de canvis
+  openchangeset: Obre el conjunt de canvis
   option_custompointers: Utilitza la ploma i la mà de punters
   option_external: "Llançament extern:"
   option_fadebackground: Atenuar el fons
-  option_layer_cycle_map: OSM - map ciclista
+  option_layer_cycle_map: OSM - mapa ciclista
   option_layer_maplint: OSM - Maplint (errors)
-  option_layer_nearmap: "Australia: NearMap"
-  option_layer_ooc_25k: "UK historic: 1:25k"
+  option_layer_nearmap: "Austràlia: NearMap"
+  option_layer_ooc_25k: "Històric del Regne Unit: 1:25k"
   option_layer_ooc_7th: "Regne Unit històric: 7th"
   option_layer_ooc_npe: "Regne Unit històric: NPE"
   option_layer_ooc_scotland: "Regne Unit històric: Escòcia"
-  option_layer_os_streetview: "UK: OS StreetView"
+  option_layer_os_streetview: "Regne Unit: OS StreetView"
   option_layer_streets_haiti: "Haití: noms de carrers"
   option_layer_surrey_air_survey: "Regne Unit: Mesurament aeri de Surrey"
   option_layer_tip: Escollir el fons a mostrar
@@ -139,9 +139,9 @@ ca:
   option_microblog_pwd: "Contrasenya microblog:"
   option_noname: Assenyala les carreteres sense nom
   option_photo: "Foto KML:"
-  option_thinareas: Utilitza línies més fines per areas
+  option_thinareas: Usa línies més fines per a àrees
   option_thinlines: Utilitza línies fines en totes les escales
-  option_tiger: Ressaltar TIGER sense canvis
+  option_tiger: Ressalta TIGER sense canvis
   option_warnings: Mostra advertències flotants
   point: Punt
   preset_icon_airport: Aeroport
@@ -171,21 +171,21 @@ ca:
   preset_icon_taxi: Parada de taxis
   preset_icon_telephone: Telèfon
   preset_icon_theatre: Teatre
-  preset_tip: Tria d'entre un menú d'etiquetes preprogramadws que descriguin $1
+  preset_tip: Trieu entre un menú d'etiquetes preestablertes que descriguin $1
   prompt_addtorelation: Afegit $1 a la relació
   prompt_changesetcomment: "Introduïu una descripció dels canvis:"
   prompt_closechangeset: Tanca conjunt de canvis $1
-  prompt_createparallel: Crea via paral.lela
+  prompt_createparallel: Crea una via paral.lela
   prompt_editlive: Edició en viu
   prompt_editsave: Edició amb guardar
-  prompt_helpavailable: Nou usuari? Miri a la part inferior esquerra per obtenir ajuda.
+  prompt_helpavailable: Sou un usuari nou? Mireu a la part inferior esquerra per obtenir ajuda.
   prompt_launch: Obrir URL externa
   prompt_live: En el mode directe, cada canvi realitzat es guardarà instantàniament en la base de dades de OpenStreetMap -  això no es recomana a principiants. Estàs segur?
-  prompt_manyways: Aquesta àrea conté molts detalls i trigarà molt en carregar-se. Prefereixes fer un zoom?
+  prompt_manyways: Aquesta àrea conté molts detalls i trigarà molt en carregar-se. Preferiu fer un zoom?
   prompt_microblog: Enviat a $1 ($2 restants)
-  prompt_revertversion: Revertir a una versió prèviament guardada
+  prompt_revertversion: Torna a una versió prèviament guardada
   prompt_savechanges: Guardar canvis
-  prompt_taggedpoints: Algun dels punts d'aquesta via tenen etiquetes o estan en una relació. Realment vol esborrar-los?
+  prompt_taggedpoints: Algun dels punts d'aquesta via tenen etiquetes o estan en una relació. Realment voleu esborrar-los?
   prompt_track: Converteix traces GPS a vies
   prompt_unlock: Feu clic per desbloquejar
   prompt_welcome: Benvingut/da a l'OpenStreetMap!
@@ -206,15 +206,15 @@ ca:
   tip_direction: Direcció de la via - feu clic per invertir-la
   tip_gps: Mostra les traces de GPS (G)
   tip_noundo: No hi ha res a desfer
-  tip_options: Establir opcions (triar el mapa de fons)
-  tip_photo: Carregar fotos
+  tip_options: Estableix les opcions (tria el fons del mapa)
+  tip_photo: Carrega les fotos
   tip_presettype: Escollir quin tipus de etiquetes preestablertes s'ofereixen en el menú.
-  tip_repeattag: Repetir les etiquetes de la via seleccionada prèviament  (R)
+  tip_repeattag: Repeteix les etiquetes de la via seleccionada prèviament  (R)
   tip_revertversion: Trii la data a la qual tornar
   tip_selectrelation: Afegir a la ruta escollida
   tip_splitway: Divideix la via en el punt seleccionat (X)
   tip_tidy: Simplifica punts en una via (T)
-  tip_undo: Desfer $1 (Z)
+  tip_undo: Desfés $1 (Z)
   uploading: Carregant...
   uploading_deleting_pois: Esborrant POIs
   uploading_deleting_ways: Esborrant vies
@@ -223,7 +223,7 @@ ca:
   uploading_relation: Pujant relació $1
   uploading_relation_name: Pujant relació $1, $2
   uploading_way: Pujant via $1
-  uploading_way_name: Pujant via $1, $2
+  uploading_way_name: S'està pujant la via $1, $2
   warning: Atenció!
   way: Via
   "yes": Sí
diff --git a/config/potlatch/locales/lb.yml b/config/potlatch/locales/lb.yml
index 75239bcf5..e0b801ca6 100644
--- a/config/potlatch/locales/lb.yml
+++ b/config/potlatch/locales/lb.yml
@@ -10,11 +10,13 @@ lb:
   action_movepoint: e Punkt réckelen
   action_splitway: e Wee opdeelen
   advanced: Erweidert
+  advanced_history: Chronik vum Wee
   advanced_inspector: Inspekter
   advanced_maximise: Fënster maximéieren
   advanced_minimise: Fënster minimiséieren
   advanced_parallel: Parallele Wee
   advanced_undelete: Restauréieren
+  advice_microblogged: Äre(n) $1-Status gouf aktualiséiert
   advice_uploadempty: Näischt fir eropzelueden
   advice_uploadfail: Eropluede gestoppt
   advice_uploadsuccess: All Donnéeë sinn eropgelueden
@@ -25,12 +27,14 @@ lb:
   custom: "Personaliséiert:"
   delete: Läschen
   deleting: läschen
+  editinglive: Live änneren
   error_anonymous: En anonyme Mapper kann net kontaktéiert ginn.
   heading_drawing: Zeechnen
   heading_introduction: Aféierung
   heading_pois: Ufänken
   help: Hëllef
   hint_loading: Donnéeë lueden
+  hint_saving: Donnéeë späicheren
   inspector: Inspekter
   inspector_duplicate: Doublon vu(n)
   inspector_in_ways: Op de Weeër
@@ -60,6 +64,7 @@ lb:
   preset_icon_bus_stop: Busarrêt
   preset_icon_cafe: Café
   preset_icon_cinema: Kino
+  preset_icon_convenience: Epicerie
   preset_icon_disaster: Haiti Gebai
   preset_icon_ferry_terminal: Fähr
   preset_icon_fire_station: Pomjeeën
@@ -76,6 +81,7 @@ lb:
   preset_icon_school: Schoul
   preset_icon_station: Gare
   preset_icon_supermarket: Supermarché
+  preset_icon_taxi: Taxistand
   preset_icon_telephone: Telefon
   preset_icon_theatre: Theater
   prompt_addtorelation: $1 bäi eng Relatioun derbäisetzen
@@ -87,13 +93,17 @@ lb:
   prompt_launch: Extern URL opmaachen
   prompt_revertversion: "Op eng méi fréi gespäichert Versioun zerécksetzen:"
   prompt_savechanges: Ännerunge späicheren
+  prompt_unlock: Klickt fir d'Spär opzehiewen
   prompt_welcome: Wëllkomm op OpenStreetMap!
   retry: Nach eng Kéier probéieren
   revert: Zrécksetzen
   save: Späicheren
   tags_backtolist: Zréck op d'Lëscht
   tags_descriptions: Beschreiwunge vu(n) '$1'
+  tags_typesearchterm: "Tippt e Wuert fir ze sichen:"
+  tip_addrelation: Bäi eng Relatioun derbäisetzen
   tip_alert: Et ass e Feeler geschitt - klickt hei fir weider Detailer
+  tip_noundo: Näischt wat annuléiert ka ginn
   tip_options: Optiounen astellen (Sicht den Hannergrond vun der Kaart eraus)
   tip_photo: Fotoe lueden
   tip_splitway: Wee op dem erausgesichte Punkt (X) opdeelen
diff --git a/config/potlatch/locales/mk.yml b/config/potlatch/locales/mk.yml
index 734e50b25..1b4d205e1 100644
--- a/config/potlatch/locales/mk.yml
+++ b/config/potlatch/locales/mk.yml
@@ -80,7 +80,7 @@ mk:
   heading_tagging: Означување
   heading_troubleshooting: Отстранување неисправности
   help: Помош
-  help_html: "<!--\n\n========================================================================================================================\nСтраница 1: Вовед\n\n--><headline>Добредојдовте во Potlatch</headline>\n<largeText>Potlatch е уредник на OpenStreetMap кој е лесен за употреба. Цртајте патишта, знаменитости, споменици и продавници од вашите GPS податоци, сателитски слики или стари карти.\n\nОвие страници за помош ќе ве запознаат со основите на користење на Potlatch, и ќе ви покажат каде можете да дознаете повеќе. Кликнете на насловите погоре за да почнете.\n\nЗа да излезете, кликнете било каде вон прозорецов.\n\n</largeText>\n\n<column/><headline>Корисно да се знае</headline>\n<bodyText>Не копирајте од други карти!\n\nАко изберете „Уредување во живо“, сите промени кои ќе ги направите одат на базата додека ги цртате - т.е. <i>веднаш</i>. Ако не сте толку сигурни во промените, одберете „Уредување со зачувување“, и така промените ќе се појават дури кога ќе стиснете на „Зачувај“.\n\nСите направени уредувања ќе се покажат по час-два (на неколку посложени работи им треба една недела). На картата не е прикажано сè - тоа би бил голем неред. Бидејќи податоците на OpenStreetMap се отворен извор, другите корисници слободно прават карти на кои се прикажани различни аспекти - како <a href=\"http://www.opencyclemap.org/\" target=\"_blank\">OpenCycleMap (Отворена велосипедска карта)</a> или <a href=\"http://maps.cloudmade.com/?styleId=999\" target=\"_blank\">Midnight Commander</a>.\n\nЗапомнете дека ова е <i>и</i> убава карта (затоа цртајте убави криви линии за кривините), но и дијаграм (затоа проверувајте дека патиштата се среќаваат на крстосници) .\n\nДали ви споменавме дека не смее да се копира од други карти?\n</bodyText>\n\n<column/><headline>Дознајте повеќе</headline>\n<bodyText><a href=\"http://wiki.openstreetmap.org/wiki/Potlatch\" target=\"_blank\">Potlatch прирачник</a>\n<a href=\"http://lists.openstreetmap.org/\" target=\"_blank\">Поштенски списоци</a>\n<a href=\"http://irc.openstreetmap.org/\" target=\"_blank\">Разговори (помош во живо)</a>\n<a href=\"http://forum.openstreetmap.org/\" target=\"_blank\">Форум</a>\n<a href=\"http://wiki.openstreetmap.org/\" target=\"_blank\">Вики на заедницата</a>\n<a href=\"http://trac.openstreetmap.org/browser/applications/editors/potlatch\" target=\"_blank\">Изворен код на Potlatch</a>\n</bodyText>\n<!-- News etc. goes here -->\n\n<!--\n========================================================================================================================\nСтраница 2: како да почнете\n\n--><page/><headline>Како да почнете</headline>\n<bodyText>Сега Potlatch ви е отворен. Кликнете на „Уреди и зачувај“ за да почнете\n\nЗначи спремни сте да нацртате карта. Најлесно е да се почне со поставење на точки од интерес на картата (POI). Овие можат да бидат ресторани, цркви, железнички станици...сè што сакате.</bodytext>\n\n<column/><headline>Влечење и пуштање</headline>\n<bodyText>За да ви олесниме, ги поставивме најчестите видови на точки од интерес (POI), на дното од картата. На картата се ставаат со нивно повлекување и пуштање на саканото место. И не грижете се ако не сте го погодиле местото од прв пат: можете точките да повлекувате повторно, сè додека не ја наместите секоја точка кадешто сакате.\n\nКога сте готови со тоа, ставете му име на ресторанот (или црквата, станицата итн.) На дното ќе се појави мала табела. Една од ставките ќе биде „име“, и до него „(тука внесете име)“. Кликнете на тој текст и впишете го името.\n\nКликнете другде на картата за да го одизберете вашата точка од интерес (POI), и така ќе се врати малиот шарен правоаголник.\n\nЛесно е, нели? Кликнете на „Зачувај“ (најдолу-десно) кога сте готови.\n</bodyText><column/><headline>Движење по картата</headline>\n<bodyText>За да отидете на друг дел од картата, само повлечете празен простор. Potlatch автоматски ќе вчита нови податоци (гледајте најгоре-десно)\n\nВи рековме да „Уредите и зачувате“, но можете и да кликнете на „Уредување во живо“. Под овој режим промените одат право во базата, и затоа нема копче „Зачувај“. Ова е добро за брзи промени и <a href=\"http://wiki.openstreetmap.org/wiki/Current_events\" target=\"_blank\">картографски акции</a>.</bodyText>\n\n<headline>Следни чекори</headline>\n<bodyText>Задоволни сте од досегашното? Одлично. Кликнете на „Истражување“ погоре за да дознаете како да бидете <i>вистински</i> картограф!</bodyText>\n\n<!--\n========================================================================================================================\nСтраница 3: Истражување\n\n--><page/><headline>Истражување со GPS</headline>\n<bodyText>Идејата позади OpenStreetMap  е создавање на карта без ограничувачките авторски права кои ги имаат други карти. Ова значи дека овдешните карти не можете да ги копирате од никаде: морате самите да ги истражите улиците. За среќа, ова е многу забавно!\nНајдобро е да се земе рачен GPS-уред. Пронајдете некој регион кој сè уште не е на картата. Прошетајте по улиците, или извозете ги на велосипед, држајќи го уредот вклучен. По пат запишувајте ги имињата на улиците, и сето она што ве интересира (ресторани? цркви?).\n\nКога ќе дојдете дома, вашиот GPS-уред ќе содржи т.н. „записник на траги“ (tracklog) кој има евиденција за секаде кадешто сте биле. Потоа ова можете да го подигнете на OpenStreetMap.\n\nНајдобриот вид на GPS-уред е оној што запишува често (на секоја секунда-две) и има големо памтење. Голем дел од нашите картографи користат рачни Garmin апарати, или Bluetooth-уреди. На нашето вики ќе најдете подробни <a href=\"http://wiki.openstreetmap.org/wiki/GPS_Reviews\" target=\"_blank\">анализа на GPS-уреди</a></bodyText>\n\n<column/><headline>Подигање на патеката</headline>\n<bodyText>Сега ќе треба да ја префрлите трагата од GPS-уредот. Можеби уредот има своја програмска опрема, или пак од него поже да се копираат податотеки предку USB. Ако не може, пробајте го <a href=\"http://www.gpsbabel.org/\" target=\"_blank\">GPSBabel</a>. Како и да е, податотеката во секој случај треба да биде во GPX формат.\n\nПотоа одете на „GPS траги“ и подигнете ја трагата на OpenStreetMap. Но ова е само првиот чекор - трагата сè уште нема да се појави на картата. Морате самите да ги нацртате и именувате улиците, следејќи ја трагата.</bodyText>\n<headline>Користење на трагата</headline>\n<bodyText>Пронајдете ја вашата подигната трага во списокот на „GPS траги“ и кликнете на „уреди“ <i>веднаш до неа</i>. Potlatch ќе започне со оваа вчитана трага, плус ако има патни точки. Сега можете да цртате!\n\n<img src=\"gps\">Можете и да кликнете на ова копче за да ви се прикажат GPS трагите на сите корисници (но не патните точки) за тековниот реон. Држете Shift за да се прикажат само вашите траги.</bodyText>\n<column/><headline>Користење на сателитски слики</headline>\n<bodyText>Не грижете се ако немате GPS-уред. Во некои градови имаме сателитски фотографии врз кои можете да цртате, добиени со поддршка од Yahoo! (благодариме!). Излезете и запишете ги имињата на улиците, па вратете се и исцртајте ги линиите врз нив.\n\n<img src='prefs'>Доколку не гледате сателитски слики, кликнете на копчето за прилагодувања и проверете дали е одбрано „Yahoo!“ Ако сè уште не ги гледате, тогаш веројатно такви слики се недостапни за вашиот град, или пак треба малку да оддалечите.\n\nНа истово копче за прилагодувања има и други избори како карти на Британија со истечени права и OpenTopoMap. Сите тие се специјално избрани бидејќи ни е дозволено да ги користиме- не копирајте ничии карти и воздушни фотографии (Законите за авторски права се за никаде.)\n\nПонекогаш сателитските слики се малку разместени од фактичката местоположба на патиштата. Ако наидете на ова, држете го Space и влечете ја позадината додека не се порамнат. Секогаш имајте доверба во GPS трагите, а не сателитските слики.</bodytext>\n\n<!--\n========================================================================================================================\nСтраница 4: Цртање\n\n--><page/><headline>Цртање патишта</headline>\n<bodyText>За да нацртате пат почнувајќи од празен простор на картата, само кликнете таму; потоа на секоја точка на патот. Кога сте готови, кликнете два пати или притиснете Enter - потоа кликнете на некое друго место за да го одизберете патот.\n\nЗа да нацртате пат почнувајќи од друг пат, кликнете на патот за да го изберете; неговите точки ќе станат црвени. Држете Shift и кликнете на една од нив за да започнете нов пат од таа точка. (Ако нема црвена точка на крстосницата, направете Shift-клик за да се појави кадешто сакате!)\n\nКликнете на „Зачувај“ (најдолу-десно) кога сте готови. Зачувувајте често, во случај да се јават проблеми со опслужувачот.\n\nНе очекувајте промените веднаш да се појават на главната карта. За ова треба да поминат час-два, а во некои случаи и до една недела.\n</bodyText><column/><headline>Правење крстосници</headline>\n<bodyText>Многу е важно патиштата да имаат заедничка точка („јазол“) кадешто се среќаваат. Ова им служи на корисниците кои планираат пат за да знаат каде да свртат.\n\nPotlatch се грижи за ова доколку внимателно кликнете <i>точно</i> на патот кој го сврзувате. Гледајте ги олеснителните знаци: точките светнуваат сино, курсорот се менува, и кога сте готови, точката на крстосницата има црна контура.</bodyText>\n<headline>Поместување и бришење</headline>\n<bodyText>Ова работи баш како што се би се очекувало. За да избришете точка, одберете ја и притиснете на Delete. За да избришете цел еден пат, притиснете Shift-Delete.\n\nЗа да поместите нешто, само повлечете го. (Ќе треба да кликнете и да подржите малку пред да влечете. Со ова се избегнуваат ненамерни поместувања.)</bodyText>\n<column/><headline>Понапредно цртање</headline>\n<bodyText><img src=\"scissors\">Ако два дела од еден пат имаат различни имиња, ќе треба да ги раздвоите. Кликнете на патот; потоа кликнете во точката кадешто сакате да го раздвоите, и кликнете на ножиците. (Можете да спојувате патишта со Control, или копчето со јаболко на Мекинтош, но не спојувајте два пата со различни имиња или типови.)\n\n<img src=\"tidy\">Кружните текови се многу тешки за цртање. Но за тоа помага самиот Potlatch. Нацртајте го кругот грубо, само внимавајте да ги споите краевите (т.е. да биде круг), и кликнете на „подреди“. (Ова се користи и за исправање на патишта.)</bodyText>\n<headline>Точки од интерес (POI)</headline>\n<bodyText>Првото нешто што го научивте е како да влечете и пуштате точка од интерес. Можете и самите да правите вакви точки со двојно кликнување на картата: ќе се појави зелено кругче. Но како ќе знаеме дали се работи за ресторан, црква или нешто друго? Кликнете на „Означување“ погоре за да дознаете!\n\n<!--\n========================================================================================================================\nСтраница 4: Означување\n\n--><page/><headline>Кој вид на пат е тоа?</headline>\n<bodyText>Штом ќе нацртате пат, треба да назначите што е. Дали е главна магистрала, пешачка патека или река? Како се вика? Има ли некои посебни правила (на пр. „забрането велосипеди“)?\n\nВо OpenStreetMap ова го запишувате со „ознаки“. Ознаката има два дела, и можете да користите колку што сакате ознаки. На пример, можете да додадете i>highway | trunk</i> за да назначите дека ова е главен магистрален пат; <i>highway | residential</i> за пат во населба; or <i>highway | footway</i> за пешачка патека. If bikes were banned, you could then add <i>bicycle | no</i>. Потоа, за да го запишете името, додајте <i>name | Партизански Одреди</i>.\n\nОзнаките на Potlatch се појавуваат најдолу на екранот - кликнете на постоечка улица, и ќе видите каква ознака има. Кликете на знакот „+“ (најдолу-десно) за да додадете нова ознака. Секоја ознака има „x“ со што можете да ја избришете.\n\nМожете да означувате цели патишта; точки на патишта (можеби порта или семафори); и точки од интерес.</bodytext>\n<column/><headline>Користење на зададени ознаки</headline>\n<bodyText>За да ви помогне да започнете, Potlatch ви нуди готови, најпопуларни ознаки.\n\n<img src=\"preset_road\">Одберете го патот, па кликајте низ симболите додека не најдете соодветен. Потоа изберете ја најсоодветната можност од менито.\n\nСо ова се пополнуваат ознаките. Некои ќе останат делумно празни за да можете да впишете (на пример) име на улицата и број</bodyText>\n<headline>Еднонасочни патишта</headline>\n<bodyText>Ви препорачуваме да додадете ознака за еднонасочни улици како <i>oneway | yes</i> - но како да познаете во која насока? Најдолу-лево има стрелка која го означува правецот напатот, од почеток до крај. Кликнете на неа за да ја свртите обратно.</bodyText>\n<column/><headline>Избор на ваши сопствени ознаки</headline>\n<bodyText>Секако, не сте ограничени само на зададените ознаки. Користете го копчето „+“  за да користите какви што сакате ознаки.\n\nМожете да видите какви ознаки користат другите на <a href=\"http://osmdoc.com/en/tags/\" target=\"_blank\">OSMdoc</a>, а имаме и долг список на популарни ознаки на нашето вики наречена<a href=\"http://wiki.openstreetmap.org/wiki/Map_Features\" target=\"_blank\">Елементи</a>. Но тие се <i>само предлози, а не правила</i>. Најслободно измислувајте си свои ознаки или преземајте од други корисници.\n\nБидејќи податоците од OpenStreetMap се користат за изработување на различни карти, секоја карта прикажува свој избор од ознаки.</bodyText>\n<headline>Релации</headline>\n<bodyText>Понекогаш не се доволни само ознаки, па ќе треба да „групирате“ два или повеќе пата. Можеби вртењето од една улица во друга е забрането, или пак 20 патеки заедно сочиннуваат означена велосипедска патека. Ова се прави во напредното мени „релации“. <a href=\"http://wiki.openstreetmap.org/wiki/Relations\" target=\"_blank\">Дознајте повеќе</a> на викито.</bodyText>\n\n<!--\n========================================================================================================================\nСтраница 6: Отстранување неисправности\n\n--><page/><headline>Враќање грешки</headline>\n<bodyText><img src=\"undo\">Ова е копчето за враќање (може и со стискање на Z) - ова ќе го врати последното нешто кое сте го направиле.\n\nМожете да „вратите“ претходно зачувана верзија на еден пат или точка. Одберете ја, па кликнете на нејзиниот ид. бр. (бројот најдолу-лево) - или притиснете на H (за „историја“). Ќе видите список на која се наведува кој ја уредувал и кога. Одберете ја саканата верзија, и стиснете на „Врати“.\n\nДоколку сте избришале пат по грешка и сте зачувале, притиснете U (за да вратите). Ќе се појават сите избришани патишта. Одберете го саканиот пат; отклучете го со кликнување на катанчето; и зачувајте.\n\nМислите дека некој друг корисник направил грешка? Испратете му пријателска порака. Користете ја историјата (H) за да му го изберете името, па кликнете на „Пошта“\n\nКористете го Инспекторот (во менито „Напредно“) за корисни информации за моменталниот пат или точка.\n</bodyText><column/><headline>ЧПП</headline>\n<bodyText><b>Како да ги видам моите патни точки?</b>\nПатните точки се појавуваат само ако кликнете на „уреди“ до името на трагата во „GPS траги“. Податотеката мора да има и патни точки и запис на трагата - опслужувачот не пропушта податотеки кои имаат само патни точки.\n\nПовеќе ЧПП за <a href=\"http://wiki.openstreetmap.org/wiki/Potlatch/FAQs\" target=\"_blank\">Potlatch</a> и <a href=\"http://wiki.openstreetmap.org/wiki/FAQ\" target=\"_blank\">OpenStreetMap</a>.\n</bodyText>\n\n\n<column/><headline>Побрзо работење</headline>\n<bodyText>Што повеќе оддалечувате, тоа повеќе податоци мора да вчита Potlatch. Приближете пред да стиснете на „Уреди“\n\nИсклучете го „Користи курсори „молив“ и „рака““ (во прозорецот за прилагодување) за да добиете максимална брзина.\n\nАко опслужувачот работи бавно, вратете се подоцна. <a href=\"http://wiki.openstreetmap.org/wiki/Platform_Status\" target=\"_blank\">Проверете го викито</a> за да проверите познати проблеми. Некои термини како недела навечер се секогаш оптоварени.\n\nКажете му на Potlatch да ги запомни вашите омилени комплети со ознаки. Одберете пат или точка со тие ознаки, па притиснете на Ctrl, Shift и на број од 1 до 9. Потоа за повторно да ги користите тие ознаки, само притиснете  Shift и тој број. (Ќе се паметат секојпат кога го користите Potlatch на овој сметач.)\n\nПретворете ја вашата GPS трага во пат со тоа што ќе ја пронајдете на списокот „GPS траги“ и ќе кликнете на „уреди“ до неа, а потоа на кутивчето „претвори“. Трагата ќе се заклучи (црвено), затоа не зачувувајте. Најпрвин уредете ја, па кликнете на катанчето (најдолу-десно) за да ја отклучите кога сте спремни да ја зачувате.</bodytext>\n\n<!--\n========================================================================================================================\nСтраница 7: Брза помош\n\n--><page/><headline>Што да кликате</headline>\n<bodyText><b>Влечете ја картата</b> за да се движите наоколу.\n<b>Двоен клик</b> за  да направите нова точка од интерес (POI).\n<b>Кликнете еднап</b> за да започнете нов пат.\n<b>Држете и влечете пат или точка од интерес (POI)</b> за да ги поместите.</bodyText>\n<headline>Кога цртате пат</headline>\n<bodyText><b>Двоен клик</b> или <b>Enter</b> за да завршите со цртање.\n<b>Кликнете</b> на друг пат за да направите крстосница.\n<b>Shift-клик на крајот на друг пат</b> за да споите.</bodyText>\n<headline>Кога ќе изберете пат</headline>\n<bodyText><b>Кликнете на точката</b> за да ја одберете.\n<b>Shift-клик на патот</b> за да вметнете нова точка.\n<b>Shift-клик на точка</b> за оттаму да започнете нов пат.\n<b>Ctrl-клик на друг пат</b> за спојување.</bodyText>\n</bodyText>\n<column/><headline>Тастатурни кратенки</headline>\n<bodyText><textformat tabstops='[25]'>B Додај позадинска изворна ознака\nC Затвори измени\nG Прикажи GPS траги\nH Прикажи историја\nI Прикажи инспектор\nJ сврзи точка за вкрстени патишта\n(+Shift) Unjoin from other ways\nK Заклучи/отклучи го моментално избраното\nL Прикажи моментална географска должина\nM Зголеми уредувачки прозорец\nP Создај паралелен пат\nR Повтори ги ознаките\nS Зачувај (освен ако не е во живо)\nT Подреди во права линија/круг\nU Врати избришано (прикажи избришани патишра)\nX Пресечи пат на две\nZ Врати\n- Отстрани точка само од овој пат\n+ Додај нова ознака\n/ Избор на друг пат со истава точка\n</textformat><textformat tabstops='[50]'>Delete Избриши точка\n  (+Shift) Избриши цел пат\nEnter Заврши со цртање на линијата\nSpace Држи и влечи позадина\nEsc Откажи го ова уредување; превчитај од опслужувачот \n0 Отстрани ги сите ознаки\n1-9 Избор на зададени ознаки\n  (+Shift) Избери запамтени ознаки\n  (+S/Ctrl) Запамти ознаки\n§ или ` Кружи помеѓу групи ознаки\n</textformat>\n</bodyText>"
+  help_html: "<!--\n\n========================================================================================================================\nСтраница 1: Вовед\n\n--><headline>Добредојдовте во Potlatch</headline>\n<largeText>Potlatch е уредник на OpenStreetMap кој е лесен за употреба. Цртајте патишта, знаменитости, споменици и продавници од вашите GPS податоци, сателитски слики или стари карти.\n\nОвие страници за помош ќе ве запознаат со основите на користење на Potlatch, и ќе ви покажат каде можете да дознаете повеќе. Кликнете на насловите погоре за да почнете.\n\nЗа да излезете, кликнете било каде вон прозорецов.\n\n</largeText>\n\n<column/><headline>Корисно да се знае</headline>\n<bodyText>Не копирајте од други карти!\n\nАко изберете „Уредување во живо“, сите промени кои ќе ги направите одат на базата додека ги цртате - т.е. <i>веднаш</i>. Ако не сте толку сигурни во промените, одберете „Уредување со зачувување“, и така промените ќе се појават дури кога ќе стиснете на „Зачувај“.\n\nСите направени уредувања ќе се покажат по час-два (на неколку посложени работи им треба една недела). На картата не е прикажано сè - тоа би бил голем неред. Бидејќи податоците на OpenStreetMap се отворен извор, другите корисници слободно прават карти на кои се прикажани различни аспекти - како <a href=\"http://www.opencyclemap.org/\" target=\"_blank\">OpenCycleMap (Отворена велосипедска карта)</a> или <a href=\"http://maps.cloudmade.com/?styleId=999\" target=\"_blank\">Midnight Commander</a>.\n\nЗапомнете дека ова е <i>и</i> убава карта (затоа цртајте убави криви линии за кривините), но и дијаграм (затоа проверувајте дека патиштата се среќаваат на крстосници) .\n\nДали ви споменавме дека не смее да се копира од други карти?\n</bodyText>\n\n<column/><headline>Дознајте повеќе</headline>\n<bodyText><a href=\"http://wiki.openstreetmap.org/wiki/Potlatch\" target=\"_blank\">Potlatch прирачник</a>\n<a href=\"http://lists.openstreetmap.org/\" target=\"_blank\">Поштенски списоци</a>\n<a href=\"http://irc.openstreetmap.org/\" target=\"_blank\">Разговори (помош во живо)</a>\n<a href=\"http://forum.openstreetmap.org/\" target=\"_blank\">Форум</a>\n<a href=\"http://wiki.openstreetmap.org/\" target=\"_blank\">Вики на заедницата</a>\n<a href=\"http://trac.openstreetmap.org/browser/applications/editors/potlatch\" target=\"_blank\">Изворен код на Potlatch</a>\n</bodyText>\n<!-- News etc. goes here -->\n\n<!--\n========================================================================================================================\nСтраница 2: како да почнете\n\n--><page/><headline>Како да почнете</headline>\n<bodyText>Сега Potlatch ви е отворен. Кликнете на „Уреди и зачувај“ за да почнете\n\nЗначи спремни сте да нацртате карта. Најлесно е да се почне со поставење на точки од интерес на картата (POI). Овие можат да бидат ресторани, цркви, железнички станици...сè што сакате.</bodytext>\n\n<column/><headline>Влечење и пуштање</headline>\n<bodyText>За да ви олесниме, ги поставивме најчестите видови на точки од интерес (POI), на дното од картата. На картата се ставаат со нивно повлекување и пуштање на саканото место. И не грижете се ако не сте го погодиле местото од прв пат: можете точките да повлекувате повторно, сè додека не ја наместите секоја точка кадешто сакате.\n\nКога сте готови со тоа, ставете му име на ресторанот (или црквата, станицата итн.) На дното ќе се појави мала табела. Една од ставките ќе биде „име“, и до него „(тука внесете име)“. Кликнете на тој текст и впишете го името.\n\nКликнете другде на картата за да го одизберете вашата точка од интерес (POI), и така ќе се врати малиот шарен правоаголник.\n\nЛесно е, нели? Кликнете на „Зачувај“ (најдолу-десно) кога сте готови.\n</bodyText><column/><headline>Движење по картата</headline>\n<bodyText>За да отидете на друг дел од картата, само повлечете празен простор. Potlatch автоматски ќе вчита нови податоци (гледајте најгоре-десно)\n\nВи рековме да „Уредите и зачувате“, но можете и да кликнете на „Уредување во живо“. Под овој режим промените одат право во базата, и затоа нема копче „Зачувај“. Ова е добро за брзи промени и <a href=\"http://wiki.openstreetmap.org/wiki/Current_events\" target=\"_blank\">картографски акции</a>.</bodyText>\n\n<headline>Следни чекори</headline>\n<bodyText>Задоволни сте од досегашното? Одлично. Кликнете на „Истражување“ погоре за да дознаете како да бидете <i>вистински</i> картограф!</bodyText>\n\n<!--\n========================================================================================================================\nСтраница 3: Истражување\n\n--><page/><headline>Истражување со GPS</headline>\n<bodyText>Идејата позади OpenStreetMap  е создавање на карта без ограничувачките авторски права кои ги имаат други карти. Ова значи дека овдешните карти не можете да ги копирате од никаде: морате самите да ги истражите улиците. За среќа, ова е многу забавно!\nНајдобро е да се земе рачен GPS-уред. Пронајдете некој регион кој сè уште не е на картата. Прошетајте по улиците, или извозете ги на велосипед, држајќи го уредот вклучен. По пат запишувајте ги имињата на улиците, и сето она што ве интересира (ресторани? цркви?).\n\nКога ќе дојдете дома, вашиот GPS-уред ќе содржи т.н. „записник на траги“ (tracklog) кој има евиденција за секаде кадешто сте биле. Потоа ова можете да го подигнете на OpenStreetMap.\n\nНајдобриот вид на GPS-уред е оној што запишува често (на секоја секунда-две) и има големо памтење. Голем дел од нашите картографи користат рачни Garmin апарати, или Bluetooth-уреди. На нашето вики ќе најдете подробни <a href=\"http://wiki.openstreetmap.org/wiki/GPS_Reviews\" target=\"_blank\">анализа на GPS-уреди</a></bodyText>\n\n<column/><headline>Подигање на патеката</headline>\n<bodyText>Сега ќе треба да ја префрлите трагата од GPS-уредот. Можеби уредот има своја програмска опрема, или пак од него поже да се копираат податотеки предку USB. Ако не може, пробајте го <a href=\"http://www.gpsbabel.org/\" target=\"_blank\">GPSBabel</a>. Како и да е, податотеката во секој случај треба да биде во GPX формат.\n\nПотоа одете на „GPS траги“ и подигнете ја трагата на OpenStreetMap. Но ова е само првиот чекор - трагата сè уште нема да се појави на картата. Морате самите да ги нацртате и именувате улиците, следејќи ја трагата.</bodyText>\n<headline>Користење на трагата</headline>\n<bodyText>Пронајдете ја вашата подигната трага во списокот на „GPS траги“ и кликнете на „уреди“ <i>веднаш до неа</i>. Potlatch ќе започне со оваа вчитана трага, плус ако има патни точки. Сега можете да цртате!\n\n<img src=\"gps\">Можете и да кликнете на ова копче за да ви се прикажат GPS трагите на сите корисници (но не патните точки) за тековниот реон. Држете Shift за да се прикажат само вашите траги.</bodyText>\n<column/><headline>Користење на сателитски слики</headline>\n<bodyText>Не грижете се ако немате GPS-уред. Во некои градови имаме сателитски фотографии врз кои можете да цртате, добиени со поддршка од Yahoo! (благодариме!). Излезете и запишете ги имињата на улиците, па вратете се и исцртајте ги линиите врз нив.\n\n<img src='prefs'>Доколку не гледате сателитски слики, кликнете на копчето за прилагодувања и проверете дали е одбрано „Yahoo!“ Ако сè уште не ги гледате, тогаш веројатно такви слики се недостапни за вашиот град, или пак треба малку да оддалечите.\n\nНа истово копче за прилагодувања има и други избори како карти на Британија со истечени права и OpenTopoMap. Сите тие се специјално избрани бидејќи ни е дозволено да ги користиме- не копирајте ничии карти и воздушни фотографии (Законите за авторски права се за никаде.)\n\nПонекогаш сателитските слики се малку разместени од фактичката местоположба на патиштата. Ако наидете на ова, држете го Space и влечете ја позадината додека не се порамнат. Секогаш имајте доверба во GPS трагите, а не сателитските слики.</bodytext>\n\n<!--\n========================================================================================================================\nСтраница 4: Цртање\n\n--><page/><headline>Цртање патишта</headline>\n<bodyText>За да нацртате пат почнувајќи од празен простор на картата, само кликнете таму; потоа на секоја точка на патот. Кога сте готови, кликнете два пати или притиснете Enter - потоа кликнете на некое друго место за да го одизберете патот.\n\nЗа да нацртате пат почнувајќи од друг пат, кликнете на патот за да го изберете; неговите точки ќе станат црвени. Држете Shift и кликнете на една од нив за да започнете нов пат од таа точка. (Ако нема црвена точка на крстосницата, направете Shift-клик за да се појави кадешто сакате!)\n\nКликнете на „Зачувај“ (најдолу-десно) кога сте готови. Зачувувајте често, во случај да се јават проблеми со опслужувачот.\n\nНе очекувајте промените веднаш да се појават на главната карта. За ова треба да поминат час-два, а во некои случаи и до една недела.\n</bodyText><column/><headline>Правење крстосници</headline>\n<bodyText>Многу е важно патиштата да имаат заедничка точка („јазол“) кадешто се среќаваат. Ова им служи на корисниците кои планираат пат за да знаат каде да свртат.\n\nPotlatch се грижи за ова доколку внимателно кликнете <i>точно</i> на патот кој го сврзувате. Гледајте ги олеснителните знаци: точките светнуваат сино, курсорот се менува, и кога сте готови, точката на крстосницата има црна контура.</bodyText>\n<headline>Поместување и бришење</headline>\n<bodyText>Ова работи баш како што се би се очекувало. За да избришете точка, одберете ја и притиснете на Delete. За да избришете цел еден пат, притиснете Shift-Delete.\n\nЗа да поместите нешто, само повлечете го. (Ќе треба да кликнете и да подржите малку пред да влечете. Со ова се избегнуваат ненамерни поместувања.)</bodyText>\n<column/><headline>Понапредно цртање</headline>\n<bodyText><img src=\"scissors\">Ако два дела од еден пат имаат различни имиња, ќе треба да ги раздвоите. Кликнете на патот; потоа кликнете во точката кадешто сакате да го раздвоите, и кликнете на ножиците. (Можете да спојувате патишта со Control, или копчето со јаболко на Мекинтош, но не спојувајте два пата со различни имиња или типови.)\n\n<img src=\"tidy\">Кружните текови се многу тешки за цртање. Но за тоа помага самиот Potlatch. Нацртајте го кругот грубо, само внимавајте да ги споите краевите (т.е. да биде круг), и кликнете на „подреди“. (Ова се користи и за исправање на патишта.)</bodyText>\n<headline>Точки од интерес (POI)</headline>\n<bodyText>Првото нешто што го научивте е како да влечете и пуштате точка од интерес. Можете и самите да правите вакви точки со двојно кликнување на картата: ќе се појави зелено кругче. Но како ќе знаеме дали се работи за ресторан, црква или нешто друго? Кликнете на „Означување“ погоре за да дознаете!\n\n<!--\n========================================================================================================================\nСтраница 4: Означување\n\n--><page/><headline>Кој вид на пат е тоа?</headline>\n<bodyText>Штом ќе нацртате пат, треба да назначите што е. Дали е главна магистрала, пешачка патека или река? Како се вика? Има ли некои посебни правила (на пр. „забрането велосипеди“)?\n\nВо OpenStreetMap ова го запишувате со „ознаки“. Ознаката има два дела, и можете да користите колку што сакате ознаки. На пример, можете да додадете i>highway | trunk</i> за да назначите дека ова е главен магистрален пат; <i>highway | residential</i> за пат во населба; or <i>highway | footway</i> за пешачка патека. If bikes were banned, you could then add <i>bicycle | no</i>. Потоа, за да го запишете името, додајте <i>name | Партизански Одреди</i>.\n\nОзнаките на Potlatch се појавуваат најдолу на екранот - кликнете на постоечка улица, и ќе видите каква ознака има. Кликете на знакот „+“ (најдолу-десно) за да додадете нова ознака. Секоја ознака има „x“ со што можете да ја избришете.\n\nМожете да означувате цели патишта; точки на патишта (можеби порта или семафори); и точки од интерес.</bodytext>\n<column/><headline>Користење на зададени ознаки</headline>\n<bodyText>За да ви помогне да започнете, Potlatch ви нуди готови, најпопуларни ознаки.\n\n<img src=\"preset_road\">Одберете го патот, па кликајте низ симболите додека не најдете соодветен. Потоа изберете ја најсоодветната можност од менито.\n\nСо ова се пополнуваат ознаките. Некои ќе останат делумно празни за да можете да впишете (на пример) име на улицата и број</bodyText>\n<headline>Еднонасочни патишта</headline>\n<bodyText>Ви препорачуваме да додадете ознака за еднонасочни улици како <i>oneway | yes</i> - но како да познаете во која насока? Најдолу-лево има стрелка која го означува правецот напатот, од почеток до крај. Кликнете на неа за да ја свртите обратно.</bodyText>\n<column/><headline>Избор на ваши сопствени ознаки</headline>\n<bodyText>Секако, не сте ограничени само на зададените ознаки. Користете го копчето „+“  за да користите какви што сакате ознаки.\n\nМожете да видите какви ознаки користат другите на <a href=\"http://osmdoc.com/en/tags/\" target=\"_blank\">OSMdoc</a>, а имаме и долг список на популарни ознаки на нашето вики наречена<a href=\"http://wiki.openstreetmap.org/wiki/Map_Features\" target=\"_blank\">Елементи</a>. Но тие се <i>само предлози, а не правила</i>. Најслободно измислувајте си свои ознаки или преземајте од други корисници.\n\nБидејќи податоците од OpenStreetMap се користат за изработување на различни карти, секоја карта прикажува свој избор од ознаки.</bodyText>\n<headline>Релации</headline>\n<bodyText>Понекогаш не се доволни само ознаки, па ќе треба да „групирате“ два или повеќе пата. Можеби вртењето од една улица во друга е забрането, или пак 20 патеки заедно сочиннуваат означена велосипедска патека. Ова се прави во напредното мени „релации“. <a href=\"http://wiki.openstreetmap.org/wiki/Relations\" target=\"_blank\">Дознајте повеќе</a> на викито.</bodyText>\n\n<!--\n========================================================================================================================\nСтраница 6: Отстранување неисправности\n\n--><page/><headline>Враќање грешки</headline>\n<bodyText><img src=\"undo\">Ова е копчето за враќање (може и со стискање на Z) - ова ќе го врати последното нешто кое сте го направиле.\n\nМожете да „вратите“ претходно зачувана верзија на еден пат или точка. Одберете ја, па кликнете на нејзината назнака. (бројот најдолу-лево) - или притиснете на H (за „историја“). Ќе видите список на која се наведува кој ја уредувал и кога. Одберете ја саканата верзија, и стиснете на „Врати“.\n\nДоколку сте избришале пат по грешка и сте зачувале, притиснете U (за да вратите). Ќе се појават сите избришани патишта. Одберете го саканиот пат; отклучете го со кликнување на катанчето; и зачувајте.\n\nМислите дека некој друг корисник направил грешка? Испратете му пријателска порака. Користете ја историјата (H) за да му го изберете името, па кликнете на „Пошта“\n\nКористете го Инспекторот (во менито „Напредно“) за корисни информации за моменталниот пат или точка.\n</bodyText><column/><headline>ЧПП</headline>\n<bodyText><b>Како да ги видам моите патни точки?</b>\nПатните точки се појавуваат само ако кликнете на „уреди“ до името на трагата во „GPS траги“. Податотеката мора да има и патни точки и запис на трагата - опслужувачот не пропушта податотеки кои имаат само патни точки.\n\nПовеќе ЧПП за <a href=\"http://wiki.openstreetmap.org/wiki/Potlatch/FAQs\" target=\"_blank\">Potlatch</a> и <a href=\"http://wiki.openstreetmap.org/wiki/FAQ\" target=\"_blank\">OpenStreetMap</a>.\n</bodyText>\n\n\n<column/><headline>Побрзо работење</headline>\n<bodyText>Што повеќе оддалечувате, тоа повеќе податоци мора да вчита Potlatch. Приближете пред да стиснете на „Уреди“\n\nИсклучете го „Користи курсори „молив“ и „рака““ (во прозорецот за прилагодување) за да добиете максимална брзина.\n\nАко опслужувачот работи бавно, вратете се подоцна. <a href=\"http://wiki.openstreetmap.org/wiki/Platform_Status\" target=\"_blank\">Проверете го викито</a> за да проверите познати проблеми. Некои термини како недела навечер се секогаш оптоварени.\n\nКажете му на Potlatch да ги запомни вашите омилени комплети со ознаки. Одберете пат или точка со тие ознаки, па притиснете на Ctrl, Shift и на број од 1 до 9. Потоа за повторно да ги користите тие ознаки, само притиснете  Shift и тој број. (Ќе се паметат секојпат кога го користите Potlatch на овој сметач.)\n\nПретворете ја вашата GPS трага во пат со тоа што ќе ја пронајдете на списокот „GPS траги“ и ќе кликнете на „уреди“ до неа, а потоа на кутивчето „претвори“. Трагата ќе се заклучи (црвено), затоа не зачувувајте. Најпрвин уредете ја, па кликнете на катанчето (најдолу-десно) за да ја отклучите кога сте спремни да ја зачувате.</bodytext>\n\n<!--\n========================================================================================================================\nСтраница 7: Брза помош\n\n--><page/><headline>Што да кликате</headline>\n<bodyText><b>Влечете ја картата</b> за да се движите наоколу.\n<b>Двоен клик</b> за  да направите нова точка од интерес (POI).\n<b>Кликнете еднап</b> за да започнете нов пат.\n<b>Држете и влечете пат или точка од интерес (POI)</b> за да ги поместите.</bodyText>\n<headline>Кога цртате пат</headline>\n<bodyText><b>Двоен клик</b> или <b>Enter</b> за да завршите со цртање.\n<b>Кликнете</b> на друг пат за да направите крстосница.\n<b>Shift-клик на крајот на друг пат</b> за да споите.</bodyText>\n<headline>Кога ќе изберете пат</headline>\n<bodyText><b>Кликнете на точката</b> за да ја одберете.\n<b>Shift-клик на патот</b> за да вметнете нова точка.\n<b>Shift-клик на точка</b> за оттаму да започнете нов пат.\n<b>Ctrl-клик на друг пат</b> за спојување.</bodyText>\n</bodyText>\n<column/><headline>Тастатурни кратенки</headline>\n<bodyText><textformat tabstops='[25]'>B Додај позадинска изворна ознака\nC Затвори измени\nG Прикажи GPS траги\nH Прикажи историја\nI Прикажи инспектор\nJ сврзи точка за вкрстени патишта\n(+Shift) Unjoin from other ways\nK Заклучи/отклучи го моментално избраното\nL Прикажи моментална географска должина\nM Зголеми уредувачки прозорец\nP Создај паралелен пат\nR Повтори ги ознаките\nS Зачувај (освен ако не е во живо)\nT Подреди во права линија/круг\nU Врати избришано (прикажи избришани патишра)\nX Пресечи пат на две\nZ Врати\n- Отстрани точка само од овој пат\n+ Додај нова ознака\n/ Избор на друг пат со истава точка\n</textformat><textformat tabstops='[50]'>Delete Избриши точка\n  (+Shift) Избриши цел пат\nEnter Заврши со цртање на линијата\nSpace Држи и влечи позадина\nEsc Откажи го ова уредување; превчитај од опслужувачот \n0 Отстрани ги сите ознаки\n1-9 Избор на зададени ознаки\n  (+Shift) Избери запамтени ознаки\n  (+S/Ctrl) Запамти ознаки\n§ или ` Кружи помеѓу групи ознаки\n</textformat>\n</bodyText>"
   hint_drawmode: кликнете за да додадете точка,\nдвоен клик/Ентер\nза да ја завршите линијата
   hint_latlon: "Г.Ш. $1\nГ.Д. $2"
   hint_loading: вчитувам податоци
diff --git a/config/potlatch/locales/rue.yml b/config/potlatch/locales/rue.yml
index fada17ba8..3f4fac9cd 100644
--- a/config/potlatch/locales/rue.yml
+++ b/config/potlatch/locales/rue.yml
@@ -5,11 +5,14 @@
 rue: 
   a_poi: $1 обєкту (POI)
   a_way: $1 лінію
+  action_addpoint: придаваня точкы на конець лінії
+  action_cancelchanges: зрушіня змін до
   action_changeway: зміны в лінії
   action_createpoi: створїня обєкту (POI)
   action_insertnode: придаваня  узла до лінії
   action_mergeways: злучіня двох ліній
   action_movepoi: пересуваня обєкту (POI)
+  action_movepoint: пересуваня точкы
   action_moveway: пересуваня лінії
   action_pointtags: наставлїня таґів на точку
   action_poitags: наставлїня таґів на обєкт (POI)
@@ -23,15 +26,18 @@ rue:
   advanced_maximise: Максімалізовати окно
   advanced_minimise: Мінімалізовати окно
   advanced_parallel: Паралелна лінія
+  advanced_tooltip: Росшырены дїї з едітованя
   advanced_undelete: Обновити
   advice_deletingpoi: Вымазаня обєкту (POI) (Z про зрушіня)
   advice_deletingway: Вымазаня лінії (Z про зрушіня)
+  advice_microblogged: Обновленый ваш статус $1
   advice_revertingpoi: Навернутя до послїднёго уложеного об’єкту (POI) (Z про назад)
   advice_revertingway: Навернутя до послїднёй уложеной лінії (Z про назад)
   advice_toolong: Дуже довге про одомкнутя - просиме роздїльте до куртшых ліній
   advice_uploadsuccess: Вшыткы дата успішно награты на сервер
   cancel: Зрушыти
   closechangeset: Заперти саду змін
+  conflict_download: Скачати чуджу верзію
   conflict_poichanged: Потім, як сьте зачали едітованя, хтось змінив точку $1$2.
   conflict_relchanged: Потім, як сьте зачали едітованя, хтось змінив звязок $1$2.
   conflict_visitpoi: Стисните 'ОК', про вказаня точкы.
@@ -41,12 +47,18 @@ rue:
   custom: "Шпеціалный:"
   delete: Вымазати
   editinglive: Едітованя нажыво
+  error_connectionfailed: "Перебачте - споїня з OpenStreetMap сервером розорване. Вашы зміны не могли быти уложены.\n\nСпробуйте уложыти зміны зясь?"
   error_microblog_long: "Посыланя до $1 неможне:\nHTTP код: $2\nХыбове повідомлїня: $3\n$1 жыба: $4"
   error_nopoi: Обєкт (POI) ся не нашов (може сьте посунули мапу?) — не дасть ся вернути назад.
   error_nosharedpoint: Лінії $1 і $2 в сучасности не мають сполочну точку, также ся не можу вернути назад.
   error_noway: "\nЛінія $1  ся не нашла (може сьте посунули мапу?) — не дасть ся вернути назад."
+  error_readfailed: Перебачте - сервер OpenStreetMap не одповідать на запросы про даня дат.\n\nСпробовати іщі раз?
+  findrelation: Найти звязкы што обсягують
+  gpxpleasewait: "Почекайте просиме: Зпрацуєме GPX-треку."
   heading_drawing: Креслїня
   heading_introduction: Вступ
+  heading_surveying: Огляд
+  heading_tagging: Становлїня значок
   heading_troubleshooting: Рїшіня проблему
   help: Поміч
   hint_drawmode: придайте точку кликнутём\nдвойклик/Enter\nукончіть лінію
@@ -55,6 +67,7 @@ rue:
   hint_overpoint: над точков ($1)\nкликнутём лінію напоїте
   hint_pointselected: точка выбрана\n(Shift-ЛК на точці\nзачне нову лінію)
   hint_saving: уложіня дат
+  hint_saving_loading: награваня/укладаня дат
   inspector: Іншпектор
   inspector_duplicate: Дуплікат
   inspector_in_ways: В лініях
@@ -65,6 +78,7 @@ rue:
   inspector_uploading: (награваня)
   inspector_way_connects_to_principal: Споює з $1 $2 і $3 іншыма $4
   inspector_way_nodes: $1 узлы
+  inspector_way_nodes_closed: $1 точок (замкнуто)
   loading: Награваня...
   login_pwd: "Гесло:"
   login_retry: Ваше мено хоснователя не было розознане, Спробуйте іщі раз.
@@ -72,6 +86,7 @@ rue:
   login_uid: "Мено хоснователя:"
   mail: Е.пошта
   more: Іщі
+  newchangeset: "Спробуйте знову: Potlatch зачне новый сет змін."
   "no": Нїт
   nobackground: Без позадя
   offset_broadcanal: Набережна шырокого каналу
@@ -80,16 +95,19 @@ rue:
   offset_narrowcanal: Набережна узкого каналу
   ok: Най буде
   openchangeset: Отворям саду змін
+  option_external: "Вонкашнє спущіня:"
   option_layer_cycle_map: OSM — цікло-мапа
   option_layer_maplint: OSM — Maplint (хыбы)
   option_layer_nearmap: "Австралія: NearMap"
   option_layer_ooc_25k: "В.БРІТАНІЯ істор.: 1:25k"
   option_layer_ooc_7th: "В.БРІТАНІЯ істор.: 1:7000"
   option_layer_ooc_npe: "В.БРІТАНІЯ істор.: NPE"
+  option_layer_ooc_scotland: "В.БРІТАНІЯ істор.: Шотландія"
   option_layer_os_streetview: "В.БРІТАНІЯ: OS StreetView"
   option_layer_streets_haiti: "Гаїті: назвы уліць"
   option_layer_surrey_air_survey: "UK: Surrey Air Survey"
   option_layer_tip: Выберте позадя
+  option_noname: Звыразнити дорогы без назвы
   option_photo: "Фото KML:"
   option_thinareas: Тонкы лінії про поліґоны
   option_thinlines: Тонкы лінії у вшыткых мірках мап
@@ -127,6 +145,7 @@ rue:
   prompt_closechangeset: Заперти саду змін $1
   prompt_createparallel: Створїня паралелной лінії
   prompt_editlive: Едітованя нажыво
+  prompt_editsave: Едітованя з улочінём
   prompt_helpavailable: Новый хоснователь? Поміч найдете вправо долов.
   prompt_launch: Отворити екстерну URL
   prompt_manyways: Тота область є дуже подробна і буде довго єй награвати. Преферуєте приближыти єй?
@@ -146,9 +165,12 @@ rue:
   tip_anticlockwise: Проти дразї годіновой ручкы (кликнутём зміните напрямку)
   tip_clockwise: По дразї годіновой ручкы (кликнутём зміните напрямку)
   tip_direction: Напрямок лінії — змінити на протилежный
+  tip_gps: Указати GPS-стопы (G)
   tip_options: Можности (выберте собі мапу про позадя)
   tip_photo: Награти фото
+  tip_presettype: Звольте якы тіпы шаблон указовати в меню.
   tip_repeattag: Наставити таґы передтым выбраной лінії(R)
+  tip_splitway: Розділити лінію у выбраній точцї (X)
   tip_tidy: Вырівнати точкы у лінії (Т)
   tip_undo: "Назад: $1 (Z)"
   uploading: Награваня...
diff --git a/config/potlatch/locales/sl.yml b/config/potlatch/locales/sl.yml
index 0bfdce8f5..e7132ebd4 100644
--- a/config/potlatch/locales/sl.yml
+++ b/config/potlatch/locales/sl.yml
@@ -4,31 +4,56 @@
 # Author: Dbc334
 sl: 
   a_poi: $1 POI
+  a_way: $1 pot
+  action_changeway: spremembe poti
   action_createpoi: ustvariti POI
   action_deletepoint: brisanje točke
+  action_insertnode: dodajanje vozlišča na pot
+  action_mergeways: združevanje dveh poti
   action_movepoi: prestaviti POI
+  action_movepoint: premikanje točke
+  action_moveway: prestavljanje poti
+  action_poitags: nastavljanje oznak na POI
+  action_revertway: vračanje poti
   advanced: Napredno
+  advanced_history: Zgodovina poti
+  advanced_inspector: Inšpektor
   advanced_maximise: Maksimiraj okno
   advanced_minimise: Minimiraj okno
   advanced_parallel: Vzporedna pot
+  advanced_tooltip: Napredna dejanja urejanja
   advanced_undelete: Obnovi
+  advice_deletingpoi: Brisanje POI (Z za razveljavitev)
+  advice_deletingway: Brisanje poti (Z za razveljavitev)
+  advice_tagconflict: Oznake se ne ujemajo – prosimo, preverite (Z za razveljavitev)
+  advice_uploadempty: Nič ni za naložiti
+  advice_uploadfail: Nalaganje ustavljeno
   cancel: Prekliči
   conflict_download: Prenesi njihovo različico
   conflict_overwrite: Prepiši njihovo različico
+  conflict_visitway: Kliknite 'Ok' za prikaz poti.
   custom: "Po meri:"
   delete: Izbriši
   deleting: brisanje
+  editinglive: Urejanje v živo
   editingoffline: Urejanje brez povezave
   heading_drawing: Risanje
   heading_introduction: Predstavitev
+  heading_tagging: Označevanje
   help: Pomoč
+  hint_latlon: "šir. $1\ndol. $2"
   hint_loading: nalaganje podatkov
   hint_saving: shranjevanje podatkov
+  hint_saving_loading: nalaganje/shranjevanje podatkov
+  inspector: Inšpektor
   inspector_duplicate: Dvojnik
+  inspector_latlon: "Šir. $1\nDol. $2"
   inspector_locked: Zaklenjeno
   inspector_node_count: ($1-krat)
   inspector_unsaved: Ni shranjeno
   inspector_uploading: (nalaganje)
+  inspector_way_nodes: $1 vozlišč
+  inspector_way_nodes_closed: $1 vozlišč (zaključeno)
   loading: Nalaganje ...
   login_pwd: "Geslo:"
   login_title: Ne morem se prijaviti
@@ -37,10 +62,17 @@ sl:
   more: Več
   "no": Ne
   nobackground: Brez ozadja
+  offset_choose: Izberite odmik (m)
   offset_motorway: Avtocesta (D3)
   ok: V redu
   option_layer_streets_haiti: "Haiti: imena ulic"
+  option_microblog_id: "Ime mikrobloga:"
+  option_microblog_pwd: "Geslo mikrobloga:"
+  option_noname: Označi neimenovane ceste
   option_photo: "Fotografija KML:"
+  option_thinareas: Uporabi tanjše črte za območja
+  option_tiger: Označi nespremenjen TIGER
+  option_warnings: Prikaži plavajoča opozorila
   point: Točka
   preset_icon_airport: Letališče
   preset_icon_bar: Bar
@@ -49,12 +81,14 @@ sl:
   preset_icon_cinema: Kinematograf
   preset_icon_disaster: Stavba Haiti
   preset_icon_fast_food: Hitra hrana
+  preset_icon_ferry_terminal: Trajekt
   preset_icon_fire_station: Gasilska postaja
   preset_icon_hospital: Bolnišnica
   preset_icon_hotel: Hotel
   preset_icon_museum: Muzej
   preset_icon_parking: Parkirišče
   preset_icon_pharmacy: Lekarna
+  preset_icon_place_of_worship: Svetišče
   preset_icon_police: Policijska postaja
   preset_icon_pub: Pivnica
   preset_icon_recycling: Recikliranje
@@ -62,23 +96,34 @@ sl:
   preset_icon_school: Šola
   preset_icon_station: Železniška postaja
   preset_icon_supermarket: Supermarket
+  preset_icon_taxi: Območje za taksije
   preset_icon_telephone: Telefon
   preset_icon_theatre: Gledališče
   prompt_changesetcomment: "Vnesite opis vaših sprememb:"
+  prompt_editlive: Urejanje v živo
   prompt_launch: Zaženi zunanji URL
   prompt_savechanges: Shrani spremembe
   prompt_unlock: Kliknite za odklenitev
   prompt_welcome: Dobrodošli na OpenStreetMap!
   retry: Poskusi znova
+  revert: Vrni
   save: Shrani
   tags_backtolist: Nazaj na seznam
+  tags_descriptions: Opisi '$1'
+  tags_findatag: Najdi oznako
   tags_findtag: Poišči oznako
   tip_addtag: Dodaj novo oznako
+  tip_alert: Prišlo je do napake – kliknite za podrobnosti
   tip_noundo: Nič ni za razveljaviti
   tip_photo: Naloži slike
   tip_undo: Razveljavi $1 (Z)
   uploading: Nalaganje ...
   uploading_deleting_pois: Brisanje POI-jev
+  uploading_deleting_ways: Brisanje poti
+  uploading_poi: Nalaganje POI $1
   uploading_poi_name: Nalaganje POI $1, $2
+  uploading_way: Nalaganje poti $1
+  uploading_way_name: Nalaganje poti $1, $2
   warning: Opozorilo!
+  way: Pot
   "yes": Da
diff --git a/config/potlatch/locales/sr-EC.yml b/config/potlatch/locales/sr-EC.yml
index a5bf09411..570671310 100644
--- a/config/potlatch/locales/sr-EC.yml
+++ b/config/potlatch/locales/sr-EC.yml
@@ -1,8 +1,9 @@
-# Messages for Serbian Cyrillic ekavian (Српски (ћирилица))
+# Messages for Serbian Cyrillic ekavian (‪Српски (ћирилица)‬)
 # Exported from translatewiki.net
 # Export driver: syck
 # Author: Charmed94
 # Author: Nikola Smolenski
+# Author: Rancher
 # Author: Милан Јелисавчић
 sr-EC: 
   a_poi: $1 ЗТ
@@ -109,7 +110,7 @@ sr-EC:
   login_title: Пријава није успела
   login_uid: "Корисничко име:"
   mail: Пошта
-  more: Још
+  more: Више
   newchangeset: "Молимо, пробајте поново: Потлач ће почети с новим скупом измена."
   "no": Не
   nobackground: Без позадине
diff --git a/config/potlatch/locales/tr.yml b/config/potlatch/locales/tr.yml
index 2dabc0ece..65b444670 100644
--- a/config/potlatch/locales/tr.yml
+++ b/config/potlatch/locales/tr.yml
@@ -3,13 +3,14 @@
 # Export driver: syck
 # Author: Alerque
 # Author: Katpatuka
+# Author: SalihB
 tr: 
-  a_poi: "POI: $1"
+  a_poi: "Etiket: $1"
   a_way: "yol: $1"
   action_addpoint: yolun sonuna bir nokta ekleniyor
   action_cancelchanges: "iptal ediliyor:"
   action_changeway: yolun değişiklikleri
-  action_createparallel: Yolunun paraleli oluştur
+  action_createparallel: paralel yollar oluşturuluyor
   action_createpoi: POI oluşturuluyor
   action_deletepoint: bir nokta siliniyor
   action_insertnode: yola bir nokta ekleniyor
@@ -18,13 +19,13 @@ tr:
   action_movepoint: nokta taşınıyor
   action_moveway: yol taşınıyor
   action_pointtags: noktadaki etiketler ayarlanıyor
-  action_poitags: POI'nin etiketleri ayarlanıyor
+  action_poitags: Etiketin verileri ayarlanıyor
   action_reverseway: yol tersine çevriliyor
   action_revertway: yol geri dönülüyor
   action_splitway: yol bölünüyor
-  action_waytags: yoldaki etiketler ayarlanıyor
+  action_waytags: yoldaki parametreler düzenleniyor
   advanced: Gelişmiş
-  advanced_close: Değişiklik takımı kapat
+  advanced_close: Değişiklik takımını kapat
   advanced_history: Yolun geçmişi
   advanced_inspector: Ayrıntı
   advanced_maximise: Ekranı kapla
@@ -36,41 +37,43 @@ tr:
   advice_deletingpoi: POI siliniyor (Ger almak için Z)
   advice_deletingway: Yol siliniyor (geri almak için Z)
   advice_nocommonpoint: Yolların ortak noktası yok
-  advice_revertingpoi: POI son kaydedilen şekline dönülüyor (geri almak için Z)
+  advice_revertingpoi: Etiket son kaydedilen şekline dönülüyor (geri almak için Z)
   advice_revertingway: Yol son kaydedilen şekline geri dönülüyor (geri almak için Z)
-  advice_tagconflict: Etiketler eşleşmiyor - lütfen kontrol et
+  advice_tagconflict: "Parametreler eşleşmiyor - lütfen kontrol edin (Geri almak için: Z)"
   advice_toolong: Kilidi kaldırmak için yol fazla uzun - lütfen önce daha kısa yollara ayır
   advice_uploadempty: Gönderilecek hiç bir şey yok
   advice_uploadfail: Gönderme durduruldu
-  advice_uploadsuccess: Bütü veri başarıyla gönderildi
+  advice_uploadsuccess: Bütün veri başarıyla gönderildi
   advice_waydragged: Yol taşındı (geri almak için Z'ye bas)
   cancel: Vazgeç
-  closechangeset: Değişiklik takımı kapatıyor
+  closechangeset: Değişiklik takımı kapatılıyor
   conflict_download: Onların sürümünü getir
   conflict_overwrite: Öbür sürümünün üzerinde yaz
   conflict_poichanged: Senin düzenlemenin başladıktan sonra başka birisi nokta $1$2 değiştirmiş.
-  conflict_relchanged: Senin düzenlemenin başladıktan sonra başka birisi ilişki $1$2 değiştirmiş.
+  conflict_relchanged: Birisi senin düzenlediğin $1$2 ilişkisini değiştirdi.
+  conflict_waychanged: Birisi sizin düzenlediğiniz $1$2 yolunu değiştirdi.
   createrelation: Yeni bir ilişki yarat
   custom: "Özel:"
   delete: Sil
   deleting: siliniyor
-  drag_pois: POI'leri sürükle-bırak
+  drag_pois: Etiketleri sürükle-bırak
   editinglive: Canlı düzenleniyor
   editingoffline: Çevrimdışı düzenleniyor
   emailauthor: \n\nLütfen bu hata konusunda richard\@systemeD.net'e bir e.posta at
   error_anonymous: Anonim haritacılarla iletişime geçemezsin.
   error_connectionfailed: Maalesef OpenStreetMap sunucusuyla bağlantı koptu. Son değişiklikler kaydedilmedi.\n\nBir daha denemek ister misin?
-  error_microblog_long: "$1 yüklenme başarsız oldu:\nHTTP kodu: $2\nHata mesajı: $3\n$1 hata: $4"
+  error_microblog_long: "$1'ün yüklenmesi başarsız oldu:\nHTTP kodu: $2\nHata mesajı: $3\n$1 hata: $4"
   error_nopoi: POI bulunamadı (belki başka bir yere taşıdınız), bundan dolayı geri alamıyorum.
   error_nosharedpoint: $1 ve $2 yollarının paylaştıkları ortak bir nokta artık yok, bu yüzden bölmeyi geri alamıyorum.
-  error_noway: $1 yolu bulunamıyor (belki atıdı) bu yüzden geri alamıyorum.
+  error_noway: $1 yolu bulunamıyor (engellenmiş olabilir misiniz?) bu yüzden geri alamıyorum.
+  error_readfailed: Üzgünüz - OSM sunucusu yanıt vermedi.\n\nYeniden denensin mi?
   existingrelation: Mevcut bir ilişkiye ekle
   findrelation: İçeren bir ilişki bul
   gpxpleasewait: GPX izi işlenirken lütfen biraz bekleyin
   heading_drawing: Çizim
   heading_introduction: Tanıtım
   heading_pois: Başlarken
-  heading_quickref: Lejant
+  heading_quickref: Kılavuz
   heading_surveying: Arazi etüdü
   heading_tagging: Etiketlemek
   heading_troubleshooting: Sorun giderme
@@ -79,9 +82,9 @@ tr:
   hint_latlon: "enlem $1\nboylam $2"
   hint_loading: yollar yükleniyor
   hint_overendpoint: yolun son noktası\nbağlamak için tıkla\nbirleştirmek için shift-tıkla
-  hint_overpoint: nokta üzerine\nbağlamak için tıkla
+  hint_overpoint: noktanın  üzerinde ($1)\nbağlanmak için tıklayın
   hint_pointselected: nokta seçili\n(shift-tıkla yeni cizgi\nbaşlatmak için)
-  hint_saving: veri kaydedilir
+  hint_saving: veriler kaydediliyor
   hint_saving_loading: Veri alınıyor/kaydediliyor
   inspector: Denetçi
   inspector_duplicate: "Çift:"
@@ -101,7 +104,7 @@ tr:
   more: Daha fazla
   newchangeset: "Lütfen tekrar dene: Potlatch yeni bir değişiklik takımı başlatacaktır."
   "no": Hayır
-  nobackground: Boş arka plan
+  nobackground: Arkaplan yok
   norelations: Çalışılan alanda ilişki yok
   offset_choose: Mesafe seç (m)
   offset_dual: Çift şeritli yol (D2)
@@ -114,12 +117,14 @@ tr:
   option_layer_maplint: OSM - Maplint (hataları)
   option_layer_nearmap: "Avustralya: NearMap"
   option_layer_ooc_scotland: İskoçya (tarihsel)
+  option_layer_os_streetview: "İngiltere: OS Sokak Görünümü"
   option_layer_streets_haiti: "Haiti'de: sokak adları"
   option_layer_tip: Arkafonu seç
   option_limitways: Eğer fazla veri indirilirse beni uyar
   option_noname: Adsız yolları vurgulansın
   option_photo: "Foto KML:"
-  option_thinlines: Tüm ölçeklerde ince çizgileri kullan
+  option_thinareas: Alanlarda ince çizgiler kullan
+  option_thinlines: Tüm ölçeklerde ince çizgiler kullan
   option_tiger: Değiştirilmemiş TIGER verileri vurgula (ABD)
   option_warnings: Uyarıları göster
   point: Nokta
@@ -132,13 +137,13 @@ tr:
   preset_icon_disaster: "Haiti'de: bina"
   preset_icon_fast_food: Büfe / lokanta
   preset_icon_ferry_terminal: Feribot
-  preset_icon_fire_station: Itfaiye
+  preset_icon_fire_station: İtfaiye
   preset_icon_hospital: Hastane
   preset_icon_hotel: Hotel
   preset_icon_museum: Müze
   preset_icon_parking: Park alanı
   preset_icon_pharmacy: Eczane
-  preset_icon_place_of_worship: İbadet yeri
+  preset_icon_place_of_worship: İbadethane
   preset_icon_police: Polis
   preset_icon_post_box: Posta kutusu
   preset_icon_pub: Birahane
@@ -158,10 +163,10 @@ tr:
   prompt_editsave: Kaydet ile düzenle
   prompt_helpavailable: Yeni kullanıcı mısın? Yardıma bak.
   prompt_launch: Dış bağlantıyı başlat
-  prompt_manyways: Bu alan çok detaylı ve yüklemesi uzun sürecek. Yakınlaştıralım mı biraz?
+  prompt_manyways: Bu alan çok detaylı ve yüklemesi uzun sürebilir. Yakınlaştırılsın mı?
   prompt_revertversion: "Daha önce kaydedilmiş bir sürümüne dön:"
   prompt_savechanges: Değişiklikleri kaydet
-  prompt_taggedpoints: Bu yolunun bazı noktaları etiketlenmiş ya da ilişkiler içinde kullanılıyor. Gerçekten silinsin mi?
+  prompt_taggedpoints: Bu yol üzerindeki bazı noktalara parametreler verilmiş veya bağlantılarda kullanılıyor. Yine de silinsin mi?
   prompt_track: GPS izini, düzenlemek için (kilitli) bir yola dönüştür.
   prompt_unlock: Kilidi açmak için tıkla
   prompt_welcome: OpenStreetMap'e Hoşgeldin!
@@ -169,11 +174,11 @@ tr:
   revert: Geri al
   save: Kaydet
   tags_backtolist: Listeye geri dön
-  tags_findatag: Etiketi bul
+  tags_findatag: Parametreyi bul
   tags_findtag: Etiketi bul
   tags_typesearchterm: "Aramak için bir sözcük yazın:"
   tip_addrelation: Bir ilişkiye ekle
-  tip_addtag: Yeni etiket ekle
+  tip_addtag: Yeni parametre ekle
   tip_alert: Bir hata oluştu - ayrıntılar için tıkla
   tip_anticlockwise: saatin ters yönünde dairesel yol - tersine dönmek için tıkla
   tip_clockwise: saat yönünde dairesel yol - tersine dönmek için tıkla
@@ -183,17 +188,17 @@ tr:
   tip_options: Ayarları değiştir (harita arka planını seç)
   tip_photo: Fotoğrafları yükle
   tip_presettype: Menüde sunulan türleri seç
-  tip_repeattag: Etiketleri bir önceki seçtiğin yoldan kopyala (R)
+  tip_repeattag: Parametreleri bir önceki seçtiğin yoldan kopyala (R)
   tip_revertversion: Geri dönülecek sürümü seç
   tip_selectrelation: Seçili rotaya ekle
   tip_splitway: Seçtiğin noktada yolu böl (X)
   tip_tidy: Doğru çizgi oluştur (kapalı bir yoldan bir daire oluşturulacak)
   tip_undo: $1 Geri Al (Z)
   uploading: Gönderiliyor...
-  uploading_deleting_pois: POI'ler siliniyor
+  uploading_deleting_pois: Etiketler siliniyor
   uploading_deleting_ways: Yolları siliniyor
-  uploading_poi: $1 POI yükleniyor
-  uploading_poi_name: $1, $2 POI yükleniyor
+  uploading_poi: $1 etiketi yükleniyor
+  uploading_poi_name: $1, $2 etiketler yükleniyor
   uploading_relation: $1 ilişki yükleniyor
   uploading_way: $1 yol yükleniyor
   uploading_way_name: $1, $2 yol yükleniyor
diff --git a/config/potlatch/locales/zh-CN.yml b/config/potlatch/locales/zh-CN.yml
new file mode 100644
index 000000000..b3dcceed5
--- /dev/null
+++ b/config/potlatch/locales/zh-CN.yml
@@ -0,0 +1,181 @@
+# Messages for Chinese (China) (‪中文(中国大陆)‬)
+# Exported from translatewiki.net
+# Export driver: syck
+# Author: Mmyangfl
+zh-CN: 
+  action_addpoint: 在路径末尾添加节点
+  action_changeway: 路径的更改
+  action_createparallel: 创建并行的路径
+  action_deletepoint: 删除点
+  action_insertnode: 在路径中添加节点
+  action_mergeways: 合并两条路径中
+  action_movepoint: 移动节点中
+  action_moveway: 移动路径
+  action_pointtags: 节点上的标签
+  action_reverseway: 恢复路径中
+  action_revertway: 恢复路径中
+  action_splitway: 分割路径中
+  advanced: 高级
+  advanced_close: 关闭修改集合
+  advanced_history: 路径历史
+  advanced_inspector: 检查器
+  advanced_maximise: 最大化窗口
+  advanced_minimise: 最小化窗口
+  advanced_parallel: 并行路径
+  advanced_tooltip: 高级编辑操作
+  advanced_undelete: 撤消删除
+  advice_conflict: 服务器冲突 - 您可能需要再次尝试保存
+  advice_deletingway: 删除路径 (Z 撤消)
+  advice_microblogged: 更新你的 $1 的状态
+  advice_nocommonpoint: 这些路径不共享一个公共节点
+  advice_revertingway: 恢复到上次保存的路径中 (Z 撤消)
+  advice_tagconflict: 标签不匹配 - 请检查(Z 撤消)
+  advice_toolong: 解锁的时间太长 - 请分割成较短的路径
+  advice_uploadempty: 没什么可上传
+  advice_uploadfail: 上传已中止
+  advice_uploadsuccess: 所有数据都已成功上传
+  advice_waydragged: 已拖拽路径 (Z 撤销)
+  cancel: 取消
+  closechangeset: 关闭修改集合中
+  conflict_download: 下载他们的版本
+  conflict_overwrite: 覆盖他们的版本
+  conflict_poichanged: 自从你开始编辑时，其他人已修改了节点 $1$2。
+  conflict_relchanged: 自从你开始编辑时，其他人已修改了关系 $1$2。
+  conflict_visitpoi: 点击'确定'以显示路径。
+  conflict_visitway: 点击'确定'以显示路径。
+  conflict_waychanged: 自从你开始编辑时，其他人已修改了路径 $1$2。
+  createrelation: 创建新的关系
+  custom: "自定义:"
+  delete: 删除
+  deleting: 删除中
+  drag_pois: 拖拽关注点到地图上
+  editinglive: 在线编辑中
+  editingoffline: 离线编辑
+  error_connectionfailed: 对不起 - 连接到 OpenStreetMap 的服务器失败。任何最近的修改将不会保存。\n\n您想再试一次吗?
+  error_microblog_long: "张贴到 $1 失败:\nHTTP 代码: $2\n错误信息: $3\n$1 错误: $4"
+  error_nosharedpoint: 路径 $1 和 $2 不共享一个节点了，所以我不能撤消分裂。
+  error_noway: 找不到路径 $1 (也许你已将它移走了吗?)，所以我不能撤消。
+  error_readfailed: 对不起 - OpenStreetMap 的服务器对数据请求没有响应。\n\n您想再试一次吗?
+  gpxpleasewait: 请稍候，正在处理 GPX 轨迹。
+  heading_drawing: 绘图
+  heading_introduction: 简介
+  heading_pois: 入门
+  heading_quickref: 快速参考
+  heading_surveying: 测量
+  heading_tagging: 添加标签
+  heading_troubleshooting: 疑难解答
+  help: 帮助
+  hint_latlon: "纬度 $1\n经度 $2"
+  hint_loading: 加载数据
+  hint_pointselected: 已选择节点\n(shift-点击以\n开始新路径)
+  hint_saving: 保存数据
+  hint_saving_loading: 加载/保存数据
+  inspector: 检查器
+  inspector_duplicate: 重复的
+  inspector_latlon: "纬度 $1\n经度 $2"
+  inspector_locked: 已锁定
+  inspector_node_count: ($1 次)
+  inspector_not_in_any_ways: 不在任何路径中 (POI)
+  inspector_unsaved: 未保存
+  inspector_uploading: (上传中)
+  inspector_way_connects_to: 连接 $1 条路径
+  inspector_way_nodes: $1 个节点
+  loading: 载入中...
+  login_pwd: "密码:"
+  login_retry: 无法识别您的网站登录凭证。请再试一次。
+  login_title: 无法登录
+  login_uid: "用户名:"
+  mail: 邮件
+  more: 更多
+  newchangeset: "\n请重试: Potlatch 将打开一个新的修改集合。"
+  "no": 不
+  nobackground: 无背景
+  norelations: 在当前区域中没有关系
+  offset_choose: 选择偏移量 (米)
+  offset_motorway: 高速公路 (D3)
+  ok: 确定
+  openchangeset: 打开修改集合中
+  option_custompointers: 使用笔和手的指针
+  option_layer_cycle_map: OSM - cycle map
+  option_layer_maplint: OSM - Maplint (错误)
+  option_layer_tip: 选择要显示的背景
+  option_limitways: 加载大量数据警告
+  option_photo: "照片 KML:"
+  option_thinareas: 为此区域使用较细的线条
+  option_warnings: 显示浮动警告
+  point: 节点
+  preset_icon_airport: 机场
+  preset_icon_bar: 酒吧
+  preset_icon_bus_stop: 公交停靠站
+  preset_icon_cafe: 咖啡馆
+  preset_icon_cinema: 电影院
+  preset_icon_convenience: 便利店
+  preset_icon_fast_food: 快餐
+  preset_icon_ferry_terminal: 渡轮
+  preset_icon_fire_station: 消防局
+  preset_icon_hospital: 医院
+  preset_icon_hotel: 酒店
+  preset_icon_museum: 博物馆
+  preset_icon_parking: 停车场
+  preset_icon_pharmacy: 药房
+  preset_icon_place_of_worship: 宗教场所
+  preset_icon_police: 警察局
+  preset_icon_post_box: 邮箱
+  preset_icon_pub: 酒吧
+  preset_icon_recycling: 回收
+  preset_icon_restaurant: 餐厅
+  preset_icon_school: 学校
+  preset_icon_station: 火车站
+  preset_icon_supermarket: 超市
+  preset_icon_taxi: 出租车站
+  preset_icon_telephone: 电话
+  preset_icon_theatre: 剧院
+  preset_tip: 从预设标签菜单中选择一个来描述 $1
+  prompt_addtorelation: 添加 $1 至关系
+  prompt_changesetcomment: "输入以描述您的更改:"
+  prompt_closechangeset: 关闭修改集合 $1
+  prompt_createparallel: 创建并行的路径
+  prompt_editlive: 在线编辑
+  prompt_editsave: 编辑再保存
+  prompt_helpavailable: 新用户?看看左下角的帮助按钮。
+  prompt_launch: 启动外部 URL
+  prompt_live: 在在线模式下，每一个你更改的项目都将被即时保存在 OpenStreetMap 的数据库中 - 不推荐初学者使用。您确定吗?
+  prompt_manyways: 这一区域信息非常详细，需要很长的时间来载入。你愿意放大吗？
+  prompt_revertversion: "恢复到先前储存的版本:"
+  prompt_savechanges: 保存更改
+  prompt_taggedpoints: 在路径上的一些节点有标签，或是关联到了关系中。真的要删除吗?
+  prompt_track: 转换 GPS 轨迹至路径
+  prompt_unlock: 点击解锁
+  prompt_welcome: 欢迎使用 OpenStreetMap!
+  retry: 重试
+  revert: 恢复
+  save: 保存
+  tags_backtolist: 返回列表
+  tags_descriptions: "'$1' 的说明"
+  tags_findatag: 查找标签
+  tags_findtag: 查找标签
+  tags_typesearchterm: "输入一个词来查找:"
+  tip_addrelation: 添加到关系
+  tip_addtag: 添加新的标签
+  tip_alert: 发生错误 - 点击查看详情
+  tip_anticlockwise: 逆时针循环的路径 - 点击逆转
+  tip_direction: 路径的方向 - 点击逆转
+  tip_gps: 显示 GPS 轨迹 (G)
+  tip_noundo: 没什么可撤消
+  tip_options: 设置选项(选择地图背景)
+  tip_photo: 加载照片
+  tip_repeattag: 从刚才的路径重复标签 (R)
+  tip_revertversion: 选择要恢复到的版本
+  tip_selectrelation: 添加到所选的路线
+  tip_splitway: 在选定的节点处分割路径 (X)
+  tip_tidy: 整理路径上的节点 (T)
+  tip_undo: 撤销 $1 (Z)
+  uploading: 上传中...
+  uploading_deleting_ways: 删除路径中
+  uploading_relation: 上传关系 $1 中
+  uploading_relation_name: 上传关系 $1, $2 中
+  uploading_way: 上传路径 $1 中
+  uploading_way_name: 上传路径 $1, $2 中
+  warning: 警告!
+  way: 路径
+  "yes": 是
diff --git a/lib/diff_reader.rb b/lib/diff_reader.rb
index 9b3e01b86..0f0492f44 100644
--- a/lib/diff_reader.rb
+++ b/lib/diff_reader.rb
@@ -54,7 +54,18 @@ class DiffReader
         # as the call to @reader.next in the innermost loop will take
         # care of that for us.
         if @reader.node_type == 1 # element
-          yield @reader.name
+          name = @reader.name
+          attributes =  {}
+
+          if @reader.has_attributes?
+            while @reader.move_to_next_attribute == 1
+              attributes[@reader.name] = @reader.value
+            end
+
+            @reader.move_to_element
+          end
+
+          yield name, attributes
         else
           read_or_die
         end
@@ -70,7 +81,7 @@ class DiffReader
   # elements, it would be better to DRY and do this in a block. This
   # could also help with error handling...?
   def with_model
-    with_element do |model_name|
+    with_element do |model_name,model_attributes|
       model = MODELS[model_name]
       raise OSM::APIBadUserInput.new("Unexpected element type #{model_name}, " +
                                      "expected node, way or relation.") if model.nil?
@@ -110,7 +121,7 @@ class DiffReader
     result.root.name = "diffResult"
 
     # loop at the top level, within the <osmChange> element
-    with_element do |action_name|
+    with_element do |action_name,action_attributes|
       if action_name == 'create'
         # create a new element. this code is agnostic of the element type
         # because all the elements support the methods that we're using.
@@ -204,12 +215,23 @@ class DiffReader
           # can a delete have placeholders under any circumstances?
           # if a way is modified, then deleted is that a valid diff?
           new.fix_placeholders!(ids)
-          old.delete_with_history!(new, @changeset.user)
 
           xml_result = XML::Node.new model.to_s.downcase
           # oh, the irony... the "new" element actually contains the "old" ID
           # a better name would have been client/server, but anyway...
           xml_result["old_id"] = new_id.to_s
+
+          if action_attributes["if-unused"]
+            begin
+              old.delete_with_history!(new, @changeset.user)
+            rescue OSM::APIPreconditionFailedError => ex
+              xml_result["new_id"] = old.id.to_s
+              xml_result["new_version"] = old.version.to_s
+            end
+          else
+            old.delete_with_history!(new, @changeset.user)
+          end
+
           result.root << xml_result
         end
 
diff --git a/public/clientaccesspolicy.xml b/public/clientaccesspolicy.xml
new file mode 100644
index 000000000..5ba9c81a0
--- /dev/null
+++ b/public/clientaccesspolicy.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<access-policy>
+  <cross-domain-access>
+    <policy>
+      <allow-from http-request-headers="*" http-methods="*">
+        <domain uri="*"/>
+      </allow-from>
+      <grant-to>
+        <resource path="/api" include-subpaths="true"/>
+        <resource path="/oauth" include-subpaths="true"/>
+      </grant-to>
+    </policy>
+  </cross-domain-access>
+</access-policy>
diff --git a/public/images/key/osmarender/admin.png b/public/images/key/osmarender/admin.png
new file mode 100644
index 000000000..80a10f20c
Binary files /dev/null and b/public/images/key/osmarender/admin.png differ
diff --git a/public/images/key/osmarender/allotments.png b/public/images/key/osmarender/allotments.png
new file mode 100644
index 000000000..ed1af15bf
Binary files /dev/null and b/public/images/key/osmarender/allotments.png differ
diff --git a/public/images/key/osmarender/bridleway.png b/public/images/key/osmarender/bridleway.png
new file mode 100644
index 000000000..3652d188d
Binary files /dev/null and b/public/images/key/osmarender/bridleway.png differ
diff --git a/public/images/key/osmarender/brownfield.png b/public/images/key/osmarender/brownfield.png
new file mode 100644
index 000000000..b1f348519
Binary files /dev/null and b/public/images/key/osmarender/brownfield.png differ
diff --git a/public/images/key/osmarender/building.png b/public/images/key/osmarender/building.png
new file mode 100644
index 000000000..e2b9902fc
Binary files /dev/null and b/public/images/key/osmarender/building.png differ
diff --git a/public/images/key/osmarender/byway.png b/public/images/key/osmarender/byway.png
new file mode 100644
index 000000000..2791234ac
Binary files /dev/null and b/public/images/key/osmarender/byway.png differ
diff --git a/public/images/key/osmarender/cemetery.png b/public/images/key/osmarender/cemetery.png
new file mode 100644
index 000000000..fa5b98461
Binary files /dev/null and b/public/images/key/osmarender/cemetery.png differ
diff --git a/public/images/key/osmarender/centre.png b/public/images/key/osmarender/centre.png
new file mode 100644
index 000000000..0ac055eb9
Binary files /dev/null and b/public/images/key/osmarender/centre.png differ
diff --git a/public/images/key/osmarender/commercial.png b/public/images/key/osmarender/commercial.png
new file mode 100644
index 000000000..2b9bac942
Binary files /dev/null and b/public/images/key/osmarender/commercial.png differ
diff --git a/public/images/key/osmarender/common.png b/public/images/key/osmarender/common.png
new file mode 100644
index 000000000..ed1af15bf
Binary files /dev/null and b/public/images/key/osmarender/common.png differ
diff --git a/public/images/key/osmarender/cycleway.png b/public/images/key/osmarender/cycleway.png
new file mode 100644
index 000000000..7b37a80ea
Binary files /dev/null and b/public/images/key/osmarender/cycleway.png differ
diff --git a/public/images/key/osmarender/farm.png b/public/images/key/osmarender/farm.png
new file mode 100644
index 000000000..ed1af15bf
Binary files /dev/null and b/public/images/key/osmarender/farm.png differ
diff --git a/public/images/key/osmarender/footway.png b/public/images/key/osmarender/footway.png
new file mode 100644
index 000000000..dd9d9124c
Binary files /dev/null and b/public/images/key/osmarender/footway.png differ
diff --git a/public/images/key/osmarender/forest.png b/public/images/key/osmarender/forest.png
new file mode 100644
index 000000000..5fa90f1e6
Binary files /dev/null and b/public/images/key/osmarender/forest.png differ
diff --git a/public/images/key/osmarender/heathland.png b/public/images/key/osmarender/heathland.png
new file mode 100644
index 000000000..07db3315d
Binary files /dev/null and b/public/images/key/osmarender/heathland.png differ
diff --git a/public/images/key/osmarender/industrial.png b/public/images/key/osmarender/industrial.png
new file mode 100644
index 000000000..b1f348519
Binary files /dev/null and b/public/images/key/osmarender/industrial.png differ
diff --git a/public/images/key/osmarender/lake.png b/public/images/key/osmarender/lake.png
new file mode 100644
index 000000000..4d80a033c
Binary files /dev/null and b/public/images/key/osmarender/lake.png differ
diff --git a/public/images/key/osmarender/mapkey.png b/public/images/key/osmarender/mapkey.png
new file mode 100644
index 000000000..64c858fb2
Binary files /dev/null and b/public/images/key/osmarender/mapkey.png differ
diff --git a/public/images/key/osmarender/military.png b/public/images/key/osmarender/military.png
new file mode 100644
index 000000000..40fa3cd9f
Binary files /dev/null and b/public/images/key/osmarender/military.png differ
diff --git a/public/images/key/osmarender/motorway.png b/public/images/key/osmarender/motorway.png
index 2c962c621..456eae5f4 100644
Binary files a/public/images/key/osmarender/motorway.png and b/public/images/key/osmarender/motorway.png differ
diff --git a/public/images/key/osmarender/park.png b/public/images/key/osmarender/park.png
new file mode 100644
index 000000000..e9a3448b7
Binary files /dev/null and b/public/images/key/osmarender/park.png differ
diff --git a/public/images/key/osmarender/pitch.png b/public/images/key/osmarender/pitch.png
new file mode 100644
index 000000000..e9a3448b7
Binary files /dev/null and b/public/images/key/osmarender/pitch.png differ
diff --git a/public/images/key/osmarender/primary.png b/public/images/key/osmarender/primary.png
new file mode 100644
index 000000000..caf298d63
Binary files /dev/null and b/public/images/key/osmarender/primary.png differ
diff --git a/public/images/key/osmarender/rail.png b/public/images/key/osmarender/rail.png
new file mode 100644
index 000000000..21f0c9f61
Binary files /dev/null and b/public/images/key/osmarender/rail.png differ
diff --git a/public/images/key/osmarender/reserve.png b/public/images/key/osmarender/reserve.png
new file mode 100644
index 000000000..ff15c8259
Binary files /dev/null and b/public/images/key/osmarender/reserve.png differ
diff --git a/public/images/key/osmarender/resident.png b/public/images/key/osmarender/resident.png
new file mode 100644
index 000000000..9be0e4903
Binary files /dev/null and b/public/images/key/osmarender/resident.png differ
diff --git a/public/images/key/osmarender/retail.png b/public/images/key/osmarender/retail.png
new file mode 100644
index 000000000..38c330580
Binary files /dev/null and b/public/images/key/osmarender/retail.png differ
diff --git a/public/images/key/osmarender/school.png b/public/images/key/osmarender/school.png
new file mode 100644
index 000000000..a80f78bf4
Binary files /dev/null and b/public/images/key/osmarender/school.png differ
diff --git a/public/images/key/osmarender/secondary.png b/public/images/key/osmarender/secondary.png
new file mode 100644
index 000000000..2695a4d5b
Binary files /dev/null and b/public/images/key/osmarender/secondary.png differ
diff --git a/public/images/key/osmarender/station.png b/public/images/key/osmarender/station.png
new file mode 100644
index 000000000..0b1fae27d
Binary files /dev/null and b/public/images/key/osmarender/station.png differ
diff --git a/public/images/key/osmarender/subway.png b/public/images/key/osmarender/subway.png
new file mode 100644
index 000000000..c225c2af6
Binary files /dev/null and b/public/images/key/osmarender/subway.png differ
diff --git a/public/images/key/osmarender/summit.png b/public/images/key/osmarender/summit.png
new file mode 100644
index 000000000..f777f6ea3
Binary files /dev/null and b/public/images/key/osmarender/summit.png differ
diff --git a/public/images/key/osmarender/tourist.png b/public/images/key/osmarender/tourist.png
new file mode 100644
index 000000000..ceb7b19a7
Binary files /dev/null and b/public/images/key/osmarender/tourist.png differ
diff --git a/public/images/key/osmarender/track.png b/public/images/key/osmarender/track.png
new file mode 100644
index 000000000..3c67f5438
Binary files /dev/null and b/public/images/key/osmarender/track.png differ
diff --git a/public/images/key/osmarender/tram.png b/public/images/key/osmarender/tram.png
new file mode 100644
index 000000000..4dc979de3
Binary files /dev/null and b/public/images/key/osmarender/tram.png differ
diff --git a/public/images/key/osmarender/trunk.png b/public/images/key/osmarender/trunk.png
new file mode 100644
index 000000000..c28b77571
Binary files /dev/null and b/public/images/key/osmarender/trunk.png differ
diff --git a/public/images/key/osmarender/unsurfaced.png b/public/images/key/osmarender/unsurfaced.png
new file mode 100644
index 000000000..6837c48ab
Binary files /dev/null and b/public/images/key/osmarender/unsurfaced.png differ
diff --git a/public/images/key/osmarender/wood.png b/public/images/key/osmarender/wood.png
new file mode 100644
index 000000000..5fa90f1e6
Binary files /dev/null and b/public/images/key/osmarender/wood.png differ
diff --git a/public/javascripts/menu.js b/public/javascripts/menu.js
index 9f88f0e0c..5b4c3050e 100644
--- a/public/javascripts/menu.js
+++ b/public/javascripts/menu.js
@@ -10,6 +10,14 @@ function openMenu(anchor, menu) {
   });
 }
 
+/*
+ * Close a menu.
+ */
+function closeMenu(menu) {
+  clearTimeout(menu.timer);
+  menu.style.display = "none";
+}
+
 /*
  * Callback called when the mouse enters a menu anchor.
  */
@@ -58,7 +66,9 @@ function createMenu(anchorid, menuid, delay) {
   var anchor = $(anchorid);
   var menu = $(menuid);
 
+  anchor.observe("mouseup", function (event) { closeMenu(menu) });
   anchor.observe("mouseover", function (event) { enterMenuAnchor(anchor, anchor, menu, delay) });
   anchor.observe("mouseout", function (event) { leaveMenuAnchor(event, anchor, menu) });
+  menu.observe("mouseup", function (event) { closeMenu(menu) });
   menu.observe("mouseout", function (event) { leaveMenu(event, anchor, menu) });
 }
diff --git a/public/openlayers/OpenStreetMap.js b/public/openlayers/OpenStreetMap.js
index ce713e4b6..aebfa65db 100644
--- a/public/openlayers/OpenStreetMap.js
+++ b/public/openlayers/OpenStreetMap.js
@@ -48,7 +48,11 @@ OpenLayers.Layer.OSM.Mapnik = OpenLayers.Class(OpenLayers.Layer.OSM, {
             "http://b.tile.openstreetmap.org/${z}/${x}/${y}.png",
             "http://c.tile.openstreetmap.org/${z}/${x}/${y}.png"
         ];
-        options = OpenLayers.Util.extend({ numZoomLevels: 19, buffer: 0 }, options);
+        options = OpenLayers.Util.extend({
+            numZoomLevels: 19,
+            buffer: 0,
+            transitionEffect: "resize"
+        }, options);
         var newArguments = [name, url, options];
         OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments);
     },
@@ -76,7 +80,11 @@ OpenLayers.Layer.OSM.Osmarender = OpenLayers.Class(OpenLayers.Layer.OSM, {
             "http://b.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png",
             "http://c.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png"
         ];
-        options = OpenLayers.Util.extend({ numZoomLevels: 18, buffer: 0 }, options);
+        options = OpenLayers.Util.extend({
+            numZoomLevels: 18,
+            buffer: 0,
+            transitionEffect: "resize"
+        }, options);
         var newArguments = [name, url, options];
         OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments);
     },
@@ -104,7 +112,11 @@ OpenLayers.Layer.OSM.CycleMap = OpenLayers.Class(OpenLayers.Layer.OSM, {
             "http://b.tile.opencyclemap.org/cycle/${z}/${x}/${y}.png",
             "http://c.tile.opencyclemap.org/cycle/${z}/${x}/${y}.png"
         ];
-        options = OpenLayers.Util.extend({ numZoomLevels: 19, buffer: 0 }, options);
+        options = OpenLayers.Util.extend({
+            numZoomLevels: 19,
+            buffer: 0,
+            transitionEffect: "resize"
+        }, options);
         var newArguments = [name, url, options];
         OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments);
     },
diff --git a/public/openlayers/img/cloud-popup-relative.png b/public/openlayers/img/cloud-popup-relative.png
index 9db138abe..1215a3618 100644
Binary files a/public/openlayers/img/cloud-popup-relative.png and b/public/openlayers/img/cloud-popup-relative.png differ
diff --git a/public/potlatch2/features/pois/accommodation_shelter2.n.24.png b/public/potlatch2/features/pois/accommodation_shelter2.n.24.png
new file mode 100644
index 000000000..71d79bd10
Binary files /dev/null and b/public/potlatch2/features/pois/accommodation_shelter2.n.24.png differ
diff --git a/public/potlatch2/features/pois/amenity_bench.n.24.png b/public/potlatch2/features/pois/amenity_bench.n.24.png
new file mode 100644
index 000000000..08c66b07a
Binary files /dev/null and b/public/potlatch2/features/pois/amenity_bench.n.24.png differ
diff --git a/public/potlatch2/features/pois/amenity_fountain2.n.24.png b/public/potlatch2/features/pois/amenity_fountain2.n.24.png
new file mode 100644
index 000000000..f8c5e3755
Binary files /dev/null and b/public/potlatch2/features/pois/amenity_fountain2.n.24.png differ
diff --git a/public/potlatch2/features/pois/amenity_library.n.24.png b/public/potlatch2/features/pois/amenity_library.n.24.png
new file mode 100644
index 000000000..658e1f1ba
Binary files /dev/null and b/public/potlatch2/features/pois/amenity_library.n.24.png differ
diff --git a/public/potlatch2/features/pois/amenity_playground.n.24.png b/public/potlatch2/features/pois/amenity_playground.n.24.png
new file mode 100644
index 000000000..1e8494739
Binary files /dev/null and b/public/potlatch2/features/pois/amenity_playground.n.24.png differ
diff --git a/public/potlatch2/features/pois/amenity_post_office.n.24.png b/public/potlatch2/features/pois/amenity_post_office.n.24.png
new file mode 100644
index 000000000..803665d05
Binary files /dev/null and b/public/potlatch2/features/pois/amenity_post_office.n.24.png differ
diff --git a/public/potlatch2/features/pois/amenity_telephone.n.24.png b/public/potlatch2/features/pois/amenity_telephone.n.24.png
new file mode 100644
index 000000000..0fc460d20
Binary files /dev/null and b/public/potlatch2/features/pois/amenity_telephone.n.24.png differ
diff --git a/public/potlatch2/features/pois/amenity_toilets.n.24.png b/public/potlatch2/features/pois/amenity_toilets.n.24.png
new file mode 100644
index 000000000..f8475f06f
Binary files /dev/null and b/public/potlatch2/features/pois/amenity_toilets.n.24.png differ
diff --git a/public/potlatch2/features/pois/amenity_waste_bin.n.24.png b/public/potlatch2/features/pois/amenity_waste_bin.n.24.png
new file mode 100644
index 000000000..fb06a04b7
Binary files /dev/null and b/public/potlatch2/features/pois/amenity_waste_bin.n.24.png differ
diff --git a/public/potlatch2/features/pois/boat-launch-24.png b/public/potlatch2/features/pois/boat-launch-24.png
new file mode 100644
index 000000000..62312b927
Binary files /dev/null and b/public/potlatch2/features/pois/boat-launch-24.png differ
diff --git a/public/potlatch2/features/pois/education_nursery3.n.24.png b/public/potlatch2/features/pois/education_nursery3.n.24.png
new file mode 100644
index 000000000..b0314ff3e
Binary files /dev/null and b/public/potlatch2/features/pois/education_nursery3.n.24.png differ
diff --git a/public/potlatch2/features/pois/emergency-telephone-24.png b/public/potlatch2/features/pois/emergency-telephone-24.png
new file mode 100644
index 000000000..466ef96b7
Binary files /dev/null and b/public/potlatch2/features/pois/emergency-telephone-24.png differ
diff --git a/public/potlatch2/features/pois/flowers.png b/public/potlatch2/features/pois/flowers.png
new file mode 100644
index 000000000..ba6298d1b
Binary files /dev/null and b/public/potlatch2/features/pois/flowers.png differ
diff --git a/public/potlatch2/features/pois/food_drinkingtap.n.24.png b/public/potlatch2/features/pois/food_drinkingtap.n.24.png
new file mode 100644
index 000000000..313572e50
Binary files /dev/null and b/public/potlatch2/features/pois/food_drinkingtap.n.24.png differ
diff --git a/public/potlatch2/features/pois/landuse_coniferous.n.24.png b/public/potlatch2/features/pois/landuse_coniferous.n.24.png
new file mode 100644
index 000000000..93f6c0df2
Binary files /dev/null and b/public/potlatch2/features/pois/landuse_coniferous.n.24.png differ
diff --git a/public/potlatch2/features/pois/poi_boundary_administrative.n.24.png b/public/potlatch2/features/pois/poi_boundary_administrative.n.24.png
new file mode 100644
index 000000000..7e2bd19af
Binary files /dev/null and b/public/potlatch2/features/pois/poi_boundary_administrative.n.24.png differ
diff --git a/public/potlatch2/features/pois/sport_swimming_outdoor.n.24.png b/public/potlatch2/features/pois/sport_swimming_outdoor.n.24.png
new file mode 100644
index 000000000..a0e0c61a7
Binary files /dev/null and b/public/potlatch2/features/pois/sport_swimming_outdoor.n.24.png differ
diff --git a/public/potlatch2/imagery.xml b/public/potlatch2/imagery.xml
index 72f61468d..b246a52f4 100644
--- a/public/potlatch2/imagery.xml
+++ b/public/potlatch2/imagery.xml
@@ -20,6 +20,14 @@
 		<name>OSM - Osmarender</name>
 		<url>http://tah.openstreetmap.org/Tiles/tile/$z/$x/$y.png</url>
 	</set>
+    <set>
+        <name>OSM - OpenCycleMap</name>
+        <url>http://tile.opencyclemap.org/cycle/$z/$x/$y.png</url>
+    </set>
+    <set>
+        <name>OSM - MapQuest</name>
+        <url>http://otile1.mqcdn.com/tiles/1.0.0/osm/$z/$x/$y.png</url>
+    </set>
 	<set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
 		<name>OS OpenData Streetview</name>
 		<url>http://os.openstreetmap.org/sv/$z/$x/$y.png</url>
@@ -29,6 +37,7 @@
 		<name>OS OpenData Locator</name>
 		<url>http://tiles.itoworld.com/os_locator/$z/$x/$y.png</url>
 		<sourcetag>OS OpenData Locator</sourcetag>
+		<sourcekey>source:name</sourcekey>
 	</set>
 	<set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
 		<name>OS 1:25k historic</name>
@@ -47,7 +56,7 @@
 	</set>
 	<set minlat="54.5" minlon="-7.8" maxlat="61.1" maxlon="-1.1">
 		<name>OS Scottish Popular historic</name>
-		<url>http://gibin.geog.ucl.ac.uk/~ollie/scotland/tiles/$z/$x/$y.jpg</url>
+		<url>http://ooc.openstreetmap.org/npescotland/tiles/$z/$x/$y.jpg</url>
 		<sourcetag>NPE</sourcetag>
 	</set>
 	<set minlat="51.071" minlon="-0.856" maxlat="51.473" maxlon="0.062">
@@ -75,4 +84,10 @@
 		<url>http://hypercube.telascience.org/tiles/1.0.0/haiti-city/$z/$x/$y.jpg</url>
 		<sourcetag>Haiti streetnames</sourcetag>
 	</set>
+
+    <set minlat="54.44" minlon="7.81" maxlat="57.86" maxlon="15.49">
+        <name>Denmark - Fugro Aerial Imagery</name>
+        <url>http://fugro.findvej.dk/fugro2005/$z/$x/$y.jpg</url>
+        <sourcetag>Fugro (2005)</sourcetag>
+    </set>
 </imagery>
diff --git a/public/potlatch2/map_features.xml b/public/potlatch2/map_features.xml
index 17845f6f8..42d272833 100644
--- a/public/potlatch2/map_features.xml
+++ b/public/potlatch2/map_features.xml
@@ -102,6 +102,10 @@ Quick documentation:
   <category name="Places" id="places">
   </category>
 
+  <category name="Sport&amp;Leisure" id="sport">
+  </category>
+
+
   <!-- Common input sets -->
 
   <inputSet id="simpleName">
@@ -126,6 +130,9 @@ Quick documentation:
     <input type="freetext" presence="onTagMatch"
         name="Historical Name" category="Naming" priority="low"
         key="old_name" description="The historic or previous name"/>
+    <input type="freetext" presence="onTagMatch"
+        name="Alternative Name" category="Naming" priority="low"
+        key="alt_name" description="An alternative, currently used, name"/>
   </inputSet>
 
   <inputSet id="wifi">
@@ -149,6 +156,7 @@ Quick documentation:
 
   <inputSet id="cuisine">
     <input type="choice" presence="always" name="Cuisine" category="Eating" description="The type of food that they serve" key="cuisine">
+      <!-- The 30 most popular values according to taginfo 23/12/2010 -->
       <choice value="burger" text="Burger"/>
       <choice value="chicken" text="Chicken"/>
       <choice value="chinese" text="Chinese"/>
@@ -156,7 +164,30 @@ Quick documentation:
       <choice value="greek" text="Greek"/>
       <choice value="pizza" text="Pizza"/>
       <choice value="sandwich" text="Sandwich"/>
-      <choice value="sea_food" text="Sea Food"/>
+      <choice value="seafood" text="Sea Food"/>
+      <choice value="regional" text="Regional"/>
+      <choice value="italian" text="Italian"/>
+      <choice value="german" text="German"/>
+      <choice value="kebab" text="Kebab/souvlaki/gyro"/>
+      <choice value="indian" text="Indian"/>
+      <choice value="asian" text="Asian"/>
+      <choice value="mexican" text="Mexican"/>
+      <choice value="thai" text="Thai"/>
+      <choice value="japanese" text="Japanese"/>
+      <choice value="ice_cream" text="Ice-cream"/>
+      <choice value="fish_and_chips" text="Fish &amp; Chips"/>
+      <choice value="turkish" text="Turkish"/>
+      <choice value="french" text="French"/>
+      <choice value="sushi" text="Sushi"/>
+      <choice value="american" text="American"/>
+      <choice value="steak_house" text="Steak House"/>
+      <choice value="international" text="International"/>
+      <choice value="spanish" text="Spanish"/>
+      <choice value="vietnamese" text="Vietnamese"/>
+      <choice value="fish" text="Fish"/>
+      <choice value="bavarian" text="Bavarian"/>
+      <choice value="vegetarian" text="Vegetarian"/>
+
       <help>http://wiki.openstreetmap.org/wiki/Key:cuisine</help>
     </input>
   </inputSet>
@@ -236,6 +267,8 @@ Quick documentation:
     <inputSet ref="bridge"/>
     <inputSet ref="tunnel"/>
     <inputSet ref="embankment-cutting"/>
+    <!-- not sure which category best suits put area=yes -->
+    <input type="checkbox" presence="onTagMatch" category="Restrictions" key="area" name="Open area" description="The way is a large open space, like at a dock, where vehicles can move anywhere within the space, rather than just along the edge." />
   </inputSet>
 
   <inputSet id="roadLanes">
@@ -437,8 +470,9 @@ Quick documentation:
     <input type="choice"
            name="Bicycles permitted" category="Cycle" description="Are bicyles allowed to use this road (regardless of physical suitability)?"
            key="bicycle">
-      <choice value="no" text="Prohibited"/>
+      <choice value="no" text="Prohibited" desciption="Cycling is not allowed. Pushing your bicycle is not allowed either."/>
       <choice value="yes" text="Allowed"/>
+      <choice value="dismount" text="Cyclists dismount" description="Signage states that cyclists should dismount and push their bike for the selected path or road."/>
       <choice value="designated" text="Designated"/>
       <choice value="private" text="Private"/>
       <help>http://wiki.openstreetmap.org/wiki/Key:access</help>
@@ -450,11 +484,13 @@ Quick documentation:
         name="Bike lanes" category="Cycle" description="Road has bike lanes within the road surface"
         key="cycleway" layout="horizontal">
       <choice value="no" text="No bike lanes"/>
-      <choice value="opposite" text="No, but two-way bicycle traffic permitted" description="The route may be cycled in the direction opposite of other traffic, but does not have a dedicated lane. Common in Belgium, Netherlands, Denmark."/>
-      <choice value="lane" text="Standard bike lane" description="Separated by painted line"/>
-      <choice value="track" text="Copenhagen-style bike lane" description="Separated by kerb or parked cars"/>
-      <choice value="opposite_lane" text="Two-way bike lane" description="Separated by painted line, and allowing bicycles in both directions in an otherwise one-way street."/>
-      <choice value="opposite_track" text="Two-way Copenhagen-style bike lane" description="Separated by kerb or parked cars, and allowing bicycles in both directions in an otherwise one-way street."/>
+      <choice value="lane" text="On-road bike lane" description="Separated by painted line on the road from cars"/>
+      <choice value="track" text="Parallel track" description="Separated by kerb or parked cars"/>
+      <choice value="opposite_lane" text="Contraflow lane" description="Separated by painted line, and allowing bicycles in both directions in an otherwise one-way street."/>
+      <choice value="opposite_track" text="Contraflow track" description="Separated by kerb or parked cars, and allowing bicycles in both directions in an otherwise one-way street."/>
+      <choice value="opposite" text="Contraflow unmarked" description="The route may be cycled in the direction opposite of other traffic, but does not have a dedicated lane."/>
+      <choice value="segregated" text="Segregated cycle path" description="A path where cyclists and pedestrians are separated by a painted line or kerb."/>
+      <choice value="shared" text="Shared cycle path" description="A path where cyclists and pedestrians share the full width of the path."/>
       <help>http://wiki.openstreetmap.org/wiki/Key:cycleway</help>
     </input>
   </inputSet>
@@ -553,6 +589,10 @@ Quick documentation:
     </input>
   </inputSet>
 
+  <inputSet id="isBuilding">
+    <input type="checkbox" presence="onTagMatch" category="Misc" description="Does this thing also represent one, solid building?" name="Building" key="building"/>
+  </inputSet>
+
   <!-- ************************************************************************
        Roads
        ************************************************************************ -->
@@ -800,6 +840,40 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
+  <feature name="Raceway/racing track">
+    <category>roads</category>
+    <category>sport</category>
+    <icon>
+      <font size="10pt">A purpose built track for racing motor vehicles.</font>
+    </icon>
+
+    <line/>
+    <area/>
+    <tag k="highway" v="raceway"/>
+
+    <inputSet ref="simpleName"/>
+    <inputSet ref="roadPhysical"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Sports track">
+    <category>roads</category>
+    <category>sport</category>
+    <icon>
+      <font size="10pt">A purpose built track for running, cycling, greyhound racing, horse racing.</font>
+    </icon>
+
+    <line/>
+    <area/>
+    <tag k="leisure" v="track"/>
+
+    <inputSet ref="simpleName"/>
+    <inputSet ref="roadPhysical"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+
 
   <!-- ************************************************************************
        Paths
@@ -810,11 +884,12 @@ Quick documentation:
     <icon image="features/paths__footway.png">
       ${name} <i>${ref}</i>
     </icon>
-
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dfootway</help>
     <line/>
     <tag k="highway" v="footway"/>
     <inputSet ref="path"/>
     <inputSet ref="common"/>
+    <inputset ref="naming"/>
   </feature>
 
   <feature name="Cycle path">
@@ -822,13 +897,29 @@ Quick documentation:
     <icon image="features/paths__bike.png">
       ${name} <i>${ncn_ref} ${rcn_ref} ${lcn_ref} ${ref}</i>
     </icon>
-
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dcycleway</help>
     <line/>
     <tag k="highway" v="cycleway"/>
     <inputSet ref="path"/>
     <inputSet ref="common"/>
+    <inputset ref="naming"/>
   </feature>
 
+  <feature name="Generic path">
+    <category>paths</category>
+    <icon >
+      ${name} <i>${ncn_ref} ${rcn_ref} ${lcn_ref} ${ref}</i>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dpath</help>
+
+    <line/>
+    <tag k="highway" v="path"/>
+    <inputSet ref="path"/>
+    <inputSet ref="common"/>
+    <inputset ref="naming"/>
+  </feature>
+
+
   <feature name="Pedestrian street">
     <category>paths</category>
     <icon image="features/paths__pedestrian.png">
@@ -849,6 +940,7 @@ Quick documentation:
     </area>
     <inputSet ref="minorRoad"/>
     <inputSet ref="common"/>
+    <inputset ref="naming"/>
   </feature>
 
   <feature name="Bridleway">
@@ -860,6 +952,7 @@ Quick documentation:
     <tag k="highway" v="bridleway"/>
     <inputSet ref="path"/>
     <inputSet ref="common"/>
+    <inputset ref="naming"/>
   </feature>
 
   <feature name="Steps">
@@ -881,6 +974,7 @@ Quick documentation:
 
   <feature name="Park">
     <category>natural</category>
+    <category>sport</category>
     <icon image="icons/natural_blank.png">
       <b>${name}</b>
       <br/>
@@ -893,7 +987,7 @@ Quick documentation:
 
   <feature name="Forest">
     <category>natural</category>
-    <icon image="icons/natural_blank.png"/>
+    <icon image="/features/pois/landuse_coniferous.n.24.png"/>
 
     <area/>
     <tag k="landuse" v="forest"/>
@@ -910,84 +1004,7 @@ Quick documentation:
   </feature>
 
 
-  <!-- ************************************************************************
-       Barrier
-       ************************************************************************ -->
-
-  <feature name="Wall">
-    <category>barrier</category>
-    <icon image="features/barrier_generic.png"/>
-    <icon>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dwall</help>
-
-    <line/>
-    <tag k="barrier" v="wall"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Ditch">
-    <category>barrier</category>
-    <icon image="features/barrier_generic.png"/>
-    <icon>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dditch</help>
-
-    <line/>
-    <tag k="barrier" v="ditch"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="Retaining wall">
-    <category>barrier</category>
-    <icon image="features/barrier_generic.png"/>
-    <icon>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dretaining_wall</help>
-
-    <line/>
-    <tag k="barrier" v="retaining_wall"/>
-    <inputSet ref="common"/>
-  </feature>
-
-  <feature name="City wall">
-    <category>barrier</category>
-    <icon image="features/barrier_generic.png"/>
-    <icon>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcity_wall</help>
-
-    <line/>
-    <tag k="barrier" v="city_wall"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Fence">
-    <category>barrier</category>
-    <icon image="features/barrier_generic.png"/>
-    <icon>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dfence</help>
-
-    <line/>
-    <tag k="barrier" v="fence"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Hedge">
-    <category>barrier</category>
-    <icon image="features/barrier_generic.png"/>
-    <icon>
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dhedge</help>
-
-    <line/>
-    <tag k="barrier" v="hedge"/>
-    <inputSet ref="common"/>
-  </feature>
-
+  
 
 
   <!-- ************************************************************************
@@ -1184,6 +1201,8 @@ Quick documentation:
 
   <feature name="Slipway">
     <category>water</category>
+    <!-- icon from http://www.clker.com/clipart-map-symbols-boat-launch-white.html, feel free to (re)move this notice -->
+    <icon image="features/pois/boat-launch-24.png"/>
     <point />
     <tag k="leisure" v="slipway"/>
     <inputSet ref="names"/>
@@ -1354,15 +1373,15 @@ Quick documentation:
 
   <feature name="Bus station">
     <category>transport</category>
-    <icon image="icons/transport_blank.png">
+    <icon image="/features/pois/transport_bus_station.n.24.png">
       <b>${name} ${addr:housename}</b><br/>
       ${addr:housenumber} ${addr:street} ${addr:postcode}
     </icon>
 
     <area/>
     <tag k="amenity" v="bus_station"/>
-    <tag k="building" v="yes"/>
     <inputSet ref="names"/>
+    <inputSet ref="isBuilding"/>
     <inputSet ref="buildingAddress"/>
     <inputSet ref="common"/>
   </feature>
@@ -1464,7 +1483,7 @@ Quick documentation:
 
     <area/>
     <tag k="amenity" v="school"/>
-    <tag k="building" v="yes"/>
+    <inputSet ref="isBuilding"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress"/>
     <inputSet ref="common"/>
@@ -1480,9 +1499,24 @@ Quick documentation:
 
     <area/>
     <tag k="amenity" v="college"/>
-    <tag k="building" v="yes"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress"/>
+    <inputSet ref="isBuilding"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="University">
+    <category>buildings</category>
+    <icon image="features/pois/education_university.n.24.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
+    <area/>
+    <tag k="amenity" v="university"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="isBuilding"/>
     <inputSet ref="common"/>
   </feature>
 
@@ -1496,9 +1530,9 @@ Quick documentation:
 
     <area/>
     <tag k="shop" v="supermarket"/>
-    <tag k="building" v="yes"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress"/>
+    <inputSet ref="isBuilding"/>
     <inputSet ref="common"/>
   </feature>
 
@@ -1512,13 +1546,73 @@ Quick documentation:
 
     <area/>
     <tag k="amenity" v="place_of_worship"/>
-    <tag k="building" v="yes"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress"/>
-    <input type="choice" category="Religion" name="Religion" key="religion" description="The religion to which this place of worship belongs.">
+    <!-- sorted in reverse order of popularity in taginfo. -->
+    <input type="choice" category="Religion" name="Religion" key="religion" description="The religion to which this place of worship belongs." presence="always">
       <choice value="christian" text="Christianity (church)"/>
+      <choice value="muslim" text="Islam (mosque)"/>
+      <choice value="buddhist" text="Buddhist (temple)"/>
       <choice value="jewish" text="Judaism (synagogue)"/>
+      <choice value="hindu" text="Hindu (temple)"/>
+      <choice value="sikh" text="Sikh (gurdwara)"/>
+      <choice value="spiritualist" text="Spiritualism"/>
+      <choice value="unitarian" text="Unitarianism"/>
+      <choice value="taoist" text="Taoism"/>
+      <choice value="multifaith" text="Multi-faith"/>
+      <choice value="scientologist" text="Scientology"/>
+      <choice value="bahai" text="Bahai"/>
     </input>
+    <!-- sorted in reverse order of popularity in taginfo. -->
+    <input type="choice" category="Religion" name="Denomination" key="denomination" description="The denomination, or sub-branch of the main religion." presence="always">
+      <choice value="catholic" text="Catholic"/>
+      <choice value="baptist" text="Baptist"/>
+      <choice value="methodist" text="Methodist"/>
+      <choice value="lutheran" text="Lutheran"/>
+      <choice value="protestant" text="Prostant"/>
+      <choice value="orthodox" text="Orthodox"/>
+      <choice value="presbyterian" text="Presbyterian"/>
+      <choice value="anglican" text="Anglican"/>
+      <choice value="roman_catholic" text="Roman Catholic"/>
+      <choice value="evangelical" text="Evangelical"/>
+      <choice value="pentecostal" text="Pentecostal"/>
+      <choice value="mormon" text="Mormon"/>
+      <choice value="sunni" text="Sunni"/>
+      <choice value="jehovahs_witness" text="Jehovah's Witness"/>
+      <!-- duplicate of Anglican? -->
+      <choice value="church_of_england" text="Church of England"/>
+      <choice value="greek_orthodox" text="Greek Orthodox"/>
+      <choice value="new_apostolic" text="New Apostolic"/>
+      <choice value="episcopal" text="Episcopal"/>
+      <choice value="russian_orthodox" text="Russian Orthodox"/>
+      <choice value="adventist" text="Adventist"/>
+      <choice value="seventh_day_adventist" text="Seventh Day Adventist"/>
+      <choice value="united_reformed" text="United Reformed"/>
+      <choice value="reformed" text="Reformed"/>
+      <choice value="iglesia_ni_cristo" text="Iglesia Ni Cristo"/>
+      <choice value="uniting" text="Uniting"/>
+      <choice value="salvation_army" text="Salvation Army"/>
+      <choice value="church_of_scotland" text="Church of Scotland"/>
+      <choice value="quaker" text="Quaker"/>
+      <choice value="scientist" text="Scientist"/>
+      <choice value="shia" text="Shia"/>
+      <choice value="congregational" text="Congregational"/>
+      <choice value="assembly_of_god" text="Assembly of God"/>
+      <choice value="united" text="United"/>
+      <choice value="mennonite" text="Mennonite"/>
+      <choice value="nazarene" text="Nazarene"/>
+      <!-- duplicate of Mormon? -->
+      <choice value="latter_day_saints" text="Latter Day Saints"/>
+      <choice value="dutch_reformed" text="Dutch Reformed"/>
+      <choice value="tibetan" text="Tibetan"/>
+      <choice value="shingon" text="Shingon"/>
+      <choice value="georgian_orthodox" text="Georgian Orthodox"/>
+      <choice value="unitarian" text="Unitarian"/>
+      <choice value="brethren" text="Brethren"/>
+      <choice value="armenian_apostolic" text="Armenian Apostolic"/>
+      <choice value="maronite" text="Maronite"/>
+    </input>
+    <inputSet ref="isBuilding"/>
     <inputSet ref="common"/>
   </feature>
 
@@ -1548,44 +1642,13 @@ Quick documentation:
 
     <area/>
     <tag k="amenity" v="hospital"/>
-    <tag k="building" v="yes"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress"/>
+    <inputSet ref="isBuilding"/>
     <inputSet ref="common"/>
   </feature>
 
 
-  <feature name="University">
-    <category>buildings</category>
-    <icon image="features/pois/education_university.n.24.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <tag k="amenity" v="university"/>
-    <tag k="building" v="yes"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="common"/>
-  </feature>
-
-
-  <feature name="Attraction">
-    <category>buildings</category>
-    <icon image="features/pois/tourist_attraction.n.24.png">
-      <b>${name} ${addr:housename}</b><br/>
-      ${addr:housenumber} ${addr:street} ${addr:postcode}
-    </icon>
-
-    <area/>
-    <tag k="tourism" v="attraction"/>
-    <tag k="building" v="yes"/>
-    <inputSet ref="names"/>
-    <inputSet ref="buildingAddress"/>
-    <inputSet ref="common"/>
-  </feature>
-
 
   <feature name="Museum">
     <category>buildings</category>
@@ -1596,12 +1659,23 @@ Quick documentation:
 
     <area/>
     <tag k="tourism" v="museum"/>
-    <tag k="building" v="yes"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress"/>
+    <inputSet ref="isBuilding"/>
     <inputSet ref="common"/>
   </feature>
 
+  <feature name="Shopping centre">
+    <category>buildings</category>
+    <category>shopping</category>
+    <node/>
+    <area/>
+    <tag k="shop" v="mall"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="isBuilding"/>
+    <inputSet ref="common"/>
+  </feature>
 
   <feature name="Zoo">
     <category>buildings</category>
@@ -1612,9 +1686,9 @@ Quick documentation:
 
     <area/>
     <tag k="tourism" v="zoo"/>
-    <tag k="building" v="yes"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress"/>
+    <inputSet ref="isBuilding"/>
     <inputSet ref="common"/>
   </feature>
 
@@ -1630,6 +1704,7 @@ Quick documentation:
     <tag k="leisure" v="stadium"/>
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress"/>
+    <inputSet ref="isBuilding"/>
     <inputSet ref="common"/>
   </feature>
 
@@ -1642,6 +1717,8 @@ Quick documentation:
     </icon>
 
     <area/>
+    <!-- This should catch all the "building=*" tags in use: yes, hut, house, residential, entrance, apartments, garage, industrial,  garages, service, manufacture, collapsed... 
+         Is this possible? -->
     <!-- <tag k="building" v="*"/> -->
     <tag k="building" v="yes"/>
     <inputSet ref="names"/>
@@ -1652,7 +1729,7 @@ Quick documentation:
 
   <feature name="Sports centre">
     <category>buildings</category>
-    <icon >
+    <icon image="features/pois/sport_leisure_centre.n.24.png">
       <b>${name} ${addr:housename}</b><br/>
       ${addr:housenumber} ${addr:street} ${addr:postcode}
     </icon>
@@ -1663,6 +1740,7 @@ Quick documentation:
     <inputSet ref="names"/>
     <inputSet ref="buildingAddress"/>
     <inputSet ref="pitchSport"/>
+    <inputSet ref="isBuilding"/>
     <inputSet ref="common"/>
   </feature>
 
@@ -1731,6 +1809,7 @@ Quick documentation:
 
   <feature name="Marketplace">
     <category>landuse</category>
+    <point />
     <area/>
     <icon image="features/pois/shopping_greengrocer.n.24.png">
       <b>${name}</b>
@@ -1743,6 +1822,7 @@ Quick documentation:
 
   <feature name="Cemetery">
     <category>landuse</category>
+    <point />
     <area/>
     <icon image="features/pois/place_of_worship_unknown3.n.24.png">
       <b>${name}</b>
@@ -1752,6 +1832,17 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
+  <feature name="Graveyard">
+    <category>landuse</category>
+    <point />
+    <area/>
+    <icon image="features/pois/place_of_worship_unknown3.n.24.png">
+      <b>${name}</b>
+    </icon>
+    <tag k="amenity" v="grave_yard"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
 
   <feature name="Quarry">
     <category>landuse</category>
@@ -1787,9 +1878,10 @@ Quick documentation:
 
 
   <feature name="Playground">
-    <category>landuse</category>
+    <category>sport</category>
     <area/>
-    <icon image="features/pois/sport_leisure_centre.n.24.png">
+    <point/>
+    <icon image="features/pois/amenity_playground.n.24.png">
       <b>${name}</b>
     </icon>
     <tag k="leisure" v="playground"/>
@@ -1799,7 +1891,7 @@ Quick documentation:
 
 
   <feature name="Golf course">
-    <category>landuse</category>
+    <category>sport</category>
     <area/>
     <icon  image="features/pois/sport_golf.n.24.png">
       <b>${name}</b>
@@ -1812,6 +1904,7 @@ Quick documentation:
 
   <feature name="Recreation ground">
     <category>landuse</category>
+    <category>sport</category>    
     <area/>
     <icon image="features/pois/sport_leisure_centre.n.24.png">
       <b>${name}</b>
@@ -1875,6 +1968,7 @@ Quick documentation:
 
   <feature name="Sports track">
     <category>landuse</category>
+    <category>sport</category>
     <area/>
     <icon image="features/pois/sport_leisure_centre.n.24.png">
       <b>${name}</b>
@@ -2079,8 +2173,22 @@ Quick documentation:
     <icon image="features/pois/amenity_police2.n.24.png"/>
     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dpolice</help>
     <point/>
+    <area/>
     <tag k="amenity" v="police"/>
-    <input type="freetext" presence="always" category="" name="name" key="name" description="The Name of it." priority="low"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Library">
+    <category>amenity</category>
+    <icon image="features/pois/amenity_library.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dlibrary</help>
+    <point/>
+    <area/>
+    <tag k="amenity" v="library"/>
+    <inputSet ref="simpleName"/>
     <inputSet ref="common"/>
   </feature>
 
@@ -2090,8 +2198,13 @@ Quick documentation:
     <icon image="features/pois/health_hospital.n.24.png"/>
     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dhospital</help>
     <point/>
+    <area/>
     <tag k="amenity" v="hospital"/>
     <input type="freetext" presence="always" category="" name="name" key="name" description="The Name of it." priority="low"/>
+    <input type="choice" presence="always" category="Hospital" name="Emergency treatment available" key="emergency" description="Are there accident and emergency facilities at this hospital?">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
     <inputSet ref="common"/>
   </feature>
 
@@ -2171,6 +2284,33 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
+  <feature name="Kindergarten">
+    <category>amenity</category>
+    <category>buildings</category>
+    <icon image="features/pois/education_nursery3.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dkindergarten</help>
+    <point/>
+    <tag k="amenity" v="kindergarten"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Town hall">
+    <category>amenity</category>
+    <icon >
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dtownhall</help>
+    <point/>
+    <tag k="amenity" v="townhall"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
+
 
   <feature name="Post Box">
     <category>amenity</category>
@@ -2185,13 +2325,154 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
+  <feature name="Post Office">
+    <category>amenity</category>
+    <category>buildings</category>
+    <icon image="features/pois/amenity_post_office.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office</help>
+    <point/>
+    <area/>
+    <tag k="amenity" v="post_office"/>
+    <input type="freetext" presence="always" category="Naming" name="Ref" key="ref" description="Reference number of the post office"/>
+    <input type="freetext" presence="always" category="Naming" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
+    <inputSet ref="common"/>
+    <inputset ref="simpleName"/>
+  </feature>
+
+  <feature name="Trash/rubbish bin">
+    <category>amenity</category>
+    <icon image="features/pois/amenity_waste_bin.n.24.png">
+      ${ref}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity=waste_basket</help>
+    <point/>
+    <tag k="amenity" v="waste_basket"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
   <feature name="Toilets">
     <category>amenity</category>
+    <icon image="features/pois/amenity_toilets.n.24.png">
+      ${ref}
+    </icon>
     <point/>
     <tag k="amenity" v="toilets"/>
     <inputSet ref="common"/>
   </feature>
 
+  <feature name="Water fountain">
+    <category>amenity</category>
+    <category>water</category>
+    <category>foodanddrink</category>
+    <icon image="features/pois/food_drinkingtap.n.24.png">
+      ${ref}
+    </icon>
+    <point/>
+    <tag k="amenity" v="drinking_water"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Shelter">
+    <category>amenity</category>
+    <icon image="features/pois/accommodation_shelter2.n.24.png">
+      ${name}
+    </icon>    
+    <point/>
+    <area/>
+    <tag k="amenity" v="shelter"/>
+    <inputset ref="names"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Barbecue">
+    <category>amenity</category>
+    <icon image="features/pois/tourist_picnic.n.24.png"/>
+    <!-- specific icon needed -->
+    <point/>
+    <tag k="amenity" v="bbq"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Hunting stand">
+    <category>amenity</category>
+    <category>sport</category>
+    <!-- icon needed -->
+    <point/>
+    <tag k="amenity" v="hunting_stand"/>
+    <inputSet ref="common"/>
+    <inputSet ref="names"/>
+  </feature>
+
+
+  <feature name="Park bench">
+    <category>amenity</category>
+    <icon image="features/pois/amenity_bench.n.24.png" />
+    <point/>
+    <tag k="amenity" v="bench"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Public telephone">
+    <category>amenity</category>
+    <icon image="features/pois/amenity_telephone.n.24.png" />
+    <point/>
+    <tag k="amenity" v="telephone"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Emergency phone">
+    <category>amenity</category>
+    <icon image="features/pois/emergency-telephone-24.png" />
+    <!-- icon from http://www.clker.com/clipart-emergency-telephone-blue.html, feel free to (re)move this notice -->
+    <point/>
+    <tag k="amenity" v="emergency_phone"/>
+    <inputSet ref="common"/>
+    <input type="freetext" presence="always" category="Naming" name="Ref" key="ref" description="Reference number of emergency phone."/>    
+  </feature>
+
+
+  <feature name="Swimming pool">
+    <category>amenity</category>
+    <category>sport</category>
+    <icon image="features/pois/sport_swimming_outdoor.n.24.png">
+      ${name}
+    </icon>
+    <point/>
+    <area/>
+    <tag k="amenity" v="swimming_pool"/>
+    <inputSet ref="simpleName"/>    
+    <inputSet ref="common"/>
+
+  </feature>
+
+  <feature name="Fountain">
+    <category>amenity</category>
+    <icon image="features/pois/amenity_fountain2.n.24.png">
+    ${name}
+    </icon>
+    <point/>
+    <tag k="amenity" v="fountain"/>
+    <inputSet ref="common"/>
+    <inputSet ref="simpleName"/>
+  </feature>
+
+  <feature name="Vending machine">
+    <category>amenity</category>
+    <category>foodanddrink</category>
+    <icon>A vending machine.</icon>
+    <!-- icon needed -->
+    <point/>
+    <tag k="amenity" v="vending_machine"/>
+    <inputSet ref="common"/>
+    <inputSet ref="simpleName"/>
+    <input type="freetext" presence="always" name="Product" key="vending" description="What is being sold: tickets, food, maps..."/>
+    <input type="operator" presence="always" name="Operator" key="operator" description="Which company provides the service" />
+  </feature>
+
 
   <!-- ========= Accommodation ========= -->
   <!-- Split off from tourism by Steve Bennett, can be remerged if it doesn't work out. -->
@@ -2289,21 +2570,20 @@ Quick documentation:
 
 
   <!-- ========= Tourism ========= -->
-
-  <!-- This is a very popular tag, can't be left out -->
   <feature name="Attraction">
     <category>tourism</category>
-    <icon image="icons/tourist_blank.png"/>
-    <point/>
+    <icon image="features/pois/tourist_attraction.n.24.png">
+      <b>${name} ${addr:housename}</b><br/>
+      ${addr:housenumber} ${addr:street} ${addr:postcode}
+    </icon>
+
     <area/>
-    <inputSet ref="simpleName"/>
     <tag k="tourism" v="attraction"/>
+    <inputSet ref="names"/>
+    <inputSet ref="buildingAddress"/>
     <inputSet ref="common"/>
   </feature>
 
-
-
-
   <feature name="Museum">
     <category>tourism</category>
     <icon image="features/pois/tourist_museum.n.24.png"/>
@@ -2427,20 +2707,19 @@ Quick documentation:
     <category>tourism</category>
     <point/>
     <area/>
-    <inputSet ref="simpleName"/>
     <icon image="features/pois/tourist_zoo.n.24.png"/>
     <tag k="tourism" v="zoo"/>
+    <inputSet ref="simpleName"/>
     <inputSet ref="common"/>
   </feature>
 
 
-  <!-- icons needed-->
   <feature name="Information">
     <category>tourism</category>
     <icon image="features/pois/amenity_information.n.24.png"/>
     <point/>
-    <inputSet ref="simpleName"/>
     <tag k="tourism" v="information"/>
+    <inputSet ref="simpleName"/>
     <inputSet ref="common"/>
   </feature>
 
@@ -2659,6 +2938,80 @@ Quick documentation:
 
   <!-- ========= Barriers ========= -->
 
+  <feature name="Wall">
+    <category>barrier</category>
+    <icon image="features/barrier_generic.png"/>
+    <icon>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dwall</help>
+
+    <line/>
+    <tag k="barrier" v="wall"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Ditch">
+    <category>barrier</category>
+    <icon image="features/barrier_generic.png"/>
+    <icon>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dditch</help>
+
+    <line/>
+    <tag k="barrier" v="ditch"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Retaining wall">
+    <category>barrier</category>
+    <icon image="features/barrier_generic.png"/>
+    <icon>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dretaining_wall</help>
+
+    <line/>
+    <tag k="barrier" v="retaining_wall"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="City wall">
+    <category>barrier</category>
+    <icon image="features/barrier_generic.png"/>
+    <icon>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcity_wall</help>
+
+    <line/>
+    <tag k="barrier" v="city_wall"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Fence">
+    <category>barrier</category>
+    <icon image="features/barrier_generic.png"/>
+    <icon>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dfence</help>
+
+    <line/>
+    <tag k="barrier" v="fence"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+  <feature name="Hedge">
+    <category>barrier</category>
+    <icon image="features/barrier_generic.png"/>
+    <icon>
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dhedge</help>
+
+    <line/>
+    <tag k="barrier" v="hedge"/>
+    <inputSet ref="common"/>
+  </feature>
+
   <feature name="Bollard">
     <category>barrier</category>
     <icon image="features/pois/barrier_bollard.n.24.png">
@@ -2763,6 +3116,19 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
+  <feature name="Wire fence">
+    <!-- no idea, but taginfo says 2700 uses -->
+    <category>barrier</category>
+    <icon image="features/barrier_generic.png"/>
+   
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dwire_fence</help>
+
+    <line/>
+    <tag k="barrier" v="wire_fence"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <!-- **************************************************************** -->
 
   <feature name="Turning circle">
     <category>transport</category>
@@ -2889,6 +3255,19 @@ Quick documentation:
 
 
   <!-- ========= Shops ========= -->
+  <feature name="Supermarket">
+    <category>shopping</category>
+    <icon image="features/pois/shopping_supermarket.n.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket</help>
+    <point/>
+    <tag k="shop" v="supermarket"/>
+    <inputSet ref="names"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>
 
   <feature name="Small Convenience Store">
     <category>shopping</category>
@@ -2904,22 +3283,20 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
-
-  <feature name="Supermarket">
+  <feature name="Bakery">
     <category>shopping</category>
-    <icon image="features/pois/shopping_supermarket.n.24.png">
-      ${name}
-    </icon>
-    <help>http://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket</help>
     <point/>
-    <tag k="shop" v="supermarket"/>
-    <inputSet ref="names"/>
+    <inputSet ref="simpleName"/>
     <inputSet ref="web"/>
     <inputSet ref="buildingAddress"/>
+    <icon image="features/pois/shopping_bakery.n.24.png"/>
+    <tag k="shop" v="bakery"/>
     <inputSet ref="common"/>
   </feature>
 
 
+
+
   <feature name="Alcohol shop">
     <category>shopping</category>
     <point/>
@@ -2932,17 +3309,6 @@ Quick documentation:
   </feature>
 
 
-  <feature name="Bakery">
-    <category>shopping</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <inputSet ref="web"/>
-    <inputSet ref="buildingAddress"/>
-    <icon image="features/pois/shopping_bakery.n.24.png"/>
-    <tag k="shop" v="bakery"/>
-    <inputSet ref="common"/>
-  </feature>
-
 
   <feature name="Bike shop">
     <category>shopping</category>
@@ -2963,7 +3329,7 @@ Quick documentation:
     <inputSet ref="web"/>
     <inputSet ref="buildingAddress"/>
     <icon image="features/pois/shopping_book.n.24.png"/>
-    <tag k="shop" v="book"/>
+    <tag k="shop" v="books"/>
     <inputSet ref="common"/>
   </feature>
 
@@ -2979,6 +3345,17 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
+  <feature name="Car sales">
+    <category>shopping</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <icon image="features/pois/shopping_car.n.24.png"/>
+    <tag k="shop" v="car"/>
+    <inputSet ref="common"/>
+  </feature>
+
 
   <feature name="Car repair">
     <category>shopping</category>
@@ -3039,6 +3416,17 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
+  <feature name="Florist">
+    <category>shopping</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <icon image="features/pois/flowers.png"/>
+    <tag k="shop" v="florist"/>
+    <inputSet ref="common"/>
+  </feature>
+
 
   <feature name="Garden centre">
     <category>shopping</category>
@@ -3111,6 +3499,17 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
+  <feature name="Kiosk">
+    <category>shopping</category>
+    <point/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <icon image="features/pois/shopping_jewelry.n.24.png"/>
+    <tag k="shop" v="kiosk"/>
+    <inputSet ref="common"/>
+  </feature>
+
 
   <feature name="Laundrette">
     <category>shopping</category>
@@ -3224,16 +3623,71 @@ Quick documentation:
     <inputSet ref="common"/>
   </feature>
 
-  <!-- boundaries -->
+  <!-- Top 10 boundaries in order of usage on taginfo.openstreetmap.de -->
 
-  <feature name="Administrative Boundary">
+  <feature name="Admin Boundary">
     <category>places</category>
     <line/>
+    <icon image="features/pois/poi_boundary_administrative.n.24.png"/>
     <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=administrative</help>
     <tag k="boundary" v="administrative"/>
     <input type="number" minimum="2" maximum="10" presence="always" name="Admin Level" key="admin_level" description="The Administrative level" />
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
   </feature>
 
+  <feature name="National Park">
+    <category>places</category>
+    <category>natural</category>
+    <line/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=national_park</help>
+    <tag k="boundary" v="national_park"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Post Code">
+    <category>places</category>
+    <line/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=postal_code</help>
+    <tag k="boundary" v="postal_code"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Protected Area">
+    <category>places</category>
+    <category>natural</category>
+    <line/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=protected_area</help>
+    <tag k="boundary" v="protected_area"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Town boundary">
+    <category>places</category>
+    <line/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=town</help>
+    <tag k="boundary" v="town"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <!-- boundary=landuse goes here. no idea what it is.-->
+
+  <feature name="Census boundary">
+    <category>places</category>
+    <line/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=census</help>
+    <tag k="boundary" v="census"/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <!-- next three are marker, postcode_area, administrative. all seem dubious -->
+  
+
   <!-- ************************************************************************
        Relations
        ************************************************************************ -->
diff --git a/public/potlatch2/potlatch.css b/public/potlatch2/potlatch.css
deleted file mode 100644
index f51fdd135..000000000
--- a/public/potlatch2/potlatch.css
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
-
-	Stylesheet that mimicks, to a certain extent, potlatch 1.x
-        Started by Andy Allan, November 2009
-
-	Based heavily on:
-	MapCSS demonstration stylesheet
-	Richard Fairhurst, October 2009
-
-*/
-
-/* This rule applies to all areas (closed ways). Note that rules are applied in the order
-  they appear in the file, so later rules may replace this one for some ways.
-  This is used as a debugger for finding unstyled areas; it's obviously oversimplistic since
-  it picks up closed-loop highways. */
-
-/* way :area { color: red; width: 1; fill-color: red; fill-opacity: 0.5; } */
-
-/* A set of fairly standard rules.
-  We use z-index to make sure high-priority roads appear above minor ones.
-  The default z-index is 5. If an object matches multiple rules with the same
-  z-index then the rules are "merged" (but individual properties become one or the other)  */
-
-way[highway=motorway],way[highway=motorway_link],
-way[highway=trunk],way[highway=trunk_link],
-way[highway=primary],way[highway=primary_link],
-way[highway=secondary],way[highway=secondary_link],
-way[highway=tertiary],way[highway=tertiary_link],
-way[highway=residential],way[highway=unclassified]  { text: name; text-color: black; font-size: 10; text-position: line; text-halo-color: white; text-halo-radius: 2; }
-way[highway=motorway],way[highway=motorway_link]    { z-index: 9; color: #809BC0; width: 7; casing-color: black; casing-width: 8; }
-way[highway=trunk],way[highway=trunk_link]          { z-index: 9; color: #7FC97F; width: 7; casing-color: black; casing-width: 8; }
-way[highway=primary],way[highway=primary_link]      { z-index: 8; color: #E46D71; width: 7; casing-color: black; casing-width: 8; }
-way[highway=secondary],way[highway=secondary_link]  { z-index: 7; color: #FDBF6F; width: 7; casing-width: 8; }
-way[highway=tertiary],way[highway=unclassified]     { z-index: 6; color: #FEFECB; width: 5; casing-width: 7; }
-way[highway=tertiary_link]                          { z-index: 5; color: #FEFECB; width: 4; casing-width: 5; }
-way[highway=residential]                            { z-index: 5; color: #E8E8E8; width: 5; casing-color: gray; casing-width: 7; }
-way[highway=service][service!=parking_aisle]        { color: white; width: 3; casing-color: gray; casing-width: 5; }
-way[highway=service][service=parking_aisle]         { color: white; width: 1; casing-color: #aaaaaa; casing-width: 2; }
-way[highway=service][service=alley]                 { color: white; width: 2; dashes: 6,2; casing-color: black; casing-width: 4; }
-way[highway=road]                                   { color: gray; width: 5; casing-color: white; casing-width: 7; }
-
-/* Pedestrian precincts need to be treated carefully. Only closed-loops with an explicit
-area=yes tag should be filled. The below doesn't yet work as intended. */
-way[highway=pedestrian] !:area { color: #ddddee; width: 5; casing-color: #555555; casing-width: 6; casing-dashes: 2,4;}
-way[highway=pedestrian] :area  { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; }
-
-way[highway=steps]     { color: #FF6644; width: 6; dashes: 2, 2; }
-way[highway=footway]   { color: #FF6644; width: 2; dashes: 6, 3; set .path;}
-way[highway=footway][bicycle=yes]   { z-index: 4; color: Blue; width: 1; }
-way[highway=bridleway] { z-index:9; color: #996644; width: 2; dashes: 4, 2, 2, 2; set .path;}
-way[highway=track]     { color: #996644; width: 2; dashes: 4, 2; .path;}
-way[highway=path]      { color: brown; width: 2; dashes: 2, 2; set .path;}
-way[highway=cycleway]  { color: Blue; width: 2; dashes: 4, 2; set .path;}
-way[railway=tram]      {z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 6; }
-way .path              {text:name; text-color: black; text-position: offset; text-offset: 5;}
-
-/* Could be improved */
-way[highway=proposed] { color: #88ffff; width: 6; dashes: 8, 4; }
-way[highway=construction] { color: #ffffbb; width: 6; dashes: 8, 4; casing-color: #0000aa; casing-width: 8; casing-dashes: 8,4;}
-way[construction=rail] 
-	{ z-index: 6; color: black; width: 5; dashes: 6, 6, 4, 8;}
-	{ z-index: 7; color: white; width: 3; dashes: 6,18; }
-
-	
-
-way[waterway=river], 
-way[waterway=canal], 
-way[waterway=stream]   { color: blue; width: 2; text:name; text-color:blue; font-size:9; text-position: offset; text-offset: 7;}
-way[waterway=drain] 			 {color: blue; width: 1; text:name; text-color: blue; text-position: offset; text-offset: 3;}
-way[waterway][tunnel=yes]                {dashes: 8,4;}
-
-way[barrier] {color: #000000; width: 1}
-way[barrier=fence] {color: #000000; width: 1; dashes: 8,4,2,4; }
-
-/*add node[power=pylon] etc when there's an icon */
-way[power=line] {color: darkgray; width: 3; dashes: 12,2; casing-color: black; casing-width: 8; casing-dashes: 4, 38;}
-way[power=minor_line] {color: gray; width: 2; dashes: 2,4; casing-width: 8; casing-color: white; casing-dashes: 2,22;}
-way[power=station] :area { color: black; width: 2; fill-color: #666666; fill-opacity: 0.6; set .area_small_name;}
-way[power=generator] :area { color: black; width: 2; fill-color: #444444; fill-opacity: 0.6; set .area_small_name;}
-
-way[golf=hole] {color: darkgreen; width: 5; casing-color: green; casing-width: 10; }
-
-/* Fills can be solid colour or bitmap images */
-
-
-way[natural] :area                          { color: #ADD6A5; width: 1; fill-color: #ADD6A5; fill-opacity: 0.2; }
-way[natural=beach] :area                    { color: #ffdd44; width: 1; fill-color: yellow; fill-opacity: 0.2; set .area_small_name;}
-way[natural=coastline]						{ color: black; width: 3; }
-way[landuse] :area                          { color: #444444; width: 2; fill-color: #444444; fill-opacity: 0.3; }
-way[landuse=residential] :area              { color: #666666; width: 2; fill-color: #666666; fill-opacity: 0.15; }
-way[landuse=retail] :area                   { color: #cc2222; width: 2; fill-color: #aa4422; fill-opacity: 0.15; }
-way[landuse=commercial] :area               { color: #4444bb; width: 2; fill-color: #444488; fill-opacity: 0.15; }
-way[landuse=military] :area                 { color: #ff4444; width: 2; fill-color: #ff4444; fill-opacity: 0.2; set .area_small_name; }
-way[amenity],way[shop] :area                { color: #ADCEB5; width: 1; fill-color: #ADCEB5; fill-opacity: 0.2; }
-way[leisure],way[sport] :area               { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; }
-way[tourism] :area                          { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; set .area_small_name;}
-way[historic],way[ruins] :area              { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; set .area_small_name;}
-way[military] :area                         { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; set .area_small_name;}
-way[building] :area                         { color: #ff6ec7; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; }
-way[natural=water],
-way[waterway][waterway!=dam] :area          { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; set .area_small_name;}
-way[waterway=dam]							{ color: black; width: 1; fill-color: #222222; fill-opacity: 0.1; set .area_small_name;}
-way[man_made] :area							{ color: black; width: 2; fill-color: #222222; fill-opacity: 0.1; set .area_small_name; }
-way[man_made=reservoir_covered] :area       { color: blue; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; set .area_small_name; }
-way[landuse=reservoir] :area                { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; set .area_small_name;}
-way[landuse=forest],way[natural=wood] :area { color: green;   width: 2; fill-color: green;   fill-opacity: 0.2; set .area_small_name;}
-way[leisure=park]  :area                    { color: #22aa22; width: 2; fill-color: #44ff44; fill-opacity: 0.15; set .area_small_name;}
-way[leisure=garden]  :area                  { color: #66ff44; width: 1; fill-color: #66ff44; fill-opacity: 0.2; set .area_small_name;}
-way[leisure=pitch] :area					{ z-index: 6; color: #88bb44; width: 2; fill-color: #88ff44; fill-opacity: 0.2; set .area_small_name;}
-way[landuse=recreation_ground] :area        { color: green; fill-color: green; set .area_small_name;}
-way[amenity=parking] :area                  { color: #bbaa66;    width: 1; fill-color: #bbaa66;    fill-opacity: 0.2; }
-way[public_transport=pay_scale_area] :area  { color: gray;    width: 1; fill-color: gray;    fill-opacity: 0.1; }
-
-way[man_made=pier]							{ z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 5;}
-way[man_made=pier][floating=yes]			{ dashes: 4,2; casing-color: #444;}
-way[leisure=marina] :area					{ color: pink; fill-color: pink; fill-opacity: 0.4; set .area_small_name;}
-way[leisure=slipway]						{ color: grey; width: 3; casing-color: blue; casing-width: 7; }
-way[leisure=golf_course] :area { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; set .area_small_name;}
-
-way[boundary=administrative]                { color: purple; width: 2; opacity: 0.2; dashes: 24,4; }
-way[landuse=cemetery]						{ color: #664466; width: 2; fill-color: color: #664466; opacity: 0.2; set .area_small_name;}
-/* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */
-
-node[addr:housenumber],
-node[addr:housename] { icon-image: circle; icon-width: 4; color: #B0E0E6; casing-color:blue; casing-width: 1; }
-way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;}
-
-/* POIs, too, can have bitmap icons - they can even be transparent */
-node[place] { icon-image: icons/place.png; text-offset: 17; font-family: DejaVu; text: name; font-size: 9; font-weight: bold; text-decoration: underline; z-index: 20; }
-node[amenity=telephone] { icon-image: icons/telephone.png; z-index: 20; }
-node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; z-index: 20; }
-
-node[tourism=guesthouse] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; }
-node[tourism=alpine_hut] { icon-image: icons/accommodation_alpinehut.n.16.png; z-index: 20; }
-node[tourism=camp_site] { icon-image: icons/accommodation_camping.n.16.png; z-index: 20; }
-node[tourism=caravan_site] { icon-image: icons/accommodation_caravan_park.n.16.png; z-index: 20; }
-node[tourism=guest_house],node[tourism=bed_and_breakfast] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; }
-node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:15; text: name; z-index: 20; }
-node[tourism=hostel] { icon-image: icons/accommodation_youth_hostel.n.16.png; z-index: 20; }
-node[amenity=fire_station] { icon-image: icons/amenity_firestation2.n.16.png; z-index: 20; }
-node[amenity=police] { icon-image: icons/amenity_police2.n.16.png; z-index: 20; }
-node[amenity=post_box] { icon-image: icons/amenity_post_box.n.16.png; z-index: 20; }
-node[amenity=recycling] { icon-image: icons/amenity_recycling.n.16.png; z-index: 20; }
-node[barrier=bollard] { icon-image: icons/barrier_bollard.n.16.png; z-index: 20; }
-node[barrier=gate], node[highway=gate] { icon-image: icons/barrier_gate.n.16.png; z-index: 20; }
-node[barrier=stile], node[highway=stile] { icon-image: icons/barrier_stile.n.16.png; z-index: 20; }
-node[barrier=toll_booth] { icon-image: icons/barrier_toll_booth.n.16.png; z-index: 20; }
-node[barrier=lift_gate] { icon-image: icons/barrier_lift_gate.n.16.png; z-index: 20; }
-node[barrier=kissing_gate] { icon-image: icons/barrier_kissing_gate.16.png; z-index: 20; }
-node[barrier=cycle_barrier] { icon-image: icons/barrier_cycle_barrier.16.png; z-index: 20; }
-node[barrier=block] { icon-image: icons/barrier_blocks.16.png; z-index: 20; }
-node[barrier=cattle_grid] { icon-image: icons/barrier_cattle_grid.16.png; z-index: 20; }
-node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:15; text: name; z-index: 20; }
-way[amenity=school] :area { color: yellow; fill-color: yellow; fill-opacity: 0.1; set .area_small_name; }
-node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:15; text: name; z-index: 20; }
-node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:15; text: name; z-index: 20; }
-node[amenity=fast_food] { icon-image: icons/food_fastfood.n.16.png; z-index: 20; }
-node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset:15; text: name; z-index: 20; }
-node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:15; text: name; z-index: 20; }
-node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; }
-node[amenity=pharmacy] { icon-image: icons/health_pharmacy.n.16.png; z-index: 20; }
-node[amenity=atm] { icon-image: icons/money_atm.n.16.png; z-index: 20; }
-node[amenity=bank] { icon-image: icons/money_bank2.n.16.png; z-index: 20; }
-node[shop=alcohol] { icon-image: icons/shopping_alcohol.n.16.png; z-index: 20; }
-node[shop=bakery] { icon-image: icons/shopping_bakery.n.16.png; z-index: 20; }
-node[shop=bicycle] { icon-image: icons/shopping_bicycle.n.16.png; z-index: 20; }
-node[shop=book] { icon-image: icons/shopping_book.n.16.png; z-index: 20; }
-node[shop=butcher] { icon-image: icons/shopping_butcher.n.16.png; z-index: 20; }
-node[shop=car_repair] { icon-image: icons/shopping_car_repair.n.16.png; z-index: 20; }
-node[shop=car] { icon-image: icons/shopping_car.n.16.png; z-index: 20; }
-node[shop=clothes] { icon-image: icons/shopping_clothes.n.16.png; z-index: 20; }
-node[shop=confectionery] { icon-image: icons/shopping_confectionery.n.16.png; z-index: 20; }
-node[shop=convenience] { icon-image: icons/shopping_convenience.n.16.png; z-index: 20; }
-node[shop=doityourself] { icon-image: icons/shopping_diy.n.16.png; z-index: 20; }
-node[shop=fishmonger] { icon-image: icons/shopping_fish.n.16.png; z-index: 20; }
-node[shop=garden_centre] { icon-image: icons/shopping_garden_centre.n.16.png; z-index: 20; }
-node[shop=gift] { icon-image: icons/shopping_gift.n.16.png; z-index: 20; }
-node[shop=greengrocer] { icon-image: icons/shopping_greengrocer.n.16.png; z-index: 20; }
-node[shop=hairdresser] { icon-image: icons/shopping_hairdresser.n.16.png; z-index: 20; }
-node[shop=hifi] { icon-image: icons/shopping_hifi.n.16.png; z-index: 20; }
-node[shop=jewelry] { icon-image: icons/shopping_jewelry.n.16.png; z-index: 20; }
-node[shop=laundry] { icon-image: icons/shopping_laundrette.n.16.png; z-index: 20; }
-node[shop=motorcycle] { icon-image: icons/shopping_motorcycle.n.16.png; z-index: 20; }
-node[shop=music] { icon-image: icons/shopping_music.n.16.png; z-index: 20; }
-node[shop=supermarket] { icon-image: icons/shopping_supermarket.n.16.png; z-index: 20; }
-node[historic=archaeological_site] { icon-image: icons/tourist_archaeological.n.16.png; z-index: 20; }
-node[historic=battlefield] { icon-image: icons/tourist_battlefield.n.16.png; z-index: 20; }
-node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:15; text: name; z-index: 20; }
-node[amenity=cinema] { icon-image: icons/tourist_cinema.n.16.png; z-index: 20; }
-node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:15; text: name; z-index: 20; }
-node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:15; text: name; z-index: 20; }
-node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:15; text: name; z-index: 20; }
-node[tourism=picnic_site] { icon-image: icons/tourist_picnic.n.16.png; z-index: 20; }
-node[historic=ruin] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; }
-node[amenity=theatre] { icon-image: icons/tourist_theatre.n.16.png; z-index: 20; }
-node[tourism=viewpoint] { icon-image: icons/tourist_view_point.n.16.png; z-index: 20; }
-node[tourism=zoo] { icon-image: icons/tourist_zoo.n.16.png; z-index: 20; }
-node[aeroway=aerodrome] { icon-image: icons/transport_aerodrome.n.16.png; z-index: 20; }
-node[amenity=bus_station] { icon-image: icons/transport_bus_station.n.16.png; z-index: 20; }
-node[highway=bus_stop] { icon-image: icons/transport_bus_stop2.n.16.png; z-index: 20; }
-node[amenity=fuel] { icon-image: icons/transport_fuel.n.16.png; z-index: 20; }
-node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset: 15; text: capacity; z-index: 20; }
-node[amenity=parking] { icon-image: icons/transport_parking_car.n.16.png; z-index: 20; }
-node[amenity=ferry_terminal] { icon-image: icons/transport_port.n.16.png; z-index: 20; }
-node[amenity=bicycle_rental] { icon-image: icons/transport_rental_bicycle.n.16.png; z-index: 20; }
-node[amenity=car_rental] { icon-image: icons/transport_rental_car.n.16.png; z-index: 20; }
-node[amenity=taxi] { icon-image: icons/transport_taxi_rank.n.16.png; z-index: 20; }
-node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:15; text: name; z-index: 20; }
-node[railway=tram_stop] { icon-image: icons/transport_tram_stop.n.16.png; z-index: 20; }
-node[leisure=marina] { icon-image: icons/transport_marina.n.16.png; z-index: 20; }
-
-way[leisure=sports_centre] :area { color: #66ddcc; fill-color: #66ddcc; set .area_small_name; }
-
-
-/* We can stack styles at different z-index (depth) */
-
-way[railway=rail]
-	{ z-index: 6; color: black; width: 5; }
-	{ z-index: 7; color: white; width: 3; dashes: 12,12; }
-way[railway=platform] { color:black; width: 2; }
-way[railway=subway]
-        { z-index: 6; color: #444444; width: 5; }
-        { z-index: 7; color: white; width: 3; dashes: 8,8; }
-
-/* Bridge */
-way[bridge=yes], way[bridge=viaduct], way[bridge=suspension]
-    { z-index: 4; color: white; width: eval('_width+3'); }
-    { z-index: 3; color: black; width: eval('_width+6'); }
-
-/* Tunnel */
-way[tunnel=yes][!waterway]
-    { z-index: 4; color: white; width: eval('_width+2'); }
-    { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; }
-
-way[embankment=yes], way[cutting=yes]
-    { z-index: 8; opacity: 0.5; color: grey; width: eval('_width+5'); dashes: 2, 2; }
-
-/* Oneway */
-way[oneway=yes] { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows; }
-
-way[access=private],way[access=no] { z-index: 10; color: red; width: eval('_width+2'); dashes: 2,5;}
-way[access=permissive] { z-index: 10; color: green; width: eval('_width+2'); dashes: 1,3;}
-
-way .area_small_name {text-color: black; font-size: 9; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;}
-/* Change the road colour based on dynamically set "highlighted" tag (see earlier) */
-
-way .highlighted { color: pink; }
-
-/* Interactive editors may choose different behaviour when a user mouses-over or selects
-   an object. Potlatch 2 supports these but the stand-alone Halcyon viewer does not */
-
-way :hover	{ z-index: 2; width: eval('_width+10'); color: #ffff99; }
-way :selected { z-index: 2; width: eval('_width+10'); color: yellow; opacity: 0.7;}
-way :restrictfrom { z-index: -1; width: eval('_width+10'); color: red; opacity: 0.7;}
-way :restrictto { z-index: -1; width: eval('_width+10'); color: blue; opacity: 0.7;}
-/*way !:drawn !:hasTags{ z-index:10; width: 0.5; color: red; }*/
-way !:drawn { z-index:10; width: 1; color: #333333; }
-way :tiger { casing-color: #ff00ff;}
-
-
-relation[type=restriction] node { z-index:11; icon-image: icons/restriction.png; }
-
-node :dupe { z-index: 9; icon-image: circle; icon-width:8; color: white; opacity: 0.4; casing-opacity: 0.4; casing-color: red; casing-width: 3; }
-node :hoverway { z-index: 9; icon-image: square; icon-width: 7; color: blue; layer: 5; }
-node !:drawn :poi { z-index: 2; icon-image: circle; icon-width: 4; color: green; casing-color: black; casing-width: 1; }
-node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 4; color: black; }
-node :hasTags :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: black; layer: 5; }
-node !:drawn :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: red; casing-color: #cc0000; casing-width: 1; layer: 5; }
-node :selected { z-index: 1; icon-image: square; icon-width: eval('_width+10'); color: yellow; interactive: no; layer: 5; }
-node :junction :selectedway { z-index: 8; icon-image: square; icon-width: 12; casing-color: black; casing-width: 1; layer: 5; }
-
-/* Descendant selectors provide an easy way to style relations: this example means "any way
-   which is part of a relation whose type=route". */
-
-relation[type=route] way { z-index: 1; width: 13; color: blue; opacity: 0.3; }
-relation[type=route][route=bicycle][network=ncn] way { z-index: 1; width: 12; color: red; opacity: 0.3; }
-relation[type=route][route=bicycle][network=rcn] way { z-index: 1; width: 12; color: cyan; opacity: 0.3; }
-relation[type=route][route=bicycle][network=lcn] way { z-index: 1; width: 12; color: blue; opacity: 0.3; }
-relation[type=route][route=foot] way { z-index: 1; width: 10; color: #80ff80; opacity: 0.6; }
-
-
diff --git a/public/potlatch2/potlatch2.swf b/public/potlatch2/potlatch2.swf
index 37a0857bf..dd42fe1a7 100644
Binary files a/public/potlatch2/potlatch2.swf and b/public/potlatch2/potlatch2.swf differ
diff --git a/public/potlatch2/stylesheets.xml b/public/potlatch2/stylesheets.xml
index c9abed15a..0e1d910a3 100644
--- a/public/potlatch2/stylesheets.xml
+++ b/public/potlatch2/stylesheets.xml
@@ -3,22 +3,32 @@
 <stylesheets>
 	<stylesheet>
 		<name>Potlatch</name>
-		<url>potlatch.css</url>
+		<url>stylesheets/potlatch.css</url>
 	</stylesheet>
 	<stylesheet>
 		<name>Wireframe</name>
-		<url>wireframe.css</url>
+		<url>stylesheets/wireframe.css</url>
+	</stylesheet>
+	<stylesheet>
+		<name>Enhanced</name>
+		<url>stylesheets/enhanced.css</url>
+	</stylesheet>
+	<stylesheet>
+		<name>Network</name>
+		<url>stylesheets/network.css</url>
 	</stylesheet>
     <stylesheet>
         <name>OpenCycleMap</name>
-        <url>opencyclemap.css</url>
+        <url>stylesheets/opencyclemap.css</url>
     </stylesheet>
     <stylesheet>
         <name>GPS</name>
-        <url>gpx.css</url>
+        <url>stylesheets/gpx.css</url>
+        <corestyle>no</corestyle>
     </stylesheet>
     <stylesheet>
         <name>Bugs</name>
-        <url>bugs.css</url>
+        <url>stylesheets/bugs.css</url>
+        <corestyle>no</corestyle>
     </stylesheet>
 </stylesheets>
diff --git a/public/potlatch2/bikeshops.css b/public/potlatch2/stylesheets/bikeshops.css
similarity index 100%
rename from public/potlatch2/bikeshops.css
rename to public/potlatch2/stylesheets/bikeshops.css
diff --git a/public/potlatch2/bugs.css b/public/potlatch2/stylesheets/bugs.css
similarity index 100%
rename from public/potlatch2/bugs.css
rename to public/potlatch2/stylesheets/bugs.css
diff --git a/public/potlatch2/stylesheets/core_interactive.css b/public/potlatch2/stylesheets/core_interactive.css
new file mode 100644
index 000000000..0e4ae8711
--- /dev/null
+++ b/public/potlatch2/stylesheets/core_interactive.css
@@ -0,0 +1,24 @@
+/* Turn restrictions */
+
+relation[type=restriction] node { z-index:11; icon-image: icons/restriction.png; }
+
+/* Interactive way behaviour */
+
+way :hover	{ z-index: 2; width: eval('_width+10'); color: #ffff99; }
+way :selected { z-index: 2; width: eval('_width+10'); color: yellow; opacity: 0.7;}
+way :restrictfrom { z-index: -1; width: eval('_width+10'); color: red; opacity: 0.7;}
+way :restrictto { z-index: -1; width: eval('_width+10'); color: blue; opacity: 0.7;}
+/*way !:drawn !:hasTags{ z-index:10; width: 0.5; color: red; }*/
+way !:drawn { z-index:10; width: 1; color: #333333; }
+way :tiger { casing-color: #ff00ff;}
+
+/* Interactive node behaviour */
+
+node :dupe { z-index: 9; icon-image: circle; icon-width:8; color: white; opacity: 0.4; casing-opacity: 0.4; casing-color: red; casing-width: 3; }
+node :hoverway { z-index: 9; icon-image: square; icon-width: 7; color: blue; layer: 5; }
+node !:drawn :poi { z-index: 2; icon-image: circle; icon-width: 4; color: green; casing-color: black; casing-width: 1; }
+node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 4; color: black; }
+node :hasTags :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: black; layer: 5; }
+node !:drawn :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: red; casing-color: #cc0000; casing-width: 1; layer: 5; }
+node :selected { z-index: 1; icon-image: square; icon-width: eval('_width+10'); color: yellow; interactive: no; layer: 5; }
+node :junction :selectedway { z-index: 8; icon-image: square; icon-width: 12; casing-color: black; casing-width: 1; layer: 5; }
diff --git a/public/potlatch2/stylesheets/core_landuse.css b/public/potlatch2/stylesheets/core_landuse.css
new file mode 100644
index 000000000..7eeb11738
--- /dev/null
+++ b/public/potlatch2/stylesheets/core_landuse.css
@@ -0,0 +1,43 @@
+/* Landuse */
+
+way[natural] :area                          { color: #ADD6A5; width: 1; fill-color: #ADD6A5; fill-opacity: 0.2; }
+way[natural=beach] :area                    { color: #ffdd44; width: 1; fill-color: yellow; fill-opacity: 0.2; set .area_small_name;}
+way[natural=coastline]						{ color: black; width: 3; }
+way[landuse] :area                          { color: #444444; width: 2; fill-color: #444444; fill-opacity: 0.3; }
+way[landuse=residential] :area              { color: #666666; width: 2; fill-color: #666666; fill-opacity: 0.15; }
+way[landuse=retail] :area                   { color: #cc2222; width: 2; fill-color: #aa4422; fill-opacity: 0.15; }
+way[landuse=commercial] :area               { color: #4444bb; width: 2; fill-color: #444488; fill-opacity: 0.15; }
+way[landuse=military] :area                 { color: #ff4444; width: 2; fill-color: #ff4444; fill-opacity: 0.2; set .area_small_name; }
+way[amenity],way[shop] :area                { color: #ADCEB5; width: 1; fill-color: #ADCEB5; fill-opacity: 0.2; }
+/* way[sport] should not be rendered by itself, according to wiki. Can we make it an "if all else fails"? */
+way[leisure] :area                         { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; }
+way[tourism] :area                          { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; set .area_small_name;}
+way[historic],way[ruins] :area              { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; set .area_small_name;}
+way[military] :area                         { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; set .area_small_name;}
+way[building] :area                         { color: #ff6ec7; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; }
+way[natural=water],
+way[waterway][waterway!=dam] :area          { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; set .area_small_name;}
+way[waterway=dam]							{ color: black; width: 1; fill-color: #222222; fill-opacity: 0.1; set .area_small_name;}
+way[man_made] :area							{ color: black; width: 2; fill-color: #222222; fill-opacity: 0.1; set .area_small_name; }
+way[man_made=reservoir_covered] :area       { color: blue; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; set .area_small_name; }
+way[landuse=reservoir] :area                { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; set .area_small_name;}
+way[landuse=forest],way[natural=wood] :area { color: green;   width: 2; fill-color: green;   fill-opacity: 0.2; set .area_small_name;}
+way[leisure=park]  :area                    { color: #22aa22; width: 2; fill-color: #44ff44; fill-opacity: 0.15; set .area_small_name;}
+way[leisure=garden]  :area                  { color: #66ff44; width: 1; fill-color: #66ff44; fill-opacity: 0.2; set .area_small_name;}
+way[leisure=pitch] :area					{ z-index: 6; color: #88bb44; width: 2; fill-color: #88ff44; fill-opacity: 0.2; set .area_small_name;}
+way[landuse=recreation_ground] :area        { color: green; fill-color: green; set .area_small_name;}
+way[amenity=parking] :area                  { color: #bbaa66;    width: 1; fill-color: #bbaa66;    fill-opacity: 0.2; }
+way[public_transport=pay_scale_area] :area  { color: gray;    width: 1; fill-color: gray;    fill-opacity: 0.1; }
+way[man_made=pier]							{ z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 5;}
+way[man_made=pier][floating=yes]			{ dashes: 4,2; casing-color: #444;}
+way[leisure=marina] :area					{ color: pink; fill-color: pink; fill-opacity: 0.4; set .area_small_name;}
+way[leisure=slipway]						{ color: grey; width: 3; casing-color: blue; casing-width: 7; }
+way[leisure=golf_course] :area { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; set .area_small_name;}
+way[boundary]                               { color: #000066; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;}
+/* Perhaps should be filled, on lower zooms. */
+way[boundary=national_park]                 { color: #225500; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;}
+way[boundary=protected_area]                { color: #447744; width: 2; opacity: 0.6; dashes: 12,4, 4, 4; z-index: 4;}
+way[boundary=administrative]                { color: purple; width: 2; opacity: 0.2; dashes: 24,4; z-index: 4;}
+way[boundary=administrative][waterway]      { opacity: 0.8; z-index: 4; dashes: 24,4; width: 6; }
+way[landuse=cemetery]						{ color: #664466; width: 2; fill-color: color: #664466; opacity: 0.2; set .area_small_name;}
+/* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */
diff --git a/public/potlatch2/stylesheets/core_pois.css b/public/potlatch2/stylesheets/core_pois.css
new file mode 100644
index 000000000..158096d62
--- /dev/null
+++ b/public/potlatch2/stylesheets/core_pois.css
@@ -0,0 +1,87 @@
+node[place] { icon-image: icons/place.png; text-offset: 17; font-family: DejaVu; text: name; font-size: 9; font-weight: bold; text-decoration: underline; z-index: 20; }
+node[amenity=telephone] { icon-image: icons/telephone.png; z-index: 20; }
+node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; z-index: 20; }
+node[tourism=guesthouse] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; }
+node[tourism=alpine_hut] { icon-image: icons/accommodation_alpinehut.n.16.png; z-index: 20; }
+node[tourism=camp_site] { icon-image: icons/accommodation_camping.n.16.png; z-index: 20; }
+node[tourism=caravan_site] { icon-image: icons/accommodation_caravan_park.n.16.png; z-index: 20; }
+node[tourism=guest_house],node[tourism=bed_and_breakfast] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; }
+node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[tourism=hostel] { icon-image: icons/accommodation_youth_hostel.n.16.png; z-index: 20; }
+node[amenity=fire_station] { icon-image: icons/amenity_firestation2.n.16.png; z-index: 20; }
+node[amenity=police] { icon-image: icons/amenity_police2.n.16.png; z-index: 20; }
+node[amenity=post_box] { icon-image: icons/amenity_post_box.n.16.png; z-index: 20; }
+node[amenity=recycling] { icon-image: icons/amenity_recycling.n.16.png; z-index: 20; }
+node[barrier=bollard] { icon-image: icons/barrier_bollard.n.16.png; z-index: 20; }
+node[barrier=gate], node[highway=gate] { icon-image: icons/barrier_gate.n.16.png; z-index: 20; }
+node[barrier=stile], node[highway=stile] { icon-image: icons/barrier_stile.n.16.png; z-index: 20; }
+node[barrier=toll_booth] { icon-image: icons/barrier_toll_booth.n.16.png; z-index: 20; }
+node[barrier=lift_gate] { icon-image: icons/barrier_lift_gate.n.16.png; z-index: 20; }
+node[barrier=kissing_gate] { icon-image: icons/barrier_kissing_gate.16.png; z-index: 20; }
+node[barrier=cycle_barrier] { icon-image: icons/barrier_cycle_barrier.16.png; z-index: 20; }
+node[barrier=block] { icon-image: icons/barrier_blocks.16.png; z-index: 20; }
+node[barrier=cattle_grid] { icon-image: icons/barrier_cattle_grid.16.png; z-index: 20; }
+node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:15; text: name; z-index: 20; }
+way[amenity=school] :area { color: yellow; fill-color: yellow; fill-opacity: 0.1; set .area_small_name; }
+node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[amenity=fast_food] { icon-image: icons/food_fastfood.n.16.png; z-index: 20; }
+node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; }
+node[amenity=pharmacy] { icon-image: icons/health_pharmacy.n.16.png; z-index: 20; }
+node[amenity=atm] { icon-image: icons/money_atm.n.16.png; z-index: 20; }
+node[amenity=bank] { icon-image: icons/money_bank2.n.16.png; z-index: 20; }
+node[shop=alcohol] { icon-image: icons/shopping_alcohol.n.16.png; z-index: 20; }
+node[shop=bakery] { icon-image: icons/shopping_bakery.n.16.png; z-index: 20; }
+node[shop=bicycle] { icon-image: icons/shopping_bicycle.n.16.png; z-index: 20; }
+node[shop=book] { icon-image: icons/shopping_book.n.16.png; z-index: 20; }
+node[shop=butcher] { icon-image: icons/shopping_butcher.n.16.png; z-index: 20; }
+node[shop=car_repair] { icon-image: icons/shopping_car_repair.n.16.png; z-index: 20; }
+node[shop=car] { icon-image: icons/shopping_car.n.16.png; z-index: 20; }
+node[shop=clothes] { icon-image: icons/shopping_clothes.n.16.png; z-index: 20; }
+node[shop=confectionery] { icon-image: icons/shopping_confectionery.n.16.png; z-index: 20; }
+node[shop=convenience] { icon-image: icons/shopping_convenience.n.16.png; z-index: 20; }
+node[shop=doityourself] { icon-image: icons/shopping_diy.n.16.png; z-index: 20; }
+node[shop=fishmonger] { icon-image: icons/shopping_fish.n.16.png; z-index: 20; }
+node[shop=garden_centre] { icon-image: icons/shopping_garden_centre.n.16.png; z-index: 20; }
+node[shop=gift] { icon-image: icons/shopping_gift.n.16.png; z-index: 20; }
+node[shop=greengrocer] { icon-image: icons/shopping_greengrocer.n.16.png; z-index: 20; }
+node[shop=hairdresser] { icon-image: icons/shopping_hairdresser.n.16.png; z-index: 20; }
+node[shop=hifi] { icon-image: icons/shopping_hifi.n.16.png; z-index: 20; }
+node[shop=jewelry] { icon-image: icons/shopping_jewelry.n.16.png; z-index: 20; }
+node[shop=laundry] { icon-image: icons/shopping_laundrette.n.16.png; z-index: 20; }
+node[shop=motorcycle] { icon-image: icons/shopping_motorcycle.n.16.png; z-index: 20; }
+node[shop=music] { icon-image: icons/shopping_music.n.16.png; z-index: 20; }
+node[shop=supermarket] { icon-image: icons/shopping_supermarket.n.16.png; z-index: 20; }
+node[historic=archaeological_site] { icon-image: icons/tourist_archaeological.n.16.png; z-index: 20; }
+node[historic=battlefield] { icon-image: icons/tourist_battlefield.n.16.png; z-index: 20; }
+node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[amenity=cinema] { icon-image: icons/tourist_cinema.n.16.png; z-index: 20; }
+node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[tourism=picnic_site] { icon-image: icons/tourist_picnic.n.16.png; z-index: 20; }
+node[historic=ruin] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; }
+node[amenity=theatre] { icon-image: icons/tourist_theatre.n.16.png; z-index: 20; }
+node[tourism=viewpoint] { icon-image: icons/tourist_view_point.n.16.png; z-index: 20; }
+node[tourism=zoo] { icon-image: icons/tourist_zoo.n.16.png; z-index: 20; }
+node[aeroway=aerodrome] { icon-image: icons/transport_aerodrome.n.16.png; z-index: 20; }
+node[amenity=bus_station] { icon-image: icons/transport_bus_station.n.16.png; z-index: 20; }
+node[highway=bus_stop] { icon-image: icons/transport_bus_stop2.n.16.png; z-index: 20; }
+node[amenity=fuel] { icon-image: icons/transport_fuel.n.16.png; z-index: 20; }
+node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset: 15; text: capacity; z-index: 20; }
+node[amenity=parking] { icon-image: icons/transport_parking_car.n.16.png; z-index: 20; }
+node[amenity=ferry_terminal] { icon-image: icons/transport_port.n.16.png; z-index: 20; }
+node[amenity=bicycle_rental] { icon-image: icons/transport_rental_bicycle.n.16.png; z-index: 20; }
+node[amenity=car_rental] { icon-image: icons/transport_rental_car.n.16.png; z-index: 20; }
+node[amenity=taxi] { icon-image: icons/transport_taxi_rank.n.16.png; z-index: 20; }
+node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[railway=tram_stop] { icon-image: icons/transport_tram_stop.n.16.png; z-index: 20; }
+node[leisure=marina] { icon-image: icons/transport_marina.n.16.png; z-index: 20; }
+
+/* Addressing */
+
+node[addr:housenumber],
+node[addr:housename] { icon-image: circle; icon-width: 4; color: #B0E0E6; casing-color:blue; casing-width: 1; }
+way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;}
diff --git a/public/potlatch2/stylesheets/core_relations.css b/public/potlatch2/stylesheets/core_relations.css
new file mode 100644
index 000000000..d1b2d5f6d
--- /dev/null
+++ b/public/potlatch2/stylesheets/core_relations.css
@@ -0,0 +1,7 @@
+/* Route relations */
+
+relation[type=route] way { z-index: 1; width: 13; color: blue; opacity: 0.3; }
+relation[type=route][route=bicycle][network=ncn] way { z-index: 1; width: 12; color: red; opacity: 0.3; }
+relation[type=route][route=bicycle][network=rcn] way { z-index: 1; width: 12; color: cyan; opacity: 0.3; }
+relation[type=route][route=bicycle][network=lcn] way { z-index: 1; width: 12; color: blue; opacity: 0.3; }
+relation[type=route][route=foot] way { z-index: 1; width: 10; color: #80ff80; opacity: 0.6; }
diff --git a/public/potlatch2/stylesheets/core_ways.css b/public/potlatch2/stylesheets/core_ways.css
new file mode 100644
index 000000000..469aec8ca
--- /dev/null
+++ b/public/potlatch2/stylesheets/core_ways.css
@@ -0,0 +1,123 @@
+
+/* Roads */
+
+way[highway=motorway],way[highway=motorway_link],
+way[highway=trunk],way[highway=trunk_link],
+way[highway=primary],way[highway=primary_link],
+way[highway=secondary],way[highway=secondary_link],
+way[highway=tertiary],way[highway=tertiary_link],
+way[highway=residential],way[highway=unclassified]  { text: name; text-color: black; font-size: 10; text-position: line; text-halo-color: white; text-halo-radius: 2; }
+way[highway=motorway],way[highway=motorway_link]    { z-index: 9; color: #809BC0; width: 7; casing-color: black; casing-width: 8; }
+way[highway=trunk],way[highway=trunk_link]          { z-index: 9; color: #7FC97F; width: 7; casing-color: black; casing-width: 8; }
+way[highway=primary],way[highway=primary_link]      { z-index: 8; color: #E46D71; width: 7; casing-color: black; casing-width: 8; }
+way[highway=secondary],way[highway=secondary_link]  { z-index: 7; color: #FDBF6F; width: 7; casing-width: 8; }
+way[highway=tertiary],way[highway=unclassified]     { z-index: 6; color: #FEFECB; width: 5; casing-width: 7; }
+way[highway=tertiary_link]                          { z-index: 5; color: #FEFECB; width: 4; casing-width: 5; }
+way[highway=residential]                            { z-index: 5; color: #E8E8E8; width: 5; casing-color: gray; casing-width: 7; }
+way[highway=service][service!=parking_aisle]        { color: white; width: 3; casing-color: gray; casing-width: 5; }
+way[highway=service][service=parking_aisle]         { color: white; width: 1; casing-color: #aaaaaa; casing-width: 2; }
+way[highway=service][service=alley]                 { color: white; width: 2; dashes: 6,2; casing-color: black; casing-width: 4; }
+way[highway=road]                                   { color: gray; width: 5; casing-color: white; casing-width: 7; }
+way[highway=living_street]                          { z-index: 5; color: #ddffee; width: 3; casing-color: #555555; casing-width: 4; }
+
+/* Road areas */
+
+way[highway=pedestrian] !:area { color: #ddddee; width: 5; casing-color: #555555; casing-width: 6; casing-dashes: 2,4;}
+way[highway=pedestrian] :area  { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; }
+
+/* Paths */
+
+way[highway=steps]     { color: #FF6644; width: 6; dashes: 2, 2; }
+way[highway=footway]   { color: #FF6644; width: 2; dashes: 6, 3; set .path;}
+way[highway=footway][bicycle=yes]   { z-index: 4; color: blue; width: 1; }
+way[highway=bridleway] { z-index:9; color: #996644; width: 2; dashes: 4, 2, 2, 2; set .path;}
+way[highway=track]     { color: #996644; width: 2; dashes: 4, 2; set .path;}
+way[highway=path]      { color: brown; width: 2; dashes: 2, 2; set .path;}
+way[highway=cycleway]  { color: blue; width: 2; dashes: 4, 2; set .path;}
+way[railway=tram]      { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 6; }
+way .path              { text:name; text-color: black; text-position: offset; text-offset: 5;}
+
+/* Under construction */
+
+way[highway=proposed] { color: #88ffff; width: 6; dashes: 8, 4; }
+way[highway=construction] { color: #ffffbb; width: 6; dashes: 8, 4; casing-color: #0000aa; casing-width: 8; casing-dashes: 8,4;}
+way[construction=rail] 
+	{ z-index: 6; color: black; width: 5; dashes: 6, 6, 4, 8;}
+	{ z-index: 7; color: white; width: 3; dashes: 6,18; }
+
+/* Railways */
+
+way[railway=rail]
+	{ z-index: 6; color: black; width: 5; }
+	{ z-index: 7; color: white; width: 3; dashes: 12,12; }
+way[railway=platform] { color:black; width: 2; }
+way[railway=subway]
+    { z-index: 6; color: #444444; width: 5; }
+    { z-index: 7; color: white; width: 3; dashes: 8,8; }
+way[railway=disused],way[railway=abandoned]
+    { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; }
+    { z-index: 7; color: #999999; width: 2; dashes: 12,12; }
+
+/* Waterways */	
+
+way[waterway=river], 
+way[waterway=canal], 
+way[waterway=stream]   { color: blue; width: 2; text:name; text-color:blue; font-size:9; text-position: offset; text-offset: 7;}
+way[waterway=drain] 			 {color: blue; width: 1; text:name; text-color: blue; text-position: offset; text-offset: 3;}
+way[waterway][tunnel=yes]                {dashes: 8,4;}
+
+/* Aeroways */
+
+way[aeroway=aerodrome] :area
+    { z-index: 3; color: #bb44bb; width: 3; casing-color: #66066;  casing-width: 4;  }
+way|z-15[aeroway=aerodrome] :area
+    { z-index: 3; fill-color: #bb99bb;  fill-opacity: 0.5;}
+way[aeroway=taxiway] !:area { z-index: 8; color: #999999; width: 3; casing-color: #aa66aa; casing-width: 6; } 
+way[aeroway=taxiway]  :area { z-index: 8; color: #bb99bb; width: 3; fill-color: #ccaacc; } 
+way|z17-[aeroway=runway] !:area 
+    { z-index: 9; color: black; width: 11; casing-color: #aa66aa; casing-width: 12; } 
+    { z-index: 10; color: white; width: 9;  dashes: 0, 20, 4, 76; } 
+    { z-index: 11; color: black; width: 7; } 
+    { z-index: 12; color: white; width: 5;  dashes: 0, 20, 4, 76; } 
+    { z-index: 13; color: black; width: 3; } 
+    { z-index: 14; color: white; width: 1;  dashes: 4, 16; } 
+way|z15-16[aeroway=runway] !:area 
+    { z-index: 9; color: black; width: 5;  } 
+    { z-index: 12; color: white; width: 5;  dashes: 0, 20, 4, 76; } 
+    { z-index: 13; color: black; width: 3; } 
+    { z-index: 14; color: white; width: 1;  dashes: 4, 16; } 
+way|z-14[aeroway=runway] !:area 
+    { z-index: 9; color: #444444; width: 3;  } 
+way[aeroway=runway] :area { z-index: 9; color: black; width: 3; fill-color: #775577; } 
+way[aeroway=apron] :area { z-index: 4; color: #cc66cc; width: 1; fill-color: #ddaadd; fill-opacity: 0.5;} 
+
+/* Barriers */
+
+way[barrier] {color: #000000; width: 1}
+way[barrier=fence] {color: #000000; width: 1; dashes: 8,4,2,4; }
+
+/* Power */
+
+way[power=line] {color: darkgray; width: 3; dashes: 12,2; casing-color: black; casing-width: 8; casing-dashes: 4, 38;}
+way[power=minor_line] {color: gray; width: 2; dashes: 2,4; casing-width: 8; casing-color: white; casing-dashes: 2,22;}
+way[power=station] :area { color: black; width: 2; fill-color: #666666; fill-opacity: 0.6; set .area_small_name;}
+way[power=generator] :area { color: black; width: 2; fill-color: #444444; fill-opacity: 0.6; set .area_small_name;}
+
+/* Leisure */
+
+way[golf=hole] {color: darkgreen; width: 5; casing-color: green; casing-width: 10; }
+way[leisure=sports_centre] :area { color: #66ddcc; fill-color: #66ddcc; set .area_small_name; }
+
+
+/* Physical decoration */
+
+way[bridge=yes], way[bridge=viaduct], way[bridge=suspension]
+    { z-index: 4; color: white; width: eval('_width+3'); }
+    { z-index: 3; color: black; width: eval('_width+6'); }
+way[tunnel=yes][!waterway]
+    { z-index: 4; color: white; width: eval('_width+2'); }
+    { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; }
+
+/* Attribute decoration */
+
+way[oneway=yes], way[junction=roundabout] { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows; }
diff --git a/public/potlatch2/stylesheets/enhanced.css b/public/potlatch2/stylesheets/enhanced.css
new file mode 100644
index 000000000..61315b395
--- /dev/null
+++ b/public/potlatch2/stylesheets/enhanced.css
@@ -0,0 +1,35 @@
+/*
+	Potlatch 2 enhanced stylesheet
+
+	The aim of this stylesheet is to provide a fuller, more detailed rendering of additional attributes
+	(e.g. direction, access) used at times by the moderately experienced mapper.
+	
+*/
+
+@import("stylesheets/core_ways.css");
+@import("stylesheets/core_pois.css");
+@import("stylesheets/core_landuse.css");
+
+/* Access */
+
+way[access=private],way[access=no] { z-index: 10; color: red; width: eval('_width+2'); dashes: 2,5;}
+way[access=permissive] { z-index: 10; color: green; width: eval('_width+2'); dashes: 1,3;}
+
+/* Physical */
+
+way[embankment=yes], way[cutting=yes]
+    { z-index: 3; opacity: 0.5; color: grey; width: eval('_width+5'); dashes: 2, 2; }
+
+/* Interactive behaviour */
+
+@import("stylesheets/core_relations.css");
+way .area_small_name {text-color: black; font-size: 9; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;}
+@import("stylesheets/core_interactive.css");
+
+/* Direction on selected ways */
+
+way[highway][!oneway][junction!=roundabout]:selected,
+way[aerial_way]:selected { z-index: 14; color: #999922; width: 2; dashes: 3,60; line-style: arrows; }
+way[waterway]:selected { z-index: 14; color: #4444CC; width: 2; dashes: 5,60; line-style: arrows; }
+way[railway] :selected{ z-index: 14; color: #999999; width: 3; dashes: 4,92; line-style: arrows; }
+
diff --git a/public/potlatch2/gpx.css b/public/potlatch2/stylesheets/gpx.css
similarity index 100%
rename from public/potlatch2/gpx.css
rename to public/potlatch2/stylesheets/gpx.css
diff --git a/public/potlatch2/stylesheets/network.css b/public/potlatch2/stylesheets/network.css
new file mode 100644
index 000000000..a8f72a6c0
--- /dev/null
+++ b/public/potlatch2/stylesheets/network.css
@@ -0,0 +1,35 @@
+/*
+	Potlatch 2 network stylesheet
+
+	This is a variant of the enhanced stylesheet _without_ landuse and similar polygons. The aim is to 
+	prevent such items distracting the mapper and leading to unwanted junctions (and slowing down
+	rendering!).
+	
+*/
+
+@import("stylesheets/core_ways.css");
+@import("stylesheets/core_pois.css");
+
+/* Access */
+
+way[access=private],way[access=no] { z-index: 10; color: red; width: eval('_width+2'); dashes: 2,5;}
+way[access=permissive] { z-index: 10; color: green; width: eval('_width+2'); dashes: 1,3;}
+
+/* Physical */
+
+way[embankment=yes], way[cutting=yes]
+    { z-index: 3; opacity: 0.5; color: grey; width: eval('_width+5'); dashes: 2, 2; }
+
+/* Interactive behaviour */
+
+@import("stylesheets/core_relations.css");
+way .area_small_name {text-color: black; font-size: 9; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;}
+@import("stylesheets/core_interactive.css");
+
+/* Direction on selected ways */
+
+way[highway][!oneway][junction!=roundabout]:selected,
+way[aerial_way]:selected { z-index: 14; color: #999922; width: 2; dashes: 3,60; line-style: arrows; }
+way[waterway]:selected { z-index: 14; color: #4444CC; width: 2; dashes: 5,60; line-style: arrows; }
+way[railway] :selected{ z-index: 14; color: #999999; width: 3; dashes: 4,92; line-style: arrows; }
+
diff --git a/public/potlatch2/opencyclemap.css b/public/potlatch2/stylesheets/opencyclemap.css
similarity index 100%
rename from public/potlatch2/opencyclemap.css
rename to public/potlatch2/stylesheets/opencyclemap.css
diff --git a/public/potlatch2/stylesheets/potlatch.css b/public/potlatch2/stylesheets/potlatch.css
new file mode 100644
index 000000000..625d5462f
--- /dev/null
+++ b/public/potlatch2/stylesheets/potlatch.css
@@ -0,0 +1,20 @@
+/*
+
+	Potlatch 2 core stylesheet
+	
+	This stylesheet should contain commonly used features and only the most essential extra attributes
+	(e.g. oneway). It needs to remain simple (not too many nested styles or dash-type decorations) in
+	order not to kill performance on slower systems and those with a less effective Flash Player (i.e. 
+	Linux).
+	
+	It is expected that experienced mappers will switch between this and other stylesheets as required.
+
+*/
+
+@import("stylesheets/core_ways.css");
+@import("stylesheets/core_pois.css");
+@import("stylesheets/core_landuse.css");
+@import("stylesheets/core_relations.css");
+way .area_small_name {text-color: black; font-size: 9; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;}
+@import("stylesheets/core_interactive.css");
+
diff --git a/public/potlatch2/wireframe.css b/public/potlatch2/stylesheets/wireframe.css
similarity index 100%
rename from public/potlatch2/wireframe.css
rename to public/potlatch2/stylesheets/wireframe.css
diff --git a/public/potlatch2/vectors.xml b/public/potlatch2/vectors.xml
index 5fef71441..d9a817491 100644
--- a/public/potlatch2/vectors.xml
+++ b/public/potlatch2/vectors.xml
@@ -8,6 +8,12 @@
       <details>http://www.mapdust.com/detail/</details>
       <apikey>e4d47b6b8c26e822a62d747b802f98ac</apikey>
     </set>
+    <set disabled="true" loaded="true">
+      <name>Mapdust Bugs - Test server</name>
+      <loader>BugLoader</loader>
+      <url>http://80.242.147.84/osmbugs/api/</url>
+      <apikey>e4d47b6b8c26e822a62d747b802f98ac</apikey>
+    </set>
     <set>
       <name>Bike Shop Locator - Missing Shops</name>
       <loader>BikeShopLoader</loader>
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index fde9fde86..3051f52d1 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -34,20 +34,22 @@ hr {
 
 #left {
   position: absolute;
-  top: -8px;
-  min-width: 150px;
+  top: 0px;
+  min-width: 170px;
 }
 
 /* Rules for the OpenStreetMap logo in the top left corner */
 
 #logo {
-  width: 150px;
-  min-width: 150px;
-  padding: 10px;
-  margin: 10px;
+  width: 170px;
+  min-width: 170px;
+  padding: 5px;
+  margin: 5px;
   height: 150px;
   background: #fff;
   border: 1px solid #ccd;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
 }
 
 #logo h1 {
@@ -65,12 +67,15 @@ hr {
 
 #intro {
   width: 170px;
-  margin: 10px;
+  padding: 5px;
+  margin: 5px;
   border: 1px solid #ccc;
   font-size: 11px;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
 }
 
-#intro p { margin: 10px; }
+#intro p { margin: 5px; }
 
 /*
  * Rules for alert boxes shown in the left sidebar when important
@@ -79,14 +84,16 @@ hr {
  */
 
 #alert {
-  width: 150px;
-  margin: 10px;
-  padding: 10px;
+  width: 170px;
+  margin: 5px;
+  padding: 5px;
   border: 1px solid #ccc;
   background: #d00;
   line-height: 1.2em;
   text-align: left;
   font-size: 14px;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
 }
 
 /*
@@ -96,23 +103,25 @@ hr {
  */
 
 .notice {
-  width: 150px;
-  margin: 10px;
-  padding: 10px;
+  width: 170px;
+  margin: 5px;
+  padding: 5px;
   border: 1px solid #ccc;
   background: #ea0;
   line-height: 1.2em;
   text-align: left;
   font-size: 14px;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
 }
 
 /* Rules for the menu displayed in the left sidebar */
 
 .left_menu {
-  width: 150px;
-  min-width: 150px;
-  margin: 10px;
-  padding: 10px;
+  width: 170px;
+  min-width: 170px;
+  margin: 5px;
+  padding: 5px;
   border: 1px solid #ccc;
   left: 0px;
   background: #ddd;
@@ -120,6 +129,8 @@ hr {
   text-align: Left;
   font-size: 14px;
   font-weight: bold;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
 }
 
 .left_menu td {
@@ -135,8 +146,9 @@ hr {
 }
 
 .left_menu ul {
-  padding-left: 10px;
+  padding-left: 0px;
   margin: 0px;
+  list-style-type: none;
 }
 
 .left_menu li {
@@ -166,16 +178,18 @@ hr {
  */
 
 .optionalbox {
-  width: 150px;
-  min-width: 150px;
-  margin: 10px;
-  padding: 10px;
+  width: 170px;
+  min-width: 170px;
+  margin: 5px;
+  padding: 5px;
   border: 1px solid #ccc;
   left: 0px;
   line-height: 1.2em;
   text-align: left;
   font-size: 12px;
   background: #eee;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
 }
 
 .optionalbox h1 {
@@ -206,11 +220,13 @@ hr {
 }
 
 #search_field input[type="text"] {
-  width: 116px;
+  width: 136px;
 }
 
 #search_field input[type="submit"] {
   width: 26px;
+  padding-left: 0px;
+  padding-right: 0px;
 }
 
 .search_help {
@@ -223,14 +239,16 @@ hr {
 /* Rules for donation request box */
 
 .donate {
-  width: 150px;
-  margin: 10px;
-  padding: 10px;
+  width: 170px;
+  margin: 5px;
+  padding: 5px;
   border: 1px solid #ccc;
   background: #cbeea7;
   line-height: 1.2em;
   text-align: center;
   font-size: 14px;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
 }
 
 /* Rules for Creative Commons logo button */
@@ -271,6 +289,10 @@ hr {
   border: 1px solid #ccc;
   text-decoration: none;
   color: #333;
+  border-top-right-radius: 5px;
+  -moz-border-radius-topright: 5px;
+  border-top-left-radius: 5px;
+  -moz-border-radius-topleft: 5px;
 }
 
 #tabnav a:link.active, #tabnav a:visited.active
@@ -591,7 +613,7 @@ hr {
 }
 
 #user_list tr {
-  vertical-align: center;
+  vertical-align: middle;
 }
 
 #user_list p {
@@ -604,35 +626,38 @@ hr {
   margin-top: 10px;
 }
 
-/* Rules for the login form */
+/* Rules for the login page */
 
-.loginBox {
-  float: left;
-  border-style: solid;
-  border-width: 1px;
-  padding-left: 10px;
-  padding-right: 10px;
-  padding-bottom: 10px;
+#login_wrapper {
+  float: left; /* ensures the child divs are the same size, and only as wide as they need to be */
 }
 
-.loginBox table {
-  width: 100%;
+#login_wrapper div {
+  margin: 5px;
+  padding: 15px;
+  border-radius: 15px;
+  -moz-border-radius: 15px;
 }
 
-.loginBox img {
-  border: 0;
-}
-
-.loginBox #openid_buttons img {
-  vertical-align: middle;
-}
-
-.loginBox input[type="submit"] {
+#login_wrapper input[type=submit] {
   float: right;
 }
 
-#openid_buttons {
-  margin-bottom: 20px;
+#login_login {
+  background-color: #f0f0f0;
+}
+
+#login_login h1 {
+  margin-top: 5px;
+}
+
+#login_openid_buttons img {
+  border: 0;
+}
+
+#login_signup form.button-to div {
+  margin: 0px;
+  padding: 0px;
 }
 
 /* Rules for the account confirmation page */
@@ -736,6 +761,8 @@ form#termsForm input#agree {
   padding: 7px;
   background-color: #fff0f0;
   margin-bottom: 20px;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
 }
 
 #warning {
@@ -743,6 +770,8 @@ form#termsForm input#agree {
   padding: 7px;
   background-color: #fff6f0;
   margin-bottom: 20px;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
 }
 
 #notice {
@@ -750,6 +779,8 @@ form#termsForm input#agree {
   padding: 7px;
   background-color: #f0fff0;
   margin-bottom: 20px;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
 }
 
 /* Rules for highlighting fields with rails validation errors */
@@ -812,7 +843,7 @@ input[type="submit"] {
 }
 
 input.openid_url { 
-  background: url('../images/openid_input.png') repeat-y left;
+  background: url('../images/openid_input.png') repeat-y left white;
   padding-left: 16px;
 }
 
diff --git a/test/functional/api_controller_test.rb b/test/functional/api_controller_test.rb
index b4ac25cfe..098026a93 100644
--- a/test/functional/api_controller_test.rb
+++ b/test/functional/api_controller_test.rb
@@ -66,9 +66,8 @@ class ApiControllerTest < ActionController::TestCase
     maxlat = point.latitude+0.001
     bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}"
     get :trackpoints, :bbox => bbox
-    #print @response.body
     assert_response :success
-    assert_select "gpx[version=1.0][creator=OpenStreetMap.org][xmlns=http://www.topografix.com/GPX/1/0/]:root", :count => 1 do
+    assert_select "gpx[version=1.0][creator=OpenStreetMap.org][xmlns=http://www.topografix.com/GPX/1/0]:root", :count => 1 do
       assert_select "trk" do
         assert_select "trkseg"
       end
@@ -83,9 +82,8 @@ class ApiControllerTest < ActionController::TestCase
     maxlat = point.latitude+0.002
     bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}"
     get :trackpoints, :bbox => bbox
-    #print @response.body
     assert_response :success
-    assert_select "gpx[version=1.0][creator=OpenStreetMap.org][xmlns=http://www.topografix.com/GPX/1/0/]:root", :count => 1 do
+    assert_select "gpx[version=1.0][creator=OpenStreetMap.org][xmlns=http://www.topografix.com/GPX/1/0]:root", :count => 1 do
       assert_select "trk", :count => 1 do
         assert_select "trk > trkseg", :count => 2 do |trksegs|
           trksegs.each do |trkseg|
@@ -106,9 +104,8 @@ class ApiControllerTest < ActionController::TestCase
     maxlat = point.latitude+0.002
     bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}"
     get :trackpoints, :bbox => bbox
-    #print @response.body
     assert_response :success
-    assert_select "gpx[version=1.0][creator=OpenStreetMap.org][xmlns=http://www.topografix.com/GPX/1/0/]:root", :count => 1 do
+    assert_select "gpx[version=1.0][creator=OpenStreetMap.org][xmlns=http://www.topografix.com/GPX/1/0]:root", :count => 1 do
       assert_select "trk", :count => 1 do
         assert_select "trk>name", :count => 1
         assert_select "trk>desc", :count => 1
diff --git a/test/functional/changeset_controller_test.rb b/test/functional/changeset_controller_test.rb
index befa8192a..3d963b471 100644
--- a/test/functional/changeset_controller_test.rb
+++ b/test/functional/changeset_controller_test.rb
@@ -497,6 +497,56 @@ EOF
     assert_equal true, Relation.find(current_relations(:visible_relation).id).visible
   end
 
+  ##
+  # test that a conditional delete of an in use object works.
+  def test_upload_delete_if_unused
+    basic_authorization users(:public_user).email, "test"
+
+    diff = XML::Document.new
+    diff.root = XML::Node.new "osmChange"
+    delete = XML::Node.new "delete"
+    diff.root << delete
+    delete["if-unused"] = ""
+    delete << current_relations(:public_used_relation).to_xml_node
+    delete << current_ways(:used_way).to_xml_node
+    delete << current_nodes(:node_used_by_relationship).to_xml_node
+
+    # upload it
+    content diff
+    post :upload, :id => 2
+    assert_response :success, 
+      "can't do a conditional delete of in use objects: #{@response.body}"
+
+    # check the returned payload
+    assert_select "diffResult[version=#{API_VERSION}][generator=\"OpenStreetMap server\"]", 1
+    assert_select "diffResult>node", 1
+    assert_select "diffresult>way", 1
+    assert_select "diffResult>relation", 1
+
+    # parse the response
+    doc = XML::Parser.string(@response.body).parse
+
+    # check the old IDs are all present and what we expect
+    assert_equal current_nodes(:node_used_by_relationship).id, doc.find("//diffResult/node").first["old_id"].to_i
+    assert_equal current_ways(:used_way).id, doc.find("//diffResult/way").first["old_id"].to_i
+    assert_equal current_relations(:public_used_relation).id, doc.find("//diffResult/relation").first["old_id"].to_i
+
+    # check the new IDs are all present and unchanged
+    assert_equal current_nodes(:node_used_by_relationship).id, doc.find("//diffResult/node").first["new_id"].to_i
+    assert_equal current_ways(:used_way).id, doc.find("//diffResult/way").first["new_id"].to_i
+    assert_equal current_relations(:public_used_relation).id, doc.find("//diffResult/relation").first["new_id"].to_i
+
+    # check the new versions are all present and unchanged
+    assert_equal current_nodes(:node_used_by_relationship).version, doc.find("//diffResult/node").first["new_version"].to_i
+    assert_equal current_ways(:used_way).version, doc.find("//diffResult/way").first["new_version"].to_i
+    assert_equal current_relations(:public_used_relation).version, doc.find("//diffResult/relation").first["new_version"].to_i
+
+    # check that nothing was, in fact, deleted
+    assert_equal true, Node.find(current_nodes(:node_used_by_relationship).id).visible
+    assert_equal true, Way.find(current_ways(:used_way).id).visible
+    assert_equal true, Relation.find(current_relations(:public_used_relation).id).visible
+  end
+
   ##
   # upload an element with a really long tag value
   def test_upload_invalid_too_long_tag
@@ -1024,6 +1074,32 @@ EOF
     end
   end
 
+  ##
+  # test that the X-Error-Format header works to request XML errors
+  def test_upload_xml_errors
+    basic_authorization users(:public_user).email, "test"
+
+    # try and delete a node that is in use
+    diff = XML::Document.new
+    diff.root = XML::Node.new "osmChange"
+    delete = XML::Node.new "delete"
+    diff.root << delete
+    delete << current_nodes(:node_used_by_relationship).to_xml_node
+
+    # upload it
+    content diff
+    error_format "xml"
+    post :upload, :id => 2
+    assert_response :success, 
+      "failed to return error in XML format"
+
+    # check the returned payload
+    assert_select "osmError[version=#{API_VERSION}][generator=\"OpenStreetMap server\"]", 1
+    assert_select "osmError>status", 1
+    assert_select "osmError>message", 1
+
+  end
+
   ##
   # when we make some simple changes we get the same changes back from the 
   # diff download.
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 507f9e7fc..b91c0779f 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -158,6 +158,10 @@ class ActiveSupport::TestCase
     @request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}")
   end
 
+  def error_format(format)
+    @request.env["HTTP_X_ERROR_FORMAT"] = format
+  end
+
   def content(c)
     @request.env["RAW_POST_DATA"] = c.to_s
   end