Merge branch 'master' into openstreetbugs2

app/controllers/api_controller.rb

@@ -46,7 +46,7 @@ class ApiController < ApplicationController
     root = XML::Node.new 'gpx'
     root['version'] = '1.0'
     root['creator'] = 'OpenStreetMap.org'
-    root['xmlns'] = "http://www.topografix.com/GPX/1/0/"
+    root['xmlns'] = "http://www.topografix.com/GPX/1/0"
     
     doc.root = root
 

app/controllers/application_controller.rb

@@ -15,6 +15,16 @@ class ApplicationController < ActionController::Base
         session_expires_automatically
 
         redirect_to :controller => "user", :action => "suspended"
+
+        # don't allow access to any auth-requiring part of the site unless
+        # the new CTs have been seen (and accept/decline chosen).
+      elsif !@user.terms_seen and flash[:showing_terms].nil?
+        flash[:notice] = t 'user.terms.you need to accept or decline'
+        if params[:referer]
+          redirect_to :controller => "user", :action => "terms", :referer => params[:referer]
+        else
+          redirect_to :controller => "user", :action => "terms", :referer => request.request_uri
+        end
       end
     elsif session[:token]
       @user = User.authenticate(:token => session[:token])
@@ -99,10 +109,21 @@ class ApplicationController < ActionController::Base
       end
     end
 
+    # have we identified the user?
+    if @user
       # check if the user has been banned
-    unless @user.nil? or @user.active_blocks.empty?
+      if not  @user.active_blocks.empty?
         # NOTE: need slightly more helpful message than this.
-      render :text => t('application.setup_user_auth.blocked'), :status => :forbidden
+        report_error t('application.setup_user_auth.blocked'), :forbidden
+      end
+
+      # if the user hasn't seen the contributor terms then don't
+      # allow editing - they have to go to the web site and see
+      # (but can decline) the CTs to continue.
+      if REQUIRE_TERMS_SEEN and not @user.terms_seen
+        set_locale
+        report_error t('application.setup_user_auth.need_to_see_terms'), :forbidden
+      end
     end
   end
 
@@ -134,8 +155,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 +163,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,8 +183,19 @@ 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
+
+    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
     response.header['Vary'] = 'Accept-Language'
@@ -181,6 +210,24 @@ class ApplicationController < ActionController::Base
       end
     end
 
+    if request.compatible_language_from(I18n.available_locales).nil?
+      request.user_preferred_languages = request.user_preferred_languages.collect do |pl|
+        pls = [ pl ]
+
+        while pl.match(/^(.*)-[^-]+$/)
+          pls.push($1) if I18n.available_locales.include?($1.to_sym)
+          pl = $1
+        end
+
+        pls
+      end.flatten
+
+      if @user and not request.compatible_language_from(I18n.available_locales).nil?
+        @user.languages = request.user_preferred_languages
+        @user.save        
+      end
+    end
+
     I18n.locale = request.compatible_language_from(I18n.available_locales)
 
     response.headers['Content-Language'] = I18n.locale.to_s

app/controllers/browse_controller.rb

@@ -72,8 +72,10 @@ class BrowseController < ApplicationController
     @next = Changeset.find(:first, :order => "id ASC", :conditions => [ "id > :id", { :id => @changeset.id }] ) 
     @prev = Changeset.find(:first, :order => "id DESC", :conditions => [ "id < :id", { :id => @changeset.id }] )
 
+    if @changeset.user.data_public?
       @next_by_user = Changeset.find(:first, :order => "id ASC", :conditions => [ "id > :id AND user_id = :user_id", { :id => @changeset.id, :user_id => @changeset.user_id }] )
       @prev_by_user = Changeset.find(:first, :order => "id DESC", :conditions => [ "id < :id AND user_id = :user_id", { :id => @changeset.id, :user_id => @changeset.user_id }] )
+    end
   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found
   end

app/controllers/changeset_controller.rb

@@ -436,7 +436,7 @@ private
   # query changesets which are closed
   # ('closed at' time has passed or changes limit is hit)
   def conditions_closed(closed)
-    return closed.nil? ? nil : ['closed_at < ? or num_changes > ?', 
+    return closed.nil? ? nil : ['(closed_at < ? or num_changes > ?)', 
                                 Time.now.getutc, Changeset::MAX_ELEMENTS]
   end
 

app/controllers/geocoder_controller.rb

@@ -234,7 +234,7 @@ class GeocoderController < ApplicationController
     end
 
     # ask nominatim
-    response = fetch_xml("http://nominatim.openstreetmap.org/search?format=xml&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{request.user_preferred_languages.join(',')}")
+    response = fetch_xml("#{NOMINATIM_URL}search?format=xml&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{request.user_preferred_languages.join(',')}")
 
     # create result array
     @results = Array.new
@@ -355,7 +355,7 @@ class GeocoderController < ApplicationController
     @results = Array.new
 
     # ask OSM namefinder
-    response = fetch_xml("http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{request.user_preferred_languages.join(',')}")
+    response = fetch_xml("#{NOMINATIM_URL}reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{request.user_preferred_languages.join(',')}")
 
     # parse the response
     response.elements.each("reversegeocode/result") do |result|

app/controllers/oauth_controller.rb

@@ -1,5 +1,5 @@
 class OauthController < ApplicationController
-  layout 'site'
+  layout 'slim'
 
   before_filter :authorize_web, :only => [:oauthorize, :revoke]
   before_filter :set_locale, :only => [:oauthorize, :revoke]

app/controllers/site_controller.rb

@@ -30,4 +30,41 @@ class SiteController < ApplicationController
   def key
     expires_in 7.days, :public => true
   end
+
+  def edit
+    editor = params[:editor] || @user.preferred_editor || DEFAULT_EDITOR
+
+    if editor == "remote"
+      render :action => :index
+    else
+      # Decide on a lat lon to initialise potlatch with. Various ways of doing this
+      if params['lon'] and params['lat']
+        @lon = params['lon'].to_f
+        @lat = params['lat'].to_f
+        @zoom = params['zoom'].to_i
+
+      elsif params['mlon'] and params['mlat']
+        @lon = params['mlon'].to_f
+        @lat = params['mlat'].to_f
+        @zoom = params['zoom'].to_i
+
+      elsif params['gpx']
+        @lon = Trace.find(params['gpx']).longitude
+        @lat = Trace.find(params['gpx']).latitude
+
+      elsif cookies.key?("_osm_location")
+        @lon, @lat, @zoom, layers = cookies["_osm_location"].split("|")
+
+      elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil?
+        @lon = @user.home_lon
+        @lat = @user.home_lat
+
+      else
+        #catch all.  Do nothing.  lat=nil, lon=nil
+        #Currently this results in potlatch starting up at 0,0 (Atlantic ocean).
+      end
+
+      @zoom = '14' if @zoom.nil?
+    end
+  end
 end

app/controllers/user_controller.rb

@@ -1,6 +1,7 @@
 class UserController < ApplicationController
-  layout 'site', :except => :api_details
+  layout :choose_layout
 
+  before_filter :disable_terms_redirect, :only => [:terms, :save, :logout]
   before_filter :authorize, :only => [:api_details, :api_gpx_files]
   before_filter :authorize_web, :except => [:api_details, :api_gpx_files]
   before_filter :set_locale, :except => [:api_details, :api_gpx_files]
@@ -24,7 +25,7 @@ class UserController < ApplicationController
 
     if request.xhr?
       render :update do |page|
-        page.replace_html "contributorTerms", :partial => "terms", :locals => { :has_decline => params[:has_decline] }
+        page.replace_html "contributorTerms", :partial => "terms"
       end
     else
       @title = t 'user.terms.title'
@@ -53,17 +54,36 @@ class UserController < ApplicationController
     if Acl.find_by_address(request.remote_ip, :conditions => {:k => "no_account_creation"})
       render :action => 'new'
     elsif params[:decline]
+      if @user
+        @user.terms_seen = true
+
+        if @user.save
+          flash[:notice] = t 'user.new.terms declined', :url => t('user.new.terms declined url')
+        end
+
+        if params[:referer]
+          redirect_to params[:referer]
+        else
+          redirect_to :action => :account, :display_name => @user.display_name
+        end
+      else
         redirect_to t('user.terms.declined')
+      end
     elsif @user
       if !@user.terms_agreed?
         @user.consider_pd = params[:user][:consider_pd]
         @user.terms_agreed = Time.now.getutc
+        @user.terms_seen = true
         if @user.save
           flash[:notice] = t 'user.new.terms accepted'
         end
       end
 
+      if params[:referer]
+        redirect_to params[:referer]
+      else
         redirect_to :action => :account, :display_name => @user.display_name
+      end
     else
       @user = User.new(params[:user])
 
@@ -73,13 +93,15 @@ class UserController < ApplicationController
       @user.creation_ip = request.remote_ip
       @user.languages = request.user_preferred_languages
       @user.terms_agreed = Time.now.getutc
+      @user.terms_seen = true
       
       if @user.save
         flash[:notice] = t 'user.new.flash create success message', :email => @user.email
         Notifier.deliver_signup_confirm(@user, @user.tokens.create(:referer => params[:referer]))
-        redirect_to :action => 'login'
+        session[:token] = @user.tokens.create.token
+        redirect_to :action => 'login', :referer => params[:referer]
       else
-        render :action => 'new'
+        render :action => 'new', :referer => params[:referer]
       end
     end
   end
@@ -108,6 +130,12 @@ class UserController < ApplicationController
       @user.home_lat = params[:user][:home_lat]
       @user.home_lon = params[:user][:home_lon]
 
+      if params[:user][:preferred_editor] == "default"
+        @user.preferred_editor = nil
+      else
+        @user.preferred_editor = params[:user][:preferred_editor]
+      end
+
       if @user.save
         set_locale
 
@@ -207,15 +235,20 @@ class UserController < ApplicationController
         session[:user] = user.id
         session_expires_after 1.month if params[:remember_me]
 
-        # The user is logged in, if the referer param exists, redirect
-        # them to that unless they've also got a block on them, in
-        # which case redirect them to the block so they can clear it.
-        if user.blocked_on_view
-          redirect_to user.blocked_on_view, :referer => params[:referer]
-        elsif params[:referer]
-          redirect_to params[:referer]
+        target = params[:referer] || url_for(:controller => :site, :action => :index)
+
+        # The user is logged in, so decide where to send them:
+        #
+        # - If they haven't seen the contributor terms, send them there.
+        # - If they have a block on them, show them that.
+        # - If they were referred to the login, send them back there.
+        # - Otherwise, send them to the home page.
+        if REQUIRE_TERMS_SEEN and not user.terms_seen
+          redirect_to :controller => :user, :action => :terms, :referer => target
+        elsif user.blocked_on_view
+          redirect_to user.blocked_on_view, :referer => target
         else
-          redirect_to :controller => 'site', :action => 'index'
+          redirect_to target
         end
       elsif user = User.authenticate(:username => email_or_display_name, :password => pass, :pending => true)
         flash.now[:error] = t 'user.login.account not active', :reconfirm => url_for(:action => 'confirm_resend', :display_name => user.display_name)
@@ -264,14 +297,29 @@ class UserController < ApplicationController
           user.save!
           referer = token.referer
           token.destroy
+
+          if session[:token] 
+            token = UserToken.find_by_token(session[:token])
+            session.delete(:token)
+          else
+            token = nil
+          end
+
+          if token.nil? or token.user != user
+            flash[:notice] = t('user.confirm.success')
+            redirect_to :action => :login, :referer => referer
+          else
+            token.destroy
+
             session[:user] = user.id
 
-          unless referer.nil?
+            if referer.nil?
+              flash[:notice] = t('user.confirm.success') + "<br /><br />" + t('user.confirm.before you start')
+              redirect_to :action => :account, :display_name => user.display_name
+            else
               flash[:notice] = t('user.confirm.success')
               redirect_to referer
-          else
-            flash[:notice] = t('user.confirm.success') + "<br /><br />" + t('user.confirm.before you start')
-            redirect_to :action => 'account', :display_name => user.display_name
+            end
           end
         end
       else
@@ -452,4 +500,28 @@ private
   rescue ActiveRecord::RecordNotFound
     redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name] unless @this_user
   end
+
+  ##
+  # Choose the layout to use. See
+  # https://rails.lighthouseapp.com/projects/8994/tickets/5371-layout-with-onlyexcept-options-makes-other-actions-render-without-layouts
+  def choose_layout
+    oauth_url = url_for(:controller => :oauth, :action => :oauthorize, :only_path => true)
+
+    if [ 'api_details' ].include? action_name
+      nil
+    elsif params[:referer] and URI.parse(params[:referer]).path == oauth_url
+      'slim'
+    else
+      'site'
+    end
+  end
+
+  ##
+  #
+  def disable_terms_redirect
+    # this is necessary otherwise going to the user terms page, when 
+    # having not agreed already would cause an infinite redirect loop.
+    # it's .now so that this doesn't propagate to other pages.
+    flash.now[:showing_terms] = true
+  end
 end

app/helpers/application_helper.rb

@@ -119,6 +119,16 @@ module ApplicationHelper
     end
   end
 
+  def preferred_editor
+    if params[:editor]
+      params[:editor]
+    elsif @user and @user.preferred_editor
+      @user.preferred_editor
+    else
+      DEFAULT_EDITOR
+    end
+  end
+
 private
 
   def javascript_strings_for_key(key)

app/models/client_application.rb

@@ -2,6 +2,7 @@ require 'oauth'
 class ClientApplication < ActiveRecord::Base
   belongs_to :user
   has_many :tokens, :class_name => "OauthToken"
+  has_many :access_tokens
   validates_presence_of :name, :url, :key, :secret
   validates_uniqueness_of :key
   before_validation_on_create :generate_keys
@@ -53,6 +54,20 @@ class ClientApplication < ActiveRecord::Base
     RequestToken.create :client_application => self, :callback_url => self.token_callback_url
   end
 
+  def access_token_for_user(user)
+    unless token = access_tokens.find(:first, :conditions => { :user_id => user.id, :invalidated_at => nil })
+      params = { :user => user }
+
+      permissions.each do |p|
+        params[p] = true
+      end
+
+      token = access_tokens.create(params)
+    end
+    
+    token
+  end
+
   # the permissions that this client would like from the user
   def permissions
     ClientApplication.all_permissions.select { |p| self[p] }

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]
@@ -33,6 +33,7 @@ class User < ActiveRecord::Base
   validates_numericality_of :home_lat, :allow_nil => true
   validates_numericality_of :home_lon, :allow_nil => true
   validates_numericality_of :home_zoom, :only_integer => true, :allow_nil => true
+  validates_inclusion_of :preferred_editor, :in => Editors::ALL_EDITORS, :allow_nil => true
 
   before_save :encrypt_password
 
@@ -106,7 +107,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)
@@ -202,4 +203,10 @@ class User < ActiveRecord::Base
 
     return score.to_i
   end
+
+  ##
+  # return an oauth access token for a specified application
+  def access_token(application_key)
+    return ClientApplication.find_by_key(application_key).access_token_for_user(self)
+  end
 end

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>

app/views/browse/_map.html.erb

@@ -2,7 +2,7 @@
 <%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
 <%= javascript_include_tag 'map.js' %>
 <div id="browse_map">
-  <% if map.instance_of? Changeset or map.visible %>
+  <% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible %>
   <div id="small_map">
   </div>
   <span id="loading"><%= t 'browse.map.loading' %></span>
@@ -15,7 +15,7 @@
     <%= t 'browse.map.deleted' %>
   <% end %>
 </div>
-<% if map.instance_of? Changeset or map.visible %>
+<% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible %>
   <script type="text/javascript">
     OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
 
@@ -49,10 +49,15 @@
       <% else %>
         var obj_type = "<%= map.class.name.downcase %>";
         var obj_id = <%= map.id %>;
+        var obj_version = <%= map.version %>;
+        var obj_visible = <%= map.visible %>;
         var url = "/api/<%= "#{API_VERSION}" %>/<%= map.class.name.downcase %>/<%= map.id %>";
 
         if (obj_type != "node") {
           url += "/full";
+        } else if (!obj_visible) {
+          var previous_version = obj_version - 1;
+          url += "/" + previous_version;
         }
 
         addObjectToMap(url, true, function(extent) {

app/views/browse/_start.html.erb

@@ -4,6 +4,8 @@
       <a id="browse_select_view" href="#"><%= t'browse.start.view_data' %></a>
       <br />
       <a id="browse_select_box" href="#"><%= t'browse.start.manually_select' %></a>  
+      <br />
+      <a id="browse_hide_areas_box" href="#"><%= t'browse.start.hide_areas' %></a>  
     </p>
   </div>
   <div id="browse_status" style="text-align: center; display: none">

app/views/browse/node.html.erb

@@ -10,7 +10,7 @@
 <%= render :partial => "map", :object => @node %>
 <%= render :partial => "node_details", :object => @node %>
 <hr />
-<%= t'browse.node.download', :download_xml_link => link_to(t('browse.node.download_xml'), :controller => "node", :action => "read"),
+<%= t'browse.node.download', :download_xml_link => link_to(t('browse.node.download_xml'), :controller => "old_node", :action => "version", :version => @node.version),
                              :view_history_link => link_to(t('browse.node.view_history'), :action => "node_history"),
                              :edit_link => link_to(t('browse.node.edit'), :controller => "site", :action => "edit", :lat => @node.lat, :lon => @node.lon, :zoom => 18, :node => @node.id)
 %>

app/views/browse/start.rjs

@@ -9,6 +9,7 @@ page << <<EOJ
   var browseDataLayer;
   var browseSelectControl;
   var browseObjectList;
+  var areasHidden = false;
 
   OpenLayers.Feature.Vector.style['default'].strokeWidth = 3;
   OpenLayers.Feature.Vector.style['default'].cursor = "pointer";
@@ -33,12 +34,16 @@ page << <<EOJ
 
     map.events.register("moveend", map, showData);
     map.events.triggerEvent("moveend");
+
+    $("browse_hide_areas_box").innerHTML = "#{I18n.t('browse.start_rjs.hide_areas')}";
+    $("browse_hide_areas_box").style.display = "inline";
+    $("browse_hide_areas_box").onclick = hideAreas;
   }
 
   function showData() {
     if (browseMode == "auto") {
       if (map.getZoom() >= 15) {
-          useMap();
+          useMap(false);
       } else {
           setStatus("#{I18n.t('browse.start_rjs.zoom_or_select')}");
       }    
@@ -84,7 +89,7 @@ page << <<EOJ
 
   $("browse_select_box").onclick = startDrag;
 
-  function useMap() {
+  function useMap(reload) {
     var bounds = map.getExtent();
     var projected = bounds.clone().transform(map.getProjectionObject(), epsg4326);
 
@@ -98,7 +103,7 @@ page << <<EOJ
                                              center.lat + (tileHeight / 2));
 
       browseBounds = tileBounds;
-      getData(tileBounds);
+      getData(tileBounds, reload);
 
       browseMode = "auto";
 
@@ -108,6 +113,26 @@ page << <<EOJ
     return false;
   }
 
+  function hideAreas() {
+      $("browse_hide_areas_box").innerHTML = "#{I18n.t('browse.start_rjs.show_areas')}";
+      $("browse_hide_areas_box").style.display = "inline";
+      $("browse_hide_areas_box").onclick = showAreas;
+
+      areasHidden = true;
+
+      useMap(true);
+  }
+
+  function showAreas() {
+      $("browse_hide_areas_box").innerHTML = "#{I18n.t('browse.start_rjs.hide_areas')}";
+      $("browse_hide_areas_box").style.display = "inline";
+      $("browse_hide_areas_box").onclick = hideAreas;
+
+      areasHidden = false;
+
+      useMap(true);
+  }
+
   $("browse_select_view").onclick = useMap;
 
   function endDrag(bbox) {
@@ -181,22 +206,29 @@ page << <<EOJ
     }
   }
 
-  function getData(bounds) {
+  function getData(bounds, reload) {
     var projected = bounds.clone().transform(new OpenLayers.Projection("EPSG:900913"), new OpenLayers.Projection("EPSG:4326"));
     var size = projected.getWidth() * projected.getHeight();
 
     if (size > #{MAX_REQUEST_AREA}) {
       setStatus(i18n("#{I18n.t('browse.start_rjs.unable_to_load_size', :max_bbox_size => MAX_REQUEST_AREA)}", { bbox_size: size }));
     } else {
-      loadGML("/api/#{API_VERSION}/map?bbox=" + projected.toBBOX());
+      loadGML("/api/#{API_VERSION}/map?bbox=" + projected.toBBOX(), reload);
     }
   }
 
-  function loadGML(url) {
+  function loadGML(url, reload) {
     setStatus("#{I18n.t('browse.start_rjs.loading')}");
     $("browse_content").innerHTML = "";
 
-    if (!browseDataLayer) {
+    var formatOptions = {
+      checkTags: true,
+      interestingTagsExclude: ['source','source_ref','source:ref','history','attribution','created_by','tiger:county','tiger:tlid','tiger:upload_uuid']
+    };
+
+    if (areasHidden) formatOptions.areaTags = [];
+
+    if (!browseDataLayer || reload) {
       var style = new OpenLayers.Style();
 
       style.addRules([new OpenLayers.Rule({
@@ -207,12 +239,11 @@ page << <<EOJ
         }
       })]);
 
+      if (browseDataLayer) browseDataLayer.destroyFeatures();
+
       browseDataLayer = new OpenLayers.Layer.GML("Data", url, {
         format: OpenLayers.Format.OSM,
-        formatOptions: {
-          checkTags: true, 
-          interestingTagsExclude: ['source','source_ref','source:ref','history','attribution','created_by','tiger:county','tiger:tlid','tiger:upload_uuid']
-        },
+        formatOptions: formatOptions,
         maxFeatures: 100,
         requestSuccess: customDataLoader,
         displayInLayerSwitcher: false,
@@ -230,6 +261,8 @@ page << <<EOJ
       map.addControl(browseSelectControl);
       browseSelectControl.activate();
     } else {
+      browseDataLayer.destroyFeatures();
+      browseDataLayer.format(formatOptions);
       browseDataLayer.setUrl(url);
     }
 

app/views/changeset/_changeset.html.erb

@@ -27,7 +27,7 @@
   <% end %>
     
   <td class="<%= cl %> comment">
-    <% if changeset.tags['comment'] %>
+    <% if changeset.tags['comment'].to_s != '' %>
       <%= linkify(h(changeset.tags['comment'])) %>
     <% else %>
       <%= t'changeset.changeset.no_comment' %>

app/views/diary_entry/_location.html.erb

@@ -1,11 +1,9 @@
 <%= t 'diary_entry.location.location' %>
 
+<a href="<%= url_for :controller => 'site', :action => 'index', :lat => location.latitude, :lon => location.longitude, :zoom => 14 %>">
 <abbr class="geo" title="<%= number_with_precision(location.latitude, :precision => 4) %>; <%= number_with_precision(location.longitude, :precision => 4) %>">
 <% cache(:controller => 'diary_entry', :action => 'view', :display_name => location.user.display_name, :id => location.id, :part => "location") do %>
 <%= describe_location location.latitude, location.longitude, 14, location.language_code %>
 <% end %>
 </abbr>
-
-(<%=link_to t('diary_entry.location.view'), :controller => 'site', :action => 'index', :lat => location.latitude, :lon => location.longitude, :zoom => 14 %>
-/
-<%=link_to t('diary_entry.location.edit'), :controller => 'site', :action => 'edit', :lat => location.latitude, :lon => location.longitude, :zoom => 14 %>)
+</a>

app/views/diary_entry/view.html.erb

@@ -1,6 +1,6 @@
 <%= user_image @entry.user, :style => "float: right" %>
 
-<h2><%= t 'diary_entry.view.user_title', :user => h(@entry.user.display_name) %></h2>
+<h2><%= link_to t('diary_entry.view.user_title', :user => h(@entry.user.display_name)), :action => :list %></h2>
 
 <%= render :partial => 'diary_entry', :object => @entry %>
 

app/views/layouts/_flash.html.erb

@@ -0,0 +1,11 @@
+<% if flash[:error] %>
+  <div id="error"><%= flash[:error] %></div>
+<% end %>
+
+<% if flash[:warning] %>
+  <div id="warning"><%= flash[:warning] %></div>
+<% end %>
+
+<% if flash[:notice] %>
+  <div id="notice"><%= flash[:notice] %></div>
+<% end %>

app/views/layouts/_head.html.erb

@@ -0,0 +1,18 @@
+<head>
+  <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"/>
+  <%= javascript_strings %>
+  <%= javascript_include_tag 'prototype' %>
+  <%= javascript_include_tag 'site' %>
+  <%= javascript_include_tag 'menu' %>
+  <!--[if lt IE 7]><%= javascript_include_tag 'pngfix' %><![endif]--> <!-- thanks, microsoft! -->
+  <%= stylesheet_link_tag 'common' %>
+  <!--[if IE]><%= stylesheet_link_tag 'large', :media => "screen" %><![endif]--> <!-- IE is totally broken with CSS media queries -->
+  <%= stylesheet_link_tag 'small', :media => "only screen and (max-width:641px)" %>
+  <%= stylesheet_link_tag 'large', :media => "screen and (min-width: 642px)" %> 
+  <%= stylesheet_link_tag 'print', :media => "print" %>
+  <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => "/opensearch/osm.xml" }) %>
+  <%= tag("meta", { :name => "description", :content => "OpenStreetMap is the free wiki world map." }) %>
+  <%= style_rules %>
+  <%= yield :head %>
+  <title><%= t 'layouts.project_name.title' %><%= ' | '+ h(@title) if @title %></title>
+</head>

app/views/layouts/site.html.erb

@@ -1,33 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= I18n.locale %>" lang="<%= I18n.locale %>" dir="<%= t'html.dir' %>">
-  <head>
-    <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"/>
-    <%= javascript_strings %>
-    <%= javascript_include_tag 'prototype' %>
-    <%= javascript_include_tag 'site' %>
-    <!--[if lt IE 7]><%= javascript_include_tag 'pngfix' %><![endif]--> <!-- thanks, microsoft! -->
-    <%= stylesheet_link_tag 'common' %>
-    <!--[if IE]><%= stylesheet_link_tag 'large', :media => "screen" %><![endif]--> <!-- IE is totally broken with CSS media queries -->
-    <%= stylesheet_link_tag 'small', :media => "only screen and (max-width: 481px)" %>
-    <%= stylesheet_link_tag 'large', :media => "screen and (min-width: 482px)" %> 
-    <%= stylesheet_link_tag 'print', :media => "print" %>
-    <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => "/opensearch/osm.xml" }) %>
-    <%= tag("meta", { :name => "description", :content => "OpenStreetMap is the free wiki world map." }) %>
-    <%= style_rules %>
-    <%= yield :head %>
-    <title><%= t 'layouts.project_name.title' %><%= ' | '+ h(@title) if @title %></title>
-  </head>
+  <%= render :partial => "layouts/head" %>
   <body>
+    <div id="small-title">
+      <%= link_to(image_tag("osm_logo.png", :size => "16x16", :border => 0, :alt => t('layouts.logo.alt_text')), :controller => 'site', :action => 'index') %>
+      <h1><%= t 'layouts.project_name.h1' %></h1>
+    </div>
     <div id="content">
-      <% if flash[:error] %>
-        <div id="error"><%= flash[:error] %></div>
-      <% end %>
-      <% if flash[:warning] %>
-        <div id="warning"><%= flash[:warning] %></div>
-      <% end %>
-      <% if flash[:notice] %>
-        <div id="notice"><%= flash[:notice] %></div>
-      <% end %>
+      <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
 
       <%= yield %>
     </div>
@@ -61,7 +41,7 @@
         diaryclass = 'active' if params['controller'] == 'diary_entry'
         %>
         <li><%= link_to t('layouts.view'), {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => t('layouts.view_tooltip'), :class => viewclass} %></li>
-        <li><%= link_to t('layouts.edit'), {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('javascripts.site.edit_tooltip'), :class => editclass} %></li>
+        <li><%= link_to t('layouts.edit') + '&nbsp;&#x25be;', {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('javascripts.site.edit_tooltip'), :class => editclass} %></li>
         <li><%= link_to t('layouts.history'), {:controller => 'changeset', :action => 'list' }, {:id => 'historyanchor', :title => t('javascripts.site.history_tooltip'), :class => historyclass} %></li>
         <% if params['controller'] == 'site' and (params['action'] == 'index' or params['action'] == 'export') %>
         <li><%= link_to_remote t('layouts.export'), {:url => {:controller => 'export', :action => 'start'}}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass, :href => url_for(:controller => 'site', :action => 'export')} %></li>
@@ -73,6 +53,18 @@
       </ul>
     </div>
 
+    <div id="editmenu">
+      <ul>
+        <% Editors::ALL_EDITORS.each do |editor| %>
+          <li><%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")), {:controller => 'site', :action => 'edit', :editor => editor}, {:id => editor + 'anchor'} %></li>
+        <% end %>
+      </ul>
+    </div>
+
+    <script type="text/javascript">
+      createMenu("editanchor", "editmenu", 1000);
+    </script>
+
     <div id="left">
 
       <div id="logo">
@@ -117,14 +109,18 @@
       <% 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 />
+        <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>
+
+      <div id="sotm">
+        <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm2011'), :title => t('layouts.sotm2011'), :border => "0"), "http://stateofthemap.org/register-now/" %>
       </div>
 
       <%= yield :optionals %>

app/views/layouts/slim.html.erb

@@ -0,0 +1,19 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= I18n.locale %>" lang="<%= I18n.locale %>" dir="<%= t'html.dir' %>">
+  <%= render :partial => "layouts/head" %>
+  <body class="slim">
+    <div id="slim_container">
+      <div id="slim_container_content">
+        <div id="slim_content">
+          <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
+
+          <%= yield %>
+        </div>
+
+        <div id="slim_header">
+          <h1><%= image_tag("osm_logo.png", :size => "60x60", :border => 0, :alt => t('layouts.logo.alt_text')) %><%= t 'layouts.project_name.h1' %></h1>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>

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 %>

app/views/site/_potlatch.html.erb

@@ -0,0 +1,43 @@
+<div id="map">
+  <%= t 'site.edit.flash_player_required' %>
+</div>
+
+<%= javascript_include_tag 'swfobject.js' %>
+
+<% session[:token] = @user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token]) %>
+
+<script type="text/javascript" defer="defer">
+  var brokenContentSize = $("content").offsetWidth == 0;
+  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; }
+  
+  window.onbeforeunload=function() {
+    if (!changesaved) {
+      return '<%= escape_javascript(t('site.edit.potlatch_unsaved_changes')) %>';
+    }
+  }
+
+  function markChanged(a) { changesaved=a; }
+
+  function doSWF(lat,lon,sc) {
+    if (sc < 11) sc = 11;
+    fo.addVariable('winie',winie);
+    fo.addVariable('scale',sc);
+    fo.addVariable('token','<%= session[:token] %>');
+    if (lat) { fo.addVariable('lat',lat); }
+    if (lon) { fo.addVariable('long',lon); }
+    <% if params['gpx']     %>fo.addVariable('gpx'     ,'<%= h(params['gpx']    ) %>');<% end %>
+    <% if params['way']     %>fo.addVariable('way'     ,'<%= h(params['way']    ) %>');<% end %>
+    <% if params['node']    %>fo.addVariable('node'    ,'<%= h(params['node']   ) %>');<% end %>
+    <% if params['tileurl'] %>fo.addVariable('custombg','<%= h(params['tileurl']) %>');<% end %>
+    fo.write("map");
+  }
+
+  doSWF(<%= @lat || 'null' %>,<%= @lon || 'null' %>,<%= @zoom %>);
+
+  function setPosition(lat, lon, zoom) {
+    doSWF(lat, lon, zoom || 15);
+  }
+</script>

app/views/site/_potlatch2.html.erb

@@ -0,0 +1,65 @@
+<div id="map">
+  <%= t 'site.edit.flash_player_required' %>
+</div>
+
+<%= javascript_include_tag 'swfobject.js' %>
+
+<% if defined? POTLATCH2_KEY %>
+<% token = @user.access_token(POTLATCH2_KEY) %>
+<% else%>
+<script type="text/javascript">alert("<%= t 'site.edit.potlatch2_not_configured' %>")</script>
+<% end %>
+
+<% locale = request.compatible_language_from(Potlatch2::LOCALES.keys) || "en" %>
+
+<script type="text/javascript" defer="defer">
+  var brokenContentSize = $("content").offsetWidth == 0;
+  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;
+  
+  window.onbeforeunload=function() {
+    if (!changesaved) {
+      return '<%= escape_javascript(t('site.edit.potlatch2_unsaved_changes')) %>';
+    }
+  }
+
+  function markChanged(a) { changesaved=a; }
+
+  function doSWF(lat,lon,zoom) {
+    fo.addParam("base","/potlatch2");
+    if (lat) { fo.addVariable("lat",lat); }
+    if (lon) { fo.addVariable("lon",lon); }
+    fo.addVariable("locale", "<%= Potlatch2::LOCALES[locale] %>");
+    <% 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","<%= 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");
+    <% if token %>
+    fo.addVariable("oauth_token","<%= token.token %>");
+    fo.addVariable("oauth_token_secret","<%= token.secret %>");
+    fo.addVariable("oauth_consumer_key","<%= token.client_application.key %>");
+    fo.addVariable("oauth_consumer_secret","<%= token.client_application.secret %>");
+    <% end %>
+    fo.addVariable("maximise_function","maximiseMap");
+    fo.addVariable("minimise_function","minimiseMap");
+    fo.addVariable("move_function","mapMoved");
+    fo.write("map");
+  }
+
+  doSWF(<%= @lat || 'null' %>,<%= @lon || 'null' %>,<%= @zoom %>);
+
+  function setPosition(lat, lon, zoom) {
+    $("potlatch").setPosition(lat, lon, Math.max(zoom || 15, 13));
+  }
+
+  function mapMoved(lon, lat, zoom, minlon, minlat, maxlon, maxlat) {
+    updatelinks(lon, lat, zoom, null, minlon, minlat, maxlon, maxlat);
+  }
+</script>

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 %>

app/views/site/edit.html.erb

@@ -19,78 +19,9 @@
 <%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
 <%= render :partial => 'search' %>
 
-<%
-session[:token] = @user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token])
+<%= render :partial => preferred_editor %>
 
-# Decide on a lat lon to initialise potlatch with. Various ways of doing this
-if params['lon'] and params['lat']
-	lon =  h(params['lon']) 
-	lat =  h(params['lat']) 
-	zoom =  h(params['zoom'])
-
-elsif params['mlon'] and params['mlat'] 
-	lon =  h(params['mlon']) 
-	lat =  h(params['mlat']) 
-	zoom =  h(params['zoom'])
-	
-elsif params['gpx']
-	#use gpx id to locate (dealt with below)
-	
-elsif cookies.key?("_osm_location")
-	lon,lat,zoom,layers = cookies["_osm_location"].split("|")
-	
-elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil? 
-	lon =  @user.home_lon
-	lat =  @user.home_lat
-
-else
-	#catch all.  Do nothing.  lat=nil, lon=nil
-	#Currently this results in potlatch starting up at 0,0 (Atlantic ocean).
-end
-
-zoom='14' if zoom.nil?
-%>
-
-<div id="map">
-	<%= t 'site.edit.flash_player_required' %>
-</div>
-
-<%= javascript_include_tag 'swfobject.js' %>
 <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");
-  // 700,600 for fixed size, 100%,100% for resizable
-  var changesaved=true;
-  var winie=false; if (document.all && window.print) { winie=true; }
-  
-  window.onbeforeunload=function() {
-    if (!changesaved) {
-      return '<%= escape_javascript(t('site.edit.potlatch_unsaved_changes')) %>';
-    }
-  }
-
-  function markChanged(a) { changesaved=a; }
-
-  function doSWF(lat,lon,sc) {
-    if (sc < 11) sc = 11;
-    fo.addVariable('winie',winie);
-    fo.addVariable('scale',sc);
-    fo.addVariable('token','<%= session[:token] %>');
-    if (lat) { fo.addVariable('lat',lat); }
-    if (lon) { fo.addVariable('long',lon); }
-    <% if params['gpx']     %>fo.addVariable('gpx'     ,'<%= h(params['gpx']    ) %>');<% end %>
-    <% if params['way']     %>fo.addVariable('way'     ,'<%= h(params['way']    ) %>');<% end %>
-    <% if params['node']    %>fo.addVariable('node'    ,'<%= h(params['node']   ) %>');<% end %>
-    <% if params['tileurl'] %>fo.addVariable('custombg','<%= h(params['tileurl']) %>');<% end %>
-    fo.write("map");
-  }
-
-  doSWF(<%= lat || 'null' %>,<%= lon || 'null' %>,<%= zoom %>);
-
-  function setPosition(lat, lon, zoom) {
-    doSWF(lat, lon, zoom || 15);
-  }
-
   function resizeContent() {
     var content = $("content");
     var rightMargin = parseInt(getStyle(content, "right"));

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 %>
 
@@ -19,6 +19,9 @@
 <div id="map">
 </div>
 
+<iframe id="linkloader" style="display: none">
+</iframe>
+
 <div id="permalink">
   <a href="/" id="permalinkanchor"><%= t 'site.index.permalink' %></a><br/>
   <a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a><br/>
@@ -64,18 +67,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')
@@ -299,10 +301,37 @@ end
     resizeMap();
   }
 
+  function remoteEditHandler(event) {
+    var extent = getMapExtent();
+    var loaded = false;
+
+    $("linkloader").observe("load", function () { loaded = true; });
+    $("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("<%= escape_javascript(t('site.index.remote_failed')) %>");
+    }, 1000);
+
+    event.stop();
+  }
+
+  function installEditHandler() {
+    $("remoteanchor").observe("click", remoteEditHandler);
+
+    <% if preferred_editor == "remote" %>
+      $("editanchor").observe("click", remoteEditHandler);
+
+      <% if params[:action] == "edit" %>
+        remoteEditHandler();
+      <% end %>
+    <% end %>
+  }
+
   mapInit();
 
-  window.onload = handleResize;
-  window.onresize = handleResize;
+  Event.observe(window, "load", installEditHandler);
+  Event.observe(window, "load", handleResize);
+  Event.observe(window, "resize", handleResize);
 
   <% if params['action'] == 'export' %>
   <%= remote_function :url => { :controller => 'export', :action => 'start' } %>

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'].to_s != '' ? 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 %>

app/views/user/_map.html.erb

@@ -1,18 +1,17 @@
-<% friends = @user.friends.collect { |f| f.befriendee }.select { |f| !f.home_lat.nil? and !f.home_lon.nil? } %>
-<% nearest = @user.nearby - friends %>
-
-<% if @user.home_lat.nil? or @user.home_lon.nil? %>
-  <% lon = h(params['lon'] || '-0.1') %>
-  <% lat = h(params['lat'] || '51.5') %>
-  <% zoom = h(params['zoom'] || '4') %> 
-<% else %>
-  <% marker = true %>
-  <% mlon = @user.home_lon %> 
-  <% mlat = @user.home_lat %>
-  <% lon =  @user.home_lon %>
-  <% lat =  @user.home_lat %>
-  <% zoom =  '12' %>
-<% end %>
+<%
+if @user.home_lat.nil? or @user.home_lon.nil?
+  lon = h(params['lon'] || '0') 
+  lat = h(params['lat'] || '20') 
+  zoom = h(params['zoom'] || '1') 
+else 
+  marker = true
+  mlon = @user.home_lon 
+  mlat = @user.home_lat
+  lon =  @user.home_lon 
+  lat =  @user.home_lat 
+  zoom =  '12'
+end
+%>
 
 <%= javascript_include_tag '/openlayers/OpenLayers.js' %>
 <%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
@@ -38,11 +37,21 @@
 
     <% if marker %>
     marker = addMarkerToMap(
-      new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>), null,
-      '<%= escape_javascript(render(:partial => "popup", :object => @user, :locals => { :type => "your location" })) %>'
+      new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)
+      <% if not setting_location %>
+        , null, '<%=escape_javascript(render(:partial => "popup", :object => @user, :locals => { :type => "your location" })) %>'
+      <% end %>
     );
     <% end %>
     
+    <% if setting_location %>
+    map.events.register("click", map, setHome);
+    <% end %>
+    
+    <% if show_other_users %>
+      <% friends = @user.friends.collect { |f| f.befriendee }.select { |f| !f.home_lat.nil? and !f.home_lon.nil? } %>
+      <% nearest = @user.nearby - friends %>
+
       var near_icon = OpenLayers.Marker.defaultIcon();
       near_icon.url = OpenLayers.Util.getImagesLocation() + "marker-green.png";
       <% nearest.each do |u| %>
@@ -60,12 +69,10 @@
           '<%= escape_javascript(render(:partial => "popup", :object => u, :locals => { :type => "friend" })) %>'
         );
       <% end %>
-
-    if (document.getElementById('updatehome')) {
-      map.events.register("click", map, setHome);
-    }
+    <% end %>
   }        
 
+  <% if setting_location %>
   function setHome( e ) { 
     closeMapPopup();
 
@@ -80,12 +87,10 @@
         removeMarkerFromMap(marker);
       }
 
-      marker = addMarkerToMap(
-        lonlat, null, 
-        '<%= escape_javascript(render(:partial => "popup", :object => @user, :locals => { :type => "your location" })) %>'
-      );
+      marker = addMarkerToMap(lonlat);
     }
   }
+  <% end %>
 
   window.onload = init;
 // -->

app/views/user/_terms.html.erb

@@ -1,15 +1,21 @@
 <p id="first">
   <%= @text['intro'] %>
-  <% if has_decline %>
   <%= @text['next_with_decline'] %>
-  <% else %>
-    <%= @text['next_without_decline'] %>
-  <% end %>
 </p>
+<h3><%= @text['introduction'] %></h3>
 <ol>
   <li>
     <p><%= @text['section_1'] %></p>
+    <% unless @text['section_1a'].nil? %>
+    <ol style="list-style-type: lower-alpha">
+      <li><%= @text['section_1a'] %></li>
+      <li><%= @text['section_1b'] %></li>
+    </ol>
+    <% end %>
   </li>
+</ol>
+<h3><%= @text['rights_granted'] %></h3>
+<ol start="2">
   <li>
     <p><%= @text['section_2'] %></p>
   </li>
@@ -17,6 +23,7 @@
     <p><%= @text['section_3'] %></p>
     <p><%= @text['active_defn_1'] %></p>
     <p><%= @text['active_defn_2'] %></p>
+    </ul>
   </li>
   <li>
     <p><%= @text['section_4'] %></p>
@@ -24,14 +31,15 @@
   <li>
     <p><%= @text['section_5'] %></p>
   </li>
-  <li>
-    <p><%= @text['section_6'] %></p>
-    <ol>
-      <li><p><%= @text['section_6_1'] %></p></li>
-      <li><p><%= @text['section_6_2'] %></p></li>
 </ol>
-  </li>
+<h3><%= @text['limitation_of_liability'] %></h3>
+<ol start="6">
+  <li><p><%= @text['section_6'] %></p></li>
+  <li><p><%= @text['section_7'] %></p></li>
+</ol>
+<h3><%= @text['miscellaneous'] %></h3>
+<ol start="8">
   <li>
-    <p id="last"><%= @text['section_7'] %></p>
+    <p id="last"><%= @text['section_8'] %></p>
   </li>
 </ol>

app/views/user/account.html.erb

@@ -66,6 +66,11 @@
     <td><%= f.text_field :languages %></td>
   </tr>
 
+  <tr>
+    <td class="fieldName" valign="top"><%= t 'user.account.preferred editor' %></td>
+    <td><%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{DEFAULT_EDITOR}.name")), 'default']] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %></td>
+  </tr>
+
   <tr>
     <td class="fieldName" valign="top">
       <%= t 'user.account.image' %>
@@ -114,7 +119,7 @@
 </table>
 <% end %>
 
-<%= render :partial => 'map' %>
+<%= render :partial => 'map', :locals => { :setting_location => true,  :show_other_users => false } %>
 
 <% unless @user.data_public? %>
 <a name="public"></a>

app/views/user/login.html.erb

@@ -1,6 +1,8 @@
+<div id="login_wrapper">
+  <div id="login_login">
     <h1><%= t 'user.login.heading' %></h1>
 
-<p><%= t 'user.login.please login', :create_user_link => link_to(t('user.login.create_account'), :controller => 'user', :action => 'new', :referer => params[:referer]) %></p>
+    <p><%= t 'user.login.already have' %></p>
 
     <% form_tag :action => 'login' do %>
       <%= hidden_field_tag('referer', h(params[:referer])) %>
@@ -8,7 +10,16 @@
         <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>
-  <tr><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
-  <tr><td></td><td align="right"><%= submit_tag t('user.login.login_button'), :tabindex => 3 %></td></tr>
       </table>
+      <%= submit_tag t('user.login.login_button'), :tabindex => 3 %>
     <% end %>
+    <br clear="both">
+  </div>
+  <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>

app/views/user/terms.html.erb

@@ -13,7 +13,7 @@
             :before => update_page do |page|
               page.replace_html 'contributorTerms', image_tag('searching.gif')
             end,
-            :url => {:legale => legale, :has_decline => params.has_key?(:user)}
+            :url => {:legale => legale}
           )
       %>
       <%= label_tag "legale_#{legale}", t('user.terms.legale_names.' + name) %>
@@ -22,7 +22,7 @@
 <% end %>
 
 <div id="contributorTerms">
-  <%= render :partial => "terms", :locals => { :has_decline =>params.has_key?(:user) }  %>
+  <%= render :partial => "terms" %>
 </div>
 
 <% form_tag({:action => "save"}, { :id => "termsForm" }) do %>
@@ -41,9 +41,7 @@
       <%= hidden_field('user', 'pass_crypt_confirmation') %>
     <% end %>
     <div id="buttons">
-      <% if params[:user] %>
       <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %>
-      <% end %>
       <%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %>
     </div>
   </p>

app/views/user/view.html.erb

@@ -96,7 +96,7 @@
         <%= t 'user.view.if set location', :settings_link => (link_to t('user.view.settings_link_text'), :controller => 'user', :action => 'account', :display_name => @user.display_name) %>
       </p>
     <% else %>
-      <%= render :partial => 'map' %>
+      <%= render :partial => 'map', :locals => { :setting_location => false, :show_other_users => true } %>
     <% end %>
   </div>
 

config/environment.rb

@@ -25,7 +25,10 @@ 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.5.0'
+  if defined?(MEMCACHE_SERVERS)
+    config.gem 'memcached'
+  end
 
   # 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

config/environments/production.rb

@@ -16,7 +16,10 @@ config.action_view.cache_template_loading            = true
 # config.logger = SyslogLogger.new
 
 # Use a different cache store in production
-# config.cache_store = :mem_cache_store
+if defined?(MEMCACHE_SERVERS)
+  MEMCACHE = Memcached::Rails.new(MEMCACHE_SERVERS, :binary_protocol => true)
+  config.cache_store = :mem_cache_store, MEMCACHE
+end
 
 # Enable serving of images, stylesheets, and javascripts from an asset server
 # config.action_controller.asset_host = "http://assets.example.com"

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
@@ -55,12 +59,21 @@ standard_settings: &standard_settings
   #file_column_root: ""
   # Enable legacy OAuth 1.0 support
   oauth_10_support: true
+  # URL of Nominatim instance to use for geocoding
+  nominatim_url: "http://nominatim.openstreetmap.org/"
+  # Default editor
+  default_editor: "potlatch2"
+  # OAuth consumer key for Potlatch 2
+  #potlatch2_key: ""
+  # Whether to require users to view the CTs before continuing to edit...
+  require_terms_seen: false
 
 development:
   <<: *standard_settings
 
 production:
   <<: *standard_settings
+  require_terms_seen: false
 
 test:
   <<: *standard_settings

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

config/initializers/i18n.rb

@@ -1,4 +1,9 @@
 module I18n
+  original_verbosity = $VERBOSE
+  $VERBOSE = nil
+  INTERPOLATION_PATTERN = /\{\{(\w+)\}\}/
+  $VERBOSE = original_verbosity
+
   module Backend
     class Simple
       module Implementation

config/initializers/memcached.rb

@@ -0,0 +1,9 @@
+if defined?(PhusionPassenger) and defined?(MEMCACHE_SERVERS)
+  PhusionPassenger.on_event(:starting_worker_process) do |forked|
+    if forked
+      MEMCACHE = MEMCACHE.clone
+      RAILS_CACHE = ActiveSupport::Cache::CompressedMemCacheStore.new(MEMCACHE)
+      ActionController::Base.cache_store = RAILS_CACHE
+    end
+  end
+end

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

config/initializers/postgresql_adapter.rb

@@ -1,7 +1,14 @@
-if defined?(ActiveRecord::ConnectionAdaptors::PostgreSQLAdaptor)
+if defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
   module ActiveRecord
     module ConnectionAdapters
       class PostgreSQLAdapter
+        def supports_disable_referential_integrity?() #:nodoc:
+          version = query("SHOW server_version")[0][0].split('.')
+          (version[0].to_i >= 9 || (version[0].to_i == 8 && version[1].to_i >= 1)) ? true : false
+        rescue
+          return false
+        end
+
         def pk_and_sequence_for(table)
           # First try looking for a sequence with a dependency on the
           # given table's primary key.

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 }

config/legales/FR.yml

@@ -1,14 +1,18 @@
-intro: "Nous vous remercions de votre intérêt pour la base de données géographiques du projet OpenStreetMap (« le Projet ») et pour votre volonté d’y intégrer des données et/ou tout autre contenu (collectivement « les Contenus »). Cet accord de contribution (« l’Accord ») est conclu entre vous (ci-après « Vous ») et la Fondation OpenStreetMap (« OSMF ») et a pour objectif de définir l’étendue des droits de propriété intellectuelle relatifs aux Contenus que vous déciderez de soumettre au Projet."
+intro: "Nous vous remercions de votre intérêt pour la base de données géographiques du projet OpenStreetMap (« le Projet ») et pour votre volonté d’y intégrer des données et/ou tout autre contenu (collectivement « les Contenus »). Cet accord de contribution (« l’Accord ») est conclu entre vous (ci-après « Vous ») et la Fondation OpenStreetMap (« OSMF ») et a pour objectif de définir l’étendue des droits de propriété intellectuelle relatifs aux Contenus que vous déciderez de soumettre au Projet avec ce compte utilisateur." 
 next_with_decline: "Lisez attentivement les articles suivants et si vous en acceptez les termes, cliquez sur le bouton « J’accepte » en bas de la page afin de continuer."
-next_without_decline: "Lisez attentivement les articles du contrat. Si vous acceptez les termes du contrat, cliquez sur \"j'accepte\", sinon retournez à la page précédente ou fermer cette fenêtre."
-section_1: "Dans le cas où des Contenus comprennent des éléments soumis à un droit d’auteur, Vous acceptez de n’ajouter que des Contenus dont Vous possédez la propriété intellectuelle. Vous garantissez le fait que Vous êtes légalement habilité à octroyer une licence telle que définie à l’Article 2 des Présentes et que cette licence ne contrevient à aucune loi, à aucune disposition contractuelle ni, à votre connaissance, à aucun droit d’un tiers. Si Vous n’êtes pas détenteur des droits de propriété intellectuelle, Vous devez garantir le fait que vous avez obtenu l’accord exprès et préalable d’utiliser les droits de propriété intellectuelle afférents au Contenu et de concéder une licence d’utilisation de ce Contenu."
-section_2: "Droits concédés. Vous concédez à OSMF, dans les conditions définies à l’article 3, de manière irrévocable et perpétuelle, une licence internationale, non soumise aux droits patrimoniaux d’auteur et non exclusive, portant sur tout acte relatif au Contenu, quel que soit le support. La concession porte notamment sur une éventuelle utilisation commerciale du Contenu ainsi que sur le droit de sous-licencier l’ensemble des contributions à des tiers ou sous-traitants. Vous acceptez de ne pas user de votre droit moral à l’encontre de OSMF ou de ses sous-traitants si la loi ou les conventions vous donne un tel droit relativement aux Contenus."
-section_3: "OSMF consent à utiliser ou sous-licencier votre Contenu comme partie de la base de données et seulement par le biais d’une des licences suivantes : ODbL 1.0 pour la base de données et DbCL 1.0 pour les contenus individuels de la base de données ; CC-BY-SA 2.0 ; ou toute autre licence libre et ouverte choisie à la majorité par vote des membres OSMF puis adoptée par une majorité de 2/3 des contributeurs actifs."
+introduction: "Introduction"
+section_1: "Parce que nous respectons les droits relatifs à la propriété intellectuelle de toute personne et qu’il s’avère indispensable que nous soyons à même de répondre à toute contestation de titulaire de droits de propriété intellectuelle:"
+section_1a: "Votre apport de données ne doit pas porter atteinte aux droit des tiers. Dans le cas d’un apport de Contenus, Vous garantissez le fait que, à votre connaissance, Vous êtes habilité à autoriser OSMF à utiliser et diffuser ces Contenus selon les conditions de notre licence. Si vous n’êtes pas habilité, vous risquez de voir votre apport effacé. (cf. alinéa b)"  
+section_1b: "Nous vous rappelons que OSMF n’a pas l’obligation d’inclure les Contenus de Vos contributions au Projet et qu’OSMF peut à tout moment supprimer Vos contributions. Ainsi, s’il existe des suspicions d’incompatibilité d’une quelconque donnée  (empêchant donc la poursuite en toute légalité de sa diffusion) avec l’une des licences utilisées ou toute autre licence (voir modalités évoquées aux articles 3 et 4) il sera possible d’effacer cette donnée."
+rights_granted: "Droits concédés"
+section_2: "Vous concédez à OSMF, dans les conditions définies aux articles 3 et 4, de manière irrévocable et perpétuelle, une licence internationale, non exclusive et non soumise aux droits patrimoniaux d’auteur, aux droits des auteurs de bases de données ou à tout autre droit, relatif à un élément du Contenu, quel que soit le support. La concession porte notamment sur une éventuelle utilisation commerciale du Contenu ainsi que sur le droit de sous-licencier l’ensemble des contributions à des tiers ou sous-traitants. Vous acceptez de ne pas user de votre droit moral à l’encontre de OSMF ou de ses sous-traitants si la loi ou les conventions vous donne un tel droit relativement aux Contenus."
+section_3: "OSMF consent à n’utiliser ou sous-licencier votre Contenu que comme partie de la base de données et seulement par le biais d’une ou des licences suivantes : ODbL 1.0 pour la base de données et DbCL 1.0 pour les contenus individuels de la base de données ; CC-BY-SA 2.0 ; ou toute autre licence libre et ouverte de même type (comme, par exemple, http://www.opendefinition.org/okd/) qui pourra être ponctuellement choisie par une majorité de 2/3 des contributeurs actifs parmi les membres d’OSMF."
 active_defn_1: "Un contributeur actif est défini comme suit:"
-active_defn_2: "Une personne physique (utilisant un ou plusieurs comptes, agissant pour son compte ou au nom d’un tiers pouvant être une société) qui, ayant une adresse email valide dans son profil enregistré a, dans 3 des 12 derniers mois, modifié le Projet, ce qui démontre ainsi son intérêt réel et renouvelé dans le projet et qui, lorsqu’elle est sollicitée répond dans un délai maximal de 3 semaines."
-section_4: "OSMF accepte de Vous citer ou de citer le titulaire des droits d’auteur, selon Votre souhait ou celui du titulaire des droits. Le procédé d'attribution sera fourni ultérieurement. Actuellement, il s'agit de la <a href=\"http://wiki.openstreetmap.org/wiki/Attribution\">page web</a>."
+active_defn_2: "Une personne physique (utilisant un ou plusieurs comptes, agissant pour son compte ou au nom d’un tiers pouvant être une société) qui, ayant une adresse email valide dans son profil enregistré a, dans 3 des 12 derniers mois, modifié le Projet, ce qui démontre ainsi son intérêt réel et renouvelé dans le projet et qui, lorsqu’elle est sollicitée pour voter répond dans un délai maximal de 3 semaines."
+section_4: "OSMF accepte de Vous citer ou de citer le titulaire des droits d’auteur, selon Votre souhait ou celui du titulaire des droits. La citation s’effectue par le biais de la page web <a href=\"http://wiki.openstreetmap.org/wiki/Attribution\">http://wiki.openstreetmap.org/wiki/Attribution</a>."
 section_5: "Nonobstant les cas prévus dans les Présentes, Vous conservez les droits et intérêts à agir relatifs à vos Contenus."
-section_6: "Limitation de responsabilité"
-section_6_1: "A l’exception des garanties prévues  à l’Article 1 des Présentes et dans les limites permises par la loi, Vous fournissez les Contenus en l’état sans aucune garantie d’aucune sorte, expresse ou tacite, notamment sans garantie de valeur commerciale, d’adéquation à un usage ou à besoin quelconque."
-section_6_2: "En cas de responsabilité ne pouvant être limitée ou exclue par la loi, aucun préjudice particulier, indirect ou punitif, lorsque ces termes s’appliquent, ne pourra Vous être imputé ou être imputé à OSMF dans le cadre de cet Accord. Cette limitation de responsabilité s’applique même si chaque Partie était avisée de la possibilité de réalisation d’un tel dommage."
-section_7: "Divers. Cet Accord est régi par le Droit Anglais, nonobstant les règles en vigueur relatives aux conflits de Lois. Vous convenez que la Convention des Nations Unies sur les Ventes Internationales de Marchandises de 1980 est intégralement inapplicable à cet Accord. Cet Accord entre Vous et OSMF remplace et annule tout accord antérieur, qu’il soit oral ou écrit, concernant l’objet de cet Accord."
+limitation_of_liability: "Limitation de responsabilité"
+section_6: "Dans les limites permises par la loi, Vous fournissez les Contenus en l’état sans aucune garantie d’aucune sorte, expresse ou tacite, notamment sans garantie de valeur commerciale, d’adéquation à un usage ou à besoin quelconque."
+section_7: "En cas de responsabilité ne pouvant être limitée ou exclue par la loi, aucun préjudice particulier, indirect ou punitif, lorsque ces termes s’appliquent, ne pourra Vous être imputé ou être imputé à OSMF dans le cadre de cet Accord. Cette limitation de responsabilité s’applique même si chaque Partie était avisée de la possibilité de réalisation d’un tel dommage."
+miscellaneous: "Divers"
+section_8: "Cet Accord est régi par le Droit Anglais, nonobstant les règles en vigueur relatives aux conflits de Lois. Vous convenez que la Convention des Nations Unies sur les Ventes Internationales de Marchandises de 1980 est intégralement inapplicable à cet Accord. Cet Accord entre Vous et OSMF remplace et annule tout accord antérieur, qu’il soit oral, écrit, ou tacite, concernant l’objet de cet Accord."

config/legales/GB.yml

@@ -1,14 +1,19 @@
-intro: "Thank you for your interest in contributing data and/or any other content (collectively, 'Contents') to the geo-database of the OpenStreetMap project (the 'Project'). This contributor agreement (the 'Agreement') is made between you ('You') and The OpenStreetMap Foundation ('OSMF') and clarifies the intellectual property rights in any Contents that You choose to submit to the Project."
+intro: "Thank you for your interest in contributing data and/or any other content (collectively, 'Contents') to the geo-database of the OpenStreetMap project (the 'Project'). This contributor agreement (the 'Agreement') is made between you ('You') and The OpenStreetMap Foundation ('OSMF') and clarifies the intellectual property rights in any Contents that You choose to submit to the Project in this user account."
 next_with_decline: "Please read the following terms and conditions carefully and click either the 'Accept' or 'Decline' button at the bottom to continue."
-next_without_decline: "Please read the following terms and conditions carefully. If you agree, click the 'Accept'  button at the bottom to continue.  Otherwise, use your browser's Back button or just close this page."
-section_1: "You agree to only add Contents for which You are the copyright holder (to the extent the Contents include any copyrightable elements). You represent and warrant that You are legally entitled to grant the licence in Section 2 below and that such licence does not violate any law, breach any contract, or, to the best of Your knowledge, infringe any third party’s rights. If You are not the copyright holder of the Contents, You represent and warrant that You have explicit permission from the rights holder to submit the Contents and grant the licence below."
-section_2: "Rights granted. Subject to Section 3 below, You hereby grant to OSMF a worldwide, royalty-free, non-exclusive, perpetual, irrevocable licence to do any act that is restricted by copyright over anything within the Contents, whether in the original medium or any other. These rights explicitly include commercial use, and do not exclude any field of endeavour. These rights include, without limitation, the right to sublicense the work through multiple tiers of sublicensees.  To the extent allowable under applicable local laws and copyright conventions, You also waive and/or agree not to assert against OSMF or its licensees any moral rights that You may have in the Contents."
-section_3: "OSMF agrees to use or sub-license Your Contents as part of a database and only under the terms of one of the following licences: ODbL 1.0 for the database and DbCL 1.0 for the individual contents of the database; CC-BY-SA 2.0; or another free and open licence. Which other free and open licence is chosen by a vote of the OSMF membership and approved by at least a 2/3 majority vote of active contributors."
+introduction: "Introduction"
+section_1: "We respect the intellectual property rights of others and we need to be able to respond to any objections by intellectual property owners. This means that:"
+section_1a: "Your contribution of data should not infringe the intellectual property rights of anyone else. If you contribute Contents, You are indicating that, as far as You know, You have the right to authorize OSMF to use and distribute those Contents under our current licence terms.  If You do not have that right, You risk having Your contribution deleted (see below)."
+section_1b: "Please note that OSMF does not have to include Contents You contribute in the Project, and may remove Your contributions from the Project at any time.  For example, if we suspect that any contributed data is incompatible, (in the sense that we could not continue to lawfully distribute it), with whichever licence or licences we are then using (see sections 3 and 4), then we may delete that data."
+rights_granted: "Rights Granted"
+section_2: "Subject to Section 3 and 4 below, You hereby grant to OSMF a worldwide, royalty-free, non-exclusive, perpetual, irrevocable licence to do any act that is restricted by copyright, database right or any related right over anything within the Contents, whether in the original medium or any other. These rights explicitly include commercial use, and do not exclude any field of endeavour. These rights include, without limitation, the right to sub-license the work through multiple tiers of sub-licensees and to sue for any copyright violation directly connected with OSMF's rights under these terms.  To the extent allowable under applicable local laws and copyright conventions, You also waive and/or agree not to assert against OSMF or its licensees any moral rights that You may have in the Contents."
+section_3: "OSMF agrees that it may only use or sub-license Your Contents as part of a database and only under the terms of one or more of the following licences: ODbL 1.0 for the database and DbCL 1.0  for the individual contents of the database; CC-BY-SA 2.0; or such other free and open licence (for example, http://www.opendefinition.org/okd/) as may from time to time be chosen by a vote of the OSMF membership and approved by at least a 2/3 majority vote of active contributors."
 active_defn_1: "An 'active contributor' is defined as:"
-active_defn_2: "a natural person (whether using a single or multiple accounts) who has edited the Project in any 3 calendar months from the last 12 months (i.e. there is a demonstrated interest over time); and has maintained a valid email address in their registration profile and responds within 3 weeks."
-section_4: "At Your or the copyright holder’s option, OSMF agrees to attribute You or the copyright holder. A mechanism will be provided, currently a <a href=\"http://wiki.openstreetmap.org/wiki/Attribution\">web page</a>."
+active_defn_2: "a natural person (whether using a single or multiple accounts) who has edited the Project in any three calendar months from the last 12 months (i.e. there is a demonstrated interest over time); and has maintained a valid email address in their registration profile and responds  to a request to vote within 3 weeks."
+section_4: "At Your or the copyright owner’s option, OSMF agrees to attribute You or the copyright owner. A mechanism will be provided, currently a web page <a href=\"http://wiki.openstreetmap.org/wiki/Attribution\">http://wiki.openstreetmap.org/wiki/Attribution</a>."
 section_5: "Except as set forth herein, You reserve all right, title, and interest in and to Your Contents."
-section_6: "Limitation of Liability"
-section_6_1: "To the extent permitted by applicable law, except as provided above in Section 1, You provide the Contents 'as is' without warranty of any kind, either express or implied, including without limitation any warranties or conditions of merchantability, fitness for a particular purpose, or otherwise."
-section_6_2: "Subject to any liability that may not be excluded or limited by law, neither You nor OSMF shall be liable for any special, indirect, incidental, consequential, punitive, or exemplary damages under this Agreement, however caused and under any theory of liability. This exclusion applies even if either party has been advised of the possibility of such damages."
-section_7: "Miscellaneous. This Agreement shall be governed by English law without regard to principles of conflict of law. You agree that the United Nations Convention on Contracts for the International Sale of Goods (1980) is hereby excluded in its entirety from application to this Agreement. In the event of invalidity of any provision of this Agreement, the parties agree that such invalidity shall not affect the validity of the remaining portions of this Agreement. This is the entire agreement between You and OSMF which supersedes any prior agreement, whether written or oral, relating to the subject matter of this agreement."
+limitation_of_liability: "Limitation of Liability"
+section_6: "To the extent permitted by applicable law, You provide the Contents 'as is' without warranty of any kind, either express or implied, including without limitation any warranties or conditions of merchantability, fitness for a particular purpose, or otherwise."
+section_7: "Subject to any liability that may not be excluded or limited by law, neither You nor OSMF shall be liable for any special, indirect, incidental, consequential, punitive, or exemplary damages under this Agreement, however caused and under any theory of liability. This exclusion applies even if either party has been advised of the possibility of such damages."
+miscellaneous: "Miscellaneous"
+section_8: "This Agreement shall be governed by English law without regard to principles of conflict of law. You agree that the United Nations Convention on Contracts for the International Sale of Goods (1980) is hereby excluded in its entirety from application to this Agreement. In the event of invalidity of any provision of this Agreement, the parties agree that such invalidity shall not affect the validity of the remaining portions of this Agreement. This is the entire agreement between You and OSMF which supersedes any prior agreement, whether written, oral or other, relating to the subject matter of this agreement."
+

config/legales/IT.yml

@@ -1,15 +1,17 @@
 intro: "Ti ringraziamo per la tua disponibilità a fornire dati e/o qualunque altro contenuto (di seguito indicati collettivamente “Contenuti”) al database geografico del progetto OpenStreetMap (di seguito “Progetto”).. Il presente accordo per la contribuzione di dati (di seguito “Accordo”) si conclude fra Te e la OpenStreetMap Foundation (“OSMF”) e disciplina i diritti sui Contenuti che Tu decidi di apportare al progetto."
 next_with_decline: "Leggi per favore le seguenti condizioni generali e premi il tasto “Accetto” o “Rifiuto” posto in fondo al testo per proseguire."
-next_without_decline: "Si prega di leggere attentamente i seguenti termini e condizioni. Se siete d'accordo, fare clic sul pulsante 'Agree' in basso, al fine di continuare. In caso contrario, utilizzare il tasto 'Indietro' del browser web o semplicemente chiudere questa pagina."
+introduction: "Introduzione"
 section_1: "Sei impegnato ad apportare esclusivamente contenuti rispetto ai quali Tu sia titolare dei relativi diritti di autore (nella misura in cui i Contenuti riguardino dati o elementi suscettibili di protezione secondo il diritto di autore). Tu dichiari e garantisci di poter validamente concedere la licenza di cui al successivo Articolo 2 e dichiari e garantisci altresì che tale licenza non viola nessuna legge e/o nessun contratto e, per quanto sia di Tua conoscenza, non viola alcun diritto di terzi. Nel caso Tu non sia titolare dei diritti di autore rispetto ai Contenuti, Tu dichiari e garantisci di avere ricevuto del titolare di tali diritti l’espressa autorizzazione di apportare i Contenuti e concederne la licenza di cui al successivo punto 2."
-section_2: "Diritti concessi. Con il presente Accordo Tu, nei limiti di cui al successivo punto 3, concedi a OSMF in via NON esclusiva una licenza gratuita, valida su tutto il territorio mondiale e di carattere perpetuo e irrevocabile a compiere qualunque atto riservato ai titolari dei diritti di autore sopra i Contenuti e/o qualunque loro singola parte,  da effettuarsi su qualunque supporto e mezzo di comunicazione ivi compresi quelli ulteriori e diversi rispetto all’originale."
+rights_granted: "Diritti concessi"
+section_2: "Con il presente Accordo Tu, nei limiti di cui al successivo punto 3, concedi a OSMF in via NON esclusiva una licenza gratuita, valida su tutto il territorio mondiale e di carattere perpetuo e irrevocabile a compiere qualunque atto riservato ai titolari dei diritti di autore sopra i Contenuti e/o qualunque loro singola parte,  da effettuarsi su qualunque supporto e mezzo di comunicazione ivi compresi quelli ulteriori e diversi rispetto all’originale."
 section_3: "OSMF userà o concederà in sub-licenza i tuoi Contenuti come parte di un database e solamente nel rispetto di una di queste licenze: ODbl 1.0 per quanto riguarda il database e DdCL 1.0 per i contenuti individuali del database; CC-BY-SA 2.0; o una altra licenza gratuita e di carattere aperto. I membri di OMSF potranno scegliere altre licenze gratuite e di carattere aperto, le quali saranno si intenderanno approvate con il voto della maggioranza dei 2/3 dei voti dei contributori attivi."
 active_defn_1: "Per “contributore attivo” deve intendersi:"
 active_defn_2: "una persona fisica (indipendentemente dal fatto che usi uno o più account) con i seguenti requisiti cumulativi: 1) che negli ultimi dodici mesi ha fornito in almeno tre diverse circostanze verificatesi in tre diversi mesi propri Contenuti pubblicati nel Progetto (dimostrando così un interesse continuato nel tempo); 2) che ha sempre mantenuto un valido indirizzo email nel suo profilo di registrazione rispondendo a eventuali messaggi entro tre settimane dal loro invio."
 section_4: "OSMF riconoscerà  la esistenza dei diritti di autore sui Contenuti apportati, e a tal fine indicherà Te o il loro eventuale titolare originario, a scelta di quest’ultimo o Tua. In questo senso verrà attuato un apposito meccanismo di attribuzione, che al momento risulta dalla <a href=\"http://wiki.openstreetmap.org/wiki/Attribution\">pagina web</a>."
 section_5: "Salvo quanto stabilito nel presente Accordo, Tu conservi ogni eventuale altro diritto o prerogativa relativa ai Contenuti da Te apportati."
-section_6: "Limitazione di responsabilità"
-section_6_1: "Nei limiti consentiti dalla legge applicabile, e senza pregiudizio a quanto previsto dal precedente articolo 1; Tu fornisci i Contenuti senza garanzie esplicite o implicite di nessun tipo per quanto riguarda – a titolo esemplificativo – la loro qualità, assenza di vizi o difetti, adeguatezza e conformità al loro scopo o altro."
-section_6_2: "Fatte salve le responsabilità che la legge non permette di escludere o derogare, né Tu né OSMF potranno intendersi responsabili di eventuali danni, siano essi diretti o indiretti, a titolo contrattuale o extracontrattuale, morali o materiali, e a qualunque genere essi appartengano. La presente esclusione di responsabilità sarà valida anche nel caso in cui una delle parti sia stata avvertita della possibilità che tali danni si verifichino."
-section_7: "Varie. Il presente Accordo è disciplinato dalla legge vigente in Inghilterra – Regno Unito, senza possibilità di applicazione delle relative norme di diritto internazionale privato. Si conviene espressamente che al presente Accordo non potrà essere applicata la Convenzione delle Nazioni Unit."
+limitation_of_liability: "Limitazione di responsabilità"
+section_6: "Nei limiti consentiti dalla legge applicabile, e senza pregiudizio a quanto previsto dal precedente articolo 1; Tu fornisci i Contenuti senza garanzie esplicite o implicite di nessun tipo per quanto riguarda – a titolo esemplificativo – la loro qualità, assenza di vizi o difetti, adeguatezza e conformità al loro scopo o altro."
+section_7: "Fatte salve le responsabilità che la legge non permette di escludere o derogare, né Tu né OSMF potranno intendersi responsabili di eventuali danni, siano essi diretti o indiretti, a titolo contrattuale o extracontrattuale, morali o materiali, e a qualunque genere essi appartengano. La presente esclusione di responsabilità sarà valida anche nel caso in cui una delle parti sia stata avvertita della possibilità che tali danni si verifichino."
+miscellaneous: "Varie"
+section_8: "Il presente Accordo è disciplinato dalla legge vigente in Inghilterra – Regno Unito, senza possibilità di applicazione delle relative norme di diritto internazionale privato. Si conviene espressamente che al presente Accordo non potrà essere applicata la Convenzione delle Nazioni Unit."
 

config/locales/af.yml

@@ -1,6 +1,6 @@
 # Messages for Afrikaans (Afrikaans)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Firefishy
 # Author: Naudefj
 # Author: Nroets
@@ -471,7 +471,6 @@ af:
           tower: Toring
           train_station: Spoorwegstasie
           university: Universiteitsgebou
-          "yes": Gebou
         highway: 
           bridleway: Ruiterpad
           bus_stop: Bushalte
@@ -779,11 +778,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
@@ -1026,7 +1021,6 @@ af:
           unclassified: Ongeklassifiseerde pad
           unsurfaced: Grondpad
           wood: Bos
-        heading: Sleutel vir z{{zoom_level}}
     search: 
       search: Soek
       search_help: "voorbeelde: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>meer voorbeelde...</a>"

config/locales/aln.yml

@@ -1,6 +1,6 @@
 # Messages for Gheg Albanian (Gegë)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Albiona
 # Author: Alket
 # Author: Ardian
@@ -552,7 +552,6 @@ aln:
           tower: Kullë
           train_station: Stacion hekurudhor
           university: Universiteti për ndërtim
-          "yes": Ndërtesë
         highway: 
           bridleway: Rruge pa osfallt
           bus_guideway: Lane udhëzoi Autobuseve
@@ -906,12 +905,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
@@ -1233,7 +1228,6 @@ aln:
           unclassified: Udhë e paklasifikume
           unsurfaced: rrugë Unsurfaced
           wood: Druri
-        heading: Legjenda për z{{zoom_level}}
     search: 
       search: Kërko
       search_help: "shembuj: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', ose 'zyrat e postës pranë Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>shembuj më shumë ...</a>"
@@ -1381,7 +1375,6 @@ aln:
       update home location on click: Ndryshoma venin kur të klikoj në hart?
     confirm: 
       button: Konfirmo
-      failure: Ni akount i shfrytzuesit me ket token veqse osht i konfirmum.
       heading: Konfirmo nje akount te shfrytezuesit
       press confirm button: Shtype butonin e konfirmimit ma posht që me mujt me aktivizue akountin e juej
       success: Akounti juaj u konfirmua, ju falemnderit për regjistrim!

config/locales/ar.yml

@@ -1,12 +1,13 @@
 # Messages for Arabic (العربية)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Aude
 # Author: Bassem JARKAS
 # Author: Grille chompa
 # Author: Majid Al-Dharrab
 # Author: Mutarjem horr
 # Author: OsamaK
+# Author: ترجمان05
 ar: 
   activerecord: 
     attributes: 
@@ -222,6 +223,7 @@ ar:
           node: عقدة
           way: طريق
       private_user: مستخدم الخاص
+      show_areas: أظهر المناطق
       show_history: أظهر التاريخ
       unable_to_load_size: "غير قادر على التحميل: حجم مربع الإحاطة [[bbox_size]] كبير جدًا (يجب أن يكون أصغر من {{max_bbox_size}})"
       wait: انتظر...
@@ -557,7 +559,6 @@ ar:
           tower: برج
           train_station: محطة قطار
           university: مبنى جامعة
-          "yes": مبنى
         highway: 
           bridleway: مسلك خيول
           bus_guideway: مسار خاص للحافلات
@@ -915,12 +916,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: ويكي خريطة العالم الحرة
@@ -1240,7 +1237,6 @@ ar:
           unclassified: طريق غير مصنّف
           unsurfaced: طريق غير معبد
           wood: غابة
-        heading: الدليل للدرجة {{zoom_level}}
     search: 
       search: ابحث
       search_help: "أمثلة: 'الحرية'، 'شارع الحمراء, بيروت'، 'مدرسة, القاهرة' <a href='http://http://wiki.openstreetmap.org/wiki/Ar:Search?uselang=ar'>المزيد من الأمثلة...</a>"
@@ -1394,7 +1390,6 @@ ar:
       update home location on click: حدّث موقع المنزل عندما أنقر على الخريطة؟
     confirm: 
       button: أكّد
-      failure: حساب مستخدم قد أُكّد سابقًا بهذا النموذج.
       heading: أكّد حساب المستخدم
       press confirm button: اضغط على زر التأكيد أدناه لتنشيط حسابك.
       success: تم تأكيد حسابك، شكرًا للاشتراك!

config/locales/arz.yml

@@ -1,6 +1,6 @@
 # Messages for Egyptian Spoken Arabic (مصرى)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Meno25
 arz: 
   activerecord: 
@@ -528,7 +528,6 @@ arz:
           tower: برج
           train_station: محطه قطار
           university: مبنى جامعة
-          "yes": مبنى
         highway: 
           bridleway: مسلك خيول
           bus_stop: موقف نزول/صعود من/إلى حافلات
@@ -846,12 +845,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: ويكى خريطه العالم الحرة
@@ -1135,7 +1130,6 @@ arz:
           unclassified: طريق غير مصنّف
           unsurfaced: طريق غير معبد
           wood: غابة
-        heading: الدليل للدرجه {{zoom_level}}
     search: 
       search: ابحث
       search_help: "أمثلة: 'الحرية'، 'شارع الحمراء, بيروت'، 'مدرسة, القاهرة' <a href='http://http://wiki.openstreetmap.org/wiki/Ar:Search?uselang=ar'>المزيد من الأمثله...</a>"
@@ -1266,7 +1260,6 @@ arz:
       update home location on click: حدّث موقع المنزل عندما أنقر على الخريطة؟
     confirm: 
       button: أكّد
-      failure: حساب مستخدم قد أُكّد سابقًا بهذه المعلومات.
       heading: أكّد حساب المستخدم
       press confirm button: اضغط على زر التأكيد أدناه لتنشيط حسابك.
       success: تم تأكيد حسابك، شكرًا للاشتراك!

config/locales/be.yml

@@ -1,6 +1,8 @@
 # Messages for Belarusian (Беларуская)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
+# Author: Jim-by
+# Author: Тест
 be: 
   activerecord: 
     attributes: 
@@ -251,7 +253,7 @@ be:
       embeddable_html: HTML для ўстаўкі
       export_button: Экспарт
       export_details: Дадзеныя праекту OpenStreetMap распаўсюджваюцца па ліцэнзіі <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a>.
-      format: Фармат
+      format: "Фармат:"
       format_to_export: Фармат для экспарту
       image_size: Памер выявы
       latitude: "Шыр:"
@@ -264,7 +266,7 @@ be:
       osm_xml_data: OpenStreetMap XML
       osmarender_image: выява Osmarender
       output: Вывад
-      paste_html: Уставіць HTML для убудовы у вэб-сайт
+      paste_html: Уставіць HTML для ўбудовы у вэб-сайт
       scale: Маштаб
       zoom: маштаб
     start_rjs: 
@@ -306,12 +308,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-карта свету
@@ -571,13 +569,12 @@ be:
       update home location on click: Абнавіць каардэнаты, калі я пстрыкну па карце?
     confirm: 
       button: Пацвердзіць
-      failure: Рахунак карыстальніка з такім ключом ужо пацверджаны.
       heading: Пацверджанне рахунку
       press confirm button: Націсніце кнопку, каб актывізаваць рахунак.
       success: Рахунак пацверджаны, дзякуй за рэгістрацыю!
     confirm_email: 
       button: Пацвердзіць
-      failure: Паштовы адрас ужо быў пацаерджаны гэтым ключом.
+      failure: Паштовы адрас ужо быў пацверджаны гэтым ключом.
       heading: Пацвердзіць змену паштовага адрасу
       press confirm button: Націсніце кнопку, каб пацвердзіць ваш новы паштовы адрас.
       success: Ваш адрас пацверджаны, дзякуй за рэгістрацыю!

config/locales/br.yml

@@ -1,6 +1,6 @@
 # Messages for Breton (Brezhoneg)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Fohanno
 # Author: Fulup
 # Author: Y-M D
@@ -78,6 +78,7 @@ br:
       cookies_needed: Diweredekaet eo an toupinoù ganeoc'h war a seblant - gweredekait an toupinoù en ho merdeer a-raok mont pelloc'h, mar plij.
     setup_user_auth: 
       blocked: Stanket eo bet ho moned d'an API. Kevreit ouzh an etrefas web evit gouzout hiroc'h.
+      need_to_see_terms: Evit ar mare n'oc'h ket aotreet da vont war an API ken. Kevreit d'an etrefas Web da sellet ouzh Termenoù an implijerien. Marteze ne viot ket a-du ganto met ret eo deoc'h bezañ lennet anezho.
   browse: 
     changeset: 
       changeset: "Strollad kemmoù : {{id}}"
@@ -192,6 +193,7 @@ br:
       details: Munudoù
       drag_a_box: Tresit ur voest war ar gartenn evit diuzañ un takad
       edited_by_user_at_timestamp: Aozet gant [[user]] da [[timestamp]]
+      hide_areas: Kuzhat an takadoù
       history_for_feature: Istor evit [[feature]]
       load_data: Kargañ ar roadennoù
       loaded_an_area_with_num_features: Karget hoc'h eus un takad zo ennañ [[num_features]] elfenn. Peurliesañ o devez poan ar merdeerioù o tiskwel kemend-all a roadennoù, ha labourat a reont gwelloc'h pa vez nebeutoc'h a 100 elfenn da ziskwel, a-hend-all e c'hall ho merdeer bezañ gorrek pe chom hep respont. Ma'z oc'h sur hoc'h eus c'hoant da ziskwel ar roadennoù-mañ, e c'hallit ober dre glikañ war ar bouton amañ dindan.
@@ -214,6 +216,7 @@ br:
           node: Skoulm
           way: Hent
       private_user: implijer prevez
+      show_areas: Diskouez an takadoù
       show_history: Diskouez an istor
       unable_to_load_size: "Ne c'haller ket kargañ : re vras eo ment ar voest bevenniñ ([[bbox_size]]). Ret eo dezhi bezañ bihanoc'h eget {{max_bbox_size}})"
       wait: Gortozit...
@@ -282,6 +285,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 +354,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 +388,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: 
@@ -548,7 +565,6 @@ br:
           tower: Tour
           train_station: Porzh-houarn
           university: Savadur Skol-Veur
-          "yes": Savadur
         highway: 
           bridleway: Hent evit ar varc'hegerien
           bus_guideway: Roudenn vus heñchet
@@ -871,16 +887,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 & 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,14 +928,11 @@ 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ñ
+    sotm2011: Kemerit perzh e kendalc'h OpenStreetMap 2011, Stad ar gartenn, d'an 11 a viz Gwengolo e Denver !
     tag_line: Kartenn digoust eus ar bed Wiki
     user_diaries: Deizlevrioù an implijer
     user_diaries_tooltip: Gwelet deizlevrioù an implijerien
@@ -925,10 +945,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: 
@@ -991,6 +1014,9 @@ br:
       title: Lenn ar gemennadenn
       to: Da
       unread_button: Merkañ evel anlennet
+      wrong_user: Kevreet oc'h evel "{{user}}", met ar gemennadenn a fell deoc'h lenn n'eo ket bet kaset na gant na d'an implijer-se. Mar plij kevreit gant ar gont reizh evit gellout lenn anezhi.
+    reply: 
+      wrong_user: Kevreet oc'h evel "{{user}}", met ar gemennadenn a fell deoc'h respont outi n'eo ket bet kaset d'an implijer-se. Mar plij kevreit gant ar gont reizh evit gellout respont.
     sent_message_summary: 
       delete_button: Dilemel
   notifier: 
@@ -1048,6 +1074,7 @@ br:
     signup_confirm: 
       subject: "[OpenStreetMap] Kadarnaat ho chomlec'h postel"
     signup_confirm_html: 
+      ask_questions: Gellout a rit sevel an holl goulennoù ho pefe diwar-benn OpenStreetMap war <a href="http://help.openstreetmap.org/">hol lec'hienn goulennoù-respontoù</a>.
       click_the_link: Ma'z eo c'hwi, degemer mat deoc'h ! Klikit war al liamm amañ dindan evit kadarnaat krouidigezh ho kont ha gouzout hiroc'h diwar-benn OpenStreetMap
       current_user: Ur roll eus an implijerien red dre rummadoù, diazezet war al lec'h m'emaint er bed, a c'haller kaout diwar <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
       get_reading: Muioc'h a ditouroù diwar-benn OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/FR:Beginners_Guide">war ar wiki</a> pe <a href="http://www.opengeodata.org/">war ar blog opengeodata</a> a ginnig ivez  <a href="http://www.opengeodata.org/?cat=13">podskignadennoù da selaou</a> !
@@ -1060,6 +1087,7 @@ br:
       video_to_openstreetmap: video evit kregiñ gant OpenStreetMap
       wiki_signup: Gallout a rit ivez <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">krouiñ ur gont war wiki OpenStreetMap</a>.
     signup_confirm_plain: 
+      ask_questions: "Gellout a rit sevel an holl goulennoù ho pefe diwar-benn OpenStreetMap war hol lec'hienn goulennoù-respontoù :"
       blog_and_twitter: "Tapout ar c'heleier diwezhañ diwar blog OpenStreetMap pe Twitter :"
       click_the_link_1: Ma'z eo c'hwi, degemer mat deoc'h ! Klikit war al liamm amañ dindan evit kadarnaat ho
       click_the_link_2: kont ha lenn muioc'h a ditouroù diwar-benn OpenStreetMap.
@@ -1133,7 +1161,7 @@ br:
       allow_write_prefs: kemmañ o fenndibaboù implijerien.
       authorize_url: "URL aotren :"
       edit: Aozañ ar munudoù
-      key: "Alc'hwez an implijer :"
+      key: "Alc'hwez implijer :"
       requests: "O c'houlenn an aotreoù-mañ digant an implijer :"
       secret: "Sekred an implijer :"
       support_notice: Skorañ a reomp HMAC-SHA1 (erbedet) hag an destenn diaoz er mod ssl.
@@ -1145,8 +1173,11 @@ 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_not_configured: Potlatch 2 n'eo ket bet kefluniet - sellit ouzh http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 da c'houzout hiroc'h
+      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: 
@@ -1158,10 +1189,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
@@ -1228,7 +1260,6 @@ br:
           unclassified: Hent n'eo ket rummet
           unsurfaced: Hent n'eo ket goloet
           wood: Koad
-        heading: Alc'hwez evit z{{zoom_level}}
     search: 
       search: Klask
       search_help: "da skouer : 'Kemper', 'Straed Siam, Brest', 'CB2 5AQ', pe 'tiez-post tost da Roazhon' <a href='http://wiki.openstreetmap.org/wiki/Search'>muioc'h a skouerioù...</a>"
@@ -1301,7 +1332,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 ?
@@ -1344,7 +1375,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)
@@ -1361,6 +1397,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: 
@@ -1379,17 +1416,23 @@ 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
-      failure: Ur gont implijer gant ar jedouer-mañ zo bet kadarnaet dija.
       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ñ.
       heading: Kadarnaat ur c'hemm chomlec'h postel
       press confirm button: Pouezit war ar bouton kadarnaat evit kadarnaat ho chomlec'h postel nevez.
       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: 
@@ -1406,22 +1449,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: Ankouaet ho ker-tremen ganeoc'h ?
+      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 ?
@@ -1443,17 +1493,18 @@ 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.
       heading: N'eus ket eus an implijer {{user}}
-      title: N'eus ket un implijer evel-se
+      title: N'eus implijer ebet evel hemañ
     popup: 
       friend: Mignon
       nearby mapper: Kartennour en ardremez
@@ -1472,16 +1523,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
@@ -1502,6 +1560,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

config/locales/ca.yml

@@ -1,7 +1,8 @@
 # Messages for Catalan (Català)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Jmontane
+# Author: Martorell
 # Author: PerroVerd
 # Author: SMP
 # Author: Ssola
@@ -116,7 +117,13 @@ ca:
     navigation: 
       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}}
@@ -201,6 +208,7 @@ ca:
       zoom_or_select: Ampliar o seleccionar una àrea del mapa per veure
     tag_details: 
       tags: "Etiquetes:"
+      wikipedia_link: L'article {{page}} a la Viquipèdia
     timeout: 
       sorry: Hem trigat massa en obtenir les dades pel tipus {{type}} amb identificador {{id}}.
       type: 
@@ -269,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
@@ -407,12 +422,12 @@ ca:
           industrial: Edifici industrial
           public: Edifici públic
           school: Edifici escolar
+          shop: Botiga
           stadium: Estadi
           store: Magatzem
           tower: Torre
           train_station: Estació de tren
           university: Edifici universitari
-          "yes": Edifici
         highway: 
           bus_stop: Parada d'autobús
           cycleway: Ruta per a bicicletes
@@ -544,13 +559,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
@@ -588,9 +606,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.
@@ -601,7 +622,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
@@ -611,6 +631,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
@@ -670,6 +692,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: 
@@ -722,6 +746,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
@@ -804,12 +831,14 @@ 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:"
       latitude: "Latitud:"
       longitude: "Longitud:"
-      my settings: La meva configuració
+      my settings: Preferències
       new image: Afegir una imatge
       preferred languages: "Llengües preferents:"
       profile description: "Descripció del perfil:"
@@ -872,6 +901,7 @@ ca:
       reset: Restablir contrasenya
       title: Restablir la contrasenya
     terms: 
+      agree: D'acord
       decline: Declinar
       legale_names: 
         france: França
@@ -935,6 +965,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

config/locales/cs.yml

@@ -1,13 +1,16 @@
 # Messages for Czech (Česky)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Bilbo
 # Author: Masox
 # Author: Mormegil
 # Author: Mr. Richard Bolla
+# Author: Veritaslibero
 cs: 
   activerecord: 
     attributes: 
+      diary_comment: 
+        body: Text
       diary_entry: 
         language: Jazyk
         latitude: Šířka
@@ -18,27 +21,33 @@ cs:
         friend: Přítel
         user: Uživatel
       message: 
+        body: Text
         recipient: Příjemce
         sender: Odesílatel
-        title: Nadpis
+        title: Předmět
       trace: 
         description: Popis
         latitude: Šířka
         longitude: Délka
         name: Název
+        public: Veřejná
         size: Velikost
         user: Uživatel
         visible: Viditelnost
       user: 
         active: Aktivní
         description: Popis
+        display_name: Zobrazované jméno
         email: E-mail
         languages: Jazyky
         pass_crypt: Heslo
     models: 
+      acl: Seznam přístupových práv
       changeset: Sada změn
       changeset_tag: Tag sady změn
       country: Země
+      diary_comment: Komentář k deníčku
+      diary_entry: Deníčkový záznam
       friend: Přítel
       language: Jazyk
       message: Zpráva
@@ -55,10 +64,20 @@ cs:
       relation: Relace
       relation_member: Člen relace
       relation_tag: Tag relace
+      trace: Stopa
+      tracepoint: Bod stopy
+      tracetag: Značka stopy
       user: Uživatel
+      user_preference: Uživatelské nastavení
+      user_token: Uživatelský token
       way: Cesta
       way_node: Uzel cesty
       way_tag: Tag cesty
+  application: 
+    require_cookies: 
+      cookies_needed: Vypadá to, že máte zakázány cookies – před pokračováním si je v prohlížeči zapněte.
+    setup_user_auth: 
+      blocked: Váš přístup k API byl zablokován. Další informace zjistíte přihlášením do webového rozhraní.
   browse: 
     changeset: 
       changeset: "Sada změn: {{id}}"
@@ -268,12 +287,17 @@ cs:
   diary_entry: 
     diary_comment: 
       comment_from: Komentář od {{link_user}} z {{comment_created_at}}
+      confirm: Potvrdit
+      hide_link: Skrýt tento komentář
     diary_entry: 
       comment_count: 
         few: "{{count}} komentáře"
         one: 1 komentář
         other: "{{count}} komentářů"
       comment_link: Okomentovat tento zápis
+      confirm: Potvrdit
+      edit_link: Upravit tento záznam
+      hide_link: Skrýt tento záznam
       posted_by: Zapsal {{link_user}} {{created}} v jazyce {{language_link}}
       reply_link: Odpovědět na tento zápis
     edit: 
@@ -285,6 +309,7 @@ cs:
       marker_text: Místo deníčkového záznamu
       save_button: Uložit
       subject: "Předmět:"
+      title: Upravit deníčkový záznam
       use_map_link: použít mapu
     feed: 
       all: 
@@ -300,7 +325,9 @@ cs:
       in_language_title: Deníčkové záznamy v jazyce {{language}}
       new: Nový záznam do deníčku
       new_title: Sepsat nový záznam do vašeho uživatelského deníčku
+      newer_entries: Novější záznamy
       no_entries: Žádné záznamy v deníčku
+      older_entries: Starší záznamy
       recent_entries: "Aktuální deníčkové záznamy:"
       title: Deníčky uživatelů
       user_title: Deníček uživatele {{user}}
@@ -310,6 +337,10 @@ cs:
       view: Zobrazit
     new: 
       title: Nový záznam do deníčku
+    no_such_entry: 
+      body: Je mi líto, ale žádný deníčkový záznam či komentář s ID {{id}} neexistuje. Zkontrolujte překlepy nebo jste možná klikli na chybný odkaz.
+      heading: Záznam s ID {{id}} neexistuje
+      title: Deníčkový záznam nenalezen
     no_such_user: 
       body: Lituji, ale uživatel se jménem {{user}} neexistuje. Zkontrolujte překlepy nebo jste možná klikli na chybný odkaz.
       heading: Uživatel {{user}} neexistuje
@@ -321,6 +352,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
@@ -400,52 +442,81 @@ cs:
           atm: Bankomat
           bank: Banka
           bench: Lavička
+          bicycle_parking: Parkoviště pro kola
           bicycle_rental: Půjčovna kol
+          brothel: Nevěstinec
+          bureau_de_change: Směnárna
           bus_station: Autobusové nádraží
           cafe: Kavárna
+          car_wash: Automyčka
           cinema: Kino
           courthouse: Soud
           crematorium: Krematorium
           dentist: Zubař
+          doctors: Lékař
+          dormitory: Kolej
+          drinking_water: Pitná voda
           driving_school: Autoškola
           embassy: Velvyslanectví
+          fast_food: Rychlé občerstvení
           ferry_terminal: Přístaviště přívozu
+          fire_hydrant: Požární hydrant
           fire_station: Hasičská stanice
           fountain: Fontána
           fuel: Čerpací stanice
           grave_yard: Hřbitov
+          health_centre: Zdravotní středisko
           hospital: Nemocnice
+          hotel: Hotel
           hunting_stand: Posed
+          ice_cream: Zmrzlinárna
           kindergarten: Mateřská škola
           library: Knihovna
+          marketplace: Tržiště
           mountain_rescue: Horská služba
+          nursing_home: Pečovatelský dům
           park: Park
           parking: Parkoviště
+          pharmacy: Lékárna
           place_of_worship: Náboženský objekt
           police: Policie
           post_box: Poštovní schránka
           post_office: Pošta
           prison: Věznice
           pub: Hospoda
+          public_building: Veřejná budova
+          recycling: Tříděný odpad
           restaurant: Restaurace
           retirement_home: Domov důchodců
           school: Škola
+          shelter: Přístřeší
+          studio: Studio
           telephone: Telefonní automat
           theatre: Divadlo
           toilets: Toalety
           townhall: Radnice
+          vending_machine: Prodejní automat
+          veterinary: Veterinární ordinace
+          waste_basket: Odpadkový koš
         boundary: 
           administrative: Administrativní hranice
         building: 
+          church: Kostel
           city_hall: Radnice
+          dormitory: Kolej
           entrance: Vstup do objektu
+          garage: Garáž
           hospital: Nemocniční budova
+          industrial: Průmyslová budova
+          office: Kancelářská budova
           public: Veřejná budova
+          school: Školní budova
           stadium: Stadion
           tower: Věž
           train_station: Železniční stanice
-          "yes": Budova
+          university: Univerzitní budova
         highway: 
+          bridleway: Koňská stezka
           bus_guideway: Autobusová dráha
           bus_stop: Autobusová zastávka
           construction: Silnice ve výstavbě
@@ -455,12 +526,16 @@ cs:
           ford: Brod
           gate: Brána
           living_street: Obytná zóna
+          minor: Vedlejší silnice
           motorway: Dálnice
           motorway_junction: Dálniční křižovatka
           motorway_link: Dálnice
+          path: Pěšina
+          pedestrian: Pěší zóna
           platform: Nástupiště
           primary: Silnice první třídy
           primary_link: Silnice první třídy
+          raceway: Závodní dráha
           residential: Ulice
           secondary: Silnice druhé třídy
           secondary_link: Silnice druhé třídy
@@ -468,23 +543,35 @@ cs:
           services: Dálniční odpočívadlo
           steps: Schody
           tertiary: Silnice třetí třídy
+          track: Cesta
           trunk: Významná silnice
           trunk_link: Významná silnice
+          unclassified: Silnice
           unsurfaced: Nezpevněná cesta
         historic: 
+          archaeological_site: Archeologické naleziště
           battlefield: Bojiště
+          boundary_stone: Hraniční kámen
           building: Budova
           memorial: Památník
           museum: Muzeum
+          ruins: Zřícenina
+          wayside_shrine: Boží muka
           wreck: Vrak
         landuse: 
           allotments: Zahrádkářská kolonie
           cemetery: Hřbitov
+          conservation: Chráněné území
           construction: Staveniště
           landfill: Skládka
           military: Vojenský prostor
+          mountain: Hory
           piste: Sjezdovka
+          quarry: Lom
+          reservoir: Zásobník na vodu
+          residential: Rezidenční oblast
           vineyard: Vinice
+          wetland: Mokřad
         leisure: 
           garden: Zahrada
           golf_course: Golfové hřiště
@@ -506,6 +593,7 @@ cs:
           cave_entrance: Vstup do jeskyně
           cliff: Útes
           coastline: Pobřežní čára
+          crater: Kráter
           fell: See http://wiki.openstreetmap.org/wiki/Tag:natural=fell
           fjord: Fjord
           geyser: Gejzír
@@ -548,31 +636,56 @@ cs:
           town: Město
           village: Vesnice
         railway: 
+          abandoned: Zrušená železniční trať
+          construction: Železnice ve výstavbě
+          disused: Nepoužívaná železniční trať
+          disused_station: Nepoužívaná železniční stanice
           funicular: Lanová dráha
           halt: Železniční zastávka
+          junction: Kolejové rozvětvení
           level_crossing: Železniční přejezd
           light_rail: Rychlodráha
           monorail: Monorail
           narrow_gauge: Úzkorozchodná dráha
+          platform: Železniční nástupiště
+          preserved: Historická železnice
           spur: Železniční vlečka
+          station: Železniční stanice
           subway: Stanice metra
           subway_entrance: Vstup do metra
+          switch: Výhybka
           tram: Tramvajová trať
           tram_stop: Tramvajová zastávka
         shop: 
           bakery: Pekařství
+          bicycle: Cykloobchod
+          books: Knihkupectví
+          butcher: Řeznictví
+          car_repair: Autoservis
+          carpet: Obchod s koberci
+          copyshop: Copycentrum
+          dry_cleaning: Chemická čistírna
+          estate_agent: Realitní kancelář
+          fish: Rybárna
+          florist: Květinářství
+          food: Potraviny
+          funeral_directors: Pohřební služba
           hairdresser: Kadeřnictví
           jewelry: Klenotnictví
+          laundry: Prádelna
           optician: Oční optika
+          outdoor: Outdoorový obchod
+          shoes: Obuvnictví
           toys: Hračkářství
           travel_agency: Cestovní kancelář
+          wine: Vinárna
         tourism: 
           alpine_hut: Vysokohorská chata
           artwork: Umělecké dílo
           attraction: Turistická atrakce
           camp_site: Tábořiště, kemp
           caravan_site: Autokemping
-          chalet: Velká chata
+          chalet: Chalupa
           guest_house: Penzion
           hostel: Hostel
           hotel: Hotel
@@ -586,13 +699,20 @@ cs:
           viewpoint: Místo s dobrým výhledem
           zoo: Zoo
         waterway: 
+          boatyard: Loděnice
+          canal: Kanál
+          dam: Přehrada
           derelict_canal: Opuštěný kanál
+          ditch: Meliorační kanál
           lock: Zdymadlo
           lock_gate: Vrata plavební komory
+          rapids: Peřeje
           river: Řeka
           riverbank: Břeh řeky
+          stream: Potok
           wadi: Vádí
           waterfall: Vodopád
+          weir: Jez
   javascripts: 
     map: 
       base: 
@@ -606,13 +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 & 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ů
@@ -640,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
@@ -698,6 +824,14 @@ cs:
       send_message_to: Poslat novou zprávu uživateli {{name}}
       subject: Předmět
       title: Odeslat zprávu
+    no_such_message: 
+      body: Je mi líto, ale žádná zpráva s tímto ID neexistuje.
+      heading: Zpráva neexistuje
+      title: Zpráva neexistuje
+    no_such_user: 
+      body: Je mi líto, ale žádný uživatel s tímto jménem neexistuje.
+      heading: Uživatel nenalezen
+      title: Uživatel nenalezen
     outbox: 
       date: Datum
       inbox: doručená pošta
@@ -718,6 +852,7 @@ cs:
       reading_your_sent_messages: Čtení odeslaných zpráv
       reply_button: Odpovědět
       subject: Předmět
+      title: Čtení zprávy
       to: Komu
       unread_button: Označit jako nepřečtené
       wrong_user: Jste přihlášeni jako „{{user}}“, ale zpráva, kterou si chcete přečíst, není ani od, ani pro tohoto uživatele. Pokud si ji chcete přečíst, přihlaste se pod správným účtem.
@@ -726,27 +861,89 @@ cs:
     sent_message_summary: 
       delete_button: Smazat
   notifier: 
+    diary_comment_notification: 
+      footer: Také si můžete komentář přečíst na {{readurl}}, komentovat na {{commenturl}} nebo odpovědět na {{replyurl}}
+      header: "{{from_user}} okomentoval váš nedávný záznam v deníčku na OpenStreetMap s předmětem {{subject}}:"
+      hi: Ahoj, uživateli {{to_user}},
+      subject: "[OpenStreetMap] {{user}} okomentoval váš deníčkový záznam"
     email_confirm: 
       subject: "[OpenStreetMap] Potvrzení vaší e-mailové adresy"
+    email_confirm_html: 
+      click_the_link: Pokud jste to byli vy, potvrďte změnu kliknutím na následující odkaz.
+      greeting: Ahoj,
+      hopefully_you: Někdo (snad vy) požádal o změnu e-mailové adresy na serveru {{server_url}} na {{new_address}}.
     email_confirm_plain: 
-      greeting: Dobrý den,
+      click_the_link: Pokud jste to byli vy, potvrďte změnu kliknutím na následující odkaz.
+      greeting: Ahoj,
+      hopefully_you_1: Někdo (snad vy) požádal o změnu e-mailové adresy na serveru
+      hopefully_you_2: "{{server_url}} na {{new_address}}."
     friend_notification: 
       befriend_them: Můžete si ho/ji také přidat jako přítele na {{befriendurl}}.
       had_added_you: "{{user}} si vás na OpenStreetMap přidal(a) jako přítele."
       see_their_profile: Jeho/její profil si můžete prohlédnout na {{userurl}}.
       subject: "[OpenStreetMap] {{user}} si vás přidal jako přítele"
+    gpx_notification: 
+      and_no_tags: a bez štítků
+      and_the_tags: "a následujícími štítky:"
+      failure: 
+        failed_to_import: "se nepodařilo nahrát. Chybové hlášení následuje:"
+        more_info_1: Další informace o chybách při importu GPX a rady, jak se
+        more_info_2: "jim vyhnout, naleznete na:"
+        subject: "[OpenStreetMap] Neúspěšný import GPX"
+      greeting: Ahoj,
+      success: 
+        loaded_successfully: se úspěšně nahrál s {{trace_points}} z možných {{possible_points}} bodů.
+        subject: "[OpenStreetMap] Úspěšný import GPX"
+      with_description: s popisem
+      your_gpx_file: Vypadá to, že váš GPX soubor
     lost_password: 
       subject: "[OpenStreetMap] Žádost o nové heslo"
     lost_password_html: 
       click_the_link: Pokud tedy chcete, kliknutím na níže uvedený odkaz získáte nové heslo.
+      greeting: Ahoj,
       hopefully_you: Někdo (patrně vy) požádal o vygenerování nového hesla pro uživatele serveru openstreetmap.org s touto e-mailovou adresou.
+    lost_password_plain: 
+      click_the_link: Pokud tedy chcete, kliknutím na níže uvedený odkaz získáte nové heslo.
+      greeting: Ahoj,
+      hopefully_you_1: Někdo (patrně vy) požádal o vygenerování nového hesla pro uživatele
+      hopefully_you_2: serveru openstreetmap.org s touto e-mailovou adresou.
     message_notification: 
       footer1: Také si můžete zprávu přečíst na {{readurl}}
       footer2: a můžete odpovědět na {{replyurl}}
       header: "{{from_user}} vám poslal(a) prostřednictvím OpenStreetMap zprávu s předmětem {{subject}}:"
       hi: Dobrý den, uživateli {{to_user}},
+    signup_confirm: 
+      subject: "[OpenStreetMap] Potvrzení vaší e-mailové adresy"
+    signup_confirm_html: 
+      ask_questions: Libovolné otázky k OpenStreetMap můžete klást na našem <a href="http://help.openstreetmap.org/">webu otázek a odpovědí</a>.
+      click_the_link: Pokud jste to vy, vítejte! Kliknutím na následující odkaz potvrdíte svůj účet, níže se dozvíte další informace o OpenStreetMap.
+      current_user: Seznam existujících uživatelů v kategoriích podle místa bydliště je dostupný v <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">kategorii Users by geographical region</a>.
+      get_reading: Přečtěte si něco o OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Cz:Beginners_Guide">na wiki</a>, sledujte aktuální dění na našem <a href="http://blog.openstreetmap.org/">blogu</a> či <a href="http://twitter.com/openstreetmap">Twitteru</a> nebo si projděte blog zakladatele OpenStreetMap Steva Coasta <a href="http://www.opengeodata.org/">OpenGeoData</a> se stručnou historií projektu i ve formě <a href="http://www.opengeodata.org/?cat=13">podcastů</a>!
+      greeting: Ahoj!
+      hopefully_you: Někdo (snad vy) si chce založit účet na
+      introductory_video: Můžete si prohlédnout {{introductory_video_link}}.
+      more_videos: Máme i {{more_videos_link}}.
+      more_videos_here: další videa
+      user_wiki_page: Doporučujeme, abyste si na wiki založili uživatelskou stránku, na které kategoriemi označíte, odkud pocházíte, například <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Praha">[[Category:Users in Praha]]</a>.
+      video_to_openstreetmap: úvodní video k OpenStreetMap
+      wiki_signup: Také se můžete chtít <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Cz:Main_Page&uselang=cs">zaregistrovat na OpenStreetMap wiki</a>.
     signup_confirm_plain: 
+      ask_questions: "Libovolné otázky k OpenStreetMap můžete klást na našem webu otázek a odpovědí:"
+      blog_and_twitter: "Sledujte aktuální dění na našem blogu či Twitteru:"
+      click_the_link_1: Pokud jste to vy, vítejte! Kliknutím na následující odkaz potvrdíte
+      click_the_link_2: svůj účet, níže se dozvíte další informace o OpenStreetMap.
+      current_user_1: Seznam existujících uživatelů v kategoriích podle místa bydliště
+      current_user_2: "je dostupný na:"
+      greeting: Ahoj!
+      hopefully_you: Někdo (snad vy) si chce založit účet na
+      introductory_video: "Můžete si prohlédnout úvodní video k OpenStreetMap:"
+      more_videos: "Další videa najdete na:"
+      opengeodata: "OpenGeoData.org je blog zakladatele OpenStreetMap Steva Coasta, nabízí i podcasty:"
+      the_wiki: "Přečtěte si něco o OpenStreetMap na wiki:"
       the_wiki_url: http://wiki.openstreetmap.org/wiki/Cs:Beginners_Guide?uselang=cs
+      user_wiki_1: Doporučujeme, abyste si na wiki založili uživatelskou stránku, na které
+      user_wiki_2: kategoriemi označíte, odkud pocházíte, například [[Category:Users in Praha]].
+      wiki_signup: "Také se můžete chtít zaregistrovat na OpenStreetMap wiki:"
       wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&type=signup&returnto=Cs:Main_Page&uselang=cs
   oauth: 
     oauthorize: 
@@ -808,7 +1005,14 @@ cs:
       flash: Klientské informace úspěšně aktualizovány
   site: 
     edit: 
+      anon_edits_link_text: Proč to tak je?
       flash_player_required: Pokud chcete používat Potlatch, flashový editor OpenStreetMap, potřebujete přehrávač Flashe. Můžete si <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">stáhnout Flash Player z Adobe.com</a>. Pro editaci OpenStreetMap existuje <a href="http://wiki.openstreetmap.org/wiki/Editing">mnoho dalších možností</a>.
+      no_iframe_support: Váš prohlížeč nepodporuje vložené HTML rámy (iframes), které jsou pro tuto funkci nezbytné.
+      not_public: Nenastavili jste své editace jako veřejné.
+      not_public_description: Dokud tak neučiníte, nemůžete editovat mapu. Své editace můžete zveřejnit na {{user_page}}.
+      potlatch2_unsaved_changes: Máte neuložené změny. (V Potlatch 2 se ukládá kliknutím na tlačítko.)
+      potlatch_unsaved_changes: Máte neuložené změny. (V Potlatchi odznačte aktuální cestu nebo bod, pokud editujete v živém režimu, nebo klikněte na tlačítko uložit, pokud tam je.)
+      user_page_link: uživatelské stránce
     index: 
       js_1: Buď používáte prohlížeč bez podpory JavaScriptu, nebo máte JavaScript zakázaný.
       js_2: OpenStreetMap používá pro svou interaktivní mapu JavaScript.
@@ -818,10 +1022,11 @@ cs:
         notice: Nabízeno pod licencí {{license_name}}, vytvořeno přispěvateli {{project_name}}.
         project_name: projektu OpenStreetMap
       permalink: Trvalý odkaz
+      remote_failed: Editace se nezdařila – ujistěte se, že JOSM nebo Merkaartor běží a je zapnuto dálkové ovládání
       shortlink: Krátký odkaz
     key: 
       map_key: Legenda
-      map_key_tooltip: Legenda pro vykreslení mapnikem na této úrovni přiblížení
+      map_key_tooltip: Legenda k mapě
       table: 
         entry: 
           admin: Administrativní hranice
@@ -888,7 +1093,6 @@ cs:
           unclassified: Silnice
           unsurfaced: Nezpevněná cesta
           wood: Les
-        heading: Legenda pro z{{zoom_level}}
     search: 
       search: Hledat
       search_help: "příklady: „Příbram“, „Havlíčkova, Plzeň“, „CB2 5AQ“, nebo „post offices near Mělník“ <a href='http://wiki.openstreetmap.org/wiki/Search'>další příklady…</a>"
@@ -1026,6 +1230,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: 
@@ -1043,32 +1248,52 @@ cs:
       title: Upravit účet
       update home location on click: Upravit pozici domova při kliknutí na mapu?
     confirm: 
+      already active: Tento uživatelský účet už byl potvrzen.
+      before you start: Víme, že se asi nemůžete dočkat, až začnete mapovat, ale předtím byste mohli chtít v následujícím formuláři vyplnit několik informaci o sobě.
       button: Potvrdit
+      heading: Potvrzení uživatelského účtu
+      press confirm button: Svůj účet aktivujte stisknutím níže zobrazeného tlačítka.
+      reconfirm: Pokud již od registrace uběhl nějaký čas, možná si budete muset <a href="{{reconfirm}}">nechat poslat nový potvrzovací e-mail</a>.
+      success: Účet potvrzen, děkujeme za registraci!
+      unknown token: Zadaný potvrzovací kód neexistuje.
     confirm_email: 
       button: Potvrdit
       failure: Tento kód byl už pro potvrzení e-mailové adresy použit.
       heading: Potvrzení změny e-mailové adresy
       press confirm button: Pro potvrzení nové e-mailové adresy klikněte na níže zobrazené tlačítko.
       success: Vaše e-mailová adresa byla potvrzena, děkujeme za registraci!
+    confirm_resend: 
+      failure: Uživatel {{name}} neexistuje.
+      success: Poslali jsme na {{email}} novou potvrzovací zprávu, jakmile potvrdíte svůj účet, budete moci začít tvořit mapy.<br /><br />Pokud používáte nějaký protispamový systém, který vyžaduje potvrzení, nezapomeňte zařídit výjimku pro webmaster@openstreetmap.org, neboť na žádosti o potvrzení nejsme schopni reagovat.
     filter: 
       not_an_administrator: K provedení této akce musíte být správce.
     list: 
+      confirm: Potvrdit vybrané uživatele
       heading: Uživatelé
+      showing: 
+        one: Zobrazuje se stránka {{page}} ({{first_item}} z {{items}})
+        other: Zobrazuje se stránka {{page}} ({{first_item}}–{{last_item}} z {{items}})
+      summary_no_ip: "{{name}} vytvořeno {{date}}"
       title: Uživatelé
     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.
+      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
@@ -1094,7 +1319,7 @@ cs:
       display name description: Vaše veřejně zobrazované uživatelské jméno. Můžete si ho později změnit ve svém nastavení.
       email address: "E-mailová adresa:"
       fill_form: Vyplňte následující formulář a my vám pošleme stručný e-mail, jak si účet aktivovat.
-      flash create success message: Uživatel byl úspěšně zaregistrován. Podívejte se do své e-mailové schránky na potvrzovací zprávu a budete tvořit mapy cobydup. :-)<br /><br />Uvědomte si, že dokud nepotvrdíte svou e-mailovou adresu, nebudete se moci přihlásit.<br /><br />Pokud používáte nějaký protispamový systém, který vyžaduje potvrzení, nezapomeňte zařídit výjimku pro webmaster@openstreetmap.org, neboť na žádosti o potvrzení nejsme schopni reagovat.
+      flash create success message: Děkujeme za registraci. Na {{email}} jsme poslali potvrzovací zprávu, jakmile potvrdíte svůj účet, budete moci začít tvořit mapy.<br /><br />Pokud používáte nějaký protispamový systém, který vyžaduje potvrzení, nezapomeňte zařídit výjimku pro webmaster@openstreetmap.org, neboť na žádosti o potvrzení nejsme schopni reagovat.
       heading: Vytvořit uživatelský účet
       license_agreement: Při potvrzení účtu budete muset souhlasit s <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">podmínkami pro přispěvatele</a>.
       no_auto_account_create: Bohužel za vás momentálně nejsme schopni vytvořit účet automaticky.
@@ -1142,12 +1367,18 @@ cs:
       read and accept: Přečtěte si prosím níže zobrazenou dohodu a klikněte na tlačítko souhlasu, čímž potvrdíte, že přijímáte podmínky této dohody pro stávající i budoucí příspěvky.
       title: Podmínky pro přispěvatele
     view: 
+      activate_user: aktivovat tohoto uživatele
       add as friend: přidat jako přítele
       ago: (před {{time_in_words_ago}})
       block_history: zobrazit zablokování
       blocks by me: zablokování mnou
       blocks on me: moje zablokování
       confirm: Potvrdit
+      confirm_user: potvrdit tohoto uživatele
+      create_block: blokovat tohoto uživatele
+      created from: "Vytvořeno od:"
+      deactivate_user: deaktivovat tohoto uživatele
+      delete_user: odstranit tohoto uživatele
       description: Popis
       diary: deníček
       edits: editace
@@ -1155,6 +1386,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í
@@ -1168,9 +1400,21 @@ cs:
       no nearby users: Nejsou známi žádní uživatelé, kteří by uvedli domov blízko vás.
       oauth settings: nastavení oauth
       remove as friend: odstranit jako přítele
+      role: 
+        administrator: Tento uživatel je správce
+        grant: 
+          administrator: Přidělit práva správce
+          moderator: Přidělit práva moderátora
+        moderator: Tento uživatel je moderátor
+        revoke: 
+          administrator: Odebrat práva správce
+          moderator: Odebrat práva moderátora
       send message: poslat zprávu
       settings_link_text: nastavení
+      spam score: "Spam skóre:"
+      status: "Stav:"
       traces: stopy
+      unhide_user: zobrazit tohoto uživatele
       user location: Pozice uživatele
       your friends: Vaši přátelé
   user_block: 

config/locales/de.yml

@@ -1,6 +1,6 @@
 # Messages for German (Deutsch)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Als-Holder
 # Author: Apmon
 # Author: Avatar
@@ -8,8 +8,11 @@
 # Author: Candid Dauth
 # Author: ChrisiPK
 # Author: CygnusOlor
+# Author: Fujnky
 # Author: Grille chompa
 # Author: Holger
+# Author: John07
+# Author: Katpatuka
 # Author: Kghbln
 # Author: Markobr
 # Author: McDutchie
@@ -93,6 +96,7 @@ de:
       cookies_needed: Es scheint als hättest du Cookies ausgeschaltet. Bitte aktiviere Cookies bevor du weiter gehst.
     setup_user_auth: 
       blocked: Dein Zugriff auf die API wurde gesperrt. Bitte melde dich auf der Web-Oberfläche an, um mehr zu erfahren.
+      need_to_see_terms: Dein Zugriff auf die API wurde vorübergehend ausgesetzt. Bitte melde Dich in Deinem Benutzerkonto an, um die „Bedingungen für Mitwirkende“ einzusehen. Du musst nicht einverstanden sein, aber Du musst sie gesehen haben.
   browse: 
     changeset: 
       changeset: "Changeset: {{id}}"
@@ -207,6 +211,7 @@ de:
       details: Details
       drag_a_box: Einen Rahmen über die Karte aufziehen, um einen Bereich auszuwählen
       edited_by_user_at_timestamp: Bearbeitet von [[user]] am [[timestamp]]
+      hide_areas: Gebiete ausblenden
       history_for_feature: Chronik für [[feature]]
       load_data: Daten laden
       loaded_an_area_with_num_features: Du hast einen Bereich geladen, der [[num_features]] Elemente enthält. Manche Browser haben Probleme bei der Darstellung einer so großen Datenmenge. Normalerweise ist es am besten, nur weniger als 100 Elemente zu betrachten; alles andere macht deinen Browser langsam bzw. lässt ihn nicht mehr auf Eingaben reagieren. Wenn du sicher bist, dass du diese Daten darstellen willst, klicke auf „Daten laden“ unten.
@@ -229,6 +234,7 @@ de:
           node: Knoten
           way: Weg
       private_user: Anonymer Benutzer
+      show_areas: Gebiete einblenden
       show_history: Chronik
       unable_to_load_size: "Konnte nicht geladen werden: Bereich der Größe [[bbox_size]] ist zu groß (soll kleiner als {{max_bbox_size}} sein)"
       wait: Verarbeiten …
@@ -366,6 +372,17 @@ de:
       save_button: Speichern
       title: "{{user}}s Blog | {{title}}"
       user_title: "{{user}}s Blog"
+  editor: 
+    default: Standard (derzeit {{name}})
+    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
@@ -478,7 +495,7 @@ de:
           ferry_terminal: Fähren-Anlaufstelle
           fire_hydrant: Hydrant
           fire_station: Feuerwehr
-          fountain: Brunnen
+          fountain: Springbrunnen
           fuel: Tankstelle
           grave_yard: Friedhof
           gym: Fitness-Zentrum
@@ -527,7 +544,7 @@ de:
           toilets: WC
           townhall: Rathaus
           university: Universität
-          vending_machine: Automat
+          vending_machine: Selbstbedienungsautomat
           veterinary: Tierarzt
           village_hall: Gemeindezentrum
           waste_basket: Mülleimer
@@ -566,7 +583,6 @@ de:
           tower: Turm
           train_station: Bahnhof
           university: Universitätsgebäude
-          "yes": Gebäude
         highway: 
           bridleway: Reitweg
           bus_guideway: Busspur
@@ -590,7 +606,7 @@ de:
           primary: Primärstraße
           primary_link: Primärauffahrt
           raceway: Rennweg
-          residential: Ortsgebiet
+          residential: Wohnstraße
           road: Straße
           secondary: Landstraße
           secondary_link: Landstraße
@@ -889,16 +905,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
@@ -923,14 +946,11 @@ 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
+    sotm2011: Besuche die OpenStreetMap-Konferenz 201 „The State of the Map“ vom 9. bis 11. September in Denver!
     tag_line: Die freie Wiki-Weltkarte
     user_diaries: Blogs
     user_diaries_tooltip: Benutzer-Blogs lesen
@@ -940,6 +960,7 @@ de:
     welcome_user_link_tooltip: Eigene Benutzerseite
     wiki: Wiki
     wiki_title: Wiki des Projekts
+    wiki_url: http://wiki.openstreetmap.org/wiki/DE:Main_Page
   license_page: 
     foreign: 
       english_link: dem englischsprachigen Original
@@ -1075,13 +1096,13 @@ de:
       ask_questions: Du kannst jegliche Fragen zu OpenStreetMap auf unserer Website mit <a href="http://help.openstreetmap.org/">Fragen und Antworten</a> stellen.
       click_the_link: Wenn du das bist, Herzlich Willkommen! Bitte klicke auf den folgenden Link unter dieser Zeile um dein Benutzerkonto zu bestätigen. Lies danach weiter, denn es folgen mehr Informationen über OSM.
       current_user: Ebenso ist <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">eine Liste mit allen Benutzern in einer Kategorie</a>, die anzeigt wo diese auf der Welt sind, verfügbar.
-      get_reading: Weitere Informationen über OpenStreetMap findest du in <a href="http://wiki.openstreetmap.org/wiki/DE:Beginners_Guide">unserem Wiki</a>, informiere dich über die neusten Nachrichten über das <a href="http://blog.openstreetmap.org/">OpenStreetMap-Blog</a> oder <a href="http://twitter.com/openstreetmap">Twitter</a>, oder besuche das <a href="http://www.opengeodata.org/">OpenGeoData-Blog</a> von OpenStreetMap-Gründer Steve Coast für die gekürzte Geschichte des Projektes, dort werden auch <a href="http://www.opengeodata.org/?cat=13">Podcasts zum Hören</a> angeboten.
+      get_reading: Auf <a href="http://www.openstreetmap.de/willkommen/">dieser Seite findest du einige nützliche Links und Informationen</a>, die dir den Einstieg erleichtern werden.
       greeting: Hallo!
       hopefully_you: Jemand (hoffentlich du) möchte ein Benutzerkonto erstellen für
       introductory_video: Du kannst dir das {{introductory_video_link}} anschauen.
       more_videos: Darüber hinaus gibt es noch viele weitere {{more_videos_link}}.
       more_videos_here: Videos über OpenStreetMap
-      user_wiki_page: Es wird begrüßt, wenn du eine Wiki-Benutzerseite erstellst. Bitte füge auch ein Kategorie-Tag ein, das deinen Standort anzeigt, zum Beispiel <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_München">[[Category:Users_in_München]]</a>.
+      user_wiki_page: Es wird begrüßt, wenn du eine Wiki-Benutzerseite erstellst. Bitte füge auch ein Kategorie-Tag ein, das deinen Standort anzeigt, zum Beispiel <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Berlin">[[Category:Users_in_Berlin]]</a>.
       video_to_openstreetmap: Einführungsvideo zu OpenStreetMap
       wiki_signup: Im <a href="http://wiki.openstreetmap.org/wiki/Hauptseite">Wiki von OpenStreetMap</a> kannst du dich ebenfalls <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup">registrieren</a>.
     signup_confirm_plain: 
@@ -1173,8 +1194,11 @@ de:
     edit: 
       anon_edits_link_text: Hier findest du mehr Infos dazu.
       flash_player_required: Du benötigst den Flash Player um Potlatch, den OpenStreetMap-Flash-Editor zu benutzen. <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">Lade den Flash Player von Adobe.com herunter</a>. <a href="http://wiki.openstreetmap.org/wiki/DE:Editing">Einige andere Möglichkeiten</a>, um OpenStreetMap zu editieren, sind hier beschrieben.
+      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_not_configured: Potlatch 2 wurde nicht konfiguriert - Bitte besuche http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 für weitere Informationen
+      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: 
@@ -1182,14 +1206,15 @@ de:
       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.
       license: 
-        license_name: Creative Commons Attribution-Share Alike 2.0
+        license_name: Creative Commons „Namensnennung, Weitergabe unter gleichen Bedingungen 2.0“
         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
-      map_key_tooltip: Legende für die Mapnik-Karte bei diesem Zoom-Level
+      map_key_tooltip: Legende zur Karte
       table: 
         entry: 
           admin: Landesgrenzen, sonstige Grenzen
@@ -1256,7 +1281,6 @@ de:
           unclassified: Straße
           unsurfaced: Unbefestigte Straße
           wood: Naturwald
-        heading: Legende für Zoomstufe {{zoom_level}}
     search: 
       search: Suchen
       search_help: "Beispiele: „München“, „Heinestraße, Würzburg“, „CB2 5AQ“, oder „post offices near Lünen“ <a href='http://wiki.openstreetmap.org/wiki/Search'>mehr Beispiele …</a>"
@@ -1268,7 +1292,7 @@ de:
       search_results: Suchergebnisse
   time: 
     formats: 
-      friendly: "%e %B %Y um %H:%M"
+      friendly: "%e. %B %Y um %H:%M"
   trace: 
     create: 
       trace_uploaded: Deine GPX-Datei wurde hochgeladen und wartet auf die Aufnahme in die Datenbank. Dies geschieht normalerweise innerhalb einer halben Stunde, anschließend wird dir eine Bestätigungs-E-Mail gesendet.
@@ -1395,6 +1419,7 @@ de:
       new email address: "Neue E-Mail Adresse:"
       new image: Bild einfügen
       no home location: Du hast noch keinen Standort angegeben.
+      preferred editor: "Bevorzugten Editor:"
       preferred languages: "Bevorzugte Sprachen:"
       profile description: "Profil-Beschreibung:"
       public editing: 
@@ -1413,17 +1438,23 @@ de:
       title: Benutzerkonto bearbeiten
       update home location on click: Standort bei Klick auf die Karte aktualisieren?
     confirm: 
+      already active: Dieses Benutzerkonto wurde bereits bestätigt.
+      before you start: Wir wissen, dass du es kaum erwarten kannst mit dem Kartieren anzufangen, allerdings solltest du vorher noch ein paar Informationen zu dir im unten folgenden Formular angeben.
       button: Bestätigen
-      failure: Ein Benutzeraccount wurde bereits mit diesem Link bestätigt.
       heading: Benutzerkonto bestätigen
       press confirm button: Benutzerkonto aktivieren, indem du auf den Bestätigungsbutton klickst.
-      success: Dein Benutzeraccount wurde bestätigt, danke fürs Registrieren!
+      reconfirm: Sofern seit deiner Registrierung schon etwas Zeit vergangen ist, musst du gegebenenfalls selber <a href="{{reconfirm}}">eine neue Bestätigungs-E-Mail senden</a>.
+      success: "Dein Benutzerkonto wurde bestätigt, danke fürs Registrieren!\n<br /><br />\nAuf <a href=\"http://www.openstreetmap.de/willkommen/\">dieser Seite</a> findest du nützliche Links und Informationen, die dir den Einstieg erleichtern."
+      unknown token: Dieser Token scheint nicht zu existieren.
     confirm_email: 
       button: Bestätigen
       failure: Eine E-Mail-Adresse wurde bereits mit diesem Link bestätigt.
       heading: Änderung der E-Mail-Adresse bestätigen
       press confirm button: Neue E-Mail-Adresse bestätigen, indem du auf den Bestätigungsbutton klickst.
       success: Deine E-Mail-Adresse wurde bestätigt, danke fürs Registrieren!
+    confirm_resend: 
+      failure: Benutzer {{name}} konnte nicht gefunden werden.
+      success: Wir haben eine neue Bestätigungsnachricht an {{email}} gesendet. Sobald du dein Benutzerkonto bestätigt hast, kannst du mit dem Kartieren anfangen.<br /><br />Sofern du ein Antispamsystem nutzt, das selbst Bestätigungen anfordert, musst du <webmaster@openstreetmap.org> auf dessen Positivliste setzten, da wir auf keine Bestätigungsanfragen reagieren können.
     filter: 
       not_an_administrator: Du must ein Administrator sein um das machen zu dürfen
     go_public: 
@@ -1440,19 +1471,24 @@ de:
       summary_no_ip: "{{name}} erstellt am {{date}}"
       title: Benutzer
     login: 
-      account not active: Leider ist dein Benutzerkonto noch nicht aktiv.<br />Bitte aktivierte dein Benutzerkonto, indem du auf den Link in deiner Bestätigungs-E-Mail klickst.
+      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
@@ -1479,9 +1515,9 @@ de:
       display name description: Dein öffentlich angezeigter Benutzername. Er kann später in den Einstellungen geändert werden.
       email address: "E-Mail-Adresse:"
       fill_form: Fülle das Formular aus und dir wird eine kurze E-Mail zur Aktivierung deines Benutzerkontos geschickt.
-      flash create success message: Benutzerkonto wurde erfolgreich erstellt. Ein Bestätigungslink wurde dir per E-Mail zugesendet, bitte bestätige diesen und du kannst mit dem Mappen beginnen.<br /><br />Du kannst dich nicht einloggen bevor du deine E-Mail-Adresse mit dem Bestätigungslink bestätigt hast.<br /><br />Falls du einen Spam-Blocker nutzt, der Bestätigungsanfragen sendet, dann setze bitte webmaster@openstreetmap.org auf deine Whitelist, weil wir auf keine Bestätigungsanfrage antworten können.
+      flash create success message: "\nVielen Dank für deine Registrierung. Wir haben eine Bestätigungsnachricht an {{email}} gesendet. Sobald du dein Benutzerkonto bestätigt hast, kannst du mit dem Kartieren anfangen.<br /><br />Sofern du ein Antispamsystem nutzt, das selbst Bestätigungen anfordert, musst du <webmaster@openstreetmap.org> auf dessen Positivliste setzten, da wir auf keine Bestätigungsanfragen reagieren können."
       heading: Ein Benutzerkonto erstellen
-      license_agreement: Wenn du dein Benutzerkonto bestätigst, musst du auch den <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">Bedigungen für Mitwirkende</a> zustimmen.
+      license_agreement: Wenn du dein Benutzerkonto bestätigst, musst du auch den <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">Bedingungen für Mitwirkende</a> zustimmen.
       no_auto_account_create: Im Moment ist das automatische Erstellen eines Benutzerkontos leider nicht möglich.
       not displayed publicly: Nicht öffentlich sichtbar (<a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy">Datenschutzrichtlinie</a>)
       password: "Passwort:"
@@ -1546,6 +1582,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
@@ -1628,7 +1665,7 @@ de:
       sorry: Entschuldigung, die Sperre mit der ID {{id}} konnte nicht gefunden werden.
     partial: 
       confirm: Bist du sicher?
-      creator_name: Ersteller
+      creator_name: Urheber
       display_name: Gesperrter Benutzer
       edit: Bearbeiten
       not_revoked: (nicht aufgehoben)

config/locales/dsb.yml

@@ -1,6 +1,6 @@
 # Messages for Lower Sorbian (Dolnoserbski)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Michawiki
 dsb: 
   activerecord: 
@@ -359,6 +359,17 @@ dsb:
       save_button: Składowaś
       title: Dnjownik {{user}} | {{title}}
       user_title: dnjownik wužywarja {{user}}
+  editor: 
+    default: Standard (tuchylu {{name}})
+    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ś
@@ -559,7 +570,6 @@ dsb:
           tower: Torm
           train_station: Dwórnišćo
           university: Uniwersitne twarjenje
-          "yes": Twarjenje
         highway: 
           bridleway: Rejtarska drožka
           bus_guideway: Jězdna kólej kólejowego busa
@@ -882,14 +892,24 @@ 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_centre: Centrum pomocy
+    help_title: Sedło pomocy za projekt
     history: Historija
     home: domoj
     home_tooltip: K stojnišćoju
@@ -915,12 +935,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
@@ -930,6 +946,8 @@ dsb:
     view_tooltip: Kórtu se woglědaś
     welcome_user: Witaj, {{user_link}}
     welcome_user_link_tooltip: Twój wužywarski bok
+    wiki: Wiki
+    wiki_title: Wikisedło za projekt
   license_page: 
     foreign: 
       english_link: engelskim originalom
@@ -1062,6 +1080,7 @@ dsb:
     signup_confirm: 
       subject: "[OpenStreetMap] Twóju e-mailowu adresu wobkšuśiś"
     signup_confirm_html: 
+      ask_questions: Móžoš se za něcym wó OpenStreetMap na našom sedle <a href="http://help.openstreetmap.org/">Pšašanja a wótegrona</a> pšašaś.
       click_the_link: Jolic ty to sy, witaj! Klikni pšosym dołojce na wótkaz, aby wobkšuśił toś to konto a cytaj dalej za dalšne informacije wo OpenStreetMap
       current_user: Lisćina aktualnych wužywarjow w kategorijach pó jich městnje w swěśe stoj pód <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a> k dispoziciji.
       get_reading: Dalšne informacije wó OpenStreetMap namakajoš <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">na wikiju</a>, zastaraj se z nejnowšymi powěsćami pśez <a href="http://blog.openstreetmap.org/">blog OpenStreetMap</a> abo <a href="http://twitter.com/openstreetmap">Twitter</a>, abo pśecytaj <a href="http://www.opengeodata.org/">blog 0penGeoData</a> załožarja OpenStreetMap Steve Coast za historiju projekta, kótaryž ma teke <a href="http://www.opengeodata.org/?cat=13">podkasty</a>!
@@ -1074,6 +1093,7 @@ dsb:
       video_to_openstreetmap: zapokazańske wideo wó OpenStreetMap
       wiki_signup: Móžoš se teke <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">na wikiju OpenStreetMap registrěrowaś</a>.
     signup_confirm_plain: 
+      ask_questions: "Móžoš se za něcym wó OpenStreetMap  na našom sedle Pšašanja a wótegrona pšašaś:"
       blog_and_twitter: "Zastaraj se z nejnowšymi powěsćami pśez blog OpenStreetMap abo Twitter:"
       click_the_link_1: Jolic ty to sy, witaj! Pšosym klikni dołojce na wótkaz, aby wobkšuśił swójo
       click_the_link_2: konto a cytaj dalej za dalšne informacije wo OpenStreetMap.
@@ -1159,8 +1179,10 @@ dsb:
     edit: 
       anon_edits_link_text: Wuslěź, cogodla tomu tak jo.
       flash_player_required: Trjebaš wótegrajadło Flash, aby wužywał Potlatch, editor Flash OpenStreetMap. Móžoš <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">wótegrajadło Flash z Adobe.com ześěgnuś</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Někotare druge móžnosći</a> stoje teke za wobźěłowanje OpenStreetMap k dispoziciji.
+      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: 
@@ -1172,10 +1194,11 @@ 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
-      map_key_tooltip: Legenda za kórtu Mapnik na toś tom skalěrowańskem měritku
+      map_key_tooltip: Legenda za kórtu
       table: 
         entry: 
           admin: Zastojnstwowa granica
@@ -1242,7 +1265,6 @@ dsb:
           unclassified: Njeklasificěrowana droga
           unsurfaced: Njewobtwarźona droga
           wood: Lěs
-        heading: Legenda za skalěrowanje {{zoom_level}}
     search: 
       search: Pytaś
       search_help: "pśikłady: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', abo 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>dalšne pśikłady...</a>"
@@ -1380,6 +1402,7 @@ dsb:
       new email address: "Nowa e-mailowa adresa:"
       new image: Wobraz pśidaś
       no home location: Njejsy swóje bydlišćo zapódał.
+      preferred editor: "Preferěrowany editor :"
       preferred languages: "Preferěrowane rěcy:"
       profile description: "Profilowe wopisanje:"
       public editing: 
@@ -1398,17 +1421,23 @@ dsb:
       title: Konto wobźěłaś
       update home location on click: Bydlišćo pśi kliknjenju na kórtu aktualizěrowaś?
     confirm: 
+      already active: Toś te konto jo se južo wobkšuśiło.
+      before you start: Wěmy, až nejskerjej njamóžoš docakaś kartěrowanje zachopiś, ale ty by měł nejpjerwjej někotare informacije wó sebje w slědujucem formularje pódaś.
       button: Wobkšuśiś
-      failure: Wužywarske konto z toś tym wótkazom jo se južo wobkšuśiło.
       heading: Wužywarske konto wobkšuśiś
       press confirm button: Klikni dołojce na wobkšuśeński tłocašk, aby aktiwěrował swójo konto.
+      reconfirm: Jolic jo se južo něco casa minuło, wót togo casa ako sy se zregistrěrował, musyš ewentuelnje sam <a href="{{reconfirm}}">nowu wobkšuśeńsku e-mail pósłaś</a>.
       success: Twójo konto jo se wobkšuśiło, źěkujomy se za registrěrowanje!
+      unknown token: Zda se, až token njeeksistěrujo.
     confirm_email: 
       button: Wobkšuśiś
       failure: E-mailowa adresa jo se južo wobkšuśiła pśez toś ten wótkaz.
       heading: Změnjenje e-mailoweje adrese wobkšuśiś
       press confirm button: Klikni na wobkšuśeński tłocašk, aby swóju nowu e-mailowu adresu wobkšuśił.
       success: Twója e-mailowa adresa jo se wobkšuśiła, źěkujomy se za registrěrowanje!
+    confirm_resend: 
+      failure: Wuzywaŕ {{name}} njejo se namakał.
+      success: Smy nowu wobkšuśeński e-mail na {{email}} póslali a gaž wobkšuśijoš swójo konto, móžoš kartěrowanje zachopiś.<br /><br />Jolic wužywaš pśeśiwospamowy system, kótaryž sćelo wobkšuśeńske napšašowanja, pśewzij adresu webmaster@openstreetmap.org do swójeje běłeje lisćiny, dokulaž njamóžomy na wobkšuśeńske napšašowanja wótegroniś.
     filter: 
       not_an_administrator: Musyš administrator byś, aby wuwjadł toś tu akciju.
     go_public: 
@@ -1425,19 +1454,24 @@ dsb:
       summary_no_ip: "{{name}} dnja {{date}} napórany"
       title: Wužywarje
     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.
+      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ś
@@ -1464,7 +1498,7 @@ dsb:
       display name description: Sy wužywarske mě zjawnje pokazał. Móžoš to pózdźej w nastajenjach změniś.
       email address: "E-mailowa adresa:"
       fill_form: Wupołni formular a pósćelomy śi krotku e-mail za aktiwěrowanje twójogo konta.
-      flash create success message: Wužywarske konto jo se wuspěšnje załožyło. Pśeglědaj swóju e-mail za wobkšuśeńskim wótkazom a móžoš ned zachopiś kartěrowaś :-)<br /><br />Pšosym spomni na to, až njamóžoš se pśizjawiś, až njejsy swóju e-mailowu adresu dostał a wobkšuśił.<br /><br />Jolic wužywaš antispamowy system, kótaryž sćelo wobkšuśeńske napšašowanja, ga zawěsć, až webmaster@openstreetmap.org jo w twójej běłej lisćinje, dokulaž njamóžomy na wobkšuśeńske napšašowanja wótegroniś.
+      flash create success message: Źěkujomy se za registrěrowanje. Smy wobkšuśeński e-mail na {{email}} póslali a gaž wobkšuśijoš swójo konto, móžoš kartěrowanje zachopiś.<br /><br />Jolic wužywaš pśeśiwospamowy system, kótaryž sćelo wobkšuśeńske napšašowanja, pśewzij adresu webmaster@openstreetmap.org do swójeje běłeje lisćiny, dokulaž njamóžomy na wobkšuśeńske napšašowanja wótegroniś.
       heading: Wužywarske konto załožyś
       license_agreement: Z wobkšuśenim twójogo konta dejš <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">wuměnjenjam pśinosowarjow</a> pśigłosowaś.
       no_auto_account_create: Bóžko njamóžomy tuchylu za tebje konto awtomatiski załožyś.
@@ -1531,6 +1565,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ś

config/locales/el.yml

@@ -1,8 +1,10 @@
 # Messages for Greek (Ελληνικά)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Consta
 # Author: Crazymadlover
+# Author: Evropi
+# Author: Kiriakos
 # Author: Logictheo
 # Author: Omnipaedista
 el: 
@@ -36,7 +38,8 @@ el:
       user: 
         active: Ενεργό
         description: Περιγραφή
-        display_name: Όνομα
+        display_name: Εμφανιζόμενο όνομα
+        email: Ηλεκτρονικό ταχυδρομείο
         languages: Γλώσσες
     models: 
       acl: Πρόσβαση στη λίστα ελέγχου
@@ -72,6 +75,9 @@ el:
       way: Κατεύθυνση
       way_node: Κατεύθυνση σημείου
       way_tag: Ετικέτα κατεύθυνσης
+  application: 
+    require_cookies: 
+      cookies_needed: Φαίνεται ότι έχετε τα cookies απενεργοποιημένα - παρακαλούμε ενεργοποιήστε τα cookies στο πρόγραμμα περιήγησής σας πριν συνεχίσετε.
   browse: 
     changeset: 
       changeset: "Αλλαγή συλλογης: {{id}}"
@@ -95,9 +101,16 @@ el:
       version: "Εκδοχή:"
     map: 
       deleted: Διαγραφή
+      larger: 
+        area: Δείτε την περιοχή σε μεγαλύτερο χάρτη.
+        node: Προβολή του κόμβου σε μεγαλύτερο χάρτη
+        relation: Δείτε την σχέση σε μεγαλύτερο χάρτη
+        way: Δείτε την διαδρομή σε μεγαλύτερο χάρτη.
       loading: Φόρτωση...
     node: 
       download: "{{download_xml_link}} ή {{view_history_link}}"
+      download_xml: Λήψη XML
+      edit: Τροποποίηστε
       node: Σημείο
       node_title: "Σήμεο: {{node_name}}"
       view_history: Δες ιστορία
@@ -106,11 +119,13 @@ el:
       part_of: "Κομμάτι του:"
     node_history: 
       download: "{{download_xml_link}} ή {{view_details_link}}"
+      download_xml: Λήψη XML
       node_history: Ιστορία σημείου
       view_details: Δες λεπτομέρειες
     not_found: 
       sorry: Συγγνώμη, η {{type}} με την ταυτότητα {{id}}, δε μπορεί να βρεθεί.
       type: 
+        changeset: Αλλαγή πλατώ
         node: Σημείο
         relation: σχέση
         way: Κατεύθηνση
@@ -119,6 +134,7 @@ el:
       showing_page: Δείχνει σελίδα
     relation: 
       download: "{{download_xml_link}} ή {{view_history_link}}"
+      download_xml: Λήψη XML
       relation: Σχέση
       relation_title: "Σχέση: {{relation_name}}"
       view_history: δες ιστορία
@@ -126,9 +142,15 @@ el:
       members: "Μέλη:"
       part_of: "Κομμάτι του:"
     relation_history: 
+      download_xml: Λήψη XML
       relation_history: Ιστορια σχέσης
       relation_history_title: "Ιστορια σχέσης: {{relation_name}}"
       view_details: προβολή λεπτομερειών
+    relation_member: 
+      type: 
+        node: Κόμβος
+        relation: Σχέση
+        way: Διαδρομή
     start: 
       manually_select: Διάλεξε διαφορετική περιοχή δια χειρός
       view_data: Δες στοιχεία για αυτο το χάρτη
@@ -166,8 +188,16 @@ el:
       zoom_or_select: Εστίασε ή διάλεξε περιοχή απο το χάρτη
     tag_details: 
       tags: "Ετικέτες:"
+    timeout: 
+      type: 
+        changeset: Αλλαγή πλατώ
+        node: Κόμβος
+        relation: Σχέση
+        way: Διαδρομή
     way: 
       download: "{{download_xml_link}} ή {{view_history_link}}"
+      download_xml: Λήψη XML
+      edit: Τροποποίηστε
       view_history: δες ιστορία
       way: Κατεύθυνση
       way_title: "Κατεύθυνση: {{way_name}}"
@@ -179,6 +209,7 @@ el:
       part_of: Κομμάτι του
     way_history: 
       download: "{{download_xml_link}} ή {{view_details_link}}"
+      download_xml: Λήψη XML
       view_details: δες λεπτομέρειες
       way_history: Ιστορία κατεύθηνσης
       way_history_title: "Ιστορία κατεύθηνσης: {{way_name}}"
@@ -197,12 +228,16 @@ el:
   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: 
@@ -214,10 +249,11 @@ el:
       marker_text: Τοποθεσία καταχώρησης blog
       save_button: Αποθήκευση
       subject: "Θέμα:"
-      title: Άλλαγη καταχώρηση blog
+      title: Επεξεργασία καταχώρησης ημερολογίου
       use_map_link: χρησημοποίησε το χάρτη
     list: 
-      new: Καινούργια καταχώρηση blog
+      in_language_title: Καταχωρήσεις Ημερολογίων στα {{language}}
+      new: Νέα καταχώρηση ημερολογίου
       new_title: Σύνθεση καινούργια καταχώρηση στο blog χρήστη
       newer_entries: Πρόσφατες Καταχωρήσεις
       no_entries: Καμία καταχώρηση blog
@@ -225,21 +261,34 @@ el:
       recent_entries: "Πρόσοφατες καταχωρήσεις blog:"
       title: Blog χρηστών
       user_title: Blog {{user}}
+    location: 
+      edit: Επεξεργασία
+      location: "Τοποθεσία:"
+      view: Προβολή
     new: 
-      title: Καινούργια καταχώρηση blog
+      title: Νέα καταχώρηση ημερολογίου
     no_such_entry: 
-      body: Συγγνώμη, δεν υπάρχει καταχώρηση blog ή σχόλιο με τη ταυτότητα {{id}}. Είναι πιθανό να υπάρχουν ορθογραφικά λάθη ή να είναι λάθος το link.
+      body: Συγγνώμη, δεν υπάρχει καταχώρηση ημερολογίου ή σχόλιο με τη ταυτότητα {{id}}. Είναι πιθανό να υπάρχουν ορθογραφικά λάθη ή να είναι λάθος ο συνδεσμος μέσο του οπίου φτάσατε σε αυτήν την σελίδα.
       heading: "Καμία καταχώρηση με τη ταυτότητα: {{id}}"
     no_such_user: 
-      body: Συγγνώμη, δεν υπάρχει χρήστης με το όνομα {{user}}. Είναι πιθανό να υπάρχουν ορθογραφικά λάθη ή να είναι λάθος το link.
+      body: Συγγνώμη, δεν υπάρχει χρήστης με το όνομα {{user}}. Είναι πιθανό να υπάρχουν ορθογραφικά λάθη ή να είναι λάθος ο σύνδεσμος μέσο του οπίου φτάσατε σε αυτήν την σελίδα.
       heading: Ο χρήστης {{user}} δεν υπάρχει
       title: Άγνωστος χρήστηςr
     view: 
       leave_a_comment: Εγγραφή σχόλιου
+      login: Είσοδος
       login_to_leave_a_comment: "{{login_link}} για εγγραφή σχόλιου"
       save_button: Αποθήκευση
-      title: Blog χρηστών | {{user}}
+      title: το ημερολόγιου το {{user}} | {{title}}
       user_title: Blog {{user}}
+  editor: 
+    default: Προεπιλογή (τώρα είναι το {{name}})
+    potlatch: 
+      description: Potlatch 1 (επεξεργαστής του χάρτη μέσα στο περιηγητή ιστού)
+      name: Potlatch 1
+    potlatch2: 
+      description: Potlatch 2 (επεξεργαστής του χάρτη μέσα στο περιηγητή ιστού)
+      name: Potlatch 2
   export: 
     start: 
       add_marker: Πρόσθεση markerστο χάρτη
@@ -262,8 +311,280 @@ el:
       zoom: Εστίαση
     start_rjs: 
       export: Εξαγωγή
+  geocoder: 
+    description: 
+      title: 
+        geonames: Τοποθεσία από το <a href="http://www.geonames.org/">GeoNames</a>
+      types: 
+        cities: Πόλεις
+        places: Μέρη
+        towns: Μικρές Πόλεις
+    direction: 
+      east: ανατολικά
+      north: βόρεια
+      north_east: βορειοανατολικά
+      north_west: βορειοδυτικά
+      south: νότια
+      south_east: νοτιοανατολικά
+      south_west: νοτιοδυτικά
+      west: δυτικά
+    results: 
+      more_results: Περισσότερα αποτελέσματα
+      no_results: Δεν βρέθηκε κανένα αποτέλεσμα
+    search_osm_nominatim: 
+      prefix: 
+        amenity: 
+          airport: Αεροδρόμιο
+          arts_centre: Κέντρο Τεχνών
+          auditorium: Αμφιθέατρο
+          bank: Τράπεζα
+          bar: Μπαρ
+          bench: Πάγκος
+          brothel: Πορνείο
+          bus_station: Σταθμός Λεωφορείου
+          cafe: Καφετέρια
+          car_rental: Ενοικίαση αυτοκινήτου
+          car_wash: Πλύσιμο Αυτοκινήτων
+          casino: Καζίνο
+          cinema: Κινηματογράφος
+          clinic: Κλινική
+          club: Club
+          college: Κολέγιο
+          courthouse: Δικαστήριο
+          crematorium: Κρεματόριο
+          dentist: Οδοντίατρος
+          doctors: Ιατροί
+          drinking_water: Πόσιμο Νερό
+          driving_school: Σχολή Οδηγών
+          embassy: Πρεσβεία
+          emergency_phone: Τηλέφωνο Έκτακτης Ανάγκης
+          fast_food: Ταχυφαγείο
+          fountain: Συντριβάνι
+          grave_yard: Νεκροταφείο
+          gym: Γυμναστήριο
+          hospital: Νοσοκομείο
+          hotel: Ξενοδοχείο
+          ice_cream: Παγωτό
+          kindergarten: Νηπιαγωγείο
+          library: Βιβλιοθήκη
+          market: Αγορά
+          marketplace: Αγορά
+          nightclub: Night Club
+          office: Γραφείο
+          park: Πάρκο
+          police: Αστυνομία
+          post_box: Ταχυδρομική Θυρίδα
+          post_office: Ταχυδρομείο
+          preschool: Προσχολική Εκπαίδευση
+          prison: Φυλακή
+          pub: Παμπ
+          reception_area: Χώρος Υποδοχής
+          restaurant: Εστιατόριο
+          sauna: Σάουνα
+          school: Σχολείο
+          shop: Κατάστημα
+          studio: Στούντιο
+          supermarket: Σουπερμάρκετ
+          taxi: Ταξί
+          theatre: Θέατρο
+          toilets: Τουαλέτες
+          townhall: Δημαρχείο
+          university: Πανεπιστήμιο
+          veterinary: Κτηνιατρική Χειρουργική
+          wifi: Πρόσβαση WiFi
+          youth_centre: Πολύκεντρο Νεολαίας
+        building: 
+          bunker: Οχυρό
+          chapel: Παρεκκλήσι
+          church: Εκκλησία
+          dormitory: Κοιτώνας
+          flats: Διαμερίσματα
+          garage: Γκαράζ
+          hotel: Ξενοδοχείο
+          house: Σπίτι
+          residential: Πολυκατοικία
+          stadium: Στάδιο
+          tower: Πύργος
+          train_station: Σιδηροδρομικός Σταθμός
+        highway: 
+          bridleway: Μονοπάτι για άλογα
+          bus_stop: Στάση Λεωφορείου
+          footway: Μονοπάτι
+          gate: Πύλη
+          path: Διαδρομή
+          pedestrian: Πεζόδρομιο
+          residential: Κατοικίες
+          road: Δρόμος
+          trail: Διαδρομή
+        historic: 
+          archaeological_site: Αρχαιολογικός Χώρος
+          building: Κτίριο
+          memorial: Μνημόσυνο
+          mine: Ορυχείο
+          monument: Μνημείο
+          museum: Μουσείο
+        landuse: 
+          basin: Λεκανοπέδιο
+          cemetery: Κοιμητήριο
+          commercial: Εμπορική Περιοχή
+          farm: Αγρόκτημα
+          farmland: Αγρόκτημα
+          farmyard: Αγρόκτημα
+          forest: Δάσος
+          grass: Γρασίδι
+          military: Στρατιωτική Περιοχή
+          mine: Ορυχείο
+          mountain: Βουνό
+          park: Πάρκο
+          plaza: Πλατεία
+          quarry: Λατομείο
+          railway: Σιδηρόδρομος
+          residential: Κατοικημένη Περιοχή
+          vineyard: Αμπέλι
+          wood: Μη προσεγμένο δάσος
+        leisure: 
+          fishing: Αλιευτική Περιοχή
+          garden: Κήπος
+          golf_course: Γήπεδο Γκολφ
+          ice_rink: Παγοδρόμιο
+          miniature_golf: Μίνι Γκολφ
+          park: Πάρκο
+          playground: Παιδική Χαρά
+          sports_centre: Αθλητικό Κέντρο
+          stadium: Στάδιο
+          swimming_pool: Πισίνα
+        natural: 
+          beach: Παραλία
+          cape: Ακρωτήριο
+          cave_entrance: Είσοδος Σπηλιάς
+          channel: Κανάλι
+          cliff: Γκρεμός
+          crater: Κρατήρας
+          feature: Χαρακτηριστικό
+          fjord: Φιόρδ
+          glacier: Παγετώνας
+          hill: Λόφος
+          island: Νησί
+          marsh: Βάλτος
+          mud: Λάσπη
+          peak: Κορυφή
+          reef: Ύφαλος
+          river: Ποτάμι
+          rock: Βράχος
+          strait: Πορθμός
+          tree: Δέντρο
+          valley: Κοιλάδα
+          volcano: Ηφαίστειο
+          water: Νερό
+          wetlands: Υγρότοποι
+          wood: Μη προσεγμένο δάσος
+        place: 
+          airport: Αεροδρόμιο
+          city: Πόλη
+          country: Χώρα
+          county: Κομητεία
+          farm: Αγρόκτημα
+          hamlet: Χωριουδάκι
+          house: Σπίτι
+          houses: Σπίτια
+          island: Νησί
+          islet: Νησίδα
+          locality: Τοποθεσία
+          municipality: Δήμος
+          postcode: Ταχυδρομικός Κώδικας
+          region: Περιοχή
+          sea: Θάλασσα
+          state: Πολιτεία
+          subdivision: Υποδιαίρεση
+          suburb: Προάστιο
+          town: Μικρή Πόλη
+          village: Χωριό
+        railway: 
+          abandoned: Εγκαταλελειμμένος Σιδηρόδρομος
+          construction: Σιδηρόδρομος Υπό Κατασκευή
+          disused: Σιδηρόδρομος Εκτός Χρήσης
+          disused_station: Σιδηροδρομικός Σταθμός Εκτός Χρήσης
+          historic_station: Ιστορική Σιδηροδρομικός Σταθμός
+          station: Σιδηροδρομικός Σταθμός
+          subway: Σταθμός Μετρό
+          subway_entrance: Είσοδος Στο Μετρό
+          tram_stop: Στάση Τραμ
+        shop: 
+          bakery: Φούρνος
+          books: Βιβλιοπωλείο
+          butcher: Κρεοπωλείο
+          car_parts: Εξαρτήματα Αυτοκινήτου
+          confectionery: Ζαχαροπλαστική
+          drugstore: Φαρμακείο
+          dry_cleaning: Στεγνό Καθάρισμα
+          fish: Ιχθυοπωλείο
+          florist: Ανθοκομείο
+          greengrocer: Μανάβης
+          hairdresser: Κομμωτήριο
+          insurance: Ασφαλιστική
+          jewelry: Κοσμηματοπωλείο
+          kiosk: Περίπτερο
+          mall: Εμπορικό Κέντρο
+          sports: Κατάστημα Αθλητικών
+          supermarket: Σουπερμάρκετ
+          travel_agency: Ταξιδιωτικό Πρακτορείο
+        tourism: 
+          hotel: Ξενοδοχείο
+          museum: Μουσείο
+        waterway: 
+          boatyard: Ναυπηγείο
+          dam: Φράγμα
+          ditch: Χαντάκι
+          river: Ποτάμι
+          waterfall: Καταράχτης
+  javascripts: 
+    site: 
+      edit_disabled_tooltip: Κάνετε μεγέθυνση για να επεξεργαστείτε το χάρτη
+      edit_tooltip: Επεξεργασία του χάρτη
   layouts: 
+    community_blogs_title: Blogs από τα μέλη της κοινότητας του OpenStreetMap
+    copyright: Πνευματικά δικαιώματα &amp; Άδειας χρήσης
+    documentation: Τεκμηρίωση
+    documentation_title: Τεκμηρίωση για το έργο
+    edit: Επεξεργασία
+    edit_with: Επεξεργασία με {{editor}}
+    export: Εξαγωγή
+    foundation: Ίδρυμα
+    foundation_title: Το Ίδρυμα OpenStreetMap
+    help: Βοήθεια
+    help_centre: Κέντρο Βοήθειας
+    help_title: Ιστοσελίδα βοήθειας για το έργο
+    history: Ιστορικό
     home: κύρια σελίδα
+    inbox: εισερχόμενα ({{count}})
+    intro_1: Ο OpenStreetMap είναι δώρεαν, επεξεργάσιμος χάρτης ολόκληρου του κόσμος. Είναι κατασκευασμένο από ανθρώπους σαν κι εσάς.
+    intro_2: Το OpenStreetMap σάς επιτρέπει να προβάλετε, να επεξεργαστείτε και να χρησιμοποιήσετε τα γεωγραφικά δεδομένα με ένα συνεργατικό τρόπο από οπουδήποτε στη Γη.
+    intro_3_partners: βίκι
+    log_in: είσοδος
+    log_in_tooltip: Σύνδεση με έναν υπάρχοντα λογαριασμό
+    logo: 
+      alt_text: Λογότυπο OpenStreetMap
+    logout: έξοδος
+    logout_tooltip: Έξοδος
+    sign_up: εγγραφή
+    sign_up_tooltip: Δημιουργήστε λογαριασμό για επεξεργασία
+    tag_line: Ο Ελεύθερος Παγκόσμιος Χάρτης Βίκι
+    user_diaries: Ημερολόγια Χρηστών
+    user_diaries_tooltip: Προβολή ημερολογίων χρηστών
+    view: Προβολή
+    view_tooltip: Προβολή του χάρτη
+    welcome_user: Καλώς ορίσατε, {{user_link}}
+    welcome_user_link_tooltip: Η σελίδα χρήστη σας
+    wiki: Βίκι
+    wiki_title: Ιστοσελίδα βίκι για το έργο
+  license_page: 
+    foreign: 
+      title: Σχετικά με αυτή την μετάφραση
+    native: 
+      mapping_link: αρχίστε τη χαρτογράφηση
+      native_link: ελληνική έκδοση
+      text: Προβάλλετε η αγγλική έκδοση της σελίδας πνευματικών δικαιωμάτων. Μπορείτε να επιστρέψετε στην {{native_link}} της σελίδας ή να σταματήσετε να διαβάζετε για τα πνευματικά δικαιώματα και {{mapping_link}}.
+      title: Σχετικά με αυτήν τη σελίδα
   message: 
     message_summary: 
       delete_button: Διαγραφή
@@ -271,36 +592,312 @@ el:
       delete_button: Διαγραφή
   notifier: 
     diary_comment_notification: 
+      footer: Μπορείτε επίσης να διαβάσετε το σχόλιο στο {{readurl}} και μπορείτε να σχολιάσετε στο {{commenturl}} ή να απαντήσετε στο {{replyurl}}
+      header: "Ο χρήστης {{from_user}} έχει σχολιάσει τη πρόσφατη καταχώρηση ημερολόγιου σας στο OpenStreetMap με το θέμα {{subject}}:"
       hi: Γεια {{to_user}},
+      subject: "[OpenStreetMap] Ο χρήστης {{user}} σχολίασε την καταχώριση ημερολογίου σας"
     email_confirm_html: 
       greeting: Γεια,
     email_confirm_plain: 
       greeting: Γεια,
+    friend_notification: 
+      befriend_them: Μπορείτε επίσης να τους προσθέσετε ως φίλους στο {{befriendurl}}.
+      had_added_you: Ο χρήστης {{user}} σας πρόσθεσε ως φίλο στο OpenStreetMap.
+      see_their_profile: Μπορείτε να δείτε το προφίλ τους στο {{userurl}}.
+      subject: "[OpenStreetMap] Ο χρήστης {{user}} σας προσθέσε ως φίλο"
     gpx_notification: 
       greeting: Γεια,
     lost_password_html: 
       greeting: Γεια,
     lost_password_plain: 
       greeting: Γεια,
+    message_notification: 
+      footer1: Μπορείτε επίσης να διαβάσετε το μήνυμα στο {{readurl}}
+      footer2: και μπορείτε να απαντήσετε στο {{replyurl}}
+      header: "Ο χρήστης {{from_user}} σάς έχει στείλει ένα μήνυμα μέσω του OpenStreetMap με θέμα {{subject}}:"
+      hi: Γεια σας {{to_user}},
+    signup_confirm: 
+      subject: "[OpenStreetMap] Επιβεβαιώστε τη διεύθυνση ηλεκτρονικού ταχυδρομείου σας"
+    signup_confirm_html: 
+      greeting: Γεια!
     signup_confirm_plain: 
       greeting: Γεια!
   oauth_clients: 
+    edit: 
+      submit: Επεξεργασία
+      title: Επεξεργασία της αίτησής σας
+    index: 
+      register_new: Εγγραφή αίτησής
+      revoke: Ανάκληση!
     new: 
       submit: Εγγραφή
+  site: 
+    edit: 
+      anon_edits_link_text: Μάθετε γιατί συμβαίνει αυτό.
+      not_public: Δεν έχετε ορίσει τις επεξεργασίες σας να είναι δημόσιες.
+      potlatch2_unsaved_changes: Έχετε μη αποθηκευμένες αλλαγές. (Για να αποθηκεύσετε στο Potlatch 2, πρέπει να κάνετε κλικ στο «Αποθήκευση».)
+      user_page_link: σελίδα χρήστη
+    index: 
+      js_1: Είτε χρησιμοποιείτε πρόγραμμα περιήγησης που δεν υποστηρίζει το JavaScript ή έχετε απενεργοποιήσει το JavaScript.
+      license: 
+        notice: Υπό την άδεια του {{license_name}} άδεια από το {{project_name}} και τους χρήστες του.
+        project_name: έργο OpenStreetMap
+    key: 
+      table: 
+        entry: 
+          bridleway: Μονοπάτι για Άλογα
+          building: Σημαντικό κτίριο
+          cable: 
+            - Τελεφερίκ
+            - τελεφερίκ με καθίσματα
+          cemetery: Κοιμητήριο
+          centre: Αθλητικό Κέντρο
+          commercial: Εμπορική περιοχή
+          common: 
+            1: λιβάδι
+          farm: Αγρόκτημα
+          forest: Δάσος
+          golf: Γήπεδο γκολφ
+          industrial: Βιομηχανική περιοχή
+          lake: 
+            - Λίμνη
+          military: Στρατιωτική περιοχή
+          motorway: Αυτοκινητόδρομος
+          park: Πάρκο
+          permissive: Ανεκτική Πρόσβαση
+          pitch: Γήπεδο Αθλητισμού
+          private: Ιδιωτική πρόσβαση
+          rail: Σιδηρόδρομος
+          resident: Κατοικημένη περιοχή
+          runway: 
+            - Διάδρομος Αεροδρομίου
+          school: 
+            - Σχολείο
+            - πανεπιστήμιο
+          station: Σιδηροδρομικός σταθμός
+          subway: Υπόγειος σιδηρόδρομος
+          summit: 
+            1: κορυφή
+          tourist: Τουριστικό αξιοθέατο
+          tram: 
+            1: τραμ
+          wood: Μη προσεγμένο δάσος
+    search: 
+      search: Αναζήτηση
+      search_help: "παραδείγματα: «Alkmaar», «Regent Street, Cambridge», «CB2 5AQ», ή «ταχυδρομεία κοντά στο Lünen» <a href='http://wiki.openstreetmap.org/wiki/Search'>περισσότερα παραδείγματα...</a>"
+      submit_text: Μετάβαση
+      where_am_i: Πού είμαι;
+    sidebar: 
+      close: Κλείσιμο
+      search_results: Αποτελέσματα Αναζήτησης
   trace: 
     edit: 
+      download: λήψη
       edit: επεξεργασία
+      filename: "Όνομα αρχείου:"
       map: χάρτης
       owner: "Ιδιοκτήτης:"
+      points: "Σημεία:"
       tags_help: οριοθετημένο από τα κόμματα
       visibility: "Ορατότητα:"
       visibility_help: τι σημαίνει αυτό;
     trace: 
+      count_points: "{{count}} σημεία"
+      edit_map: Επεξεργασία Χάρτη
       map: χάρτης
+      private: ΙΔΙΩΤΙΚΟ
+      public: ΔΗΜΟΣΙΟ
     trace_form: 
       description: Περιγραφή
+      help: Βοήθεια
+      tags: Ετικέτες
+      visibility: Ορατότητα
+    trace_optionals: 
+      tags: Ετικέτες
     view: 
+      description: "Περιγραφή:"
+      download: λήψη
+      edit: επεξεργασία
+      filename: "Όνομα αρχείου:"
       map: χάρτης
+      owner: "Ιδιοκτήτης:"
+      tags: "Ετικέτες:"
+      visibility: "Ορατότητα:"
   user: 
-    new: 
+    account: 
+      current email address: "Τωρινή Διεύθυνση ηλεκτρονικού ταχυδρομείου:"
+      image: "Εικόνα:"
+      longitude: "Γεωγραφικό μήκος:"
+      my settings: Οι ρυθμίσεις μου
+      new email address: "Νέα Διεύθυνση ηλεκτρονικού ταχυδρομείου:"
+      new image: Προσθήκη εικόνας
+      preferred editor: "Προτιμώμενο πρόγραμμα Επεξεργασίας:"
+      preferred languages: "Προτιμώμενες γλώσσες:"
+      profile description: "Περιγραφή Λογαριασμού:"
+      public editing: 
+        disabled link text: γιατί δεν μπορώ να επεξεργαστώ τον χάρτη;
+        enabled: Ενεργοποιήθηκε. Δεν είστε πια ανώνυμος και μπορείτε να επεξεργαστείτε δεδομένα.
+        enabled link text: τι είναι αυτό;
+        heading: "Δημόσια επεξεργασία:"
+      save changes button: Αποθήκευση Αλλαγών
+      title: Επεξεργασία λογαριασμού
+    confirm: 
+      already active: Αυτός ο λογαριασμός έχει ήδη επιβεβαιωθεί.
+      button: Επιβεβαίωση
+      heading: Επιβεβαίωση ενός λογαριασμού χρήστη
+      press confirm button: Πατήστε το κουμπί "Επιβεβαίωση" για να ενεργοποιήσετε το λογαριασμό σας.
+      success: Επιβεβαιώθηκε ο λογαριασμός σας, σας ευχαριστούμε για την εγγραφή σας!
+    confirm_email: 
+      button: Επιβεβαίωση
+      failure: Μια διεύθυνση ηλεκτρονικού ταχυδρομείου έχει ήδη επιβεβαιωθεί με αυτό το διακριτικό.
+      heading: Επιβεβαίωση αλλαγής της διεύθυνσης ηλεκτρονικού ταχυδρομείου
+      press confirm button: Πατήστε το κουμπί "Επιβεβαίωση" παρακάτω για να επιβεβαιώσετε τη νέα διεύθυνση ηλεκτρονικού ταχυδρομείου σας.
+      success: Επιβεβαιώθηκε η διεύθυνση ηλεκτρονικού ταχυδρομείου σας, σας ευχαριστούμε για την εγγραφή σας!
+    confirm_resend: 
+      failure: Ο χρήστης {{name}} δεν βρέθηκε.
+    filter: 
+      not_an_administrator: Πρέπει να είστε διαχειριστής για να το κάνετε αυτό.
+    go_public: 
+      flash success: Όλες οι επεξεργασίες σας είναι τώρα δημόσιες και έχετε τη δυνατότητα να επεξεργαστείτε τον χάρτη.
+    list: 
+      confirm: Επιβεβαίωση επιλεγμένων χρηστών
+      heading: Χρήστες
+      hide: Απόκρυψη Επιλεγμένων Χρηστών
+      summary: "{{name}} δημιουργήθηκε από την διεύθυνση IP {{ip_address}} στις {{date}}"
+      summary_no_ip: "{{name}} δημιουργήθηκε στις {{date}}"
+      title: Χρήστες
+    login: 
+      account not active: Λυπόμαστε, ο λογαριασμός σας δεν είναι ενεργός ακόμα.<br />Παρακαλούμε χρησιμοποιήστε το σύνδεσμο στο email επιβεβαίωσης για να ενεργοποιήσετε το λογαριασμό σας, ή <a href="{{reconfirm}}">κάντε αίτηση νέου email επιβεβαίωσης</a>.
+      account suspended: Συγνώμη, ο λογαριασμός σας έχει ανασταλεί λόγω ύποπτης δραστηριότητας.<br />Εάν επιθυμείτε, επικοινωνήστε με τον {{webmaster}} για να το συζητήσουμε αυτό το θέμα.
+      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, πρέπει να έχετε λογαριασμό.
+    logout: 
+      heading: Έξοδος από το OpenStreetMap
+      logout_button: Έξοδος
+      title: Έξοδος
+    lost_password: 
       email address: "Διεύθυνση ηλεκτρονικού ταχυδρομείου:"
+      heading: Ξεχάσατε τον κωδικό σας;
+      new password button: Επαναφορά κωδικού
+      notice email cannot find: Λυπόμαστε, δεν βρέθηκε αυτή η διεύθυνση ηλεκτρονικού ταχυδρομείου.
+    make_friend: 
+      already_a_friend: Είστε ήδη φίλοι με τον χρήστη {{name}}.
+      failed: Λυπούμαστε, απέτυχε η προσθήκη του χρήστη {{name}} ως φίλο.
+      success: Ο χρήστης {{name}} είναι τώρα φίλος σας.
+    new: 
+      confirm email address: "Επιβεβαιώση Διεύθυνσης ηλεκτρονικού ταχυδρομείου:"
+      confirm password: "Επιβεβαίωση Κωδικού:"
+      continue: Συνέχεια
+      display name: "Εμφανιζόμενο όνομα:"
+      email address: "Διεύθυνση ηλεκτρονικού ταχυδρομείου:"
+      heading: Δημιουργία Λογαριασμού Χρήστη
+      license_agreement: Όταν επιβεβαιώσετε το λογαριασμό σας, θα πρέπει να συμφωνείσετε με τους <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">όρους συνεισφοράς</a>.
+      password: "Κωδικός:"
+      terms accepted: Σας ευχαριστούμε για την αποδοχή των νέων όρων συνεισφοράς!
+      title: Δημιουργία λογαριασμού
+    no_such_user: 
+      body: Συγγνώμη, δεν υπάρχει χρήστης με το όνομα {{user}}. Είναι πιθανό να υπάρχουν ορθογραφικά λάθη ή να είναι λάθος ο σύνδεσμος μέσο του οπίου φτάσατε σε αυτήν την σελίδα.
+      heading: Ο χρήστης {{user}} δεν υπάρχει
+    popup: 
+      friend: Φίλος
+      nearby mapper: Κοντινός χαρτογράφος
+      your location: Η τοποθεσία σας
+    remove_friend: 
+      not_a_friend: Ο χρήστης {{name}} δεν είναι ένας από τους φίλους σας.
+      success: Ο χρήστης {{name}} καταργήθηκε ως φίλος.
+    reset_password: 
+      confirm password: "Επιβεβαίωση Κωδικού:"
+      flash changed: Ο κωδικός σας έχει αλλάξει.
+      heading: Επαναφορά Κωδικού για τον χρήστη {{user}}
+      password: "Κωδικός:"
+      reset: Επαναφορά Κωδικού
+      title: Επαναφορά κωδικού
+    suspended: 
+      body: "<p>\nΣυγνώμη, ο λογαριασμός σας έχει αυτόματα ανασταλεί λόγω\nύποπτης δραστηριότητας.\n</p>\n<p>\nΗ παρούσα απόφαση θα εξεταστεί από ένα διαχειριστή σύντομα, ή\nμπορείτε να επικοινωνήσετε με τον {{webmaster}} αν θέλετε να το συζητήσετε αυτό το θέμα.\n</p>"
+      heading: Ο Λογαριασμός Ανασταλεί
+      title: Ο Λογαριασμός Ανασταλεί
+    terms: 
+      agree: Συμφωνώ
+      decline: Διαφωνώ
+      heading: Όροι συνεισφοράς
+      legale_names: 
+        france: Γαλλία
+        italy: Ιταλία
+        rest_of_world: Υπόλοιπος κόσμος
+    view: 
+      activate_user: ενεργοποίηση αυτού του λογαριασμού χρήστη
+      add as friend: προσθήκη ως φίλος
+      confirm: Επιβεβαίωση
+      confirm_user: επιβεβαίωση αυτού το χρήστη
+      create_block: φραγή αυτού του χρήστη
+      created from: "Δημιουργήθηκε από:"
+      deactivate_user: απενεργοποίηση αυτού του λογαριασμού χρήστη
+      delete_user: διαγραφή αυτού του χρήστη
+      description: Περιγραφή
+      diary: ημερολόγιο
+      edits: τροποποιήσεις
+      email address: "Διεύθυνση ηλεκτρονικού ταχυδρομείου:"
+      hide_user: απόκρυψη αυτού του χρήστη
+      km away: "{{count}}χλμ μακριά"
+      m away: "{{count}}μ μακριά"
+      mapper since: "Χαρτογράφος από:"
+      my diary: το ημερολόγιό μου
+      my edits: οι επεξεργασίες μου
+      my settings: οι ρυθμίσεις μου
+      new diary entry: νέα καταχώρηση ημερολογίου
+      no friends: Δεν έχετε προσθέσει φίλους ακόμα.
+      no nearby users: Δεν υπάρχουν άλλοι χρήστες που παραδέχονται ότι χαρτογραφούν κοντά σας προς το παρόν.
+      oauth settings: ρυθμίσεις oauth
+      role: 
+        administrator: Αυτός ο χρήστης είναι ο διαχειριστής
+        grant: 
+          administrator: Χορήγηση πρόσβασης διαχειριστή
+          moderator: Χορήγηση πρόσβασης μεσολαβητή
+        moderator: Αυτός ο χρήστης είναι μεσολαβητής
+        revoke: 
+          administrator: Ανάκληση πρόσβασης διαχειριστή
+          moderator: Ανάκληση πρόσβασης μεσολαβητή
+      send message: αποστολή μηνύματος
+      settings_link_text: ρυθμίσεις
+      status: "Κατάσταση:"
+      unhide_user: επανεμφάνιση αυτού του χρήστη
+      user location: Τοποθεσία χρήστη
+      your friends: Οι φίλοι σας
+  user_block: 
+    helper: 
+      time_future: Τελειώνει σε {{time}}.
+      time_past: Τελείωση {{time}} πριν.
+      until_login: Ενεργό έως ότου ο χρήστης συνδεθεί.
+    partial: 
+      confirm: Είστε σίγουροι;
+      creator_name: Δημιουργός
+      edit: Επεξεργασία
+      not_revoked: (δεν έχει ανακληθεί)
+      revoke: Ανάκληση!
+      show: Εμφάνιση
+      status: Κατάσταση
+    revoke: 
+      revoke: Ανάκληση!
+    show: 
+      edit: Επεξεργασία
+      revoke: Ανάκληση!
+      status: Κατάσταση
+      time_future: Τελειώνει σε {{time}}
+      time_past: Τελείωση {{time}} πριν
+  user_role: 
+    grant: 
+      confirm: Επιβεβαίωση
+    revoke: 
+      confirm: Επιβεβαίωση

config/locales/en.yml

@@ -79,6 +79,17 @@ en:
     with_id: "{{id}}"
     with_version: "{{id}}, v{{version}}"
     with_name: "{{name}} ({{id}})"
+  editor:
+    default: "Default (currently {{name}})"
+    potlatch:
+      name: "Potlatch 1"
+      description: "Potlatch 1 (in-browser editor)"
+    potlatch2:
+      name: "Potlatch 2"
+      description: "Potlatch 2 (in-browser editor)"
+    remote:
+      name: "Remote Control"
+      description: "Remote Control (JOSM or Merkaartor)"
   browse:
     changeset:
       title: "Changeset"
@@ -208,6 +219,8 @@ en:
       zoom_or_select: "Zoom in or select an area of the map to view"
       drag_a_box: "Drag a box on the map to select an area"
       manually_select: "Manually select a different area"
+      hide_areas: "Hide areas"
+      show_areas: "Show areas"
       loaded_an_area_with_num_features: "You have loaded an area which contains [[num_features]] features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than 100 features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
       load_data: "Load Data"
       unable_to_load_size: "Unable to load: Bounding box size of [[bbox_size]] is too large (must be smaller than {{max_bbox_size}})"
@@ -923,6 +936,7 @@ en:
     gps_traces_tooltip: Manage GPS traces
     user_diaries: User Diaries
     user_diaries_tooltip: View user diaries
+    edit_with: Edit with {{editor}}
     tag_line: The Free Wiki World Map
     intro_1: "OpenStreetMap is a free editable map of the whole world. It is made by people like you."
     intro_2: "OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth."
@@ -935,19 +949,21 @@ 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 & 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
+    sotm2011: 'Come to the 2011 OpenStreetMap Conference, The State of the Map, September 9-11th in Denver!'
     license:
       alt: CC by-sa 2.0
       title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License
@@ -1054,6 +1070,8 @@ en:
           Resources Canada), CanVec (© Department of Natural
           Resources Canada), and StatCan (Geography Division,
           Statistics Canada).</li>
+          <li><strong>France</strong>: Contains data sourced from
+          Direction Générale des Impôts.</i>
           <li><strong>New Zealand</strong>: Contains data sourced from
           Land Information New Zealand. Crown Copyright reserved.</li>
           <li><strong>Poland</strong>: Contains data from <a
@@ -1237,6 +1255,7 @@ en:
         license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
         project_name: "OpenStreetMap project"
         project_url: "http://openstreetmap.org"
+      remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled"
     edit:
       not_public: "You have not set your edits to be public."
       not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
@@ -1246,6 +1265,9 @@ en:
       anon_edits_link_text: "Find out why this is the case."
       flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
       potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)"
+      potlatch2_not_configured: "Potlatch 2 has not been configured - please see http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for more information"
+      potlatch2_unsaved_changes: "You have unsaved changes. (To save in Potlatch 2, you should click save.)"
+      no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
     sidebar:
       search_results: Search Results
       close: Close
@@ -1256,7 +1278,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:
@@ -1432,6 +1454,7 @@ en:
       cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
     setup_user_auth:
       blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
+      need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
   oauth:
     oauthorize:
       request_access: "The application {{app_name}} is requesting access to your account. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
@@ -1510,6 +1533,11 @@ en:
       remember: "Remember me:"
       lost password link: "Lost your password?"
       login_button: "Login"
+      register now: Register now
+      already have: Already have an OpenStreetMap account? Please 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
@@ -1552,6 +1580,8 @@ en:
       continue: Continue
       flash create success message: "Thanks for signing up. We've sent a confirmation note to {{email}} and as soon as you confirm your account you'll be able to get mapping.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
       terms accepted: "Thanks for accepting the new contributor terms!"
+      terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see <a href=\"{{url}}\">this wiki page</a>."
+      terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
     terms:
       title: "Contributor terms"
       heading: "Contributor terms"
@@ -1562,6 +1592,7 @@ en:
       agree: Agree
       declined: "http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
       decline: "Decline"
+      you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue."
       legale_select: "Please select your country of residence:"
       legale_names:
         france: "France"
@@ -1588,6 +1619,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:"
@@ -1651,6 +1683,7 @@ en:
         link text: "what is this?"
       profile description: "Profile Description:"
       preferred languages: "Preferred Languages:"
+      preferred editor: "Preferred Editor:"
       image: "Image:"
       new image: "Add an image"
       keep image: "Keep the current image"

config/locales/eo.yml

@@ -1,10 +1,11 @@
 # Messages for Esperanto (Esperanto)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Cfoucher
 # Author: Lucas
 # Author: LyzTyphone
 # Author: Michawiki
+# Author: Petrus Adamus
 # Author: Yekrats
 eo: 
   activerecord: 
@@ -280,7 +281,7 @@ eo:
       format_to_export: Formato por Eksportado
       image_size: Bildamplekso
       latitude: "Lat:"
-      licence: Licenco
+      licence: Permesilo
       longitude: "Lon:"
       manually_select: Mane elekti alian aeron.
       mapnik_image: Mapnik Bildo
@@ -354,7 +355,7 @@ eo:
       other: Via leterkesto enhavas {{count}} nelegitajn mesaĝojn
       zero: Via leterkesto ne enhavas nelegitajn mesaĝojn
     license: 
-      title: Datumoj de OpenStreetMap estas licencataj sub la Ĝenerala Licenco de Commons Attribution-Share Alike 2.0
+      title: Datenoj de OpenStreetMap estas disponeblaj laŭ la permesilo Krea Komunaĵo Atribuite-Samkondiĉe 2.0 Ĝenerala
     log_in: ensaluti
     log_in_tooltip: Ensaluti kun ekzistanta konto
     logo: 
@@ -364,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
@@ -520,7 +518,6 @@ eo:
             - tramo
             - tramo
           wood: Arbaro
-        heading: Klarigo de signoj por zomo {{zoom_level}}
     search: 
       search: Serĉi
       search_help: "ekzemploj: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ' aŭ 'poŝtoficejoj proksime de Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>pliaj ekzemploj...</a>"

config/locales/es.yml

@@ -1,7 +1,9 @@
 # Messages for Spanish (Español)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Crazymadlover
+# Author: Johnarupire
+# Author: Locos epraix
 # Author: McDutchie
 # Author: PerroVerd
 # Author: Peter17
@@ -81,6 +83,7 @@ es:
       cookies_needed: Parece que tienes las cookies deshabilitadas. Por favor, habilita las cookies en tu navegador antes de continuar.
     setup_user_auth: 
       blocked: Su acceso a la API ha sido bloqueado. Por favor, haga login en la interfaz web para obtener más información.
+      need_to_see_terms: Su acceso a la API está temporalmente suspendida. Por favor, accede a la web para ver los Términos de Contribución. No es necesario llegar a un acuerdo, pero debes conocerlos.
   browse: 
     changeset: 
       changeset: Conjunto de cambios {{id}}
@@ -193,6 +196,7 @@ es:
       details: Detalles
       drag_a_box: Arrastre en el mapa para dibujar un Área de encuadre
       edited_by_user_at_timestamp: Editado por [[user]] en [[timestamp]]
+      hide_areas: Ocultar áreas
       history_for_feature: Historial de [[feature]]
       load_data: Cargar datos
       loaded_an_area_with_num_features: Ha cargado un Área que contiene [[num_features]] objetos. Por lo general, algunos navegadores web no aguantan bien el mostrar esta candidad de información vectorial. Generalmente, el funcionamiento Óptimo se da cuando se muestran menos de 100 objetos al mismo tiempo; de otra manera, su navegador puede volverse lento o no responder. Si está seguro de que quiere mostrar todos estos datos, puede hacerlo pulsando el botón que aparece debajo.
@@ -215,6 +219,7 @@ es:
           node: Nodo
           way: Vía
       private_user: usuario privado
+      show_areas: Mostrar áreas
       show_history: Mostrar historial
       unable_to_load_size: "Imposible cargar: El tamaño de la envoltura ([[bbox_size]] es demasiado grande (debe ser menor que {{max_bbox_size}})"
       wait: Espere...
@@ -352,6 +357,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
@@ -552,7 +568,6 @@ es:
           tower: Torre
           train_station: Estación de tren
           university: Edificio universitario
-          "yes": Edificio
         highway: 
           bridleway: Camino prioritario para peatones y caballos
           bus_guideway: Canal guiado de autobuses
@@ -875,16 +890,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
@@ -909,14 +931,11 @@ 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
+    sotm2011: Ven a la Conferencia de OpenStreetMap 2011, El Estado del Mapa, del 09 al 11 de septiembre en Denver!
     tag_line: El WikiMapaMundi libre
     user_diaries: Diarios de usuario
     user_diaries_tooltip: Ver diarios de usuario
@@ -1159,8 +1178,11 @@ 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}}.
+      potlatch2_not_configured: Potlatch 2 no ha sido configurado - por favor ver http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 para obtener más información
+      potlatch2_unsaved_changes: Tienes cambios sin guardar. (para guardar en Potlatch 2, haz clic en guardar)
       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.)
       user_page_link: página de usuario
     index: 
@@ -1172,10 +1194,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
@@ -1242,7 +1265,6 @@ es:
           unclassified: Carretera sin clasificar
           unsurfaced: Carretera sin asfaltar
           wood: Madera
-        heading: Leyenda para z{{zoom_level}}
     search: 
       search: Buscar
       search_help: "ejemplos: 'Soria', 'Calle Mayor, Lugo',  'CB2 5AQ', o 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>más ejemplos...</a>"
@@ -1380,6 +1402,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: 
@@ -1398,17 +1421,23 @@ es:
       title: Editar cuenta
       update home location on click: ¿Actualizar tu lugar de origen cuando pulses sobre el mapa?
     confirm: 
+      already active: Esta cuenta ya ha sido confirmada.
+      before you start: Sabemos que puedes tiener muchas ganas de comenzar a mapear, pero antes podría gustarte complementar la información sobre ti mismo en el siguiente formulario.
       button: Confirmar
-      failure: Una cuenta de usuario con esta misma credencial de autentificación ya ha sido confirmada
       heading: Confirmar la cuenta de usuario
       press confirm button: Pulse botón de confirmación de abajo para activar su cuenta.
+      reconfirm: Si ha pasado un tiempo desde que te registraste podrías necesitar <a href="{{reconfirm}}"> enviarte un nuevo aviso de confirmación.
       success: ¡Cuenta confirmada, gracias por registrarse!
+      unknown token: Ese símbolo parece no existir.
     confirm_email: 
       button: Confirmar
       failure: La dirección de correo electrónico ha sido confirmada mediante esta credencial de autentificación
       heading: Confirmar el cambio de dirección de correo electrónico
       press confirm button: Pulse botón de confirmación de debajo para confirmar su nueva dirección de correo
       success: Dirección de correo electrónico confirmada. ¡Gracias por registrarse!
+    confirm_resend: 
+      failure: No se ha encontrado el usuario {{name}}
+      success: Te hemos enviado un nuevo aviso de confirmación a {{email}} y tan pronto confirmes tu cuenta podrás comenzar a mapear <br /><br />Si usas un sistema para control de spam que envie solicitudes de confirmación, asegúrese, por favor, de que incluir en tu lista blanca a webmaster@openstreetmap.org ya que no podemos responder a cualquier solicitud de confirmación.
     filter: 
       not_an_administrator: Necesitas ser administrador para ejecutar esta acción.
     go_public: 
@@ -1425,19 +1454,24 @@ es:
       summary_no_ip: "{{name}} creado el {{date}}"
       title: Usuarios
     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 not active: Lo sentimos, tu cuenta aun no está activa.<br />Por favor usa el enlace que hay en el correo de confirmación para activarla, o <a href="{{reconfirm}}">solicita un nuevo correo de confirmación</a>.
       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
@@ -1464,7 +1498,7 @@ es:
       display name description: Tu nombre de usuario público. Puedes cambiarlo más tarde en "preferencias".
       email address: Dirección de correo
       fill_form: Llenar el formulario y te enviaremos un mensaje de correo rápidamente para activar tu cuenta.
-      flash create success message: El usuario ha sido creado con éxito. Revisa tu cuenta de correo electrónico, donde deberás encontrar una nota de confirmación, y estarás colaborando con los mapas en un abrir y cerrar de ojos. :-)<br /><br />Por favor, toma en consideracón que no podrás acceder hasta que hayas recibido la nota y confirmado tu dirección de correo electrónico,.<br /><br />Si utilizas un sistema de bloqueo de correo no deseado que envía solicitudes de confirmación, asegúrate por favor de que incluyas entre tus remitentes seguros a webmaster@openstreetmap.org, puesto que nosotros no podemos responder solicitudes de confirmación.
+      flash create success message: Gracias por registrarte. Te enviamos un correo de confirmación a {{email}} y tan pronto como confirmes tu cuenta podrás estar listo para mapear :-). <br /><br />Por favor, considera que no podrás acceder hasta que hayas recibido el aviso y confirmado tu dirección de correo electrónico,.<br /><br />Si utilizas un sistema de bloqueo de correo no deseado que envía solicitudes de confirmación, asegúrate por favor de que incluyas entre tus remitentes seguros a webmaster@openstreetmap.org, puesto que nosotros no podemos responder solicitudes de confirmación.
       heading: Crear una cuenta de usuario
       license_agreement: Cuando confirmas tu cuenta necesitarás aceptar los <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">términos del contribuyente</a>.
       no_auto_account_create: Desafortunadamente no estamos actualmente habilitados para crear una cuenta para ti automáticamente.
@@ -1531,6 +1565,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

config/locales/et.yml

@@ -1,12 +1,17 @@
 # Messages for Estonian (Eesti)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # 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
@@ -19,6 +24,7 @@ et:
         latitude: Laiuskraadid
         longitude: Pikkuskraadid
         name: Nimi
+        public: Avalik
         size: Suurus
         user: Kasutaja
         visible: Nähtav
@@ -30,38 +36,232 @@ 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
+      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:"
+      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: 
+        node: Sõlm
+        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 »
+      previous: "« 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
@@ -71,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: 
@@ -78,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
@@ -97,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
@@ -112,6 +328,7 @@ et:
           post_office: Postkontor
           preschool: Lasteaed
           prison: Vangla
+          pub: Pubi
           reception_area: Vastuvõtt
           restaurant: Restoran
           retirement_home: Vanadekodu
@@ -126,83 +343,121 @@ 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
-          park: Park
+          nature_reserve: Looduskaitseala
+          park: park
+          pitch: Spordiväljak
           playground: Mänguväljak
           sports_centre: Spordikeskus
           stadium: Saadion
-          swimming_pool: Ujula
+          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
+          airport: lennujaam
           city: Linn
-          country: Riik
+          country: riik
           county: Maakond
-          house: Maja
+          farm: talu
+          house: maja
           houses: Majad
           island: Saar
           islet: Saareke
+          moor: Raba
           municipality: Vald
           postcode: Sihtnumber
+          sea: meri
           state: Osariik
           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
@@ -228,46 +483,129 @@ et:
           toys: Mänguasjapood
           travel_agency: Reisiagentuur
         tourism: 
+          alpine_hut: Alpimaja
           attraction: Turismiatraktsioon
           camp_site: Laagriplats
-          guest_house: Külalistemaja
+          guest_house: külalistemaja
+          hostel: Hostel
           hotel: Hotell
-          information: Informatsioon
-          motel: Motell
-          museum: Muuseum
-          picnic_site: Piknikuplats
+          information: informatsioon
+          motel: motell
+          museum: muuseum
+          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
+      my_inbox: Minu postkast
+      outbox: Saadetud kirjad
+      people_mapping_nearby: lähedalolevad kaardistajad
+      subject: Teema
+      title: Saabunud kirjad
+      you_have: Sul on {{new_count}} uusi sõnumeid ja {{old_count}} vanad sõnumid
+    mark: 
+      as_read: Sõnum on märgitud loetuks
+      as_unread: Sõnum on märgitud kui lugemata
     message_summary: 
       delete_button: Kustuta
       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: 
       delete_button: Kustuta
   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: 
@@ -276,10 +614,19 @@ 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
       title: Redigeeri oma avaldust
+    form: 
+      name: Nimi
     index: 
       application: Avalduse nimi
     new: 
@@ -288,21 +635,93 @@ et:
   site: 
     edit: 
       user_page_link: kasutajaleht
+    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: 
+            - 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: 
       close: Sulge
       search_results: Otsingu tulemused
+  time: 
+    formats: 
+      friendly: "%e %B %Y kell %H:%M"
   trace: 
+    create: 
+      upload_trace: Laadi üles GPS-rada
     edit: 
       description: "Kirjeldus:"
       download: laadi alla
@@ -313,18 +732,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?
+      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
@@ -334,67 +768,170 @@ et:
       owner: "Omanik:"
       points: "Punktid:"
       start_coordinates: "Alguskoordinaadid:"
+      tags: "Sildid:"
+      uploaded: "Üles laaditud:"
       visibility: "Nähtavus:"
   user: 
     account: 
+      contributor terms: 
+        heading: "Kaastöö tingimused:"
+        link text: Mis see on?
+      current email address: "Praegune e-posti aadress:"
+      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: 
-        disabled link text: miks ma ei saa redigeerida?
-        enabled link text: mis see on?
+        disabled link text: Miks ma ei saa kaarti töödelda?
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: Mis see on?
+        heading: "Avalikud seaded:"
+      public editing note: 
+        heading: Avalik toimetamine
+      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: 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: "{{name}} loodud {{date}}"
+      title: Kasutajad
     login: 
-      create_account: loo uus kasutajanimi
+      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
+      logout_button: Logi välja
+      title: Logi välja
     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."
     new: 
       confirm email address: "Kinnita e-posti aadress:"
       confirm password: "Kinnita parool:"
+      continue: Jätka
+      display name: "Kuvatav nimi:"
+      display name description: Avalikult kuvatud kasutajanimi. Seda saate muuta hiljem eelistustes.
       email address: "E-posti aadress:"
+      fill_form: Täitke vorm ning me saadame teile e-posti konto aktiveerimiseks.
       heading: Loo uus kasutajanimi
       password: "Parool:"
+      title: Loo uus konto
+    popup: 
+      friend: Sõber
+      nearby mapper: Lähedaloevad kaardistajad
+      your location: Sinu asukoht
+    remove_friend: 
+      not_a_friend: "{{name}} ei ole üks sinu sõpradest."
     reset_password: 
       confirm password: "Kinnita parool:"
       flash changed: Sinu parool on muudetud.
+      heading: Lähtesta parool kasutajale {{user}}
       password: "Parool:"
+      reset: Lähtesta parool
+      title: Lähtesta parool
+    set_home: 
+      flash success: Kodukoht edukalt salvestatud
+    terms: 
+      agree: Nõus
+      consider_pd_why: Mis see on?
+      decline: Langus
+      legale_names: 
+        france: Prantsusmaa
+        italy: Itaalia
+        rest_of_world: Muu maailm
+      legale_select: "Palun valige oma elukohariik:"
     view: 
       activate_user: aktiveeri see kasutaja
       add as friend: lisa sõbraks
+      ago: ({{time_in_words_ago}} tagasi)
+      confirm: Kinnita
       create_block: blokeeri see kasutaja
       delete_user: kustuta see kasutaja
       description: Kirjeldus
       diary: päevik
       edits: muudatused
       email address: "E-posti aadress:"
+      hide_user: peida see kasutaja
       km away: "{{count}} kilomeetri kaugusel"
       m away: "{{count}} meetri kaugusel"
+      mapper since: "Kaardistaja alates:"
       my diary: minu päevik
+      my edits: minu muutmised
+      my settings: minu seaded
+      my traces: minu jäljelogid
+      nearby users: Teised lähedal asuvad kasutajad
       new diary entry: uus päevikusissekanne
+      no friends: Sa ei ole lisanud veel ühtegi sõpra.
+      no nearby users: Puuduvad teised kasutajad, kes tunnistavad, et kaardistavad läheduses.
+      oauth settings: oauth seaded
+      remove as friend: Eemalda sõprade hulgast
       role: 
         administrator: See kasutaja on administraator
         moderator: See kasutaja on moderaator
       send message: saada sõnum
+      settings_link_text: seaded
+      spam score: "Rämpsposti tulemus:"
+      status: "Staatus:"
+      traces: jäljelogid
+      user location: Kasutaja asukoht
       your friends: Sinu sõbrad
   user_block: 
     edit: 
       back: Vaata kõiki blokeeringuid
+    filter: 
+      not_a_moderator: Selle tegevuse sooritamiseks pead sa olema moderaator.
     new: 
       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?
+      edit: Redigeeri
+      revoker: Tühistaja
+      show: Näita
+      status: Olek
+      time_future: Lõpeb {{time}}
   user_role: 
+    grant: 
+      confirm: Kinnita
     revoke: 
       confirm: Kinnita

config/locales/eu.yml

@@ -1,10 +1,12 @@
 # Messages for Basque (Euskara)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
+# Author: 9and3r
 # Author: An13sa
 # Author: Asieriko
 # Author: MikelEH
 # Author: PerroVerd
+# Author: Xabier Armendaritz
 eu: 
   activerecord: 
     attributes: 
@@ -15,8 +17,10 @@ eu:
         latitude: Latitude
         longitude: Longitude
         title: Izenburua
+        user: Erabiltzailea
       friend: 
         friend: Lagun
+        user: Erabiltzailea
       message: 
         body: Testua
         sender: Igorlea
@@ -28,6 +32,7 @@ eu:
         name: Izena
         public: Publikoa
         size: Tamaina
+        user: Erabiltzailea
       user: 
         description: Deskribapen
         email: Eposta
@@ -76,6 +81,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
@@ -87,9 +93,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
@@ -101,6 +110,9 @@ eu:
       details: Xehetasunak
       loading: Kargatzen...
       object_list: 
+        back: Objetu zerrenda erakutsi
+        details: Xehetasunak
+        heading: Objetu zerrenda
         history: 
           type: 
             node: "[[id]]. nodoa"
@@ -112,10 +124,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
@@ -128,6 +144,7 @@ eu:
     way_history: 
       download: "{{download_xml_link}} edo {{view_details_link}}"
       download_xml: XML jaitsi
+      view_details: xehetasunak ikusi
   changeset: 
     changeset: 
       anonymous: Anonimoa
@@ -137,7 +154,9 @@ eu:
       next: Hurrengoa »
       previous: "« Aurrekoa"
     changesets: 
+      id: ID
       saved_at: Noiz gordeta
+      user: Erabiltzailea
   diary_entry: 
     diary_comment: 
       confirm: Baieztatu
@@ -164,6 +183,13 @@ eu:
       leave_a_comment: Iruzkin bat utzi
       login: Saioa hasi
       save_button: Gorde
+  editor: 
+    potlatch: 
+      name: Potlatch 1
+    potlatch2: 
+      name: Potlatch 2
+    remote: 
+      name: Urrutiko Agintea
   export: 
     start: 
       export_button: Esportatu
@@ -175,6 +201,7 @@ eu:
       licence: Lizentzia
       longitude: "Lon:"
       mapnik_image: Mapnik irudia
+      max: max
       options: Aukerak
       osm_xml_data: OpenStreetMap XML Data
       osmarender_image: Osmarender irudia
@@ -214,6 +241,7 @@ eu:
           auditorium: Entzunareto
           bank: Banku
           bar: Taberna
+          bench: Eserleku
           bicycle_rental: Txirrindu Alokairua
           brothel: Putetxe
           bureau_de_change: Diru-truke Bulegoa
@@ -225,6 +253,7 @@ eu:
           cinema: Zinema
           clinic: Klinika
           club: Diskoteka
+          college: Kolegioa
           community_centre: Komunitate Zentroa
           courthouse: Epaitegia
           crematorium: Errauste labe
@@ -240,6 +269,7 @@ eu:
           fountain: Iturri
           grave_yard: Hilerri
           gym: Osasun Zentroa / Gimnasioa
+          hall: Aretoa
           health_centre: Osasun Zentroa
           hospital: Ospitalea
           hotel: Hotel
@@ -265,6 +295,7 @@ eu:
           public_market: Herri Azoka
           recycling: Birziklatze gune
           restaurant: Jatetxe
+          retirement_home: Nagusien etxea
           sauna: Sauna
           school: Ikastetxe
           shop: Denda
@@ -300,7 +331,6 @@ eu:
           tower: Dorre
           train_station: Tren Geltokia
           university: Unibertsitate eraikina
-          "yes": Eraikina
         highway: 
           bus_stop: Autobus-geraleku
           construction: Eraikitze-lanetan dagoen Autopista
@@ -335,6 +365,8 @@ eu:
         landuse: 
           cemetery: Hilerri
           commercial: Merkataritza Eremua
+          construction: Eraikuntza
+          farm: Baserria
           forest: Baso
           meadow: Larre
           military: Eremu Militarra
@@ -466,6 +498,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
@@ -495,6 +528,8 @@ eu:
   layouts: 
     edit: Aldatu
     export: Esportatu
+    help: Laguntza
+    help_centre: Laguntza Zentroa
     history: Historia
     home: hasiera
     inbox: sarrera-ontzia ({{count}})
@@ -508,14 +543,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: 
@@ -558,6 +596,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: 
@@ -585,6 +625,8 @@ eu:
       submit: Aldatu
     form: 
       name: Izena
+    show: 
+      allow_write_api: mapa aldatu.
   site: 
     edit: 
       user_page_link: Lankide orria
@@ -608,7 +650,7 @@ eu:
           golf: Golf-zelai
           industrial: Industrialdea
           lake: 
-            - Laku
+            - Aintzira
             - urtegia
           military: Eremu militarra
           motorway: Autobidea
@@ -634,9 +676,12 @@ eu:
       where_am_i: Non nago?
     sidebar: 
       close: Itxi
+  time: 
+    formats: 
+      friendly: "%e %B %Y %H:%M-ean"
   trace: 
     edit: 
-      description: "Deskribapen:"
+      description: "Deskribapena:"
       download: jaitsi
       edit: aldatu
       filename: "Fitxategi izena:"
@@ -644,8 +689,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}}
@@ -662,30 +709,40 @@ eu:
       description: Deskribapena
       help: Laguntza
       tags: "Etiketak:"
-      upload_button: Kargatu
-      visibility: Ikuspen
+      upload_button: Igo
+      upload_gpx: GPX fitxategi igo
+      visibility: Ikusgarritasuna
+      visibility_help: Zer esan nahi du honek?
     trace_optionals: 
       tags: Etiketak
     trace_paging_nav: 
       next: Hurrengoa »
       previous: "« Aurrekoa"
     view: 
-      description: "Deskribapen:"
+      description: "Deskribapena:"
       download: jaitsi
       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?
@@ -712,20 +769,26 @@ 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
       title: Saio-itxiera
     lost_password: 
-      email address: "Eposta Helbidea:"
+      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:"
-      email address: "Helbide elektronikoa:"
+      continue: Jarraitu
+      display name: "Erakusteko izena:"
+      email address: "Eposta Helbidea:"
       heading: Erabiltzaile Kontua sortu
       password: "Pasahitza:"
       title: Kontua sortu
@@ -741,28 +804,46 @@ 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?
+      decline: Ez onartu
       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:"
+      email address: "Eposta helbidea:"
       hide_user: Erabiltzaile hau ezkutatu
       km away: "{{count}} km-tara"
       m away: "{{count}} m-tara"
       mapper since: "Noiztik mapatzaile:"
+      my diary: nire egunerokoa
       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: 

config/locales/fa.yml

@@ -1,7 +1,11 @@
 # Messages for Persian (فارسی)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Grille chompa
+# Author: Huji
+# Author: Reza1615
+# Author: Sahim
+# Author: Wayiran
 fa: 
   activerecord: 
     attributes: 
@@ -9,18 +13,26 @@ fa:
         language: زبان
         latitude: عرض جغرافیایی
         longitude: طول جغرافیایی
+        title: عنوان
         user: کاربر
       friend: 
         friend: دوست
         user: کاربر
+      message: 
+        title: عنوان
       trace: 
+        description: توضیح
         latitude: عرض جغرافیایی
         longitude: طول جغرافیایی
         name: نام
+        size: اندازه
         user: کاربر
       user: 
+        email: پست الکترونیکی
+        languages: زبان ها
         pass_crypt: کلمه عبور
     models: 
+      changeset: مجموعه تغییرات
       country: کشور
       friend: دوست
       language: زبان
@@ -30,39 +42,126 @@ fa:
       user: کاربر
       way: راه
   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: "متعلق به :"
+      bounding_box: جعبه مرزی
+      box: جعبه
+      closed_at: "بسته شده بر:"
+      created_at: "ایجاد توسط:"
+      has_nodes: 
+        other: "یک=دارای {{count}} نقطه:"
+      has_relations: 
+        other: "یک=دارای {{count}} مرتبط:"
+      has_ways: 
+        other: "یک=دارای {{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}})
+    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_xml: بارگیری XML
       edit: ویرایش
       node: گره
       node_title: "گره: {{node_name}}"
+      view_history: نمایش تاریخچه
     node_details: 
+      coordinates: "مختصات:"
       part_of: "قسمتی از:"
+    node_history: 
+      download: "{{download_xml_link}} یا {{view_details_link}}"
+      download_xml: بارگیری XML
+      node_history: تاریخچه منطقه
+      node_history_title: "تاریخچه منطقه: {{node_name}}"
+      view_details: نمایش جزئیات
     not_found: 
+      sorry: با عرض پوزش ، {{type}} با شناسه {{id}} ،یافت نمی‌شود.
       type: 
+        changeset: مجموعه تغییرات
         node: گره
         relation: ارتباط
         way: راه
     paging_nav: 
       of: از
+      showing_page: صفحه نمایش
     relation: 
+      download: "{{download_xml_link}} یا {{view_history_link}}"
+      download_xml: بارگیری XML
       relation: ارتباط
       relation_title: "ارتباطات: {{relation_name}}"
+      view_history: نمایش تاریخچه
     relation_details: 
+      members: "اعضا:"
       part_of: "قسمتی از:"
+    relation_history: 
+      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: 
         node: گره
         relation: ارتباط
         way: راه
+    start: 
+      manually_select: به صورت دستی منطقه دیگری را انتخاب کنید
+      view_data: مشاهده اطلاعات برای نمایش نقشه فعلی
     start_rjs: 
+      data_frame_title: داده ها
+      data_layer_name: داده ها
       details: جزئیات
+      drag_a_box: " جعبه‌ای را روی نقشه برای انتخاب یک منطقه بکشید"
+      edited_by_user_at_timestamp: "[[timestamp]] در [[user]] ویرایش توسط"
+      history_for_feature: "[[feature]] تاریخچه برای"
+      load_data: بارگذاری داده ها
+      loaded_an_area_with_num_features: "  شما منطقه‌ای را بارگذاری کردید که شامل[[num_features]] می‌شود. به طورکلی بعضی از مرورگرها نمی توانند با این مقدار اطلاعات تصویری کار کنند.کلا مرورگرها برای نمایش اطلاعات کمتر از 100 مورد در زمان  در بهترین وضعیت هستند: و هر میزان دیگر میتواند مرورگر ار کند  یا قفل کند.اگر شما میخواهید این اطلاعات دیده شود دکمه زیر را فشار دهید."
+      loading: در حال بارگذاری…
+      manually_select: به صورت دستی منطقه دیگری را انتخاب کنید
       object_list: 
+        api: بازیابی این منطقه از ای‌پی‌آی
+        back: نمایش فهرست موضوع
         details: جزئیات
+        heading: لیست اجزاء
         history: 
           type: 
             node: گره [[id]]
@@ -74,27 +173,59 @@ fa:
         type: 
           node: گره
           way: راه
+      private_user: کاربر شخصی
+      show_history: نمایش سابقه
+      unable_to_load_size: "نمی‌تواند بارگذاری کند: اندازه جعبه ارتباطی [[bbox_size]] خیلی زیاد هست و باید کمتر از {{max_bbox_size}} باشد"
+      wait: صبر کنید...
+      zoom_or_select: بزگنمایی کنید یا بخشی از منطقه را برای دیدن انتخاب کنید
     tag_details: 
       tags: "برچسب‌ها:"
+      wiki_link: 
+        key: " {{key}} توضیحات صفحه ویکی برای برچسب"
+        tag: " {{key}} = {{value}} توضیحات صفحه ویکی برای برچسب"
+      wikipedia_link: صفحه {{page}} مقاله در ویکی‌پدیا
     timeout: 
+      sorry: با عرض پوزش ، داده ها برای {{type}} با شناسه {{id}} ، زمان بیش از حد طولانی برای بازیابی میبرد
       type: 
+        changeset: مجموعه تغییرات
         node: گره
         relation: ارتباط
         way: راه
     way: 
       download: "{{download_xml_link}}، {{view_history_link}} یا {{edit_link}}"
+      download_xml: بارگیری XML
       edit: ویرایش
+      view_history: نمایش تاریخچه
       way: راه
       way_title: "راه: {{way_name}}"
     way_details: 
+      also_part_of: 
+        other: "همچنین بخشی از مسیرها {{related_ways}} "
       nodes: "گره ها :"
       part_of: "قسمتی از:"
+    way_history: 
+      download: "{{download_xml_link}} یا {{view_details_link}}"
+      download_xml: بارگیری XML
+      view_details: نمایش جزئیات
+      way_history: تاریخچه مسیر
+      way_history_title: "تاریخچه مسیر : {{way_name}}"
   changeset: 
     changeset: 
+      anonymous: گمنام
       big_area: (بزرگ)
+    changeset_paging_nav: 
+      next: بعدی »
+      previous: "« قبلی"
     changesets: 
       user: کاربر
   diary_entry: 
+    diary_comment: 
+      confirm: تأیید
+    diary_entry: 
+      comment_count: 
+        one: 1 نظر
+        other: "{{count}} نظر"
+      confirm: تأیید
     edit: 
       language: "زبان:"
       latitude: "عرض جغرافیایی:"
@@ -102,14 +233,61 @@ fa:
       save_button: ذخیره
     location: 
       edit: ویرایش
+      view: نمایش
     view: 
+      login: ورود به سیستم
       save_button: ذخیره
+  editor: 
+    default: پیش‌فرض (در حال حاضر {{name}})
+    potlatch: 
+      description: جلسه ۱ (در مرورگر ویرایشگر)
+      name: Potlatch 1
+    potlatch2: 
+      description: جلسه ۲ (در مرورگر ویرایشگر)
+      name: Potlatch 2
+    remote: 
+      description: کنترل از راه دور (JOSM یا Merkaartor)
+      name: کنترل از راه دور
   export: 
     start: 
+      add_marker: اضافه کردن نشانگر به نقشه
+      area_to_export: برون‌بری منطقه
+      embeddable_html: درج اچ‌تی‌ام‌ال
+      export_button: برون‌بری
+      export_details: اطلاعات نقشه‌باز‌شهری تحت مجوز <a href="http://creativecommons.org/licenses/by-sa/2.0/">  کریتیو کانز اشتراک‌یکسان 2 است
+      format: قالب
+      format_to_export: قالب برای خروجی‌سازی
+      image_size: اندازه تصویر
       latitude: "عرض:"
+      licence: اجازه‌نامه
       longitude: "طول:"
+      manually_select: به صورت دستی منطقه دیگری را انتخاب کنید
+      mapnik_image: Mapnik تصویر
+      max: حداکثر
       options: تنظیمات
+      osm_xml_data: داده‌های XML نقشه‌باز‌شهری
+      osmarender_image: تصویر پردازش شده نقشه‌باز‌شهری
+      output: خروجی
+      paste_html: برای تعبیه کردن در وب‌گاه اچ‌تی‌ام‌ال را پیست کنید
+      scale: مقیاس
+      too_large: 
+        body: این منطقه برای خروجی سازی  در قالب XML بسیار بزرگ است لطفا پس از بزرگنمایی منطقه کوچکتری را انتخاب کنید
+        heading: منطقه بیش از حد بزرگ
+      zoom: بزگ‌نمایی
+    start_rjs: 
+      add_marker: اضافه کردن نشانگر به نقشه
+      change_marker: تغییر موقعیت نشانه‌گذار
+      click_add_marker: برای اضافه کردن نشانگر بر روی نقشه کلیک کنید
+      drag_a_box: " جعبه‌ای را روی نقشه برای انتخاب یک منطقه بکشید"
+      export: صدور
+      manually_select: به صورت دستی منطقه دیگری را انتخاب کنید
+      view_larger_map: نمایش نقشه بزرگتر
   geocoder: 
+    description: 
+      types: 
+        cities: شهرها
+        places: مکانها
+        towns: شهرستانها
     description_osm_namefinder: 
       prefix: "{{distance}} {{direction}} {{type}}"
     direction: 
@@ -121,6 +299,19 @@ fa:
       south_east: جنوب شرقی
       south_west: جنوب غربی
       west: غرب
+    distance: 
+      one: تقریباً 1کیلومتر
+      other: تقریباً {{count}}کیلومتر
+      zero: کمتر از 1کیلومتر
+    search: 
+      title: 
+        ca_postcode: نتایج <a href="http://geocoder.ca/">Geocoder.CA</a>
+        geonames: نتایج <a href="http://www.geonames.org/">GeoNames</a>
+        latlon: نتایج <a href="http://openstreetmap.org/">داخلی</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: ", {{distance}} {{direction}} {{placename}}"
@@ -143,6 +334,7 @@ fa:
           fuel: پمپ بنزین
           hospital: بیمارستان
           hotel: هتل
+          ice_cream: بستنی فروشی
           kindergarten: کودکستان
           library: کتابخانه
           market: بازار
@@ -159,48 +351,72 @@ fa:
           recycling: بازیافت
           restaurant: رستوران
           school: مدرسه
+          shop: فروشگاه
           supermarket: سوپرمارکت
           taxi: تاکسی
           theatre: تئاتر
+          toilets: توالت
           townhall: شهر داری
           university: دانشگاه
           waste_basket: سطل اشغال
         building: 
+          church: کلیسا
           garage: گاراژ
+          hospital: ساختمان بیمارستان
           hotel: هتل
           house: خانه
+          shop: فروشگاه
           stadium: ورزشگاه
           tower: برج
         highway: 
           bus_stop: ایستگاه اتوبوس
+          footway: پیاده رو
+          gate: دروازه
           motorway: اتوبان
           path: مسیر
+          pedestrian: پیاده راه
+          residential: مسکونی
           road: جاده
           steps: پله
           trunk: بزرگراه
+          trunk_link: بزرگراه
         historic: 
           castle: قلعه
+          church: کلیسا
           museum: موزه
           tower: برج
         landuse: 
+          cemetery: گورستان
           farmland: زمین کشاورزی
           forest: جنگل
+          mine: معدن
           mountain: کوه
           park: پارک
           railway: ریل
         leisure: 
+          fishing: نواحی ماهی‌گیری
           garden: باغ
+          marina: تفریح‌گاه ساحلی
           park: پارک
           stadium: ورزشگاه
+          swimming_pool: استخر شنا
         natural: 
+          bay: خالیج
           beach: ساحل
+          cave_entrance: ورودی غار
           channel: کانال
           coastline: ساحل
+          fell: قطع کردن
+          glacier: یخچال طبیعی
           hill: تپه
           island: جزیره
+          moor: دشت
+          mud: گل
+          peak: قله
           point: نقطه
           river: رود خانه
           rock: صخره
+          spring: بهار
           tree: درخت
           valley: دره
           volcano: کوه آتشفشان
@@ -213,39 +429,106 @@ fa:
           farm: مزرعه
           house: خانه
           island: جزیره
+          islet: جزیره کوچک
+          locality: محل
+          postcode: کدپستی
           sea: دریا
           suburb: محله
           town: شهر
           village: دهکده
         shop: 
           bakery: نانوایی
+          books: فروشگاه کتاب
           butcher: قصاب
+          greengrocer: سبزی فروش
           kiosk: کیوسک
+          laundry: خشکشویی
           market: بازار
           supermarket: سوپرمارکت
         tourism: 
+          artwork: آثار هنری
+          attraction: جاذبه
+          bed_and_breakfast: تخت‌خواب و صبحانه
+          cabin: اطاق
+          camp_site: محل اردوگاه
+          chalet: کلبه ییلاقی
+          hostel: هتل
           hotel: هتل
+          information: اطلاعات
           motel: متل
           museum: موزه
           valley: دره
           zoo: باغ وحش
         waterway: 
           canal: کانال
+          dam: سد
           river: رودخانه
           waterfall: ابشار
+  html: 
+    dir: rtl
+  javascripts: 
+    map: 
+      base: 
+        noname: بینام
+  layouts: 
+    copyright: کپی رایت و مجوز
+    edit: ویرایش
+    export: صدور
+    help: راهنما
+    history: تاریخچه
+    intro_3_partners: ویکی‌
+    log_in: ورود به سیستم
+    logout: خروج
+    logout_tooltip: خروج از سیستم
+    make_a_donation: 
+      text: کمک مالی
+      title: OpenStreetMap پشتیبانی با اهداء پولی
+    sign_up: ثبت نام
+    user_diaries: یادداشت کاربر
+    view: نمایش
+    view_tooltip: نمایش نقشه
+    welcome_user: خوش آمدید، {{user_link}}
+    wiki: ویکی‌
+  license_page: 
+    foreign: 
+      english_link: اصل انگلیسی
+      text: در زمان به وجود آمدن تداخل بین ترجمه  فارسی و {{english_original_link}} متن انگلیسی در اولویت است
+      title: درباره این ترجمه‌ها
+    native: 
+      mapping_link: شروع به نقشه‌کشی
+      native_link: THIS_LANGUAGE_NAME_HERE نسخه
+      text: شما در حال مشاهده ویرایش انگلیسی قانون کپی‌رایت هستید.  برای دیدن {{native_link}}  می توانید به عقب باز گردید یا خواندن متن کپی رایت و {{mapping_link}} را متوقف کنید
+      title: درباره این صفحه
   message: 
     inbox: 
       date: تاریخ
       from: از
+      my_inbox: صندوق دریافتی من
+      outbox: صندوق خروجی
+      subject: عنوان
+      title: صندوق دریافتی
+    message_summary: 
+      delete_button: حذف
+      reply_button: پاسخ
+    new: 
+      send_button: ارسال
       subject: عنوان
     outbox: 
       date: تاریخ
+      inbox: صندوق دریافتی
+      my_inbox: "{{inbox_link}} من"
+      outbox: صندوق خروجی
       subject: عنوان
+      title: صندوق خروجی
       to: به
     read: 
       date: تاریخ
       from: از
+      reply_button: پاسخ
+      subject: عنوان
       to: به
+    sent_message_summary: 
+      delete_button: حذف
   notifier: 
     diary_comment_notification: 
       hi: سلام {{to_user}} ،
@@ -269,73 +552,368 @@ fa:
     form: 
       name: نام
   site: 
+    index: 
+      license: 
+        project_name: پروژه OpenStreetMap
     key: 
       table: 
         entry: 
           cemetery: گورستان
           farm: مزرعه
           forest: جنگل
+          golf: زمین گلف
           lake: 
             - دریاچه
           motorway: اتوبان
           park: پارک
+          runway: 
+            - باند فرودگاه
           school: 
             - مدرسه
             - دانشگاه
+          subway: مترو
           summit: 
             - قله
             - قله
           trunk: بزرگراه
+    search: 
+      search: جستجو
+      search_help: "مثال : 'نامجو ۱۶، مشهد' ، 'CB2 5AQ' ، 'post offices near تهران' <a href='http://wiki.openstreetmap.org/wiki/Search'>مثالها ادامه...</a>"
+      submit_text: برو
+      where_am_i: من کجا هستم؟
     sidebar: 
       close: بستن
+      search_results: نتایج جستجو
+  time: 
+    formats: 
+      friendly: "%e %B %Y ساعت %H:%M"
   trace: 
+    create: 
+      trace_uploaded: پروندهٔ GPX شما بارگذاری شده است و در انتظار درج در پایگاه داده است. این کار معمولاً نیم ساعت طول می‌کشد و در صورت تکمیل، رایانامه‌ای به شما فرستاده خواهد شد.
+      upload_trace: ارسال ردیابی جی‌پی‌اس
+    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: مسیر‌های جی‌پی‌اس عمومی
+      public_traces_from: مسیر جی‌پی‌اس عمومی از {{user}}
+      tagged_with: با  {{tags}} برچسب بزنید
+      your_traces: آثار جی‌پی‌اس شما
+    make_public: 
+      made_public: رسم‌کردن عمومی
+    no_such_user: 
+      body: شرمند کاربری با نام {{user}} وجود ندارد. لطفا اسم کاربر را از نو وارد کنید  یا ممکن است لینکی را که شما انتخاب کرده‌اید اشتباه باشد
+      heading: کاربر {{user}} وجود ندارد
+      title: چنین کاربری وجود ندارد
+    offline: 
+      heading: ذخیره بدون اینترنت جی‌پی‌اس
+      message: ذخیره جی‌پی‌اس و بارگذاری سامانه غیرقابل دسترس می‌باشد
+    offline_warning: 
+      message: سامانه بارگذاری جی‌پی‌اکس غیرقابل دسترس می‌باشد
     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: توضیح
       help: راهنما
       tags: برچسب‌ها
+      tags_help: ویرگول مرزبندی شده
+      upload_button: بارگذاری
+      upload_gpx: ارسال پرونده GPX
+      visibility: پدیداری
+      visibility_help: حد وسط این چیست؟
+    trace_header: 
+      see_all_traces: دیدن همه رهگیری‌ها
+      see_your_traces: دیدن تمام رهگیری‌های شما
+      upload_trace: بارگذاری یک رهگیری
+      your_traces: ‌‌دیدن فقط رهگیری‌های شما
     trace_optionals: 
       tags: برچسب‌ها
+    trace_paging_nav: 
+      next: بعدی &raquo;
+      previous: "&laquo; قبلی"
+      showing_page: نمایش صفحه {{page}}
     view: 
+      delete_track: حذف این رهگیری
+      description: "شرح:"
+      download: بارگیری
       edit: ویرایش
+      edit_track: ویرایش این رهگیری
+      filename: "نام پرونده:"
+      heading: دیدن رهگیری {{name}}
       map: نقشه
+      none: هیچ کدام
+      owner: "مالک:"
+      pending: انتظار
+      points: "نقاط:"
+      start_coordinates: "شروع مختصات :"
       tags: "برچسب‌ها:"
+      title: دیدن رهگیری {{name}}
+      trace_not_found: رهگیری یافت نشد!
+      uploaded: ":بارگذاری شد"
+      visibility: "پدیداری:"
+    visibility: 
+      identifiable: "  قابل تشخیص(نقاط مرتب شده بر اساس زمان را در فهرست پیگیری به عنوان قابل تشخیص نشان دهید)"
+      private: خصوصی (فقط به عنوان ناشناس ، نقاط نامشخص)
+      public: عمومی (نقاط مرتب نشده را در فهرست پیگیری به عنوان ناشناس  نمایش دهید(
+      trackable: (قابل پیگیری (نقاط مرتب شده بر اساس زمان را تنها به عنوان ناشناس به اشتراک بگذارید
   user: 
     account: 
+      contributor terms: 
+        agreed: شما باید با شرایط کاربرهای جدید موافقت کنید
+        agreed_with_pd: شما اقرار کردید که ویرایش‌های شما به صورت عمومی ارائه گردند
+        heading: "شرایط شرکت‌کنندگان:"
+        link text: این چیست؟
+        not yet agreed: شما هنوز با شرایط کار جدی موافقت نکردید
+        review link text: برای آسودگی خود این پیوند را دنبال کنید تا شرایز کاربر جدید را مطالعه و موافقت کنید
+      current email address: "آدرس رایانامهٔ فعلی:"
+      delete image: حذف تصویر فعلی
+      email never displayed publicly: (هرگز به صورت عمومی نمایش داده نشود)
+      flash update success: اطلاعات کاربر با موفقیت به روز شد.
+      flash update success confirm needed: اطلاعات کاربر با موفقیت به روز شد . پست‌الکترونیک خود را برای مشاهده تائید نشانی پست‌الکترونیک جدید  چک کنید
+      home location: "موقعیت خانه:"
       image: "تصویر :"
+      image size hint: (مربع عکس‌ها حداقل 100 در 100 بهترین کار)
+      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: 
+        disabled: غیر فعال شده است و تمام ویرایش‌های قبلی به‌صورت  ناشناس هستند
+        disabled link text: چرا من نمی‌توانم ویرایش کنم؟
+        enabled: فعال شدید.ناشناس نیستید و می‌توانید اطلاعات را ویرایش کنید
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: این چیست؟
+        heading: "ویرایش عمومی:"
+      public editing note: 
+        heading: ویرایش عمومی
+      replace image: " تصویر فعلی را جایگزین کنید"
+      return to profile: بازگشت به محل مشخصات
+      save changes button: "ذخیرهٔ تغییرات:"
+      title: "ویرایش حساب:"
+      update home location on click: آیا وقتی که روی نقشه کلیک میکنید  موقعیت خانه را به روز کنم ؟
+    confirm: 
+      already active: این حساب کاربری در حال حاضر تأیید شده است.
+      button: تایید
+      heading: تایید حساب کاربر
+      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: 
+      already have: آیا اشتراک کاربری نقشه‌باز‌شهری دارید؟ لطفا با حساب کاربری وارد شوید
+      email or username: "رایانامه یا نام کاربری:"
       heading: ورود به سیستم
       login_button: ورود
+      new to osm: به نقشهٔ باز شهری جدید؟
       password: "کلمه عبور:"
+      remember: "به‌خاطر سپردن من:"
       title: ورود به سیستم
+      webmaster: مدیر تارنما
+    logout: 
+      heading: خروج از نقشه باز شهری
+      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: شما در حال حاضر دوست با {{name}} هستید.
+      failed: شرمنده افزودن {{name}} به عنوان دوست انجام نشد
+      success: "{{name}} الان از دوستان شما هست."
     new: 
+      confirm email address: "تایید نشانی رایانامه:"
+      confirm password: "تایید گذرواژه:"
+      contact_webmaster: لطفا با  <a href="mailto:webmaster@openstreetmap.org">سرپرست</a> برای ساختن حساب کاربری هماهنگی  کنید و تماس بگیرید  - ما سعی میکنیم به درخواست ‌ها به سرعت پاسخ دهیم
+      continue: ادامه
+      display name: "نمایش نام:"
+      display name description: " نام کاربری شما برای عموم نمایش داده شده. شما می توانید این مورد را در بخش ترجیحات تغییر دهید."
+      email address: "رایانامه:"
+      fill_form: این فرم را پر کنید . ما برای شما یک پیام‌الکترونیکی برای فعال سازی حساب کاربریتان خواهیم فرستاد
+      heading: ایجاد حساب کاربری
+      no_auto_account_create: متاسفانه در حال حاضر برای ما امکان ساخت خودکار حساب کاربری مقدور نیست
       password: "کلمه عبور:"
+      terms accepted: با تشکر  از پذیرش شرایط نویسندگان جدید!
+      title: ایجاد حساب کاربری
+    no_such_user: 
+      body: با عرض پوزش ، هیچ کاربر با نام {{user}} وجود ندارد. لطفا املایی خود نام کاربری را بازبینی کنید یا شاید لینکی که کلیک کردید اشتباه است.
+      heading: کاربر {{user}} وجود ندارد
+      title: چنین کاربری وجود ندارد.
     popup: 
       friend: دوست
+      nearby mapper: نقشه‌ترسیم کننده در این اطراف
+      your location: مکان حضور شما
+    remove_friend: 
+      not_a_friend: "{{name}} از دوستان شما نیست."
+      success: "{{name}} از دوستان شما  حذف شده است."
     reset_password: 
+      confirm password: "تایید گذرواژه:"
+      flash changed: رمز عبور شما تغییر کرده است.
+      flash token bad: آیا آن مورد دیافتی را یافتید؟آدرس اینترنتی را چک کنید
+      heading: بازیابی کلمه عبور برای {{user}}
       password: "کلمه عبور:"
+      reset: بازنشانی گذرواژه
+      title: بازنشانی گذرواژه
+    set_home: 
+      flash success: موقعیت خانه با موفقیت ذخیره شد
+    suspended: 
+      body: "<p>\n شرمنده ! یه خاطر فعالیت مشکوک حساب کاربری شما به تعلیق افتاده است\n</p>\n<p>\nاین تصمیم به وسیله یک مدیر بازبینی خواهد شد . در صورتی که  بخواهید میتوانید با {{webmaster}}برای بحث در این زمینه تماس حاصل نمایید\n</p>"
+      heading: حساب کاربری معلق
+      title: حساب کاربری معلق
+      webmaster: مدیرسایت
+    terms: 
+      agree: موافقت
+      consider_pd: بر اساس توافق‌نامه موفق من ویرایش‌ها و تولیدات خودم را  اجازه میدهم که به صورت عمومی انتشار یابد
+      consider_pd_why: این چیست؟
+      decline: کاهش
+      heading: شرایط نویسندگان
+      legale_names: 
+        france: فرانسه
+        italy: ایتالیا
+        rest_of_world: دیگر نقاط جهان
+      legale_select: "لطفا کشور محل سکونت خود را انتخاب کنید:"
+      read and accept: برای ادامه‌دادن و ویرایش‌کردن‌های آینده لطفا این توافق‌نامه را مطالعه کنید و دکمه موافق هستم را فشار دهید  به عنوان اینکه شما موارد این توافق نامه را قبول دارید
+      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: دفتر خاطرات
+      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: ورود خاطرات جدید
+      no friends: شما هنوز هیچ دوستی اضافه نکرده‌اید
+      no nearby users: در این حوالی هیچ کاربری  نقشه  ترسیم نکرده است
+      oauth settings: تنظیمات oauth
+      remove as friend: حذف به‌عنوان دوست
+      role: 
+        administrator: این کاربر سرپرست می‌باشد
+        grant: 
+          administrator: به سرپرست دسترسی بدهید
+          moderator: به سرپرست دسترسی بدهید
+        moderator: این کاربر مدیر است
+        revoke: 
+          administrator: دسترسی سرپرست را لغو شد
+          moderator: دسترسی مدیر را لغو کنید
+      send message: ارسال پیغام
       settings_link_text: تنظیمات
+      spam score: "امتیاز هرزنامه:"
+      status: "وضعیت:"
+      traces: اثرها
+      unhide_user: این کاربر را غیر مخفی کنید
+      user location: موقعبت کاربر
+      your friends: دوستان شما
   user_block: 
     partial: 
       edit: ویرایش
+      status: وضعیت
+    period: 
+      one: 1 ساعت
+      other: "{{count}} ساعت"
     show: 
+      confirm: آیا مطمئن هستید؟
       edit: ویرایش
+      show: نمایش
+      status: وضعیت
   user_role: 
+    filter: 
+      already_has_role: کاربر در حال حاضر نقش {{role}} دارد.
+      doesnt_have_role: کاربر نقشی ندارد {{role}}.
+      not_a_role: رشته '{{role}}' نقش معتبر نیست.
+      not_an_administrator: فقط مدیران می توانند نقش مدیریت کاربرها را انجام دهند ، و شما مدیر نیستید.
     grant: 
+      are_you_sure: آیا اطمینان دارید که می خواهید نقش '{{role}}' از کاربر '{{name}}' را  اعطا  کنید؟
       confirm: تائید
+      fail: نمی‌توان نقش {{role}} کاربر {{name}} را اهدا کرد . لطفا از معتبر بودن کاربر و نقش اطمینان حاصل نمایید
+      heading: تایید اعطای نقش
+      title: تایید اعطای نقش
     revoke: 
+      are_you_sure: آیا شما اطمینان دارید که می خواهید نقش `{{role}}' را از کاربر '{{name}}' حذف  نمایید؟
       confirm: تأیید
+      fail: نمی‌توان نقش {{role}} کاربر {{name}} را لغو کرد . لطفا از معتبر بودن کاربر و نقش اطمینان حاصل نمایید
+      heading: تایید لغو نقش
+      title: تایید لغو نقش

config/locales/fi.yml

@@ -1,6 +1,6 @@
 # Messages for Finnish (Suomi)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Crt
 # Author: Daeron
 # Author: Nike
@@ -183,15 +183,20 @@ fi:
       view_data: Näytä tiedot nykyisestä karttanäkymästä
     start_rjs: 
       data_frame_title: Tiedot
+      data_layer_name: Data
       details: Tarkemmin
       drag_a_box: Valitse alue kartalta hiirellä maalaamalla
+      edited_by_user_at_timestamp: Viimeinen muokkaaja [[user]] kello [[timestamp]]
+      history_for_feature: Ominaisuuden [[feature]] historia
       load_data: Lataa tiedot
       loaded_an_area_with_num_features: Olet ladannut alueen, joka sisältää [[num_features]] osiota. Yleensä jotkin selaimet eivät kykene näyttämään tätä määrää dataa. Yleisesti selaimet toimivat parhaiten näyttäessään alle 100 osiota kerrallaan. Muussa tapauksessa selain saattaa tulla hitaaksi tai lakata toimimasta kokonaan. Jos olet varma että haluat näyttää tämän datan, voit tehdä niin napsauttamalla alla olevaa painiketta.
       loading: Ladataan tietoja...
       manually_select: Rajaa pienempi alue käsin
       object_list: 
         api: Hae tämä alue APIsta
+        back: Näytettävien kohteiden lista
         details: Lisätiedot
+        heading: Objektiluettelo
         history: 
           type: 
             node: Piste [[id]]
@@ -209,7 +214,12 @@ fi:
       zoom_or_select: Katso pienempää aluetta tai valitse kartalta alue, jonka tiedot haluat
     tag_details: 
       tags: "Tägit:"
+      wiki_link: 
+        key: Wikisivu tietueelle {{key}}
+        tag: Wikisivu tietueelle {{key}}={{value}}
+      wikipedia_link: Artikkeli {{page}} Wikipediassa
     timeout: 
+      sorry: Tietojen hakeminen (kohde {{type}}:{{id}}) kesti liian kauan.
       type: 
         changeset: muutoskokoelma
         node: piste
@@ -501,7 +511,6 @@ fi:
           tower: Torni
           train_station: Rautatieasema
           university: Yliopistorakennus
-          "yes": Rakennus
         highway: 
           bus_stop: Bussipysäkki
           byway: Sivutie
@@ -636,6 +645,7 @@ fi:
           station: Rautatieasema
           subway: Metroasema
           subway_entrance: Metron sisäänkäynti
+          tram_stop: Raitiovaunupysäkki
           yard: Ratapiha
         shop: 
           art: Taidekauppa
@@ -723,6 +733,7 @@ fi:
     export: Vienti
     export_tooltip: Karttatiedon vienti
     gps_traces: GPS-jäljet
+    help: Ohje
     history: Historia
     home: koti
     home_tooltip: Siirry kotisijaintiin
@@ -744,11 +755,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
@@ -757,6 +765,18 @@ fi:
     view_tooltip: Näytä kartta
     welcome_user: Tervetuloa, {{user_link}}
     welcome_user_link_tooltip: Käyttäjäsivusi
+    wiki: Wiki
+  license_page: 
+    foreign: 
+      english_link: englanninenkielisen alkuperäisversion
+      text: Siinä tapauksessa, että tämän käännetyn sivun ja {{english_original_link}} välillä on ristiriita englanninkielinen sivu on etusijalla.
+      title: Tietoja tästä käännöksestä
+    legal_babble: "<h2>Tekijänoikeus ja lisenssi</h2>\n<p>\nOpenStreetMap on <i>avointa dataa</i>, joka on lisensoitu <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/deed.fi/\">\nCreative Commonsin Nimeä-Tarttuva 2.0 Raakaversio</a> -lisenssilllä (CC-BY-SA).\n</p>\n<p>\nVoit kopioida, levittää, välittää ja mukauttaa karttojamme\nja tietojamme, kunhan OpenStreetMap ja sen tekijät mainitaan.\nJos muutat tai kehität karttojamme tai tietoja, voit\njakaa teosta vain saman lisenssin nojalla.\n<a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">Legal codessa</a>\nkerrotaan oikeutesi ja velvollisuutesi.\n</p>\n\n\n<h3>OpenStreetMapin mainitseminen</h3>\n<p>\nJos käytät OpenStreetMapin karttakuvia, pyydämme että\nmainitset ainakin ”© OpenStreetMapin tekijät, CC-BY-SA”.\nJos käytät vain karttatietoja,\nmainitse ”Karttatiedot © OpenStreetMapin tekijät, CC-BY-SA”.\n</p>\n<p>\nAina kun se on mahdollista, linkitä OpenStreetMap osoitteeseen\n<a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\nja CC-BY-SA osoitteeseen\n<a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>.\nJos hyperlinkit eivät ole mahdollisia (esimerkiksi\ntulostettu työ), suosittelemme, että ohjaat lukijat osoitteisiin\nwww.openstreetmap.org ja\nwww.creativecommons.org.\n</p>\n\n<h3>Lisätietoja</h3>\n<p>\nLue lisää\n<a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Legal FAQ:sta</a>.\n</p>\n<p>\nOSM:n tekijöitä muistutetaan, että kopioiminen tekijänoikeuksien alaisista teoksista\n(esimerkiksi Google Maps tai painetut kartat) ilman\ntekijänoikeuden haltijan nimenomaista lupaa on kielletty.\n</p>\n<p>\nVaikka OpenStreetMap on avointa dataa, emme voi tarjota\nmaksutonta karttarajapintaa (API) kolmannen osapuolen kehittäjille.\n\nKatso <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">APIn käyttösäännöt</a>,\n<a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">karttakuvien käyttösäännöt</a>\n<a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">ja Nominatimin käyttösäännöt</a>.\n</p>\n\n<h3>Tekijät</h3>\n<p>\nKäyttämämme CC-BY-SA-lisenssi vaatii ”alkuperäisten tekijöiden\nmainintaa” käyttömediaan ja käyttötapaan sopivalla tavalla.\nYksittäisiä OSM-kartoittajia ei tarvitse mainita muuten kuin \nmaininnalla ”OpenStreetMapin tekijät”. Kun kyseessä on\npaikallinen maanmittauslaitos tai muu merkittävä lähde,\njonka tietoja käytetään OpenStreetMapissa, voi olla\nperusteltua nimetä myös kyseiset tahot suoraan tai viitata\nsiihen tällä sivulla.\n</p>\n\n<!--\nInformation for page editors\n\nThe following lists only those organisations who require attribution\nas a condition of their data being used in OpenStreetMap. It is not a\ngeneral catalogue of imports, and must not be used except when\nattribution is required to comply with the licence of the imported\ndata.\n\nAny additions here must be discussed with OSM sysadmins first.\n-->\n\n<ul id=\"contributors\">\n<li><strong>Australia</strong>: Sisältää lähiötietoja\nAustralian Bureau of Statisticsilta.</li>\n<li><strong>Kanada</strong>: Sisältää tietoja\nGeoBasesta ®, GeoGratisista (© Department of Natural\nResources Canada), CanVecista (© Department of Natural\nResources Canada), ja StatCanista (Geography Division,\nStatistics Canada).</li> \n<li><strong>Uusi-Seelanti</strong>: Sisältää tietoja Land Information New Zealandista. Crown Copyright.\n<li><strong>Puola</strong>: Sisältää tietoja\n<a href=\"http://ump.waw.pl/\">UMP-pcPL-kartoista. Tekijänoikeus\nUMP-pcPL:n tekijät.</li>\n<li><strong>Yhdistyneet kuningaskunnat</strong>: Sisältää Ordnance\nSurveyn keräämiä tietoja © Crown Copyright ja tietokantojen käyttöoikeus\n2010.\n</ul>\n\n\n<p>\nTietojen sisältyminen OpenStreetMapiin ei tarkoita, että tietojen antaja\nottaa kantaa OpenStreetMapiin tai vastuuta tietojen oikeellisuudesta.\n</p>"
+    native: 
+      mapping_link: aloittaa kartoituksen
+      native_link: suomenkieliseen versioon
+      text: Tarkastelet on tekijänoikeussivun englanninkielistä versiota. Voit siirtyä takaisin {{native_link}} tai voit lopettaa lukemisen tekijänoikeuksista  ja {{mapping_link}}.
+      title: Tietoja sivusta
   message: 
     delete: 
       deleted: Viesti poistettu
@@ -908,7 +928,7 @@ fi:
       shortlink: Lyhytosoite
     key: 
       map_key: Karttamerkit
-      map_key_tooltip: Kartat (mapnik) selitteet tälle tasolle
+      map_key_tooltip: Merkkien selitykset
       table: 
         entry: 
           admin: Hallinnollinen raja
@@ -974,7 +994,6 @@ fi:
           unclassified: Luokittelematon tie
           unsurfaced: Päällystämätön tie
           wood: Metsä
-        heading: Selitteet karttatasolle z{{zoom_level}}
     search: 
       search: Haku
       search_help: "esim.: 'Munkkivuori', 'Karttatie, Oulu' tai 'post offices near Helsinki' <a href='http://wiki.openstreetmap.org/wiki/Search'>lisää esimerkkejä...</a> (englanniksi)"
@@ -1021,6 +1040,11 @@ fi:
       body: Valitettavasti käyttäjää {{user}} ei ole. Tarkista oikeinkirjoitus tai ehkä napsauttamasi linkki on väärä.
       heading: Käyttäjää {{user}} ei ole olemassa
       title: Käyttäjää ei löydy
+    offline: 
+      heading: GPX-jälkien tallennus ei ole käytettävissä
+      message: GPX-jälkien tallennusjärjestelmä ei ole tällä hetkellä käytettävissä
+    offline_warning: 
+      message: GPX-tiedostojen tallennus ei ole tällä hetkellä käytettävissä
     trace: 
       ago: "{{time_in_words_ago}} sitten"
       by: käyttäjältä
@@ -1037,6 +1061,7 @@ fi:
       private: YKSITYINEN
       public: JULKINEN
       trace_details: Näytä jäljen tiedot
+      trackable: SEURATTAVA
       view_map: Selaa karttaa
     trace_form: 
       description: Kuvaus
@@ -1051,11 +1076,14 @@ fi:
       see_all_traces: Näytä kaikki jäljet
       see_your_traces: Näytä kaikki omat jäljet
       traces_waiting: Lähettämiäsi jälkiä on jo {{count}} käsittelyjonossa odottamassa tallennusta tietokantaan. Olisi huomaavaista jos odottaisit näiden valmistuvan ennen kuin lähetät lisää jälkiä. Näin muidenkin käyttäjien lähettämät jäljet pääsevät aiemmin tietokantaan.
+      upload_trace: Lisää GPS-jälki
+      your_traces: Omat jäljet
     trace_optionals: 
       tags: Tägit
     trace_paging_nav: 
       next: Seuraava &raquo;
       previous: "&laquo; Edellinen"
+      showing_page: Sivu {{page}}
     view: 
       delete_track: Poista tämä jälki
       description: "Kuvaus:"
@@ -1077,6 +1105,8 @@ fi:
       visibility: "Näkyvyys:"
     visibility: 
       identifiable: Tunnistettavissa (näytetään jälkiluettelossa ja pisteet tunnistettavasti järjestettynä aikaleimoineen)
+      private: Yksityinen (pisteet vain ilman nimeä ja aikaleimoja)
+      public: Julkisen (näytetään jälkiluettelossa, mutta pisteet ilman nimeä ja aikaleimoja)
       trackable: Jäljitettävissä (pisteet jaetaan järjestettynä aikaleimoineen, mutta nimettömänä)
   user: 
     account: 
@@ -1114,7 +1144,6 @@ fi:
       update home location on click: Aktivoi kodin sijainnin päivitys karttaa napsautettaessa?
     confirm: 
       button: Vahvista
-      failure: Tällä tunnisteella on jo vahvistettu käyttäjätunnus.
       heading: Vahvista käyttäjätunnuksen luominen
       press confirm button: Aktivoi uusi käyttäjätunnuksesi valitsemalla Vahvista.
       success: Käyttäjätunnuksesi on nyt vahvistettu.
@@ -1137,7 +1166,7 @@ fi:
       email or username: "Sähköpostiosoite tai käyttäjätunnus:"
       heading: Kirjaudu
       login_button: Kirjaudu sisään
-      lost password link: Salasana unohtunut?
+      lost password link: Unohditko salasanasi?
       password: "Salasana:"
       please login: Kirjaudu sisään tai {{create_user_link}}.
       remember: "Muista minut:"
@@ -1147,7 +1176,7 @@ fi:
       title: Kirjaudu ulos
     lost_password: 
       email address: "Sähköpostiosoite:"
-      heading: Salasana unohtunut?
+      heading: Unohditko salasanasi?
       new password button: Lähetä minulle uusi salasana
       notice email cannot find: Antamallasi sähköpostiosoitteella ei löytynyt käyttäjää.
       notice email on way: Antamaasi osoitteeseen lähetettiin ohjeet salasanan uusimiseksi.
@@ -1268,6 +1297,7 @@ fi:
       time_past: Päättyi {{time}} sitten.
       until_login: Aktiivinen kunnes käyttäjä kirjautuu sisään.
     index: 
+      empty: Ei estoja.
       heading: Luettelo käyttäjän estoista
       title: Estetyt käyttäjät
     new: 
@@ -1283,10 +1313,12 @@ fi:
       confirm: Oletko varma?
       display_name: Estetty käyttäjä
       edit: Muokkaa
+      not_revoked: (ei kumottu)
       reason: Eston syy
       revoke: Estä!
       revoker_name: Eston tehnyt
       show: Näytä
+      status: Tila
     period: 
       one: 1 tunti
       other: "{{count}} tuntia"

config/locales/fr.yml

@@ -1,17 +1,21 @@
 # Messages for French (Français)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Alno
 # 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
+# Author: Yvecai
 fr: 
   activerecord: 
     attributes: 
@@ -86,6 +90,7 @@ fr:
       cookies_needed: Il semble que les cookies soient désactivés sur votre navigateur. Veuillez les activer avant de continuer.
     setup_user_auth: 
       blocked: Votre accès à l'API a été bloqué. Connectez-vous sur l'interface web pour plus d'informations.
+      need_to_see_terms: Votre accès à l’API est temporairement suspendu. Veuillez vous connecter à l’interface web pour afficher les conditions de contributions. Vous n'avez pas besoin d’accord, mais vous devez les visualiser.
   browse: 
     changeset: 
       changeset: "Groupe de modifications : {{id}}"
@@ -198,6 +203,7 @@ fr:
       details: Détails
       drag_a_box: Dessiner un cadre sur la carte pour sélectionner une zone
       edited_by_user_at_timestamp: Modifié par [[user]] le [[timestamp]]
+      hide_areas: Masquer les zones
       history_for_feature: Historique pour [[feature]]
       load_data: Charger les données
       loaded_an_area_with_num_features: "Vous avez chargé une zone qui contient [[num_features]] éléments. En général, les navigateurs ne supportent pas bien l'affichage de tant de données, et travaillent mieux lorsqu'ils affichent moins de 100 éléments : accepter peut rendre votre navigateur lent ou non fonctionnel. Si vous êtes sûr de vouloir afficher ces données, vous pouvez le faire en appuyant sur le bouton ci-dessous."
@@ -220,6 +226,7 @@ fr:
           node: Nœud
           way: Chemin
       private_user: utilisateur privé
+      show_areas: Afficher les zones
       show_history: Montrer l'historique
       unable_to_load_size: "Impossible de charger les données : le cadre de délimitation d'une taille de [[bbox_size]] est trop grand (il doit être inférieur à {{max_bbox_size}})"
       wait: Patienter...
@@ -313,7 +320,7 @@ fr:
       longitude: "Longitude:"
       marker_text: Emplacement de l'entrée du journal
       save_button: Sauvegarder
-      subject: "Sujet:"
+      subject: "Objet :"
       title: Modifier l'entrée du journal
       use_map_link: Utiliser la carte
     feed: 
@@ -357,6 +364,17 @@ fr:
       save_button: Enregistrer
       title: Journal de {{user}} | {{title}}
       user_title: Journal de {{user}}
+  editor: 
+    default: Par défaut (actuellement {{name}})
+    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
@@ -557,7 +575,6 @@ fr:
           tower: Tour
           train_station: Gare ferroviaire
           university: Bâtiment d'université
-          "yes": Bâtiment
         highway: 
           bridleway: Chemin pour cavaliers
           bus_guideway: Voie de bus guidée
@@ -679,7 +696,7 @@ fr:
           coastline: Littoral
           crater: Cratère
           feature: Élément
-          fell: Fell
+          fell: Lande
           fjord: Fjord
           geyser: Geyser
           glacier: Glacier
@@ -699,7 +716,7 @@ fr:
           scree: Éboulis
           scrub: Broussailles
           shoal: Haut-fond
-          spring: Cascade
+          spring: Source
           strait: Détroit
           tree: Arbre
           valley: Vallée
@@ -880,16 +897,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 & 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
@@ -914,14 +938,11 @@ 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
+    sotm2011: Venez à la Conférence d'OpenStreetMap 2011, L’État de la Carte, du 9 au 11 septembre à Denver !
     tag_line: La carte coopérative libre
     user_diaries: Journaux
     user_diaries_tooltip: Voir les journaux d'utilisateurs
@@ -1116,7 +1137,7 @@ fr:
       allow_read_gpx: lire ses traces GPS privées.
       allow_read_prefs: lire ses préférences utilisateur.
       allow_write_api: modifier la carte.
-      allow_write_diary: créez des entrées dans les journaux, des commentaires et faîtes-vous des amis.
+      allow_write_diary: créez des entrées dans le journal, des commentaires et faites-vous des amis.
       allow_write_gpx: envoyer des traces GPS.
       allow_write_prefs: modifier ses préférences utilisateur.
       callback_url: URL de rappel
@@ -1146,7 +1167,7 @@ fr:
       allow_read_gpx: lire leurs traces GPS privées.
       allow_read_prefs: consulter ses préférences utilisateur.
       allow_write_api: modifier la carte.
-      allow_write_diary: créez des entrées dans le journal, des commentaire et faîtes-vous des amis.
+      allow_write_diary: créez des entrées dans le journal, des commentaires et faites-vous des amis.
       allow_write_gpx: envoi trace GPS.
       allow_write_prefs: modifier ses préférences utilisateur.
       authorize_url: "URL d'autorisation :"
@@ -1163,8 +1184,11 @@ fr:
     edit: 
       anon_edits_link_text: Trouvez pourquoi ici.
       flash_player_required: Vous avez besoin d’un lecteur Flash pour utiliser Potlatch, l’éditeur Flash de OpenStreetMap. Vous pouvez <a href='http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash'>télécharger Flash Player sur le site d’Adobe</a>. <a href='http://wiki.openstreetmap.org/wiki/Editing'>D’autres options</a> sont également disponibles pour modifier OpenStreetMap.
+      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_not_configured: Potlatch 2 n’a pas été configuré - veuillez consulter http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 pour plus d'informations
+      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: 
@@ -1176,10 +1200,11 @@ 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
-      map_key_tooltip: Légende pour le rendu Mapnik à ce niveau de zoom
+      map_key_tooltip: Légende de la carte
       table: 
         entry: 
           admin: Limite administrative
@@ -1246,10 +1271,9 @@ fr:
           unclassified: Route non classifiée
           unsurfaced: Route non revêtue
           wood: Bois
-        heading: Légende pour z{{zoom_level}}
     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
@@ -1351,21 +1375,21 @@ fr:
       start_coordinates: "Coordonnées de départ :"
       tags: "Balises :"
       title: Affichage de la trace {{name}}
-      trace_not_found: Trace introuvable !
+      trace_not_found: Trace non trouvée !
       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: 
         agreed: Vous avez accepté les nouveaux termes du contributeur.
         agreed_with_pd: Vous avez également déclaré que vous considériez vos modifications comme relevant du domaine public.
         heading: "Termes du contributeur :"
-        link text: Qu'est-ce que c'est ?
+        link text: qu’est-ce que ceci ?
         not yet agreed: Vous n’avez pas encore accepté les nouveaux termes du contributeur.
         review link text: Veuillez suivre ce lien à votre convenance pour examiner et accepter les nouveaux termes du contributeur.
       current email address: "Adresse de courriel actuelle :"
@@ -1384,6 +1408,7 @@ fr:
       new email address: "Nouvelle adresse de courriel :"
       new image: Ajouter une image
       no home location: Vous n'avez pas indiqué l'emplacement de votre domicile.
+      preferred editor: "Éditeur préféré :"
       preferred languages: "Langues préférées :"
       profile description: "Description du profil :"
       public editing: 
@@ -1391,7 +1416,7 @@ fr:
         disabled link text: pourquoi ne puis-je pas modifier ?
         enabled: Activé. Non anonyme et peut modifier les données.
         enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
-        enabled link text: Qu'est-ce que c'est ?
+        enabled link text: qu’est-ce que ceci ?
         heading: "Modification publique :"
       public editing note: 
         heading: Modification publique
@@ -1402,17 +1427,23 @@ fr:
       title: Modifier le compte
       update home location on click: Mettre a jour l'emplacement de votre domicile quand vous cliquez sur la carte ?
     confirm: 
+      already active: Ce compte a déjà été confirmé.
+      before you start: Nous savons que vous êtes probablement pressé de commencer à cartographier, mais avant, vous pourriez vouloir fournir de plus amples informations sur vous-même, dans le formulaire ci-dessous.
       button: Confirmer
-      failure: Un compte utilisateur avec ce jeton a déjà été confirmé.
       heading: Confirmer un compte utilisateur
       press confirm button: Appuyer le bouton confirmer ci-dessous pour activer votre compte.
+      reconfirm: Si cela fait longtemps que vous vous êtes inscrit, vous pourriez vouloir <a href="{{reconfirm}}">vous renvoyer un courrier électronique de confirmation</a>.
       success: Compte confirmé, merci de vous être enregistré !
+      unknown token: Ce jeton ne semble pas exister.
     confirm_email: 
       button: Confirmer
       failure: Une adresse email a déjà été confirmée avec ce jeton d'authentification.
       heading: Confirmer le changement de votre adresse e-mail
       press confirm button: Appuyer sur le bouton confirmer pour confirmer votre nouvelle adresse e-mail.
       success: Adresse email confirmée, merci de vous être enregistré !
+    confirm_resend: 
+      failure: L’utilisateur {{name}} est introuvable.
+      success: Nous avons envoyé une note de confirmation à {{email}}. Dès que vous aurez confirmé votre compte, vous pourrez commencer à cartographier.<br /><br />Si vous utilisez un logiciel anti-spam qui envoie des requêtes de confirmation, veuillez mettre webmaster@openstreetmap.org dans votre liste blanche, car nous sommes incapables de répondre à ces messages.
     filter: 
       not_an_administrator: Vous devez être administrateur pour effectuer cette action.
     go_public: 
@@ -1429,19 +1460,24 @@ fr:
       summary_no_ip: "{{name}} créé le {{date}}"
       title: Utilisateurs
     login: 
-      account not active: Désolé, votre compte n'est pas encore actif.<br/>Veuillez cliquer sur le lien dans l'email de confirmation, pour activer votre compte.
+      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 ?
-      notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">En savoir plus sur le future 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>)
+      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
@@ -1461,14 +1497,14 @@ fr:
       success: "{{name}} est à présent votre ami."
     new: 
       confirm email address: "Confirmer l'adresse e-mail :"
-      confirm password: "Confirmer le mot de passe :"
+      confirm password: "Confirmez le mot de passe :"
       contact_webmaster: Veuillez contacter le <a href='mailto:webmaster@openstreetmap.org'>webmaster</a> pour qu'il vous crée un compte - nous essaierons de traiter votre demande le plus rapidement possible.
       continue: Continuer
       display name: "Nom affiché :"
       display name description: Votre nom d'utilisateur affiché publiquement. Vous pouvez changer ceci ultérieurement dans les préférences.
       email address: "Adresse e-mail :"
       fill_form: Remplissez le formulaire et nous vous enverrons un e-mail pour activer votre compte.
-      flash create success message: L'utilisateur a été créé avec succès. Vérifiez votre e-mail de confirmation, et vous serez prêt à mapper dans peu de temps :-)<br /><br />Veuillez noter que vous ne pourrez pas vous connecter tant que vous n'aurez pas reçu l'e-mail de confirmation et confirmé votre adresse e-mail. <br /><br />Si vous utilisez un logiciel anti-spam qui envoie des requêtes de confirmation, veuillez mettre webmaster@openstreetmap.org dans votre liste blanche, car nous sommes incapables de répondre à ces e-mails.
+      flash create success message: Merci de vous être enregistré ! Nous avons envoyé une note de confirmation à {{email}}. Dès que vous aurez confirmé votre compte, vous pourrez commencer à cartographier.<br /><br />Si vous utilisez un logiciel anti-spam qui envoie des requêtes de confirmation, veuillez mettre webmaster@openstreetmap.org dans votre liste blanche, car nous sommes incapables de répondre à ces messages.
       heading: Créer un compte utilisateur
       license_agreement: En confirmant votre compte, vous devrez accepter les <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">termes du contributeur</a>.
       no_auto_account_create: Malheureusement, nous sommes actuellement dans l'impossibilité de vous créer un compte automatiquement.
@@ -1488,7 +1524,7 @@ fr:
       not_a_friend: "{{name}} n'est pas parmi vos amis."
       success: "{{name}} a été retiré de vos amis."
     reset_password: 
-      confirm password: "Confirmer le mot de passe :"
+      confirm password: "Confirmez le mot de passe :"
       flash changed: Votre mot de passe a été modifié.
       flash token bad: Vous n'avez pas trouvé ce jeton, avez-vous vérifié l'URL ?
       heading: Réinitialiser le mot de passe de {{user}}
@@ -1505,7 +1541,7 @@ fr:
     terms: 
       agree: J'accepte
       consider_pd: En plus de l’accord ci-dessus, je considère mes contributions comme étant dans le domaine public
-      consider_pd_why: Qu'est-ce que ceci ?
+      consider_pd_why: qu’est-ce que ceci ?
       decline: Décliner
       heading: Termes du contributeur
       legale_names: 
@@ -1535,6 +1571,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
@@ -1619,7 +1656,7 @@ fr:
       confirm: Êtes-vous sûr ?
       creator_name: Créateur
       display_name: Utilisateur Bloqué
-      edit: Éditer
+      edit: Modifier
       not_revoked: (non révoqué)
       reason: Motif du blocage
       revoke: Révoquer !

config/locales/fur.yml

@@ -1,6 +1,6 @@
 # Messages for Friulian (Furlan)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Klenje
 fur: 
   activerecord: 
@@ -35,6 +35,7 @@ fur:
         display_name: Non di mostrâ
         email: Pueste eletroniche
         languages: Lenghis
+        pass_crypt: Password
     models: 
       changeset: Grup di cambiaments
       country: Paîs
@@ -62,11 +63,19 @@ fur:
       title: Grup di cambiaments
     changeset_details: 
       belongs_to: "Al è di:"
+      bounding_box: "Retangul di selezion:"
+      box: retangul
       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 +90,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 +110,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:"
@@ -106,8 +120,10 @@ fur:
       download_xml: Discjame XML
       view_details: cjale i detais
     not_found: 
+      sorry: Nus displâs, nol è stât pussibil cjatâ il {{type}} cun id {{id}}.
       type: 
         changeset: "Non dal file:"
+        node: grop
         relation: relazion
     paging_nav: 
       of: su
@@ -130,6 +146,7 @@ fur:
     relation_member: 
       entry_role: "{{type}} {{name}} come {{role}}"
       type: 
+        node: Grop
         relation: Relazion
     start: 
       manually_select: Sielç a man une aree divierse
@@ -138,6 +155,7 @@ fur:
       data_frame_title: Dâts
       data_layer_name: Dâts
       details: Detais
+      drag_a_box: Disegne un retangul su la mape par sielzi une aree
       edited_by_user_at_timestamp: Cambiât di [[user]] ai [[timestamp]]
       history_for_feature: Storic par [[feature]]
       load_data: Cjame i dâts
@@ -149,15 +167,22 @@ 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â...
       zoom_or_select: Ingrandìs o sielç la aree de mape che tu vuelis viodi
     tag_details: 
       tags: "Etichetis:"
+      wiki_link: 
+        key: La pagjine de vichi cu la descrizion dal tag {{key}}.
+        tag: La pagjine de vichi cu la descrizion pal tag {{key}}={{value}}
       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 +286,17 @@ 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
+    remote: 
+      description: Remote Control (JOSM o Merkaartor)
+      name: Remote Control
   export: 
     start: 
       add_marker: Zonte un segnalut ae mape
@@ -282,11 +318,14 @@ fur:
       paste_html: Tache l'HTML par inserîlu tal to sît web
       scale: Scjale
       too_large: 
+        body: Cheste aree e je masse grande par espuartâle come dâts XML di OpenStreetMap. Par plasê incrès il zoom o sielç une aree plui piçule.
         heading: La aree e je masse largje
+      zoom: Ingrandiment
     start_rjs: 
       add_marker: Zonte un segnalut ae mape
       change_marker: Cambie la posizion dal segnalut
       click_add_marker: Frache su la mape par zontâ un segn
+      drag_a_box: Disegne un retangul su la mape par sielzi une aree
       export: Espuarte
       manually_select: Sielç a man une aree divierse
       view_larger_map: Viôt une mape plui grande
@@ -337,38 +376,52 @@ fur:
           atm: Bancomat
           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
           driving_school: Scuele guide
           embassy: Ambassade
           emergency_phone: Telefon di emergjence
+          fire_hydrant: Idrant
           fire_station: Stazion dai pompîrs
           fountain: Fontane
           fuel: Stazion di riforniment
           hospital: Ospedâl
+          kindergarten: Scuelute
           library: Biblioteche
           market: Marcjât
           office: Ufizi
           park: Parc
+          parking: Parcament
           pharmacy: Farmacie
           place_of_worship: Lûc di cult
+          police: Polizie
           post_office: Pueste
+          prison: Preson
+          pub: Pub
           public_building: Edifici public
+          public_market: Marcjât public
           restaurant: Ristorant
+          retirement_home: Cjase di polse
           sauna: Saune
           school: Scuele
           shop: Buteghe
+          supermarket: Supermarcjât
           telephone: Telefon public
           theatre: Teatri
           townhall: Municipi
           university: Universitât
+          veterinary: Veterinari
           wifi: Acès a internet WiFi
           youth_centre: Centri zovanîl
         boundary: 
@@ -377,19 +430,26 @@ 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
         highway: 
           bus_stop: Fermade autobus
+          construction: Strade in costruzion
           emergency_access_point: Pont di acès di emergjence
           raceway: Circuit
+          road: Strade
           steps: Scjalis
+          unsurfaced: Strade no asfaltade
         historic: 
           archaeological_site: Sît archeologic
           battlefield: Cjamp di bataie
+          building: Edifici
           castle: Cjiscjel
           church: Glesie
           house: Cjase
@@ -408,6 +468,7 @@ fur:
           residential: Aree residenziâl
           vineyard: Vigne
         leisure: 
+          fishing: Riserve par pescjâ
           garden: Zardin
           golf_course: Troi di golf
           miniature_golf: Minigolf
@@ -416,12 +477,15 @@ fur:
           sports_centre: Centri sportîf
           stadium: Stadi
           swimming_pool: Pissine
+          track: Piste pe corse
         natural: 
           bay: Rade
           channel: Canâl
           coastline: Litorâl
           crater: Cratêr
+          fjord: Fiort
           glacier: Glaçâr
+          hill: Culine
           island: Isule
           point: Pont
           river: Flum
@@ -449,20 +513,30 @@ 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
+          gallery: Galarie di art
           hairdresser: Piruchîr o barbîr
           insurance: Assicurazion
+          jewelry: Buteghe dal oresin
           laundry: Lavandarie
+          market: Marcjât
+          optician: Otic
+          pet: Buteghe di animâi
           supermarket: Supermarcjât
           toys: Negozi di zugatui
+          travel_agency: Agjenzie di viaçs
         tourism: 
+          hostel: Ostel
           information: Informazions
           museum: Museu
           valley: Val
@@ -470,6 +544,7 @@ fur:
           zoo: Zoo
         waterway: 
           canal: Canâl
+          dam: Dighe
           ditch: Fuesse
           river: Flum
   javascripts: 
@@ -478,18 +553,30 @@ fur:
         cycle_map: Cycle Map
         noname: CenceNon
     site: 
+      edit_disabled_tooltip: Cres il zoom par cambiâ la mape
+      edit_tooltip: Cambie la mape
       edit_zoom_alert: Tu scugnis cressi il zoom par cambiâ la mape
+      history_disabled_tooltip: Cres il zoom par viodi i cambiaments in cheste aree
+      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 & 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
@@ -514,12 +601,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
@@ -564,6 +647,12 @@ fur:
       send_message_to: Mande un gnûf messaç a {{name}}
       subject: Sogjet
       title: Mande messaç
+    no_such_message: 
+      heading: Messaç no cjatât
+      title: Messaç no cjatât
+    no_such_user: 
+      heading: Utent no cjatât
+      title: Utent no cjatât
     outbox: 
       date: Date
       inbox: in jentrade
@@ -591,11 +680,16 @@ fur:
       delete_button: Elimine
   notifier: 
     diary_comment_notification: 
+      footer: Tu puedis ancje lei il coment su {{readurl}} e tu puedis zontâ un coment su {{commenturl}} o ben rispuindi su {{replyurl}}
+      header: "{{from_user}} al à zontât un coment ae tô vos dal diari di OpenStreetMap cun sogjet {{subject}}:"
       hi: Mandi {{to_user}},
       subject: "[OpenStreetMap] {{user}} al à zontât un coment ae tô vôs dal diari"
     email_confirm: 
       subject: "[OpenStreetMap] Conferme la tô direzion di pueste eletroniche"
+    email_confirm_plain: 
+      click_the_link: Se tu sês propite tu, par plasê frache sul leam ca sot par confermâ il cambiament.
     friend_notification: 
+      befriend_them: Tu puedis ancje zontâlu/le come amì in {{befriendurl}}.
       had_added_you: "{{user}} ti à zontât come amì su OpenStreetMap."
       see_their_profile: Tu puedis viodi il lôr profîl su {{userurl}}.
       subject: "[OpenStreetMap] {{user}} ti à zontât come amì su OpenStreetMap."
@@ -609,17 +703,26 @@ fur:
       with_description: cu la descrizion
       your_gpx_file: Al somee che il to file GPX
     message_notification: 
+      footer1: Tu puedis ancje lei il messaç su {{readurl}}
+      footer2: e tu puedis rispuindi su {{replyurl}}
+      header: "{{from_user}} ti à mandât un messaç su OpenStreetMap cun sogjet {{subject}}:"
       hi: Mandi {{to_user}},
     signup_confirm: 
       subject: "[OpenStreetMap] Conferme la tô direzion di pueste eletroniche"
     signup_confirm_html: 
+      hopefully_you: Cualchidun (sperìn propite tu) al vûl creâ une identitât
       introductory_video: Tu puedis viodi un {{introductory_video_link}}.
   oauth_clients: 
     form: 
       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: 
@@ -631,10 +734,11 @@ 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
-      map_key_tooltip: Leiende pal rendering mapnik a chest nivel di zoom
+      map_key_tooltip: Leiende de mape
       table: 
         entry: 
           admin: Confin aministratîf
@@ -661,11 +765,11 @@ fur:
             - Scuele
             - universitât
           station: stazion de ferade
+          tourist: Atrazion turistiche
           tram: 
             - tram
             - tram
           unsurfaced: Strade blancje
-        heading: Leiende par z{{zoom_level}}
     search: 
       search: Cîr
       search_help: "esemplis: 'Cividât', 'Vie Julie, Naiarêt', 'CB2 5AQ', o se no 'post offices near Gurize' <a href='http://wiki.openstreetmap.org/wiki/Search'>altris esemplis...</a>"
@@ -704,6 +808,8 @@ fur:
       public_traces_from: Percors GPS publics di {{user}}
       tagged_with: " etichetât cun {{tags}}"
       your_traces: Percors GPS personâi
+    no_such_user: 
+      title: Utent no cjatât
     trace: 
       ago: "{{time_in_words_ago}} fa"
       by: di
@@ -726,9 +832,12 @@ fur:
       upload_button: Cjame
       upload_gpx: "Cjame file GPX:"
       visibility: Visibilitât
+      visibility_help: ce vuelial dî?
     trace_header: 
       see_all_traces: Cjale ducj i percors
       see_your_traces: Cjale ducj i miei percors
+      upload_trace: Cjame un percors
+      your_traces: Viôt dome i tiei percors
     trace_optionals: 
       tags: Etichetis
     trace_paging_nav: 
@@ -756,12 +865,22 @@ fur:
       visibility: "Visibilitât:"
   user: 
     account: 
+      contributor terms: 
+        agreed: Tu âs acetât i gnûfs tiermins di contribuzion.
+        agreed_with_pd: Tu âs ancje declarât di considerâ i tiei cambiaments intal Public Domini.
+        heading: "Tiermins par contribuî:"
+        link text: ce isal chest?
+        not yet agreed: No tu âs ancjemò acetât i gnûfs tiermins di contribuzion.
+        review link text: Frache par plasê su chest leam par viodi e acetâ i gnûf tiermins par contribuî.
       current email address: "Direzion di pueste eletroniche atuâl:"
+      delete image: Gjave la figure di cumò
       email never displayed publicly: (mai mostrade in public)
       flash update success: Informazions dal utent inzornadis cun sucès.
       flash update success confirm needed: Informazions dal utent inzornadis cun sucès. Controle la tô pueste par confermâ la tô gnove direzion di pueste eletroniche.
       home location: "Lûc iniziâl:"
       image: "Figure:"
+      image size hint: (figuris cuadris di almancul 100x100 a van miôr)
+      keep image: Ten la figure di cumò
       latitude: "Latitudin:"
       longitude: "Longjitudin:"
       make edits public button: Rint publics ducj i miei cambiaments
@@ -769,60 +888,82 @@ fur:
       new email address: "Gnove direzion di pueste:"
       new image: Zonte une figure
       no home location: No tu âs configurât il lûc iniziâl.
+      preferred editor: "Editôr preferît:"
       preferred languages: "Lenghis preferidis:"
       profile description: "Descrizion dal profîl:"
       public editing: 
+        disabled: Disativâts e no si pues cambiâ i dâts, ducj i cambiaments precedents a son anonims.
         disabled link text: parcè no puedio cambiâ?
+        enabled: Ativâts. No anonims e si pues cambiâ i dâts.
         enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: ce isal chest?
+        heading: "Cambiaments publics:"
       replace image: Sostituìs la figure atuâl
       return to profile: Torne al profîl
       save changes button: Salve cambiaments
       title: Modifiche profîl
       update home location on click: Aio di inzornâ il lûc iniziâl cuant che o frachi parsore la mape?
     confirm: 
+      already active: Chest profîl al è za stât confermât.
       button: Conferme
       heading: Conferme di un profîl utent
       press confirm button: Frache il boton Conferme par ativâ il to profîl.
       success: Profîl confermât, graziis par jessiti regjistrât!
     confirm_email: 
       button: Conferme
+      heading: Conferme dal cambiament de direzion email
       press confirm button: Frache sul boton di conferme par confermâ la gnove direzion di pueste.
       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: 
         one: Pagjine {{page}} ({{first_item}} su {{items}})
         other: Pagjine {{page}} ({{first_item}}-{{last_item}} su {{items}})
+      summary_no_ip: "{{name}} creât ai {{date}}"
       title: Utents
     login: 
+      already have: Âstu za un profîl su OpenStreetMap? Par plasê doprile par jentrâ.
       auth failure: Nus displâs, ma no si à rivât a jentrâ cun i dâts inserîts.
+      create account minute: Cree un profîl. I vûl dome un minût.
       create_account: cree un profîl
       email or username: "Direzion di pueste eletroniche o non utent:"
       heading: Jentre
       login_button: Jentre
       lost password link: Password pierdude?
+      new to osm: Sêstu gnûf su OpenStreetMap?
       please login: Jentre o {{create_user_link}}.
+      register now: Regjistriti cumò
       remember: Visiti di me
       title: Jentre
+      to make changes: Par cambiâ alc tai dâts di OpenStreetMap, tu scugnis vê un profîl.
     logout: 
       heading: Va fûr di OpenStreetMap
       logout_button: Jes
       title: Jes
     lost_password: 
       email address: "Direzion di pueste:"
+      heading: Âstu pierdût la password?
+      help_text: Scrîf la direzion di pueste eletroniche che tu âs doprât par iscrivîti e ti mandarin un leam par tornâ a impuestâ la tô password.
+      title: Password pierdude
     make_friend: 
       already_a_friend: Tu sês za amì di {{name}}.
       success: "{{name}} al è cumò to amì."
     new: 
       confirm email address: "Conferme direzion pueste:"
+      confirm password: "Conferme la password:"
       continue: Va indevant
       display name: "Non di mostrâ:"
+      display name description: Il non utent che al vignarà mostrât a ducj. Tu podarâs gambiâlu plui tart tes preferencis.
       email address: "Direzion di pueste eletroniche:"
       fill_form: Jemple il modul e ti mandarin in curt un messaç di pueste par ativâ il to profîl.
-      flash create success message: L'utent al è stât creât cun sucès. Spiete che ti rivedi par pueste il messaç di conferme e po tu podarâs scomençâ a mapâ intun lamp :-)<br /><br />Ten a ments che no tu rivarâs a jentrâ fin cuant che no tu varâs ricevût il messaç e confermât la direzion di pueste eletroniche.<br /><br />Se tu dopris un sisteme antispam che al mande richiestis di conferme, siguriti di meti te whitelist webmaster@openstreetmap.org, parcè che no podin rispuindi aes richiestis di conferme.
+      flash create success message: Graciis par jessiti regjistrât. Spiete che ti rivedi par pueste il messaç di conferme che o vin mandât a {{email}} e po tu podarâs scomençâ a mapâ intun lamp :-)<br /><br />Se tu dopris un sisteme antispam che al mande richiestis di conferme, siguriti di meti te whitelist webmaster@openstreetmap.org, parcè che no podin rispuindi aes richiestis di conferme.
       heading: Cree un account utent
       license_agreement: Creant un profîl tu scugnis aprovâ i <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">tiermins par contribuî</a>.
+      password: "Password:"
       terms accepted: Graziis par vê acetât i gnûfs tiermins par contribuî!
       title: Cree profîl
     no_such_user: 
@@ -836,10 +977,18 @@ fur:
     remove_friend: 
       not_a_friend: "{{name}} nol è un dai tiei amîs."
       success: "{{name}} al è stât gjavât dai tiei amîs."
+    reset_password: 
+      confirm password: "Conferme la password:"
+      flash changed: La tô password e je stade cambiade.
+      heading: Azere la password par {{user}}
+      password: "Password:"
+      reset: Azere la password
+      title: Azere la password
     set_home: 
       flash success: Lûc iniziâl salvât cun sucès
     terms: 
       agree: O aceti
+      consider_pd: In plui dal acuardi parsore, jo o consideri i miei contribûts come di Public Domini
       consider_pd_why: ce isal chest?
       decline: No aceti
       heading: Tiermins par contribuî
@@ -847,6 +996,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
@@ -865,6 +1015,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
@@ -876,6 +1027,7 @@ fur:
       new diary entry: gnove vôs dal diari
       no friends: No tu âs ancjemò nissun amì.
       no nearby users: Nol è ancjemò nissun utent che al declare di mapâ dongje di te.
+      oauth settings: configurazion OAuth
       remove as friend: gjave dai amîs
       send message: mande messaç
       settings_link_text: impostazions
@@ -894,6 +1046,7 @@ fur:
       status: Stât
     show: 
       confirm: Sêstu sigûr?
+      edit: Cambie
       show: Mostre
       status: Stât
   user_role: 

config/locales/gl.yml

@@ -1,6 +1,6 @@
 # Messages for Galician (Galego)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Gallaecio
 # Author: Toliño
 gl: 
@@ -350,6 +350,17 @@ gl:
       save_button: Gardar
       title: Diario de {{user}} | {{title}}
       user_title: Diario de {{user}}
+  editor: 
+    default: Predeterminado (actualmente, {{name}})
+    potlatch: 
+      description: Potlatch 1 (editor integrado no navegador)
+      name: Potlatch 1
+    potlatch2: 
+      description: Potlatch 2 (editor integrado no navegador)
+      name: Potlatch 2
+    remote: 
+      description: Control remoto (JOSM ou Merkaartor)
+      name: Control remoto
   export: 
     start: 
       add_marker: Engadir un marcador ao mapa
@@ -550,7 +561,6 @@ gl:
           tower: Torre
           train_station: Estación de ferrocarril
           university: Complexo universitario
-          "yes": Construción
         highway: 
           bridleway: Pista de cabalos
           bus_guideway: Liña de autobuses guiados
@@ -873,16 +883,23 @@ gl:
       history_tooltip: Ollar as edicións feitas nesta zona
       history_zoom_alert: Debe achegarse para ollar as edicións nesta zona
   layouts: 
+    community_blogs: Blogues da comunidade
+    community_blogs_title: Blogues de membros da comunidade do OpenStreetMap
     copyright: Dereitos de autor e licenza
+    documentation: Documentación
+    documentation_title: Documentación do proxecto
     donate: Apoie o OpenStreetMap {{link}} ao fondo de actualización de hardware.
     donate_link_text: doando
     edit: Editar
+    edit_with: Editar con {{editor}}
     export: Exportar
     export_tooltip: Exportar os datos do mapa
+    foundation: Fundación
+    foundation_title: A fundación do OpenStreetMap
     gps_traces: Pistas GPS
     gps_traces_tooltip: Xestionar as pistas GPS
     help: Axuda
-    help_and_wiki: "{{help}} e {{wiki}}"
+    help_centre: Centro de axuda
     help_title: Sitio de axuda do proxecto
     history: Historial
     home: inicio
@@ -907,12 +924,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
@@ -1155,8 +1168,10 @@ gl:
     edit: 
       anon_edits_link_text: Descubra aquí o motivo.
       flash_player_required: Necesita un reprodutor de Flash para usar o Potlatch, o editor Flash do OpenStreetMap. Pode <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">descargar o reprodutor Flash desde Adobe.com</a>. Hai dispoñibles <a href="http://wiki.openstreetmap.org/wiki/Editing">outras opcións</a> para editar o OpenStreetMap.
+      no_iframe_support: O seu navegador non soporta os iframes HTML, necesarios para esta característica.
       not_public: Non fixo que as súas edicións fosen públicas.
       not_public_description: Non pode editar o mapa a menos que o faga. Pode establecer as súas edicións como públicas desde a súa {{user_page}}.
+      potlatch2_unsaved_changes: Ten cambios sen gardar. (Para gardar no Potlatch 2, prema en "Gardar".)
       potlatch_unsaved_changes: Ten cambios sen gardar. (Para gardar no Potlatch, ten que desmarcar o camiño actual ou o punto, se está a editar no modo en vivo, ou premer sobre o botón "Gardar".)
       user_page_link: páxina de usuario
     index: 
@@ -1168,10 +1183,11 @@ gl:
         notice: Baixo a licenza {{license_name}} polo {{project_name}} e os seus colaboradores.
         project_name: proxecto OpenStreetMap
       permalink: Ligazón permanente
+      remote_failed: Fallo de edición; comprobe que ou ben JOSM ou ben Merkaartor estea cargado e que a opción do control remoto estea activada
       shortlink: Atallo
     key: 
       map_key: Lenda do mapa
-      map_key_tooltip: Lenda do renderizador mapnik a este nivel de zoom
+      map_key_tooltip: Lenda do mapa
       table: 
         entry: 
           admin: Límite administrativo
@@ -1238,7 +1254,6 @@ gl:
           unclassified: Estrada sen clasificar
           unsurfaced: Estrada non pavimentada
           wood: Bosque
-        heading: Lenda para z{{zoom_level}}
     search: 
       search: Procurar
       search_help: "exemplos: \"Santiago de Compostela\", \"rúa Rosalía de Castro, Vigo\" ou \"oficinas postais preto de Mondoñedo\" <a href='http://wiki.openstreetmap.org/wiki/Search'>máis exemplos...</a>"
@@ -1376,6 +1391,7 @@ gl:
       new email address: "Novo enderezo de correo electrónico:"
       new image: Engadir unha imaxe
       no home location: Non inseriu o seu lugar de orixe.
+      preferred editor: "Editor preferido:"
       preferred languages: "Linguas preferidas:"
       profile description: "Descrición do perfil:"
       public editing: 
@@ -1394,17 +1410,23 @@ gl:
       title: Editar a conta
       update home location on click: Quere actualizar o domicilio ao premer sobre o mapa?
     confirm: 
+      already active: Esta conta xa se confirmou.
+      before you start: Sabemos que probablemente queira comezar cos mapas de contado, pero antes gustaríanos que enchese algunha información acerca de vostede no formulario que hai a continuación.
       button: Confirmar
-      failure: Xa se confirmou unha conta de usuario con este pase.
       heading: Confirmar unha conta de usuario
       press confirm button: Prema sobre o botón de confirmación que aparece a continuación para activar a súa conta.
+      reconfirm: Se hai tempo que non accede ao sistema, quizais necesite <a href="{{reconfirm}}">enviarse un novo correo electrónico de confirmación</a>.
       success: Confirmouse a súa conta. Grazas por se rexistrar!
+      unknown token: Semella que o pase non existe.
     confirm_email: 
       button: Confirmar
       failure: Xa se confirmou un enderezo de correo electrónico con este pase.
       heading: Confirmar o cambio do enderezo de correo electrónico
       press confirm button: Prema sobre o botón de confirmación que aparece a continuación para confirmar o seu novo enderezo de correo electrónico.
       success: Confirmouse o seu enderezo de correo electrónico. Grazas por se rexistrar!
+    confirm_resend: 
+      failure: Non se atopou o usuario "{{name}}".
+      success: Busque unha nota de confirmación que lle enviamos a {{email}} e comezará a crear mapas de contado.<br /><br />Se emprega un sistema de bloqueo de spam, asegúrese de incluír webmaster@openstreetmap.org na súa lista branca para poder completar o proceso sen problemas.
     filter: 
       not_an_administrator: Ten que ser administrador para poder levar a cabo esta acción.
     go_public: 
@@ -1421,19 +1443,24 @@ gl:
       summary_no_ip: "{{name}} creado o {{date}}"
       title: Usuarios
     login: 
-      account not active: Sentímolo, a súa conta aínda non está activada.<br />Prema na ligazón que hai no correo de confirmación da conta para activar a súa.
+      account not active: Sentímolo, a súa conta aínda non está activada.<br />Prema na ligazón que hai no correo de confirmación da conta ou <a href="{{reconfirm}}">solicite un novo correo de confirmación</a>.
       account suspended: Sentímolo, a súa conta foi suspendida debido a actividades sospeitosas.<br />Póñase en contacto co {{webmaster}} se quere debatelo.
+      already have: Xa ten unha conta no OpenStreetMap? Inicie a sesión.
       auth failure: Sentímolo, non puido acceder ao sistema con eses datos.
+      create account minute: Crear unha conta. Tan só leva un minuto.
       create_account: cree unha conta
       email or username: "Enderezo de correo electrónico ou nome de usuario:"
       heading: Rexistro
       login_button: Acceder ao sistema
       lost password link: Perdeu o seu contrasinal?
+      new to osm: É novo no OpenStreetMap?
       notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Máis información acerca do cambio na licenza do OpenStreetMap</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">traducións</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">conversa</a>)
       password: "Contrasinal:"
       please login: Identifíquese ou {{create_user_link}}.
+      register now: Rexístrese agora
       remember: "Lembrádeme:"
       title: Rexistro
+      to make changes: Para realizar as modificacións nos datos do OpenStreetMap, cómpre ter unha conta.
       webmaster: webmaster
     logout: 
       heading: Saír do OpenStreetMap
@@ -1460,7 +1487,7 @@ gl:
       display name description: O seu nome de usuario mostrado publicamente. Pode cambialo máis tarde nas preferencias.
       email address: "Enderezo de correo electrónico:"
       fill_form: Encha o formulario e axiña recibirá un correo electrónico coas instrucións para activar a súa conta.
-      flash create success message: O usuario creouse correctamente. Busque unha nota de confirmación no seu correo electrónico e comezará a crear mapas de contado :-)<br /><br />Teña en conta que non poderá acceder ao sistema ata que reciba e confirme o seu enderezo de correo.<br /><br />Se emprega un sistema de bloqueo de spam, asegúrese de incluír webmaster@openstreetmap.org na súa lista branca para poder completar o proceso sen problemas.
+      flash create success message: O usuario creouse correctamente. Busque unha nota de confirmación que lle enviamos a {{email}} e comezará a crear mapas de contado.<br /><br />Se emprega un sistema de bloqueo de spam, asegúrese de incluír webmaster@openstreetmap.org na súa lista branca para poder completar o proceso sen problemas.
       heading: Crear unha conta de usuario
       license_agreement: Cando confirme a súa conta necesitará aceptar os <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">termos do colaborador</a>.
       no_auto_account_create: Por desgraza, arestora non podemos crear automaticamente unha conta para vostede.
@@ -1527,6 +1554,7 @@ gl:
       hide_user: agochar este usuario
       if set location: Se define a súa localización, aquí aparecerá un mapa. Pode establecer o seu lugar de orixe na súa páxina de {{settings_link}}.
       km away: a {{count}}km de distancia
+      latest edit: "Última edición {{ago}}:"
       m away: a {{count}}m de distancia
       mapper since: "Cartógrafo desde:"
       moderator_history: ver os bloqueos dados

config/locales/hr.yml

@@ -1,6 +1,6 @@
 # Messages for Croatian (Hrvatski)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Mnalis
 # Author: Mvrban
 # Author: SpeedyGonsales
@@ -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
@@ -555,7 +566,6 @@ hr:
           tower: Toranj
           train_station: Željeznički kolodvor
           university: Zgrada Sveučilišta
-          "yes": Zgrada
         highway: 
           bridleway: Konjička staza
           bus_guideway: Autobusna traka
@@ -878,16 +888,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 & 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 +931,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 +1177,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 +1192,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
@@ -1247,7 +1263,6 @@ hr:
           unclassified: Nerazvrstana cesta
           unsurfaced: neasfaltirana cesta
           wood: Šume (prirodne, neodržavane)
-        heading: Legenda za z{{zoom_level}}
     search: 
       search: Traži
       search_help: "primjer: 'Osijek', 'Zelenjak 52, Zagreb', ili 'kolodvor, Split' <a href='http://wiki.openstreetmap.org/wiki/Search'>više primjera...</a>"
@@ -1385,6 +1400,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: 
@@ -1403,17 +1419,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
-      failure: Korisnički račun s ovim tokenom je već potvrđen.
       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: 
@@ -1430,19 +1452,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
@@ -1469,7 +1496,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.
@@ -1536,6 +1563,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

config/locales/hsb.yml

@@ -1,6 +1,6 @@
 # Messages for Upper Sorbian (Hornjoserbsce)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Michawiki
 hsb: 
   activerecord: 
@@ -359,6 +359,17 @@ hsb:
       save_button: Składować
       title: Dźenik {{user}} | {{title}}
       user_title: dźenik wužiwarja {{user}}
+  editor: 
+    default: Standard (tuchwilu {{name}}
+    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ć
@@ -559,7 +570,6 @@ hsb:
           tower: Wěža
           train_station: Dwórnišćo
           university: Uniwersitne twarjenje
-          "yes": Twarjenje
         highway: 
           bridleway: Jěchanski puć
           bus_guideway: Trolejbusowy milinowód
@@ -882,14 +892,24 @@ 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_centre: Srjedźišćo pomocy
+    help_title: Sydło pomocy za projekt
     history: Historija
     home: domoj
     home_tooltip: Domoj hić
@@ -916,12 +936,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
@@ -931,6 +947,8 @@ hsb:
     view_tooltip: Kartu pokazać
     welcome_user: Witaj, {{user_link}}
     welcome_user_link_tooltip: Twoja wužiwarska strona
+    wiki: Wiki
+    wiki_title: Wikisydło za projekt
   license_page: 
     foreign: 
       english_link: jendźelskim originalom
@@ -1063,6 +1081,7 @@ hsb:
     signup_confirm: 
       subject: "[OpenStreetMap] Twoju e-mejlowu adresu wobkrućić"
     signup_confirm_html: 
+      ask_questions: Móžeš so za něčim wo OpenStreetMap  na našim sydle <a href="http://help.openstreetmap.org/">Prašenja a wotmołwy</a> prašeć.
       click_the_link: Jeli ty to sy, witaj! Klikń prošu na slědowacy wotkaz, zo by konto wobkrućił a čitaj potom dalše informacije wo OpenStreetMap
       current_user: Lisćina tuchwilnych wužiwarjow po jich stejnišću w swěće steji na <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Lisćina wužiwarjow po geografiskim regionje</a> k dispoziciji.
       get_reading: Čitaj wo OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">na wikiju</a>, wobstaraj sej najnowše powěsće přez <a href="http://blog.openstreetmap.org/">blog OpenStreetMap</a> abo <a href="http://twitter.com/openstreetmap">Twitter</a>, abo přečitaj <a href="http://www.opengeodata.org/">blog OpenGeoData</a> załožerja OpenStreetMap Steve Coast za historiju projekta, kotryž ma tež <a href="http://www.opengeodata.org/?cat=13">podcasty</a>!
@@ -1075,6 +1094,7 @@ hsb:
       video_to_openstreetmap: zawodne widejo wo OpenStreetMap
       wiki_signup: Móžeš so tež <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">w  wikiju OpenStreetMap registrować</a>.
     signup_confirm_plain: 
+      ask_questions: "Móžeš so za něčim wo OpenStreetMap  na našim sydle Prašenja a wotmołwy prašeć:"
       blog_and_twitter: "Wobstaraj sej najnowše powěsće přez blog OpenStreetMap abo Twitter:"
       click_the_link_1: Jeli sy to ty, witaj! Prošu klikń na slědowacy wotkaz, zo by swoje
       click_the_link_2: konto wobkrućił a čitaj potom dalše informacije wo OpenStreetMap.
@@ -1160,8 +1180,10 @@ hsb:
     edit: 
       anon_edits_link_text: Zwěsćić, čehoždla je tomu tak.
       flash_player_required: Trjebaš wothrawak Flash, zo by Potlatch, editor OpenStreetMap Flash wužiwał. Móžeš <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">wothrawak Flash wot Adobe.com sćahnyć</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Někotre druhe móžnosće</a> tež za wobdźěłowanje OpenStreetMap k dispoziciji steja.
+      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: 
@@ -1173,10 +1195,11 @@ 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
-      map_key_tooltip: Legenda za kartu Mapnik na tutym skalowanskim schodźenku
+      map_key_tooltip: Legenda za kartu
       table: 
         entry: 
           admin: Zarjadniska hranica
@@ -1243,7 +1266,6 @@ hsb:
           unclassified: Njeklasifikowana dróha
           unsurfaced: Njewobtwjerdźena dróha
           wood: Lěs
-        heading: Legenda za z{{zoom_level}}
     search: 
       search: Pytać
       search_help: "přikłady: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', abo 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>dalše přikłady...</a>"
@@ -1381,6 +1403,7 @@ hsb:
       new email address: "Nowa e-mejlowa adresa:"
       new image: Wobraz přidać
       no home location: Njejsy swoje domjace stejnišćo zapodał.
+      preferred editor: "Preferowany editor:"
       preferred languages: "Preferowane rěče:"
       profile description: "Profilowe wopisanje:"
       public editing: 
@@ -1399,17 +1422,23 @@ hsb:
       title: Konto wobdźěłać
       update home location on click: Domjace stejnišćo při kliknjenju na kartu aktualizować?
     confirm: 
+      already active: Tute konto bu hižo wobkrućene.
+      before you start: Wěmy, zo najskerje njemóžeš dočakać kartěrowanje započeć, ale ty měł najprjedy někotre informacije wo sebje w slědowacym formularje podać.
       button: Wobkrućić
-      failure: Wužiwarske konto z tutym kodom bu hižo wobkrućene.
       heading: Wužiwarske konto wobkrućić
       press confirm button: Klikni deleka na wobkrućenske tłóčatko, zo by swoje konto aktiwizował.
+      reconfirm: Jeli je hižo něšto časa zašło, wot toho zo sy zregistrował, dyrbiš ewentuelnje sam <a href="{{reconfirm}}">nowu wobkrućensku e-mejl pósłać</a>.
       success: Twoje konto bu wobkrućene, dźakujemy so za registrowanje!
+      unknown token: Zda so, zo token njeeksistuje.
     confirm_email: 
       button: Wobkrućić
       failure: E-mejlowa adresa je hižo z tutym kodom wobkrućena.
       heading: Změnjenje e-mejloweje adresy wobkrućić
       press confirm button: Klikń deleka na wobkrućenske tłóčatko, zo by swoju nowu e-mejlowu adresu wobkrućił.
       success: Twoja e-mejlowa adresa bu wobkrućena, dźakujemy so za registrowanje!
+    confirm_resend: 
+      failure: Wužiwar {{name}} njenamakany.
+      success: Smy nowu wobkrućenski e-mejl na {{email}} póslali a tak ruče hač swoje konto wobkrućiš, móžeš kartěrowanje započeć.<br /><br /> Jeli přećiwospamowy system wužiwaš, kotryž wobkrućenske naprašowanja sćele, přewzmi adresu webmaster@openstreetmap.org do swojeje běłeje lisćiny, dokelž njemóžemy na wobkrućenske naprašowanja wotmołwić.
     filter: 
       not_an_administrator: Dyrbiš administrator być, zo by tutu akciju wuwjedł.
     go_public: 
@@ -1426,19 +1455,24 @@ hsb:
       summary_no_ip: "{{name}} dnja {{date}} wutworjeny"
       title: Wužiwarjo
     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ł.
+      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ć
@@ -1465,7 +1499,7 @@ hsb:
       display name description: Sy wužiwarske mjeno zjawnje pokazał. Móžeš to pozdźišo w nastajenjach změnić.
       email address: "E-mejlowa adresa:"
       fill_form: Wupjelń formular a budźemy ći hnydom e-mejl słać, zo by swoje konto aktiwizował.
-      flash create success message: Wužiwarske konto bu wuspěšnje załožene. W e-mejlu, kotruž dóstanješ, namakaš wobkrućenski wotkaz, a móžeš so hnydom do kartěrowanja dać :-)<br /><br />Prošu dźiwaj na to, zo njemóžeš so přizjewić, doniž njejsy swoju e-mejlowu addresu wobkrućił.<br /><br /> Jeli přećiwospamowy system wužiwaš, kotryž wobkrućenske naprašowanja sćele, da přewzmi adresu webmaster@openstreetmap.org do swojeje běłeje lisćiny, dokelž njemóžemy na wobkrućenske naprašowanja wotmołwić.
+      flash create success message: Dźakujemy so za registrowanje. Smy wobkrućenski e-mejl na {{email}} póslali a tak ruče hač swoje konto wobkrućiš, móžeš kartěrowanje započeć.<br /><br /> Jeli přećiwospamowy system wužiwaš, kotryž wobkrućenske naprašowanja sćele, přewzmi adresu webmaster@openstreetmap.org do swojeje běłeje lisćiny, dokelž njemóžemy na wobkrućenske naprašowanja wotmołwić.
       heading: Wužiwarske konto załožić
       license_agreement: Hdyž swoje konto wubkrućeš, dyrbiš <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">wuměnjenjam za sobuskutkowarjow</a> přihłosować.
       no_auto_account_create: Bohužel njemóžemy tuchwilu žane konto za tebje awtomatisce załožić.
@@ -1532,6 +1566,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ć

config/locales/hu.yml

@@ -1,6 +1,6 @@
 # Messages for Hungarian (Magyar)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: City-busz
 # Author: Dani
 # Author: Glanthor Reviol
@@ -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
@@ -555,7 +566,6 @@ hu:
           tower: Torony
           train_station: Vasútállomás
           university: Egyetemi épület
-          "yes": Épület
         highway: 
           bridleway: Lovaglóút
           bus_guideway: Buszsín
@@ -878,16 +888,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 +930,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 +1146,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 +1178,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,10 +1195,11 @@ 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
-      map_key_tooltip: Jelmagyarázat a Mapnik rendereléshez ezen a nagyítási szinten
+      map_key_tooltip: Jelmagyarázat a térképhez
       table: 
         entry: 
           admin: Közigazgatási határ
@@ -1250,7 +1266,6 @@ hu:
           unclassified: Egyéb út
           unsurfaced: Burkolatlan út
           wood: Erdő
-        heading: Jelmagyarázat z{{zoom_level}}
     search: 
       search: Keresés
       search_help: "példák: 'Szeged', 'Piac utca, Debrecen', 'CB2 5AQ' vagy 'post offices near Kaposvár' <a href='http://wiki.openstreetmap.org/wiki/Search'>további példák...</a>"
@@ -1371,7 +1386,7 @@ hu:
         heading: "Hozzájárulási feltételek:"
         link text: mi ez?
         not yet agreed: Még nem fogadtad el az új hozzájárulási feltételeket.
-        review link text: Kérjük, kövesd ezt a hivatkozást az új hozzájárulási feltételek áttekintéséhez és elfogadásához.
+        review link text: Kérlek, kövesd ezt a hivatkozást az új hozzájárulási feltételek áttekintéséhez és elfogadásához.
       current email address: "Jelenlegi e-mail cím:"
       delete image: Jelenlegi kép eltávolítása
       email never displayed publicly: (soha nem jelenik meg nyilvánosan)
@@ -1388,6 +1403,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: 
@@ -1406,17 +1422,23 @@ hu:
       title: Felhasználói fiók szerkesztése
       update home location on click: Otthon helyének frissítése, amikor a térképre kattintok?
     confirm: 
+      already active: Ez a fiók már megerősítésre került.
+      before you start: Tudjuk, hogy valószínűleg sietve kezdenél térképezni, de mielőtt ezt megtennéd, - ha úgy gondolod - megadhatsz magadról néhány további információt az alábbi űrlapon.
       button: Megerősítés
-      failure: Egy felhasználói fiók már megerősítésre került ezzel az utalvánnyal.
       heading: Felhasználói fiók megerősítése
       press confirm button: Felhasználói fiókod megerősítéséhez nyomd meg az alábbi megerősítés gombot.
+      reconfirm: Ha már eltelt némi idő azóta, amióta regisztráltál, akkor szükséged lehet arra, hogy <a href="{{reconfirm}}">küldj magadnak egy új megerősítő emailt</a>.
       success: Felhasználói fiókod megerősítve, köszönjük a regisztrációt!
+      unknown token: Ez az utalvány úgy tűnik, nem létezik.
     confirm_email: 
       button: Megerősítés
       failure: Egy e-mail cím már megerősítésre került ezzel az utalvánnyal.
       heading: E-mail cím módosításának megerősítése
       press confirm button: Új e-mail címed megerősítéséhez nyomd meg az alábbi megerősítés gombot.
       success: E-mail címed megerősítve, köszönjük a regisztrációt!
+    confirm_resend: 
+      failure: "{{name}} felhasználó nem található."
+      success: Elküldtünk egy új megerősítő üzenetet a(z) {{email}} címre, és amint megerősíted a felhasználói fiókodat, hozzákezdhetsz a térképezéshez.<br /><br />Ha használsz olyan antispam rendszert, amely megerősítési kérelmeket küld, akkor győződj meg róla, hogy engedélylistára tetted a webmaster@openstreetmap.org címet, mivel nem tudunk válaszolni megerősítési kérelmekre.
     filter: 
       not_an_administrator: Ennek a műveletnek az elvégzéséhez adminisztrátori jogosultsággal kell rendelkezned.
     go_public: 
@@ -1433,19 +1455,24 @@ hu:
       summary_no_ip: "{{name}} letrejött ekkor: {{date}}"
       title: Felhasználók
     login: 
-      account not active: Sajnálom, a felhasználói fiókod még nincs aktiválva.<br />Az aktiváláshoz, kattints a fiókodat megerősítő e-mailben lévő hivatkozásra.
+      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
@@ -1472,7 +1499,7 @@ hu:
       display name description: A nyilvánosan megjelenített felhasználóneved. A beállításaidban később megváltoztathatod.
       email address: "E-mail cím:"
       fill_form: Töltsd ki az űrlapot, és küldünk neked egy gyors e-mailt felhasználói fiókod aktiválásához.
-      flash create success message: A felhasználó sikeresen létrehozva. Nézd meg az e-mailjeidet a megerősítő levélhez, és pillanatokon belül szerkesztheted a térképet :-)<br /><br />Felhívom a figyelmed, hogy addig nem tudsz bejelentkezni, amíg nem kaptad meg és nem erősítetted meg az e-mail címedet.<br /><br />Ha olyan antispam rendszert használsz, ami megerősítő kérést küld, akkor bizonyosodj meg róla, hogy engedélyezőlistára tetted a webmaster@openstreetmap.org címet, mivel mi nem tudunk válaszolni megerősítő kérésekre.
+      flash create success message: Köszönjük, hogy regisztráltál. Küldtünk egy megerősítő üzenetet a(z) {{email}} címre, és amint megerősíted a felhasználói fiókodat, hozzákezdhetsz a térképezéshez.<br /><br />Ha használsz olyan antispam rendszert, amely megerősítési kérelmeket küld, akkor győződj meg róla, hogy engedélylistára tetted a webmaster@openstreetmap.org címet, mivel nem tudunk válaszolni megerősítési kérelmekre.
       heading: Felhasználói fiók létrehozása
       license_agreement: Amikor megerősíted a felhasználói fiókodat, el kell fogadnod a <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">hozzájárulási feltételeket</a>.
       no_auto_account_create: Sajnos jelenleg nem tudunk neked létrehozni automatikusan egy felhasználói fiókot.
@@ -1517,7 +1544,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érjük, 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
@@ -1539,6 +1566,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

config/locales/ia.yml

@@ -1,6 +1,6 @@
 # Messages for Interlingua (Interlingua)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: McDutchie
 ia: 
   activerecord: 
@@ -76,6 +76,7 @@ ia:
       cookies_needed: Tu pare haber disactivate le cookies. Per favor activa le cookies in tu navigator ante de continuar.
     setup_user_auth: 
       blocked: Tu accesso al API ha essite blocate. Per favor aperi un session al interfacie web pro plus informationes.
+      need_to_see_terms: Vostre accesso al API ha essite temporarimente suspendite. Per favor aperi session in le interfacie web pro vider le Conditiones del Contributor. Non es necessari declarar se de accordo, ma es obligatori haber legite los.
   browse: 
     changeset: 
       changeset: "Gruppo de modificationes: {{id}}"
@@ -190,6 +191,7 @@ ia:
       details: Detalios
       drag_a_box: Designa un quadro super le carta pro seliger un area
       edited_by_user_at_timestamp: Modificate per [[user]] le [[timestamp]]
+      hide_areas: Celar areas
       history_for_feature: Historia de [[feature]]
       load_data: Cargar datos
       loaded_an_area_with_num_features: Tu ha cargate un area que contine [[num_features]] elementos. In general, alcun navigatores del web pote haber problemas de presentar un tal quantitate de datos. Generalmente, un navigator functiona melio monstrante minus de 100 elementos a un vice; alteremente, illo pote devenir lente o non responder. Si tu es secur de voler visualisar iste datos, tu pote cliccar super le button ci infra.
@@ -212,6 +214,7 @@ ia:
           node: Nodo
           way: Via
       private_user: usator private
+      show_areas: Monstrar areas
       show_history: Monstrar historia
       unable_to_load_size: "Impossibile cargar: Le dimension del quadro de delimitation [[bbox_size]] es troppo grande (debe esser inferior a {{max_bbox_size}})"
       wait: Un momento...
@@ -349,6 +352,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
@@ -549,7 +563,6 @@ ia:
           tower: Turre
           train_station: Station ferroviari
           university: Edificio de universitate
-          "yes": Edificio
         highway: 
           bridleway: Sentiero pro cavallos
           bus_guideway: Via guidate de autobus
@@ -597,7 +610,7 @@ ia:
           church: Ecclesia
           house: Casa
           icon: Icone
-          manor: Casa senioral
+          manor: Casa seniorial
           memorial: Memorial
           mine: Mina
           monument: Monumento
@@ -872,16 +885,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 & 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,14 +928,11 @@ 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
+    sotm2011: Veni al conferentia de OpenStreetMap de 2011, "Le stato del carta", del 9 al 11 de septembre in Denver!
     tag_line: Le wiki-carta libere del mundo
     user_diaries: Diarios de usatores
     user_diaries_tooltip: Leger diarios de usatores
@@ -1156,8 +1173,11 @@ 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_not_configured: Potlatch 2 non ha essite configurate. Per favor vide http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 pro plus informationes.
+      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,10 +1189,11 @@ 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
-      map_key_tooltip: Legenda pro le rendition Mapnik a iste nivello de zoom
+      map_key_tooltip: Legenda del carta
       table: 
         entry: 
           admin: Limite administrative
@@ -1239,7 +1260,6 @@ ia:
           unclassified: Via non classificate
           unsurfaced: Cammino de terra
           wood: Bosco
-        heading: Legenda pro z{{zoom_level}}
     search: 
       search: Cercar
       search_help: "exemplos: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', o 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>altere exemplos...</a>"
@@ -1251,7 +1271,7 @@ ia:
       search_results: Resultatos del recerca
   time: 
     formats: 
-      friendly: "%e %B %Y a %H:%M"
+      friendly: "%e de %B %Y a %H:%M"
   trace: 
     create: 
       trace_uploaded: Tu file GPX ha essite incargate e attende insertion in le base de datos. Isto prende generalmente minus de un medie hora, e un e-mail te essera inviate al completion.
@@ -1377,6 +1397,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: 
@@ -1395,17 +1416,23 @@ ia:
       title: Modificar conto
       update home location on click: Actualisar le position de origine quando io clicca super le carta?
     confirm: 
+      already active: Iste conto ha ja essite confirmate.
+      before you start: Nos sape que tu es probabilemente impatiente de comenciar le cartographia, ma antea tu vole forsan inserer plus information super te in le formulario hic infra.
       button: Confirmar
-      failure: Un conto de usator con iste indicio ha ja essite confirmate.
       heading: Confirmar un conto de usator
       press confirm button: Preme le button de confirmation ci infra pro activar tu conto.
+      reconfirm: Si alcun tempore passava post que tu creava le conto, pote esser que tu debe <a href="{{reconfirm}}">facer inviar te un nove e-mail de confirmation</a>.
       success: Tu conto ha essite confirmate, gratias pro inscriber te!
+      unknown token: Iste indicio non pare exister.
     confirm_email: 
       button: Confirmar
       failure: Un adresse de e-mail ha ja essite confirmate con iste indicio.
       heading: Confirmar un cambio de adresse de e-mail
       press confirm button: Preme le button Confirmar ci infra pro confirmar tu nove adresse de e-mail.
       success: Tu adresse de e-mail ha essite confirmate, gratias pro inscriber te!
+    confirm_resend: 
+      failure: Usator {{name}} non trovate.
+      success: Nos ha inviate un nove message de confirmation a {{email}} e si tosto que tu confirma le conto, tu potera comenciar a cartographiar.<br /><br />Si tu usa un systema anti-spam que invia requestas de confirmation, alora per favor assecura te de adder webmaster@openstreetmap.org al lista blanc, post que nos non pote responder a requestas de confirmation.
     filter: 
       not_an_administrator: Tu debe esser administrator pro executar iste action.
     go_public: 
@@ -1422,19 +1449,24 @@ ia:
       summary_no_ip: "{{name}} create le {{date}}"
       title: Usatores
     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.
+      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
@@ -1461,7 +1493,7 @@ ia:
       display name description: Tu nomine de usator monstrate publicamente. Tu pote cambiar lo plus tarde in le preferentias.
       email address: "Adresse de e-mail:"
       fill_form: Completa le formulario e nos te inviara promptemente un e-mail pro activar tu conto.
-      flash create success message: Le usator ha essite create con successo. Recipe tu e-mail pro un nota de confirmation, e tu devenira tosto un cartographo. :-)<br /><br />Nota ben que tu non potera aperir un session usque tu ha recipite e confirmate tu adresse de e-mail.<br /><br />Si tu usa un systema anti-spam que invia requestas de confirmation, alora per favor assecura te de adder webmaster@openstreetmap.org al lista blanc, post que nos non pote responder a requestas de confirmation.
+      flash create success message: Gratias pro crear un conto. Nos ha inviate un message de confirmation a {{email}} e si tosto que tu confirma le conto, tu potera comenciar a cartographiar.<br /><br />Si tu usa un systema anti-spam que invia requestas de confirmation, alora per favor assecura te de adder webmaster@openstreetmap.org al lista blanc, post que nos non pote responder a requestas de confirmation.
       heading: Crear un conto de usator
       license_agreement: Quando tu confirma tu conto, tu debera acceptar le <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">conditiones de contributor</a>.
       no_auto_account_create: Infortunatemente in iste momento non es possibile crear un conto pro te automaticamente.
@@ -1528,6 +1560,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

config/locales/is.yml

@@ -1,6 +1,6 @@
 # Messages for Icelandic (Íslenska)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Ævar Arnfjörð Bjarmason
 is: 
   activerecord: 
@@ -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ð
@@ -900,7 +895,6 @@ is:
           unclassified: Héraðsvegur
           unsurfaced: Óbundið slitlag
           wood: Náttúrulegur skógur
-        heading: Kortaskýringar fyrir þys {{zoom_level}}
     search: 
       search: Leita
       search_help: "dæmi: „Akureyri“, „Laugavegur, Reykjavík“ eða „post offices near Lünen“. Sjá einnig <a href='http://wiki.openstreetmap.org/index.php?uselang=is&title=Search'>leitarhjálpina</a>."
@@ -1049,7 +1043,6 @@ is:
       update home location on click: Uppfæra staðsetninguna þegar ég smelli á kortið
     confirm: 
       button: Staðfesta
-      failure: Notandi hefur þegar verið staðfestur með þessum lykli.
       heading: Staðfesta notanda
       press confirm button: Hér getur þú staðfest að þú viljir búa til notanda..
       success: Notandinn þinn hefur verið staðfestur.

config/locales/it.yml

@@ -1,6 +1,7 @@
 # Messages for Italian (Italiano)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
+# Author: Alessioz
 # Author: Bellazambo
 # Author: Beta16
 # Author: Davalv
@@ -329,6 +330,7 @@ it:
       user_title: Diario dell'utente {{user}}
     location: 
       edit: Modifica
+      location: "Località:"
       view: Visualizza
     new: 
       title: Nuova voce del diario
@@ -347,6 +349,17 @@ it:
       save_button: Salva
       title: Diario di {{user}} | {{title}}
       user_title: Diario dell'utente {{user}}
+  editor: 
+    default: Predefinito (al momento {{name}})
+    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
@@ -384,7 +397,9 @@ it:
   geocoder: 
     description: 
       title: 
+        geonames: Località da <a href="http://www.geonames.org/">GeoNames</a>
         osm_namefinder: "{{types}} da <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
+        osm_nominatim: Località da <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
       types: 
         cities: Città
         places: Luoghi
@@ -413,6 +428,7 @@ it:
         geonames: Risultati da <a href="http://www.geonames.org/">GeoNames</a>
         latlon: Risultati da <a href="http://openstreetmap.org/">Internal</a>
         osm_namefinder: Risultati da <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        osm_nominatim: Risultati restituiti da <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
         uk_postcode: Risultati da <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Risultati da <a href="http://geocoder.us/">Geocoder.us</a>
     search_osm_namefinder: 
@@ -442,9 +458,11 @@ it:
           clinic: Clinica
           club: Club
           college: Scuola superiore
+          community_centre: Centro civico
           courthouse: Tribunale
           crematorium: Crematorio
           dentist: Dentista
+          doctors: Medici
           dormitory: Dormitorio
           drinking_water: Acqua potabile
           driving_school: Scuola guida
@@ -472,6 +490,7 @@ it:
           nightclub: Locale notturno
           nursery: Asilo nido
           nursing_home: Asilo nido
+          office: Ufficio
           park: Parco
           parking: Parcheggio
           pharmacy: Farmacia
@@ -509,6 +528,7 @@ it:
           administrative: Confine amministrativo
         building: 
           apartments: Edificio residenziale
+          bunker: Bunker
           chapel: Cappella
           church: Chiesa
           city_hall: Municipio
@@ -534,7 +554,6 @@ it:
           tower: Torre
           train_station: Stazione ferroviaria
           university: Sede universitaria
-          "yes": Edificio
         highway: 
           bridleway: Percorso per equitazione
           bus_guideway: Autobus guidato
@@ -555,23 +574,23 @@ it:
           path: Sentiero
           pedestrian: Percorso pedonale
           platform: Piattaforma
-          primary: Strada principale
+          primary: Strada di importanza nazionale
           primary_link: Strada principale
           raceway: Pista
           residential: Strada residenziale
           road: Strada generica
-          secondary: Strada secondaria
+          secondary: Strada di importanza regionale
           secondary_link: Strada secondaria
           service: Strada di servizio
           services: Stazione di servizio
           steps: Scala
           stile: Scaletta
-          tertiary: Strada terziaria
-          track: Tracciato
+          tertiary: Strada di importanza locale
+          track: Strada forestale o agricola
           trail: Percorso escursionistico
           trunk: Superstrada
           trunk_link: Superstrada
-          unclassified: Strada non classificata
+          unclassified: Strada minore
           unsurfaced: Strada non pavimentata
         historic: 
           archaeological_site: Sito archeologico
@@ -589,6 +608,8 @@ it:
           museum: Museo
           ruins: Rovine
           tower: Torre
+          wayside_cross: Croce
+          wayside_shrine: Edicola votiva
           wreck: Relitto
         landuse: 
           allotments: Orti casalinghi
@@ -684,7 +705,7 @@ it:
           country: Nazione
           county: Contea (in Italia NON usare)
           farm: Area agricola
-          hamlet: Borgo
+          hamlet: Gruppo di case
           house: Casa
           houses: Gruppo di case
           island: Isola
@@ -700,7 +721,7 @@ it:
           suburb: Quartiere
           town: Paese
           unincorporated_area: Area non inclusa
-          village: Frazione
+          village: Piccolo paese
         railway: 
           abandoned: Linea ferroviaria abbandonata
           construction: Ferrovia in costruzione
@@ -713,6 +734,8 @@ it:
           light_rail: Ferrovia leggera
           monorail: Monorotaia
           narrow_gauge: Ferrovia a scartamento ridotto
+          platform: Banchina ferroviaria
+          preserved: Ferrovia storica
           station: Stazione ferroviaria
           subway: Stazione della metropolitana
           subway_entrance: Ingresso alla metropolitana
@@ -720,31 +743,50 @@ it:
           tram_stop: Fermata del tram
           yard: Zona di manovra ferroviaria
         shop: 
+          alcohol: Alcolici
+          art: Negozio d'arte
           bakery: Panetteria
+          beauty: Prodotti cosmetici
+          beverages: Negozio bevande
+          bicycle: Negozio biciclette
           books: Libreria
           butcher: Macellaio
           car: Concessionaria
           car_dealer: Concessionaria auto
           car_parts: Autoricambi
           car_repair: Autofficina
+          carpet: Tappeti
+          charity: Negozio solidale
           chemist: Farmacia
           clothes: Negozio di abbigliamento
           computer: Negozio di computer
+          confectionery: Pasticceria
+          convenience: Minimarket
+          copyshop: Copisteria
+          cosmetics: Negozio cosmetici
+          department_store: Grande magazzino
           discount: Discount
           doityourself: Fai da-te
           drugstore: Emporio
           dry_cleaning: Lavasecco
+          electronics: Elettronica
           estate_agent: Agenzia immobiliare
           farm: Parafarmacia
+          fashion: Negozio moda
           fish: Pescheria
           florist: Fioraio
           food: Alimentari
           funeral_directors: Agenzia funebre
           furniture: Arredamenti
+          gallery: Galleria d'arte
+          garden_centre: Centro giardinaggio
+          general: Emporio
           gift: Articoli da regalo
           greengrocer: Fruttivendolo
           grocery: Fruttivendolo
           hairdresser: Parrucchiere
+          hardware: Ferramenta
+          hifi: Hi-Fi
           insurance: Assicurazioni
           jewelry: Gioielleria
           kiosk: Edicola
@@ -752,16 +794,22 @@ it:
           mall: Centro commerciale
           market: Mercato
           mobile_phone: Centro telefonia mobile
+          motorcycle: Concessionario di motociclette
           music: Articoli musicali
           newsagent: Giornalaio
           optician: Ottico
+          organic: Negozio di prodotti naturali ed ecologici
           pet: Negozio animali
           photo: Articoli fotografici
+          salon: Salone
           shoes: Negozio di calzature
+          shopping_centre: Centro commerciale
           sports: Articoli sportivi
           supermarket: Supermercato
           toys: Negozio di giocattoli
           travel_agency: Agenzia di viaggi
+          video: Videoteca
+          wine: Alcolici
         tourism: 
           alpine_hut: Rifugio alpino
           artwork: Opera d'arte
@@ -816,19 +864,27 @@ 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
+    home_tooltip: Vai alla posizione iniziale
     inbox: in arrivo ({{count}})
     inbox_tooltip: 
       one: La tua posta in arrivo contiene 1 messaggio non letto
@@ -849,12 +905,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
@@ -997,6 +1049,7 @@ it:
     signup_confirm: 
       subject: "[OpenStreetMap] Conferma il tuo indirizzo email"
     signup_confirm_html: 
+      ask_questions: E' possibile fare qualsiasi domanda relativa ad OpenStreetMap sul nostro <a href="http://help.openstreetmap.org/">sito di domande e risposte</a>.
       click_the_link: Se questo qualcuno sei tu, benvenuto! Clicca sul collegamento sottostante per confermare il tuo profilo ed avere ulteriori informazioni su OpenStreetMap.
       current_user: Una lista degli utenti attuali nelle categorie, basate sul luogo in cui essi operano, è disponibile su <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
       get_reading: Leggi di OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">sul wiki</a>, non perdere le ultime notizie sul <a href="http://blog.openstreetmap.org/">blog di OpenStreetMap</a> o su <a href="http://twitter.com/openstreetmap">Twitter</a>, oppure sfoglia il blog <a href="http://www.opengeodata.org/">OpenGeoData</a> di Steve Coast, fondatore di OpenStreetMap, per una storia completa del progetto; ci sono anche dei <a href="http://www.opengeodata.org/?cat=13">podcast da ascoltare</a>!
@@ -1009,6 +1062,7 @@ it:
       video_to_openstreetmap: video introduttivo su OpenStreetMap
       wiki_signup: Ci si può anche <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">iscrivere al wiki di OpenStreetMap</a>.
     signup_confirm_plain: 
+      ask_questions: "E' possibile fare qualsiasi domanda relativa ad OpenStreetMap sul nostro sito di domande e risposte:"
       blog_and_twitter: "Ottieni le ultime notizie tramite il blog di OpenStreetMap oppure Twitter:"
       click_the_link_1: Se questo qualcuno sei tu, benvenuto! Clicca sul collegamento sottostante
       click_the_link_2: per confermare il tuo profilo ed avere ulteriori informazioni su OpenStreetMap.
@@ -1050,6 +1104,7 @@ it:
       allow_write_diary: crea pagine di diario, commenti e fai amicizia.
       allow_write_gpx: carica tracciati GPS.
       allow_write_prefs: modifica le loro preferenze utente.
+      callback_url: URL di richiamata
       name: Nome
       requests: "Richiedi le seguenti autorizzazioni da parte dell'utente:"
       required: Richiesto
@@ -1072,6 +1127,7 @@ it:
     not_found: 
       sorry: Siamo dolenti, quel {{type}} non è stato trovato.
     show: 
+      access_url: "URL del token di accesso:"
       allow_read_gpx: leggi i loro tracciati GPS privati.
       allow_read_prefs: leggi le loro preferenze utente.
       allow_write_api: modifica la mappa.
@@ -1080,17 +1136,22 @@ it:
       allow_write_prefs: modifica le sue preferenze utente.
       authorize_url: "Autorizza URL:"
       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:"
     update: 
       flash: Aggiornate con successo le informazioni sul client
   site: 
     edit: 
       anon_edits_link_text: Leggi il perché.
       flash_player_required: E' necessario un visualizzatore Flash per utilizzare Potlatch, il programma Flash per le modifiche di OpenStreetMap. Si può <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">scaricare il Flash Player da Adobe.com</a>. Sono disponibili anche <a href="http://wiki.openstreetmap.org/wiki/Editing">altre possibilità</a> per apportare modifiche a OpenStreetMap.
+      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: 
@@ -1098,20 +1159,24 @@ it:
       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>.
       license: 
-        license_name: Creative Commons Attribution-Share Alike 2.0
+        license_name: Creative Commons Attribuzione-Condividi allo stesso modo 2.0
         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
+      map_key_tooltip: Legenda
       table: 
         entry: 
           admin: Confine amministrativo
+          allotments: Area comune orti casalinghi
           apron: 
             - Area di parcheggio aeroportuale
             - Terminal
           bridge: Quadrettatura nera = ponte
+          bridleway: Percorso per equitazione
           brownfield: Area soggetta ad interventi di ridestinazione d'uso
           building: Edificio significativo
           byway: Byway (UK)
@@ -1119,13 +1184,16 @@ it:
             - Funivia
             - Seggiovia
           cemetery: Cimitero
+          centre: Centro sportivo
           commercial: Zona di uffici
           common: 
-            1: prato
+            - Area comune
+            - prato
           construction: Strade in costruzione
           cycleway: Pista Ciclabile
+          destination: Servitù di passaggio
           farm: Azienda agricola
-          footway: Pista pedonale
+          footway: Percorso pedonale
           forest: Foresta
           golf: Campo da golf
           heathland: Brughiera
@@ -1137,7 +1205,8 @@ it:
           motorway: Autostrada
           park: Parco
           permissive: Accesso permissivo
-          primary: Strada principale
+          pitch: Campo sportivo
+          primary: Strada di importanza nazionale
           private: Accesso privato
           rail: Ferrovia
           reserve: Riserva naturale
@@ -1149,21 +1218,22 @@ it:
           school: 
             - Scuola
             - Università
-          secondary: Strada secondaria
+          secondary: Strada di importanza regionale
           station: Stazione ferroviaria
           subway: Metropolitana
           summit: 
-            1: picco
+            - Picco montuoso
+            - Picco montuoso
           tourist: Attrazione turistica
+          track: Strada forestale o agricola
           tram: 
             - Metropolitana di superficie
             - Tram
-          trunk: Strada principale
+          trunk: Superstrada
           tunnel: Linea tratteggiata = tunnel
-          unclassified: Strada non classificata
+          unclassified: Strada minore
           unsurfaced: Strada non pavimentata
           wood: Bosco
-        heading: Legenda per z{{zoom_level}}
     search: 
       search: Cerca
       search_help: "esempi: 'Trieste', 'Via Dante Alighieri, Trieste', 'CB2 5AQ', oppure 'post offices near Trieste' <a href='http://wiki.openstreetmap.org/wiki/Search'>altri esempi...</a>"
@@ -1301,6 +1371,7 @@ it:
       new email address: "Nuovo indirizzo e-mail:"
       new image: Aggiungi un'immagine
       no home location: Non si è inserita la propria posizione.
+      preferred editor: "Editor preferito:"
       preferred languages: "Lingua preferita:"
       profile description: "Descrizione del profilo:"
       public editing: 
@@ -1319,17 +1390,23 @@ it:
       title: Modifica profilo
       update home location on click: Aggiorna la posizione quando clicco sulla mapppa?
     confirm: 
+      already active: Questo profilo è stato già confermato.
+      before you start: Sappiamo che probabilmente hai fretta di iniziare a mappare, ma prima dovresti inserire alcune informazioni su di te nel modulo sottostante.
       button: Conferma
-      failure: E' stato già confermato un profilo utente con questo codice.
       heading: Conferma un profilo utente
       press confirm button: Premere sul pulsante di conferma sottostante per attivare il proprio profilo utente.
+      reconfirm: Se è passato un po' di tempo dall'ultimo accesso potrebbe essere necessario <a href="{{reconfirm}}">inviare una nuova email di conferma</a>.
       success: Il profilo utente è stato confermato, grazie per l'iscrizione!
+      unknown token: Questo token non sembra esistere.
     confirm_email: 
       button: Conferma
       failure: E' stato già confermato un indirizzo email con questo codice.
       heading: Conferma una variazione di indirizzo email
       press confirm button: Premere sul pulsante di conferma sottostante per confermare il nuovo indirizzo email.
       success: L'indirizzo email è stato confermato, grazie per l'iscrizione!
+    confirm_resend: 
+      failure: Utente {{name}} non trovato.
+      success: E' stato spedito un nuovo messaggio di conferma all'indirizzo {{email}} e non appena verrà confermato il proprio profilo si sarà in grado di mappare.<br /><br />Se si utilizzano dei filtri antispam che spediscono richieste di conferma assicurarsi di inserire l'indirizzo webmaster@openstreetmap.org nella whitelist, altrimenti non siamo in grado di rispondere ad alcuna richiesta di conferma.
     filter: 
       not_an_administrator: Bisogna essere amministratori per poter eseguire questa azione.
     go_public: 
@@ -1346,19 +1423,24 @@ it:
       summary_no_ip: "{{name}} creato il {{date}}"
       title: Utenti
     login: 
-      account not active: Spiacenti, il tuo profilo non è ancora attivo.<br />Clicca sul collegamento presente nell'email di conferma per attivare il tuo profilo.
+      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
@@ -1385,7 +1467,7 @@ it:
       display name description: Il proprio nome utente visualizzato pubblicamente. Può essere modificato più tardi nelle preferenze.
       email address: "Indirizzo email:"
       fill_form: Riempi il modulo e noi ti invieremo velocemente una email per attivare il tuo profilo.
-      flash create success message: L'utente è stato creato con successo. Controllare la propria email per conferma, e si sarà in grado di mappare immediatamente :-)<br /><br />Si ricorda che non si sarà in grado di effettuare l'accesso finché non si sarà ricevuta e confermata la propria email.<br /><br />Se si utilizza un sistema antispam che spedisce richieste di conferma allora assicurarsi di accreditare l'indirizzo webmaster@openstreetmap.org altrimenti non siamo in grado di rispondere ad alcuna richiesta di conferma.
+      flash create success message: Grazie per l'iscrizione. Abbiamo spedito un messaggio di conferma all'indirizzo {{email}} e non appena sarà confermato il proprio profilo sarà possibile mappare.<br /><br />Se si utilizzano dei filtri antispam che inviano delle richieste di conferma assicurarsi che l'indirizzo webmaster@openstreetmap.org sia nella whitelist, altrimenti non saremo in grado di rispondere ad alcuna richiesta di conferma.
       heading: Crea un profilo utente
       license_agreement: Quando confermi il tuo profilo devi accettare le <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">regole per contribuire</a>.
       no_auto_account_create: Sfortunatamente in questo momento non è possibile creare automaticamente per te un profilo.
@@ -1452,6 +1534,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

config/locales/ja.yml

@@ -1,10 +1,12 @@
 # Messages for Japanese (日本語)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Fryed-peach
 # Author: Higa4
 # Author: Hosiryuhosi
+# Author: Iwai.masaharu
 # Author: Mage Whopper
+# Author: Miya
 # Author: Nazotoko
 # Author: 青子守歌
 ja: 
@@ -54,6 +56,7 @@ ja:
       message: メッセージ
       node: ノード
       node_tag: ノードタグ
+      notifier: 通知
       old_node: 古いノード
       old_node_tag: 古いノードのタグ
       old_relation: 古いリレーション
@@ -344,6 +347,8 @@ ja:
       save_button: 保存
       title: "{{user}}の日記 | {{title}}"
       user_title: "{{user}} の日記"
+  editor: 
+    default: 規定値 (現在は {{name}})
   export: 
     start: 
       add_marker: 地図にマーカーを追加する
@@ -432,6 +437,7 @@ ja:
           casino: 賭場
           cinema: 映画館
           clinic: クリニック
+          club: クラブ
           college: 大学
           community_centre: コミュニティセンター
           courthouse: 裁判所
@@ -467,6 +473,7 @@ ja:
           place_of_worship: 神社仏閣
           police: 警察所
           post_box: 郵便ポスト
+          post_office: 郵便局
           prison: 刑務所
           pub: パブ（立ち吞み屋）
           public_building: 公共建築物
@@ -477,6 +484,7 @@ ja:
           school: 学校
           shelter: 避難所
           shop: 店舗
+          shopping: ショッピング
           social_club: 社交クラブ
           studio: スタジオ
           supermarket: スーパーマーケット
@@ -515,7 +523,6 @@ ja:
           terrace: テラス
           tower: 塔
           train_station: 鉄道駅
-          "yes": 建造物
         highway: 
           bus_stop: バス停
           byway: 路地
@@ -524,8 +531,10 @@ ja:
           ford: 砦
           gate: 門
           motorway_junction: 高速道路ジャンクション
+          platform: プラットフォーム
           road: 道路
           steps: 階段
+          trunk: 国道
         historic: 
           battlefield: 戦場
           boundary_stone: 境界石
@@ -677,8 +686,10 @@ ja:
           shopping_centre: ショッピングセンター
           toys: 玩具店
         tourism: 
+          artwork: 芸術作品
           camp_site: キャンプ場
           hotel: ホテル
+          information: 案内所
           museum: 博物館
           theme_park: テーマパーク
           valley: 谷
@@ -708,13 +719,18 @@ ja:
       history_zoom_alert: 編集履歴を参照するにはもっと拡大してください
   layouts: 
     copyright: 著作権とライセンス
+    documentation: ドキュメント
+    documentation_title: プロジェクトのドキュメント
     donate: ハードウェアーアップグレード基金への{{link}} で、OpenStreetMap を支援する。
     donate_link_text: 寄付
     edit: 編集
     export: エクスポート
     export_tooltip: 地図データのエクスポート
+    foundation_title: OpenStreetMap ファウンデーション
     gps_traces: GPS トレース
     gps_traces_tooltip: トレースの管理
+    help: ヘルプ
+    help_centre: ヘルプセンター
     history: 履歴
     home: ホーム
     home_tooltip: ホームへ戻る
@@ -739,12 +755,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: 自由なウィキ世界地図
@@ -858,6 +870,8 @@ ja:
     lost_password_html: 
       greeting: こんにちは。
       hopefully_you: (たぶんあなたがですが、)誰かがこのEメールアドレスの openstreetmap.org アカウントのパスワードをリセットするように頼みました。
+    lost_password_plain: 
+      greeting: こんにちは、
     message_notification: 
       hi: やあ {{to_user}}、
     signup_confirm: 
@@ -873,6 +887,7 @@ ja:
       video_to_openstreetmap: OpenStreetMap の紹介ビデオ
       wiki_signup: また、<a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page&uselang=ja">OpenStreetMap wikのサインアップ</a>もしておくとよいでしょう。
     signup_confirm_plain: 
+      more_videos: こちらにもっとビデオがあります：
       the_wiki_url: http://wiki.openstreetmap.org/wiki/Ja:Beginners%27_Guide
       wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page&uselang=ja
   oauth: 
@@ -1016,7 +1031,6 @@ ja:
           unclassified: 未分類の道路
           unsurfaced: 未舗装道路
           wood: 森林
-        heading: z{{zoom_level}} 用凡例
     search: 
       search: 検索
       search_help: "例: '名古屋城'、'名寄市'、'New York'、'皇居' など <a href='http://wiki.openstreetmap.org/wiki/Search'>他の例…</a>"
@@ -1129,6 +1143,13 @@ ja:
       trackable: 追跡可能  (匿名でのみ共有されるが、点の順序はタイムスタンプ付きでわかる。)
   user: 
     account: 
+      contributor terms: 
+        agreed: あなたは、新しい投稿規約を承諾しています。
+        agreed_with_pd: また、あなたは、自分の編集結果がパブリックドメインにあるべきだと考えているということも宣言しています。
+        heading: "投稿規約:"
+        link text: これは何ですか？
+        not yet agreed: あなたはまだ新しい投稿規約を承諾していません。
+        review link text: ご都合の良い時にこのリンクをクリックして新しい投稿規約をレビューの上、同意してください。
       current email address: 現在の電子メールアドレス：
       delete image: 現在の画像を削除
       email never displayed publicly: （公開しません）
@@ -1144,6 +1165,7 @@ ja:
       new email address: 新しい電子メールアドレス
       new image: 画像を追加
       no home location: あなたはまだ活動地域を登録していません。
+      preferred editor: 優先エディタ：
       preferred languages: "言語設定:"
       profile description: "ユーザ情報の詳細:"
       public editing: 
@@ -1155,22 +1177,27 @@ ja:
         heading: "公開編集:"
       public editing note: 
         heading: 公開編集
+      replace image: 現在の画像と置換
       return to profile: プロフィールに戻る
       save changes button: 変更を保存
       title: アカウントを編集
       update home location on click: クリックした地点をあなたの活動地域として登録を更新しますか？
     confirm: 
+      already active: このアカウントはすでに確認されています。
       button: 確認
-      failure: このキーワードによって、ユーザアカウントはすでに確認されています。
       heading: ユーザアカウントの確認
       press confirm button: アカウントを有効にして良ければ、以下の確認ボタンを押してください。
       success: あなたのアカウントを確認しました。登録ありがとうございます！
+      unknown token: このトークンは存在していないようです。
     confirm_email: 
       button: 確認
       failure: このメールアドレス確認トークンは既に確認が済んでいます。
       heading: 電子メールアドレス変更の確認
       press confirm button: 新しいメールアドレスを確認するために確認ボタンを押して下さい。
       success: あなたのメールアドレスが確認できました。登録ありがとうございます。
+    confirm_resend: 
+      failure: "{{name}}というアカウントは登録されていません。"
+      success: " {{email}}に確認メッセージを再送信しました。電子メールを確認してアカウントを有効にし次第、編集を開始できます。<br /><br />あなたの指定したアドレスに確認メールが届くまであなたはログインすることはできません。メールボックスでスパムフィルタを使っているときには webmaster@openstreetmap.org からの確認メールを受信できるようホワイトリストを設定してください。"
     filter: 
       not_an_administrator: この作業を行うには、管理者になる必要があります。
     go_public: 
@@ -1180,19 +1207,26 @@ ja:
       empty: 条件に一致するユーザーが見つかりません
       heading: 利用者
       hide: 選択したユーザーを隠す
+      summary: "{{name}} は {{ip_address}}から{{date}}に作成されました。"
+      summary_no_ip: "{{name}} は{{date}}に作成されました。"
       title: ユーザー
     login: 
-      account not active: 申し訳ありません。あなたのアカウントはまだ有効ではありません。<br />アカウント確認メールに記載されている、アカウントを有効にするリンクをクリックしてください。
+      account not active: 申し訳ありません。あなたのアカウントはまだ有効ではありません。<br />アカウント確認メールに記載されている、アカウントを有効にするリンクをクリックするか、<a href="{{reconfirm}}">新しいアカウント確認メールの要求</a>をしてください。
+      already have: すでにOpenStreetMapのアカウントを持っていますか？ログインしてください。
       auth failure: 申し訳ありません、以下の理由によりログインできません。
+      create account minute: アカウントを作成します。1分でできます。
       create_account: アカウント作成
       email or username: "Eメールアドレスかユーザ名:"
       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からログアウトする
@@ -1219,12 +1253,13 @@ ja:
       display name description: あなたのユーザー名は投稿者として公開されます。これは設定から変更できます。
       email address: "Eメールアドレス:"
       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: アカウントを作成することで、あなたが openstreetmap.org にアップロードする全てのデータおよび作業内容、もしくは openstreetmap.org に接続するツールによる活動を全て非排他的な <a  href="http://creativecommons.org/licenses/by-sa/2.0/">クリエイティブコモンズ 表示-継承 (Creative Commons by-sa) ライセンス</a>で使用許諾した物と見なされます。
+      license_agreement: アカウントを確認することで、あなたが openstreetmap.org にアップロードする全てのデータおよび作業内容、もしくは openstreetmap.org に接続するツールによる活動を全て非排他的な <a  href="http://creativecommons.org/licenses/by-sa/2.0/">クリエイティブコモンズ 表示-継承 (Creative Commons by-sa) ライセンス</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}}. という名前のユーザは存在しません。スペルミスが無いかチェックしてください。もしくはリンク元が間違っています。"
@@ -1254,11 +1289,14 @@ ja:
       agree: 同意する
       consider_pd: 私の投稿をパブリックドメインとします（著作権、著作隣接権を放棄し、著作人格権の行使を行いません）
       consider_pd_why: これは何ですか？
+      decline: 拒否
+      heading: 投稿規約(Contributor terms)
       legale_names: 
         france: フランス
         italy: イタリア
         rest_of_world: それ以外の国
       legale_select: "お住まいの国もしくは地域を選択してください:"
+      read and accept: 下記の同意書を読み、あなたの既存および将来の投稿のために本同意書の条項を承諾することを確認するために同意ボタンを押してください。
     view: 
       activate_user: このユーザーを有効にする
       add as friend: 友達に追加
@@ -1276,6 +1314,7 @@ ja:
       hide_user: このユーザーを隠す
       if set location: 活動地域を指定すると、この下に周辺の地図と、近くで活動するマッパーが表示されます。{{settings_link}} から設定をしてください。
       km away: 距離 {{count}}km
+      latest edit: "最終編集 {{ago}}:"
       m away: 距離 {{count}}メートル
       mapper since: "マッパー歴:"
       my diary: 私の日記
@@ -1317,8 +1356,10 @@ ja:
     create: 
       flash: ユーザー {{name}} をブロックしました。
     edit: 
+      back: すべてのブロックを表示
       heading: "{{name}} のブロックを編集"
       show: このブロックを閲覧
+      submit: ブロックを更新
       title: "{{name}} のブロックを編集"
     filter: 
       block_expired: このブロック期間は既に終了しており、変更できません。

config/locales/lb.yml

@@ -1,6 +1,6 @@
 # Messages for Luxembourgish (Lëtzebuergesch)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Robby
 lb: 
   activerecord: 
@@ -118,6 +118,8 @@ lb:
         node: Knuet
         relation: Relatioun
         way: Wee
+    start: 
+      manually_select: En anere Beräich manuell eraussichen
     start_rjs: 
       data_frame_title: Donnéeën
       data_layer_name: Donnéeën
@@ -143,6 +145,9 @@ lb:
       show_history: Versioune weisen
       wait: Waart w.e.g. ...
     tag_details: 
+      wiki_link: 
+        key: D'Wiki-Beschreiwungssäit fir den {{key}}-Tag
+        tag: D'Wiki-Beschreiwungssäit fir den {{key}}={{value}}-Tag
       wikipedia_link: Den Artikel {{page}} op der Wikipedia
     timeout: 
       type: 
@@ -167,21 +172,25 @@ lb:
     changeset: 
       anonymous: Anonym
       big_area: (grouss)
+      no_comment: (keen)
       no_edits: (keng Ännerungen)
     changeset_paging_nav: 
       next: Nächst »
       previous: "« Vireg"
     changesets: 
+      area: Beräich
       user: Benotzer
   diary_entry: 
     diary_comment: 
       confirm: Confirméieren
+      hide_link: Dës Bemierkung verstoppen
     diary_entry: 
       confirm: Confirméieren
     edit: 
       language: "Sprooch:"
       save_button: Späicheren
       subject: "Sujet:"
+      use_map_link: Kaart benotzen
     location: 
       edit: Änneren
     no_such_user: 
@@ -191,13 +200,19 @@ lb:
       save_button: Späicheren
   export: 
     start: 
+      export_button: Exportéieren
       format: Format
       image_size: "Gréisst vum Bild:"
       licence: Lizenz
       options: Optiounen
       scale: Maassstab
       zoom: Zoom
+    start_rjs: 
+      export: Exportéieren
   geocoder: 
+    description: 
+      types: 
+        places: Plazen
     direction: 
       east: ëstlech
       north: nërdlech
@@ -209,6 +224,15 @@ lb:
       west: westlech
     results: 
       more_results: Méi Resultater
+      no_results: Näischt fonnt
+    search: 
+      title: 
+        ca_postcode: Resultater vu <a href="http://geocoder.ca/">Geocoder.ca</a>
+        geonames: Resultater vu <a href="http://www.geonames.org/">GeoNames</a>
+        latlon: Resultater vun <a href="http://openstreetmap.org/">Internal</a>
+        osm_namefinder: Resultater vun <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        uk_postcode: Resultater vun <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
+        us_postcode: Resultater vu <a href="http://geocoder.us/">Geocoder.us</a>
     search_osm_namefinder: 
       suffix_place: ", {{distance}} {{direction}} vu(n) {{placename}}"
     search_osm_nominatim: 
@@ -216,6 +240,7 @@ lb:
         amenity: 
           airport: Fluchhafen
           bank: Bank
+          bureau_de_change: Wiesselbüro
           bus_station: Busarrêt
           cafe: Café
           cinema: Kino
@@ -223,21 +248,27 @@ lb:
           crematorium: Crematoire
           dentist: Zänndokter
           doctors: Dokteren
+          drinking_water: Drénkwaasser
           driving_school: Fahrschoul
           embassy: Ambassade
+          emergency_phone: Noutruff-Telefon
           fire_station: Pompjeeën
           fountain: Sprangbur
           hospital: Klinik
           hotel: Hotel
           kindergarten: Spillschoul
+          library: Bibliothéik
           market: Maart
           marketplace: Maartplaz
           mountain_rescue: Biergrettung
           park: Park
+          parking: Parking
           pharmacy: Apdikt
           police: Police
+          post_office: Postbüro
           preschool: Spillschoul
           prison: Prisong
+          pub: Bistro
           restaurant: Restaurant
           sauna: Sauna
           school: Schoul
@@ -248,26 +279,34 @@ lb:
           toilets: Toiletten
           townhall: Stadhaus
           university: Universitéit
+          vending_machine: Verkaafsautomat
         building: 
           bunker: Bunker
           chapel: Kapell
           church: Kierch
+          city_hall: Stadhaus
+          flats: Appartementer
           hotel: Hotel
           house: Haus
+          office: Bürosgebai
+          school: Schoulgebai
           stadium: Stadion
+          store: Geschäft
           terrace: Terrasse
           tower: Tuerm
           train_station: Gare (Eisebunn)
-          "yes": Gebai
         highway: 
           footway: Fousswee
           gate: Paard
           motorway: Autobunn
           path: Pad
+          pedestrian: Fousswee
           primary: Haaptstrooss
+          primary_link: Haaptstrooss
           road: Strooss
           secondary_link: Niewestrooss
         historic: 
+          battlefield: Schluechtfeld
           building: Gebai
           castle: Schlass
           church: Kierch
@@ -278,20 +317,25 @@ lb:
           tower: Tuerm
         landuse: 
           cemetery: Kierfecht
+          farm: Bauerenhaff
           forest: Bësch
           military: Militairegebitt
+          mountain: Bierg
           park: Park
           railway: Eisebunn
           vineyard: Wéngert
           wood: Bësch
         leisure: 
+          garden: Gaart
           golf_course: Golfterrain
           marina: Yachthafen
           miniature_golf: Minigolf
+          nature_reserve: Naturschutzgebitt
           playground: Spillplaz
           stadium: Stadion
           swimming_pool: Schwëmm
         natural: 
+          beach: Plage
           channel: Kanal
           crater: Krater
           fjord: Fjord
@@ -299,6 +343,7 @@ lb:
           glacier: Gletscher
           hill: Hiwwel
           island: Insel
+          moor: Mouer
           point: Punkt
           river: Floss
           rock: Steng
@@ -311,6 +356,8 @@ lb:
         place: 
           airport: Fluchhafen
           country: Land
+          farm: Bauerenhaff
+          house: Haus
           houses: Haiser
           island: Insel
           municipality: Gemeng
@@ -320,17 +367,24 @@ lb:
           village: Duerf
         railway: 
           disused: Fréier Eisebunn
+          station: Gare (Eisebunn)
+          subway: Metro-Statioun
           tram: Tram
         shop: 
           bakery: Bäckerei
           books: Bichergeschäft
+          car_dealer: Autoshändler
+          car_repair: Garage
           chemist: Apdikt
           clothes: Kleedergeschäft
           dry_cleaning: Botzerei
           florist: Fleurist
+          furniture: Miwwelgeschäft
+          gallery: Gallerie
           hairdresser: Coiffeur
           insurance: Versécherungsbüro
           jewelry: Bijouterie
+          laundry: Botzerei
           optician: Optiker
           photo: Fotosgeschäft
           shoes: Schonggeschäft
@@ -340,6 +394,7 @@ lb:
           artwork: Konschtwierk
           attraction: Attraktioun
           chalet: Chalet
+          hotel: Hotel
           information: Informatioun
           museum: Musée
           picnic_site: Piknikplaz
@@ -356,12 +411,20 @@ lb:
       edit_tooltip: Kaart änneren
   layouts: 
     copyright: Copyright &amp; Lizenz
+    documentation: Dokumentatioun
+    documentation_title: Dokumentatioun vum Projet
     donate_link_text: Don
     edit: Änneren
+    foundation: Fondatioun
+    help: Hëllef
+    home: Doheem
     intro_3_partners: Wiki
+    logo: 
+      alt_text: OpenStreetMap Logo
+    logout_tooltip: Ausloggen
     make_a_donation: 
       text: En Don maachen
-    shop: Geschäft
+      title: Ënnerstëtzt OpenStreetMap mat engem Don
     user_diaries: Benotzer Bloggen
     view_tooltip: Kaart weisen
     welcome_user: Wëllkomm, {{user_link}}
@@ -379,13 +442,16 @@ lb:
       deleted: Message geläscht
     inbox: 
       date: Datum
+      from: Vum
       subject: Sujet
     message_summary: 
       delete_button: Läschen
+      read_button: Als geliest markéieren
       reply_button: Äntwerten
       unread_button: Als net geliest markéieren
     new: 
       send_button: Schécken
+      send_message_to: Dem {{name}} en neie Message schécken
       subject: Sujet
       title: Noriicht schécken
     no_such_user: 
@@ -397,11 +463,15 @@ lb:
     read: 
       date: Datum
       reply_button: Äntwerten
+      subject: Sujet
+      title: Message liesen
     sent_message_summary: 
       delete_button: Läschen
   notifier: 
     diary_comment_notification: 
       hi: Salut {{to_user}},
+    email_confirm: 
+      subject: "[OpenStreetMap] Confirméiert Är E-Mailadress"
     email_confirm_html: 
       greeting: Salut,
     email_confirm_plain: 
@@ -413,6 +483,8 @@ lb:
       greeting: Salut,
     lost_password_plain: 
       greeting: Salut,
+    message_notification: 
+      hi: Salut {{to_user}},
     signup_confirm_plain: 
       more_videos: "Hei si méi Videoen:"
   oauth_clients: 
@@ -430,11 +502,16 @@ lb:
     key: 
       table: 
         entry: 
+          cemetery: Kierfecht
           cycleway: Vëlospiste
+          farm: Bauerenhaff
+          forest: Bësch
           golf: Golfterrain
           lake: 
             - Séi
+          military: Militärgebitt
           motorway: Autobunn
+          park: Park
           rail: Eisebunn
           school: 
             - Schoul
@@ -446,6 +523,7 @@ lb:
     search: 
       search: Sichen
       submit_text: Lass
+      where_am_i: Wou sinn ech?
     sidebar: 
       close: Zoumaachen
       search_results: Reaultater vun der Sich
@@ -502,6 +580,7 @@ lb:
       map: Kaart
       none: Keen
       owner: "Besëtzer:"
+      pending: AM SUSPENS
       points: "Punkten:"
       start_coordinates: "Ufankskoordinaten:"
       uploaded: "Eropgelueden:"
@@ -512,6 +591,7 @@ lb:
         link text: wat ass dëst?
       current email address: "Aktuell E-Mailadress:"
       delete image: Dat aktuellt Bild ewechhuelen
+      email never displayed publicly: (ni ëffentlech gewisen)
       flash update success: Benotzerinformatioun ass elo aktualiséiert.
       image: "Bild:"
       keep image: Dat aktuellt Bild behalen
@@ -525,24 +605,36 @@ lb:
         disabled link text: Firwat kann ech net änneren?
         enabled link text: wat ass dëst?
       replace image: Dat aktuellt Bild ersetzen
+      return to profile: "Zréck op de Profil:"
       save changes button: Ännerunge späicheren
+      title: Benotzerkont änneren
     confirm: 
+      already active: Dëse Kont gouf scho confirméiert.
       button: Confirméieren
       heading: E Benotzerkont confirméieren
       press confirm button: Klickt w.e.g. op de Knäppchen confirméieren fir Äre Benotzerkont z'aktivéieren.
     confirm_email: 
       button: Confirméieren
+      heading: Eng Ännerung vun enger E-Mailadress confirméieren
+    confirm_resend: 
+      failure: Benotzer {{name}} gouf net fonnt.
+    filter: 
+      not_an_administrator: Dir musst Administrateur si fir déi Aktioun maachen ze kënnen.
     go_public: 
       flash success: All Är Ännerunge sinn elo ëffentlech, an Dir däerft elo änneren.
     list: 
       confirm: Erausgesichte Benotzer confirméieren
+      empty: Et goufe keng esou Benotzer fonnt
       heading: Benotzer
       hide: Erausgesichte Benotzer vrstoppen
       title: Benotzer
     login: 
       email or username: "E-Mailadress oder Benotzernumm:"
+      heading: Umellen
+      login_button: Umellen
       lost password link: Hutt Dir Äert Passwuert vergiess?
       password: "Passwuert:"
+      title: Umellen
       webmaster: Webmaster
     logout: 
       heading: Vun OpenStreetMap ofmellen
@@ -556,6 +648,7 @@ lb:
       title: Passwuert vergiess
     make_friend: 
       already_a_friend: Dir sidd schonn de Frënd vum {{name}}.
+      failed: Pardon, {{name}} konnt net als Frënd derbäigesat ginn.
       success: "{{name}} ass elo Äre Frënd."
     new: 
       confirm email address: "E-Mailadress confirméieren:"
@@ -564,6 +657,7 @@ lb:
       display name: Numm weisen
       email address: "E-Mailadress:"
       heading: E Benotzerkont uleeën
+      no_auto_account_create: Leider kënne mir den Ament kee Benotzerkont automatesch fir Iech opmaachen.
       password: "Passwuert:"
       title: Benotzerkont opmaachen
     no_such_user: 
@@ -573,6 +667,7 @@ lb:
       friend: Frënn
     remove_friend: 
       not_a_friend: "{{name}} ass kee vun Äre Frënn."
+      success: "{{name}} gouf als Äre Frënd ewechgeholl."
     reset_password: 
       confirm password: "Passwuert confirméieren:"
       flash changed: Äert Passwuert gouf geännert.
@@ -610,6 +705,7 @@ lb:
       my edits: meng Ännerungen
       my settings: meng Astellungen
       nearby users: Aner Benotzer nobäi
+      no friends: Dir hutt nach keng Frënn derbäi gesat.
       remove as friend: als Frënd ewechhuelen
       role: 
         administrator: Dëse Benotzer ass en Administrateur
@@ -629,6 +725,7 @@ lb:
     blocks_by: 
       title: Späre vum {{name}}
     edit: 
+      show: Dës Spär weisen
       submit: Spär aktualiséieren
     index: 
       title: Benotzerspären
@@ -644,6 +741,7 @@ lb:
       one: 1 Stonn
       other: "{{count}} Stonnen"
     show: 
+      back: All Späre weisen
       confirm: Sidd Dir sécher?
       edit: Änneren
       heading: "{{block_on}} gespaart vum {{block_by}}"
@@ -659,7 +757,10 @@ lb:
       not_a_role: D'Zeechen '{{role}}' ass keng valabel Roll.
       not_an_administrator: Nëmmen Adminstrateure kënnen d'Gstioun vun de Rolle maachen, an Dir sidd net Administrateur.
     grant: 
+      are_you_sure: Sidd Dir sécher datt Dir dem Benotzer '{{name}}' d'Roll '{{role}}' zoudeele wëllt?
       confirm: Confirméieren
+      heading: Confirméiert d'Zoudeele vun der Roll
+      title: Confirméiert d'Zoudeele vun der Roll
     revoke: 
       are_you_sure: Sidd Dir sécher datt Dir dem Benotzer '{{name}}' d'Roll '{{role}}' ofhuele wëllt?
       confirm: Confirméieren

config/locales/mk.yml

@@ -1,6 +1,6 @@
 # Messages for Macedonian (Македонски)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Bjankuloski06
 mk: 
   activerecord: 
@@ -76,6 +76,7 @@ mk:
       cookies_needed: Изгледа сте оневозможиле колачиња - дозволете колачиња во прелистувачот за да можете да продолжите,
     setup_user_auth: 
       blocked: Пристапот кон API ви е блокиран. Најавете се на посредникот за да дознаете повеќе.
+      need_to_see_terms: Вашиот пристап до приложниот програм (API) е привремено запрен. Најавете се на мрежниот посредник за да ги погледате Условите за учесниците. Нема потреба да се согласувате со услоците, но мора да ги прочитате.
   browse: 
     changeset: 
       changeset: "Измени: {{id}}"
@@ -151,7 +152,7 @@ mk:
       node_history_title: "Историја на јазолот: {{node_name}}"
       view_details: погледај детали
     not_found: 
-      sorry: Жалиам, но не најдов {{type}} со ид. бр. {{id}}.
+      sorry: Жалиам, но не најдов {{type}} со назнака {{id}}.
       type: 
         changeset: измени
         node: јазол
@@ -190,6 +191,7 @@ mk:
       details: Детали
       drag_a_box: Повлечете рамка на картата за да одберете простор
       edited_by_user_at_timestamp: Уредено од [[user]] во [[timestamp]]
+      hide_areas: Скриј подрачја
       history_for_feature: Историја за [[feature]]
       load_data: Вчитај ги податоците
       loaded_an_area_with_num_features: "Вчитавте простор кој содржи [[num_features]] елементи. Некои прелистувачи не можат добро да прикажат со волку податоци. Начелно, прелистувачите работат најдобро при помалку од 100 елементи наеднаш: ако правите нешто друго прелистувачот ќе ви биде бавен/пасивен. Ако и покрај тоа сакате да се прикажат овие податоци, кликнете подолу."
@@ -212,6 +214,7 @@ mk:
           node: Јазол
           way: Пат
       private_user: приватен корисник
+      show_areas: Прикажи подрачја
       show_history: Прикажи историја
       unable_to_load_size: "Не можам да вчитам: Рамката од [[bbox_size]] е преголема (мора да биде помала од {{max_bbox_size}}))"
       wait: Почекајте...
@@ -264,7 +267,7 @@ mk:
     changesets: 
       area: Површина
       comment: Коментар
-      id: ид. бр.
+      id: Назнака
       saved_at: Зачувано во
       user: Корисник
     list: 
@@ -286,7 +289,7 @@ mk:
     diary_comment: 
       comment_from: Коментар од {{link_user}}  во {{comment_created_at}}
       confirm: Потврди
-      hide_link: Сокриј го коментаров
+      hide_link: Скриј го коментаров
     diary_entry: 
       comment_count: 
         one: 1 коментар
@@ -294,7 +297,7 @@ mk:
       comment_link: Коментирај на оваа ставка
       confirm: Потврди
       edit_link: Уреди ја оваа ставка
-      hide_link: Сокриј ја ставкава
+      hide_link: Скриј ја ставкава
       posted_by: Испратено од {{link_user}} во {{created}} на {{language_link}}
       reply_link: Одговори на оваа ставка
     edit: 
@@ -336,7 +339,7 @@ mk:
       title: Нова дневничка ставка
     no_such_entry: 
       body: Жалиме, но нема дневничка ставка или коментар со ид.бр. {{id}}. Проверете дали сте напишале правилно, или да не сте кликнале на погрешна врска.
-      heading: "Нема ставка со ид. бр.: {{id}}"
+      heading: "Нема ставка со назнака: {{id}}"
       title: Нема таква дневничка ставка
     no_such_user: 
       body: Жалиме, но нема корисник по име {{user}}. Проверете дали сте напишале правилно, или да не сте кликнале на погрешна врска.
@@ -349,6 +352,17 @@ mk:
       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: Додај бележник на картата
@@ -549,7 +563,6 @@ mk:
           tower: Кула
           train_station: Железничка станица
           university: Универзитетска зграда
-          "yes": Зграда
         highway: 
           bridleway: Коњски пат
           bus_guideway: Автобуски шини
@@ -764,7 +777,7 @@ mk:
           charity: Добротворна продавница
           chemist: Аптека
           clothes: Дуќан за облека
-          computer: Компјутерска продавница
+          computer: Продавница за сметачи
           confectionery: Слаткарница
           convenience: Бакалница
           copyshop: Фотокопир
@@ -859,6 +872,8 @@ mk:
           water_point: Пристап до вода
           waterfall: Водопад
           weir: Јаз
+  html: 
+    dir: ltr
   javascripts: 
     map: 
       base: 
@@ -872,16 +887,23 @@ mk:
       history_tooltip: Преглед на уредувањата во ова подрачје
       history_zoom_alert: Морате да приближите за да можете да ја видите историјата на уредувања
   layouts: 
+    community_blogs: Блогови на заедницата
+    community_blogs_title: Блогови од членови на заедницата на OpenStreetMap
     copyright: Авторски права и лиценца
-    donate: Поддржете ја OpenStreetMap со {{link}} за Фондот за обнова на хардвер.
+    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: дома
@@ -896,26 +918,23 @@ 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: Создај сметка за уредување
+    sotm2011: Дојдете на Конференцијата на OpenStreetMap 2011 што се одржува од 9 до 11 септември во Денвер!
     tag_line: Слободна вики-карта на светот
     user_diaries: Кориснички дневници
     user_diaries_tooltip: Види кориснички дневници
@@ -1085,6 +1104,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 траги.
@@ -1152,12 +1172,17 @@ mk:
       url: "Побарај URL адреса на жетонот:"
     update: 
       flash: Клиентските информации се успешно ажурирани
+  printable_name: 
+    with_version: "{{id}}, вер. {{version}}"
   site: 
     edit: 
       anon_edits_link_text: Дознајте зошто ова е така.
       flash_player_required: Ќе ви треба Flash-програм за да го користите Potlatch - Flash-уредник за OpenStreetMap. Можете да <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">го преземете Flash Player од Adobe.com</a>. Имате и <a href="http://wiki.openstreetmap.org/wiki/Editing">неколку други можности</a> за уредување на OpenStreetMap.
+      no_iframe_support: Вашиот прелистувач не поддржува „иРамки“ (iframes) со HTML, без кои оваа можност не може да работи.
       not_public: Не сте наместиле уредувањата да ви бидат јавни.
       not_public_description: Повеќе не можете да ја уредувате картата  ако не го направите тоа. Можете да наместите уредувањата да ви бидат јавни на вашата {{user_page}}.
+      potlatch2_not_configured: Potlatch 2 не е поставен - погледајте ја страницата http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 за повеќе информации
+      potlatch2_unsaved_changes: Имате незачувани промени. (Зачувувањето во Potlatch 2 се врши со стискање на „зачувај“.)
       potlatch_unsaved_changes: Имате незачувани промени. (За да зачувате во Potlatch, треба го одселектирате тековниот пат или точка, ако уредувате во живо, или кликнете на „зачувај“ ако го имате тоа копче.)
       user_page_link: корисничка страница
     index: 
@@ -1169,10 +1194,11 @@ mk:
         notice: Под лиценцата {{license_name}} од {{project_name}} и неговите учесници.
         project_name: проектот OpenStreetMap
       permalink: Постојана врска
+      remote_failed: Уредувањето не успеа - проверете дали е вчитан JOSM или Merkaartor и дали е овозможено далечинското управување
       shortlink: Кратка врска
     key: 
       map_key: Легенда
-      map_key_tooltip: Легенда за mapnik приказ на ова размерно ниво
+      map_key_tooltip: Легенда на картата
       table: 
         entry: 
           admin: Административна граница
@@ -1196,7 +1222,7 @@ mk:
             - ливада
           construction: Патишта во изградба
           cycleway: Велосипедска патека
-          destination: Пристап кон дестинацијата
+          destination: Пристап до одредницата
           farm: Фарма
           footway: Пешачка патека
           forest: Шума
@@ -1239,7 +1265,6 @@ mk:
           unclassified: Некласификуван пат
           unsurfaced: Неасфалтиран пат
           wood: Шумичка
-        heading: Легенда за z{{zoom_level}}
     search: 
       search: Пребарај
       search_help: "примери: 'Струмица', 'Илинденска', 'Regent Street, Cambridge', 'CB2 5AQ' или 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>повеќе примери...</a>"
@@ -1377,6 +1402,7 @@ mk:
       new email address: "Нова е-поштенска адреса:"
       new image: Додај слика
       no home location: Немате внесено матична местоположба.
+      preferred editor: "Претпочитан урендик:"
       preferred languages: "Претпочитани јазици:"
       profile description: "Опис за профилот:"
       public editing: 
@@ -1388,24 +1414,30 @@ mk:
         heading: "Јавно уредување:"
       public editing note: 
         heading: Јавно уредување
-        text: Во моментов вашите уредувања се анонимни и луѓето не можат да ви пратат порака или да ви ја видат локацијата. За да покажете што уредувате и да овозможите корисниците да ве контактираат преку оваа страница, кликнете на копчето подолу. <b>По преодот на 0.6 API, само јавни корисници можат да уредуваат податоци на карти</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">дознајте зошто</a>).<ul> <li>Ако станете јавен корисник, вашата е-пошта сепак нема да се открие.</li> <li>Оваа постапка не може да се врати, и сите нови корисници сега се автоматски јавни.</li> </ul>
+        text: Во моментов вашите уредувања се анонимни и луѓето не можат да ви пратат порака или да ви ја видат местоположбата. За да покажете што уредувате и да овозможите корисниците да ве контактираат преку оваа страница, кликнете на копчето подолу. <b>По преодот на 0.6 API, само јавни корисници можат да уредуваат податоци на карти</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">дознајте зошто</a>).<ul> <li>Ако станете јавен корисник, вашата е-пошта сепак нема да се открие.</li> <li>Оваа постапка не може да се врати, и сите нови корисници сега се автоматски јавни.</li> </ul>
       replace image: Замени тековна слика
       return to profile: Назад кон профилот
       save changes button: Зачувај ги промените
       title: Уреди сметка
       update home location on click: Подновувај го матичната местоположба кога ќе кликнам на картата
     confirm: 
+      already active: Оваа сметка е веќе потврдена.
+      before you start: Знаеме дека со нетрпение чекате да почнете со картографска работа, но пред тоа препорачуваме да пополните некои податоци за вас во образецот подолу.
       button: Потврди
-      failure: Веќе имаме потврдено корисничка сметка со овој жетон.
       heading: Потврди корисничка сметка
       press confirm button: Притиснете го копчето за потврда подолу за да ја активирате сметката.
+      reconfirm: Ако поминало подолго време од последниот пат кога сте се најавиле, ќе треба да <a href="{{reconfirm}}">си испратите нова потврдна порака по е-пошта</a>.
       success: Вашата сметка е потврдена. Ви благодариме што се регистриравте!
+      unknown token: Се чини дека тој жетон не постои.
     confirm_email: 
       button: Потврди
       failure: Со овој жетон е потврдена веќе една е-поштенска адреса
       heading: Потврди промена на е-пошта
       press confirm button: Притиснете го копчето за потврдување за да ја потврдите новата е-поштенска адреса.
       success: Вашата е-пошта е потврдена. Ви благодариме што се регистриравте!
+    confirm_resend: 
+      failure: Корисникот {{name}} не е пронајден.
+      success: Испративме поврдна порака на {{email}}, и штом ќе ја потврдите сметката, ќе можете да почнете со картографска работа.<br /><br />Ако користите систем против спам кој испраќа барања за потврда, тогаш ќе морате да ја дозволите адресата webmaster@openstreetmap.org бидејќи ние немаме начин да одговараме на такви потврди.
     filter: 
       not_an_administrator: За да го изведете тоа, треба да се администратор.
     go_public: 
@@ -1414,7 +1446,7 @@ mk:
       confirm: Потврди ги одбраните корисници
       empty: Нема најдено такви корисници
       heading: Корисници
-      hide: Сокриј одбрани корисници
+      hide: Скриј одбрани корисници
       showing: 
         one: Прикажана е страницата {{page}} ({{first_item}} од {{items}})
         other: Прикажани се страниците {{page}} ({{first_item}}-{{last_item}} од {{items}})
@@ -1422,22 +1454,27 @@ mk:
       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: Си ја загубивте лозинката?
+      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: 
@@ -1461,7 +1498,7 @@ mk:
       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: Нажалост моментално не можеме автоматски да ви создадеме сметка.
@@ -1525,9 +1562,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: погледај добиени блокови
@@ -1578,7 +1616,7 @@ mk:
       period: Колку да трае блокот на корисникот?
       reason: Причината зошто е блокиран корисникот {{name}}. Бидете што посмирени и поразумни, и напишете што повеќе подробности за ситуацијата. Имајте на ум дека не сите корисници го разбираат жаргонот на заедницата, па затоа користете лаички поими.
       show: Преглед на овој блок
-      submit: Ажурирај го блокот
+      submit: Поднови го блокот
       title: Уредување на блок за {{name}}
     filter: 
       block_expired: Блокот е веќе истечен и не може да се ажурира.
@@ -1594,7 +1632,7 @@ mk:
       title: Кориснички блокови
     model: 
       non_moderator_revoke: Морате да бидете модератор за да поништувате блокови.
-      non_moderator_update: Морате да бидете модератор за да правите или ажурирате блокови.
+      non_moderator_update: Морате да бидете модератор за да правите или подновувате блокови.
     new: 
       back: Преглед на сите блокови
       heading: Правење на блок за {{name}}
@@ -1607,7 +1645,7 @@ mk:
       tried_waiting: На корисникот му дадов разумен рок за да одговори на тие преписки.
     not_found: 
       back: Назад кон индексот
-      sorry: Жалиме, но нема пронајдено кориснички блок со ид. бр. {{id}}
+      sorry: Жалиме, но нема пронајдено кориснички блок со назнака {{id}}
     partial: 
       confirm: Дали сте сигурни?
       creator_name: Создавач

config/locales/nl.yml

@@ -1,6 +1,6 @@
 # Messages for Dutch (Nederlands)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Freek
 # Author: Fruggo
 # Author: Greencaps
@@ -81,6 +81,7 @@ nl:
       cookies_needed: U hebt cookies waarschijnlijk uitgeschakeld in uw browser. Schakel cookies in voordat u verder gaat.
     setup_user_auth: 
       blocked: Uw toegang tot de API is geblokkeerd. Meld u opnieuw aan in de webinterface om meer te weten te komen.
+      need_to_see_terms: Uw toegang tot de API is tijdelijk opgeschort. Meld u aan in de webinterface om de Voorwaarden voor Bijdragen te bekijken. U hoeft ze niet te onderschijven, maar moet ze wel gezien hebben.
   browse: 
     changeset: 
       changeset: "Set wijzigingen: {{id}}"
@@ -193,6 +194,7 @@ nl:
       details: Details
       drag_a_box: Sleep een rechthoek op de kaart om een gebied te selecteren
       edited_by_user_at_timestamp: Bewerkt door [[user]] op [[timestamp]]
+      hide_areas: Gebieden verbergen
       history_for_feature: Geschiedenis voor [[feature]]
       load_data: Gegevens laden
       loaded_an_area_with_num_features: U hebt een gebied geladen dat [[num_features]] objecten bevat. Sommige browsers kunnen niet goed overweg met zoveel gegevens. Normaal gesproken werken browsers het best met minder dan honderd objecten. Als u er meer weergeeft kan de browser traag worden of niet meer reageren. Als u zeker weet dat u de gegevens wilt weergeven, klik dan op de knop hieronder.
@@ -215,6 +217,7 @@ nl:
           node: Node
           way: Weg
       private_user: private gebruiker
+      show_areas: Gebieden weergeven
       show_history: Geschiedenis weergeven
       unable_to_load_size: Laden is niet mogelijk. Het selectiekader van [[bbox_size]] is te groot. Het moet kleiner zijn dan {{max_bbox_size}}
       wait: Een ogenblik geduld alstublieft...
@@ -352,6 +355,17 @@ nl:
       save_button: Opslaan
       title: Gebruikersdagboek van {{user}} | {{title}}
       user_title: Dagboek van {{user}}
+  editor: 
+    default: Standaard (op dit moment {{name}})
+    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
@@ -368,7 +382,7 @@ nl:
       manually_select: Handmatig een ander gebied selecteren
       mapnik_image: Mapnik-afbeelding
       max: max
-      options: Instellingen
+      options: Opties
       osm_xml_data: OpenStreetMap XML-gegevens
       osmarender_image: Osmarender-afbeelding
       output: Uitvoer
@@ -552,7 +566,6 @@ nl:
           tower: Toren
           train_station: Spoorwegstation
           university: Universiteitsgebouw
-          "yes": Gebouw
         highway: 
           bridleway: Ruiterpad
           bus_guideway: Vrijliggende busbaan
@@ -706,7 +719,7 @@ nl:
         place: 
           airport: Luchthaven
           city: Stad
-          country: District
+          country: Land
           county: District
           farm: Boerderij
           hamlet: Gehucht
@@ -795,7 +808,7 @@ nl:
           hairdresser: Kapper
           hardware: Gereedschappenwinkel
           hifi: Hi-fi
-          insurance: Verzekeringen
+          insurance: Verzekering
           jewelry: Juwelier
           kiosk: Kioskwinkel
           laundry: Wasserij
@@ -875,16 +888,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 & 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
@@ -909,14 +929,11 @@ 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
+    sotm2011: Kom naar de OpenStreetMap-conferentie 2011, de staat van de kaart, 9-11 september in Denver!
     tag_line: De vrije wikiwereldkaart
     user_diaries: Gebruikersdagboeken
     user_diaries_tooltip: Gebruikersdagboeken bekijken
@@ -1157,8 +1174,11 @@ nl:
     edit: 
       anon_edits_link_text: Lees waarom dit het geval is.
       flash_player_required: U hebt Flash-player nodig om Potlatch, de OpenStreetMap Flash-editor te gebruiken. U kunt <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">Flash-player van Adobe.com downloaden</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Er zijn ook andere opties</a> om OpenStreetMap te bewerken.
+      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_not_configured: Potlatch 2 is niet ingesteld - zi http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 voor meer informatie
+      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: 
@@ -1170,10 +1190,11 @@ 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
-      map_key_tooltip: Kaartsleutel voor de mapnik-rendering op dit zoomniveau
+      map_key_tooltip: Kaartsleutel
       table: 
         entry: 
           admin: Bestuurlijke grens
@@ -1240,7 +1261,6 @@ nl:
           unclassified: Ongeclassificeerde weg
           unsurfaced: Onverharde weg
           wood: Bos
-        heading: Legenda voor z{{zoom_level}}
     search: 
       search: Zoeken
       search_help: "voorbeelden: 'Alkmaar', 'Spui, Amsterdam', '1234 AA', of 'post offices near Leiden' (<a href='http://wiki.openstreetmap.org/wiki/Search'>meer voorbeelden...</a>)."
@@ -1379,6 +1399,7 @@ nl:
       new email address: "Nieuw e-mailadres:"
       new image: Afbeelding toevoegen
       no home location: Er is geen thuislocatie ingevoerd.
+      preferred editor: "Voorkeursprogramma voor kaartbewerking:"
       preferred languages: "Voorkeurstalen:"
       profile description: "Profielbeschrijving:"
       public editing: 
@@ -1397,17 +1418,23 @@ nl:
       title: Gebruiker bewerken
       update home location on click: Thuislocatie aanpassen bij klikken op de kaart
     confirm: 
+      already active: Deze gebruiker is al bevestigd.
+      before you start: We weten dat u waarschijnlijk snel met mappen wilt beginnen, maar geef alstublieft eerst wat informatie over uzelf in het onderstaande formulier.
       button: Bevestigen
-      failure: Er bestaat al een gebruiker met deze naam.
       heading: Gebruikers bevestigen
       press confirm button: Klik op de knop "Bevestigen" hieronder om uw gebruiker te activeren.
+      reconfirm: Als het al weer een tijdje geleden is sinds u zich hebt geregistreerd, dan kunt u zich een <a href="{{reconfirm}}">nieuwe bevestigingse-mail laten sturen</a>.
       success: De gebruiker is geactiveerd. Dank u wel voor het registreren!
+      unknown token: Dat token bestaat niet.
     confirm_email: 
       button: Bevestigen
       failure: Er is al een e-mailadres bevestigd met dit token.
       heading: Gewijzigd e-mailadres bevestigen
       press confirm button: Klik op de knop "Bevestigen" hieronder om uw e-mailadres te bevestigen.
       success: Uw e-mailadres is bevestigd. Dank u wel voor het registreren!
+    confirm_resend: 
+      failure: De gebruiker {{name}} is niet gevonden.
+      success: Er is een bevestigingse-mail verstuurd naar {{email}} en als u uw gebruiker hebt bevestigd, kunt u gaan mappen.<br /><br />Als u een spamfilter gebruikt die bevestigingse-mails stuurt, zorg er dan voor dat u webmaster@openstreetmap.org toestaat. Dit systeem stuurt geen antwoord op bevestigingsverzoeken.
     filter: 
       not_an_administrator: U moet beheerder zijn om deze handeling uit te kunnen voeren.
     go_public: 
@@ -1424,19 +1451,24 @@ nl:
       summary_no_ip: "{{name}} aangemaakt op {{date}}"
       title: Gebruikers
     login: 
-      account not active: Sorry, uw gebruiker is nog niet actief.<br />Klik op de verwijzing in de bevestigingse-mail om deze te activeren.
+      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
@@ -1463,7 +1495,7 @@ nl:
       display name description: Uw openbare gebruikersnaam. U kunt deze later in uw voorkeuren wijzigen.
       email address: "E-mailadres:"
       fill_form: Vul het formulier in en we sturen u dan zo snel mogelijk een e-mail met gegevens over hoe u uw gebruiker kunt activeren.
-      flash create success message: De gebruiker is aangemaakt. Controleer uw e-mail voor een bevestigingse-mail, en dan kunt u zo gaan mappen :-)<br /><br />Denk eraan dat u niet kunt aanmelden voordat u uw bevestigingse-mail hebt ontvangen en deze hebt bevestigd.<br /><br />Als u een spamfilter gebruikt die bevestigingse-mails stuurt, zorg er dan voor dat u webmaster@openstreetmap.org toestaat. Dit systeem stuurt geen antwoord op bevestigingsverzoeken.
+      flash create success message: Bedankt voor uw aanmelding. Er is een bevestigingse-mail verstuurd naar {{email}} en als u uw gebruiker hebt bevestigd, kunt u gaan mappen.<br /><br />Als u een spamfilter gebruikt die bevestigingse-mails stuurt, zorg er dan voor dat u webmaster@openstreetmap.org toestaat. Dit systeem stuurt geen antwoord op bevestigingsverzoeken.
       heading: Gebruiker aanmaken
       license_agreement: Als u een gebruiker aan wilt maken, moet u akkoord gaan met de <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">voorwaarden voor bijdragen</a>.
       no_auto_account_create: Helaas is het niet mogelijk om automatisch een gebruiker voor u aan te maken.
@@ -1530,6 +1562,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
@@ -1612,7 +1645,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)

config/locales/no.yml

@@ -1,6 +1,6 @@
 # Messages for Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Gustavf
 # Author: Hansfn
 # Author: Jon Harald Søby
@@ -11,7 +11,7 @@
   activerecord: 
     attributes: 
       diary_comment: 
-        body: Kropp
+        body: Brødtekst
       diary_entry: 
         language: Språk
         latitude: Breddegrad
@@ -22,7 +22,7 @@
         friend: Venn
         user: Bruker
       message: 
-        body: Kropp
+        body: Brødtekst
         recipient: Mottaker
         sender: Avsender
         title: Tittel
@@ -195,6 +195,7 @@
       details: Detaljer
       drag_a_box: Dra en boks på kartet for å velge et område
       edited_by_user_at_timestamp: Redigert av [[user]],  [[timestamp]]
+      hide_areas: Skjul områder
       history_for_feature: Historikk for [[feature]]
       load_data: Last inn data
       loaded_an_area_with_num_features: "Du har lastet et område som inneholder [[num_features]] objekter. Noen nettlesere fungerer ikke ved håndtering av så mye data. Nettlesere fungerer generelt best med mindre enn 100 objekter av gangen: noe mer kan gjøre at nettleseren fryser. Om du er sikker på at du vil se denne informasjonen kan du gjøre det ved å klikke på knappen nedenfor."
@@ -217,6 +218,7 @@
           node: Node
           way: Vei
       private_user: privat bruker
+      show_areas: Vis områder
       show_history: Vis historikk
       unable_to_load_size: "Klarte ikke laste inn: Avgrensingsboks med størrelse [[bbox_size]] er for stor (må være mindre enn {{max_bbox_size}})"
       wait: Vent ...
@@ -354,6 +356,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 +439,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: 
@@ -554,7 +568,6 @@
           tower: Tårn
           train_station: Jernbanestasjon
           university: Universitetsbygg
-          "yes": Bygning
         highway: 
           bridleway: Ridevei
           bus_guideway: Ledet bussfelt
@@ -609,6 +622,8 @@
           museum: Museum
           ruins: Ruiner
           tower: Tårn
+          wayside_cross: Veikant kors
+          wayside_shrine: Veikant alter
           wreck: Vrak
         landuse: 
           allotments: Kolonihager
@@ -731,9 +746,11 @@
           construction: Jernbane under konstruksjon
           disused: Nedlagt jernbane
           disused_station: Nedlagt jernbanestasjon
+          funicular: Kabelbane
           halt: Togstopp
           historic_station: Historisk jernbanestasjon
           junction: Jernbanekryss
+          level_crossing: Planovergang
           light_rail: Bybane
           monorail: Enskinnebane
           narrow_gauge: Smalspor jernbane
@@ -844,6 +861,7 @@
           canal: Kanal
           connector: Vannveiforbindelse
           dam: Demning
+          derelict_canal: Nedlagt kanal
           ditch: Grøft
           dock: Dokk
           drain: Avløp
@@ -859,11 +877,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
@@ -872,16 +895,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
@@ -906,14 +936,14 @@
     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
+    sotm2011: Kom til 2011 OpenStreetMap-konferansen, «Kartets tilstand», 11.-9. september i Denver!
     tag_line: Fritt Wiki-verdenskart
     user_diaries: Brukerdagbok
     user_diaries_tooltip: Vis brukerens dagbok
@@ -928,6 +958,7 @@
       english_link: den engelske originalen
       text: I tilfellet av en konflikt mellom denne oversatte siden og {{english_original_link}} har den engelske presedens
       title: Om denne oversettelsen
+    legal_babble: "<h2>Opphavsrett og lisenser</h2>\n<p>\n   OpenStreetMap er <i>åpne data</i>, lisensiert under <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n   Commons Navngivelse-DelPåSammeVilkår 2.0</a> (CC-BY-SA).\n</p>\n<p>\n  Du er fri til å kopiere, distribuere, overføre og tilpasse våre kart\n  og data, så lenge du krediterer OpenStreetMap og dens\n  bidragsytere. Hvis du endrer eller bygger på våre kart eller data, kan du\n  bare distribuere resultatet under samme lisens. Den\n  full <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">juridiske\n  koden</a> forklarer rettighetene og ansvaret.\n</p>\n\n<h3>Hvordan kreditere OpenStreetMap</h3>\n<p>\n  Hvis du bruker OpenStreetMap kartbilder, ber vi om at\n  din kreditering minst inneholder «© OpenStreetMap\n  bidragsytere, CC-BY-SA». Hvis du bare bruker kartdata,\n  ber vi om «Kartdata © OpenStreetMap bidragsytere,\n  CC-BY-SA».\n</p>\n<p>\n  Der det er mulig, bør OpenStreetMap bli hyperlenket til <a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n  og CC-BY-SA til <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Hvis\n  du bruker et medium der lenkene ikke er mulig (f.eks. i\n  utskrevne arbeid), foreslår vi at du henviser leserne til\n  www.openstreetmap.org (kanskje ved å utvide\n  'OpenStreetMap' til denne fullstendige adressen) og til\n  www.creativecommons.org.\n</p>\n\n<h3>Finn ut mer</h3>\n<p>\n  Les mer om hvordan du bruker våre data på <a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">juridisk\n  FAQ</a>.\n</p>\n<p>\n  OSM bidragsytere blir påminnet å aldri skal legge til data fra\n  opphavsrettsbeskyttede kilder (f.eks. Google Maps eller utskrevne kart) uten\n  uttrykkelig tillatelse fra rettighetshavere.\n</p>\n<p>\n  Selv om OpenStreetMap er åpne data kan vi ikke gi et\n  gratis kart-API til tredjepartsutviklere.\n\n  Se våre <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">API-retningslinjer</a>,\n  <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Side ved side-retningslinjer</a>\n  og <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Nominatim-retningslinjer</a>.\n</p>\n\n<h3>Våre bidragsytere</h3>\n<p>\n  Vår CC-BY-SA-lisens krever at du «gir den opprinnelige\n  forfatteren rimelig kreditt til mediet eller måten du\n  benytter». Individuelle OSM-kartleggere krever ikke en\n  kreditering utover «OpenStreetMap bidragsytere»,\n  men der data fra et nasjonal kartleggingsbyrå\n  eller fra en annen stor kilde er blitt inkludert inne i\n  OpenStreetMap, kan det være fornuftig å kreditere dem ved direkte\n  reprodusering av deres kreditt eller ved å linke til det på denne siden.\n</p>\n\n<!--\nInformasjon til sideredaktører\n\nDen følgende listen lister kun opp de organisasjonene som krever kreditering\nsom et vilkår for at deres data brukes i OpenStreetMap. Det er ikke en\ngenerell importeringskatalog og må ikke brukes unntatt når kreditering\nkreves for å oppfylle lisensvilkårene til de importerte dataene.\n\nAlle tillegg her må diskuteres med en OSM-sysadmin først.\n-->\n\n<ul id=\"contributors\">\n   <li><strong>Australia</strong>: Inneholder forstaddata basert\n   på Australian Bureau of Statistics data.</li>\n   <li><strong>Canada</strong>: Inneholder data fra\n   GeoBase®, GeoGratis (© Department of Natural\n   Resources Canada), CanVec (© Department of Natural\n   Resources Canada), og StatCan (Geography Division,\n   Statistics Canada).</li>\n   <li><strong>New Zealand</strong>: Inneholder data hentet fra\n   Land Information New Zealand. Crown Copyright reservert.</li>\n   <li><strong>Polen</strong>: Inneholder data fra <a href=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. Copyright\n   UMP-pcPL bidragsytere.</li>\n   <li><strong>Storbritannia</strong>: Inneholder Ordnance\n   Survey data © Crown copyright og database-rettigheter\n   2010.</li>\n</ul>\n\n<p>\n  Inkludering av data i OpenStreetMap innebærer ikke at opprinnelige\n  dataleverandøren støtter OpenStreetMap, gir ingen garanti, eller\n  godtar erstatningsansvar.\n</p>"
     native: 
       mapping_link: start kartlegging
       native_link: Norsk versjon
@@ -1051,6 +1082,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: 
@@ -1097,6 +1129,8 @@
   oauth_clients: 
     create: 
       flash: Vellykket registrering av informasjonen
+    destroy: 
+      flash: Ødelagt klientapplikasjonsregistreringen
     edit: 
       submit: Rediger
       title: Rediger ditt programvare
@@ -1118,6 +1152,7 @@
       issued_at: Utstedt
       my_apps: Mine klientapplikasjoner
       my_tokens: Mine autoriserte applikasjoner
+      no_apps: Har du et program som du vil registrere for bruk med oss gjennom {{oauth}}-standarden? Da må du først registrere ditt nettprogram før det kan gjøre OAuth-forespørsler til denne tjenesten.
       register_new: Registrer din applikasjon
       registered_apps: "Du har registrert følgende klientapplikasjoner:"
       revoke: Tilbakekall!
@@ -1149,8 +1184,11 @@
     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_not_configured: Potlatch 2 har ikke blitt konfigurert - se http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for mer informasjon
+      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: 
@@ -1162,10 +1200,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
@@ -1232,7 +1271,6 @@
           unclassified: Uklassifisert vei
           unsurfaced: Vei uten dekke
           wood: Ved
-        heading: Tegnforklaring for z{{zoom_level}}
     search: 
       search: Søk
       search_help: "Eksempler: 'Lindesnes', 'Karl Johans gate', 'Sør-Trøndelag' og <a href='http://wiki.openstreetmap.org/wiki/Search'>flere ...</a>"
@@ -1370,6 +1408,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: 
@@ -1381,23 +1420,30 @@
         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
-      failure: En brukerkonto med denne nøkkelen er allerede bekreftet.
       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}}.
+      success: Vi har sendt en ny bekreftelsesmelding til {{email}} og så snart du bekrefter kontoen din kan du begynne å lage kart.<br /><br />Om du bruker et antispamsystem som sender bekreftelsesforspørsler, kontroller at du har hvitelistet webmaster@openstreetmap.org siden vi ikke kan svar på bekreftelsesforespørsler.
     filter: 
       not_an_administrator: Du må være administrator for å gjøre det.
     go_public: 
@@ -1414,19 +1460,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
@@ -1453,7 +1504,7 @@
       display name description: Ditt offentlig fremviste brukernavn. Du kan endre dette senere i innstillingene.
       email address: "E-postadresse:"
       fill_form: Fyll ut skjemaet og vi vil sende deg en e-post for å aktivere kontoen din.
-      flash create success message: Bruker ble opprettet. Se etter er en bekreftelsesmelding i e-posten din, og du vil lage kart på null tid :-)<br /><br />Legg merke til at du ikke kan logge inn før du har bekreftet e-postadresssen din.<br /><br />Hvis du bruker en antispam-løsning som krever bekreftelse fra avsender, så må du hvitliste webmaster@openstreetmap.org (siden vi ikke er i stand til å svare på slike forespørsler om bekreftelse).
+      flash create success message: Takk for at du registrerte deg. Vi har sendt en bekreftelsesmelding til {{email}} og så snart du bekrefter kontoen din kan du begynne å lage kart.<br /><br />Om du bruker et antispamsystem som sender bekreftelsesforspørsler, kontroller at du har hvitelistet webmaster@openstreetmap.org siden vi ikke kan svar på bekreftelsesforespørsler.
       heading: Opprett en brukerkonto
       license_agreement: Når du bekrefter kontoen din må du godkjenne <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">bidragsytervilkårene</a>.
       no_auto_account_create: Beklageligvis kan vi for øyeblikket ikke opprette en konto for deg automatisk.
@@ -1520,6 +1571,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

config/locales/pl.yml

@@ -1,8 +1,10 @@
 # Messages for Polish (Polski)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
+# Author: Ajank
 # Author: BdgwksxD
 # Author: Deejay1
+# Author: RafalR
 # Author: Soeb
 # Author: Sp5uhe
 # Author: Wpedzich
@@ -229,6 +231,7 @@ pl:
       wiki_link: 
         key: Strona wiki dla etykiety {{key}}
         tag: Strona wiki dla etykiety {{key}}={{value}}
+      wikipedia_link: Artykuł {{page}} w Wikipedii
     timeout: 
       sorry: Niestety, pobranie danych dla {{type}} o identyfikatorze {{id}} trwało zbyt długo.
       type: 
@@ -354,6 +357,17 @@ pl:
       save_button: Zapisz
       title: Dziennik użytkownika {{user}} | {{title}}
       user_title: Dziennik dla {{user}}
+  editor: 
+    default: Domyślnie (obecnie {{name}})
+    potlatch: 
+      description: Potlatch 1 (edycja w przeglądarce)
+      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
@@ -553,7 +567,6 @@ pl:
           tower: Wieża
           train_station: Stacja kolejowa
           university: Budynek uniwersytetu
-          "yes": Budynek
         highway: 
           bridleway: Droga dla koni
           bus_guideway: Droga dla autobusów
@@ -869,19 +882,30 @@ 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: Blogi wspólnoty
+    community_blogs_title: Blogi członków społeczności OpenStreetMap
+    copyright: Prawa autorskie i 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
@@ -893,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ę
@@ -904,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
@@ -919,10 +940,17 @@ 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 tym tłumaczeniem a {{english_original_link}}, preferowana jest strona w języku angielskim.
       title: Informacje o tłumaczeniu
+    native: 
+      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: 
       deleted: Wiadomość usunięta
@@ -953,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
@@ -1107,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
@@ -1174,7 +1205,6 @@ pl:
           unclassified: Drogi niesklasyfikowane
           unsurfaced: Droga nieutwardzona
           wood: Puszcza
-        heading: Legenda dla przybliżenia {{zoom_level}}
     search: 
       search: Szukaj
       search_help: "przykłady: 'Wąchock', 'Franciszkańska, Poznań', 'CB2 5AQ', lub 'post offices near Mokotów' <a href='http://wiki.openstreetmap.org/wiki/Search'>więcej przykładów...</a>"
@@ -1184,6 +1214,9 @@ pl:
     sidebar: 
       close: Zamknij
       search_results: Wyniki wyszukiwania
+  time: 
+    formats: 
+      friendly: "%e %B %Y o %H:%M"
   trace: 
     create: 
       trace_uploaded: Twój plik GPX został załadowany i czeka na dodanie do bazy danych.  Powinno to nastąpić w ciągu najbliższej pół godziny i dostaniesz wtedy maila z informacją o tym.
@@ -1274,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:"
@@ -1286,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)
@@ -1294,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.
@@ -1319,17 +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
-      failure: Konto o tym kodzie było już potwierdzone.
       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: 
@@ -1340,17 +1379,22 @@ 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>.
+      already have: Masz już konto OpenStreetMap? Zaloguj się.
       auth failure: Niestety podane dane nie pozwoliły na zalogowanie Cię.
+      create account minute: Utwórz konto. To zajmuje tylko minutę.
       create_account: załóż konto
       email or username: "Adres email lub nazwa użytkownika:"
       heading: Logowanie
       login_button: Zaloguj się
       lost password link: Zapomniane hasło?
+      new to osm: Nowy na OpenStreetMap?
       password: "Hasło:"
       please login: Zaloguj się lub {{create_user_link}}.
+      register now: Zarejestruj się
       remember: "Pamiętaj mnie:"
       title: Logowanie
+      to make changes: Aby wprowadzać zmiany w OpenStreetMap, musisz mieć konto.
     logout: 
       heading: Wyloguj z OpenStreetMap
       logout_button: Wyloguj
@@ -1376,9 +1420,9 @@ 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>.
+      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 edytujących</a>.
       no_auto_account_create: Niestety nie możemy aktualnie stworzyć Ci konta automatycznie.
       not displayed publicly: Informacje nie wyświetlane publicznie (zobacz <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="zasady prywatnością łącznie z sekcją o adresach e-mail na wiki">polityka prywatności</a>)
       password: "Hasło:"
@@ -1409,12 +1453,17 @@ pl:
       title: Konto zawieszone
     terms: 
       agree: Akceptuję
+      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
@@ -1423,6 +1472,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
@@ -1434,6 +1484,7 @@ pl:
       hide_user: ukryj tego użytkownika
       if set location: Jeśli ustawisz swoją lokalizacje, pojawi się na tej stronie kolorowa mapka i w ogóle.  Lokalizację możesz podać na Twojej {{settings_link}}.
       km away: "{{count}}km stąd"
+      latest edit: "Ostatnia edycja {{ago}}:"
       m away: "{{count}}m stąd"
       mapper since: "Mapuje od:"
       moderator_history: nałożone blokady

config/locales/pt-BR.yml

@@ -1,7 +1,8 @@
 # Messages for Brazilian Portuguese (Português do Brasil)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: BraulioBezerra
+# Author: Diego Queiroz
 # Author: Giro720
 # Author: Luckas Blade
 # Author: Nighto
@@ -312,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:"
@@ -362,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
@@ -564,7 +576,6 @@ pt-BR:
           tower: Torre
           train_station: Estação de Trem
           university: Edifício Universitário
-          "yes": Edifício
         highway: 
           bridleway: Pista para cavalos
           bus_guideway: Corredor de ônibus
@@ -874,6 +885,7 @@ pt-BR:
           water_point: Ponto de água
           waterfall: Queda de água
           weir: Açude
+      prefix_format: "{{name}}"
   html: 
     dir: ltr
   javascripts: 
@@ -893,17 +905,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 & 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
@@ -931,16 +951,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
@@ -952,6 +967,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
@@ -1082,6 +1098,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: 
@@ -1192,8 +1209,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: 
@@ -1207,10 +1226,11 @@ 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
-      map_key_tooltip: Legenda para o mapa renderizado neste nível de zoom
+      map_key_tooltip: Chave para o mapa
       table: 
         entry: 
           admin: Limite Administrativo
@@ -1277,7 +1297,6 @@ pt-BR:
           unclassified: Via Sem Classificação Administrativa
           unsurfaced: Via Não Pavimentada
           wood: Reserva Florestal
-        heading: Legenda para o zoom nível {{zoom_level}}
     search: 
       search: Buscar
       search_help: "exemplos: 'Brasília', 'Av. Paulista, São Paulo', ou 'hospitals near Belo Horizonte'. <a href='http://wiki.openstreetmap.org/wiki/Pt-br:Search'>mais exemplos...</a>"
@@ -1399,6 +1418,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 +1438,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: 
@@ -1436,17 +1457,23 @@ pt-BR:
       title: Editar conta
       update home location on click: Atualizar localização ao clicar no mapa?
     confirm: 
+      already active: Esse conta já foi confirmada.
+      before you start: Nós sabemos que você deve estar com pressa para começar a mapear, mas antes, você pode querer preencher mais algumas informações sobre você no formulário abaixo.
       button: Confirmar
-      failure: A Conta de usuário já foi confirmada anteriormente.
       heading: Confirmar uma conta de usuário
       press confirm button: Pressione o botão de confirmação abaixo para ativar sua conta.
+      reconfirm: Já faz algum tempo que você se cadastrou, por isso você precisa <a href="{{reconfirm}}">reenviar um novo email de confirmação</a>.
       success: Conta ativada, obrigado!
+      unknown token: Parece que este token não existe.
     confirm_email: 
       button: Confirmar
       failure: Um endereço de email já foi confirmado com esse código.
       heading: Confirmar uma mudança do endereço de email
       press confirm button: Pressione o botão de confirmação abaixo para confirmar seu novo endereço de email.
       success: Confirmamos seu endereço de email. Obrigado por se cadastrar!
+    confirm_resend: 
+      failure: Usuário {{name}} não encontrado.
+      success: Nós enviamos uma nova mensagem de confirmação para {{email}} e assim que você confirmar o seu cadastro você poderá começar a editar os mapas.<br /><br />Se você usa um sistema antispam que exige uma mensagem de confirmação então certifique-se que o endereço webmaster@openstreetmap.org esteja na sua lista de e-mails confiáveis, já que não conseguimos responder a nenhum pedido de confirmação.
     filter: 
       not_an_administrator: Você precisa ser um administrador para executar essa ação.
     go_public: 
@@ -1463,19 +1490,24 @@ pt-BR:
       summary_no_ip: "{{name}} criado em {{date}}"
       title: Usuários
     login: 
-      account not active: Desculpe, sua conta não está mais ativa.<br />Por favor clique no link no e-mail de confirmação recebido, para ativar sua conta.
+      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
@@ -1502,7 +1534,7 @@ pt-BR:
       display name description: Seu nome de usuário disponível publicamente. Você pode mudá-lo posteriormente nas preferências.
       email address: "Endereço de Email:"
       fill_form: Preencha o formulário e lhe enviaremos um email rapidamente para ativar sua conta.
-      flash create success message: Usuário criado com sucesso. Verifique seu email para uma nota de confirmação, e você estará mapeando logo logo :-)<br /><br />Por favor note que você não poderá entrar no sistema até ter recebido e confirmado seu endereço de email.<br /><br />Se você utiliza algum sistema de antispam que envia mensagens de confirmação, tenha certeza de incluir webmaster@openstreetmap.org na lista de remetentes confiáveis (whitelist) pois não poderemos responder pedidos de confirmação.
+      flash create success message: Obrigado por se cadastrar. Nós mandamos uma confirmação para {{email}} e assim que você confirmar sua conta você poderá começar a mapear.<br /><br />Se você usa um sistema antispam que envia pedido de confirmação assegure-se que você adicionou o endereço webmaster@openstreetmap.org à sua Lista Branca, já que nós não conseguimos responder a nenhum pedido de confirmação.
       heading: Criar uma nova conta de usuário
       license_agreement: Quando você confirmar sua conta, você precisará concordar com os <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">Termos de Colaborador</a>.
       no_auto_account_create: Infelizmente não foi possível criar uma conta para você automaticamente.
@@ -1540,7 +1572,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
@@ -1569,6 +1603,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

config/locales/pt.yml

@@ -1,61 +1,152 @@
 # Messages for Portuguese (Português)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
+# Author: Crazymadlover
+# Author: Giro720
+# Author: Hamilton Abreu
 # Author: Indech
+# Author: Luckas Blade
 # Author: Malafaya
 # Author: McDutchie
+# Author: SandroHc
 pt: 
+  activerecord: 
+    attributes: 
+      diary_comment: 
+        body: Conteúdo
+      diary_entry: 
+        language: Língua
+        latitude: Latitude
+        longitude: Longitude
+        title: Título
+        user: Utilizador
+      friend: 
+        friend: Amigo
+        user: Utilizador
+      message: 
+        body: Conteúdo
+        recipient: Destinatário
+        sender: Remetente
+        title: Título
+      trace: 
+        description: Descrição
+        latitude: Latitude
+        longitude: Longitude
+        name: Nome
+        public: Público
+        size: Tamanho
+        user: Utilizador
+        visible: Visível
+      user: 
+        active: Activo
+        description: Descrição
+        display_name: Nome de Exibição
+        email: E-mail
+        languages: Idiomas
+        pass_crypt: Palavra-chave
+    models: 
+      country: País
+      friend: Amigo
+      language: Idioma
+      message: Mensagem
+      notifier: Notificador
+      session: Sessão
+      user: Utilizador
   browse: 
+    changeset: 
+      changeset: "Conjunto de mudanças: {{id}}"
+      changesetxml: Conjunto de mudanças XML
+      download: Download de {{changeset_xml_link}} ou {{osmchange_xml_link}}
+      feed: 
+        title: Conjunto de mudanças {{id}}
+        title_comment: Conjunto de mudanças {{id}} - {{comment}}
+      title: Conjunto de mudanças
     changeset_details: 
       belongs_to: "Pertence a:"
+      box: caixa
       closed_at: "Fechado em:"
       created_at: "Criado em:"
-    navigation: 
-      user: 
-        name_changeset_tooltip: Ver edições de {{user}}
-        next_changeset_tooltip: Próxima edição por {{user}}
-        prev_changeset_tooltip: Edição anterior por {{user}}
+      has_relations: 
+        one: "Tem a seguinte {{count}} relação:"
+        other: "Tem as seguintes {{count}} relações:"
+      has_ways: 
+        one: "tem o seguinte {{count}} trajecto:"
+        other: "Tem os seguintes {{count}} trajectos:"
+      show_area_box: Mostrar Caixa de Área
     common_details: 
       changeset_comment: "Comentário:"
       edited_at: "Editado em:"
       edited_by: "Editado por:"
+      in_changeset: "No conjunto de mudanças:"
       version: Versão
+    containing_relation: 
+      entry: Relação {{relation_name}}
+      entry_role: Relação {{relation_name}} (como {{relation_role}})
     map: 
       deleted: Apagado
       larger: 
-        area: Ver área em um mapa maior
-        relation: Ver relação em um mapa maior
-        way: Ver trajeto em um mapa maior
+        area: Ver área num mapa maior
+        node: Ver trajecto num mapa maior
+        relation: Ver relação num mapa maior
+        way: Ver trajeto num mapa maior
       loading: Carregando...
+    navigation: 
+      all: 
+        next_changeset_tooltip: Seguinte conjunto de mudanças
+        next_node_tooltip: Nó seguinte
+        next_relation_tooltip: Relação seguinte
+        next_way_tooltip: Próximo caminho
+        prev_changeset_tooltip: Anterior conjunto de mudanças
+        prev_node_tooltip: Nó anterior
+        prev_way_tooltip: Trajecto anterior
+      user: 
+        name_changeset_tooltip: Ver edições de {{user}}
+        next_changeset_tooltip: Próxima edição por {{user}}
+        prev_changeset_tooltip: Edição anterior por {{user}}
     node: 
+      download: "{{download_xml_link}}, {{view_history_link}} ou {{edit_link}}"
       download_xml: Baixar XML
       edit: editar
+      node: Nó
+      node_title: "Nó: {{node_name}}"
       view_history: ver histórico
     node_details: 
       coordinates: "Coordenadas:"
       part_of: "Parte de:"
     node_history: 
+      download: "{{download_xml_link}} ou {{view_details_link}}"
       download_xml: Baixar XML
+      node_history: Nenhum Histórico
       view_details: ver detalhes
     not_found: 
+      sorry: Lamentamos, não foi possível encontrar o {{type}} com o id {{id}}.
       type: 
+        changeset: alterações
+        node: nenhum
         relation: relação
         way: trajeto
     paging_nav: 
       of: de
       showing_page: Mostrando página
     relation: 
+      download: "{{download_xml_link}} ou {{view_history_link}}"
+      download_xml: Download XML
+      relation: Relação
       relation_title: "Relação: {{relation_name}}"
       view_history: ver histórico
     relation_details: 
       members: "Membros:"
       part_of: "Parte de:"
     relation_history: 
-      download_xml: Baixar XML
+      download: "{{download_xml_link}} ou {{view_details_link}}"
+      download_xml: Download XML
       relation_history: Histórico de Relação
+      relation_history_title: "Historial da Relação: {{relation_name}}"
       view_details: ver detalhes
     relation_member: 
+      entry_role: "{{type}} {{name}} como {{role}}"
       type: 
+        node: Nó
         relation: Relação
         way: Trajeto
     start_rjs: 
@@ -63,6 +154,8 @@ pt:
       data_layer_name: Dados
       details: Detalhes
       drag_a_box: Arraste uma seleção no mapa para escolher uma área
+      edited_by_user_at_timestamp: Editado pelo [[user]] em [[timestamp]]
+      history_for_feature: Histórico de [[feature]]
       load_data: Carregar Dados
       loading: Carregando...
       manually_select: Selecionar manualmente uma área diferente
@@ -72,18 +165,33 @@ pt:
         heading: Lista de objetos
         history: 
           type: 
+            node: Nenhum [[id]]
             way: Trajeto [[id]]
         selected: 
           type: 
+            node: Nenhum [[id]]
             way: Trajeto [[id]]
         type: 
+          node: Nenhum
           way: Trajeto
       private_user: usuário privativo
       show_history: Mostrar Histórico
+      unable_to_load_size: "Não foi possível carregar: O tamanho da caixa de [[bbox_size]] é muito grande (deve ser menor que {{max_bbox_size}})"
       wait: Espere...
-      zoom_or_select: Aproximar ou selecionar uma área do mapa para visualização
+      zoom_or_select: Aproximar ou seleccionar uma área do mapa para visionamento
     tag_details: 
       tags: "Marcações:"
+      wiki_link: 
+        key: A página de descrição da wiki para a etiqueta {{key}}
+        tag: A página de descrição da wiki para a etiqueta {{key}}={{value}}
+      wikipedia_link: O(A) {{page}} na Wikipedia
+    timeout: 
+      sorry: Lamentamos, demorou demasiado tempo a obter os dados para o {{type}} com o id {{id}}.
+      type: 
+        changeset: alterações
+        node: nenhum
+        relation: relação
+        way: trajecto
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} ou {{edit_link}}"
       download_xml: Baixar XML
@@ -92,59 +200,626 @@ pt:
       way: Trajeto
       way_title: "Trajeto: {{way_name}}"
     way_details: 
+      also_part_of: 
+        one: também faz parte do trajecto {{related_ways}}
+        other: também faz parte dos trajectos {{related_ways}}
+      nodes: "Nós:"
       part_of: "Parte de:"
     way_history: 
+      download: "{{download_xml_link}} ou {{view_details_link}}"
       download_xml: Descarregar XML
       view_details: ver detalhes
       way_history: Histórico do Trajeto
       way_history_title: "Histórico do Trajeto: {{way_name}}"
+  changeset: 
+    changeset_paging_nav: 
+      next: Seguinte »
+      previous: "« Anterior"
+    changesets: 
+      area: Área
+      comment: Comentário
+      id: ID
+      saved_at: Salvo em
+      user: Utilizador
+  diary_entry: 
+    diary_comment: 
+      comment_from: Comentário de {{link_user}} em {{comment_created_at}}
+      confirm: Confirmar
+      hide_link: Ocultar este comentário
+    diary_entry: 
+      comment_count: 
+        one: 1 comentário
+        other: "{{count}} comentários"
+      confirm: Confirmar
+      hide_link: Ocultar esta entrada
+    edit: 
+      body: "Mensagem:"
+      language: "Idioma:"
+      latitude: "Latitude:"
+      location: "Localização:"
+      longitude: "Longitude:"
+      save_button: Salvar
+      subject: "Assunto:"
+      use_map_link: usar mapa
+    location: 
+      edit: Editar
+      location: "Localização:"
+      view: Ver
+    view: 
+      login: Entrar
+      save_button: Salvar
+  editor: 
+    default: Padrão (actualmente {{name}})
+    potlatch: 
+      description: Potlatch 1 (editor do navegador)
+      name: Potlatch 1
+    potlatch2: 
+      description: Potlatch 2 (editor do navegador)
+      name: Potlatch 2
+    remote: 
+      description: Controlo Remoto (JOSM or Merkaartor)
+      name: Controlo Remoto
+  export: 
+    start: 
+      export_button: Exportar
+      format: Formato
+      image_size: Tamanho da Imagem
+      latitude: "Lat:"
+      licence: Licença
+      longitude: "Lon:"
+      options: Opções
+      osm_xml_data: OpenStreetMap XML Data
+      output: Saída
+      scale: Escala
+      too_large: 
+        heading: Área Muito Grande
+      zoom: Zoom
+    start_rjs: 
+      export: Exportar
   geocoder: 
+    description: 
+      types: 
+        cities: Cidades
+        places: Lugares
+        towns: Municípios
+    description_osm_namefinder: 
+      prefix: "{{distance}} {{direction}} de {{type}}"
+    direction: 
+      east: este
+      north: norte
+      north_east: nordeste
+      north_west: noroeste
+      south: sul
+      south_east: sudeste
+      south_west: sudoeste
+      west: oeste
+    distance: 
+      one: cerca de 1km
+      other: cerca de {{count}}km
+      zero: menos de 1km
+    results: 
+      more_results: Mais resultados
+      no_results: Não foram encontrados resultados
+    search: 
+      title: 
+        ca_postcode: Resultados de <a href="http://geocoder.ca/">Geocoder.CA</a>
+        geonames: Resultados de <a href="http://www.geonames.org/">GeoNames</a>
+        latlon: Resultados <a href="http://openstreetmap.org/">Internos</a>
+        osm_namefinder: Resultados de <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        osm_nominatim: Resultados de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
+        uk_postcode: Resultados de <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
+        us_postcode: Resultados de <a href="http://geocoder.us/">Geocoder.us</a>
     search_osm_nominatim: 
       prefix: 
+        amenity: 
+          airport: Aeroporto
+          bank: Banco
+          bar: Bar
+          cafe: Café
+          casino: Casino
+          college: Colégio
+          dentist: Dentista
+          doctors: Médicos
+          emergency_phone: Telefone de Emergência
+          fast_food: Fast Food
+          fountain: Fonte
+          fuel: Combustível
+          grave_yard: Cemitério
+          hospital: Hospital
+          hotel: Hotel
+          library: Biblioteca
+          market: Mercado
+          office: Escritório
+          pharmacy: Farmácia
+          police: Polícia
+          prison: Prisão
+          restaurant: Restaurante
+          sauna: Sauna
+          school: Escola
+          shop: Loja
+          studio: Estúdio
+          supermarket: Supermercado
+          taxi: Táxi
+          telephone: Telefone público
+          theatre: Teatro
+          university: Universidade
+          wifi: Acesso WiFi
+        building: 
+          apartments: Bloco de apartamentos
+          chapel: Capela
+          church: Igreja
+          city_hall: Câmara Municipal
+          garage: Garagem
+          hotel: Hotel
+          house: Casa
+          shop: Loja
+          stadium: Estádio
+          store: Loja
+          terrace: Terraço
+          tower: Torre
+        highway: 
+          gate: Porta
+          road: Estrada
+          secondary_link: Estrada Secundária
+          steps: Passos
+          stile: Escada
+          trail: Trilha
         historic: 
+          castle: Castelo
+          church: Igreja
+          house: Casa
+          memorial: Memorial
+          mine: Mina
+          monument: Monumento
+          museum: Museu
           ruins: Ruínas
+          tower: Torre
+        landuse: 
+          allotments: Lotes
+          cemetery: Cemitério
+          commercial: Área comercial
+          conservation: Conservação
+          forest: Floresta
+          grass: Erva
+          meadow: Pradaria
+          military: Área militar
+          mine: Mina
+          mountain: Montanha
+          park: Parque
+        leisure: 
+          fishing: Área de Pesca
+          garden: Jardim
+          golf_course: Campo de golf
+          marina: Marina
+          miniature_golf: Mini-Golf
+          nature_reserve: Reserva Natural
+          park: Parque
+          playground: Parque
+          sports_centre: Centro Desportivo
+          stadium: Estádio
+          swimming_pool: Piscina
+          water_park: Parque aquático
+        natural: 
+          bay: Baía
+          beach: Praia
+          cape: Cabo
+          cave_entrance: Entrada de gruta
+          channel: Canal
+          coastline: Litoral
+          geyser: Geiser
+          island: Ilha
+          land: Terra
+          marsh: Pântano
+          peak: Pico
+          point: Ponto
+          reef: Recife
+          river: Rio
+          tree: Árvore
+          valley: Vale
+          volcano: Vulcão
+          water: Água
+        place: 
+          airport: Aeroporto
+          city: Cidade
+          country: País
+          county: Município
+          farm: Fazenda
+          hamlet: Aldeia
+          house: Casa
+          houses: Casas
+          island: Ilha
+          islet: Ilhota
+          locality: Localidade
+          region: Região
+          sea: Mar
+          state: Estado
+          subdivision: Subdivisão
+          suburb: Subúrbio
+          town: Cidade
+          village: Vila
         railway: 
           funicular: Funicular
+        shop: 
+          bakery: Padaria
+          books: Livraria
+          car: Oficina
+          car_repair: Oficina
+          computer: Loja de informática
+          cosmetics: Loja de cosméticos
+          electronics: Loja de electrónica
+          florist: Florista
+          hifi: Hi-Fi
+          jewelry: Joalharia
+          laundry: Lavandaria
+          music: Loja de música
+          pet: Loja de animais
+          shopping_centre: Centro Comercial
+          supermarket: Supermercado
+        tourism: 
+          attraction: Atracção
+          cabin: Cabana
+          chalet: Chalé
+          hotel: Hotel
+          information: Informação
+          motel: Motel
+          museum: Museu
+          theme_park: Parque temático
+          valley: Vale
+          zoo: Jardim zoológico
+        waterway: 
+          canal: Canal
+          dock: Doca
+          river: Rio
+  javascripts: 
+    site: 
+      edit_tooltip: Editar o mapa
+  layouts: 
+    documentation: Documentação
+    donate_link_text: doação
+    edit: Editar
+    export: Exportar
+    history: Histórico
+    intro_3_partners: wiki
+    log_in: entrar
+    logout: sair
+    logout_tooltip: Sair
+    sign_up: registar-se
+    wiki: Wiki
+  license_page: 
+    foreign: 
+      english_link: o original em inglês
+      title: Sobre esta tradução
+    native: 
+      mapping_link: começar a mapear
+      native_link: Versão em português
+      title: Sobre esta página
+  message: 
+    delete: 
+      deleted: Mensagem apagada
+    inbox: 
+      date: Data
+      from: De
+      my_inbox: Minha caixa de entrada
+      no_messages_yet: Ainda não tens mensagens. Por que não entrar em contacto com alguns da {{people_mapping_nearby_link}}?
+      outbox: caixa de saída
+      subject: Assunto
+      title: Caixa de Entrada
+      you_have: Tu tens {{new_count}} novas mensagens e {{old_count}} mensagens no total
+    message_summary: 
+      delete_button: Apagar
+      read_button: Marcar como lido
+      reply_button: Responder
+      unread_button: Marcar como não lida
+    new: 
+      send_button: Enviar
+      title: Enviar mensagem
+    read: 
+      back_to_inbox: Voltar para a caixa de entrada
+      back_to_outbox: Voltar para a caixa de saída
+      date: Data
+      from: De
+      reading_your_messages: Lendo mensagem
+      reading_your_sent_messages: Lendo as mensagens enviadas
+      subject: Assunto
+      title: Ler mensagem
+      to: Para
+      unread_button: Marcar como não lida
+      wrong_user: Estás logado como `{{user}}', mas a mensagem que pediste para ler não foi enviada por ou para o utilizador. Por favor, entra com o usuário correto para a ler.
+    sent_message_summary: 
+      delete_button: Apagar
   notifier: 
     email_confirm_plain: 
       greeting: Olá,
+    gpx_notification: 
+      greeting: Olá,
   oauth_clients: 
+    edit: 
+      submit: Editar
     form: 
       name: Nome
+  site: 
+    key: 
+      table: 
+        entry: 
+          admin: Fronteira administrativa
+          allotments: Lotes
+          apron: 
+            - Estacionamento de aeroporto
+            - terminal
+          cemetery: Cemitério
+          centre: Centro desportivo
+          commercial: Área comercial
+          cycleway: Ciclovia
+          destination: Acesso a destino
+          farm: Quinta
+          forest: Floresta
+          lake: 
+            - Lago
+          military: Área militar
+          park: Parque
+          reserve: Reserva natural
+          school: 
+            - Escola
+            - universidade
+    sidebar: 
+      close: Fechar
+  time: 
+    formats: 
+      friendly: "%e %B %Y às %H:%M"
   trace: 
+    create: 
+      upload_trace: Carregar um Caminho de GPS
     edit: 
       description: "Descrição:"
       download: baixar
       edit: editar
-      filename: "Nome do arquivo:"
+      filename: "Nome do ficheiro:"
+      heading: A editar caminho {{name}}
       map: mapa
       owner: "Proprietário:"
       points: "Pontos:"
-      save_button: Salvar Mudanças
+      save_button: Gravar Mudanças
       start_coord: "Coordenada de início:"
       tags: "Marcações:"
+      title: Editando caminho {{name}}
       uploaded_at: "Mandado em:"
       visibility: "Visibilidade:"
       visibility_help: o que significa isso?
+    list: 
+      public_traces: Caminhos GPS públicos
+      public_traces_from: Caminhos GPS públicos do utilizador {{user}}
+      tagged_with: " etiquetado como {{tags}}"
+      your_traces: Os seus caminhos GPS
+    make_public: 
+      made_public: Caminho tornado público
+    offline_warning: 
+      message: O sistema de carregamento de ficheiros GPX está actualmente indisponível
     trace: 
       ago: Há {{time_in_words_ago}}
       by: por
       count_points: "{{count}} pontos"
       edit: editar
       edit_map: Editar Mapa
+      identifiable: IDENTIFICÁVEL
       in: em
       map: mapa
       more: mais
       pending: PENDENTE
+      private: PRIVADO
+      public: PÚBLICO
+      trace_details: Ver Detalhes do Caminho
+      trackable: CONTROLÁVEL
       view_map: Ver Mapa
     trace_form: 
+      description: Descrição
       help: Ajuda
+      tags: Etiquetas
+      upload_button: Carregar
+      upload_gpx: Carregar Ficheiro GPX
+      visibility: Visibilidade
+    trace_header: 
+      see_all_traces: Ver todos os caminhos
+      see_your_traces: Ver todos os teus caminhos
+      traces_waiting: Tu tens {{count}} caminhos esperando pelo carregamento. Por favor, considera em esperar por esses carregamentos terminares antes de enviares mais, de modo a não bloquear a fila para outros utilizadores.
+      upload_trace: Carregar caminho
+      your_traces: Ver apenas os teus caminhos
+    trace_optionals: 
+      tags: Etiquetas
+    trace_paging_nav: 
+      next: Próximo &raquo;
+      previous: "&laquo; Anterior"
+      showing_page: Mostrando página {{page}}
     view: 
+      delete_track: Apagar este caminho
+      description: "Descrição:"
+      download: download
       edit: editar
+      edit_track: Editar este caminho
+      filename: "Nome do ficheiro:"
+      heading: Vendo o caminho {{name}}
       map: mapa
       none: Nenhum
       owner: "Proprietário:"
       pending: PENDENTE
       points: "Pontos:"
       start_coordinates: "Coordenada de início:"
+      tags: "Etiquetas:"
+      title: Vendo o caminho {{name}}
+      trace_not_found: Caminho não encontrado
+      uploaded: "Carregado:"
       visibility: "Visibilidade:"
+    visibility: 
+      identifiable: Identificável (mostrado na lista de caminhos e como identificável, pontos ordenados com data e hora)
+      private: Privado (só partilhado como anónimo, pontos não ordenados)
+      public: Público (mostrado na lista de caminhos como anónimo, pontos não ordenados)
+      trackable: Controlável (apenas compartilhada como anónimo, pontos ordenados com data e hora)
+  user: 
+    account: 
+      contributor terms: 
+        heading: "Termos do Contribuidor:"
+        link text: o que é isso?
+      current email address: "E-mail Actual:"
+      delete image: Remover a imagem actual
+      flash update success: As informações do utilizador foram actualizadas com sucesso.
+      flash update success confirm needed: As informações do utilizador foram actualizadas com sucesso. Verifica o teu e-mail para confirmar o teu endereço de e-mail.
+      home location: Localização da Residência
+      image: "Imagem:"
+      latitude: "Latitude:"
+      longitude: "Longitude:"
+      make edits public button: Tornar todas as minhas edições públicas
+      my settings: Minhas definições
+      new email address: "Novo E-mail:"
+      new image: Adicionar imagem
+      no home location: Não inseriste a localização da tua residência.
+      preferred editor: "Editor Preferido:"
+      preferred languages: "Línguas preferidas:"
+      public editing: 
+        disabled link text: porque não posso editar?
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: o que é isso?
+        heading: "Edição pública:"
+      replace image: Substituir a imagem actual
+      save changes button: Gravar Alterações
+      title: Editar conta
+    confirm: 
+      already active: Esta conta já foi confirmada.
+      button: Confirmar
+      heading: Confirmar a conta de utilizador
+      press confirm button: Prime o botão confirmar abaixo para activar a tua conta.
+      success: Conta confirmada, obrigado por te registares!
+    confirm_email: 
+      button: Confirmar
+      failure: Um e-mail já foi confirmado com este código.
+      heading: Confirmar a alteração de e-mail
+      press confirm button: Prime o botão confirmar abaixo para confirmar o teu e-mail.
+      success: O teu e-mail foi confirmado, obrigado por te inscreveres!
+    confirm_resend: 
+      failure: Utilizador {{name}} não foi encontrado.
+    filter: 
+      not_an_administrator: Precisas de ser um administrador de para realizar esta operação.
+    go_public: 
+      flash success: Todas as tuas edições são agora públicas, e agora estás autorizado a editar.
+    list: 
+      confirm: Confirmar Utilizadores Seleccionados
+      heading: Utilizadores
+      hide: Ocultar Utilizadores Seleccionados
+      summary: "{{name}} criado com o ip {{ip_address}} em {{date}}"
+      summary_no_ip: "{{name}} criado na {{date}}"
+      title: Utilizadores
+    login: 
+      already have: Já tens uma conta OpenStreetMap? Por favor, autentica-te.
+      create_account: criar uma conta
+      email or username: "E-mail ou Utilizador:"
+      heading: Iniciar sessão
+      login_button: Autenticar-se
+      lost password link: Perdeu a sua palavra-chave?
+      new to osm: Novo no OpenStreetMap?
+      password: "Palavra-chave:"
+      please login: Por favor, inicie sessão ou {{create_user_link}}.
+      register now: Registar-se agora
+      remember: "Lembrar-me:"
+      title: Autenticar-se
+      webmaster: webmaster
+    logout: 
+      heading: Sair do OpenStreetMap
+      logout_button: Sair
+      title: Sair
+    lost_password: 
+      email address: "E-mail:"
+      heading: Palavra-passe esquecida?
+      new password button: Alterar Palavra-passe
+      notice email cannot find: Não foi possível encontrar o e-mail, desculpe.
+      title: Palavra-passe esquecida
+    make_friend: 
+      already_a_friend: Já és amigo do(a) {{name}}.
+      failed: Desculpe, falha ao adicionar {{name}} como um amigo.
+      success: "{{name}} agora é teu amigo."
+    new: 
+      confirm email address: "Confirmar E-mail:"
+      confirm password: "Confirmar palavra-passe:"
+      contact_webmaster: Entre em contacto com o <a href="mailto:webmaster@openstreetmap.org">webmaster</a> para uma conta ser criada - vamos tentar lidar com o pedido o mais rapidamente possível.
+      continue: Continuar
+      display name: "Mostrar Nome:"
+      email address: "E-mail:"
+      flash create success message: Obrigado por te inscreveres. Enviamos uma nota de confirmação para o e-mail {{email}} e assim que confirmares a conta, vais ser capaz de obter o mapeamento. <br /><br /> Se utilizares um sistema anti-spam que envia pedidos de confirmação, por favor, vai ver á pasta de spam.
+      heading: Criar uma Conta de Utilizador
+      password: "Palavra-chave:"
+      terms accepted: Obrigado por aceitar os novos termos do contribuidor!
+      title: Criar conta
+    popup: 
+      friend: Amigo
+      your location: Tua localização
+    remove_friend: 
+      not_a_friend: "{{name}} não é teu amigo."
+      success: "{{name}} foi removido dos teus amigos."
+    reset_password: 
+      confirm password: "Confirmar Palavra-passe:"
+      flash changed: A sua palavra-chave foi alterada.
+      heading: Repor palavra-passe para o {{user}}
+      password: "Palavra-chave:"
+      reset: Repor Palavra-chave
+      title: Repor palavra-passe
+    set_home: 
+      flash success: Residência salva com sucesso
+    suspended: 
+      heading: Conta Suspensa
+      title: Conta Suspensa
+    terms: 
+      agree: Aceitar
+      consider_pd_why: O que é isto?
+      decline: Rejeitar
+      heading: Termos do contribuidor
+      legale_names: 
+        france: França
+        italy: Itália
+        rest_of_world: Resto do mundo
+      title: Termos dos contribuidores
+    view: 
+      activate_user: activar este utilizador
+      add as friend: adicionar aos amigos
+      ago: ({{time_in_words_ago}} atrás)
+      confirm: Confirmar
+      confirm_user: confirmar esse utilizador
+      create_block: bloquear este utilizador
+      created from: "Criado em:"
+      deactivate_user: desactivar este utilizador
+      delete_user: eliminar este utilizador
+      description: Descrição
+      diary: diário
+      edits: edições
+      email address: "E-mail:"
+      hide_user: ocultar este utilizador
+      km away: "{{count}}km de distância"
+      latest edit: "Última edição {{ago}}:"
+      m away: "{{count}}m de distância"
+      my diary: meu diário
+      my edits: as minhas edições
+      my settings: as minhas configurações
+      new diary entry: nova entrada no de diário
+      no friends: Ainda não adicionou nenhum amigo.
+      remove as friend: remover amigo
+      role: 
+        administrator: Este utilizador é administrador
+        moderator: Este utilizador é um moderador
+      send message: enviar mensagem
+      settings_link_text: configurações
+      status: "Estado:"
+      traces: caminhos
+      unhide_user: descobrir este utilizador
+      user location: Localização do utilizador
+      your friends: Os seus amigos
+  user_block: 
+    partial: 
+      confirm: Tem a certeza?
+      edit: Editar
+    show: 
+      edit: Editar
+  user_role: 
+    grant: 
+      are_you_sure: Tens certeza que você desejas conceder o cargo `{{role}}' ao utilizador `{{name}}'?
+      confirm: Confirmar
+      title: Confirmar a concessão do cargo
+    revoke: 
+      confirm: Confirmar
+      heading: Confirmar revogação de cargo
+      title: Confirmar revogação de cargo

config/locales/ru.yml

@@ -1,15 +1,17 @@
 # Messages for Russian (Русский)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: AOleg
 # Author: Aleksandr Dezhin
 # Author: Calibrator
 # Author: Chilin
 # Author: Eleferen
+# Author: EugeneZelenko
 # Author: Ezhick
 # Author: G0rn
 # Author: Komzpa
 # Author: Lockal
+# Author: MaxSem
 # Author: Yuri Nazarov
 # Author: Александр Сигачёв
 # Author: Сrower
@@ -87,6 +89,7 @@ ru:
       cookies_needed: Похоже, что у вас выключены куки. Пожалуйста, включите куки в вашем браузере, прежде чем продолжить.
     setup_user_auth: 
       blocked: Ваш доступ к API заблокирован. Пожалуйста, войдите через веб-интерфейсе, чтобы узнать подробности.
+      need_to_see_terms: Ваш доступ к API временно приостановлен. Пожалуйста войдите через веб-интерфейс для просмотра условий участия. Вам не обязательно соглашаться, но вы должны просмотреть их.
   browse: 
     changeset: 
       changeset: "Пакет правок: {{id}}"
@@ -199,6 +202,7 @@ ru:
       details: Подробности
       drag_a_box: Для выбора области растяните рамку по карте
       edited_by_user_at_timestamp: Изменил [[user]] в [[timestamp]]
+      hide_areas: Скрыть области
       history_for_feature: История [[feature]]
       load_data: Загрузить данные
       loaded_an_area_with_num_features: Вы загрузили область, которая содержит [[num_features]] объектов. Некоторые браузеры могут не справиться с отображением такого количества данных. Обычно браузеры лучше всего обрабатывают до 100 объектов одновременно. Загрузка большего числа может замедлить ваш браузер или привести к зависанию. Если вы всё равно хотите отобразить эти данные, нажмите на кнопку ниже.
@@ -221,6 +225,7 @@ ru:
           node: Точка
           way: Линия
       private_user: частный пользователь
+      show_areas: Показать области
       show_history: Показать историю
       unable_to_load_size: "Загрузка невозможна: размер квадрата [[bbox_size]] слишком большой (должен быть меньше {{max_bbox_size}})"
       wait: Подождите...
@@ -358,6 +363,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: Поставить на карту маркер
@@ -558,7 +574,6 @@ ru:
           tower: Башня
           train_station: трамвайная остановка
           university: Университет
-          "yes": Здание
         highway: 
           bridleway: Конный путь
           bus_guideway: Автобусная полоса-рельс
@@ -885,16 +900,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: домой
@@ -920,14 +942,11 @@ 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: Создать учётную запись для редактирования
+    sotm2011: Приезжайте на конференцию OpenStreetMap 2011 «The State of the Map», 9-11 сентября, Денвер!
     tag_line: Свободная вики-карта мира
     user_diaries: Дневники
     user_diaries_tooltip: Посмотреть дневники
@@ -1171,8 +1190,11 @@ 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_not_configured: Potlatch 2 не был настроен — подробнее см. http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
+      potlatch2_unsaved_changes: Имеются несохранённые изменения. (Для сохранения в Potlatch 2, следует нажать «сохранить».)
       potlatch_unsaved_changes: Имеются несохранённые изменения. (Для сохранения в Potlatch снимите выделение с пути или точки, если редактируете в «живом» режиме, либо нажмите кнопку «сохранить», если вы в режиме отложенного сохранения.)
       user_page_link: страница пользователя
     index: 
@@ -1184,10 +1206,11 @@ ru:
         notice: Лицензировано на условиях {{license_name}} проектом {{project_name}} и его пользователями.
         project_name: OpenStreetMap
       permalink: Постоянная ссылка
+      remote_failed: Редактирование не удалось. Убедитесь, что JOSM или Merkaartor загружены и включена настройка дистанционного управления
       shortlink: Короткая ссылка
     key: 
       map_key: Условные знаки
-      map_key_tooltip: Условные обозначения для рендеринга mapnik на этом уровне масштаба
+      map_key_tooltip: Легенда для карты
       table: 
         entry: 
           admin: Административная граница
@@ -1254,7 +1277,6 @@ ru:
           unclassified: Дорога местного значения
           unsurfaced: Грунтовая дорога
           wood: Роща
-        heading: Условные обозначения для м{{zoom_level}}
     search: 
       search: Поиск
       search_help: "примеры: 'Вязьма', 'Regent Street, Cambridge', 'CB2 5AQ', или 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/index.php?title=RU:Search&uselang=ru'>больше примеров…</a>"
@@ -1386,7 +1408,7 @@ ru:
       flash update success confirm needed: Информация о пользователе успешно обновлена. Проверьте свою электронную почту, чтобы подтвердить ваш новый адрес.
       home location: "Основное местоположение:"
       image: "Изображение:"
-      image size hint: (квадратные изображения, по крайней мере 100x100 работают лучше)
+      image size hint: (квадратные изображения, по крайней мере 100×100 работают лучше)
       keep image: Хранить текущее изображение
       latitude: "Широта:"
       longitude: "Долгота:"
@@ -1395,6 +1417,7 @@ ru:
       new email address: "Новый адрес эл. почты:"
       new image: Добавить изображение
       no home location: Вы не обозначили свое основное местоположение.
+      preferred editor: "Предпочтительный редактор:"
       preferred languages: "Предпочитаемые языки:"
       profile description: "Описание профиля:"
       public editing: 
@@ -1413,17 +1436,23 @@ ru:
       title: Изменение учётной записи
       update home location on click: Обновлять моё местоположение, когда я нажимаю на карту?
     confirm: 
+      already active: Эта учётная запись уже подтверждена.
+      before you start: Мы знаем, вы спешите приступить к картографированию, но перед этим вы можете ещё указать какие-то сведения о себе.
       button: Подтвердить
-      failure: Учётная запись пользователя с таким кодом подтверждения уже была активирована ранее.
       heading: Подтвердить учётную запись пользователя
       press confirm button: Нажмите на кнопку подтверждения ниже, чтобы активировать вашу учетную запись.
+      reconfirm: Если уже прошло достаточно времени с момента вашей регистрации, возможно, вам необходимо <a href="{{reconfirm}}">отправить себе новое подтверждение</a>.
       success: Ваша учётная запись подтверждена, спасибо за регистрацию!
+      unknown token: Похоже, что такого токена не существует.
     confirm_email: 
       button: Подтвердить
       failure: Адрес электронной почты уже был подтверждён эти токеном.
       heading: Подтвердите изменение адреса электронной почты
       press confirm button: Нажмите кнопку подтверждения ниже, чтобы подтвердить ваш новый адрес электронной почты.
       success: Ваш адрес электронной почты подтверждён, спасибо за регистрацию!
+    confirm_resend: 
+      failure: Участник {{name}} не найден.
+      success: Мы выслали новое письмо с подтверждением на адрес {{email}}, и как только вы подтвердите вашу учётную запись, вы можете начать работать с картами.<br /><br />Если вы используете антиспам-систему, посылающую запросы на подтверждение, пожалуйста, внесите адрес webmaster@openstreetmap.org в ваш белый список, так как мы не можем отвечать на такие запросы.
     filter: 
       not_an_administrator: Только администратор может выполнить это действие.
     go_public: 
@@ -1440,19 +1469,24 @@ ru:
       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: "\nЗапомнить меня:"
       title: Представьтесь
+      to make changes: Чтобы вносить изменения в данные OpenStreetMap, вы должны иметь учётную запись.
       webmaster: веб-мастер
     logout: 
       heading: Выйти из OpenStreetMap
@@ -1479,7 +1513,7 @@ ru:
       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: К сожалению, сейчас мы не можем автоматически создать для вас учётную запись.
@@ -1546,6 +1580,7 @@ ru:
       hide_user: скрыть этого пользователя
       if set location: Если вы укажете свое местоположение, карта и дополнительные инструменты появятся ниже. Вы можете установить ваше местоположение на вашей странице {{settings_link}}.
       km away: "{{count}} км от вас"
+      latest edit: "Последняя правка {{ago}}:"
       m away: "{{count}} м от вас"
       mapper since: "Зарегистрирован:"
       moderator_history: созданные блокировки

config/locales/sk.yml

@@ -1,6 +1,6 @@
 # Messages for Slovak (Slovenčina)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Lesny skriatok
 # Author: Rudko
 # Author: Vladolc
@@ -433,6 +433,7 @@ sk:
           courthouse: Súd
           crematorium: Krematórium
           dentist: Zubár
+          doctors: Lekár
           dormitory: Študentský domov
           drinking_water: Pitná voda
           driving_school: Autoškola
@@ -523,7 +524,6 @@ sk:
           tower: Veža
           train_station: Železničná stanica
           university: Univerzitné budovy
-          "yes": Budova
         highway: 
           bridleway: Cesta pre kone
           bus_guideway: Bus so sprievodcom
@@ -567,6 +567,7 @@ sk:
           castle: Hrad
           church: Kostol
           house: Dom
+          icon: Ikona
           manor: Šľachtické sídlo
           memorial: Pomník
           mine: Baňa
@@ -823,12 +824,17 @@ sk:
       history_tooltip: Zobraziť úpravy pre túto oblasť
       history_zoom_alert: Musíte priblížiť na zobrazenie úprav pre túto oblasť
   layouts: 
+    community_blogs: Komunitné blogy
+    copyright: Autorské práva a licencia
+    documentation: Dokumentácia
     donate_link_text: darovanie
     edit: Upraviť
     export: Export
     export_tooltip: Export mapových dát
+    foundation: Nadácia
     gps_traces: GPS Stopy
     gps_traces_tooltip: Správa GPS stopy
+    help_centre: Centrum pomoci
     history: História
     home: domov
     home_tooltip: Choďte na domácu polohu
@@ -840,6 +846,7 @@ sk:
       zero: Nemáte žiadne neprečítané správy
     intro_1: OpenStreetMap je volne editovateľná mapa celého sveta. Tvoria ju ľudia ako vy.
     intro_2: OpenStreetMap vám dovolí prezerať, upravovať a používať zemepisné dáta vďaka spolupráci kdekoľvek na Zemi.
+    intro_3: Hosting OpenStreetMap láskavo poskytujú {{ucl}} a {{bytemark}}. Ďalší partneri projektu sú uvedení na {{partners}}.
     intro_3_partners: wiki
     license: 
       title: OpenStreetMap dáta sú licencované pod the Creative Commons Attribution-Share Alike 2.0 Generic License
@@ -852,12 +859,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
@@ -1138,7 +1141,6 @@ sk:
           tunnel: Únikový kryt = tunel
           unclassified: Neklasifikovaná cesta
           unsurfaced: Nespevnená cesta
-        heading: Legenda pre z{{zoom_level}}
     search: 
       search: Vyhľadať
       search_help: "príklady: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', alebo 'pošta blízko Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more príklady...</a>"
@@ -1284,7 +1286,6 @@ sk:
       update home location on click: Upraviť polohu domova, kliknutím na mapu?
     confirm: 
       button: Potvrdiť
-      failure: Užívateľský účet s týmito údajmi už bol založený.
       heading: Potvrdiť užívateľský účet
       press confirm button: Stlačte tlačítko na potvrdenie dole, pre aktiváciu vášho účtu.
       success: Váš účet je založený, ďakujeme, že ste sa zapísali!
@@ -1298,6 +1299,10 @@ sk:
       not_an_administrator: Potrebujete byť administrátor na vykonanie tejto akcie.
     go_public: 
       flash success: Všetky vaše úpravy sú teraz verejné, a teraz máte povolenie na úpravu.
+    list: 
+      heading: Užívatelia
+      hide: Skryť vybraných užívateľov
+      title: Užívatelia
     login: 
       account not active: Prepáčte, vaš účet nie je ešte aktívne.<br /> Prosím kliknite na odkaz v maile potvrdzujúcom účet na aktivovanie vášho účtu.
       auth failure: Prepáčte, nemohol som vás prihlásiť s týmito údajmi.
@@ -1330,6 +1335,7 @@ sk:
       confirm email address: "Potvrdiť emailovú adresu:"
       confirm password: "Potvrdiť Heslo:"
       contact_webmaster: Prosím kontaktovať <a href="mailto:webmaster@openstreetmap.org">webmaster</a> kvôli žiadosti pre vytvorenie účtu – budeme sa snažiť  vašu požiadavku vybaviť tak rýchlo, ako je len možné.
+      continue: Pokračovať
       display name: "Zobrazované meno:"
       display name description: Vaše verejne zobrazené meno užívateľa. Môžete ho potom zmeniť v nastaveniach.
       email address: "Emailová adresa:"
@@ -1405,6 +1411,7 @@ sk:
           moderator: Zrušiť prístup moderátora
       send message: poslať správu
       settings_link_text: nastavenia
+      status: "Stav:"
       traces: stopy
       unhide_user: odkryť tohto užívateľa
       user location: Poloha užívateľa

config/locales/sl.yml

@@ -1,6 +1,6 @@
 # Messages for Slovenian (Slovenščina)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Dbc334
 sl: 
   activerecord: 
@@ -420,7 +420,6 @@ sl:
           house: Hiša
           stadium: Stadion
           tower: Stolp
-          "yes": Zgradba
         highway: 
           bus_stop: Avtobusna postaja
         historic: 
@@ -431,6 +430,8 @@ sl:
           manor: Graščina
           ruins: Ruševine
           tower: Stolp
+        landuse: 
+          railway: Železnica
         leisure: 
           garden: Vrt
           park: Park
@@ -479,6 +480,7 @@ sl:
     export_tooltip: Izvozite podatke zemljevida
     gps_traces: GPS sledi
     gps_traces_tooltip: Upravljaj sledi GPS
+    help: Pomoč
     history: Zgodovina
     home: domov
     home_tooltip: Prikaži domači kraj
@@ -501,12 +503,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
@@ -680,7 +678,7 @@ sl:
       shortlink: Kratka povezava
     key: 
       map_key: Legenda
-      map_key_tooltip: Legenda mapnik zemljevida na prikazanem nivoju povečave
+      map_key_tooltip: Legenda zemljevida
       table: 
         entry: 
           admin: Upravna razmejitev
@@ -700,6 +698,7 @@ sl:
           destination: Dovoljeno za dostavo
           farm: Kmetija
           footway: Pešpot
+          forest: Gozd
           golf: Igrišče za Golf
           heathland: Grmičevje
           industrial: Industrijsko območje
@@ -733,7 +732,6 @@ sl:
           tunnel: Črtkana obroba = predor
           unclassified: Ostale ceste izven naselij
           unsurfaced: Neasfaltirana cesta
-        heading: Legenda povečave {{zoom_level}}
     search: 
       search: Iskanje
       search_help: "primeri: 'Bovec', 'Prešernova, Celje', 'Živalski vrt' ali 'vzpenjača' <a href='http://wiki.openstreetmap.org/wiki/Search'>Več primerov...</a>"
@@ -852,7 +850,6 @@ sl:
       update home location on click: Posodobi domačo lokacijo ob kliku na zemljevid?
     confirm: 
       button: Potrdi
-      failure: Uporabnišli račun je že bil potrjen s tem žetonom.
       heading: Potrdite uporabniški račun
       press confirm button: Za aktivacijo vašega uporabniškega računa pritisnite na gumb Potrdi spodaj.
       success: Vaš uporabniški račun je potrjen. Hvala, da ste se vpisali!
@@ -868,7 +865,7 @@ sl:
       heading: Uporabniki
       title: Uporabniki
     login: 
-      account not active: Oprostite, vaš uporabniški račun še ni aktiven.<br />Za aktivacijo prosim kliknite na povezavo, ki ste jo prejeli v elektronskem sporočilu za potrditev uporabniškega računa.
+      account not active: Oprostite, vaš uporabniški račun še ni aktiven.<br />Za aktivacijo prosimo uporabite povezavo, ki ste jo prejeli v elektronskem sporočilu za potrditev uporabniškega računa, ali <a href="{{reconfirm}}">zahtevajte novo potrditveno elektronsko sporočilo</a>.
       auth failure: Oprostite, prijava s temi podatki ni uspela.
       create_account: ustvarite uporabniški račun
       email or username: "Naslov e-pošte ali uporabniško ime:"
@@ -900,7 +897,7 @@ sl:
       display name: "Prikazno ime:"
       email address: "Naslov e-pošte:"
       fill_form: Izpolnite obrazec in poslali vam bomo elektronsko sporočilce s katerim boste aktivirali svoj uporabniški račun.
-      flash create success message: Uporabniški račun narejen. Preverite vaš poštni predal s sporočilom za potrditev in že boste lahko kartirali :-)<br /><br />Prosimo, upoštevajte, da prijava v sistem ne bo mogoča dokler ne potrdite svojega e-poštnega naslova.<br /><br />V kolikor vaš filter neželene pošte (anti spam filter) pred sprejemom sporočil neznanih pošiljateljev zahteva potrditev vas prosimo, da pošiljatelja webmaster@openstreetmap.org uvrstite na seznam dovoljenih pošiljateljev. Sistem pač ne zmore dovolj inteligentno odgovarjati na vse take zahtevke.
+      flash create success message: Hvala, ker ste se registrirali. Poslali smo potrditveno sporočilo na {{email}} in takoj, ko boste potrdili vaš račun, boste lahko začeli kartirati.<br /><br />V kolikor vaš filter neželene pošte pred sprejemom sporočil neznanih pošiljateljev zahteva potrditev, vas prosimo, da pošiljatelja webmaster@openstreetmap.org uvrstite na seznam dovoljenih pošiljateljev. Sistem pač ne zmore dovolj inteligentno odgovarjati na vse take zahtevke.
       heading: Ustvarite si uporabniški račun
       license_agreement: Ko boste potrdili svoj račun, se boste morali strinjati s <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">pogoji sodelovanja</a>.
       no_auto_account_create: Na žalost vam trenutno ne moremo samodejno ustvariti uporabniškega računa.

config/locales/sq.yml

@@ -1,8 +1,9 @@
 # Messages for Albanian (Shqip)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # 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: 
@@ -71,11 +72,11 @@ sq:
         prev_changeset_tooltip: Ndryshimi i ma hershēm prej {{user}}
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} ose {{edit_link}}"
-      download_xml: Merre me XML
-      edit: ndrro
+      download_xml: Shkarko në XML
+      edit: Ndrysho
       node: Pikë
       node_title: "Pika: {{node_name}}"
-      view_history: kqyre historinë
+      view_history: Shikoje historinë
     node_details: 
       coordinates: "Koordinatat:"
       part_of: "Pjesë e:"
@@ -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
@@ -316,9 +328,11 @@ sq:
       english_link: orgjianl anglisht
       text: Në ni ngjarje të ni konflitkti me faqe e përktyme dhe {{english_original_link}}, Faqja anglisht ka perparsi
       title: Rreth këtij përkthimi
+    legal_babble: "<h2>Të drejtat autoriale dhe licenca</h2>\n<p>\n   OpenStreetMap është <i>me kod të hapur</i>, dhe e licencuar nën <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  Ju jeni të lirë të kopjoni, shpërndani, transmetoni dhe adoptoni hartat\n  dhe të dhënat tona, duke pasur parasysh citimin e OpenStreetMap dhe \n  kontribuuesve të saj. Nëse ndryshoni apo ndërtoni mbi hartat apo të dhënat tona, ju\n  mund të shpërndani rezultatet nën licencën e njëjtë. Licenca e\n  e plotë <a\n  href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">legal\n  code</a> shpjegon të drejtat dhe përgjegjësitë tuaja.\n</p>\n\n<h3>Si të citoni OpenStreetMap</h3>\n<p>\n  Nëse ju përdorni imazhe të hartave të OpenStreetMap, ne kërkojmë që \n  së paku citimet tuaja të përfshijnë &ldquo;&copy; OpenStreetMap\n  kontribuuesit, CC-BY-SA&rdquo;. Nëse ju përdorni vetëm të dhëna të hartave\n  ne kërkojmë citimin e kontribuuesve &ldquo;të të dhënave të hartave &copy; të OpenStreetMap,\n  CC-BY-SA&rdquo;.\n</p>\n<p>\n  Ku është e mundur, OpenStreetMap duhet të hyperlinked to <a\n  href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n  dhe  CC-BY-SA to <a\n  href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Nëse jeni duke përdorur një medium ku nuk mund të bëhen linka (p.sh. a\n  letër e shtypur), ne sugjerojmë që ju të drejtoni lexuesit tek\n  www.openstreetmap.org (ndoshta duke shpjeguar \n  &lsquo;OpenStreetMap&rsquo; këtë adresë të plotë) dhe tek \n  www.creativecommons.org.\n</p>\n\n<h3>Të kuptoni më shumë</h3>\n<p>\n  Lexoni më shumë rreth përdorimit të të dhënave <a\n  href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Legal\n  FAQ</a>.\n</p>\n<p>\n  OSM kontribuuesit duhet të mos përdorin asnjë të dhënë prej burimeve të çfarëdoshme\n  të mbrojtura me të drejta të kopjimit (p.sh. Google Maps apo harta të printuara) pa\n  leje speciale prej pronarëve të të drejtave të kopjimit.\n</p>\n<p>\n  Edhe pse OpenStreetMap është me të kod të hapur, ne nuk mund të ofrojmë \n  një hartë API pa pagesë për zhvillues të palëve të treta.\n\n  Shikoni <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">API Politika e Përdorimit</a>,\n  <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Politika e përdorimit të pllakave</a>\n  dhe <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Poltika e përfitimit të Normave </a>.\n</p>\n\n<h3>Kontribuuesit tanë </h3>\n<p>\n  Licenca jonë CC-BY-SA kërkon nga ju që &ldquo;të vlerësoni Autorin\n  Origjinal përkatës të mediumit apo masave që jeni duke i\n  shfrytëzuar &rdquo;. Hartuesit individual të OSM nuk kërkojnë një\n  citim mbi dhe për atë që kontribuojnë për &ldquo;OpenStreetMap\n  &rdquo;, por kur përfshihen në OSM, hartat nga një agjencion nacional i hartave \n  apo faktor tjerë madhor burimor, është e arsyeshme të citohen drejtpërsëdrejti \n   duke paraqitur emrin apo duke lidhur faqen e tyre me link.\n</p>\n\n<!--\nInformata mbi edituesit e faqeve\n\nLista e mëposhtme paraqet vetëm organizatat që kërkojnë vlerësim\nsi kusht të përdorimit të të dhënave të tyre në OpenStreetMap. Nuk është një\nkatalog i përgjithshëm i importimeve, dhe nuk duhet të përdoret kur kërkohet\nvlerësim për tu përshtatur me licencën e të dhënave të importuara.\n\nÇfarëdo shtesash këtu duhet të diskutohen së pari me administratorët e sistemit të OSM.\n-->\n\n<ul id=\"contributors\">\n   <li><strong>Australia</strong>: Përmban të dhëna periferike të bazuara në të dhënat e Zyrës Australiane të Statistikave.</li>\n   <li><strong>Canada</strong>: Përmban të dhëna nga\n   GeoBase&reg;, GeoGratis (&copy; Departamenti i Resurseve Natyrale\n   në Kanada), CanVec (&copy; Departamenti i Resurseve Natyrale\n   në Kanada), and StatCan (Divizioni Gjeografik,\n   Statistik në Kanada  ).</li>\n   <li><strong>New Zealand</strong>: Përmban të dhëna nga burimet e Informatave të tokave\n   në Zelandë të re. Të drejtat e rezervuara i mbanë Crown.</li>\n   <li><strong>Poland</strong>: Përmban të dhëna nga <a\n   href=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. Copyright\n   UMP-pcPL contributors.</li>\n   <li><strong>Britani e Madhe</strong>: Përmban të dhëna nga Ordnance\n   Survey&copy;. Crown i ka të drejtat autoriale dhe të databazës.</li>\n</ul>\n\n<p>\n  Përfshirja e të dhënave në OpenStreetMap nuk thekson se të ofruesi origjinal i të \n  dhënave përdor OpenStreetMap, ofron garancion, apo\n  pranon çfarëdo anekse.\n</p>"
     native: 
       mapping_link: Fillo hatrografimin
       native_link: THIS_LANGUAGE_NAME_HERE verzion
+      text: Ju po shikoni versionin në gjuhën angelze të faqes së të drejtave autoriale. Ju mund të shkoni prapa tek {{native_link}} të kësaj faqe apo mund të ndaleni së lexuari rreth të drejtave autoriale dhe {{mapping_link}}.
       title: Rreth ksaj faqeje
   message: 
     inbox: 
@@ -441,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
@@ -487,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)
@@ -503,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: 
@@ -520,21 +542,37 @@ sq:
       title: Ndrysho akountin
       update home location on click: Ndryshoma venin kur te klikoj ne hart?
     confirm: 
+      already active: Kjo llogari tashmë është konfirmuar.
+      before you start: Ne e dimë që ju mezi po prisni të filloni punën me harta, por para se të veproni kështu, mund të plotësoni disa informata më shumë rreth vetes suaj në formën e mëposhtme.
       button: Konfirmo
-      failure: Ni akount i shfrytzuesit me ket token veqse osht i konfirmum.
       heading: Konfirmo nje akount te shfrytezuesit
       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.
@@ -567,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.
@@ -599,6 +639,19 @@ sq:
       title: Ricakto fjalekalimin
     set_home: 
       flash success: Lokacioni i shtëpisë është ruajtur me sukses
+    terms: 
+      agree: Pajtohem
+      consider_pd: Përveç marrëveshjes së mësipërme, unë i konsideroj kontributet e mia të jenë në Domenin Publik
+      consider_pd_why: çfarë është kjo?
+      decline: Nuk e pranoj
+      heading: Kushtet e Kontribimit
+      legale_names: 
+        france: Francë
+        italy: Itali
+        rest_of_world: Pjesa tjetër e botës
+      legale_select: "Ju lutem zgjidhni vendin tuaj të qëndrimit:"
+      read and accept: Ju lutem lexoni marrëveshjen më poshtë dhe shtypni butonin e dakordimit për të konfirmuar se ju pranoni kushtet e kësaj marrëveshjeje për kontributin tuaj ekzistues dhe të ardhshëm.
+      title: Kushtet e Kontribimit
     view: 
       activate_user: aktivizo ket shfrytezues
       add as friend: shtoje si shoq
@@ -607,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:"
@@ -629,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

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
+# Export driver: syck-pecl
 # 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: Наслов
@@ -103,6 +104,7 @@ sr-EC:
         few: "Има следеће {{count}} путање:"
         one: "Има следећу путању:"
         other: "Има следећих {{count}} путања:"
+      no_bounding_box: Ниједан гранични оквир није сачуван за овај скуп измена.
       show_area_box: Прикажи оквир области
     common_details: 
       changeset_comment: "Напомена:"
@@ -138,10 +140,10 @@ sr-EC:
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} или {{edit_link}}"
       download_xml: Преузми XML
-      edit: уреди
+      edit: измени
       node: Чвор
       node_title: "Чвор: {{node_name}}"
-      view_history: погледај историју
+      view_history: прикажи историјат
     node_details: 
       coordinates: "Координате:"
       part_of: "Део:"
@@ -150,9 +152,9 @@ sr-EC:
       download_xml: Преузми XML
       node_history: Историја чвора
       node_history_title: "Историја чвора: {{node_name}}"
-      view_details: погледај детаље
+      view_details: прикажи детаље
     not_found: 
-      sorry: Нажалост, {{type}} са ИД-ом {{id}} не може бити пронађен.
+      sorry: Нажалост, {{type}} са ИД бројем {{id}} не може бити пронађен.
       type: 
         changeset: скуп измена
         node: чвор
@@ -166,7 +168,7 @@ sr-EC:
       download_xml: Преузми XML
       relation: Однос
       relation_title: "Однос: {{relation_name}}"
-      view_history: погледај историју
+      view_history: прикажи историјат
     relation_details: 
       members: "Чланови:"
       part_of: "Део:"
@@ -214,6 +216,7 @@ sr-EC:
           way: Путања
       private_user: приватни корисник
       show_history: Прикажи историју
+      unable_to_load_size: "Није могуће учитати: Гранична величина оквира [[bbox_size]] је превелика (мора бити мања од {{max_bbox_size}})"
       wait: Чекај...
       zoom_or_select: Увећајте или изаберите место на мапи које желите да погледате
     tag_details: 
@@ -232,8 +235,8 @@ sr-EC:
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} или {{edit_link}}"
       download_xml: Преузми XML
-      edit: уреди
-      view_history: погледај историју
+      edit: измени
+      view_history: прикажи историјат
       way: Путања
       way_title: "Путања: {{way_name}}"
     way_details: 
@@ -245,7 +248,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 +267,7 @@ sr-EC:
     changesets: 
       area: Област
       comment: Напомена
-      id: ИД
+      id: ID
       saved_at: Сачувано у
       user: Корисник
     list: 
@@ -280,6 +283,8 @@ sr-EC:
       title_bbox: Скупови измена унутар {{bbox}}
       title_user: Скупови измена корисника {{user}}
       title_user_bbox: Скупови измена корисника {{user}} унутар {{bbox}}
+    timeout: 
+      sorry: Жао нам је, списак измена који сте захтевали је сувише дуг да бисте преузели.
   diary_entry: 
     diary_comment: 
       comment_from: Коментар {{link_user}} од {{comment_created_at}}
@@ -297,18 +302,20 @@ 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: користи мапу
     feed: 
       all: 
         title: OpenStreetMap кориснички уноси
+      language: 
+        title: OpenStreetMap дневнички уноси на {{language_name}}
     list: 
       in_language_title: Дневници на {{language}}
       new: Нови дневнички унос
@@ -319,7 +326,7 @@ sr-EC:
       title: Кориснички дневници
       user_title: Дневник корисника {{user}}
     location: 
-      edit: Уреди
+      edit: Измени
       location: "Локација:"
       view: Преглед
     new: 
@@ -331,9 +338,18 @@ sr-EC:
       leave_a_comment: Оставите коментар
       login: Пријави се
       login_to_leave_a_comment: "{{login_link}} да оставите коментар"
-      save_button: Сними
+      save_button: Сачувај
       title: "{{user}} дневник | {{title}}"
       user_title: Дневник корисника {{user}}
+  editor: 
+    default: Подразумевано (тренутно {{name}})
+    potlatch: 
+      description: Potlatch 1 (уређивач у прегледачу)
+    potlatch2: 
+      description: Potlatch 2 (уређивач у прегледачу)
+    remote: 
+      description: Даљинско управљење (JOSM или Merkaartor)
+      name: Даљинско управљење
   export: 
     start: 
       add_marker: Додајте маркер на мапу
@@ -356,6 +372,7 @@ sr-EC:
       paste_html: Пренесите HTML како бисте уградили у сајт
       scale: Размера
       too_large: 
+        body: Ова област је превелика да би се извезла као OpenStreetMap XML податак. Молимо Вас да увећате или изаберите мању површину.
         heading: Превелика област
       zoom: Увећање
     start_rjs: 
@@ -393,7 +410,7 @@ sr-EC:
       zero: мање од километра
     results: 
       more_results: Још резултата
-      no_results: Нема резултата претраге
+      no_results: Нема резултата
     search: 
       title: 
         ca_postcode: Резултати од <a href="http://geocoder.ca/">Geocoder.ca</a>
@@ -417,6 +434,7 @@ sr-EC:
           bar: Бар
           bench: Клупа
           bicycle_parking: Паркинг за бицике
+          bicycle_rental: Изнајмљивање бицикла
           brothel: Бордел
           bureau_de_change: Мењачница
           bus_station: Аутобуска станица
@@ -436,6 +454,7 @@ sr-EC:
           drinking_water: Пијаћа вода
           driving_school: Ауто-школа
           embassy: Амбасада
+          emergency_phone: Телефон за хитне случајеве
           fast_food: Брза храна
           fire_hydrant: Хидрант
           fire_station: Ватрогасна станица
@@ -461,19 +480,24 @@ sr-EC:
           park: Парк
           parking: Паркинг
           pharmacy: Апотека
+          place_of_worship: Место богослужења
           police: Полиција
           post_box: Поштанско сандуче
           post_office: Пошта
           preschool: Обданиште
           prison: Затвор
           pub: Паб
+          public_building: Јавна зграда
           public_market: Пијаца
+          reception_area: Пријемна област
+          recycling: Место за рециклажу
           restaurant: Ресторан
           retirement_home: Старачки дом
           sauna: Сауна
           school: Школа
           shelter: Склониште
           shop: Продавница
+          social_club: Друштвени клуб
           studio: Студио
           supermarket: Супермаркет
           taxi: Такси
@@ -482,6 +506,8 @@ sr-EC:
           toilets: Тоалети
           townhall: Градска скупштина
           university: Универзитет
+          vending_machine: Аутомат за продају
+          veterinary: Ветеринарска хирургија
           village_hall: Сеоска већница
           waste_basket: Корпа за отпатке
           wifi: Wi-Fi приступ
@@ -496,6 +522,7 @@ sr-EC:
           city_hall: Градска скупштина
           commercial: Пословна зграда
           dormitory: Студентски дом
+          entrance: Улаз у зграду
           faculty: Факултетска зграда
           flats: Станови
           garage: Гаража
@@ -503,7 +530,9 @@ sr-EC:
           hospital: Болница
           hotel: Хотел
           house: Кућа
+          public: Јавна зграда
           residential: Стамбена зграда
+          retail: Малопродајна радња
           school: Школа
           shop: Продавница
           stadium: Стадион
@@ -512,12 +541,12 @@ sr-EC:
           tower: Торањ
           train_station: Железничка станица
           university: Универзитетска зграда
-          "yes": Зграда
         highway: 
           bus_stop: Аутобуска станица
           byway: Споредни пут
           construction: Аутопут у изградњи
           cycleway: Бициклистичка стаза
+          distance_marker: Ознака удаљености
           emergency_access_point: Излаз за случај опасности
           footway: Стаза
           ford: Газ
@@ -540,6 +569,7 @@ sr-EC:
           trail: Стаза
           trunk: Магистрални пут
           trunk_link: Магистрални пут
+          unclassified: Некатегорисан пут
         historic: 
           archaeological_site: Археолошко налазиште
           battlefield: Бојиште
@@ -556,11 +586,15 @@ sr-EC:
           museum: Музеј
           ruins: Рушевине
           tower: Торањ
+          wayside_cross: Крајпуташ (крст)
+          wayside_shrine: Крајпуташ (споменик)
           wreck: Олупина
         landuse: 
+          allotments: Баште
           basin: Басен
           cemetery: Гробље
           commercial: Пословна област
+          conservation: Под заштитом
           construction: Градилиште
           farm: Фарма
           farmyard: Сеоско двориште
@@ -614,6 +648,7 @@ sr-EC:
           fjord: Фјорд
           geyser: Гејзир
           glacier: Глечер
+          heath: Вресиште
           hill: Брдо
           island: Острво
           land: Земљиште
@@ -662,8 +697,14 @@ sr-EC:
           abandoned: Напуштена железница
           construction: Железничка пруга у изградњи
           disused: Напуштена железница
+          disused_station: Предложена железничка станица
+          funicular: Жичана железница
+          halt: Железничко стајалиште
           historic_station: Историјска железничка станица
           junction: Железнички чвор
+          level_crossing: Прелаз у нивоу
+          light_rail: Лака железница
+          monorail: Пруга са једним колосеком
           narrow_gauge: Пруга уског колосека
           platform: Железничка платформа
           preserved: Очувана железница
@@ -673,21 +714,29 @@ sr-EC:
           tram: Трамвај
           tram_stop: Трамвајско стајалиште
         shop: 
+          alcohol: Без лиценце
           art: Продавница слика
           bakery: Пекара
           beauty: Салон лепоте
+          beverages: Продавница пића
           books: Књижара
           butcher: Месара
+          car: Ауто продавница
           car_dealer: Ауто дилер
-          car_parts: Продавница ауто-делова
+          car_parts: Ауто-делови
           car_repair: Ауто-сервис
           chemist: Апотекар
           clothes: Бутик
+          computer: Рачунарска опрема
+          confectionery: Посластичарница
           copyshop: Копирница
+          cosmetics: Козметичарска радња
           department_store: Робна кућа
           drugstore: Апотека
           dry_cleaning: Хемијско чишћење
+          electronics: Електронска опрема
           estate_agent: Агент за некретнине
+          farm: Пољопривредна апотека
           fish: Рибарница
           florist: Цвећара
           food: Бакалница
@@ -697,6 +746,8 @@ sr-EC:
           greengrocer: Пиљарница
           grocery: Бакалница
           hairdresser: Фризерски салон
+          hardware: Гвожђара
+          hifi: Музичка опрема
           insurance: Осигурање
           jewelry: Јувелирница
           kiosk: Киоск
@@ -707,22 +758,27 @@ sr-EC:
           optician: Оптичар
           organic: Здрава храна
           outdoor: Штанд
+          pet: Кућни љубимаци
           photo: Фотографска радња
           salon: Салон
           shoes: Продавница ципела
           shopping_centre: Тржни центар
+          sports: Спортска опрема
           supermarket: Супермаркет
           toys: Продавница играчака
           travel_agency: Туристичка агенција
+          wine: Без лиценце
         tourism: 
+          alpine_hut: Планинарски дом
           artwork: Галерија
           attraction: Атракција
           bed_and_breakfast: Полупансион
+          camp_site: Камп
           chalet: Планинска колиба
           guest_house: Гостинска кућа
           hostel: Хостел
           hotel: Хотел
-          information: Информације
+          information: Подаци
           motel: Мотел
           museum: Музеј
           picnic_site: Место за пикник
@@ -753,20 +809,28 @@ sr-EC:
         noname: Без назива
     site: 
       edit_disabled_tooltip: Увећајте како бисте уредили мапу
-      edit_tooltip: Уреди мапу
+      edit_tooltip: Измените мапу
+      edit_zoom_alert: Морате увећати да бисте изменили мапу
       history_disabled_tooltip: Увећајте како бисте видели измене за ову област
+      history_tooltip: Погледајте измене за ову област
       history_zoom_alert: Морате увећати како бисте видели историју уређивања
   layouts: 
+    community_blogs: Блогови заједнице
+    community_blogs_title: Блогови чланова OpenStreetMap заједнице
     copyright: Ауторска права и лиценца
+    documentation: Документација
+    documentation_title: Документација за пројекат
     donate_link_text: донирање
     edit: Уреди
+    edit_with: Уреди помоћу {{editor}}
     export: Извези
     export_tooltip: Извоз мапа
+    foundation: Фондација
     gps_traces: ГПС трагови
     gps_traces_tooltip: Управљање ГПС траговима
     help: Помоћ
-    help_and_wiki: "{{help}} и {{wiki}}"
-    history: Историја
+    help_centre: Центар за помоћ
+    history: Историјат
     home: мој дом
     home_tooltip: Иди на почетну локацију
     inbox: поруке ({{count}})
@@ -785,14 +849,13 @@ sr-EC:
     log_in_tooltip: Пријавите се са постојећим налогом
     logo: 
       alt_text: OpenStreetMap лого
-    logout: одјавите се
-    logout_tooltip: Одјави се
+    logout: одјави ме
+    logout_tooltip: Одјави ме
     make_a_donation: 
       text: Донирајте
       title: Подржите OpenStreetMap новчаним прилогом
-    news_blog: Вести на блогу
-    shop: Продавница
-    shop_tooltip: пазарите у регистрованој OpenStreetMap продавници
+    osm_offline: OpenStreetMap база података је тренутно ван мреже док се извршава одржавање базе података.
+    osm_read_only: OpenStreetMap база података је тренутно у режиму само за читање док се извршава одржавање базе података.
     sign_up: региструјте се
     sign_up_tooltip: Направите налог како бисте уређивали мапе
     user_diaries: Кориснички дневници
@@ -823,7 +886,7 @@ sr-EC:
       outbox: послате
       people_mapping_nearby: маперима у вашој околини
       subject: Тема
-      title: Моје примљене поруке
+      title: Примљене
       you_have: Имате {{new_count}} нових порука и {{old_count}} старих порука
     mark: 
       as_read: Порука је означена као прочитана
@@ -835,22 +898,24 @@ sr-EC:
       unread_button: Означи као непрочитано
     new: 
       back_to_inbox: Назад на примљене
-      body: Тело
-      message_sent: Порука је послата
+      body: Текст
+      limit_exceeded: Недавно сте послали много порука. Молимо Вас да сачекате неко време пре него покушавате да пошаљете још неку.
+      message_sent: Порука је послата.
       send_button: Пошаљи
       send_message_to: Пошаљи нову поруку {{name}}
       subject: Тема
       title: Пошаљи поруку
     no_such_message: 
+      body: Жао нам је нема поруке означене тим ИД бројем.
       heading: Нема такве поруке
       title: Нема такве поруке
     no_such_user: 
       body: Извините не постоји корисник са тим именом.
-      heading: Овде таквог нема
-      title: Овде таквог нема
+      heading: Нема таквог корисника
+      title: Нема таквог корисника
     outbox: 
       date: Датум
-      inbox: примљене поруке
+      inbox: примљене
       my_inbox: Моје {{inbox_link}}
       no_sent_messages: Тренутно немате послатих порука. Зашто не успоставите контакт са {{people_mapping_nearby_link}}?
       outbox: послате
@@ -869,6 +934,9 @@ sr-EC:
       title: Прочитај поруку
       to: За
       unread_button: Означи као непрочитано
+      wrong_user: "Пријављени сте као: `{{user}}', али поруку коју сте жележи да прочитате није послат од или том кориснику. Молимо вас пријавите као правилан корисник да бисте је прочитали."
+    reply: 
+      wrong_user: "Пријављени сте као: `{{user}}', али поруку на коју сте желели да одговорите није послата том кориснику. Молимо вас пријавите се као правилан корисник да бисте одговорили."
     sent_message_summary: 
       delete_button: Обриши
   notifier: 
@@ -913,34 +981,43 @@ sr-EC:
     signup_confirm_html: 
       click_the_link: Ако сте то Ви, добродошли! Молимо кликните на везу испод како бисте потврдили ваш налог и прочитали још информација о OpenStreetMap
       greeting: Поздрав!
-      hopefully_you: Неко (вероватно Ви) би желео да направи налог на
+      hopefully_you: Неко (вероватно ви) би желео да направи налог на
       introductory_video: Можете гледати {{introductory_video_link}}.
+      video_to_openstreetmap: уводни видео за OpenStreetMap
     signup_confirm_plain: 
       click_the_link_1: Ако сте то Ви, добродошли! Молимо кликните на везу испод како бисте потврдили Ваш
       current_user_1: Списак тренутних корисника у категоријама, на основу положаја у свету
       current_user_2: "где живе, је доступан на:"
       greeting: Поздрав!
-      hopefully_you: Неко (вероватно Ви) би желео да направи налог на
+      hopefully_you: Неко (вероватно ви) би желео да направи налог на
+      introductory_video: "Уводни видео на OpenStreetMap можете погледати овде:"
   oauth: 
     oauthorize: 
       allow_read_gpx: учитајте ваше GPS путање.
       allow_write_api: измени мапу.
       allow_write_gpx: учитај GPS  трагове.
-      allow_write_prefs: измените ваша корисничка подешавања.
+      allow_write_prefs: измените своје корисничке поставке.
   oauth_clients: 
     edit: 
       submit: Уреди
     form: 
+      allow_write_api: измени мапу.
       name: Име
+      requests: "Захтевај следеће дозволе од корисника:"
     index: 
       application: Име апликације
       register_new: Региструј своју апликацију
       revoke: Опозови!
+      title: Моји OAuth детаљи
     new: 
-      submit: Региструј
+      submit: Отвори налог
       title: Региструј нову апликацију
     not_found: 
       sorry: Жао нам је, {{type}} није могло бити пронађено.
+    show: 
+      allow_write_api: измени мапу.
+      edit: Детаљи измене
+      title: OAuth детаљи за {{app_name}}
   site: 
     edit: 
       not_public: Нисте подесили да ваше измене буду јавне.
@@ -948,11 +1025,14 @@ sr-EC:
     index: 
       license: 
         license_name: Creative Commons Attribution-Share Alike 2.0
+        project_name: OpenStreetMap пројекат
     key: 
       map_key: Легенда мапе
+      map_key_tooltip: Кључна реч за мапу
       table: 
         entry: 
           admin: Административна граница
+          allotments: Баште
           apron: 
             - Аеродромски перон
             - терминал
@@ -962,6 +1042,7 @@ sr-EC:
           byway: Споредни пут
           cable: 
             - Жичара
+            - седишница
           cemetery: Гробље
           centre: Спортски центар
           commercial: Пословна област
@@ -1010,11 +1091,10 @@ sr-EC:
           unclassified: Некатегорисан пут
           unsurfaced: Подземни пут
           wood: Гај
-        heading: Легенда за  увећање {{zoom_level}}
     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: 
@@ -1033,17 +1113,17 @@ sr-EC:
       description: "Опис:"
       download: преузми
       edit: уреди
-      filename: "Име фајла:"
+      filename: "Назив датотеке:"
       heading: Уређивање трага {{name}}
       map: мапа
       owner: "Власник:"
       points: "Тачке:"
-      save_button: Сними промене
+      save_button: Сачувај измене
       start_coord: "Почетне координате:"
       tags: "Ознаке:"
       tags_help: раздвојене зарезима
       title: Мењање трага {{name}}
-      uploaded_at: "Послато:"
+      uploaded_at: "Отпремљено:"
       visibility: "Видљивост:"
       visibility_help: шта ово значи?
     list: 
@@ -1054,7 +1134,7 @@ sr-EC:
     no_such_user: 
       body: Жао нам је, не постоји корисник са именом {{user}}. Молимо проверите да ли сте добро откуцали, или је можда веза коју сте кликнули погрешна.
       heading: Корисник {{user}} не постоји
-      title: Овде таквог нема
+      title: Нема таквог корисника
     offline_warning: 
       message: Систем за слање GPX фајлова је тренутно недоступан
     trace: 
@@ -1063,20 +1143,22 @@ sr-EC:
       count_points: "{{count}} тачака"
       edit: уреди
       edit_map: Уреди мапу
+      identifiable: ПОИСТОВЕТЉИВ
       in: у
       map: мапа
-      more: још
+      more: више
       pending: НА_ЧЕКАЊУ
-      private: ПРИВАТНО
+      private: ПРИВАТНИ
       public: ЈАВНО
       trace_details: Погледај детаље путање
+      trackable: УТВРДЉИВ
       view_map: Погледај мапу
     trace_form: 
       description: Опис
       help: Помоћ
       tags: Ознаке
       tags_help: раздвојене зарезима
-      upload_button: Пошаљи
+      upload_button: Отпреми
       upload_gpx: Пошаљи GPX фајл
       visibility: Видљивост
       visibility_help: Шта ово значи?
@@ -1098,7 +1180,7 @@ sr-EC:
       download: преузми
       edit: уреди
       edit_track: Уреди ову стазу
-      filename: "Име фајла:"
+      filename: "Назив датотеке:"
       heading: Преглед трага {{name}}
       map: мапа
       none: Нема
@@ -1109,7 +1191,7 @@ sr-EC:
       tags: "Ознаке:"
       title: Преглед трага {{name}}
       trace_not_found: Траг није пронађен!
-      uploaded: "Послато:"
+      uploaded: "Отпремљено:"
       visibility: "Видљивост:"
     visibility: 
       identifiable: Омогућавају препознавање (приказани у списку трагова и као јавне, поређане и датиране тачке)
@@ -1124,6 +1206,7 @@ sr-EC:
         heading: "Услови уређивања:"
         link text: шта је ово?
         not yet agreed: Још се нисте сложили са новим условима уређивања.
+        review link text: Молимо Вас да следите ову везу да бисте прегледали и прихватили нове услове уређивања.
       current email address: "Тренутна адреса е-поште:"
       delete image: Уклони тренутну слику
       email never displayed publicly: (не приказуј јавно)
@@ -1137,76 +1220,96 @@ sr-EC:
       longitude: "Географска дужина:"
       make edits public button: Нека све моје измене буду јавне
       my settings: Моја подешавања
-      new email address: "Нова адреса е-поште:"
-      new image: Додајте вашу слику
+      new email address: "Нова е-адреса:"
+      new image: Додајте слику
       no home location: Нисте унели ваше место становања.
       preferred languages: "Подразумевани језици:"
       profile description: "Опис профила:"
       public editing: 
         disabled link text: зашто не могу да уређујем?
+        enabled: Омогућено. Није анонимнан и може уређивати податке.
         enabled link text: шта је ово?
+        heading: "Јавне измене:"
       public editing note: 
         heading: Јавне измене
+      replace image: Замени тренутну слику
       return to profile: Повратак на профил
       save changes button: Сачувај промене
       title: Уреди налог
+      update home location on click: Ажурирај моју локацију када кликнем на мапу?
     confirm: 
+      already active: Овај налог је већ потврђен.
       button: Потврди
       heading: Потврдите кориснички налог
       press confirm button: Притисните дугме за потврду како бисте активирали налог.
+      reconfirm: Ако је прошло неко време откако сте се пријавили, можда ћете морати да <a href="{{reconfirm}}">пошаљете себи нову потврду е-поштом</a>.
       success: Ваш налог је потврђен, хвала на регистрацији!
     confirm_email: 
       button: Потврди
       heading: Потврдите промену е-мејл адресе
       success: Потврдите вашу е-мејл адресу, хвала на регистрацији!
+    confirm_resend: 
+      failure: Корисник {{name}} није пронађен.
     filter: 
-      not_an_administrator: Морате бити администратор да бисте извели ову акцију.
+      not_an_administrator: Морате бити администратор да бисте извели ову радњу.
+    go_public: 
+      flash success: Све Ваше измене су сада јавне, и сада можете да правите измените.
     list: 
       heading: Корисници
       summary_no_ip: "{{name}}, направљен {{date}}"
       title: Корисници
     login: 
       account not active: Извињавамо се, ваш налог још није активиран. <br />Молимо пратите везу у е-мејлу за потврду налога како бисте га активирали.
+      already have: Већ имате налог? Пријавите се.
+      create account minute: Отворите налог. Потребно је само неколико тренутака.
       create_account: направите налог
       email or username: "Адреса е-поште или корисничко име:"
-      heading: Пријављивање
+      heading: Пријава
       login_button: Пријавите се
-      lost password link: Изгубили сте лозинку?
+      lost password link: Заборавили сте лозинку?
+      new to osm: Нови сте на сајту?
       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: Пријављивање
+      title: Пријава
+      to make changes: Да бисте правили измене OpenStreetMap података, морате имати налог.
       webmaster: администратор
     logout: 
-      logout_button: Одјави се
-      title: Одјави се
+      heading: Одјављивање
+      logout_button: Одјави ме
+      title: Одјави ме
     lost_password: 
-      email address: "Адреса е-поште:"
-      heading: Заборављена лозинка?
+      email address: "Е-адреса:"
+      heading: Заборавили сте лозинку?
       help_text: Унесите адресу е-поште коју сте користили за пријављивање, и на њу ћемо вам послати везу коју можете кликнути како бисте ресетовали лозинку.
       new password button: Обнови лозинку
       title: Изгубљена лозинка
     make_friend: 
       success: "{{name}} је постао ваш пријатељ."
     new: 
-      confirm email address: "Потврдите адресу е-поште:"
+      confirm email address: "Потврдите е-адресу:"
       confirm password: "Потврдите лозинку:"
+      contact_webmaster: Молимо Вас да контактирате <a href="mailto:webmaster@openstreetmap.org">администратора</a> како би креирао налог налог - покушаћемо да се обрадимо Ваш захтев што је пре могуће.
       continue: Настави
       display name: "Приказано име:"
       display name description: Име вашег корисничког налога. Можете га касније променити у подешавањима.
-      email address: "Адреса е-поште:"
+      email address: "Е-адреса:"
       fill_form: Попуните упитник и убрзо ћемо вам послати мејл како бисте активирали налог.
+      flash create success message: Хвала што сте се регистровали. Послали смо Вам потврдну поруку на {{email}} и чим потврдите свој налог моћи ћете да почнете са мапирањем.<br /><br />Ако користите систем против нежељених порука који одбија захтев за потврду онда молимо проверите да ли сте ставили на белу листу webmaster@openstreetmap.org јер нисмо у могућности да одговоримо на било који захтев за потврду.
       heading: Направите кориснички налог
       license_agreement: Креирањем налога, прихватате услове да сви подаци које шаљете на Openstreetmap пројекат буду (неискључиво) лиценциран под <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.sr">овом Creative Commons лиценцом (by-sa)</a>.
       not displayed publicly: Не приказује се јавно (погледајте <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="вики политика приватности која садржи и одељак о адресама е-поште">политику приватности</a>)
       password: "Лозинка:"
-      title: Направи налог
+      terms accepted: Хвала што прихватате нове услове уређивања!
+      title: Отварање налога
     no_such_user: 
       heading: Корисник {{user}} не постоји
-      title: Овде таквог нема
+      title: Нема таквог корисника
     popup: 
       friend: Пријатељ
+      nearby mapper: Мапери у близини
       your location: Ваша локација
     remove_friend: 
       not_a_friend: "{{name}} није један од ваших пријатеља."
@@ -1221,29 +1324,42 @@ sr-EC:
     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: шта је ово?
       decline: Одбаци
+      heading: Услови уређивања
       legale_names: 
         france: Француска
         italy: Италија
         rest_of_world: Остатак света
+      legale_select: "Молимо изаберите земљу Вашег пребивалишта:"
+      read and accept: Молимо вас да прочитате уговор испод и притисните дугме Прихвати како бисте потврдили да се слажете са условима овог уговора за постојеће и будуће доприносе.
+      title: Услови уређивања
     view: 
+      activate_user: активирај овог корисника
       add as friend: додај за пријатеља
       ago: (пре {{time_in_words_ago}})
+      blocks by me: моја блокирања
       blocks on me: моја блокирања
       confirm: Потврди
+      confirm_user: потврди овог корисника
       create_block: блокирај овог корисника
+      created from: "Креирано од:"
+      deactivate_user: деактивирај овог корисника
       delete_user: избриши овог корисника
       description: Опис
       diary: дневник
       edits: измене
-      email address: "Адреса е-поште:"
+      email address: "Е-адреса:"
+      hide_user: сакриј овог корисника
       km away: "{{count}}km далеко"
+      latest edit: "Последња измена пре {{ago}}:"
       m away: "{{count}}m далеко"
       mapper since: "Мапер од:"
       my diary: мој дневник
@@ -1253,6 +1369,8 @@ sr-EC:
       nearby users: "Остали корисници у близини:"
       new diary entry: нови дневнички унос
       no friends: Још нисте додали ниједног пријатеља.
+      no nearby users: Још не постоје други корисници који су потврдили да мапирају у близини.
+      oauth settings: oauth подешавања
       remove as friend: уклони као пријатеља
       role: 
         administrator: Овај корисник је администратор
@@ -1260,6 +1378,9 @@ sr-EC:
           administrator: Одобри администраторски приступ
           moderator: Одобри модераторски приступ
         moderator: Овај корисник је модератор
+        revoke: 
+          administrator: Опозови администраторски приступ
+          moderator: Опозови модераторски приступ
       send message: пошаљи поруку
       settings_link_text: подешавања
       status: "Статус:"
@@ -1267,6 +1388,14 @@ sr-EC:
       user location: Локација корисника
       your friends: Ваши пријатељи
   user_block: 
+    filter: 
+      block_expired: Блокирање је већ истекло и не може се уређивати.
+      not_a_moderator: Морате бити модератора да извели ову радњу.
+    model: 
+      non_moderator_revoke: Мора бити модератора да бисте укинули блокирање.
+      non_moderator_update: Мора бити модератора да бисте поставили или ажурирали блокирање.
+    not_found: 
+      back: Назад на индекс
     partial: 
       confirm: Јесте ли сигурни?
       creator_name: Творац
@@ -1282,6 +1411,8 @@ sr-EC:
       few: "{{count}} сата"
       one: 1 сат
       other: "{{count}} сати"
+    revoke: 
+      revoke: Опозови!
     show: 
       back: Погледај сва блокирања
       confirm: Јесте ли сигурни?
@@ -1289,6 +1420,8 @@ sr-EC:
       heading: "{{block_on}}-а је блокирао {{block_by}}"
       needs_view: Овај корисник мора да се пријави пре него што се блокада уклони.
       reason: "Разлози блокирања:"
+      revoke: Опозови!
+      revoker: "Опозивалац:"
       show: Прикажи
       status: Статус
       time_future: Завршава се у  {{time}}

config/locales/sv.yml

@@ -1,6 +1,6 @@
 # Messages for Swedish (Svenska)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Ainali
 # Author: Balp
 # Author: Cohan
@@ -15,6 +15,7 @@
 # Author: Sannab
 # Author: Sertion
 # Author: The real emj
+# Author: WikiPhoenix
 sv: 
   activerecord: 
     attributes: 
@@ -267,6 +268,7 @@ sv:
       title_user_bbox: Changesets av {{user}} inom {{bbox}}
   diary_entry: 
     diary_comment: 
+      comment_from: Kommentar från {{link_user}}, {{comment_created_at}}
       confirm: Bekräfta
       hide_link: Dölj denna kommentar
     diary_entry: 
@@ -276,6 +278,7 @@ sv:
       comment_link: Kommentera denna anteckning
       confirm: Bekräfta
       edit_link: Redigera denna anteckning
+      hide_link: Dölj den här posten
       posted_by: Skrivet av {{link_user}} den {{created}} på {{language_link}}
       reply_link: Svara på denna anteckning
     edit: 
@@ -299,6 +302,10 @@ sv:
       older_entries: Äldre anteckningar
       title: Användardagböcker
       user_title: "{{user}}s dagbok"
+    location: 
+      edit: Redigera
+      location: "Plats:"
+      view: Visa
     new: 
       title: Ny dagboksanteckning
     no_such_entry: 
@@ -314,6 +321,11 @@ sv:
       login_to_leave_a_comment: "{{login_link}} för att lämna en kommentar"
       save_button: Spara
       user_title: Dagbok för {{user}}
+  editor: 
+    potlatch: 
+      name: Potlatch 1
+    potlatch2: 
+      name: Potlatch 2
   export: 
     start: 
       add_marker: Lägg till markör på kartan
@@ -372,6 +384,7 @@ sv:
       other: ungefär {{count}} km
       zero: mindre än 1 km
     results: 
+      more_results: Fler resultat
       no_results: Hittade inget.
     search: 
       title: 
@@ -391,6 +404,7 @@ sv:
           airport: Flygplats
           arts_centre: Konstcenter
           atm: Bankomat
+          auditorium: Auditorium
           bank: Bank
           bar: Bar
           bench: Bänk
@@ -405,11 +419,14 @@ sv:
           car_wash: Biltvätt
           casino: Kasino
           cinema: Biograf
+          clinic: Klinik
           club: Klubb
           college: Gymnasium
+          courthouse: Tingshus
           crematorium: Krematorium
           dentist: Tandläkare
           doctors: Läkare
+          dormitory: Studenthem
           drinking_water: Dricksvatten
           driving_school: Körskola
           embassy: Ambassad
@@ -432,6 +449,8 @@ sv:
           market: Torghandel
           marketplace: "\nMarknad"
           nightclub: Nattklubb
+          nursery: Förskola
+          nursing_home: Vårdhem
           office: Kontor
           park: Park
           parking: Parkeringsplats
@@ -452,26 +471,42 @@ sv:
           shelter: Hydda
           shop: Affär
           shopping: Handel
+          studio: Studio
+          supermarket: Stormarknad
           taxi: Taxi
+          telephone: Telefonkiosk
           theatre: Teater
           toilets: Toaletter
+          townhall: Rådhus
           university: Universitet
           vending_machine: Varumaskin
           veterinary: Veterinär
           waste_basket: Papperskorg
           youth_centre: Ungdomscenter
+        boundary: 
+          administrative: Administrativ gräns
         building: 
+          apartments: Flerfamiljshus
+          bunker: Bunker
           chapel: Kapell
           church: Kyrka
+          dormitory: Studenthem
+          faculty: Fakultetsbyggnad
+          flats: Lägenheter
           garage: Garage
           hospital: Sjukhusbyggnad
           hotel: Hotell
           house: Hus
+          industrial: Industribyggnad
           office: Kontorsbyggnad
           school: Skolbyggnad
           shop: Affär
+          stadium: Stadium
+          store: Affär
           terrace: Terass
+          tower: Torn
           train_station: Järnvägsstation
+          university: Universitetsbyggnad
         highway: 
           bridleway: Ridstig
           bus_stop: Busshållplats
@@ -482,6 +517,8 @@ sv:
           ford: Vadställe
           gate: Grind
           motorway: Motorväg
+          motorway_junction: Motorvägskorsning
+          path: Stig
           pedestrian: Gångväg
           platform: Perrong
           raceway: Tävlingsbana
@@ -500,6 +537,7 @@ sv:
           church: Kyrka
           house: Hus
           icon: Ikon
+          memorial: Minnesmärke
           mine: Gruva
           monument: Monument
           museum: Museum
@@ -511,12 +549,19 @@ sv:
           cemetery: Begravningsplats
           farm: Bondgård
           forest: Skog
+          grass: Gräs
           industrial: Industriområde
+          meadow: Äng
           military: Militärområde
           mine: Gruva
+          mountain: Berg
           park: Park
+          quarry: Stenbrott
+          railway: Järnväg
+          reservoir: Reservoar
           residential: Bostadsområde
           vineyard: Vingård
+          wood: Skog
         leisure: 
           beach_resort: Badort
           common: Allmänning
@@ -591,6 +636,7 @@ sv:
           postcode: Postnummer
           region: Region
           sea: Hav
+          state: Delstat
           subdivision: Underavdelning
           suburb: Förort
           town: Ort
@@ -619,26 +665,42 @@ sv:
           yard: Bangård
         shop: 
           bakery: Bageri
+          beauty: Skönhetssalong
           bicycle: Cykelaffär
           books: Bokhandel
           butcher: Slaktare
+          car: Bilhandlare
           car_dealer: Bilförsäljare
           car_parts: Bildelar
           car_repair: Bilverkstad
+          carpet: Mattaffär
+          charity: Välgörenhetsbutik
+          chemist: Apotek
+          clothes: Klädbutik
           computer: Datorbutik
           convenience: Närköp
+          cosmetics: Parfymeri
+          drugstore: Apotek
           dry_cleaning: Kemtvätt
+          electronics: Elektronikbutik
+          estate_agent: Egendomsmäklare
+          fashion: Modebutik
           florist: Blommor
           food: Mataffär
           funeral_directors: Begravningsbyrå
           furniture: Möbler
           gallery: Galleri
           gift: Presentaffär
+          grocery: Livsmedelsbutik
           hairdresser: Frisör
           insurance: Försäkring
           jewelry: Guldsmed
           kiosk: Kiosk
           mall: Köpcentrum
+          market: Marknad
+          motorcycle: Motorcykelhandlare
+          music: Musikaffär
+          newsagent: Tidningskiosk
           optician: Optiker
           pet: Djuraffär
           photo: Fotoaffär
@@ -647,6 +709,7 @@ sv:
           supermarket: Snabbköp
           toys: Leksaksaffär
           travel_agency: Resebyrå
+          video: Videobutik
         tourism: 
           alpine_hut: Fjällbod
           artwork: Konstverk
@@ -672,9 +735,15 @@ sv:
           boatyard: Båtvarv
           canal: Kanal
           dam: Damm
+          ditch: Dike
+          drain: Avlopp
           lock: Sluss
           lock_gate: Slussport
           mineral_spring: Mineralvattenskälla
+          mooring: Förtöjning
+          river: Älv
+          riverbank: Älvbank
+          stream: Ström
           waterfall: Vattenfall
           weir: Överfallsvärn
   javascripts: 
@@ -690,13 +759,20 @@ 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: 
+    copyright: Upphovsrätt & licens
+    documentation: Dokumentation
+    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
+    help_title: Hjälpsida för projektet
     history: Historik
     home: hem
     home_tooltip: Gå till hempositionen
@@ -707,7 +783,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,25 +796,25 @@ 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
     user_diaries: Användardagböcker
     user_diaries_tooltip: Visa användardagböcker
     view: Visa
-    view_tooltip: Visa kartorna
+    view_tooltip: Visa kartan
     welcome_user: Välkommen {{user_link}}
     welcome_user_link_tooltip: Din användarsida
+    wiki: Wiki
   license_page: 
     foreign: 
       english_link: det engelska originalet
+      title: Om denna översättning
     native: 
+      mapping_link: börja kartlägga
+      native_link: Svensk version
       title: Om denna sida
   message: 
     delete: 
@@ -768,10 +845,14 @@ 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
-      title: Ingen sådan användare eller meddelande
+      body: Tyvärr finns ingen användare med det namnet.
+      heading: Ingen sådan användare
+      title: Ingen sådan användare
     outbox: 
       date: Datum
       inbox: inbox
@@ -855,6 +936,7 @@ sv:
       allow_write_api: ändra kartan.
       allow_write_gpx: ladda upp GPS-spår.
       name: Namn
+      support_url: Support URL
     index: 
       issued_at: Utfärdad
       revoke: Återkalla!
@@ -863,6 +945,7 @@ sv:
     show: 
       allow_write_api: ändra kartan.
       allow_write_gpx: ladda upp GPS-spår.
+      edit: Redigera detaljer
   site: 
     edit: 
       flash_player_required: Du måste ha Flash för att kunna använda Potatch, OpenStreetMaps flasheditor. Du kan <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">ladda hem Flash Player från Adobe.com</a>. Det finns <a href="http://wiki.openstreetmap.org/wiki/Editing">flera andra editorer</a> tillgängliga för OpenStreetMap.
@@ -931,7 +1014,6 @@ sv:
           tunnel: Streckade kanter = tunnel
           unsurfaced: Oasfalterad väg
           wood: Vårdad skog
-        heading: Symbolförklaring för z{{zoom_level}}
     search: 
       search: Sök
       search_help: "exempel: 'Delsbo', 'Storgatan, Svedala', <a href='http://wiki.openstreetmap.org/wiki/Sv:Search'>Fler exempel..</a>"
@@ -1041,6 +1123,10 @@ sv:
       trackable: Spårbar (delas bara som anonyma ordnade punker med tidsstämpel)
   user: 
     account: 
+      contributor terms: 
+        agreed: Du har godkänt de nya bidragsgivarvillkoren.
+        link text: vad är detta?
+        not yet agreed: Du har ännu inte godkänt de nya bidragsgivarvillkoren.
       current email address: "Nuvarande E-postadress:"
       delete image: Ta bort nuvarande bild
       email never displayed publicly: (Visas aldrig offentligt)
@@ -1076,7 +1162,6 @@ sv:
       update home location on click: Uppdatera hemplatsen när jag klickar på kartan?
     confirm: 
       button: Bekräfta
-      failure: Ett användarkonto med denna nyckel (token) är redan bekräftat.
       heading: Bekräfta ett användarkonto.
       press confirm button: Klicka bekräftelseknappen nedan för att aktivera ditt konto.
       success: Ditt konto är bekräftat, tack för att du registrerade dig.
@@ -1086,24 +1171,40 @@ sv:
       heading: Bekräfta byte av e-postadress
       press confirm button: Klicka på bekräftaknappen nedan för att bekräfta din nya e-postadress.
       success: E-postadressen är bekräftad. Tack för att du registrerade dig!
+    confirm_resend: 
+      failure: Användaren {{name}} hittades inte.
     filter: 
       not_an_administrator: Du måste vara administratör för att få göra det.
     go_public: 
       flash success: Alla dina ändringar är nu publika, och du får lov att redigera.
     list: 
+      confirm: Bekräfta valda användare
+      empty: Inga användare hittades
+      heading: Användare
+      hide: Göm valda användare
+      showing: 
+        one: Visar sida {{page}} ({{first_item}} av {{items}})
+        other: Visar sida {{page}} ({{first_item}}-{{last_item}} av {{items}})
+      summary: "{{name}} skapades från {{ip_address}} den {{date}}"
       summary_no_ip: "{{name}} skapad {{date}}"
+      title: Användare
     login: 
-      account not active: Ditt konto är ännu inte aktivt.<br />Vänligen klicka länken i e-brevet med kontobekräftelsen för att aktivera ditt konto.
+      account not active: Ditt konto är inte aktivterat.<br />Vänligen klicka på länken i e-brevet med kontobekräftelsen för att aktivera ditt konto, eller <a href="{{reconfirm}}">begär ett nytt bekräftelsebrev</a>.
       auth failure: Kunde inte logga in med de uppgifterna.
+      create account minute: Skapa ett konto. Det tar bara en minut.
       create_account: skapa ett konto
       email or username: "E-postadress eller användarnamn:"
       heading: Inloggning
       login_button: Logga in
       lost password link: Glömt ditt lösenord?
+      new to osm: Ny på OpenStreetMap?
       password: "Lösenord:"
       please login: Logga in eller {{create_user_link}}
+      register now: Registrera dig nu
       remember: "Kom ihåg mig:"
       title: Logga in
+      to make changes: För att göra ändringar i OpenStreetMaps data måste du ha ett konto.
+      webmaster: webmaster
     logout: 
       heading: Logga ut från OpenStreetMap
       logout_button: Logga ut
@@ -1129,7 +1230,7 @@ sv:
       display name description: Ditt offentligt visade användarnamn. Du kan ändra detta senare i inställningarna.
       email address: "E-postadress:"
       fill_form: Fyll i formuläret så skickar vi ett e-brev för att aktivera ditt konto.
-      flash create success message: Användaren skapades framgångsrikt. Kontrollera din e-post för en bekräftelse, och du kommer att kunna börja kartlägga på nolltid :-) <br /><br /> Observera att du inte kommer att kunna logga in förrän du har fått och bekräftat din e-postadress. <br /><br /> Om du använder ett antispam-system som skickar iväg bekräftelsen, var då vänlig och vitlista webmaster@openstreetmap.org då vi inte kan svara på några bekräftelseförfrågningar.
+      flash create success message: Användaren skapades framgångsrikt. Kontrollera din e-post för en bekräftelse, och du kommer att kunna börja kartlägga på nolltid :-) <br /><br /> Om du använder ett antispam-system som skickar iväg bekräftelsen, var då vänlig och vitlista webmaster@openstreetmap.org då vi inte kan svara på några bekräftelseförfrågningar.
       heading: Skapa ett användarkonto
       license_agreement: När du bekräftar ditt konto måste du samtycka till <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">bidragsgivarvillkoren</a> .
       no_auto_account_create: Tyvärr kan vi för närvarande inte kan skapa ett konto åt dig automatiskt.
@@ -1163,6 +1264,8 @@ sv:
       webmaster: Webbmaster
     terms: 
       agree: Jag godkänner
+      consider_pd_why: vad är det här?
+      decline: Avslå
       legale_names: 
         france: Frankrike
         italy: Italien
@@ -1187,6 +1290,7 @@ sv:
       hide_user: dölj denna användare
       if set location: Om du sätter din position, så kommer en karta med lite funktioner att dyka upp här nedanför. Du kan sätta din hemposition på din {{settings_link}}-sida.
       km away: "{{count}}km bort"
+      latest edit: "Senaste redigering {{ago}}:"
       m away: "{{count}}m bort"
       mapper since: "Karterar sedan:"
       moderator_history: visa tilldelade blockeringar
@@ -1220,6 +1324,8 @@ sv:
     create: 
       flash: Skapat en blockering av användare {{name}}.
       try_contacting: Försök att kontakta användarenoch ge användaren tid att svara innan du blockerar .
+    not_found: 
+      back: Tillbaka till index
     partial: 
       confirm: Är du säker?
       creator_name: Skapare

config/locales/uk.yml

@@ -1,8 +1,9 @@
 # Messages for Ukrainian (Українська)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: AS
 # Author: Andygol
+# Author: Arturyatsko
 # Author: KEL
 # Author: Prima klasy4na
 # Author: Yurkoy
@@ -246,8 +247,8 @@ uk:
       way_title: "Ліня: {{way_name}}"
     way_details: 
       also_part_of: 
-        one: також є частиною шляху {{related_ways}}
-        other: також є частиною шляхів {{related_ways}}
+        one: також є частиною лінії {{related_ways}}
+        other: також є частиною ліній {{related_ways}}
       nodes: "Точки:"
       part_of: "Частина з:"
     way_history: 
@@ -358,6 +359,17 @@ uk:
       save_button: Зберегти
       title: Щоденник користувача {{user}} | {{title}}
       user_title: Щоденник користувача {{user}}
+  editor: 
+    default: Типовий (зараз {{name}})
+    potlatch: 
+      description: Потлач 1 (редактор в оглядачі)
+      name: Потлач 1
+    potlatch2: 
+      description: Потлач 2 (редактор в оглядачі)
+      name: Потлач 2
+    remote: 
+      description: Дистанційне керування (JOSM або Merkaartor)
+      name: Дистанційне керування
   export: 
     start: 
       add_marker: Додати маркер на мапу
@@ -558,7 +570,6 @@ uk:
           tower: Башта
           train_station: Залізнична станція
           university: Університет
-          "yes": Будівля
         highway: 
           bridleway: Дорога для їзди верхи
           bus_guideway: Рейковий автобус
@@ -881,16 +892,23 @@ uk:
       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: додому
@@ -918,12 +936,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: Вільна Вікі-мапа Світу
@@ -1168,8 +1182,10 @@ uk:
     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/wiki/Uk:Editing">інші можливості</a> для правки в OpenStreetMap.
+      no_iframe_support: Ваш оглядач не підтримує фрейми HTML, які необхідні для цієї функції.
       not_public: Ви не зробили свої правки загальнодоступними.
       not_public_description: "Ви не можете більше анонімно редагувати мапу. Ви можете зробити ваші редагування загальнодоступними тут: {{user_page}}."
+      potlatch2_unsaved_changes: Ви маєте незбережені зміни. (Для збереження в Потлач 2, ви повинні натиснути Зберегти.)
       potlatch_unsaved_changes: Є незбережені зміни. (Для збереження в Potlatch зніміть виділення з колії або точки, якщо редагуєте «вживу», або натисніть кнопку «зберегти», якщо ви в режимі відкладеного збереження.)
       user_page_link: сторінка користувача
     index: 
@@ -1181,10 +1197,11 @@ uk:
         notice: Ліцензовано на умовах {{license_name}} проектом  {{project_name}} та його користувачами.
         project_name: OpenStreetMap
       permalink: Постійне посилання
+      remote_failed: Редагування не вдалося — переконайтеся, що JOSM або Merkaartor завантажений та втулок дистанційного керування увімкнений.
       shortlink: Коротке посилання
     key: 
       map_key: Умовні знаки
-      map_key_tooltip: Умовні позначення для рендерінгу mapnik на цьому рівні масштабування
+      map_key_tooltip: Легенда для карти
       table: 
         entry: 
           admin: Адміністративна межа
@@ -1251,7 +1268,6 @@ uk:
           unclassified: Дорога без класифікації
           unsurfaced: Дорога без покриття
           wood: Гай
-        heading: Умовні позначення для М:{{zoom_level}}
     search: 
       search: Пошук
       search_help: "наприклад: 'Кобеляки', 'Regent Street, Cambridge', 'CB2 5AQ', чи 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>ще приклади…</a>"
@@ -1390,6 +1406,7 @@ uk:
       new email address: "Нова адреса електронної пошти:"
       new image: Додати зображення
       no home location: Ви не позначили своє основне місце розташування.
+      preferred editor: "Редактор:"
       preferred languages: "Бажані мови:"
       profile description: "Опис профілю:"
       public editing: 
@@ -1408,17 +1425,23 @@ uk:
       title: Правка облікового запису
       update home location on click: Оновлювати моє місце розташування, коли я клацаю на мапу?
     confirm: 
+      already active: Цей обліковий запис вже підтверджений.
+      before you start: Ми знаємо, Ви, ймовірно, хочете якнайшвидше почати картографування, але, перш ніж ви почнете, не хотіли б Ви заповнити деякі додаткові відомості про себе у формі нижче.
       button: Підтвердити
-      failure: Обліковий запис користувача з таким кодом підтвердження був активований раніше.
       heading: Підтвердити обліковий запис користувача
       press confirm button: Натисніть на кнопку підтвердження нижче, щоб активувати ваш профіль.
+      reconfirm: Якщо пройшло достатньо часу з моменту Вашої реєстрації, Вам,  можливо, необхідно <a href="{{reconfirm}}">відправити собі нове підтвердження по електронній пошті</a> .
       success: Ваш обліковий запис підтверджено, дякуємо за реєстрацію!
+      unknown token: Цей маркер, здається, не існує.
     confirm_email: 
       button: Підтвердити
       failure: Електронна адреса вже була підтверджена цим посиланням.
       heading: Підтвердить зміну адреси електронної пошти
       press confirm button: Натисніть кнопку підтвердження нижче, щоб підтвердити вашу нову адресу електронної пошти.
       success: Адресу вашої електронної пошти підтверджено, дякуємо за реєстрацію!
+    confirm_resend: 
+      failure: Користувача {{name}} не знайдено.
+      success: Користувача успішно зареєстровано. Перевірте вашу електрону пошту ({{email}}) на наявність листа з підтвердженням, натисніть на посилання в ньому та можете негайно починати редагувати мапу :-).<br /><br /> Зауважте, що ви не зможете увійти, доки ви не підтвердите адресу вашої електронної пошти. <br /><br />Якщо ви користуєтесь системою анти-спаму, що надсилає запити на підтвердження, внесіть до «білого» списку адресу webmaster@openstreetmap.org, так як ми не в змозі відповідати на такі запити.
     filter: 
       not_an_administrator: Тільки адміністратор може виконати цю дію.
     go_public: 
@@ -1436,19 +1459,24 @@ uk:
       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
@@ -1475,7 +1503,7 @@ uk:
       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 /> Зауважте, що ви не зможете увійти, доки ви не підтвердите адресу вашої електронної пошти. <br /><br />Якщо ви користуєтесь системою анти-спаму, що надсилає запити на підтвердження, внесіть до «білого» списку адресу webmaster@openstreetmap.org, так як ми не в змозі відповідати на такі запити.
       heading: Створення облікового запису користувача
       license_agreement: Створюючи обліковий запис ви погоджуєтесь з тим, що всі дані, які надсилаються до Openstreetmap ліцензуються на умовах <a href="http://creativecommons.org/licenses/by-sa/2.0/">ліцензії Creative Commons (by-sa)</a>.
       no_auto_account_create: На жаль, ми в даний час не в змозі створити для вас обліковий запис автоматично.
@@ -1542,6 +1570,7 @@ uk:
       hide_user: приховати цього користувача
       if set location: Якщо ви вкажете своє місце розташування, мапа і додаткові інструменти з'являться нижче. Ви можете встановити ваше місце розташування на вашій сторінці {{settings_link}}.
       km away: "{{count}} км від вас"
+      latest edit: "Остання правка {{ago}}:"
       m away: "{{count}} м від вас"
       mapper since: "Зареєстрований:"
       moderator_history: створені блокування

config/locales/vi.yml

@@ -1,6 +1,6 @@
 # Messages for Vietnamese (Tiếng Việt)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Minh Nguyen
 # Author: Ninomax
 vi: 
@@ -77,6 +77,7 @@ vi:
       cookies_needed: Hình như đã tắt cookie. Xin hãy bật lên chức năng cookie trong trình duyệt để tiếp tục.
     setup_user_auth: 
       blocked: Bạn bị chặn không được truy cập qua API. Vui lòng đăng nhập vào giao diện Web để biết chi tiết.
+      need_to_see_terms: Bạn tạm không có quyền truy cập API. Xin vui lòng đăng nhập giao diện Web để đọc các Điều khoản Đóng góp. Bạn không cần phải chấp nhận các điều khoản nhưng ít nhất phải đọc chúng.
   browse: 
     changeset: 
       changeset: "Bộ thay đổi: {{id}}"
@@ -120,7 +121,7 @@ vi:
         node: Xem nốt trên bản đồ rộng hơn
         relation: Xem quan hệ trên bản đồ rộng hơn
         way: Xem lối trên bản đồ rộng hơn
-      loading: Đang tải...
+      loading: Đang tải…
     navigation: 
       all: 
         next_changeset_tooltip: Bộ thay đổi sau
@@ -191,10 +192,11 @@ vi:
       details: Chi tiết
       drag_a_box: Kéo hộp trên bản đồ để chọn vùng
       edited_by_user_at_timestamp: Được sửa đổi bởi [[user]] lúc [[timestamp]]
+      hide_areas: Ẩn các khu vực
       history_for_feature: Lịch sử [[feature]]
       load_data: Tải Dữ liệu
       loaded_an_area_with_num_features: "Bạn đã tải vùng chứa [[num_features]] nét. Một số trình duyệt không hiển thị nổi nhiều dữ liệu như thế. Nói chung, trình duyệt hoạt động tốt khi nào chỉ có 100 nét cùng lúc: hơn thì trình duyệt sẽ chậm chạp. Nếu bạn chắc chắn muốn xem dữ liệu này, hãy bấm nút ở dưới."
-      loading: Đang tải...
+      loading: Đang tải…
       manually_select: Chọn vùng khác thủ công
       object_list: 
         api: Lấy vùng này dùng API
@@ -213,6 +215,7 @@ vi:
           node: Nốt
           way: Lối
       private_user: người bí mật
+      show_areas: Hiện các khu vực
       show_history: Xem Lịch sử
       unable_to_load_size: "Không thể tải: Hộp bao với cỡ [[bbox_size]] quá lớn (phải nhỏ hơn {{max_bbox_size}})"
       wait: Xin chờ...
@@ -350,6 +353,17 @@ vi:
       save_button: Lưu
       title: Nhật ký của {{user}} | {{title}}
       user_title: Nhật ký của {{user}}
+  editor: 
+    default: Mặc định (hiện là {{name}})
+    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 đồ
@@ -436,6 +450,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ê
@@ -444,6 +459,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
@@ -472,7 +488,9 @@ vi:
           library: Thư viện
           market: Chợ
           marketplace: Chợ phiên
+          mountain_rescue: Đội Cứu nạn Núi
           nursery: Nhà trẻ
+          nursing_home: Viện Dưỡng lão
           office: Văn phòng
           park: Công viên
           parking: Chỗ Đậu xe
@@ -484,6 +502,7 @@ vi:
           preschool: Trường Mầm non
           prison: Nhà tù
           pub: Quán rượu
+          public_building: Tòa nhà Công cộng
           public_market: Chợ phiên
           restaurant: Nhà hàng
           retirement_home: Nhà về hưu
@@ -499,6 +518,7 @@ vi:
           townhall: Thị sảnh
           university: Trường Đại học
           vending_machine: Máy Bán hàng
+          village_hall: Trụ sở Làng
           waste_basket: Thùng rác
           wifi: Điểm Truy cập Không dây
           youth_centre: Trung tâm Thanh niên
@@ -517,15 +537,17 @@ 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à ở
+          retail: Tòa nhà Cửa hàng
           school: Nhà trường
           shop: Tiệm
           stadium: Sân vận động
           store: Tiệm
+          terrace: Thềm
           tower: Tháp
           train_station: Nhà ga
           university: Tòa nhà Đại học
-          "yes": Tòa nhà
         highway: 
           bridleway: Đường Cưỡi ngựa
           bus_guideway: Làn đường Dẫn Xe buýt
@@ -535,6 +557,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ỏ
@@ -580,6 +603,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
@@ -613,6 +637,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
@@ -624,9 +649,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
@@ -637,6 +664,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
@@ -646,12 +674,15 @@ 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 Đá
+          scrub: Đất Bụi rậm
           spring: Suối
           strait: Eo biển
           tree: Cây
@@ -685,24 +716,34 @@ vi:
           unincorporated_area: Khu Chưa Hợp nhất
           village: Làng
         railway: 
+          abandoned: Đường sắt bị Bỏ rơi
           construction: Đường sắt Đang Xây
+          disused: Đường sắt Ngừng hoạt động
           disused_station: Nhà ga Đóng cửa
           funicular: Đường sắt Leo núi
+          halt: Ga Xép
           historic_station: Nhà ga Lịch sử
           junction: Ga Đầu mối
+          level_crossing: Điểm giao Đường sắt
           light_rail: Đường sắt nhẹ
           monorail: Đường Một Ray
+          preserved: Đường sắt được Bảo tồn
+          spur: Đường sắt Phụ
           station: Nhà ga
           subway: Trạm Xe điện Ngầm
           subway_entrance: Cửa vào Nhà ga Xe điện ngầm
           tram: Đường Xe điện
+          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
           car: Tiệm Xe hơi
           car_dealer: Cửa hàng Xe hơi
+          car_parts: Phụ tùng Xe hơi
           car_repair: Tiệm Sửa Xe
           carpet: Tiệm Thảm
           chemist: Nhà thuốc
@@ -711,6 +752,7 @@ vi:
           confectionery: Tiệm Kẹo
           convenience: Tiệm Tập hóa
           cosmetics: Tiệm Mỹ phẩm
+          department_store: Cửa hàng Bách hóa
           doityourself: Tiệm Ngũ kim
           drugstore: Nhà thuốc
           dry_cleaning: Hấp tẩy
@@ -720,6 +762,8 @@ vi:
           florist: Tiệm Hoa
           food: Tiệm Thực phẩm
           funeral_directors: Nhà tang lễ
+          furniture: Tiệm Đồ đạc
+          general: Tiệm Đồ
           grocery: Tiệm Tạp phẩm
           hairdresser: Tiệm Làm tóc
           hardware: Tiệm Ngũ kim
@@ -734,6 +778,7 @@ vi:
           newsagent: Tiệm Báo
           optician: Tiệm Kính mắt
           organic: Tiệm Thực phẩm Hữu cơ
+          pet: Tiệm Vật nuôi
           photo: Tiệm Rửa Hình
           salon: Tiệm Làm tóc
           shoes: Tiệm Giày
@@ -751,6 +796,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
@@ -765,12 +811,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: 
@@ -788,16 +840,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 & 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à
@@ -824,15 +883,11 @@ 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
+    sotm2011: Mời tham dự Hội nghị OpenStreetMap 2011, Tình trạng Bản đồ, 9–11 tháng 9 tại Denver!
     tag_line: Bản đồ Wiki của Thế giới Mở
     user_diaries: Nhật ký Cá nhân
     user_diaries_tooltip: Đọc các nhật ký cá nhân
@@ -842,6 +897,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
@@ -1076,8 +1132,11 @@ vi:
     edit: 
       anon_edits_link_text: Tại sao vậy?
       flash_player_required: Bạn cần có Flash Player để sử dụng Potlatch, trình vẽ OpenStreetMap bằng Flash. Bạn có thể <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">tải xuống Flash Player từ Adobe.com</a>. Cũng có sẵn <a href="http://wiki.openstreetmap.org/wiki/Editing?uselang=vi">vài cách khác</a> để sửa đổi OpenStreetMap.
+      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_not_configured: Potlatch 2 chưa được thiết lập. Xem thêm chi tiết tại http://wiki.openstreetmap.org/wiki/The_Rails_Port?uselang=vi#Potlatch_2
+      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: 
@@ -1085,14 +1144,15 @@ vi:
       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.
       license: 
-        license_name: Creative Commons Attribution-Share Alike 2.0
+        license_name: Creative Commons Ghi công–Chia sẻ tương tự 2.0
         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
-      map_key_tooltip: Chú giải kiểu bản đồ Mapnik tại mức thu phóng này
+      map_key_tooltip: Chú giải bản đồ
       table: 
         entry: 
           admin: Biên giới hành chính
@@ -1159,7 +1219,6 @@ vi:
           unclassified: Đường không phân loại
           unsurfaced: Đường không lát
           wood: Rừng
-        heading: Chú giải tại mức {{zoom_level}}
     search: 
       search: Tìm kiếm
       search_help: "thí dụ: \"Alkmaar\", \"Regent Street, Cambridge\", \"CB2 5AQ\", hoặc \"post offices near Lünen\" - <a href=\"http://wiki.openstreetmap.org/wiki/Search?uselang=vi\">thêm thí dụ...</a>"
@@ -1300,6 +1359,7 @@ vi:
       new email address: "Địa chỉ Thư điện tử Mới:"
       new image: Thêm hình
       no home location: Bạn chưa định vị trí nhà.
+      preferred editor: "Trình vẽ Ưa thích:"
       preferred languages: "Ngôn ngữ Ưu tiên:"
       profile description: "Tự giới thiệu:"
       public editing: 
@@ -1318,17 +1378,23 @@ vi:
       title: Chỉnh sửa tài khoản
       update home location on click: Cập nhật vị trí nhà khi tôi nhấn chuột vào bản đồ?
     confirm: 
+      already active: Tài khoản này đã được xác nhận rồi.
+      before you start: Có lẽ bạn muốn vội vàng bắt đầu vẽ bản đồ, nhưng trước tiên xin vui lòng tự giới thiệu về bạn trong biểu mẫu ở dưới.
       button: Xác nhận
-      failure: Tài khoản với dấu hiệu này đã được xác nhận.
       heading: Xác nhận tài khoản người dùng
       press confirm button: Bấm nút Xác nhận ở dưới để xác nhận tài khoản.
+      reconfirm: Nếu mở tài khoản lâu rồi có thể cần <a href="{{reconfirm}}">gửi mình một thư xác nhận mới</a>.
       success: Đã xác nhận tài khoản của bạn. Cám ơn bạn đã đăng ký!
+      unknown token: Hình như dấu hiệu đó không tồn tại.
     confirm_email: 
       button: Xác nhận
       failure: Một địa chỉ thư điện tử đã được xác nhận dùng dấu hiệu này.
       heading: Xác nhận thay đổi địa chỉ thư điện tử
       press confirm button: Bấm nút Xác nhận ở dưới để xác nhận địa chỉ thư điện tử mới.
       success: Đã xác nhận địa chỉ thư điện tử mới. Cám ơn bạn đã đăng ký!
+    confirm_resend: 
+      failure: Không tìm thấy người dùng {{name}}.
+      success: Chúng tôi đã gửi thư xác nhận đến {{email}}; ngay khi xác nhận tài khoản, bạn sẽ có thể vẽ bản đồ.<br /><br />Nếu hộp thư của bạn gửi thư yêu cầu xác nhận để chống thư rác, xin chắc chắn thêm webmaster@openstreetmap.org vào danh sách trắng, vì chúng tôi không thể trả lời những yêu cầu xác nhận này.
     filter: 
       not_an_administrator: Chỉ các quản lý viên có quyền thực hiện tác vụ đó.
     go_public: 
@@ -1345,19 +1411,24 @@ vi:
       summary_no_ip: "{{name}} mở ngày {{date}}"
       title: Người dùng
     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.
+      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
@@ -1384,7 +1455,7 @@ vi:
       display name description: Tên đăng ký của bạn được hiển thị công khai. Bạn có thể thay đổi tên này về sau trong tùy chọn.
       email address: "Địa chỉ Thư điện tử:"
       fill_form: Điền biểu mẫu rồi chúng tôi sẽ gửi thư điện tử cho bạn để kích hoạt tài khoản.
-      flash create success message: Tài khoản người dùng được tạo ra thành công. Kiểm tra hộp thư điện tử cho thư xác nhận để bắt đầu vẽ bản đồ ngay lập tức. :-)<br /><br />Xin lưu ý rằng bạn cần phải nhận thư xác nhận và xác nhận địa chỉ thư điện tử trước khi có thể đăng nhập.<br /><br />Nếu hệ thống thư điện tử của bạn có tính năng chống spam bằng cách yêu cầu xác nhận lại, xin hãy chắc chắn thêm webmaster@openstreetmap.org vào danh sách trắng, tại vì chúng tôi không thể trả lời những yêu cầu xác nhận này.
+      flash create success message: Cám ơn bạn đã đăng ký. Chúng tôi đã gửi thư xác nhận đến {{email}}; ngay khi xác nhận tài khoản, bạn sẽ có thể vẽ bản đồ.<br /><br />Nếu hộp thư của bạn gửi thư yêu cầu xác nhận để chống thư rác, xin chắc chắn thêm webmaster@openstreetmap.org vào danh sách trắng, vì chúng tôi không thể trả lời những yêu cầu xác nhận này.
       heading: Mở Tài khoản Người dùng
       license_agreement: Lúc khi xác nhận tài khoản, bạn sẽ phải chấp nhận <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms?uselang=vi">các Điều kiện Đóng góp</a>.
       no_auto_account_create: Rất tiếc, chúng ta hiện không có khả năng tạo ra tài khoản tự động cho bạn.
@@ -1451,6 +1522,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
@@ -1462,7 +1534,7 @@ vi:
       new diary entry: mục nhật ký mới
       no friends: Bạn chưa thêm người bạn.
       no nearby users: Không có người dùng nào nhận rằng họ ở gần.
-      oauth settings: Thiết lập OAuth
+      oauth settings: thiết lập OAuth
       remove as friend: dời người bạn
       role: 
         administrator: Người dùng này là quản lý viên

config/locales/zh-TW.yml

@@ -1,6 +1,7 @@
 # Messages for Chinese (Taiwan) (‪中文(台灣)‬)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
+# 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: 版權 & 授權條款
+    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: 圖例
@@ -791,7 +803,6 @@ zh-TW:
           unclassified: 未分類道路
           unsurfaced: 無鋪面道路
           wood: 樹木
-        heading: z{{zoom_level}} 的圖例
     search: 
       search: 搜尋
       search_help: 範例： 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', 或 'post offices near L羹nen' <a href='http://wiki.openstreetmap.org/wiki/Search'>更多範例...</a>
@@ -906,6 +917,8 @@ zh-TW:
       trackable: 可追蹤 (以匿名方式分享，節點有時間戳記)
   user: 
     account: 
+      contributor terms: 
+        link text: 這是什麼？
       current email address: 目前的電子郵件位址：
       delete image: 移除目前的圖片
       email never displayed publicly: (永遠不公開顯示)
@@ -941,7 +954,6 @@ zh-TW:
       update home location on click: 當我點選地圖時更新家的位置？
     confirm: 
       button: 確認
-      failure: 具有此記號的使用者帳號已經確認過了。
       heading: 確認使用者帳號
       press confirm button: 按下確認按鈕以啟用您的帳號。
       success: 已確認您的帳號，感謝您的註冊！
@@ -951,6 +963,8 @@ zh-TW:
       heading: 確認電子郵件位址的變更
       press confirm button: 按下確認按鈕以確認您的新電子郵件位址。
       success: 已確認您的電子郵件位址，感謝您的註冊！
+    confirm_resend: 
+      failure: 找不到使用者 {{name}}。
     filter: 
       not_an_administrator: 您需要一個管理者來執行該動作。
     go_public: 
@@ -967,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 登出
@@ -1005,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}} 的使用者。請檢查您的拼字，或者可能是按到錯誤的連結。
@@ -1065,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: 檢視阻擋來自

config/potlatch/locales/af.yml

@@ -1,6 +1,6 @@
 # Messages for Afrikaans (Afrikaans)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: BdgwksxD
 # Author: Naudefj
 af: 
@@ -38,12 +38,14 @@ af:
   hint_saving_loading: laai/stoor data
   inspector: Inspekteur
   inspector_locked: Op slot
+  inspector_node_count: ($1 keer)
   inspector_uploading: (besig om op te laai)
   inspector_way_connects_to_principal: Verbind $1 $2 en $3 andere $4
   login_pwd: "Wagwoord:"
   login_title: Kon nie aanteken nie
   login_uid: "Gebruikersnaam:"
   more: Meer
+  "no": Nee
   nobackground: Geen agtergrond
   offset_motorway: Snelweg (D3)
   ok: Ok
@@ -55,6 +57,7 @@ af:
   preset_icon_bus_stop: Bushalte
   preset_icon_cafe: Kafee
   preset_icon_cinema: Bioskoop
+  preset_icon_ferry_terminal: Veerboot
   preset_icon_fire_station: Brandweerstasie
   preset_icon_hospital: Hospitaal
   preset_icon_hotel: Hotel
@@ -74,10 +77,13 @@ af:
   prompt_helpavailable: Nuwe gebruiker? Kyk links onder vir hulp.
   prompt_welcome: Welkom by OpenStreetMap!
   retry: Probeer weer
+  revert: Rol terug
   save: Stoor
   tip_addtag: Voeg 'n nuwe etiket by
   tip_alert: "'n Fout het voorgekom - kliek vir meer besonderhede"
   tip_options: Opsies (kies die kaart agtergrond)
   tip_photo: Laai foto's
   uploading: Besig met oplaai...
+  warning: Waarskuwing!
   way: Weg
+  "yes": Ja

config/potlatch/locales/aln.yml

@@ -1,6 +1,6 @@
 # Messages for Gheg Albanian (Gegë)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
 # Author: Mdupont
 aln: 
   a_poi: $1 POI