Merge branch 'master' into openid

Conflicts:
	app/controllers/user_controller.rb
	app/views/user/login.html.erb
	config/locales/en.yml

.gitignore

@@ -0,0 +1,2 @@
+log
+tmp

app/controllers/browse_controller.rb

@@ -86,11 +86,11 @@ private
     end
   rescue ActionView::TemplateError => ex
     if ex.original_exception.is_a?(Timeout::Error)
-      render :action => "timeout", :status => :request_timeout
+      render :action => "timeout"
     else
       raise
     end
   rescue Timeout::Error
-    render :action => "timeout", :status => :request_timeout
+    render :action => "timeout"
   end
 end

app/controllers/geocoder_controller.rb

@@ -357,8 +357,8 @@ class GeocoderController < ApplicationController
     response = fetch_xml("http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{request.user_preferred_languages.join(',')}")
 
     # parse the response
-    response.elements.each("reversegeocode") do |result|
+    response.elements.each("reversegeocode/result") do |result|
-      description = result.get_text("result").to_s
+      description = result.get_text.to_s
 
       @results.push({:prefix => "#{description}"})
     end

app/controllers/message_controller.rb

@@ -47,25 +47,38 @@ class MessageController < ApplicationController
 
   # Allow the user to reply to another message.
   def reply
-    message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ])
+    message = Message.find(params[:message_id])
-    @body = "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}" 
+
-    @title = @subject = "Re: #{message.title.sub(/^Re:\s*/, '')}"
+    if message.to_user_id == @user.id then
-    @to_user = User.find(message.from_user_id)
+      @body = "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}" 
-    render :action => 'new'
+      @title = @subject = "Re: #{message.title.sub(/^Re:\s*/, '')}"
+      @to_user = User.find(message.from_user_id)
+
+      render :action => 'new'
+    else
+      flash[:notice] = t 'message.reply.wrong_user', :user => @user.display_name
+      redirect_to :controller => "user", :action => "login", :referer => request.request_uri
+    end
   rescue ActiveRecord::RecordNotFound
-    @title = t'message.no_such_user.title'
+    @title = t'message.no_such_message.title'
-    render :action => 'no_such_user', :status => :not_found
+    render :action => 'no_such_message', :status => :not_found
   end
 
   # Show a message
   def read
     @title = t 'message.read.title'
-    @message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ])
+    @message = Message.find(params[:message_id])
-    @message.message_read = true if @message.to_user_id == @user.id
+
-    @message.save
+    if @message.to_user_id == @user.id or @message.from_user_id == @user.id then
+      @message.message_read = true if @message.to_user_id == @user.id
+      @message.save
+    else
+      flash[:notice] = t 'message.read.wrong_user', :user => @user.display_name
+      redirect_to :controller => "user", :action => "login", :referer => request.request_uri
+    end
   rescue ActiveRecord::RecordNotFound
-    @title = t'message.no_such_user.title'
+    @title = t'message.no_such_message.title'
-    render :action => 'no_such_user', :status => :not_found
+    render :action => 'no_such_message', :status => :not_found
   end
 
   # Display the list of messages that have been sent to the user.
@@ -90,7 +103,7 @@ class MessageController < ApplicationController
   def mark
     if params[:message_id]
       id = params[:message_id]
-      message = Message.find_by_id(id)
+      message = Message.find_by_id(id, :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id])
       if params[:mark] == 'unread'
         message_read = false 
         notice = t 'message.mark.as_unread'
@@ -102,6 +115,7 @@ class MessageController < ApplicationController
       if message.save
         if request.xhr?
           render :update do |page|
+            page.replace "inboxanchor", :partial => "layouts/inbox"
             page.replace "inbox-count", :partial => "message_count"
             page.replace "inbox-#{message.id}", :partial => "message_summary", :object => message
           end
@@ -112,15 +126,15 @@ class MessageController < ApplicationController
       end
     end
   rescue ActiveRecord::RecordNotFound
-    @title = t'message.no_such_user.title'
+    @title = t'message.no_such_message.title'
-    render :action => 'no_such_user', :status => :not_found
+    render :action => 'no_such_message', :status => :not_found
   end
 
   # Delete the message.
   def delete
     if params[:message_id]
       id = params[:message_id]
-      message = Message.find_by_id(id)
+      message = Message.find_by_id(id, :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id])
       message.from_user_visible = false if message.sender == @user
       message.to_user_visible = false if message.recipient == @user
       if message.save
@@ -134,7 +148,7 @@ class MessageController < ApplicationController
       end
     end
   rescue ActiveRecord::RecordNotFound
-    @title = t'message.no_such_user.title'
+    @title = t'message.no_such_message.title'
-    render :action => 'no_such_user', :status => :not_found
+    render :action => 'no_such_message', :status => :not_found
   end
 end

app/controllers/user_controller.rb

@@ -253,6 +253,8 @@ if (!params[:user][:openid_url].nil? and params[:user][:openid_url].length > 0)
            end
       end
     end
+
+    user
   end
 
   def go_public
@@ -310,8 +312,8 @@ if (!params[:user][:openid_url].nil? and params[:user][:openid_url].length > 0)
   def new
     @title = t 'user.new.title'
 
-    # The user is logged in already, so don't show them the signup page, instead
+    # The user is logged in already, so don't show them the signup
-    # send them to the home page
+    # page, instead send them to the home page
     redirect_to :controller => 'site', :action => 'index' if session[:user]
 
 	@nickname = params['nickname']
@@ -320,66 +322,64 @@ if (!params[:user][:openid_url].nil? and params[:user][:openid_url].length > 0)
   end
 
   def login
+    @title = t 'user.login.title'
 
-	#The redirect from the OpenID provider reenters here again
+    #The redirect from the OpenID provider reenters here again
     #and we need to pass the parameters through to the 
     # open_id_authentication function
     if params[:open_id_complete]
-      open_id_authentication('')
+      user = open_id_authentication('')
-    end
+    elsif params[:user]
-
+      if !params[:user][:openid_url].nil? and !params[:user][:openid_url].empty?
-    if params[:user] and session[:user].nil?
+        session[:remember] = params[:remember_me]
-	  if !params[:user][:openid_url].nil? and !params[:user][:openid_url].empty?
+        user = open_id_authentication(params[:user][:openid_url])
-		session[:remember] = params[:remember_me]
-        open_id_authentication(params[:user][:openid_url])
       else
-		email_or_display_name = params[:user][:email]
+        email_or_display_name = params[:user][:email]
-		pass = params[:user][:password]
+        pass = params[:user][:password]
-		user = User.authenticate(:username => email_or_display_name, :password => pass)
+
-		if user
+        if user = User.authenticate(:username => email_or_display_name, :password => pass)
-		  session[:user] = user.id
+          session[:user] = user.id
-		  session_expires_after 1.month if params[:remember_me]
+          session_expires_after 1.month if params[:remember_me]
-		elsif User.authenticate(:username => email_or_display_name, :password => pass, :inactive => true)
+        elsif User.authenticate(:username => email_or_display_name, :password => pass, :inactive => true)
-		  flash.now[:error] = t 'user.login.account not active'
+          flash.now[:error] = t 'user.login.account not active'
-		else
+        else
-		  flash.now[:error] = t 'user.login.auth failure'
+          flash.now[:error] = t 'user.login.auth failure'
-		end
+        end
-	  end
+      end
     end
 
-    if session[:user]
+    if user
-      # The user is logged in, if the referer param exists, redirect them to that
+      # The user is logged in, if the referer param exists, redirect
-      # unless they've also got a block on them, in which case redirect them to
+      # them to that unless they've also got a block on them, in
-      # the block so they can clear it.
+      # which case redirect them to the block so they can clear it.
-      user = User.find(session[:user])
+      if user.blocked_on_view
-      block = user.blocked_on_view
+        redirect_to user.blocked_on_view, :referrer => params[:referrer]
-      if block
-        redirect_to block, :referrer => params[:referrer]
       elsif params[:referer]
         redirect_to params[:referer]
       else
         redirect_to :controller => 'site', :action => 'index'
       end
-      return
     end
-
-    @title = t 'user.login.title'
   end
 
   def logout
-    if session[:token]
+    @title = t 'user.logout.title'
-      token = UserToken.find_by_token(session[:token])
+
-      if token
+    if params[:session] == request.session_options[:id]
-        token.destroy
+      if session[:token]
+        token = UserToken.find_by_token(session[:token])
+        if token
+          token.destroy
+        end
+        session[:token] = nil
+      end
+      session[:user] = nil
+      session_expires_automatically
+      if params[:referer]
+        redirect_to params[:referer]
+      else
+        redirect_to :controller => 'site', :action => 'index'
       end
-      session[:token] = nil
-    end
-    session[:user] = nil
-    session_expires_automatically
-    if params[:referer]
-      redirect_to params[:referer]
-    else
-      redirect_to :controller => 'site', :action => 'index'
     end
   end
 
@@ -468,7 +468,11 @@ if (!params[:user][:openid_url].nil? and params[:user][:openid_url].length > 0)
         flash[:warning] = t 'user.make_friend.already_a_friend', :name => name
       end
 
-      redirect_to :controller => 'user', :action => 'view'
+      if params[:referer]
+        redirect_to params[:referer]
+      else
+        redirect_to :controller => 'user', :action => 'view'
+      end
     end
   end
 
@@ -483,7 +487,11 @@ if (!params[:user][:openid_url].nil? and params[:user][:openid_url].length > 0)
         flash[:error] = t 'user.remove_friend.not_a_friend', :name => friend.display_name
       end
 
-      redirect_to :controller => 'user', :action => 'view'
+      if params[:referer]
+        redirect_to params[:referer]
+      else
+        redirect_to :controller => 'user', :action => 'view'
+      end
     end
   end
 

app/helpers/application_helper.rb

@@ -1,4 +1,10 @@
 module ApplicationHelper
+  require 'rexml/document'
+
+  def sanitize(text)
+    Sanitize.clean(text, Sanitize::Config::OSM)
+  end
+
   def htmlize(text)
     return linkify(sanitize(simple_format(text)))
   end
@@ -34,6 +40,39 @@ module ApplicationHelper
     return js
   end
 
+  def describe_location(lat, lon, zoom = nil, language = nil)
+    zoom = zoom || 14
+    language = language || request.user_preferred_languages.join(',')
+    url = "http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}"
+    response = REXML::Document.new(Net::HTTP.get(URI.parse(url)))
+
+    if result = response.get_text("reversegeocode/result")
+      result.to_s
+    else
+      "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}"
+    end
+  end
+
+  def user_image(user, options = {})
+    options[:class] ||= "user_image"
+
+    if user.image
+      image_tag url_for_file_column(user, "image"), options
+    else
+      image_tag "anon_large.png", options
+    end
+  end
+
+  def user_thumbnail(user, options = {})
+    options[:class] ||= "user_thumbnail"
+
+    if user.image
+      image_tag url_for_file_column(user, "image"), options
+    else
+      image_tag "anon_small.png", options
+    end
+  end
+
 private
 
   def javascript_strings_for_key(key)

app/models/diary_sweeper.rb

@@ -30,5 +30,9 @@ private
     expire_action(:controller => 'diary_entry', :action => 'rss', :language => nil, :display_name => nil)
     expire_action(:controller => 'diary_entry', :action => 'rss', :language => entry.language_code, :display_name => nil)
     expire_action(:controller => 'diary_entry', :action => 'rss', :language => nil, :display_name => entry.user.display_name)
+
+    if record.is_a?(DiaryEntry)
+      expire_fragment(:controller => 'diary_entry', :action => 'view', :display_name => entry.user.display_name, :id => entry.id, :part => "location")
+    end
   end
 end

app/models/notifier.rb

@@ -89,15 +89,9 @@ class Notifier < ActionMailer::Base
   end
 
   def friend_notification(friend)
-    befriender = User.find_by_id(friend.user_id)
+    common_headers friend.befriendee
-    befriendee = User.find_by_id(friend.friend_user_id)
+    subject I18n.t('notifier.friend_notification.subject', :user => friend.befriender.display_name, :locale => locale)
-
+    body :friend => friend
-    common_headers befriendee
-    subject I18n.t('notifier.friend_notification.subject', :user => befriender.display_name, :locale => locale)
-    body :user => befriender.display_name,
-         :userurl => url_for(:host => SERVER_URL,
-                             :controller => "user", :action => "view",
-                             :display_name => befriender.display_name)
   end
 
 private

app/models/user.rb

@@ -86,7 +86,7 @@ class User < ActiveRecord::Base
   end
 
   def languages
-    attribute_present?(:languages) ? read_attribute(:languages).split(",") : []
+    attribute_present?(:languages) ? read_attribute(:languages).split(/ *, */) : []
   end
 
   def languages=(languages)

app/views/browse/_relation_details.html.erb

@@ -14,7 +14,7 @@
   <% end %>
 
   <% unless relation_details.containing_relation_members.empty? %>
-    <tr>
+    <tr valign="top">
       <th><%= t'browse.relation_details.part_of' %></th>
       <td>
         <table cellpadding="0">

app/views/diary_entry/_diary_comment.html.erb

@@ -1,4 +1,5 @@
-<h4 id="comment<%= diary_comment.id %>"><%= t('diary_entry.diary_comment.comment_from', :link_user => (link_to h(diary_comment.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_comment.user.display_name), :comment_created_at => l(diary_comment.created_at)) %></h4>
+<%= user_thumbnail diary_comment.user, :style => "float: right" %>
+<h4 id="comment<%= diary_comment.id %>"><%= t('diary_entry.diary_comment.comment_from', :link_user => (link_to h(diary_comment.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_comment.user.display_name), :comment_created_at => l(diary_comment.created_at, :format => :friendly)) %></h4>
 <%= htmlize(diary_comment.body) %>
 <% if @user && @user.administrator? %> 
 <%= link_to t('diary_entry.diary_comment.hide_link'), {:action => 'hidecomment', :display_name => @user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id}, {:confirm => t('diary_entry.diary_comment.confirm')} %>

app/views/diary_entry/_diary_entry.html.erb

@@ -1,9 +1,10 @@
 <b><%= link_to h(diary_entry.title), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id %></b><br />
 <%= htmlize(diary_entry.body) %>
 <% if diary_entry.latitude and diary_entry.longitude %>
-<%= t 'map.coordinates' %> <div class="geo" style="display: inline"><span class="latitude"><%= diary_entry.latitude %></span>; <span class="longitude"><%= diary_entry.longitude %></span></div> (<%=link_to (t 'map.view'), :controller => 'site', :action => 'index', :lat => diary_entry.latitude, :lon => diary_entry.longitude, :zoom => 14 %> / <%=link_to (t 'map.edit'), :controller => 'site', :action => 'edit', :lat => diary_entry.latitude, :lon => diary_entry.longitude, :zoom => 14 %>)<br/>
+<%= render :partial => "location", :object => diary_entry %>
+<br />
 <% end %>
-<%= t 'diary_entry.diary_entry.posted_by', :link_user => (link_to h(diary_entry.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_entry.user.display_name), :created => l(diary_entry.created_at), :language_link => (link_to h(diary_entry.language.name), :controller => 'diary_entry', :action => 'list', :language => diary_entry.language_code)  %> 
+<%= t 'diary_entry.diary_entry.posted_by', :link_user => (link_to h(diary_entry.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_entry.user.display_name), :created => l(diary_entry.created_at, :format => :friendly), :language_link => (link_to h(diary_entry.language.name), :controller => 'diary_entry', :action => 'list', :language => diary_entry.language_code)  %> 
 <% if params[:action] == 'list' %>
 <br />
 <%= link_to t('diary_entry.diary_entry.comment_link'), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'newcomment' %>

app/views/diary_entry/_diary_list_entry.html.erb

@@ -0,0 +1,2 @@
+<%= user_thumbnail diary_list_entry.user, :style => "float: right" %>
+<%= render :partial => "diary_entry", :object => diary_list_entry %>

app/views/diary_entry/_location.html.erb

@@ -0,0 +1,11 @@
+<%= t 'diary_entry.location.location' %>
+
+<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 %>)

app/views/diary_entry/list.html.erb

@@ -1,9 +1,8 @@
-<h2><%= h(@title) %></h2>
+<% if @this_user %>
-
+<%= user_image @this_user, :style => "float: right" %>
-<% if @this_user && @this_user.image %>
- <%= image_tag url_for_file_column(@this_user, "image") %>
 <% end %>
 
+<h2><%= h(@title) %></h2>
 
 <% if @this_user %>
   <% if @user == @this_user %>
@@ -23,8 +22,12 @@
 
   <hr />
 
-  <%= render :partial => 'diary_entry', :collection => @entries %>
+  <% if @this_user %>
-	
+    <%= render :partial => 'diary_entry', :collection => @entries %>
+  <% else %>
+    <%= render :partial => 'diary_list_entry', :collection => @entries %>
+  <% end %>
+
   <%= link_to t('diary_entry.list.older_entries'), { :page => @entry_pages.current.next, :language => params[:language] } if @entry_pages.current.next %>
   <% if @entry_pages.current.next and @entry_pages.current.previous %>|<% end %>
   <%= link_to t('diary_entry.list.newer_entries'), { :page => @entry_pages.current.previous, :language => params[:language] } if @entry_pages.current.previous %>

app/views/diary_entry/view.html.erb

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

app/views/export/_start.html.erb

@@ -40,7 +40,7 @@
 
       <div class="export_details">
         <p><%= t'export.start.too_large.body' %></p>
-      </div
+      </div>
     </div>
   </div>
 

app/views/geocoder/error.html.erb

@@ -1 +1 @@
-<p class="search_results_error"><%= @error %></p>
+<p class="search_results_error"><%= h(@error) %></p>

app/views/layouts/_inbox.html.erb

@@ -0,0 +1,7 @@
+<%
+inbox_attributes = {}
+inbox_attributes[:id] = "inboxanchor"
+inbox_attributes[:class] = 'greeting-bar-unread' if @user.new_messages.size > 0
+inbox_attributes[:title] = t 'layouts.inbox_tooltip', :count => @user.new_messages.size
+%>
+<%= link_to t('layouts.inbox', :count => @user.new_messages.size), {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, inbox_attributes %>

app/views/layouts/site.html.erb

@@ -7,9 +7,9 @@
     <%= javascript_include_tag 'site' %>
     <!--[if lt IE 7]><%= javascript_include_tag 'pngfix' %><![endif]--> <!-- thanks, microsoft! -->
     <%= stylesheet_link_tag 'common' %>
-    <!--[if IE]><%= stylesheet_link_tag 'site', :media => "screen" %><![endif]--> <!-- IE is totally broken with CSS media queries -->
+    <!--[if IE]><%= stylesheet_link_tag 'large', :media => "screen" %><![endif]--> <!-- IE is totally broken with CSS media queries -->
-    <%= stylesheet_link_tag 'site-sml', :media => "only screen and (max-width: 481px)" %>
+    <%= stylesheet_link_tag 'small', :media => "only screen and (max-width: 481px)" %>
-    <%= stylesheet_link_tag 'site', :media => "screen and (min-width: 482px)" %> 
+    <%= 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." }) %>
@@ -36,13 +36,8 @@
         <span id="full-greeting"><%= t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), {:controller => 'user', :action => 'view', :display_name => @user.display_name}, :title => t('layouts.welcome_user_link_tooltip')) %></span> 
         <span id="small-greeting"><%= link_to t('layouts.welcome_user_link_tooltip'), {:controller => 'user', :action => 'view', :display_name => @user.display_name} %></span> | 
         <%= yield :greeting %>
-        <%
+        <%= render :partial => "layouts/inbox" %> |
-        inbox_attributes = {}
+        <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :session => request.session_options[:id], :referer => request.request_uri}, {:id => 'logoutanchor', :title => t('layouts.logout_tooltip'), :method => :post, :href => url_for(:controller => 'user', :action => 'logout', :referer => request.request_uri)}%>
-        inbox_attributes[:class] = 'greeting-bar-unread' if @user.new_messages.size > 0
-        inbox_attributes[:title] = t 'layouts.inbox_tooltip', :count => @user.new_messages.size
-        %>
-        <%= link_to t('layouts.inbox', :count => @user.new_messages.size), {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, inbox_attributes %> |
-        <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :referer => request.request_uri}, {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%>
       <% else %>
         <%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.request_uri}, {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %> |
         <%= link_to t('layouts.sign_up'), {:controller => 'user', :action => 'new'}, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %>
@@ -134,7 +129,7 @@
           <a href="http://donate.openstreetmap.org/" title="<%= h(t('layouts.make_a_donation.title')) %>"><%= h(t('layouts.make_a_donation.text')) %></a>
         </div>
 
-        <div id="cclogo" class="button" style="width: 88px">
+        <div id="cclogo" style="width: 88px">
           <%= link_to(
                   image_tag("cc_button.png",
                       :alt => t('layouts.license.alt'),

app/views/message/_message_summary.html.erb

@@ -3,7 +3,7 @@
 <tr id="inbox-<%= message_summary.id %>" class="inbox-row<%= "-unread" if not message_summary.message_read? %>">
   <td class="inbox-sender" bgcolor="<%= this_colour %>"><%= link_to h(message_summary.sender.display_name), :controller => 'user', :action => message_summary.sender.display_name %></td>
   <td class="inbox-subject" bgcolor="<%= this_colour %>"><%= link_to h(message_summary.title), :controller => 'message', :action => 'read', :message_id => message_summary.id  %></td>
-  <td class="inbox-sent nowrap" bgcolor="<%= this_colour %>"><%= l message_summary.sent_on %></td>
+  <td class="inbox-sent nowrap" bgcolor="<%= this_colour %>"><%= l message_summary.sent_on, :format => :friendly %></td>
   <% if message_summary.message_read? %>
     <td><%= button_to t('message.message_summary.unread_button'), {:controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'unread'}, { :onclick => remote_function(:url => {:controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'unread'}) + "; return false;" } %></td>
   <% else %>

app/views/message/_sent_message_summary.html.erb

@@ -3,6 +3,6 @@
 <tr class="inbox-row">
   <td class="inbox-sender" bgcolor="<%= this_colour %>"><%= link_to h(sent_message_summary.recipient.display_name), :controller => 'user', :action => sent_message_summary.recipient.display_name %></td>
   <td class="inbox-subject" bgcolor="<%= this_colour %>"><%= link_to h(sent_message_summary.title), :controller => 'message', :action => 'read', :message_id => sent_message_summary.id  %></td>
-  <td class="inbox-sent nowrap" bgcolor="<%= this_colour %>"><%= l sent_message_summary.sent_on %></td>
+  <td class="inbox-sent nowrap" bgcolor="<%= this_colour %>"><%= l sent_message_summary.sent_on, :format => :friendly %></td>
   <td><%= button_to t('message.sent_message_summary.delete_button'), :controller => 'message', :action => 'delete', :message_id => sent_message_summary.id, :referer => request.request_uri %></td>
 </tr>

app/views/message/no_such_message.html.erb

@@ -0,0 +1,2 @@
+<h1><%= t'message.no_such_message.heading' %></h1>
+<p><%= t'message.no_such_message.body' %></p>

app/views/message/read.html.erb

@@ -5,24 +5,23 @@
 <table>
   <tr>
     <th align="right"><%= t'message.read.from' %></th>
-    <td>
+    <td><%= link_to h(@message.sender.display_name), :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %></td>
-     <% if @message.sender.image %>
+    <td rowspan="4" valign="top"><%= user_thumbnail @message.sender %></td>
-        <%= image_tag url_for_file_column(@message.sender, "image") %>
-      <% end %>
-  
-<%= link_to h(@message.sender.display_name), :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %></td>
   </tr>
   <tr>
     <th align="right"><%= t'message.read.subject' %></th>
     <td><%= h(@message.title) %></td>
+    <td></td>
   </tr>
   <tr>
     <th align="right"><%= t'message.read.date' %></th>
-    <td><%= l @message.sent_on %></td>
+    <td><%= l @message.sent_on, :format => :friendly %></td>
+    <td></td>
   </tr>
   <tr>
     <th></th>
     <td><%= htmlize(@message.body) %></td>
+    <td></td>
   </tr>
 </table>
 
@@ -44,18 +43,22 @@
   <tr>
     <th align="right"><%= t'message.read.to' %></th>
     <td><%= link_to h(@message.recipient.display_name), :controller => 'user', :action => 'view', :display_name => @message.recipient.display_name %></td>
+    <td rowspan="4" valign="top"><%= user_thumbnail @message.recipient %></td>
   </tr>
   <tr>
     <th align="right"><%= t'message.read.subject' %></th>
     <td><%= h(@message.title) %></td>
+    <td></td>
   </tr>
   <tr>
     <th align="right"><%= t'message.read.date' %></th>
-    <td><%= l @message.sent_on %></td>
+    <td><%= l @message.sent_on, :format => :friendly %></td>
+    <td></td>
   </tr>
   <tr>
     <th></th>
     <td><%= htmlize(@message.body) %></td>
+    <td></td>
   </tr>
 </table>
 

app/views/notifier/friend_notification.html.erb

@@ -1,4 +1,20 @@
-<%= t'notifier.friend_notification.had_added_you', :user => @user %>
+<%=
+  t 'notifier.friend_notification.had_added_you',
+     :user => @friend.befriender.display_name
+%>
 
-<%= t'notifier.friend_notification.see_their_profile', :userurl => @userurl %>
+<%=
+  t 'notifier.friend_notification.see_their_profile',
+     :userurl => url_for(:host => SERVER_URL,
+                         :controller => "user", :action => "view",
+                         :display_name => @friend.befriender.display_name)
+%>
 
+<%=
+  unless @friend.befriendee.is_friends_with?(@friend.befriender)
+    t 'notifier.friend_notification.befriend_them',
+       :befriendurl => url_for(:host => SERVER_URL,
+                               :controller => "user", :action => "make_friend",
+                               :display_name => @friend.befriender.display_name)
+  end
+%>

app/views/site/_key.html.erb

@@ -17,7 +17,7 @@
   }
 
   function updateMapKey() {
-    var layer = map.baseLayer.name.toLowerCase().replace(/\s+/g, "_");
+    var layer = map.baseLayer.keyid;
     var zoom = map.getZoom();
 
     <%= remote_function :update => "sidebar_content",

app/views/site/_search.html.erb

@@ -5,12 +5,11 @@
   }
 
   function describeLocation() {
-    var position = getPosition();
+    var args = getArgs($("viewanchor").href);
-    var zoom = getZoom();
 
     <%= remote_function(:loading => "startSearch()",
                         :url => { :controller => :geocoder, :action => :description },
-                        :with => "'lat=' + position.lat + '&lon=' + position.lon + '&zoom=' + zoom") %>
+                        :with => "'lat=' + args['lat'] + '&lon=' + args['lon'] + '&zoom=' + args['zoom']") %>
   }
 
   function setSearchViewbox() {
@@ -33,8 +32,8 @@
 
 <% content_for "optionals" do %>
   <div class="optionalbox">
-    <span class="oboxheader"><%= t 'site.search.search' %></span>
     <span class="whereami"><a href="javascript:describeLocation()" title="<%= t 'site.search.where_am_i_title' %>"><%= t 'site.search.where_am_i' %></a></span>
+    <h1><%= t 'site.search.search' %></h1>
     <div class="search_form">
     <div id="search_field">
     <% form_remote_tag(:before => "setSearchViewbox()",

app/views/trace/_trace.html.erb

@@ -10,7 +10,7 @@
     <% end %>
   </td>
   <td class="<%= cl %>"><%= link_to trace.name, {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id} %>
-    <span class="gpxsummary" title="<%= trace.timestamp %>"> ... 
+    <span class="trace_summary" title="<%= trace.timestamp %>"> ... 
       <% if trace.inserted %> 
         (<%= t'trace.trace.count_points', :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %>)
       <% end %> 

app/views/trace/_trace_list.html.erb

@@ -1,6 +1,6 @@
 <%= render :partial => 'trace_paging_nav' %>
 
-<table id="keyvalue" cellpadding="3">
+<table id="trace_list" cellpadding="3">
   <tr>
     <th></th>
     <th></th>

app/views/trace/_trace_optionals.html.erb

@@ -1,7 +1,6 @@
 <% content_for "optionals" do %>
   <div class="optionalbox">
-    <span class="oboxheader"><%= t'trace.trace_optionals.tags' %></span>
+    <h1><%= t'trace.trace_optionals.tags' %></h1>
-    <br />
     <br />
     <% if @all_tags %>
       <% @all_tags.each do |tag| %>

app/views/trace/edit.html.erb

@@ -11,7 +11,7 @@
   </tr> 
   <tr>
     <td><%= t'trace.edit.uploaded_at' %></td>
-    <td><%= l @trace.timestamp %></td>
+    <td><%= l @trace.timestamp, :format => :friendly %></td>
   </tr>
   <% if @trace.inserted? %>
   <tr>

app/views/trace/view.html.erb

@@ -15,7 +15,7 @@
   </tr> 
   <tr>
     <td><%= t'trace.view.uploaded' %></td>
-    <td><%= l @trace.timestamp %></td>
+    <td><%= l @trace.timestamp, :format => :friendly %></td>
   </tr>
   <% if @trace.inserted? %>
   <tr>

app/views/user/_contact.html.erb

@@ -0,0 +1,27 @@
+<tr>
+  <td rowspan="2">
+    <%= user_thumbnail contact %>
+  </td>
+  <td>
+    <%= link_to h(contact.display_name), :controller => 'user', :action => 'view',  :display_name => contact.display_name %>
+    <% if @this_user.home_lon and @this_user.home_lat and contact.home_lon and contact.home_lat %>
+      <% distance = @this_user.distance(contact) %>
+      <% if distance < 1 %>
+        (<%= t 'user.view.m away', :count => (distance * 1000).round %>)
+      <% else %>
+        (<%= t 'user.view.km away', :count => distance.round %>)
+      <% end %>
+    <% end %>
+  </td>
+</tr>
+<tr>
+  <td>
+    <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => contact.display_name %>
+    |
+    <% if @user.is_friends_with?(contact) %>
+      <%= link_to t('user.view.remove as friend'), :controller => 'user', :action => 'remove_friend', :display_name => contact.display_name, :referer => request.request_uri %>
+    <% else %>
+      <%= link_to t('user.view.add as friend'), :controller => 'user', :action => 'make_friend', :display_name => contact.display_name, :referer => request.request_uri %>
+    <% end %>
+  </td>
+</tr>

app/views/user/_map.html.erb

@@ -1,15 +1,5 @@
-<% nearest_str = "" %>
+<% friends = @user.friends.collect { |f| f.befriendee }.select { |f| !f.home_lat.nil? and !f.home_lon.nil? } %>
-<% if !@user.home_lat.nil? and !@user.home_lon.nil? %>
+<% nearest = @user.nearby - friends %>
-  <% if !@user.nearby.empty? %>
-    <% @user.nearby.each do |nearby| %>
-    <% nearest_str += "nearest.push( { 'display_name' : '#{escape_javascript(nearby.display_name)}', 'home_lat' : #{nearby.home_lat}, 'home_lon' : #{nearby.home_lon} } );\n" %>
-    <% end %>
-  <% end %>
-<% end %>
-<script type="text/javascript">
-    var nearest = [], friends = [];
-    <%= nearest_str %>
-</script>
 
 <% if @user.home_lat.nil? or @user.home_lon.nil? %>
   <% lon = h(params['lon'] || '-0.1') %>
@@ -47,16 +37,29 @@
     setMapCenter(centre, zoom);
 
     <% if marker %>
-    marker = addMarkerToMap(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>), null, "<%= t 'user.friend_map.your location' %>");
+    marker = addMarkerToMap(
+      new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>), null,
+      '<%= escape_javascript(render(:partial => "popup", :object => @user, :locals => { :type => "your location" })) %>'
+    );
     <% end %>
 
     var near_icon = OpenLayers.Marker.defaultIcon();
-    near_icon.url = OpenLayers.Util.getImagesLocation() + "marker-green.png";;
+    near_icon.url = OpenLayers.Util.getImagesLocation() + "marker-green.png";
-    var i = nearest.length;
+    <% nearest.each do |u| %>
-    while( i-- ) {
+      addMarkerToMap(new OpenLayers.LonLat(
-      var description = i18n('<%= t 'user.friend_map.nearby mapper'%>', { nearby_user: '<a href="/user/'+nearest[i].display_name+'">'+nearest[i].display_name+'</a>' });
+        <%= u.home_lon %>, <%= u.home_lat %>), near_icon.clone(),
-      var nearmarker = addMarkerToMap(new OpenLayers.LonLat(nearest[i].home_lon, nearest[i].home_lat), near_icon.clone(), description);
+        '<%= escape_javascript(render(:partial => "popup", :object => u, :locals => { :type => "nearby mapper" })) %>'
-    }
+      );
+    <% end %>
+
+    var friend_icon = OpenLayers.Marker.defaultIcon();
+    friend_icon.url = OpenLayers.Util.getImagesLocation() + "marker-blue.png";
+    <% friends.each do |u| %>
+      addMarkerToMap(new OpenLayers.LonLat(
+        <%= u.home_lon %>, <%= u.home_lat %>), friend_icon.clone(),
+        '<%= escape_javascript(render(:partial => "popup", :object => u, :locals => { :type => "friend" })) %>'
+      );
+    <% end %>
 
     if (document.getElementById('updatehome')) {
       map.events.register("click", map, setHome);
@@ -77,12 +80,13 @@
         removeMarkerFromMap(marker);
       }
 
-      marker = addMarkerToMap(lonlat, null, "<%= t 'user.friend_map.your location' %>");
+      marker = addMarkerToMap(
+        lonlat, null, 
+        '<%= escape_javascript(render(:partial => "popup", :object => @user, :locals => { :type => "your location" })) %>'
+      );
     }
   }
 
   window.onload = init;
 // -->
 </script>
-
-

app/views/user/_popup.html.erb

@@ -0,0 +1,5 @@
+<div class="user_popup">
+  <%= user_thumbnail popup, :style => "float :left" %>
+  <p><%= t('user.popup.' + type) %></p>
+  <p><%= link_to popup.display_name, :controller => "user", :action => "view", :display_name => popup.display_name %></p>
+</div>

app/views/user/account.html.erb

@@ -18,12 +18,12 @@
 
   <tr>
     <td class="fieldName" style="padding-bottom:0px;"><%= t 'user.new.password' %></td>
-    <td style="padding-bottom:0px;"><%= f.password_field :pass_crypt, {:value => '', :size => 30, :maxlength => 255} %></td>
+    <td style="padding-bottom:0px;"><%= f.password_field :pass_crypt, {:value => '', :size => 30, :maxlength => 255, :autocomplete => :off} %></td>
   </tr>
 
   <tr>
     <td class="fieldName"><%= t 'user.new.confirm password' %></td>
-    <td><%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255} %></td>
+    <td><%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255, :autocomplete => :off} %></td>
   </tr>
   <tr>
     <td class="fieldName" ><%= t 'user.account.openid.openid' %></td>
@@ -58,11 +58,11 @@
     <td valign="top">
       <% if @user.image.nil? %>
         <%= hidden_field_tag "image_action", "new" %>
-        <%= t 'user.account.new image' %><br /><%= file_column_field "user", "image" %>
+        <%= t 'user.account.new image' %><br /><%= file_column_field "user", "image" %><br /><span class="minorNote"><%= t 'user.account.image size hint' %></span>
       <% else %>
-        <table>
+        <table id="accountImage">
           <tr>
-            <td rowspan="3" valign="top"><%= image_tag url_for_file_column(@user, "image") %></td>
+            <td rowspan="3" valign="top"><%= image_tag url_for_file_column(@user, "image"), :class => "user_image" %></td>
             <td><%= radio_button_tag "image_action", "keep", true %></td>
             <td><%= t 'user.account.keep image' %></td>
           </tr>
@@ -72,7 +72,7 @@
           </tr>
           <tr>
             <td><%= radio_button_tag "image_action", "new" %></td>
-            <td><%= t 'user.account.replace image' %><br /><%= file_column_field "user", "image", :onchange => "$('image_action_new').checked = true" %></td>
+            <td><%= t 'user.account.replace image' %><br /><%= file_column_field "user", "image", :onchange => "$('image_action_new').checked = true" %><br /><span class="minorNote"><%= t 'user.account.image size hint' %></span></td>
           </tr>
         </table>
       <% end %>
@@ -88,7 +88,7 @@
     <td></td>
     <td>
       <p><%= t 'user.account.update home location on click' %> <input type="checkbox" value="1" <% unless @user.home_lat and @user.home_lon %> checked="checked" <% end %> id="updatehome" /> </p>
-      <div id="map" style="border:1px solid black; position:relative; width:500px; height:400px;"></div>
+      <div id="map" class="user_map" style="border:1px solid black; position:relative; width:500px; height:400px;"></div>
     </td>
   </tr>
   
@@ -99,7 +99,7 @@
 </table>
 <% end %>
 
-<%= render :partial => 'friend_map' %>
+<%= render :partial => 'map' %>
 
 <% unless @user.data_public? %>
 <a name="public"></a>

app/views/user/login.html.erb

@@ -5,13 +5,12 @@
 <% form_tag :action => 'login' do %>
 <%= hidden_field_tag('referer', h(params[:referer])) %>
 <table id="loginForm">
-  <tr><td class="fieldName"><%= t 'user.login.email or username' %></td><td><%= text_field('user', 'email',{:size => 28, :maxlength => 255, :tabindex => 1}) %></td></tr>
+  <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',{:size => 28, :maxlength => 255, :tabindex => 2}) %></td><td> <span class="minorNote">(<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)</span></td></tr>
+  <tr><td class="fieldName"><%= t 'user.login.password' %></td><td><%= password_field('user', 'password',{:value => "", :size => 28, :maxlength => 255, :tabindex => 2}) %></td><td> <span class="minorNote">(<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)</span></td></tr>
-<tr><td colspan = "3"><h4><I><%= t 'user.login.alternatively' %></I></h4></td></tr>
+  <tr><td colspan = "3"><h4><I><%= t 'user.login.alternatively' %></I></h4></td></tr>
-<tr><td class="fieldName"><%= t 'user.login.openid' %></td><td><%= text_field('user', 'openid_url',{:size => 28, :maxlength => 255, :tabindex => 3}) %></td><td> <span class="minorNote">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</span></td></tr>
+  <tr><td class="fieldName"><%= t 'user.login.openid' %></td><td><%= text_field('user', 'openid_url',{:size => 28, :maxlength => 255, :tabindex => 3}) %></td><td> <span class="minorNote">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</span></td></tr>
-
+  <tr><td colspan="3">&nbsp;<!--vertical spacer--></td></tr>
-  <tr><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
+  <tr><td colspan="3">&nbsp;<!--vertical spacer--></td></tr>
-  <tr><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
+  <tr><td class="fieldName"><label for="remember_me"><%= t 'user.login.remember' %></label></td><td><%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %></td><td align=right><%= submit_tag t('user.login.login_button'), :tabindex => 3 %></td></tr>
-  <tr><td class="fieldName"><label for="remember_me">Remember me:</label></td><td><%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %></td><td align=right><%= submit_tag t('user.login.login_button'), :tabindex => 3 %></td></tr>
 </table>
 <% end %>

app/views/user/logout.html.erb

@@ -0,0 +1,6 @@
+<h1><%= t 'user.logout.heading' %></h1>
+<% form_tag :action => "logout" do %>
+  <%= hidden_field_tag("referer", h(params[:referer])) %>
+  <%= hidden_field_tag("session", request.session_options[:id]) %>
+  <%= submit_tag t('user.logout.logout_button') %>
+<% end %>

app/views/user/new.html.erb

@@ -39,4 +39,6 @@
 </table>
 <% end %>
 
+<%= javascript_include_tag 'https://ethnio.com/remotes/62786' %>
+
 <% end %>

app/views/user/view.html.erb

@@ -1,148 +1,122 @@
-<% if @this_user.image %>
+<%= user_image @this_user, :style => "float: right" %>
-<%= image_tag url_for_file_column(@this_user, "image"), :align => "right", :float => "left" %>
+
-<% end %>
 <h2><%= h(@this_user.display_name) %>
+
 <% UserRole::ALL_ROLES.each do |role| %>
-<% if @user and @user.administrator? %>
+  <% if @user and @user.administrator? %>
-<% if @this_user.has_role? role %>
+    <% if @this_user.has_role? role %>
-<%= link_to(image_tag("roles/#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.revoke.#{role}"), :title => t("user.view.role.revoke.#{role}")), :controller => 'user_roles', :action => 'revoke', :display_name => @this_user.display_name, :role => role) %>
+      <%= link_to(image_tag("roles/#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.revoke.#{role}"), :title => t("user.view.role.revoke.#{role}")), :controller => 'user_roles', :action => 'revoke', :display_name => @this_user.display_name, :role => role) %>
-<% else %>
+    <% else %>
-<%= link_to(image_tag("roles/blank_#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.grant.#{role}"), :title => t("user.view.role.grant.#{role}")), :controller => 'user_roles', :action => 'grant', :display_name => @this_user.display_name, :role => role) %>
+      <%= link_to(image_tag("roles/blank_#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.grant.#{role}"), :title => t("user.view.role.grant.#{role}")), :controller => 'user_roles', :action => 'grant', :display_name => @this_user.display_name, :role => role) %>
-<% end %>
+    <% end %>
-<% elsif @this_user.has_role? role %>
+  <% elsif @this_user.has_role? role %>
-<%= image_tag("roles/#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.#{role}"), :title => t("user.view.role.#{role}")) %>
+    <%= image_tag("roles/#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.#{role}"), :title => t("user.view.role.#{role}")) %>
-<% end %>
+  <% end %>
 <% end %></h2>
+
 <div id="userinformation">
-<% if @user and @this_user.id == @user.id %>
+  <% if @user and @this_user.id == @user.id %>
-<!-- Displaying user's own profile page -->
+    <!-- Displaying user's own profile page -->
-<%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %>
+    <%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %>
-| <%= link_to t('user.view.new diary entry'), :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %>
+    |
-| <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name %>
+    <%= link_to t('user.view.new diary entry'), :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %>
-| <%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %>
+    |
-| <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %>
+    <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name %>
-| <%= link_to t('user.view.blocks on me'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @user.display_name %>
+    |
-<% if @user and @user.moderator? %>
+    <%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %>
-| <%= link_to t('user.view.blocks by me'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @user.display_name %>
+    |
-<% end %>
+    <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %>
-<% else %>
+    |
-<!-- Displaying another user's profile page -->
+    <%= link_to t('user.view.oauth settings'), :controller => 'oauth_clients', :action => 'index' %>
-<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @this_user.display_name %>
+    |
-| <%= link_to t('user.view.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %>
+    <%= link_to t('user.view.blocks on me'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @user.display_name %>
-| <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list', :display_name => @this_user.display_name %>
+    <% if @user and @user.moderator? %>
-| <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'view', :display_name => @this_user.display_name %>
+      | <%= link_to t('user.view.blocks by me'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @user.display_name %>
-| <% if @user and @user.is_friends_with?(@this_user) %>
+    <% end %>
-  <%= link_to t('user.view.remove as friend'), :controller => 'user', :action => 'remove_friend', :display_name => @this_user.display_name %>
+  <% else %>
-<% else %>
+    <!-- Displaying another user's profile page -->
-  <%= link_to t('user.view.add as friend'), :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %>
+    <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @this_user.display_name %>
-<% end %>
+    |
-| <%= link_to t('user.view.block_history'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @this_user.display_name %>
+    <%= link_to t('user.view.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %>
-<% if @this_user.moderator? %>
+    |
-| <%= link_to t('user.view.moderator_history'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @this_user.display_name %>
+    <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list', :display_name => @this_user.display_name %>
-<% end %>
+    |
-<% if @user and @user.moderator? %>
+    <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'view', :display_name => @this_user.display_name %>
-| <%= link_to t('user.view.create_block'), :controller => 'user_blocks', :action => 'new', :display_name => @this_user.display_name %>
+    |
-<% end %>
+    <% if @user and @user.is_friends_with?(@this_user) %>
-<% end %>
+      <%= link_to t('user.view.remove as friend'), :controller => 'user', :action => 'remove_friend', :display_name => @this_user.display_name %>
-<% if @user and @user.administrator? %>
+    <% else %>
-<br/>
+      <%= link_to t('user.view.add as friend'), :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %>
-<% if @this_user.active? %>
+    <% end %>
-<%= link_to t('user.view.deactivate_user'), {:controller => 'user', :action => 'deactivate', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %>
+    |
-<% else %>
+    <%= link_to t('user.view.block_history'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @this_user.display_name %>
-<%= link_to t('user.view.activate_user'), {:controller => 'user', :action => 'activate', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %>
+    <% if @this_user.moderator? %>
-<% end %>
+      | <%= link_to t('user.view.moderator_history'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @this_user.display_name %>
-<% if @this_user.visible? %>
+    <% end %>
-| <%= link_to t('user.view.hide_user'), {:controller => 'user', :action => 'hide', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %>
+    <% if @user and @user.moderator? %>
-| <%= link_to t('user.view.delete_user'), {:controller => 'user', :action => 'delete', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %>
+      | <%= link_to t('user.view.create_block'), :controller => 'user_blocks', :action => 'new', :display_name => @this_user.display_name %>
-<% else %>
+    <% end %>
-| <%= link_to t('user.view.unhide_user'), {:controller => 'user', :action => 'unhide', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %>
+  <% end %>
-<% end %>
+  <% if @user and @user.administrator? %>
-<% end %>
+    <br/>
+    <% if @this_user.active? %>
+      <%= link_to t('user.view.deactivate_user'), {:controller => 'user', :action => 'deactivate', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %>
+    <% else %>
+      <%= link_to t('user.view.activate_user'), {:controller => 'user', :action => 'activate', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %>
+    <% end %>
+    |
+    <% if @this_user.visible? %>
+      <%= link_to t('user.view.hide_user'), {:controller => 'user', :action => 'hide', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %>
+      |
+      <%= link_to t('user.view.delete_user'), {:controller => 'user', :action => 'delete', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %>
+    <% else %>
+      <%= link_to t('user.view.unhide_user'), {:controller => 'user', :action => 'unhide', :display_name => @this_user.display_name}, {:confirm => t('user.view.confirm')} %>
+    <% end %>
+  <% end %>
 </div>
 
-<p><b><%= t 'user.view.mapper since' %></b> <%= l @this_user.creation_time %> <%= t 'user.view.ago', :time_in_words_ago => time_ago_in_words(@this_user.creation_time) %></p>
+<p><b><%= t 'user.view.mapper since' %></b> <%= l @this_user.creation_time, :format => :friendly %> <%= t 'user.view.ago', :time_in_words_ago => time_ago_in_words(@this_user.creation_time) %></p>
 
 <% if @user and @user.administrator? %>
-<p><b><%= t 'user.view.email address' %></b> <%= @this_user.email %></p>  
+  <p><b><%= t 'user.view.email address' %></b> <%= @this_user.email %></p>  
-<p><b><%= t 'user.view.created from' %></b> <%= @this_user.creation_ip %></p>
+  <p><b><%= t 'user.view.created from' %></b> <%= @this_user.creation_ip %></p>
 <% end %>
 
 <h3><%= t 'user.view.description' %></h3>
+
 <div id="description"><%= htmlize(@this_user.description) %></div>
 
-<% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %>
-<h3><%= t 'user.view.user location' %></h3>
-
-  <%= t 'user.view.no home location' %>
-  <% if @user and @this_user.id == @user.id %>
-  <%= 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) %>
-  <% end %>
-<% else %>
-
-  <% if @user and @this_user.id == @user.id %>
-    <h3><%= t 'user.view.your friends' %></h3>
-    <% if @this_user.friends.empty? %>
-      <%= t 'user.view.no friends' %>
-    <% else %>
-      <table id="friends">
-      <% @this_user.friends.each do |friend| %>
-      <% @friend = User.find_by_id(friend.friend_user_id) %>
-      <tr>
-      <td class="image">
-      <% if @friend.image %>
-        <%= image_tag url_for_file_column(@friend, "image") %>
-      <% end %>
-      </td>
-      <td class="username"><%= link_to h(@friend.display_name), :controller => 'user', :action => 'view',  :display_name => @friend.display_name %></td>
-      <td>
-        <% if @friend.home_lon and @friend.home_lat %>
-          <% distance = @this_user.distance(@friend) %>
-          <% if distance < 1 %>
-            <%= t 'user.view.m away', :count => (distance * 1000).round %>
-          <% else %>
-            <%= t 'user.view.km away', :count => distance.round %>
-          <% end %>
-        <% end %>
-      </td>
-      <td class="message">(<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @friend.display_name %>)</td>
-      </tr>
-      <%end%>
-      </table>
-    <%end%>
-    <br/>
-  <%end%>
-
-
-  <% if @user and @this_user.id == @user.id %>
-    <h3><%= t 'user.view.nearby users' %></h3>
-    <% if @this_user.nearby.empty? %>
-      <%= t 'user.view.no nearby users' %>
-    <% else %>
-
-    <div id="map" style="border: 1px solid black; position: relative; width : 90%; height : 400px;"></div>
-    <%= render :partial => 'friend_map' %>
-      <table id="nearbyusers">
-      <% @this_user.nearby.each do |nearby| %>
-      <tr>
-      <td class="username"><%= link_to h(nearby.display_name), :controller => 'user', :action => 'view',  :display_name => nearby.display_name %></td>
-      <td>
-        <% distance = @this_user.distance(nearby) %>
-        <% if distance < 1 %>
-          <%= t 'user.view.m away', :count => (distance * 1000).round %>
-        <% else %>
-          <%= t 'user.view.km away', :count => distance.round %>
-        <% end %>
-      </td>
-      <td class="message">(<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => nearby.display_name %>)</td>
-      </tr>
-      <% end %>
-      </table>
-    <% end %>
-  <% end %>
-<% end %>
-
-<br/>
-<br/>
 <% if @user and @this_user.id == @user.id %>
-<%= link_to t('user.view.my_oauth_details'), :controller => 'oauth_clients', :action => 'index' %>
+  <div id="map" class="user_map" style="border: 1px solid black; position: relative; width: 400px; height: 400px; float: right;">
+    <% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %>
+      <p style="position: absolute; top: 0; bottom: 0; width: 90%; height: 30%; margin: auto 5%">
+        <%= 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' %>
+    <% end %>
+  </div>
+
+  <% friends = @this_user.friends.collect { |f| f.befriendee } %>
+  <% nearby = @this_user.nearby - friends %>
+
+  <h3 style="margin-top: 0"><%= t 'user.view.your friends' %></h3>
+
+  <% if friends.empty? %>
+    <%= t 'user.view.no friends' %>
+  <% else %>
+    <table id="friends">
+      <%= render :partial => "contact", :collection => friends %>
+    </table>
+  <% end %>
+
+  <h3><%= t 'user.view.nearby users' %></h3>
+
+  <% if nearby.empty? %>
+    <%= t 'user.view.no nearby users' %>
+  <% else %>
+    <table id="nearbyusers">
+      <%= render :partial => "contact", :collection => nearby %>
+    </table>
+  <% end %>
 <% end %>

config/.gitignore

@@ -0,0 +1 @@
+database.yml

config/environment.rb

@@ -54,6 +54,7 @@ Rails::Initializer.run do |config|
   config.gem 'httpclient'
   config.gem 'ruby-openid', :lib => 'openid', :version => '>=2.0.4'
   config.gem 'SystemTimer', :version => '>= 1.1.3', :lib => 'system_timer'
+  config.gem 'sanitize'
 
   # Only load the plugins named here, in the order given. By default, all plugins
   # in vendor/plugins are loaded in alphabetical order.

config/environments/test.rb

@@ -20,3 +20,6 @@ config.action_controller.allow_forgery_protection    = false
 # The :test delivery method accumulates sent emails in the
 # ActionMailer::Base.deliveries array.
 config.action_mailer.delivery_method = :test
+
+# Load timecop to help with testing time dependent code
+config.gem 'timecop'

config/initializers/i18n.rb

@@ -2,3 +2,29 @@ require 'globalize/i18n/missing_translations_log_handler'
 
 I18n.missing_translations_logger = Logger.new("#{RAILS_ROOT}/log/missing_translations.log")
 I18n.exception_handler = :missing_translations_log_handler
+
+module I18n
+  module Backend
+    class Simple
+      protected
+      alias_method :old_init_translations, :init_translations
+      
+      def init_translations
+        old_init_translations
+
+        merge_translations(:nb, translations[:no])
+        translations[:no] = translations[:nb]
+
+        friendly = translate('en', 'time.formats.friendly')
+
+        available_locales.each do |locale|
+          time_formats = I18n.t('time.formats', :locale => locale)
+
+          unless time_formats.has_key?(:friendly)
+            store_translations(locale, :time => { :formats => { :friendly => friendly } })
+          end
+        end
+      end
+    end
+  end
+end

config/initializers/sanitize.rb

@@ -0,0 +1,3 @@
+Sanitize::Config::OSM = Sanitize::Config::RELAXED.dup
+
+Sanitize::Config::OSM[:add_attributes] = { 'a' => { 'rel' => 'nofollow' } }

config/locales/af.yml

@@ -353,6 +353,7 @@ af:
           auditorium: Ouditorium
           bank: Bank
           bar: Kroeg
+          bench: Bank
           bicycle_parking: Fietsparkering
           bicycle_rental: Fietsverhuring
           brothel: Bordeel
@@ -367,6 +368,7 @@ af:
           club: Klub
           college: Kollege
           community_centre: Gemeenskap-sentrum
+          courthouse: Hof
           crematorium: Krematorium
           dentist: Tandarts
           doctors: Dokters
@@ -382,6 +384,7 @@ af:
           fountain: Fontein
           fuel: Brandstof
           grave_yard: Begraafplaas
+          hall: Saal
           health_centre: Gesondheidsentrum
           hospital: Hospitaal
           hotel: Hotel
@@ -392,6 +395,7 @@ af:
           market: Mark
           marketplace: Markplein
           nightclub: Nagklub
+          nursery: Kleuterskool
           nursing_home: Verpleeghuis
           office: Kantoor
           park: Park
@@ -413,6 +417,7 @@ af:
           school: Skool
           shelter: Skuiling
           shop: Winkel
+          shopping: Inkopies
           social_club: Sosiale klub
           studio: Studio
           supermarket: Supermark
@@ -474,6 +479,8 @@ af:
           platform: Platform
           primary: Primêre pad
           primary_link: Primêre pad
+          raceway: Renbaan
+          residential: Woonerf
           road: Pad
           secondary: Sekondêre pad
           secondary_link: Sekondêre pad
@@ -559,6 +566,7 @@ af:
           feature: Besienswaardigheid
           geyser: Geiser
           glacier: Gletser
+          heath: Heide
           hill: Heuwel
           island: Eiland
           land: Land
@@ -570,6 +578,7 @@ af:
           ridge: Bergkam
           river: Rivier
           rock: Rotse
+          scree: Puin
           scrub: Struikgewas
           shoal: Sandbank
           spring: Bron
@@ -731,11 +740,10 @@ af:
     donate: Ondersteun OpenStreetMap deur aan die Hardeware Opgradeer-fonds te {{link}}.
     donate_link_text: skenk
     edit: Wysig
-    edit_tooltip: Wysig kaarte
     export: Eksporteer
     export_tooltip: Eksporteer kaartdata
     gps_traces: GPS-spore
-    gps_traces_tooltip: Beheer spore
+    gps_traces_tooltip: Beheer GPS-spore
     help_wiki: Help & Wiki
     help_wiki_tooltip: Help en wiki vir die projek
     history: Geskiedenis
@@ -770,13 +778,9 @@ af:
     user_diaries: Gebruikersdagboeke
     user_diaries_tooltip: Wys gebruikersdagboeke
     view: Wys
-    view_tooltip: Wys kaarte
+    view_tooltip: Wys die kaart
     welcome_user: Welkom, {{user_link}}
     welcome_user_link_tooltip: U gebruikersblad
-  map: 
-    coordinates: "Koördinate:"
-    edit: Wysig
-    view: Wys
   message: 
     delete: 
       deleted: Boodskap is verwyder
@@ -807,9 +811,9 @@ af:
       subject: Onderwerp
       title: Stuur boodskap
     no_such_user: 
-      body: Jammer, daar is geen gebruiker of boodskap met die naam of id nie
+      body: Jammer, daar is geen gebruiker met die naam nie
-      heading: Geen sodanige gebruiker of boodskap nie
+      heading: Die gebruiker bestaan nie
-      title: Geen sodanige gebruiker of boodskap nie
+      title: Die gebruiker bestaan nie
     outbox: 
       date: Datum
       inbox: inboks
@@ -1104,6 +1108,7 @@ af:
       email never displayed publicly: (word nie openbaar gemaak nie)
       flash update success: U gebruikersinligting is verander.
       home location: "Tuisligging:"
+      image: "Beeld:"
       latitude: "Breedtegraad:"
       longitude: "Lengtegraad:"
       make edits public button: Maak al my wysigings openbaar
@@ -1127,9 +1132,6 @@ af:
     confirm_email: 
       button: Bevestig
       success: U e-posadres is bevestig, dankie dat u geregistreer het!
-    friend_map: 
-      nearby mapper: "Nabygeleë karteerder: [[nearby_user]]"
-      your location: U ligging
     login: 
       auth failure: Jammer, kon nie met hierdie inligting aanteken nie.
       create_account: registreer
@@ -1167,6 +1169,9 @@ af:
       body: Daar is geen gebruiker met die naam {{user}} nie. Kontroleer u spelling, of die skakel waarop u gekliek het is verkeerd.
       heading: Die gebruiker {{user}} bestaan nie
       title: Gebruiker bestaan nie
+    popup: 
+      nearby mapper: Nabygeleë karteerder
+      your location: U ligging
     remove_friend: 
       not_a_friend: "{{name}} is nie een van u vriende nie."
       success: "{{name}} is uit u lys van vriende verwyder."
@@ -1182,16 +1187,13 @@ af:
     view: 
       activate_user: aktiveer hierdie gebruiker
       add as friend: voeg by as vriend
-      add image: Voeg prent by
       ago: ({{time_in_words_ago}} gelede)
       block_history: wys blokkades ontvang
       blocks by me: blokkades deur my
       blocks on me: blokkades op my
-      change your settings: verander u voorkeure
       confirm: Bevestig
       create_block: blokkeer die gebruiker
       deactivate_user: deaktiveer hierdie gebruiker
-      delete image: Verwyder prent
       delete_user: skrap die gebruiker
       description: Beskrywing
       diary: dagboek
@@ -1207,12 +1209,10 @@ af:
       my edits: my wysigings
       my settings: my voorkeure
       my traces: my spore
-      my_oauth_details: Wys my OAuth-besonderhede
+      nearby users: Ander nabygeleë gebruikers
-      nearby users: "Nabygeleë gebruikers:"
       new diary entry: nuwe dagboekinskrywing
       no friends: U het nog geen vriende bygevoeg nie.
-      no home location: Geen tuisligging verskaf nie.
+      no nearby users: Daar is nog geen gebruikers wat herken dat hulle nabygeleë karterinswerk doen nie.
-      no nearby users: Daar is nog geen nabygeleë gebruikers wat erken dat hulle karterinswerk doen nie.
       remove as friend: verwyder as vriend
       role: 
         administrator: Hierdie gebruiker is 'n administrateur
@@ -1227,8 +1227,6 @@ af:
       settings_link_text: voorkeure
       traces: spore
       unhide_user: maak die gebruiker weer sigbaar
-      upload an image: Laai 'n prent op
-      user image heading: Foto van gebruiker
       user location: Ligging van gebruiker
       your friends: U vriende
   user_block: 

config/locales/ar.yml

@@ -3,6 +3,7 @@
 # Export driver: syck
 # Author: Aude
 # Author: Bassem JARKAS
+# Author: Grille chompa
 # Author: Mutarjem horr
 # Author: OsamaK
 ar: 
@@ -328,6 +329,10 @@ ar:
       recent_entries: "المدخلات اليومية الحديثة:"
       title: يوميات المستخدمين
       user_title: يومية {{user}}
+    location: 
+      edit: عدّل
+      location: "الموقع:"
+      view: اعرض
     new: 
       title: مدخلة يومية جديدة
     no_such_entry: 
@@ -367,6 +372,9 @@ ar:
       output: الخرج
       paste_html: ألصق HTML لتضمينه في موقع ما
       scale: القياس
+      too_large: 
+        body: هذه المنطقة كبيرة جدًا للتصدير على هيئة بيانات إكس إم إل لخريطة الشارع المفتوحة. يرجى تكبير الخريطة أو استخدام منطقة أصغر.
+        heading: المنطقة كبيرة جدًا
       zoom: تكبير
     start_rjs: 
       add_marker: أضف علامة على الخريطة
@@ -852,27 +860,31 @@ ar:
           water_point: نقطة ماء شفة
           waterfall: شلال
           weir: هدار (سدّ منخفض)
+  html: 
+    dir: rtl
   javascripts: 
     map: 
       base: 
         cycle_map: خريطة للدراجات
         noname: التسمية غائبة
     site: 
+      edit_disabled_tooltip: قم بالتكبير لتحرير الخريطة
+      edit_tooltip: عدّل الخريطة
       edit_zoom_alert: يجب عليك التكبير لتعديل الخريطة
+      history_disabled_tooltip: قم بالتكبير لعرض التعديلات في هذه المنطقة
+      history_tooltip: اعرض التعديلات في هذه المنطقة
       history_zoom_alert: يجب التكبير لرؤية تاريخ التعديل
   layouts: 
     donate: ادعم خريطة الشارع المفتوحة ب{{link}} لتمويل ترقية العتاد.
     donate_link_text: التبرع
     edit: عدّل الخريطة
-    edit_tooltip: يمكنك تعديل هذه الخريطة، من فضلك اقرأ صفحة الدليل قبل البدء
     export: صدِّر
     export_tooltip: صدّر بيانات الخريطة
     gps_traces: آثار جي بي أس
-    gps_traces_tooltip: عالج الآثار
+    gps_traces_tooltip: عالج آثار جي بي إس
     help_wiki: المساعدة والويكي
     help_wiki_tooltip: المساعدة وموقع الويكي للمشروع
     history: تاريخ
-    history_tooltip: تاريخ حزمة التغييرات
     home: الصفحة الرئيسية
     home_tooltip: اذهب إلى الصفحة الرئيسية
     inbox: صندوق البريد ({{count}})
@@ -910,13 +922,9 @@ ar:
     user_diaries: يوميات المستخدمين
     user_diaries_tooltip: اعرض يوميات المستخدمين
     view: اعرض
-    view_tooltip: اعرض الخرائط
+    view_tooltip: اعرض الخريطة
     welcome_user: مرحبًا بك، {{user_link}}
     welcome_user_link_tooltip: صفحة المستخدم الخاصة بك
-  map: 
-    coordinates: "الإحداثيات:"
-    edit: عدّل
-    view: اعرض
   message: 
     delete: 
       deleted: حُذفت الرسالة
@@ -947,10 +955,14 @@ ar:
       send_message_to: أرسل رسالة جديدة إلى {{name}}
       subject: الموضوع
       title: أرسل رسالة
+    no_such_message: 
+      body: عذرًا لا يوجد أي رسالة بهذا المعرف.
+      heading: لا توجد مثل هذه الرسالة
+      title: لا توجد مثل هذه الرسالة
     no_such_user: 
-      body: عذرًا لا يوجد مستخدم أو رسالة بذلك الاسم أو المعرّف
+      body: عذرًا لا يوجد مستخدم أو رسالة بذلك الاسم.
-      heading: لا يوجد مستخدم أو رسالة
+      heading: لا يوجد مثل هذا المستخدم
-      title: لا يوجد مستخدم أو رسالة
+      title: لا يوجد مثل هذا المستخدم
     outbox: 
       date: التاريخ
       inbox: صندوق البريد الوارد
@@ -974,6 +986,9 @@ ar:
       title: اقرأ الرسالة
       to: إلى
       unread_button: علّم كغير مقروءة
+      wrong_user: أنت مسجل دخول باسم '{{user}}' ولكن الرسالة التي طلبت قراءتها لم تكن من أو إلى ذلك المستخدم. يرجى تسجيل الدخول كمستخدم صحيح للرد.
+    reply: 
+      wrong_user: أنت مسجل دخول باسم '{{user}}' ولكن الرسالة التي طلبت الرد عليها لم تكن مرسلة لذلك المستخدم. يرجى تسجيل الدخول كمستخدم صحيح للرد.
     sent_message_summary: 
       delete_button: احذف
   notifier: 
@@ -994,8 +1009,9 @@ ar:
       hopefully_you_1: شخص ما (نأمل أنت) يرغب بتغيير عنوان بريده الإلكتروني على
       hopefully_you_2: "{{server_url}} إلى {{new_address}}."
     friend_notification: 
+      befriend_them: يمكنك أيضًا إضافتهم كصديق على {{befriendurl}}.
       had_added_you: "{{user}} قام بإضافتك كصديق على خريطة الشارع المفتوحة."
-      see_their_profile: يمكنك أن تشاهد ملفه الشخصي على {{userurl}} وإضافته كصديق أيضًا إن كنت ترغب في ذلك.
+      see_their_profile: يمكنك أن تشاهد ملفهم الشخصي على {{userurl}}.
       subject: "[خريطة الشارع المفتوحة] {{user}} أضافك كصديق."
     gpx_notification: 
       and_no_tags: ولا يوجد سمات.
@@ -1222,6 +1238,9 @@ ar:
     sidebar: 
       close: أغلق
       search_results: نتائج البحث
+  time: 
+    formats: 
+      friendly: "%e %B %Y في %H:%M"
   trace: 
     create: 
       trace_uploaded: لقد تم تحميل ملفك الجي بي إكس ويتنظر الإدراج في قاعدة البيانات. وهذا يحدث عادًة خلال نصف ساعة، وسيتم إرسال رسالة إلكترونية لك عند الانتهاء.
@@ -1324,15 +1343,20 @@ ar:
   user: 
     account: 
       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 languages: "اللغات المفضّلة:"
       profile description: "وصف الملف الشخصي:"
@@ -1346,6 +1370,7 @@ ar:
       public editing note: 
         heading: تعديل عام
         text: حاليًا تعديلاتك تظهر بشكل مجهول ولا يمكن للناس إرسال رسائل لك أو رؤية موقعك. لإظهار ما قمت بتعديله وللسماح للناس بالاتصال بك من خلال الموقع، انقر على الزر أدناه. <b>منذ التغيير إلى الأي بي أي 0.6، فقط المستخدمين العلنيين يمكنه تحرير بيانات الخريطة</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: عدّل الحساب
@@ -1364,9 +1389,6 @@ ar:
       success: تم تأكيد عنوان بريدك الإلكتروني، شكرًا للاشتراك!
     filter: 
       not_an_administrator: عليك أن تكون إداري لتنفيذ هذا الإجراء.
-    friend_map: 
-      nearby mapper: "مخطط بالجوار: [[nearby_user]]"
-      your location: موقعك
     go_public: 
       flash success: جميع تعديلاتك الآن عامة، ومسموح لك بالتعديل الآن.
     login: 
@@ -1379,7 +1401,12 @@ ar:
       lost password link: أنسيت كلمة المرور؟
       password: "كلمة المرور:"
       please login: من فضلك لُج أو {{create_user_link}}.
+      remember: "تذكرني:"
       title: ولوج
+    logout: 
+      heading: الخروج من خريطة الشارع المفتوحة
+      logout_button: اخرج
+      title: اخرج
     lost_password: 
       email address: "عنوان البريد الإلكتروني:"
       heading: أنسيت كلمة المرور؟
@@ -1412,6 +1439,10 @@ ar:
       body: عذرًا، لا يوجد مستخدم بالاسم {{user}}. يرجى تدقيق الاسم، أو ربما يكون الرابط الذي تم النقر عليه خاطئ.
       heading: المستخدم {{user}} غير موجود
       title: مستخدم غير موجود
+    popup: 
+      friend: صديق
+      nearby mapper: مخطط بالجوار
+      your location: موقعك
     remove_friend: 
       not_a_friend: "{{name}} ليس من أحد أصدقائك."
       success: تم إزالة {{name}} من قائمة أصدقائك.
@@ -1428,17 +1459,14 @@ ar:
     view: 
       activate_user: نشّط هذا المستخدم
       add as friend: أضف كصديق
-      add image: أضف صورة
       ago: ({{time_in_words_ago}})
       block_history: اعرض العرقلات الواصلة
       blocks by me: العرقلات بواسطتي
       blocks on me: العرقلات علي
-      change your settings: غيّر إعداداتك
       confirm: أكّد
       create_block: امنع هذا المستخدم
       created from: "أُنشىء من:"
       deactivate_user: احذف هذا المستخدم
-      delete image: احذف الصورة
       delete_user: احذف هذا المستخدم
       description: الوصف
       diary: يومية
@@ -1454,12 +1482,11 @@ ar:
       my edits: مساهماتي
       my settings: إعداداتي
       my traces: آثاري
-      my_oauth_details: اعرض تفاصيل OAuth الخاص بي
+      nearby users: "مستخدمين أيضًا بالجوار:"
-      nearby users: "مستخدمين بالجوار:"
       new diary entry: مدخلة يومية جديدة
       no friends: لم تقم بإضافة أي أصدقاء بعد.
-      no home location: لم يتم تحديد الموقع.
+      no nearby users: لا يوجد بعد المزيد من المستخدمين أفصحوا عن تخطيطهم بالجوار.
-      no nearby users: لا يوجد بعد مستخدمين أفصحوا عن تخطيطهم بالجوار.
+      oauth settings: إعدادات oauth
       remove as friend: أزل كصديق
       role: 
         administrator: هذا المستخدم إداري
@@ -1474,8 +1501,6 @@ ar:
       settings_link_text: إعدادات
       traces: آثار
       unhide_user: أظهر هذا المستخدم
-      upload an image: حمّل صورة
-      user image heading: صورة المستخدم
       user location: الموقع
       your friends: أصدقاؤك
   user_block: 

config/locales/arz.yml

@@ -818,7 +818,6 @@ arz:
     donate: ادعم خريطه الشارع المفتوحه ب{{link}} لتمويل ترقيه العتاد.
     donate_link_text: التبرع
     edit: عدّل هذه الخريطة
-    edit_tooltip: يمكنك تعديل هذه الخريطه، من فضلك اقرأ صفحه الدليل قبل البدء
     export: صدِّر
     export_tooltip: صدّر بيانات الخريطة
     gps_traces: آثار جى بى أس
@@ -826,7 +825,6 @@ arz:
     help_wiki: المساعده والويكي
     help_wiki_tooltip: المساعده وموقع الويكى للمشروع
     history: تاريخ
-    history_tooltip: تاريخ حزمه التغييرات
     home: الصفحه الرئيسية
     home_tooltip: اذهب إلى الصفحه الرئيسية
     inbox: صندوق البريد ({{count}})
@@ -866,10 +864,6 @@ arz:
     view_tooltip: اعرض الخرائط
     welcome_user: مرحبًا بك، {{user_link}}
     welcome_user_link_tooltip: صفحه المستخدم الخاصه بك
-  map: 
-    coordinates: "الإحداثيات:"
-    edit: عدّل
-    view: اعرض
   message: 
     delete: 
       deleted: حُذفت الرسالة
@@ -1289,9 +1283,6 @@ arz:
       success: تم تأكيد عنوان بريدك الإلكترونى، شكرًا للاشتراك!
     filter: 
       not_an_administrator: عليك أن تكون إدارى لتنفيذ هذا الإجراء.
-    friend_map: 
-      nearby mapper: "مخطط بالجوار: [[nearby_user]]"
-      your location: موقعك
     go_public: 
       flash success: جميع تعديلاتك الآن عامه، ومسموح لك بالتعديل الآن.
     login: 
@@ -1337,6 +1328,9 @@ arz:
       body: عذرًا، لا يوجد مستخدم بالاسم {{user}}. يرجى تدقيق الاسم، أو ربما يكون الرابط الذى تم النقر عليه خاطئ.
       heading: المستخدم {{user}} غير موجود
       title: مستخدم غير موجود
+    popup: 
+      nearby mapper: مخطط بالجوار
+      your location: موقعك
     remove_friend: 
       not_a_friend: "{{name}} ليس من أحد أصدقائك."
       success: تم إزاله {{name}} من قائمه أصدقائك.
@@ -1353,17 +1347,14 @@ arz:
     view: 
       activate_user: نشّط هذا المستخدم
       add as friend: أضف كصديق
-      add image: أضف صورة
       ago: (منذ {{time_in_words_ago}})
       block_history: اعرض العرقلات الواصلة
       blocks by me: العرقلات بواسطتي
       blocks on me: العرقلات علي
-      change your settings: غيّر إعداداتك
       confirm: أكّد
       create_block: امنع هذا المستخدم
       created from: "أُنشىء من:"
       deactivate_user: احذف هذا المستخدم
-      delete image: احذف الصورة
       delete_user: احذف هذا المستخدم
       description: الوصف
       diary: يومية
@@ -1379,11 +1370,9 @@ arz:
       my edits: مساهماتي
       my settings: إعداداتي
       my traces: آثاري
-      my_oauth_details: اعرض تفاصيل OAuth الخاص بي
       nearby users: "مستخدمين بالجوار:"
       new diary entry: مدخله يوميه جديدة
       no friends: لم تقم بإضافه أى أصدقاء بعد.
-      no home location: لم يتم تحديد الموقع.
       no nearby users: لا يوجد بعد مستخدمين أفصحوا عن تخطيطهم بالجوار.
       remove as friend: أزل كصديق
       role: 
@@ -1399,8 +1388,6 @@ arz:
       settings_link_text: إعدادات
       traces: آثار
       unhide_user: أظهر هذا المستخدم
-      upload an image: حمّل صورة
-      user image heading: صوره المستخدم
       user location: الموقع
       your friends: أصدقاؤك
   user_block: 

config/locales/be-TARASK.yml

@@ -3,6 +3,7 @@
 # Export driver: syck
 # Author: EugeneZelenko
 # Author: Jim-by
+# Author: Wizardist
 be-TARASK: 
   activerecord: 
     attributes: 
@@ -30,6 +31,8 @@ be-TARASK:
       version: "Вэрсія:"
     map: 
       deleted: Выдаленая
+      larger: 
+        way: Паказаць шлях на большай мапе
       loading: Загрузка…
     node: 
       download_xml: Загрузіць XML
@@ -76,6 +79,9 @@ be-TARASK:
         type: 
           node: Вузел
           way: Шлях
+      wait: Пачакайце...
+    tag_details: 
+      tags: "Меткі:"
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} ці {{edit_link}}"
       download_xml: Загрузіць XML
@@ -89,6 +95,10 @@ be-TARASK:
     way_history: 
       download_xml: Загрузіць XML
       view_details: паказаць падрабязнасьці
+      way_history_title: "Гісторыя зьменаў шляху: {{way_name}}"
+  changeset: 
+    list: 
+      description: Апошнія зьмены
   diary_entry: 
     edit: 
       language: "Мова:"
@@ -110,9 +120,6 @@ be-TARASK:
     edit: Рэдагаваць
     export: Экспартаваць
     history: Гісторыя
-  map: 
-    coordinates: "Каардынаты:"
-    edit: Рэдагаваць
   message: 
     inbox: 
       subject: Тэма
@@ -132,6 +139,8 @@ be-TARASK:
     edit: 
       submit: Рэдагаваць
   trace: 
+    create: 
+      upload_trace: Загрузіць GPS-трэк
     edit: 
       description: "Апісаньне:"
       download: загрузіць
@@ -168,8 +177,6 @@ be-TARASK:
       reset: Ачысьціць пароль
       title: Ачысьціць пароль
     view: 
-      add image: Дадаць выяву
-      delete image: Выдаліць выяву
       description: Апісаньне
       edits: рэдагаваньні
       my settings: мае ўстаноўкі

config/locales/be.yml

@@ -282,7 +282,6 @@ be:
     donate: Падтрымайце OpenStreetMap {{link}} у фонд абнаўлення тэхнікі.
     donate_link_text: ахвяраваннем
     edit: Змяніць
-    edit_tooltip: Рэдагаваць карты
     export: Экспарт
     export_tooltip: Экспартаваць данныя карты
     gps_traces: GPS Трэкі
@@ -291,7 +290,6 @@ be:
     help_wiki_tooltip: Даведка і сайт Вікі
     help_wiki_url: http://wiki.openstreetmap.org/wiki/RU:Main_Page?uselang=be
     history: Гісторыя
-    history_tooltip: Гісторыя змен
     home: дамоў
     home_tooltip: Паказаць маю хату
     inbox: уваходныя ({{count}})
@@ -327,10 +325,6 @@ be:
     view_tooltip: Паглядзець карты
     welcome_user: Вітаем, {{user_link}}
     welcome_user_link_tooltip: Ваша старонка карыстача
-  map: 
-    coordinates: "Каардынаты:"
-    edit: Змяніць
-    view: Карта
   message: 
     inbox: 
       date: Дата
@@ -593,9 +587,6 @@ be:
       heading: Пацвердзіць змену паштовага адрасу
       press confirm button: Націсніце кнопку, каб пацвердзіць ваш новы паштовы адрас.
       success: Ваш адрас пацверджаны, дзякуй за рэгістрацыю!
-    friend_map: 
-      nearby mapper: "Карыстальнік: [[nearby_user]]"
-      your location: Ваша месцазнаходжанне
     go_public: 
       flash success: Усе вашыя змены цяпер публічныя, і вам цяпер дазволена рэдагаванне
     login: 
@@ -639,6 +630,9 @@ be:
       body: Прабачце, карыстальнік {{user}} не знойдзены. Please check your spelling, Калі ласка, праверце свой правапіс, ці, магчыма, вам далі няправільную спасылку.
       heading: Карыстальнік {{user}} не існуе
       title: Няма такога карыстальніка
+    popup: 
+      nearby mapper: Карыстальнік
+      your location: Ваша месцазнаходжанне
     remove_friend: 
       not_a_friend: "{{name}} не з'яўляецца вашым сябрам."
       success: "{{name}} выдалены са спіса сяброў."
@@ -649,10 +643,7 @@ be:
       flash success: Дамашняе месцазнаходжанне паспяхова запісана
     view: 
       add as friend: дадаць у сябры
-      add image: Дадаць выяву
       ago: ({{time_in_words_ago}} таму)
-      change your settings: змяніць вашыя настаўленні
-      delete image: Выдаліць выяву
       description: Апісанне
       diary: дзённік
       edits: змены
@@ -666,13 +657,10 @@ be:
       nearby users: "Карыстальнікі непадалёку:"
       new diary entry: новы запіс у дзённіку
       no friends: Вы пакуль не дадалі нікога ў сябры.
-      no home location: Карыстальнік не паказаў сваё месцазнаходжанне.
       no nearby users: Пакуль няма карыстальнікаў, што адмецілі сваё месцазнаходжанне непадалёку.
       remove as friend: выдаліць з сяброў
       send message: даслаць паведамленне
       settings_link_text: настаўленняў
       traces: трэкі
-      upload an image: Зацягнуць выяву
-      user image heading: Выява карыстальніка
       user location: Месцазнаходжанне
       your friends: Вашыя сябры

config/locales/bg.yml

@@ -4,6 +4,11 @@
 # Author: DCLXVI
 bg: 
   browse: 
+    changeset_details: 
+      belongs_to: "Принадлежи към:"
+    common_details: 
+      changeset_comment: "Коментар:"
+      version: "Версия:"
     containing_relation: 
       entry: Релация {{relation_name}}
       entry_role: Релация {{relation_name}} (като {{relation_role}})
@@ -31,6 +36,10 @@ bg:
     paging_nav: 
       of: от
       showing_page: Показване на страница
+    relation: 
+      download_xml: Изтегляне на XML
+    relation_details: 
+      members: "Членове:"
     relation_history: 
       download: "{{download_xml_link}} или {{view_details_link}}"
       download_xml: Изтегляне на XML
@@ -39,6 +48,11 @@ bg:
       type: 
         node: Възел
         relation: Релация
+    start_rjs: 
+      details: Подробности
+      loading: Зареждане...
+      object_list: 
+        details: Подробности
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} или {{edit_link}}"
       download_xml: Изтегляне на XML
@@ -64,6 +78,9 @@ bg:
     view: 
       login: Влизане
       save_button: Съхраняване
+  export: 
+    start: 
+      licence: Лиценз
   message: 
     new: 
       send_button: Изпращане
@@ -73,3 +90,46 @@ bg:
       subject: Тема
       to: До
       unread_button: Отбелязване като непрочетено
+  notifier: 
+    diary_comment_notification: 
+      hi: Здравейте ((to_user)),
+    email_confirm: 
+      subject: "[OpenStreetMap] Потвърждаване на вашия адрес за е-поща"
+  oauth_clients: 
+    edit: 
+      submit: Редактиране
+    form: 
+      name: Име
+    new: 
+      submit: Регистриране
+  trace: 
+    edit: 
+      description: "Описание:"
+      edit: редактиране
+      filename: "Име на файл:"
+      save_button: Съхраняване на промените
+    no_such_user: 
+      title: Няма такъв потребител
+    trace: 
+      edit: редактиране
+      in: в
+    trace_form: 
+      help: Помощ
+    view: 
+      edit: редактиране
+      filename: "Име на файл:"
+  user: 
+    reset_password: 
+      password: "Парола:"
+  user_block: 
+    partial: 
+      creator_name: Създател
+      display_name: Блокиран потребител
+      edit: Редактиране
+      reason: Причина за блокиране
+      status: Статут
+  user_role: 
+    grant: 
+      confirm: Потвърждаване
+    revoke: 
+      confirm: Потвърждаване

config/locales/br.yml

@@ -214,6 +214,12 @@ br:
       zoom_or_select: Zoumañ pe diuzañ un takad eus ar gartenn da welet
     tag_details: 
       tags: "Balizennoù :"
+    timeout: 
+      type: 
+        changeset: strollad kemmoù
+        node: skoulm
+        relation: darempred
+        way: hent
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} pe {{edit_link}}"
       download_xml: Pellgargañ XML
@@ -277,7 +283,7 @@ br:
       comment_link: Addisplegañ an enmoned-mañ
       confirm: Kadarnaat
       edit_link: Aozañ an enmoned-mañ
-      hide_link: Kuzhat an ebarzhadenn-mañ
+      hide_link: Kuzhat an elfenn-mañ
       posted_by: Postet gant {{link_user}} da {{created}} e {{language_link}}
       reply_link: Respont d'an enmoned-mañ
     edit: 
@@ -311,6 +317,10 @@ br:
       recent_entries: "Enmonedoù nevez en deizlevr :"
       title: Deizlevrioù an implijerien
       user_title: Deizlevr {{user}}
+    location: 
+      edit: Kemmañ
+      location: "Lec'hiadur :"
+      view: "Lec'hiadur :"
     new: 
       title: Enmoned nevez en deizlevr
     no_such_entry: 
@@ -326,7 +336,7 @@ br:
       login: Kevreañ
       login_to_leave_a_comment: "{{login_link}} evit lezel un addispleg"
       save_button: Enrollañ
-      title: Deizlevrioù an implijerien | {{user}}
+      title: Deizlevr {{user}} | {{title}}
       user_title: Deizlevr {{user}}
   export: 
     start: 
@@ -350,6 +360,8 @@ br:
       output: Er-maez
       paste_html: Pegañ HTML evit bezañ enkorfet en ul lec'hienn web
       scale: Skeuliad
+      too_large: 
+        heading: Zonenn re vras
       zoom: Zoum
     start_rjs: 
       add_marker: Ouzhpennañ ur merker d'ar gartenn
@@ -385,6 +397,7 @@ br:
       other: war-dro {{count}} km
       zero: nebeutoc'h eget 1 km
     results: 
+      more_results: Muioc'h a zisoc'hoù
       no_results: N'eus bet kavet respont ebet
     search: 
       title: 
@@ -574,7 +587,7 @@ br:
           icon: Arlun
           manor: Maner
           memorial: Kounlec'h
-          mine: Maen-gleuz
+          mine: Mengleuz
           monument: Monumant
           museum: Mirdi
           ruins: Dismantroù
@@ -600,7 +613,7 @@ br:
           landfill: Diskarg
           meadow: Prad
           military: Takad milourel
-          mine: Maen-gleuz
+          mine: Mengleuz
           mountain: Menez
           nature_reserve: Gwarezva natur
           park: Park
@@ -658,7 +671,7 @@ br:
           moor: Lanneier
           mud: Fank
           peak: Pikern
-          point: Beg
+          point: Poent
           reef: Karreg
           ridge: Kribenn
           river: Stêr
@@ -840,21 +853,23 @@ br:
         cycle_map: Kelc'hiad kartenn
         noname: AnvEbet
     site: 
+      edit_disabled_tooltip: Zoumañ da zegas kemmoù war ar gartenn
+      edit_tooltip: Kemmañ ar gartenn
       edit_zoom_alert: Ret eo deoc'h zoumañ evit aozañ ar gartenn
+      history_disabled_tooltip: Zoumañ evit gwelet ar c'hemmoù degaset d'an takad-mañ
+      history_tooltip: Gwelet ar c'hemmoù er zonenn-se
       history_zoom_alert: Ret eo deoc'h zoumañ evit gwelet istor an aozadennoù
   layouts: 
     donate: Skoazellit OpenStreetMap dre {{link}} d'an Hardware Upgrade Fund.
     donate_link_text: oc'h ober un donezon
     edit: Aozañ
-    edit_tooltip: Aozañ kartennoù
     export: Ezporzhiañ
     export_tooltip: Ezporzhiañ roadennoù ar gartenn
     gps_traces: Roudoù GPS
-    gps_traces_tooltip: Merañ ar roudoù
+    gps_traces_tooltip: Merañ ar roudoù GPS
     help_wiki: Skoazell & Wiki
     help_wiki_tooltip: Skoazell & lec'hienn Wiki evit ar raktres
     history: Istor
-    history_tooltip: Istor ar strollad kemmoù
     home: degemer
     home_tooltip: Mont da lec'h ar gêr
     inbox: boest resev ({{count}})
@@ -864,7 +879,8 @@ br:
       zero: N'eus kemennadenn anlennet ebet en ho poest resev
     intro_1: OpenStreetMap zo ur gartenn digoust eus ar bed a-bezh, a c'haller kemmañ. Graet eo gant tud eveldoc'h.
     intro_2: Gant OpenStreetMap e c'hallit gwelet, aozañ hag implijout roadennoù douaroniel eus forzh pelec'h er bed.
-    intro_3: Herberc'hiet eo OpenStreetMap gant {{ucl}} et {{bytemark}}.
+    intro_3: Herberc'hiet eo OpenStreetMap gant {{ucl}} et {{bytemark}}. Skoazellerien all eus ar raktres a vez rollet war ar {{partners}}.
+    intro_3_partners: wiki
     license: 
       title: OpenStreetMap data zo dindan an aotre-implijout Creative Commons Attribution-Share Alike 2.0
     log_in: kevreañ
@@ -889,13 +905,9 @@ br:
     user_diaries: Deizlevrioù an implijer
     user_diaries_tooltip: Gwelet deizlevrioù an implijerien
     view: Gwelet
-    view_tooltip: Gwelet ar c'hartennoù
+    view_tooltip: Gwelet ar gartenn
     welcome_user: Degemer mat, {{user_link}}
     welcome_user_link_tooltip: Ho pajenn implijer
-  map: 
-    coordinates: "Daveennoù :"
-    edit: Aozañ
-    view: Gwelet
   message: 
     delete: 
       deleted: Kemennadenn dilamet
@@ -926,10 +938,14 @@ br:
       send_message_to: Kas ur gemennadenn nevez da {{name}}
       subject: Danvez
       title: Kas ur gemennadenn
+    no_such_message: 
+      body: Ho tigarez, n'eus kemennadenn ebet gant an id-se.
+      heading: N'eus ket eus ar gemennadenn-se
+      title: N'eus ket eus ar gemennadenn-se
     no_such_user: 
-      body: Ho tigarez, n'eus implijer ebet na kemennadenn ebet gant an anv pe an id-se
+      body: Ho tigarez, n'eus implijer ebet gant an anv.
-      heading: N'eus ket un implijer pe ur gemennadenn evel-se
+      heading: N'eus implijer ebet evel-se
-      title: N'eus ket un implijer pe ur gemennadenn evel-se
+      title: N'eus implijer ebet evel-se
     outbox: 
       date: Deiziad
       inbox: boest resev
@@ -973,8 +989,9 @@ br:
       hopefully_you_1: Unan bennak (c'hwi moarvat) a garfe cheñch e chomlec'h postel da
       hopefully_you_2: "{{server_url}} da {{new_address}}."
     friend_notification: 
+      befriend_them: "Tu 'zo deoc'h e ouzhpennañ evel ur mignon amañ : {{befriendurl}}."
       had_added_you: "{{user}} en deus hoc'h ouzhpennet evel mignon war OpenStreetMap."
-      see_their_profile: Gallout a rit gwelet o frofil war {{userurl}} hag o ouzhpennañ evel mignoned ma karit.
+      see_their_profile: "Gallout a rit gwelet o frofil amañ : {{userurl}}."
       subject: "[OpenStreetMap] {{user}} en deus hoc'h ouzhpennet evel mignon"
     gpx_notification: 
       and_no_tags: ha balizenn ebet.
@@ -1200,6 +1217,9 @@ br:
     sidebar: 
       close: Serriñ
       search_results: Disoc'hoù an enklask
+  time: 
+    formats: 
+      friendly: "%e %B %Y da %H:%M"
   trace: 
     create: 
       trace_uploaded: Kaset eo bet ho restr GPX hag emañ en gortoz a vezañ ensoc'het en diaz roadennoù. C'hoarvezout a ra dindan un hanter-eurvezh peurvuiañ, ha kaset e vo ur postel deoc'h pa vo echu.
@@ -1271,6 +1291,10 @@ br:
       traces_waiting: Bez' hoc'h eus {{count}} roud a c'hortoz bezañ kaset. Gwell e vefe gortoz a-raok kas re all, evit chom hep stankañ al lostennad evit an implijerien all.
     trace_optionals: 
       tags: Balizennoù
+    trace_paging_nav: 
+      next: War-lerc'h »
+      previous: "« A-raok"
+      showing_page: O tiskouez ar bajenn {{page}}
     view: 
       delete_track: Dilemel ar roudenn-mañ
       description: "Deskrivadur :"
@@ -1297,14 +1321,21 @@ br:
       trackable: A c'haller treseal (rannet evel dizanv hepken, poent uzhiet gant deiziadoù)
   user: 
     account: 
+      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)
       flash update success: Hizivaet eo bet titouroù an implijer.
       flash update success confirm needed: Hizivaet eo bet titouroù an implijer. Gwiriit ho posteloù evit kadarnaat ho chomlec'h postel nevez.
       home location: "Lec'hiadur ar gêr :"
+      image: "Skeudenn :"
+      image size hint: (ar skeudennoù karrezenneg gant ar stumm 100×100 pixel a zo ar re wellañ)
+      keep image: Derc'hel ar skeudenn a-vremañ
       latitude: "Ledred :"
       longitude: "Hedred :"
       make edits public button: Lakaat ma holl aozadennoù da vezañ foran
       my settings: Ma arventennoù
+      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 languages: "Yezhoù gwellañ karet :"
       profile description: "Deskrivadur ar profil :"
@@ -1318,6 +1349,7 @@ br:
       public editing note: 
         heading: Kemm foran
         text: Evit poent ez eo ho embannoù dianv, dre-se ne c'hell den skrivañ deoc'h pe gwelet ho lec'hiadur. Evit diskouez ar pezh o peus embannet ha reiñ an tu d'an dud da vont e darempred ganeoc'h dre al lec'hienn, klikit war al liamm da heul. <b>Abaoe ar c'hemm davet ar stumm API 0.6, ne c'hell nemet an dud gant an doare "kemmoù foran" embann kartennoù</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">gouzout hiroc'h</a>).<ul><li>Ne vo ket roet ho chomlec'h e-mail d'an dud o kregiñ ganti.</li><li>An obererezh-se ne c'hell ket bezañ nullet hag an implijerien nevez a zo en doare "kemmoù foran" dre ziouer.</li></ul>
+      replace image: Erlec'hiañ ar skeudenn a-vremañ
       return to profile: Distreiñ d'ar profil
       save changes button: Enrollañ ar c'hemmoù
       title: Aozañ ar gont
@@ -1336,9 +1368,6 @@ br:
       success: Kadarnaet eo ho chomlec'h postel, trugarez evit bezañ en em enskrivet !
     filter: 
       not_an_administrator: Ret eo deoc'h bezañ merour evit kas an ober-mañ da benn.
-    friend_map: 
-      nearby mapper: "Kartennour en ardremez : [[nearby_user]]"
-      your location: Ho lec'hiadur
     go_public: 
       flash success: Foran eo hoc'h holl aozadennoù bremañ, ha n'oc'h ket aotreet da aozañ.
     login: 
@@ -1351,7 +1380,12 @@ br:
       lost password link: Kollet hoc'h eus ho ker-tremen ?
       password: "Ger-tremen :"
       please login: Kevreit, mar plij, pe {{create_user_link}}.
+      remember: "Derc'hel soñj ac'hanon :"
       title: Kevreañ
+    logout: 
+      heading: Kuitaat OpenStreetMap
+      logout_button: Kuitaat
+      title: Kuitaat
     lost_password: 
       email address: "Chomlec'h postel :"
       heading: Ankouaet hoc'h eus ho ker-tremen ?
@@ -1384,6 +1418,10 @@ br:
       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
+    popup: 
+      friend: Mignon
+      nearby mapper: Kartennour en ardremez
+      your location: Ho lec'hiadur
     remove_friend: 
       not_a_friend: "{{name}} n'eo ket unan eus ho mignoned."
       success: "{{name}} zo bet lamet eus ho mignoned."
@@ -1400,17 +1438,14 @@ br:
     view: 
       activate_user: gweredekaat an implijer-mañ
       add as friend: Ouzhpennañ evel mignon
-      add image: Ouzhpennañ ur skeudenn
       ago: ({{time_in_words_ago}} zo)
       block_history: gwelet ar stankadurioù resevet
       blocks by me: stankadurioù graet ganin
       blocks on me: Stankadurioù evidon
-      change your settings: cheñch hoc'h arventennoù
       confirm: Kadarnaat
       create_block: stankañ an implijer-mañ
       created from: "Krouet diwar :"
       deactivate_user: diweredekaat an implijer-mañ
-      delete image: Dilemel ar skeudenn
       delete_user: dilemel an implijer-mañ
       description: Deskrivadur
       diary: deizlevr
@@ -1426,12 +1461,11 @@ br:
       my edits: ma aozadennoù
       my settings: ma arventennoù
       my traces: ma roudoù
-      my_oauth_details: Gwelet ma munudoù OAuth
+      nearby users: "Implijerien all tost deoc'h :"
-      nearby users: "Implijerien tost deoc'h :"
       new diary entry: enmoned nevez en deizlevr
       no friends: N'hoc'h eus ouzhpennet mignon ebet c'hoazh.
-      no home location: N'eus bet lakaet lec'hiadur ebet evit ar gêr.
+      no nearby users: N'eus implijer ebet all en ardremez c'hoazh.
-      no nearby users: N'eus implijer ebet en ardremez c'hoazh.
+      oauth settings: arventennoù oauth
       remove as friend: Lemel evel mignon
       role: 
         administrator: Ur merour eo an implijer-mañ
@@ -1446,8 +1480,6 @@ br:
       settings_link_text: arventennoù
       traces: roudoù
       unhide_user: Diguzhat an implijer-mañ
-      upload an image: Kas ur skeudenn
-      user image heading: Skeudenn implijer
       user location: Lec'hiadur an implijer
       your friends: Ho mignoned
   user_block: 

config/locales/ca.yml

@@ -86,6 +86,7 @@ ca:
       title: Conjunt de canvis
     changeset_details: 
       belongs_to: "Pertany a:"
+      bounding_box: "Caixa contenidora:"
       box: caixa
       closed_at: "Tancat el:"
       created_at: "Creat el:"
@@ -238,30 +239,43 @@ ca:
       user: Usuari
     list: 
       description: Canvis recents
+      description_bbox: Conjunt de canvis dins de {{bbox}}
+      description_user_bbox: Conjunt de canvis de {{user}} dins de {{bbox}}
       heading: Conjunt de canvis
       heading_bbox: Conjunt de canvis
       heading_user: Conjunt de canvis
       heading_user_bbox: Conjunt de canvis
       title: Conjunt de canvis
+      title_bbox: Conjunt de canvis dins de {{bbox}}
+      title_user: Conjunt de canvis de {{user}}
+      title_user_bbox: Conjunt de canvis de {{user}} dins de {{bbox}}
   diary_entry: 
     diary_comment: 
       confirm: Confirmar
     diary_entry: 
       confirm: Confirmar
     edit: 
+      body: "Cos del missatge:"
       language: Idioma
       latitude: "Latitud:"
+      location: "Ubicació:"
       longitude: "Longitud:"
       save_button: Guardar
       subject: "Assumpte:"
+    location: 
+      edit: Edita
+      location: "Ubicació:"
+      view: Veure
     view: 
       login: Accés
       save_button: Desa
   export: 
     start: 
+      area_to_export: Àrea a exportar
       export_button: Exporta
       export_details: Les dades l'OpenStreetMap són publicades sota el termes de la <a href="http://creativecommons.org/licenses/by-sa/2.0/">llicència Creative Commons Attribution-ShareAlike 2.0</a>.
       format: Format
+      format_to_export: Format d'exportació
       image_size: Mida de la imatge
       latitude: "Lat:"
       licence: Llicència
@@ -269,15 +283,24 @@ ca:
       mapnik_image: Imatge de Mapnik
       max: màx
       options: Opcions
+      osm_xml_data: OpenStreetMap XML Data
+      osmarender_image: Imatge de Osmarender
       output: Sortida
       scale: Escala
+      too_large: 
+        heading: L'àrea és massa gran
       zoom: Zoom
     start_rjs: 
       export: Exporta
   geocoder: 
     description: 
+      title: 
+        geonames: Localització des de <a href="http://www.geonames.org/">GeoNames</a>
+        osm_nominatim: Localització des de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
       types: 
         cities: Ciutats
+        places: Llocs
+        towns: Municipis
     description_osm_namefinder: 
       prefix: "{{distance}} {{direction}} de {{type}}"
     direction: 
@@ -311,6 +334,8 @@ ca:
           auditorium: Auditori
           bank: Banc
           bar: Bar
+          bench: Banc
+          bicycle_rental: Lloguer de bicicletes
           brothel: Prostíbul
           bureau_de_change: Oficina de canvi
           bus_station: Estació d'autobusos
@@ -318,10 +343,12 @@ ca:
           car_rental: Lloguer de cotxes
           casino: Casino
           cinema: Cinema
+          clinic: Clínica
           club: Club
           courthouse: Jutjat
           crematorium: Crematori
           dentist: Dentista
+          doctors: Metges
           drinking_water: Aigua potable
           driving_school: Autoescola
           embassy: Ambaixada
@@ -334,6 +361,7 @@ ca:
           hospital: Hospital
           hotel: Hotel
           ice_cream: Gelat
+          kindergarten: Jardí d'infància
           library: Biblioteca
           market: Mercat
           nightclub: Club nocturn
@@ -341,19 +369,25 @@ ca:
           parking: Pàrquing
           pharmacy: Farmàcia
           place_of_worship: Lloc de culte
+          police: Policia
+          post_box: Bustia
           post_office: Oficina de correus
+          preschool: Pre-Escola
           prison: Presó
+          pub: Pub
           public_building: Edifici públic
           recycling: Punt de reciclatge
           restaurant: Restaurant
           sauna: Sauna
           school: Escola
+          shelter: Refugi
           shop: Botiga
           social_club: Club social
           supermarket: Supermercat
           taxi: Taxi
           telephone: Telèfon públic
           theatre: Teatre
+          toilets: Banys
           townhall: Ajuntament
           university: Universitat
           wifi: Accés a internet WiFi
@@ -385,7 +419,9 @@ ca:
           emergency_access_point: Accés d'emergència
           footway: Sendera
           gate: Porta
+          path: Camí
           primary_link: Carretera principal
+          residential: Residencial
           road: Carretera
           secondary: Carretera secundària
           secondary_link: Carretera secundària
@@ -411,6 +447,7 @@ ca:
         landuse: 
           cemetery: Cementiri
           commercial: Zona comercial
+          construction: Construcció
           farm: Granja
           forest: Bosc
           industrial: Zona industrial
@@ -434,6 +471,7 @@ ca:
           sports_centre: Centre esportiu
           stadium: Estadi
           swimming_pool: Piscina
+          water_park: Parc aquàtic
         natural: 
           bay: Badia
           beach: Platja
@@ -443,9 +481,11 @@ ca:
           cliff: Cingle
           coastline: Litoral
           crater: Cràter
+          fell: Forest
           fjord: Fiord
           geyser: Guèiser
           glacier: Glacera
+          heath: Bruguerar
           hill: Pujol
           island: Illa
           moor: Amarratge
@@ -453,11 +493,13 @@ ca:
           peak: Pic
           point: Punt
           reef: Escull
+          ridge: Cresta
           river: Riu
           rock: Roca
           scree: Pedregar
           shoal: Banc
           spring: Deu
+          strait: Estret
           tree: Arbre
           valley: Vall
           volcano: Volcà
@@ -471,9 +513,13 @@ ca:
           country: País
           county: Comtat
           farm: Granja
+          hamlet: Aldea
           house: Casa
           houses: Cases
           island: Illa
+          islet: Illot
+          locality: Localitat
+          moor: Amarrador
           municipality: Municipi
           postcode: Codi postal
           region: Regió
@@ -482,6 +528,7 @@ ca:
           subdivision: Subdivisió
           suburb: Suburbi
           town: Poble
+          village: Aldea
         railway: 
           level_crossing: Pas a nivell
           monorail: Monorail
@@ -490,6 +537,7 @@ ca:
           tram_stop: Parada de tramvia
         shop: 
           bakery: Fleca
+          bicycle: Tenda de bicicletes
           books: Llibreria
           butcher: Carnisseria
           car_repair: Reparació d'automòbils
@@ -499,19 +547,25 @@ ca:
           hairdresser: Perruqueria o barberia
           jewelry: Joieria
           laundry: Bugaderia
+          mall: Centre comercial
           market: Mercat
           shoes: Sabateria
           supermarket: Supermercat
           travel_agency: Agència de viatges
         tourism: 
+          alpine_hut: Cabanya alpina
           artwork: Il·lustració
           attraction: Atracció
           bed_and_breakfast: Llist i esmorzar (B&B)
+          cabin: Cabanya
+          camp_site: Campament
+          caravan_site: Càmping per a caravanes
           chalet: Xalet
           guest_house: Alberg
           hostel: Hostal
           hotel: Hotel
           information: Informació
+          lean_to: Nau
           motel: Motel
           museum: Museu
           picnic_site: Àrea de pícnic
@@ -520,6 +574,7 @@ ca:
           viewpoint: Mirador
           zoo: Zoològic
         waterway: 
+          canal: Canal
           ditch: Séquia
           mooring: Amarradors
           rapids: Ràpids
@@ -539,21 +594,27 @@ ca:
     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.
+    intro_3_partners: wiki
     logo: 
       alt_text: logotip de l'OpenStreetMap
+    logout: sortir
+    logout_tooltip: Sortir
+    make_a_donation: 
+      text: Fer una donació
     shop: Botiga
     user_diaries: DIaris de usuari
     view: Veure
     view_tooltip: Visualitza els mapes
     welcome_user: Benvingut/da, {{user_link}}
-  map: 
+    welcome_user_link_tooltip: La teva pàgina d'usuari
-    coordinates: "Coordenades:"
-    edit: Modifica
-    view: Visualitza
   message: 
+    delete: 
+      deleted: Missatge esborrat
     inbox: 
       date: Data
       from: De
+      outbox: sortida
+      subject: Assumpte
       title: Safata d'entrada
     message_summary: 
       delete_button: Suprimeix
@@ -562,19 +623,30 @@ ca:
       unread_button: Marca com a no llegit
     new: 
       back_to_inbox: Tornar a la safata d'entrada
+      body: Cos
+      message_sent: S'ha enviat el missatge
       send_button: Envia
       subject: Assumpte
+      title: Enviar missatge
+    no_such_message: 
+      heading: No existeix aquest missatge
+      title: No existeix aquest missatge
     outbox: 
       date: Data
+      inbox: Entrada
       my_inbox: El meu {{inbox_link}}
+      outbox: sortida
       subject: Assumpte
+      title: Sortida
       to: A
     read: 
       date: Data
       from: De
       reply_button: Respon
       subject: Assumpte
+      title: Llegir missatge
       to: Per a
+      unread_button: Marca com a no llegit
     sent_message_summary: 
       delete_button: Suprimeix
   notifier: 
@@ -606,11 +678,16 @@ ca:
     edit: 
       user_page_link: pàgina d'usuari
     index: 
+      license: 
+        license_name: Creative Commons Reconeixement-Compartir Igual 2.0
+        project_name: projecte OpenStreetMap
       permalink: Enllaç permanent
       shortlink: Enllaç curt
     key: 
       table: 
         entry: 
+          apron: 
+            1: terminal
           cemetery: Cementiri
           centre: Centre esportiu
           farm: Granja
@@ -632,6 +709,7 @@ ca:
           subway: Metro
           summit: 
             1: pic
+          track: Pista
           wood: Fusta
     search: 
       search: Cerca
@@ -661,6 +739,7 @@ ca:
       visibility: "Visibilitat:"
       visibility_help: Què vol dir això?
     list: 
+      public_traces: Traces GPS públiques
       tagged_with: " etiquetat amb {{tags}}"
       your_traces: Les teves traces GPS
     no_such_user: 
@@ -707,6 +786,7 @@ ca:
       edit: modificació
       edit_track: Edita aquesta traça
       filename: "Nom del fitxer:"
+      heading: Veient traça {{name}}
       map: mapa
       none: Ningú
       owner: "Propietari:"
@@ -714,18 +794,25 @@ ca:
       points: "Punts:"
       start_coordinates: "coordenada de inici:"
       tags: "Etiquetes:"
+      title: Veient traça {{name}}
       trace_not_found: No s'ha trobat la traça!
       uploaded: "Pujat el:"
       visibility: "Visibilitat:"
   user: 
     account: 
+      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ó
+      new image: Afegir una imatge
       preferred languages: "Llengües preferents:"
+      profile description: "Descripció del perfil:"
       public editing: 
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: què és això?
+        heading: "Edició pública:"
       public editing note: 
         heading: Edició pública
       return to profile: Torna al perfil
@@ -735,8 +822,6 @@ ca:
       button: Confirmar
     confirm_email: 
       button: Confirmar
-    friend_map: 
-      your location: La teva situació
     go_public: 
       flash success: Ara totes les teves edicions són públiques i ja estàs autoritzat per a editar
     login: 
@@ -748,6 +833,10 @@ ca:
       password: "Contrasenya:"
       please login: Si us plau, inicieu la sessió o {{create_user_link}}.
       title: Accés
+    logout: 
+      heading: Sortir d'OpenStreetMap
+      logout_button: Sortir
+      title: Sortir
     lost_password: 
       email address: "Adreça de correu electrònic:"
       heading: Heu oblidat la contrasenya?
@@ -757,10 +846,16 @@ ca:
       success: "{{name}} ara és el vostre amic."
     new: 
       confirm password: "Confirmeu la contrasenya:"
+      display name: "Nom en pantalla:"
       email address: "Adreça de correu:"
       heading: Crea un compte d'usuari
       password: "Contrasenya:"
       signup: Registre
+    no_such_user: 
+      title: No existeix aquest usuari
+    popup: 
+      friend: Amic
+      your location: La teva situació
     reset_password: 
       confirm password: "Confirmeu la contrasenya:"
       flash changed: S'ha canviat la contrasenya.
@@ -769,28 +864,35 @@ ca:
       reset: Restablir contrasenya
       title: Restablir la contrasenya
     view: 
-      add image: Afegeix una imatge
+      activate_user: activa aquest usuari
+      add as friend: afegir com a amic
+      ago: (fa {{time_in_words_ago}})
       confirm: Confirmeu
       create_block: boca aquest usuari
+      created from: "Creat a partir de:"
       deactivate_user: desactiva aquest usuari
-      delete image: Suprimeix la imatge
       delete_user: Suprimeix aquest usuari
       description: Descripció
       diary: diari
       edits: modificacions
       email address: "Adreça de correu:"
       hide_user: amagar aquest usuari
+      km away: "{{count}}km de distància"
+      m away: "{{count}}m de distància"
+      mapper since: "Mapejant des de:"
       my diary: el meu diari
       my edits: les meves edicions
+      my settings: les meves preferències
       my traces: les meves traces
-      my_oauth_details: Veure els meus detalls de OAuth
+      nearby users: Altres usuaris propers
-      nearby users: "Usuaris propers:"
+      oauth settings: configuració OAuth
       role: 
         administrator: Aquest usuari és administrador
         moderator: Aquest usuari és moderador
+      send message: enviar missatge
       settings_link_text: preferències
       traces: traces
-      user image heading: Imatge d'usuari
+      user location: Ubicació de l'usuari
       your friends: Els vostres amics
   user_block: 
     partial: 

config/locales/cs.yml

@@ -4,6 +4,7 @@
 # Author: Bilbo
 # Author: Masox
 # Author: Mormegil
+# Author: Mr. Richard Bolla
 cs: 
   activerecord: 
     attributes: 
@@ -187,6 +188,7 @@ cs:
         type: 
           node: Uzel
           way: Cesta
+      private_user: anonym
       show_history: Zobrazit historii
       unable_to_load_size: "Nelze načíst: Rozměr [[bbox_size]] je příliš velký (maximum je {{max_bbox_size}})"
       wait: Čekejte...
@@ -227,7 +229,9 @@ cs:
       still_editing: (stále se upravuje)
       view_changeset_details: Zobrazit detaily sady změn
     changeset_paging_nav: 
-      showing_page: Zobrazuji stranu
+      next: Následující »
+      previous: "« Předchozí"
+      showing_page: Zobrazuji stranu {{page}}
     changesets: 
       area: Oblast
       comment: Komentář
@@ -277,7 +281,7 @@ cs:
       login: Přihlaste se
       login_to_leave_a_comment: "{{login_link}} k zanechání komentáře"
       save_button: Uložit
-      title: Deníčky uživatelů | {{user}}
+      title: Deníček uživatele {{user}} | {{title}}
   export: 
     start: 
       add_marker: Přidat do mapy značku
@@ -295,9 +299,13 @@ cs:
       mapnik_image: Obrázek z Mapniku
       max: max.
       options: Nastavení
+      osmarender_image: Obrázek z Osmarenderu
       output: Výstup
       paste_html: Ke vložení na stránku použijte toto HTML
       scale: Měřítko
+      too_large: 
+        body: Tato oblast je pro export do XML formátu OpenStreetMap příliš velká. Přejděte na větší měřítko nebo zvolte menší oblast.
+        heading: Příliš velká oblast
     start_rjs: 
       add_marker: Přidat do mapy značku
       change_marker: Změnit umístění značky
@@ -346,10 +354,34 @@ cs:
       suffix_place: ", {{distance}} na {{direction}} od {{placename}}"
     search_osm_nominatim: 
       prefix: 
+        amenity: 
+          cinema: Kino
+          parking: Parkoviště
+          post_office: Pošta
+          toilets: Toalety
+        building: 
+          train_station: Železniční stanice
+        highway: 
+          bus_stop: Autobusová zastávka
+          gate: Brána
+          secondary: Silnice II. třídy
+          steps: Schody
+        historic: 
+          museum: Muzeum
         leisure: 
           garden: Zahrada
           miniature_golf: Minigolf
+          nature_reserve: Přírodní rezervace
           park: Park
+          pitch: Hřiště
+          stadium: Stadion
+        natural: 
+          beach: Pláž
+          glacier: Ledovec
+          hill: Kopec
+          island: Ostrov
+          tree: Strom
+          valley: Údolí
         place: 
           airport: Letiště
           city: Velkoměsto
@@ -365,8 +397,14 @@ cs:
           region: Region
           sea: Moře
           state: Stát
+          suburb: Městská část
           town: Město
           village: Vesnice
+        railway: 
+          halt: Železniční zastávka
+          subway: Stanice metra
+        shop: 
+          hairdresser: Kadeřnictví
         tourism: 
           alpine_hut: Vysokohorská chata
           attraction: Turistická atrakce
@@ -388,17 +426,15 @@ cs:
     map: 
       base: 
         cycle_map: Cyklomapa
-        noname: Bezejmenné ulice
+        noname: Nepojmenované ulice
   layouts: 
     edit: Upravit
-    edit_tooltip: Upravovat mapy
     export: Export
     export_tooltip: Exportovat mapová data
     help_wiki: Nápověda & wiki
     help_wiki_tooltip: Server s nápovědou a wiki k tomuto projektu
     help_wiki_url: http://wiki.openstreetmap.org/wiki/Cs:Main_Page?uselang=cs
     history: Historie
-    history_tooltip: Historie změn
     home: domů
     home_tooltip: Přejít na polohu domova
     inbox: zprávy ({{count}})
@@ -409,8 +445,9 @@ cs:
       zero: Nemáte žádné nepřečtené zprávy
     intro_1: OpenStreetMap je svobodná editovatelná mapa celého světa. Tvoří ji lidé jako vy.
     intro_2: OpenStreetMap vám umožňuje společně si prohlížet, upravovat a používat geografická data z libovolného místa na Zemi.
-    intro_3: Hosting OpenStreetMap laskavě poskytují {{ucl}} a {{bytemark}}.
+    intro_3: Hosting OpenStreetMap laskavě poskytují {{ucl}} a {{bytemark}}. Další partneři projektu jsou uvedeni na {{partners}}.
     intro_3_bytemark: bytemark
+    intro_3_partners: wiki
     intro_3_ucl: středisko VR UCL
     license: 
       title: Data OpenStreetMap jsou k dispozici pod licencí Creative Commons Uveďte autora-Zachovejte licenci 2.0 Generic
@@ -431,16 +468,13 @@ cs:
     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
     user_diaries: Deníčky
     user_diaries_tooltip: Zobrazit deníčky uživatelů
     view: Zobrazit
-    view_tooltip: Zobrazit mapy
+    view_tooltip: Zobrazit mapu
     welcome_user: Vítejte, {{user_link}}
     welcome_user_link_tooltip: Vaše uživatelská stránka
-  map: 
-    coordinates: "Souřadnice:"
-    edit: Upravit
-    view: Zobrazit
   message: 
     delete: 
       deleted: Zpráva smazána
@@ -493,6 +527,8 @@ cs:
       the_wiki_url: http://wiki.openstreetmap.org/wiki/Cs:Beginners_Guide?uselang=cs
       wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&type=signup&returnto=Cs:Main_Page&uselang=cs
   site: 
+    edit: 
+      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>.
     index: 
       js_1: Buď používáte prohlížeč bez podpory JavaScriptu, nebo máte JavaScript zakázaný.
       license: 
@@ -502,8 +538,8 @@ cs:
       permalink: Trvalý odkaz
       shortlink: Krátký odkaz
     key: 
-      map_key: Mapový klíč
+      map_key: Legenda
-      map_key_tooltip: Mapový klíč pro vykreslení mapnikem na této úrovni přiblížení
+      map_key_tooltip: Legenda pro vykreslení mapnikem na této úrovni přiblížení
       table: 
         entry: 
           admin: Administrativní hranice
@@ -560,13 +596,13 @@ cs:
             - Vrchol
             - hora
           tourist: Turistická atrakce
-          track: Lesní či polní cesta
+          track: Lesní a polní cesta
           tram: 
             - Rychlodráha
             - tramvaj
           trunk: Významná silnice
           tunnel: Čárkované obrysy = tunel
-          unclassified: Silnice bez klasifikace
+          unclassified: Silnice
           unsurfaced: Nezpevněná cesta
         heading: Legenda pro z{{zoom_level}}
     search: 
@@ -600,9 +636,12 @@ cs:
     list: 
       your_traces: Vaše GPS záznamy
     no_such_user: 
+      body: Lituji, ale uživatel {{user}} neexistuje. Zkontrolujte překlepy nebo jste možná klikli na chybný odkaz.
       heading: Uživatel {{user}} neexistuje
+      title: Uživatel nenalezen
     trace: 
       ago: před {{time_in_words_ago}}
+      by: od
       count_points: "{{count}} bodů"
       edit: upravit
       edit_map: Upravit mapu
@@ -626,6 +665,8 @@ cs:
     trace_optionals: 
       tags: Tagy
     trace_paging_nav: 
+      next: Následující &raquo;
+      previous: "&laquo; Předchozí"
       showing_page: Zobrazuji stranu {{page}}
     view: 
       description: "Popis:"
@@ -645,12 +686,17 @@ cs:
       trackable: Trackable (dostupný jedině jako anonymní, uspořádané body s časovými značkami)
   user: 
     account: 
+      current email address: "Stávající e-mailová adresa:"
       email never displayed publicly: (nikde se veřejně nezobrazuje)
       home location: "Poloha domova:"
+      image: "Obrázek:"
+      image size hint: (nejlépe fungují čtvercové obrázky velikosti nejméně 100×100)
       latitude: "Šířka:"
       longitude: "Délka:"
       make edits public button: Zvěřejnit všechny moje úpravy
       my settings: Moje nastavení
+      new email address: "Nová e-mailová adresa:"
+      new image: Přidat obrázek
       no home location: Nezadali jste polohu svého bydliště.
       preferred languages: "Preferované jazyky:"
       profile description: "Popis profilu:"
@@ -670,9 +716,6 @@ cs:
       button: Potvrdit
       failure: Tento kód byl už pro potvrzení e-mailové adresy použit.
       success: Vaše e-mailová adresa byla potvrzena, děkujeme za registraci!
-    friend_map: 
-      nearby mapper: "Nedaleký uživatel: [[nearby_user]]"
-      your location: Vaše poloha
     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.
       auth failure: Je mi líto, ale s uvedenými údaji se nemůžete přihlásit.
@@ -682,8 +725,12 @@ cs:
       login_button: Přihlásit
       lost password link: Ztratili jste heslo?
       password: "Heslo:"
-      please login: Prosím přihlašte se, nebo si můžete {{create_user_link}}.
+      please login: Prosím přihlaste se, nebo si můžete {{create_user_link}}.
+      remember: "Zapamatuj si mě:"
       title: Přihlásit se
+    logout: 
+      logout_button: Odhlásit se
+      title: Odhlásit se
     lost_password: 
       email address: "E-mailová adresa:"
       heading: Zapomněli jste heslo?
@@ -714,6 +761,9 @@ cs:
       body: Je mi líto, ale uživatel {{user}} neexistuje. Zkontrolujte překlepy nebo jste možná klikli na chybný odkaz.
       heading: Uživatel {{user}} neexistuje
       title: Uživatel nenalezen
+    popup: 
+      nearby mapper: Nedaleký uživatel
+      your location: Vaše poloha
     remove_friend: 
       not_a_friend: "{{name}} není mezi vašimi přáteli."
       success: "{{name}} byl odstraněn z vašich přátel."
@@ -729,12 +779,9 @@ cs:
       flash success: Pozice domova byla úspěšně uložena
     view: 
       add as friend: přidat jako přítele
-      add image: Přidat obrázek
       ago: (před {{time_in_words_ago}})
       blocks on me: moje zablokování
-      change your settings: změnit vaše nastavení
       confirm: Potvrdit
-      delete image: Smazat obrázek
       description: Popis
       diary: deníček
       edits: editace
@@ -746,15 +793,15 @@ cs:
       my diary: můj deníček
       my edits: moje editace
       my settings: moje nastavení
-      nearby users: "Uživatelé poblíž:"
+      nearby users: Další uživatelé poblíž
       new diary entry: nový záznam do deníčku
       no friends: Zatím jste nepřidali žádné přátele.
-      no home location: Pozice domova nebyla nastavena.
+      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
       send message: poslat zprávu
       settings_link_text: nastavení
-      upload an image: Nahrát obrázek
+      traces: záznamy
-      user image heading: Obrázek uživatele
       user location: Pozice uživatele
       your friends: Vaši přátelé
   user_role: 

config/locales/da.yml

@@ -215,6 +215,7 @@ da:
       no_edits: (ingen redigeringer)
       show_area_box: vis boks for område
       still_editing: (redigerer stadig)
+      view_changeset_details: Vis detaljer for ændringssæt
     changeset_paging_nav: 
       next: Næste »
       previous: "« Forrige"
@@ -264,9 +265,12 @@ da:
       manually_select: Vælg et andet område manuelt
       mapnik_image: Mapnik billede
       max: maks
+      options: Indstillinger
       osm_xml_data: OpenStreetMap XML-data
       osmarender_image: Osmarender billede
       scale: Skala
+      too_large: 
+        heading: Område for stort
       zoom: Zoom
     start_rjs: 
       add_marker: Tilføj en markør på kortet
@@ -318,7 +322,6 @@ da:
     donate: Støt OpenStreetMap med en {{link}} til Hardware-upgradefonden.
     donate_link_text: donation
     edit: Redigér
-    edit_tooltip: Redigér kortet
     export: Eksporter
     export_tooltip: Eksporter kortdata
     gps_traces: GPS-spor
@@ -326,7 +329,6 @@ da:
     help_wiki_tooltip: Hjælp- og Wiki-side for projektet
     help_wiki_url: http://wiki.openstreetmap.org/wiki/Da:Main_Page?uselang=da
     history: Historik
-    history_tooltip: Historik af ændringssæt
     home: hjem
     home_tooltip: Gå til hjemmeposition
     inbox: indbakke ({{count}})
@@ -361,10 +363,6 @@ da:
     view_tooltip: Vis kortere
     welcome_user: Velkommen, {{user_link}}
     welcome_user_link_tooltip: Din brugerside
-  map: 
-    coordinates: "Koordinater:"
-    edit: Redigér
-    view: Kort
   message: 
     delete: 
       deleted: Besked slettet
@@ -557,8 +555,6 @@ da:
       heading: Bekræft ændring af e-mail adresse
     filter: 
       not_an_administrator: Du skal være administrator for at gøre dette.
-    friend_map: 
-      your location: Din position
     login: 
       account not active: Din konto er ikke aktiveret endnu.<br />Klik på linket i bekræftelsemailen for at aktivere din konto.
       auth failure: Kunne ikke logge på med disse oplysninger.
@@ -593,6 +589,8 @@ da:
       body: Der findes desværre ingen bruger ved navn {{user}}. Tjek venligst stavningen, ellers kan linket du trykkede på være forkert.
       heading: Brugeren {{user}} findes ikke
       title: Ingen sådan bruger
+    popup: 
+      your location: Din position
     reset_password: 
       confirm password: "Bekræft adgangskode:"
       flash changed: Din adgangskode er ændret.
@@ -604,11 +602,9 @@ da:
       flash success: Hjemmeposition gemt
     view: 
       add as friend: tilføj som ven
-      add image: Tilføj billede
       ago: ({{time_in_words_ago}} siden)
       confirm: Bekræft
       deactivate_user: deaktiver denne bruger
-      delete image: Slet billede
       delete_user: slet denne bruger
       description: Beskrivelse
       diary: dagbog
@@ -623,7 +619,6 @@ da:
       my traces: mine GPS-spor
       nearby users: "Brugere nær dig:"
       new diary entry: ny dagbogsoptegnelse
-      no home location: Ingen hjemmeposition sat.
       remove as friend: fjern som ven
       role: 
         administrator: Denne bruger er en administrator
@@ -631,8 +626,6 @@ da:
       settings_link_text: indstillinger
       traces: GPS-spor
       unhide_user: stop med at skjule denne bruger
-      upload an image: Send et billede
-      user image heading: Brugerbillede
       user location: Brugereposition
       your friends: Dine venner
   user_block: 

config/locales/de.yml

@@ -108,7 +108,7 @@ de:
       created_at: "Erstellt am:"
       has_nodes: 
         one: "Enthält folgenden Knoten:"
-        other: "Enhält folgende {{count}} Knoten:"
+        other: "Enthält folgende {{count}} Knoten:"
       has_relations: 
         one: "Enthält folgende Relation:"
         other: "Enthält folgende {{count}} Relationen:"
@@ -330,6 +330,10 @@ de:
       recent_entries: "Neuste Einträge:"
       title: Blogs
       user_title: "{{user}}s Blog"
+    location: 
+      edit: Bearbeiten
+      location: "Ort:"
+      view: Anzeigen
     new: 
       title: Selbst Bloggen
     no_such_entry: 
@@ -345,7 +349,7 @@ de:
       login: Anmelden
       login_to_leave_a_comment: "{{login_link}}, um einen Kommentar zu schreiben"
       save_button: Speichern
-      title: Benutzer-Blogs | {{user}}
+      title: "{{user}}s Blog | {{title}}"
       user_title: "{{user}}s Blog"
   export: 
     start: 
@@ -369,6 +373,9 @@ de:
       output: Ausgabe
       paste_html: HTML-Code kopieren, um ihn in eine Website einzufügen.
       scale: Maßstab
+      too_large: 
+        body: Dieser Bereich ist zu groß, um als OpenStreetMap XML-Daten exportiert werden. Bitte heranzoomen oder einen kleineren Bereich wählen.
+        heading: Bereich zu groß
       zoom: Zoom
     start_rjs: 
       add_marker: Markierung zur Karte hinzufügen
@@ -860,22 +867,24 @@ de:
         cycle_map: Radfahrerkarte
         noname: Straßen ohne Name
     site: 
+      edit_disabled_tooltip: Reinzoomen zum Editieren der Karte
+      edit_tooltip: Karte bearbeiten
       edit_zoom_alert: Du musst näher heranzoomen, um die Karte zu bearbeiten
+      history_disabled_tooltip: Reinzoomen um Änderungen für diesen Bereich anzuzeigen
+      history_tooltip: Änderungen für diesen Bereich anzeigen
       history_zoom_alert: Du musst näher heranzoomen, um die Chronik zu sehen
   layouts: 
     donate: Unterstütze die OpenStreetMap-Hardwarespendenaktion durch eine eigene {{link}}.
     donate_link_text: Spende
     edit: Bearbeiten
-    edit_tooltip: Karte bearbeiten
     export: Export
     export_tooltip: Kartendaten exportieren
     gps_traces: GPS-Tracks
-    gps_traces_tooltip: GPS-Tracks anzeigen und verwalten
+    gps_traces_tooltip: GPS-Tracks verwalten
     help_wiki: Hilfe & Wiki
     help_wiki_tooltip: Hilfe & Wiki des Projekts
     help_wiki_url: http://wiki.openstreetmap.org/wiki/Hauptseite?uselang=de
     history: Chronik
-    history_tooltip: Änderungen der Kartendaten anzeigen
     home: Standort
     home_tooltip: Eigener Standort
     inbox: Posteingang ({{count}})
@@ -885,7 +894,8 @@ de:
       zero: Dein Posteingang enthält keine ungelesenen Nachrichten
     intro_1: OpenStreetMap ist eine freie, editierbare Karte der gesamten Welt, die von Menschen wie dir erstellt wird.
     intro_2: OpenStreetMap ermöglicht es geographische Daten gemeinschaftlich von überall auf der Welt anzuschauen und zu bearbeiten.
-    intro_3: Das Hosting der OpenStreetMap-Server wird freundlicherweise von {{ucl}} und {{bytemark}} unterstützt.
+    intro_3: Das Hosting der OpenStreetMap-Server wird freundlicherweise von {{ucl}} und {{bytemark}} unterstützt. Weitere Unterstützer sind im {{partners}} aufgelistet.
+    intro_3_partners: Wiki
     license: 
       title: Daten von OpenStreetMap stehen unter der „Creative Commons Attribution-Share Alike 2.0 Generic“-Lizenz
     log_in: Anmelden
@@ -910,13 +920,9 @@ de:
     user_diaries: Blogs
     user_diaries_tooltip: Benutzer-Blogs lesen
     view: Karte
-    view_tooltip: Karte betrachten
+    view_tooltip: Karte anzeigen
     welcome_user: Willkommen, {{user_link}}
     welcome_user_link_tooltip: Eigene Benutzerseite
-  map: 
-    coordinates: "Koordinaten:"
-    edit: Bearbeiten
-    view: Karte
   message: 
     delete: 
       deleted: Nachricht gelöscht
@@ -947,10 +953,14 @@ de:
       send_message_to: Eine Nachricht an {{name}} senden
       subject: Betreff
       title: Nachricht senden
+    no_such_message: 
+      body: Leider gibt es keine Nachricht mit dieser ID.
+      heading: Nachricht nicht vorhanden
+      title: Nachricht nicht vorhanden
     no_such_user: 
-      body: Wir konnten leider keinen entsprechenden Benutzer oder eine entsprechende Nachricht finden. Du hast dich möglicherweise vertippt oder du bist einem ungültigem Link gefolgt.
+      body: Leider gibt es kein Benutzer mit diesem Namen.
-      heading: Benutzer oder Nachricht nicht gefunden
+      heading: Benutzer nicht gefunden
-      title: Benutzer oder Nachricht nicht gefunden
+      title: Benutzer nicht gefunden
     outbox: 
       date: Datum
       inbox: Posteingang
@@ -974,6 +984,9 @@ de:
       title: Nachricht lesen
       to: An
       unread_button: Als ungelesen markieren
+      wrong_user: Sie sind angemeldet als '{{user}}', aber die Nachricht die Sie lesen wollten wurde an einen anderen Benutzer geschickt. Bitte melden Sie sich zum Lesen mit dem korrekten Benutzer an.
+    reply: 
+      wrong_user: Sie sind angemeldet als '{{user}}', aber die Nachricht auf die Sie antworten wollten wurde an einen anderen Benutzer geschickt. Bitte melden Sie sich zum Beantworten mit dem korrekten Benutzer an.
     sent_message_summary: 
       delete_button: Löschen
   notifier: 
@@ -994,8 +1007,9 @@ de:
       hopefully_you_1: Jemand (hoffentlich du) möchte seine E-Mail-Adresse bei
       hopefully_you_2: "{{server_url}} zu {{new_address}} ändern."
     friend_notification: 
+      befriend_them: Du kannst sie / ihn unter {{befriendurl}} ebenfalls als Freund hinzufügen.
       had_added_you: "{{user}} hat dich als Freund hinzugefügt."
-      see_their_profile: Sein Profil ist hier {{userurl}} zu finden, dort kannst du ihn ebenfalls als Freund hinzufügen.
+      see_their_profile: Du kannst sein / ihr Profil unter {{userurl}} ansehen.
       subject: "[OpenStreetMap] {{user}} hat dich als Freund hinzugefügt"
     gpx_notification: 
       and_no_tags: und ohne Tags.
@@ -1101,7 +1115,7 @@ de:
       no_apps: Wenn du mit einer Anwendung gerne den {{oauth}}-Standard verwenden würdest, musst du sie hier registrieren.
       register_new: Anwendung registrieren
       registered_apps: "Du hast die folgenden Client-Anwendungen registriert:"
-      revoke: Wiederrufen!
+      revoke: Widerrufen!
       title: Meine OAuth Details
     new: 
       submit: Registrieren
@@ -1223,6 +1237,9 @@ de:
     sidebar: 
       close: Schließen
       search_results: Suchergebnisse
+  time: 
+    formats: 
+      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.
@@ -1325,14 +1342,21 @@ de:
       trackable: Track (wird in der Trackliste als anonyme, sortierte Punktfolge mit Zeitstempel angezeigt)
   user: 
     account: 
+      current email address: "Aktuelle E-Mail-Adresse:"
+      delete image: Aktuelles Bild löschen
       email never displayed publicly: (nicht öffentlich sichtbar)
       flash update success: Benutzerinformationen erfolgreich aktualisiert.
       flash update success confirm needed: Benutzerinformationen erfolgreich aktualisiert. Du erhältst eine E-Mail, um deine neue E-Mail-Adresse zu bestätigen.
       home location: "Standort:"
+      image: "Bild:"
+      image size hint: (quadratische Bilder mit zumindes 100x100 funktionieren am Besten)
+      keep image: Aktuelles Bild beibehalten
       latitude: "Breitengrad:"
       longitude: "Längengrad:"
       make edits public button: Alle meine Bearbeitungen öffentlich machen
       my settings: Eigene Einstellungen
+      new email address: "Neue E-Mail Adresse:"
+      new image: Bild einfügen
       no home location: Du hast noch keinen Standort angegeben.
       preferred languages: "Bevorzugte Sprachen:"
       profile description: "Profil-Beschreibung:"
@@ -1346,6 +1370,7 @@ de:
       public editing note: 
         heading: Öffentliches Bearbeiten
         text: Im Moment sind deine Beiträge anonym und man kann dir weder Nachrichten senden noch deinen Wohnort sehen. Um sichtbar zu machen, welche Arbeit von dir stammt, und um kontaktierbar zu werden, klicke auf den Button unten. <b>Seit Version 0.6 der API aktiv ist, können anonyme Benutzer die Karte nicht mehr bearbeiten</b> (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">warum?</a>).<ul><li>Deine E-Mail-Adresse wird bei Verlassen des anonymen Statuses nicht veröffentlicht.</li><li>Die Aktion kann nicht rückgängig gemacht werden. Für neu registrierte Benutzer besteht die Möglichkeit des anonymen Accounts nicht mehr.</li></ul>
+      replace image: Aktuelles Bild austauschen
       return to profile: Zurück zum Profil
       save changes button: Speichere Änderungen
       title: Benutzerkonto bearbeiten
@@ -1364,9 +1389,6 @@ de:
       success: Deine E-Mail-Adresse wurde bestätigt, danke fürs Registrieren!
     filter: 
       not_an_administrator: Du must ein Administrator sein um das machen zu dürfen
-    friend_map: 
-      nearby mapper: "Mapper in der Nähe: [[nearby_user]]"
-      your location: Eigener Standort
     go_public: 
       flash success: Alle deine Bearbeitungen sind nun öffentlich und du kannst nun die Kartendaten bearbeiten.
     login: 
@@ -1379,7 +1401,12 @@ de:
       lost password link: Passwort vergessen?
       password: "Passwort:"
       please login: Bitte melde dich an oder {{create_user_link}}.
+      remember: "Anmeldedaten merken:"
       title: Anmelden
+    logout: 
+      heading: Von OpenStreetMap abmelden
+      logout_button: Abmelden
+      title: Abmelden
     lost_password: 
       email address: "E-Mail-Adresse:"
       heading: Passwort vergessen?
@@ -1412,6 +1439,10 @@ de:
       body: Es gibt leider keinen Benutzer mit dem Namen {{user}}. Bitte überprüfe deine Schreibweise oder der Link war beschädigt.
       heading: Der Benutzer {{user}} existiert nicht
       title: Benutzer nicht gefunden
+    popup: 
+      friend: Freund
+      nearby mapper: Mapper in der Nähe
+      your location: Eigener Standort
     remove_friend: 
       not_a_friend: "{{name}} ist nicht dein Freund."
       success: "{{name}} wurde als Freund entfernt."
@@ -1428,17 +1459,14 @@ de:
     view: 
       activate_user: Benutzer aktivieren
       add as friend: Als Freund hinzufügen
-      add image: Ein Bild hinzufügen
       ago: ({{time_in_words_ago}} her)
-      block_history: Blockierungen ansehen
+      block_history: Erhaltene Sperren anzeigen
       blocks by me: Selbst vergebene Sperren
       blocks on me: Erhaltene Sperren
-      change your settings: Ändere deine Einstellungen
       confirm: Bestätigen
       create_block: Diesen Nutzer sperren
       created from: "erstellt aus:"
       deactivate_user: Benutzer deaktivieren
-      delete image: Bild löschen
       delete_user: Benutzer löschen
       description: Beschreibung
       diary: Blog
@@ -1454,12 +1482,11 @@ de:
       my edits: Eigene Bearbeitungen
       my settings: Eigene Einstellungen
       my traces: Eigene Tracks
-      my_oauth_details: Meine OAuth-Details
+      nearby users: Anwender in der Nähe
-      nearby users: "Benutzer in der Nähe:"
       new diary entry: Neuer Blogeintrag
       no friends: Du hast bis jetzt keine Freunde hinzugefügt.
-      no home location: Es wurde kein Standort angegeben.
       no nearby users: Es gibt bisher keine Benutzer, die einen Standort in deiner Nähe angegeben haben.
+      oauth settings: oauth Einstellungen
       remove as friend: Als Freund entfernen
       role: 
         administrator: Dieser Benutzer ist ein Administrator
@@ -1474,15 +1501,13 @@ de:
       settings_link_text: Einstellungen
       traces: Tracks
       unhide_user: Benutzer nicht mehr verstecken
-      upload an image: Ein Bild hochladen
-      user image heading: Benutzerbild
       user location: Standort des Benutzers
       your friends: Eigene Freunde
   user_block: 
     blocks_by: 
       empty: "{{name}} hat noch keine Sperren eingerichtet."
-      heading: Liste der Blockierungen durch {{name}}
+      heading: Liste der Sperren durch {{name}}
-      title: Blockierungen von {{name}}
+      title: Sperre durch {{name}}
     blocks_on: 
       empty: "{{name}} wurde bisher nicht gesperrt."
       heading: Liste der Sperren für {{name}}
@@ -1490,33 +1515,33 @@ de:
     create: 
       flash: Benutzer {{name}} wurde gesperrt.
       try_contacting: Bitte nimm Kontakt mit dem Benutzer auf und gib ihm eine angemessene Zeit zum Antworden, bevor Du ihn sperrst.
-      try_waiting: Bitte gib dem Benutzer einen angemessenen Zeitraum zu antworten bevor Du ihn blockierst.
+      try_waiting: Bitte gib dem Benutzer einen angemessenen Zeitraum zu antworten bevor Du ihn sperrst.
     edit: 
-      back: Alle Blockierungen anzeigen
+      back: Alle Sperren anzeigen
-      heading: Blockierung von {{name}} bearbeiten
+      heading: Sperre von {{name}} bearbeiten
-      needs_view: Muss der Benutzer sich anmelden, damit die Blockierung beendet wird?
+      needs_view: Muss der Benutzer sich anmelden, damit die Sperre aufgehoben wird?
-      period: Zeitraum, ab jetzt, den der Benutzer von der API blockiert wird.
+      period: Dauer, ab jetzt, während der dem Benutzer der Zugriff auf die API gesperrt wird.
-      reason: Der Grund warum {{name}} blockiert wird. Bitte bleibe ruhig und sachlich und versuche so viele Details wie möglich anzugeben. Bedenke, dass nicht alle Benutzer den Community Jargon verstehen und versuche eine Erklärung zu finden, die von Laien verstanden werden kann.
+      reason: Der Grund warum {{name}} gesperrt wird. Bitte bleibe ruhig und sachlich und versuche so viele Details wie möglich anzugeben. Bedenke, dass nicht alle Benutzer den Community Jargon verstehen und versuche eine Erklärung zu finden, die von Laien verstanden werden kann.
-      show: Diese Blockierung ansehen
+      show: Diese Sperre anzeigen
-      submit: Blockierung aktualisieren
+      submit: Sperre aktualisieren
-      title: Blockierung von {{name}} bearbeiten
+      title: Sperre von {{name}} bearbeiten
     filter: 
-      block_expired: Die Blockierung kann nicht bearbeitet werden weil die Blockierungszeit bereits abgelaufen ist.
+      block_expired: Die Sperre kann nicht bearbeitet werden, da die Sperrdauer bereits abgelaufen ist.
-      block_period: Die Blockierungszeit muss einer der Werte aus der Drop-Down Liste sein
+      block_period: Die Sperrdauer muss einem der Werte aus der Drop-Down-Liste entsprechen.
       not_a_moderator: Du musst Moderator sein um diese Aktion durchzuführen.
     helper: 
       time_future: Endet in {{time}}.
       time_past: Endete vor {{time}}
       until_login: Aktiv, bis der Benutzer sich anmeldet.
     index: 
-      empty: Noch nie blockiert.
+      empty: Noch nie gesperrt.
       heading: Liste der Benutzersperren
       title: Benutzersperren
     model: 
       non_moderator_revoke: Du musst Moderator sein, um eine Sperre aufzuheben.
       non_moderator_update: Du musst Moderator sein, um eine Sperre einzurichten oder zu ändern.
     new: 
-      back: Alle Blockierungen anzeigen
+      back: Alle Sperren anzeigen
       heading: Sperre für {{name}} einrichten
       needs_view: Der Benutzer muss sich anmelden, bevor die Sperre aufgehoben wird.
       period: Wie lange der Benutzer von jetzt ab für den Zugriff auf die API gesperrt wird.
@@ -1527,14 +1552,14 @@ de:
       tried_waiting: Ich habe dem Benutzer eine angemessene Zeit eingeräumt, um auf diese Nachrichten zu antworten.
     not_found: 
       back: Zurück zur Übersicht
-      sorry: Sorry, die Blockierung mit der ID {{id}} konnte nicht gefunden werden.
+      sorry: Entschuldigung, die Sperre mit der ID {{id}} konnte nicht gefunden werden.
     partial: 
       confirm: Bist du sicher?
       creator_name: Ersteller
-      display_name: Blockierter Benutzer
+      display_name: Gesperrter Benutzer
       edit: Bearbeiten
       not_revoked: (nicht aufgehoben)
-      reason: Grund der Blockierung
+      reason: Grund der Sperre
       revoke: Aufheben!
       revoker_name: Aufgehoben von
       show: Anzeigen
@@ -1543,7 +1568,7 @@ de:
       one: 1 Stunde
       other: "{{count}} Stunden"
     revoke: 
-      confirm: Bist du sicher, das du diese Blockierung aufheben möchtest?
+      confirm: Bist du sicher, dass du diese Sperre aufheben möchtest?
       flash: Die Sperre wurde aufgehoben.
       heading: Sperre für {{block_on}} durch {{block_by}} aufgehoben
       past: Die Sperre ist seit {{time}} beendet und kann nicht mehr aufgehoben werden.
@@ -1551,19 +1576,19 @@ de:
       time_future: "Blockablaufdatum: {{time}}."
       title: Sperre für {{block_on}} aufheben
     show: 
-      back: Alle Blockierungen anzeigen
+      back: Alle Sperren anzeigen
       confirm: Bist Du sicher?
       edit: Bearbeiten
-      heading: "{{block_on}} blockiert durch {{block_by}}"
+      heading: "{{block_on}} gesperrt durch {{block_by}}"
-      needs_view: Der Benutzer muss sich wieder anmelden, damit die Blockierung beendet wird.
+      needs_view: Der Benutzer muss sich wieder anmelden, damit die Sperre beendet wird.
-      reason: "Grund der Blockierung:"
+      reason: "Grund der Sperre:"
       revoke: Aufheben!
       revoker: "Aufgehoben von:"
       show: anzeigen
       status: Status
       time_future: Endet in {{time}}
       time_past: Geendet vor {{time}}
-      title: "{{block_on}} blockiert von  {{block_by}}"
+      title: "{{block_on}} gesperrt durch  {{block_by}}"
     update: 
       only_creator_can_edit: Nur der Moderator, der die Sperre eingerichtet hat, kann sie ändern.
       success: Block aktualisiert.

config/locales/dsb.yml

@@ -326,6 +326,10 @@ dsb:
       recent_entries: "Nejnowše zapiski dnjownika:"
       title: Dnjowniki wužywarjow
       user_title: dnjownik wužywarja {{user}}
+    location: 
+      edit: Wobźěłaś
+      location: "Městno:"
+      view: Woglědaś se
     new: 
       title: Nowy zapisk dnjownika
     no_such_entry: 
@@ -341,7 +345,7 @@ dsb:
       login: Pśizjawjenje
       login_to_leave_a_comment: "{{login_link}}, aby zawóstajił komentar"
       save_button: Składowaś
-      title: Dnjowniki | {{user}}
+      title: Dnjownik {{user}} | {{title}}
       user_title: dnjownik wužywarja {{user}}
   export: 
     start: 
@@ -365,6 +369,8 @@ dsb:
       output: Wudaśe
       paste_html: HTML kopěrowaś, aby se zasajźił do websedła
       scale: Měritko
+      too_large: 
+        heading: Wobłuk pśewjeliki
       zoom: Skalěrowanje
     start_rjs: 
       add_marker: Kórśe marku pśidaś
@@ -400,6 +406,7 @@ dsb:
       other: mjenjej ako {{count}} km
       zero: mjenjej ako 1 km
     results: 
+      more_results: Dalšne wuslědki
       no_results: Žedne wuslědki namakane
     search: 
       title: 
@@ -509,14 +516,18 @@ dsb:
         boundary: 
           administrative: Zastojnstwowa granica
         building: 
+          apartments: Bydleński blok
           chapel: Kapałka
           church: Cerkwja
           city_hall: Radnica
+          flats: Bydlenja
+          garage: Garaža
           hall: Hala
           hospital: Chórownja
           hotel: Hotel
           house: Dom
           industrial: Industrijowe twarjenje
+          school: Šulske twarjenje
           shop: Wobchod
           stadium: Stadion
           terrace: Terasa
@@ -563,17 +574,26 @@ dsb:
           unclassified: Njezarědowana droga
           unsurfaced: Njewobtwarźona droga
         historic: 
+          archaeological_site: Archeologiske wukopowanišćo
           building: Twarjenje
           castle: Grod
           church: Cerkwja
           house: Dom
+          icon: Ikona
           monument: Pomnik
           museum: Muzeum
+          ruins: Ruiny
           tower: Torm
+          wreck: Wrak
         landuse: 
+          cemetery: Kjarchob
           construction: Twarnišćo
+          farm: Farma
+          forest: Góla
           industrial: Industrijowy wobcerk
           mountain: Góra
+          park: Park
+          plaza: Naměstno
           railway: Zeleznica
           wood: Lěs
         leisure: 
@@ -659,8 +679,10 @@ dsb:
           unincorporated_area: Bźezgmejnske strony
           village: Wjas
         railway: 
+          historic_station: Historiske dwórnišćo
           station: Dwórnišćo
           tram: Elektriska
+          tram_stop: Zastanišćo elektriskeje
         shop: 
           alcohol: Wobchod za spirituoze
           apparel: Woblekarnja
@@ -778,23 +800,22 @@ dsb:
     map: 
       base: 
         cycle_map: Kórta za kolesowarjow
-        noname: ŽedneMě
+        noname: ŽednoMě
     site: 
+      edit_tooltip: Kórtu wobźěłaś
       edit_zoom_alert: Musyš powětšyś, aby wobźěłał kórtu
       history_zoom_alert: Musyš powětšyś, aby wiźeł wobźěłowańsku historiju
   layouts: 
     donate: Pódprěj OpenStreetMap pśez {{link}} do fondsa aktualizacije hardware
     donate_link_text: dar
     edit: Wobźěłaś
-    edit_tooltip: Kórty wobźěłaś
     export: Eksport
     export_tooltip: Kórtowe daty eksportěrowaś
     gps_traces: GPS-slědy
-    gps_traces_tooltip: Slědy zastojaś
+    gps_traces_tooltip: GPS-slědy zastojaś
     help_wiki: Pomoc & wiki
     help_wiki_tooltip: Pomoc & wikisedło za projekt
     history: Historija
-    history_tooltip: Historija sajźby změnow
     home: domoj
     home_tooltip: K stojnišćoju
     inbox: post ({{count}})
@@ -806,7 +827,8 @@ dsb:
       zero: Twój postowy kašćik njewopśimujo žedne njepśecytane powěsći
     intro_1: OpenStreetMap jo licho wobźěłujobna kórta cełego swěta. Jo se za luźi ako ty napórała.
     intro_2: OpenStreetMap śi dowólujo, geografiske daty wóte wšuźi na zemi zgromadnje se woglědaś, wobźěłaś a wužywaś.
-    intro_3: Hostowanje OpenStreetMap pódpěra se wót {{ucl}} a {{bytemark}} z pśijaznosću.
+    intro_3: Hostowanje OpenStreetMap pśijaznosću pódpěra se wót {{ucl}} a {{bytemark}}. Druge pódpěrarje projekta su w {{partners}} nalicone.
+    intro_3_partners: wiki
     license: 
       title: Daty OpenStreetMap licencěruju se pód licencu Creative Commons Attribution-Share Alike 2.0 Generic
     log_in: pśizjawiś
@@ -831,13 +853,9 @@ dsb:
     user_diaries: Dnjowniki
     user_diaries_tooltip: Wužywarske dnjowniki cytaś
     view: Kórta
-    view_tooltip: Kórty se woglědaś
+    view_tooltip: Kórtu se woglědaś
     welcome_user: Witaj, {{user_link}}
     welcome_user_link_tooltip: Twój wužywarski bok
-  map: 
-    coordinates: "Koordinaty:"
-    edit: Wobźěłaś
-    view: Kórta
   message: 
     delete: 
       deleted: Powěsć wulašowana
@@ -868,10 +886,13 @@ dsb:
       send_message_to: "{{name}} nowu powěsć pósłaś"
       subject: Temowe nadpismo
       title: Powěsć pósłaś
+    no_such_message: 
+      heading: Powěsć njeeksistěrujo
+      title: Powěsć njeeksistěrujo
     no_such_user: 
-      body: Bóžko njejo žeden wužywaŕ abo žedna powěsć z tym mjenim abo ID
+      body: Bóžko njejo žeden wužywaŕ z tym mjenim.
-      heading: Wužywaŕ abo powěsć njeeksistěrujo
+      heading: Wužywaŕ njeeksistěrujo
-      title: Wužywaŕ abo powěsć njeeksistěrujo
+      title: Wužywaŕ njeeksistěrujo
     outbox: 
       date: Datum
       inbox: post
@@ -916,7 +937,7 @@ dsb:
       hopefully_you_2: "{{server_url}} do {{new_address}} změniś."
     friend_notification: 
       had_added_you: "{{user}} jo śi na OpenStreetMap ako pśijaśela pśidał."
-      see_their_profile: Jogo profil jo na {{userurl}} a móžoš jogo teke ako pśijaśela pśidaś, jolic coš.
+      see_their_profile: Móžoš profil na {{userurl}} wiźeś.
       subject: "[OpenStreetMap] {{user}} jo śi ako pśijaśela pśidał."
     gpx_notification: 
       and_no_tags: a žedne atributy.
@@ -1142,6 +1163,9 @@ dsb:
     sidebar: 
       close: Zacyniś
       search_results: Pytańske wuslědki
+  time: 
+    formats: 
+      friendly: "%e. %B %Y  %H:%M"
   trace: 
     create: 
       trace_uploaded: Twója GPX-dataja jo se nagrała a caka na zasajźenje do datoweje banki. To stawa se zwětšego za poł góźiny a dostanjoš e-mail za wobkšuśenje.
@@ -1243,14 +1267,20 @@ dsb:
       trackable: Cera (jano źělona ako anonymne, zrědowane dypki z casowymi kołkami)
   user: 
     account: 
+      current email address: "Aktualna e-mailowa adresa:"
+      delete image: Aktualny wobraz wótpóraś
       email never displayed publicly: (njejo nigda widobna)
       flash update success: Wužywarske informacije wuspěšnje zaktualizěrowane.
       flash update success confirm needed: Wužywarske informacije wuspěšnje zaktualizěrowane. Dostanjoš e-mail z napominanim, twóju e-mailowu adresu wobkšuśiś.
       home location: "Bydlišćo:"
+      image: "Wobraz:"
+      keep image: Aktualny wobraz wobchowaś
       latitude: "Šyrina:"
       longitude: "Dlinina:"
       make edits public button: Wše móje změny wózjawiś
       my settings: Móje nastajenja
+      new email address: "Nowa e-mailowa adresa:"
+      new image: Wobraz pśidaś
       no home location: Njejsy swóje bydlišćo zapódał.
       preferred languages: "Preferěrowane rěcy:"
       profile description: "Profilowe wopisanje:"
@@ -1264,6 +1294,7 @@ dsb:
       public editing note: 
         heading: Zjawne wobźěłowanje
         text: Tuchylu twóje změny su anonymne a luźe njamógu śi powěsći pósłaś abo twójo městno wiźeś. Aby pokazał, což sy wobźěłał a luźam dowólił, se z tobu pśez websedło do zwiska stajiś, klikni dołojnce na tłocašk. <b>Wót pśeźenja do API 0.6, jano zjawne wužywarje mógu kórtowe daty wobźěłaś.</b> (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">glědaj pśicyny</a>).<ul><li>Twója e-mailowa adresa njebuźo zjawnje widobna.</li><li>Toś ta akcija njedajo se anulěrowaś a wše nowe wužywarje su něnto pó standarźe zjawne.</li></ul>
+      replace image: Aktualny wobraz wuměniś
       return to profile: Slědk k profiloju
       save changes button: Změny składowaś
       title: Konto wobźěłaś
@@ -1282,9 +1313,6 @@ dsb:
       success: Twója e-mailowa adresa jo se wobkšuśiła, źěkujomy se za registrěrowanje!
     filter: 
       not_an_administrator: Musyš administrator byś, aby wuwjadł toś tu akciju.
-    friend_map: 
-      nearby mapper: "Kartěrowaŕ w bliskosći: [[nearby_user]]"
-      your location: Twójo městno
     go_public: 
       flash success: Wše twóje změny su něnto zjawne, a ty móžoš je něnto wobźěłaś.
     login: 
@@ -1298,6 +1326,10 @@ dsb:
       password: "Gronidło:"
       please login: Pšosym pśizjaw se abo {{create_user_link}}.
       title: Pśizjawjenje
+    logout: 
+      heading: Z OpenStreetMap se wótzjawiś
+      logout_button: Wótzjawjenje
+      title: Wótzjawiś se
     lost_password: 
       email address: "E-mailowa adresa:"
       heading: Sy gronidło zabył?
@@ -1330,6 +1362,10 @@ dsb:
       body: Bóžko njejo wužywaŕ z mjenim {{user}}. Pšosym pśekontrolěruj swój pšawopis, abo wótkaz, na kótaryž sy kliknuł, jo njepłaśiwy.
       heading: Wužywaŕ {{user}} njeeksistěrujo
       title: Toś ten wužywaŕ njejo
+    popup: 
+      friend: Pśijaśel
+      nearby mapper: Kartěrowaŕ w bliskosći
+      your location: Twójo městno
     remove_friend: 
       not_a_friend: "{{name}} njejo twój pśijaśel."
       success: "{{name}} jo se z twójich pśijaśelow wótpórał."
@@ -1346,17 +1382,14 @@ dsb:
     view: 
       activate_user: toś togo wužywarja aktiwěrowaś
       add as friend: ako pśijaśela pśidaś
-      add image: Wobraz pśidaś
       ago: (pśed {{time_in_words_ago}})
       block_history: Dostane blokěrowanja pokazaś
       blocks by me: blokěrowanja wóte mnjo
       blocks on me: blokěrowanja pśeśiwo mě
-      change your settings: Twóje nastajenja změniś
       confirm: Wobkšuśiś
       create_block: toś togo wužywarja blokěrowaś
       created from: "Napórany z:"
       deactivate_user: toś togo wužywarja znjemóžniś
-      delete image: Wobraz wulašowaś
       delete_user: toś togo wužywarja lašowaś
       description: Wopisanje
       diary: dnjownik
@@ -1372,12 +1405,11 @@ dsb:
       my edits: móje změny
       my settings: móje nastajenja
       my traces: móje slědy
-      my_oauth_details: Móje OAuth-drobnostki pokazaś
+      nearby users: Druge wužywarje w bliskosći
-      nearby users: "Wužywarje w bliskosći:"
       new diary entry: nowy dnjownikowy zapisk
       no friends: Hyšći njejsy žednych pśijaśelow pśidał.
-      no home location: Žedne stojnišćo njejo se pódało.
       no nearby users: Hyšći njejsu žedne wužywarje, kótarež kartěruju w bliskosći.
+      oauth settings: OAUTH-nastajenja
       remove as friend: ako pśijaśela wótpóraś
       role: 
         administrator: Toś ten wužywaŕ jo administrator
@@ -1392,8 +1424,6 @@ dsb:
       settings_link_text: nastajenja
       traces: slědy
       unhide_user: toś togo wužiwarja pokazaś
-      upload an image: Wobraz nagraś
-      user image heading: Wužywarski wobraz
       user location: Wužywarske městno
       your friends: Twóje pśijaśele
   user_block: 

config/locales/el.yml

@@ -3,6 +3,7 @@
 # Export driver: syck
 # Author: Consta
 # Author: Crazymadlover
+# Author: Logictheo
 # Author: Omnipaedista
 el: 
   activerecord: 
@@ -97,7 +98,7 @@ el:
       loading: Φόρτωση...
     node: 
       download: "{{download_xml_link}} ή {{view_history_link}}"
-      node: Σήμεο
+      node: Σημείο
       node_title: "Σήμεο: {{node_name}}"
       view_history: Δες ιστορία
     node_details: 
@@ -168,12 +169,12 @@ el:
     way: 
       download: "{{download_xml_link}} ή {{view_history_link}}"
       view_history: δες ιστορία
-      way: Κατεύθηνση
+      way: Κατεύθυνση
-      way_title: "Κατεύθηνση: {{way_name}}"
+      way_title: "Κατεύθυνση: {{way_name}}"
     way_details: 
       also_part_of: 
-        one: επίσης κομμάτι κατεύθηνσης {{related_ways}}
+        one: επίσης κομμάτι κατεύθυνσης {{related_ways}}
-        other: επίσης κομμάτι κατεύθηνσεων {{related_ways}}
+        other: επίσης κομμάτι κατευθύνσεων {{related_ways}}
       nodes: "Σημεία:"
       part_of: Κομμάτι του
     way_history: 
@@ -186,6 +187,8 @@ el:
       anonymous: Ανόνυμος
       show_area_box: δείξε περιοχή κουτιού
       view_changeset_details: Δες αλλαγή συλλογής λεπτομερειών
+    changeset_paging_nav: 
+      showing_page: Eμφάνιση σελίδας {{page}}
     changesets: 
       area: Περιοχή
       comment: Σχόλιο
@@ -243,7 +246,7 @@ el:
       area_to_export: Εξαγωγή περιοχής
       export_button: Εξαγωγή
       export_details: OpenStreetMap data are licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.
-      format: Τρόπος παρουσίασης
+      format: Μορφοποίηση
       format_to_export: Εξαγωγή τρόπου παρουσίασης
       image_size: Μέγεθος εικόνας
       latitude: "Γ. Π.:"
@@ -261,10 +264,6 @@ el:
       export: Εξαγωγή
   layouts: 
     home: κύρια σελίδα
-  map: 
-    coordinates: "Συντεταγμένες:"
-    edit: Άλλαξε
-    view: Εξέτασε
   message: 
     message_summary: 
       delete_button: Διαγραφή

config/locales/en.yml

@@ -1,6 +1,9 @@
 en:
   html:
     dir: ltr
+  time:
+    formats:
+      friendly: "%e %B %Y at %H:%M"    
   activerecord:
     # Translates all the model names, which is used in error handling on the web site
     models:
@@ -76,10 +79,6 @@ en:
     with_id: "{{id}}"
     with_version: "{{id}}, v{{version}}"
     with_name: "{{name}} ({{id}})"
-  map:
-    view: View
-    edit: Edit
-    coordinates: "Coordinates:"
   browse:
     changeset:
       title: "Changeset"
@@ -328,7 +327,7 @@ en:
       heading: "The user {{user}} does not exist"
       body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
     diary_entry:
-      posted_by: "Posted by {{link_user}} at {{created}} in {{language_link}}"
+      posted_by: "Posted by {{link_user}} on {{created}} in {{language_link}}"
       comment_link: Comment on this entry
       reply_link: Reply to this entry
       comment_count:
@@ -338,9 +337,13 @@ en:
       hide_link: Hide this entry
       confirm: Confirm
     diary_comment:
-      comment_from: "Comment from {{link_user}}  at {{comment_created_at}}"
+      comment_from: "Comment from {{link_user}} on {{comment_created_at}}"
       hide_link: Hide this comment
       confirm: Confirm
+    location:
+      location: "Location:"
+      view: "View"
+      edit: "Edit"
     feed:
       user:
         title: "OpenStreetMap diary entries for {{user}}"
@@ -938,7 +941,8 @@ en:
     friend_notification:
       subject: "[OpenStreetMap] {{user}} added you as a friend"
       had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
-      see_their_profile: "You can see their profile at {{userurl}} and add them as a friend too if you wish."
+      see_their_profile: "You can see their profile at {{userurl}}."
+      befriend_them: "You can also add them as a friend at {{befriendurl}}."
     gpx_notification:
       greeting: "Hi,"
       your_gpx_file: "It looks like your GPX file"
@@ -1035,9 +1039,13 @@ en:
       message_sent: "Message sent"
       limit_exceeded: "You have sent a lot of messages recently. Please wait a while before trying to send any more."
     no_such_user:
-      title: "No such user or message"
+      title: "No such user"
-      heading: "No such user or message"
+      heading: "No such user"
-      body: "Sorry there is no user or message with that name or id"
+      body: "Sorry there is no user with that name."
+    no_such_message:
+      title: "No such message"
+      heading: "No such message"
+      body: "Sorry there is no message with that id."
     outbox: 
       title: "Outbox"
       my_inbox: "My {{inbox_link}}"
@@ -1049,6 +1057,8 @@ en:
       date: "Date"
       no_sent_messages: "You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
       people_mapping_nearby: "people mapping nearby"
+    reply:
+      wrong_user: "You are logged in as `{{user}}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply."
     read:
       title: "Read message"
       reading_your_messages: "Reading your messages"
@@ -1061,6 +1071,7 @@ en:
       reading_your_sent_messages: "Reading your sent messages"
       to: "To"
       back_to_outbox: "Back to outbox"
+      wrong_user: "You are logged in as `{{user}}' but the message you have asked to read to was not sent by or to that user. Please login as the correct user in order to read it."
     sent_message_summary:
       delete_button: "Delete"
     mark:
@@ -1183,7 +1194,7 @@ en:
       heading: "Editing trace {{name}}"
       filename: "Filename:"
       download: "download"
-      uploaded_at: "Uploaded at:"
+      uploaded_at: "Uploaded:"
       points: "Points:"
       start_coord: "Start coordinate:"
       map: "map"
@@ -1224,7 +1235,7 @@ en:
       pending: "PENDING"
       filename: "Filename:"
       download: "download"
-      uploaded: "Uploaded at:"
+      uploaded: "Uploaded:"
       points: "Points:"
       start_coordinates: "Start coordinate:"
       map: "map"
@@ -1354,12 +1365,17 @@ en:
       openid: "OpenID:"
       openid description: "Use your OpenID to login"
       alternatively: "Alternatively"
+      remember: "Remember me:"
       lost password link: "Lost your password?"
       login_button: "Login"
       account not active: "Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account."
       auth failure: "Sorry, could not log in with those details."
       openid missing provider: "Sorry, could not contact your OpenID provider"
       openid invalid: "Sorry, your OpenID seems misformed"
+    logout:
+      title: "Logout"
+      heading: "Logout from OpenStreetMap"
+      logout_button: "Logout"      
     lost_password:
       title: "Lost password"
       heading: "Forgotten Password?"
@@ -1404,6 +1420,7 @@ en:
       my edits: my edits
       my traces: my traces
       my settings: my settings
+      oauth settings: oauth settings
       blocks on me: blocks on me
       blocks by me: blocks by me
       send message: send message
@@ -1418,16 +1435,14 @@ en:
       created from: "Created from:"
       description: Description
       user location: User location
-      no home location: "No home location has been set."
+      if set location: "If you set your location, a pretty map and stuff will appear here. You can set your home location on your {{settings_link}} page."
-      if set location: "If you set your location, a pretty map and stuff will appear below. You can set your home location on your {{settings_link}} page."
       settings_link_text: settings
       your friends: Your friends
       no friends: You have not added any friends yet.
       km away: "{{count}}km away"
       m away: "{{count}}m away"
-      nearby users: "Nearby users:"
+      nearby users: "Other nearby users"
-      no nearby users: "There are no users who admit to mapping nearby yet."
+      no nearby users: "There are no other users who admit to mapping nearby yet."
-      my_oauth_details: "View my OAuth details"
       role:
         administrator: "This user is an administrator"
         moderator: "This user is a moderator"
@@ -1446,9 +1461,10 @@ en:
       unhide_user: "unhide this user"
       delete_user: "delete this user"
       confirm: "Confirm"
-    friend_map:
+    popup:
-      your location: Your location
+      your location: "Your location"
-      nearby mapper: "Nearby mapper: [[nearby_user]]"
+      nearby mapper: "Nearby mapper"
+      friend: "Friend"
     account:
       title: "Edit account"
       my settings: My settings
@@ -1476,6 +1492,7 @@ en:
       keep image: "Keep the current image"
       delete image: "Remove the current image"
       replace image: "Replace the current image"
+      image size hint: "(square images at least 100x100 work best)"
       home location: "Home Location:"
       no home location: "You have not entered your home location."
       latitude: "Latitude:"

config/locales/eo.yml

@@ -196,6 +196,12 @@ eo:
       zoom_or_select: Zomu aŭ elektu videndan mapareon
     tag_details: 
       tags: "Etikedoj:"
+    timeout: 
+      type: 
+        changeset: ŝanĝaro
+        node: nodo
+        relation: rilato
+        way: vojo
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} aŭ {{edit_link}}"
       download_xml: Elŝuti XML
@@ -334,7 +340,6 @@ eo:
     donate: Subtenu OpenStreetMap {{link}} al Fonduso de Ĝisdatigo de Aparataro.
     donate_link_text: donacante
     edit: Redakti
-    edit_tooltip: Redakti mapojn
     export: Eksporti
     export_tooltip: Eksporti mapajn datumojn
     gps_traces: GPS spuroj
@@ -342,7 +347,6 @@ eo:
     help_wiki: Helpo kaj Vikio
     help_wiki_tooltip: Helpo kaj Vikio por la projekto
     history: Historio
-    history_tooltip: Historio de ŝanĝaroj
     home: hejmo
     home_tooltip: Iri al hejmloko
     inbox: leterkesto ({{count}})
@@ -373,10 +377,6 @@ eo:
     view_tooltip: Vidi mapojn
     welcome_user: Bonvenon, {{user_link}}
     welcome_user_link_tooltip: Via uzantpaĝo
-  map: 
-    coordinates: "Koordinatoj:"
-    edit: Redakti
-    view: Vidi
   message: 
     delete: 
       deleted: Mesaĝo forigita
@@ -657,9 +657,6 @@ eo:
       success: Via retadreso estis konfirmita, dankon pro registriĝo.
     filter: 
       not_an_administrator: Vi devas esti administristo por fari tion.
-    friend_map: 
-      nearby mapper: "Proksima uzanto: [[nearby_user]]"
-      your location: Via loko
     go_public: 
       flash success: Ĉiuj viaj redaktoj naŭ estas publikaj, kaj vi naŭ rajtas redakti.
     login: 
@@ -695,6 +692,9 @@ eo:
     no_such_user: 
       heading: La uzanto {{user}} ne ekzistas
       title: Neniu tiel uzanto
+    popup: 
+      nearby mapper: Proksima uzanto
+      your location: Via loko
     remove_friend: 
       not_a_friend: "{{name}} ne estas amiko via."
       success: "{{name}} estis forviŝita el viaj amikoj."
@@ -711,15 +711,12 @@ eo:
     view: 
       activate_user: ebligi tiun uzanto
       add as friend: aldoni kiel amikon
-      add image: Aldoni Bildon
       ago: (antaŭ {{time_in_words_ago}})
       blocks on me: blokas min
-      change your settings: ŝanĝi viajn agordojn
       confirm: Konfirmi
       create_block: bloki tiun uzanto
       created from: "Kreita de:"
       deactivate_user: malebligi tiun uzanto
-      delete image: Forigi Bildon
       delete_user: forviŝi ĉi tiun uzanton
       description: Priskribo
       diary: ĵurnalo
@@ -733,11 +730,9 @@ eo:
       my edits: miaj redaktoj
       my settings: miaj agordoj
       my traces: miaj spuroj
-      my_oauth_details: Vidi miajn OAuth detalojn
       nearby users: "Proksimaj uzantoj:"
       new diary entry: nova ĵurnalrikordo
       no friends: Vi jam ne aldonis neniun amikon.
-      no home location: Neniu hejmloko estis elektita.
       remove as friend: forviŝu kiel amiko
       role: 
         administrator: Ĉi tiu uzanto estas administranto
@@ -746,8 +741,6 @@ eo:
       settings_link_text: agordoj
       traces: spuroj
       unhide_user: aperigi tiun uzanto
-      upload an image: Alŝuti bildon
-      user image heading: Uzantbildo
       user location: Loko de uzanto
       your friends: Viaj amikoj
   user_block: 

config/locales/es.yml

@@ -5,6 +5,7 @@
 # Author: McDutchie
 # Author: PerroVerd
 # Author: Peter17
+# Author: Toliño
 # Author: Translationista
 es: 
   activerecord: 
@@ -291,7 +292,7 @@ es:
       body: "Cuerpo:"
       language: "Idioma:"
       latitude: Latitud
-      location: "Lugar:"
+      location: "Ubicación:"
       longitude: Longitud
       marker_text: Lugar de la entrada del diario
       save_button: Guardar
@@ -318,6 +319,10 @@ es:
       recent_entries: "Entradas recientes en el diario:"
       title: Diarios de usuarios
       user_title: Diario de {{user}}
+    location: 
+      edit: Editar
+      location: "Ubicación:"
+      view: Ver
     new: 
       title: Nueva entrada en el diario
     no_such_entry: 
@@ -341,7 +346,7 @@ es:
       area_to_export: Área a exportar
       embeddable_html: HTML para pegar
       export_button: Exportar
-      export_details: Los datos de OpenStreetMap se encuentran bajo una <a href='http://creativecommons.org/licenses/by-sa/2.0/'>licencia Creative Commons Atribución-Compartir Igual 2.0</a>.
+      export_details: Los datos de OpenStreetMap se encuentran bajo una <a href='http://creativecommons.org/licenses/by-sa/2.0/'>licencia Creative Commons Atribución-Compartir Igual 2.0</a>.
       format: Formato
       format_to_export: Formato de exportación
       image_size: Tamaño de la imagen
@@ -357,6 +362,9 @@ es:
       output: Resultado
       paste_html: HTML para empotrar en otro sitio web
       scale: Escala
+      too_large: 
+        body: Este área es demasiado grande para ser exportado como OpenStreetMap XML. Por favor, haga zoom o seleccione un área más pequeña.
+        heading: El área es demasiado grande
       zoom: Zoom
     start_rjs: 
       add_marker: Añadir un marcador al mapa
@@ -848,22 +856,24 @@ es:
         cycle_map: Mapa ciclista
         noname: Sin nombres
     site: 
+      edit_disabled_tooltip: Haga zoom para editar el mapa
+      edit_tooltip: Edita el mapa
       edit_zoom_alert: Debe hacer más zoom para editar el mapa
+      history_disabled_tooltip: Haga zoom para ver las ediciones de este área
+      history_tooltip: Ver ediciones para este área
       history_zoom_alert: Debe hacer más zoom para ver el histórico de ediciones
   layouts: 
     donate: Apoye a OpenStreetMap {{link}} al Fondo de Actualización de Hardware.
     donate_link_text: donando
     edit: Editar
-    edit_tooltip: Editar mapas
     export: Exportar
     export_tooltip: Exportar datos del mapa
     gps_traces: Trazas GPS
-    gps_traces_tooltip: Gestionar trazas
+    gps_traces_tooltip: Gestiona las trazas GPS
     help_wiki: Ayuda y Wiki
     help_wiki_tooltip: Ayuda y sitio Wiki del proyecto
     help_wiki_url: http://wiki.openstreetmap.org/wiki/ES:Main_Page?uselang=es
     history: Historial
-    history_tooltip: Historial de conjuntos de cambios
     home: inicio
     home_tooltip: Ir a la página inicial
     inbox: bandeja de entrada ({{count}})
@@ -899,13 +909,9 @@ es:
     user_diaries: Diarios de usuario
     user_diaries_tooltip: Ver diarios de usuario
     view: Ver
-    view_tooltip: Ver mapas
+    view_tooltip: Ver el mapa
     welcome_user: Bienvenido, {{user_link}}
     welcome_user_link_tooltip: Tu página de usuario
-  map: 
-    coordinates: Coordenadas
-    edit: Editar
-    view: Ver
   message: 
     delete: 
       deleted: Mensaje borrado
@@ -936,10 +942,14 @@ es:
       send_message_to: Enviar un mensaje nuevo a {{name}}
       subject: Asunto
       title: Enviar mensaje
+    no_such_message: 
+      body: Lo sentimos, no hay ningún mensaje con este identificador.
+      heading: Este mensaje no existe.
+      title: Este mensaje no existe.
     no_such_user: 
-      body: Perdón no existe usuario o mensaje con ese nombre o id
+      body: Lo sentimos no hay ningún usuario con ese nombre.
-      heading: No hay tal usuario o mensaje
+      heading: Este usuario no existe
-      title: No hay tal usuario o mensaje
+      title: Este usuario no existe
     outbox: 
       date: Fecha
       inbox: entrada
@@ -963,6 +973,9 @@ es:
       title: Leer mensaje
       to: A
       unread_button: Marcar como no leído
+      wrong_user: Está conectado como `{{user}}' pero el mensaje que quiere leer no se ha enviado a dicho usuario. Por favor, ingrese con el usuario correcto para ver el mensaje.
+    reply: 
+      wrong_user: Está conectado como `{{user}}' pero el mensaje que quiere responder no se ha enviado a dicho usuario. Por favor, ingrese con el usuario correcto para responder.
     sent_message_summary: 
       delete_button: Borrar
   notifier: 
@@ -983,8 +996,9 @@ es:
       hopefully_you_1: Alguien (posiblemente usted) quiere cambiar la dirección de correo en
       hopefully_you_2: "{{server_url}} a {{new_address}}."
     friend_notification: 
+      befriend_them: También puede añadirle como amigo en {{befriendurl}}.
       had_added_you: "{{user}} te ha añadido como amigo en OpenStreetMap"
-      see_their_profile: Puede ver su perfil en {{userurl}} y añadirle como amigo también, si así­ lo desea
+      see_their_profile: Puede ver su perfil en {{userurl}}.
       subject: "[OpenStreetMap] {{user}} te ha añadido como amigo"
     gpx_notification: 
       and_no_tags: y sin etiquetas
@@ -1212,6 +1226,9 @@ es:
     sidebar: 
       close: Cerrar
       search_results: Resultados de la búsqueda
+  time: 
+    formats: 
+      friendly: "%e %B %Y a las %H:%M"
   trace: 
     create: 
       trace_uploaded: Su archivo GPX ha sido cargado y está esperando ser agregado a la Base de Datos. Esto normalmente ocurre dentro de la próxima media hora, y un email le será enviado al terminar.
@@ -1234,7 +1251,7 @@ es:
       title: Editando trazo {{name}}
       uploaded_at: "Subido el:"
       visibility: "Visibilidad:"
-      visibility_help: ¿Que significa esto?
+      visibility_help: ¿Qué significa esto?
     list: 
       public_traces: Trazas GPS públicas
       public_traces_from: Trazas GPS Publicas de {{user}}
@@ -1314,15 +1331,20 @@ es:
   user: 
     account: 
       current email address: "Dirección de correo electrónico actual:"
+      delete image: Elimina la imagen actual
       email never displayed publicly: (nunca es mostrado públicamente)
       flash update success: La información del usuario se ha actualizado correctamente.
       flash update success confirm needed: La información del usuario se ha actualizado correctamente. Compruebe su correo electrónico para ver una nota sobre cómo confirmar su nueva dirección de correo electrónico.
       home location: "Lugar de origen:"
+      image: "Imagen:"
+      image size hint: (las imágenes cuadradas de al menos 100x100 funcionan mejor)
+      keep image: Mantiene la imagen actual
       latitude: "Latitud:"
       longitude: "Longitud:"
       make edits public button: Hacer que todas mis ediciones sean públicas
       my settings: Mis preferencias
       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 languages: "Idiomas preferidos:"
       profile description: "Descripción del perfil:"
@@ -1336,6 +1358,7 @@ es:
       public editing note: 
         heading: Edición pública
         text: Actualmente sus ediciones son anónimas y la gente no puede ni enviarle mensajes ni ver su localización. Para mostrar que es lo que ha editado y permitir a la gente contactar con usted a través del sitio web, pulse el botón inferior. <b>Desde la migración a la API 0.6, sólo los usuarios públicos pueden editar el mapa</b> (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">más detalles aquí</a>) <ul><li>Su dirección de correo no será revelada por el hecho de ser público. </li><li>Esta acción no puede ser revertida y todos los nuevos usuarios son públicos por omisión.</li></ul>
+      replace image: Reemplazar la imagen actual
       return to profile: Regresar al perfil
       save changes button: Guardar cambios
       title: Editar cuenta
@@ -1354,9 +1377,6 @@ es:
       success: Dirección de correo electrónico confirmada. ¡Gracias por registrarse!
     filter: 
       not_an_administrator: Necesitas ser administrador para ejecutar esta acción.
-    friend_map: 
-      nearby mapper: "Mapeadores cercanos:"
-      your location: "Tu lugar de origen:"
     go_public: 
       flash success: Ahora todas tus ediciones son públicas y ya estás autorizado para editar
     login: 
@@ -1369,7 +1389,12 @@ es:
       lost password link: ¿Ha perdido su contraseña?
       password: Contraseña
       please login: Por favor inicie sesión o {{create_user_link}}.
+      remember: "Recordarme:"
       title: Iniciar sesión
+    logout: 
+      heading: Salir de OpenStreetMap
+      logout_button: Cerrar sesión
+      title: Cerrar sesión
     lost_password: 
       email address: "Dirección de correo:"
       heading: ¿Contraseña olvidada?
@@ -1402,6 +1427,10 @@ es:
       body: Perdón, No existe usuario con el nombre {{user}}. Por favor verifica las letras, o posiblemente el vínculo que has hecho click está equivocado.
       heading: El usuario {{user}} no existe
       title: Este usuario no existe
+    popup: 
+      friend: Amigo
+      nearby mapper: Mapeadores cercanos
+      your location: "Tu lugar de origen:"
     remove_friend: 
       not_a_friend: "{{name}} no es uno de tus amigos."
       success: Has quitado a {{name}} de tus amigos.
@@ -1418,17 +1447,14 @@ es:
     view: 
       activate_user: activar este usuario
       add as friend: añadir como amigo
-      add image: Añadir imagen
       ago: (hace {{time_in_words_ago}})
       block_history: ver los bloqueos recibidos
       blocks by me: bloqueados por mi
       blocks on me: bloqueos sobre mi
-      change your settings: cambiar tu configuración
       confirm: Confirmar
       create_block: bloquear a este usuario
       created from: "Creado a partir de:"
       deactivate_user: desactivar este usuario
-      delete image: Borrar imagen
       delete_user: borrar este usuario
       description: Descripción
       diary: diario
@@ -1444,12 +1470,11 @@ es:
       my edits: mis ediciones
       my settings: mis preferencias
       my traces: mis trazas
-      my_oauth_details: Ver mis detalles OAuth
+      nearby users: "Otros usuarios cercanos:"
-      nearby users: "Usuarios cercanos:"
       new diary entry: nueva entrada de diario
       no friends: No has añadido ningún amigo aún.
-      no home location: No se ha fijado ninguna localización.
+      no nearby users: Todavía no hay usuarios que se hayan ubicado en su proximidad.
-      no nearby users: Todavía no hay usuarios que reconozcan el estar mapeando cerca.
+      oauth settings: ajustes OAuth
       remove as friend: eliminar como amigo
       role: 
         administrator: Este usuario es un administrador
@@ -1464,32 +1489,30 @@ es:
       settings_link_text: preferencias
       traces: trazas
       unhide_user: descubrir este usuario
-      upload an image: Subir una imagen
-      user image heading: Imagen del usuario
       user location: Localización del usuario
       your friends: Tus amigos
   user_block: 
     blocks_by: 
-      empty: "{{name}} todavía no ha creado ningún bloque."
+      empty: "{{name}} todavía no ha creado ningún bloqueo."
-      heading: Listado de bloques por {{name}}
+      heading: Listado de bloqueos por {{name}}
-      title: Bloques por {{name}}
+      title: Bloqueos por {{name}}
     blocks_on: 
       empty: "{{name}} no ha sido bloqueado todavía."
-      heading: Listado de bloques en {{name}}
+      heading: Listado de bloqueos en {{name}}
       title: Bloqueos para {{name}}
     create: 
       flash: Ha creado un bloque en el usuario {{name}}.
       try_contacting: Por favor, antes de bloquear al usuario, intenta contactarle y darle un tiempo razonable de respuesta.
       try_waiting: Por favor, trata de darle al usuario un tiempo razonable de respuesta antes de bloquearle.
     edit: 
-      back: Ver todos los bloques
+      back: Ver todos los bloqueos
-      heading: Editando el bloque en {{name}}
+      heading: Editando el bloqueo en {{name}}
       needs_view: ¿Necesita el usuario hacer login antes de que este bloqueo sea eliminado_
       period: ¿Por cuánto tiempo, empezando ahora, tiene que estar el usuario bloqueado del uso de la API?
       reason: El motivo por el que {{name}} está siendo bloqueado. Por favor, escriba todo lo calmado y razonable que pueda, proporcionando todos los detalles que pueda sobre la situación. Tenga en cuenta que no todos los usuarios entienden la jerga de la comunidad, así que por favor trate de usar un lenguaje plano.
-      show: Ver este bloque
+      show: Ver este bloqueo
-      submit: Actualizar el bloque
+      submit: Actualizar el bloqueo
-      title: Editando el bloque en {{name}}
+      title: Editando el bloqueo en {{name}}
     filter: 
       block_expired: Este bloqueo ya ha expirado y no puede ser editado.
       block_period: El periodo de bloqueo debe de ser uno de los valores seleccionables de la lista desplegable
@@ -1533,13 +1556,13 @@ es:
       one: 1 hora
       other: "{{count}} horas"
     revoke: 
-      confirm: ¿Seguro que deseas revocar este bloque?
+      confirm: ¿Seguro que deseas revocar este bloqueo?
-      flash: Este bloque ha sido revocado.
+      flash: Este bloqueo ha sido revocado.
-      heading: Revocando bloque en {{block_on}} por {{block_by}}
+      heading: Revocando bloqueo en {{block_on}} por {{block_by}}
-      past: Este bloque terminó hace {{time}} y no puede ser revocado ahora.
+      past: Este bloqueo terminó hace {{time}} y no puede ser revocado ahora.
       revoke: Revocar
-      time_future: Este bloque finalizará en {{time}}.
+      time_future: Este bloqueo finalizará en {{time}}.
-      title: Revocando bloque en {{block_on}}
+      title: Revocando bloqueo en {{block_on}}
     show: 
       back: Ver todos los bloqueos
       confirm: ¿Está seguro?
@@ -1555,7 +1578,7 @@ es:
       time_past: Finalizado hace {{time}}
       title: "{{block_on}} bloqueado por {{block_by}}"
     update: 
-      only_creator_can_edit: Sólo el moderador que ha creado este bloque puede editarlo.
+      only_creator_can_edit: Sólo el moderador que ha creado este bloqueo puede editarlo.
       success: Bloqueo actualizado.
   user_role: 
     filter: 

config/locales/et.yml

@@ -0,0 +1,400 @@
+# Messages for Estonian (Eesti)
+# Exported from translatewiki.net
+# Export driver: syck
+# Author: Avjoska
+et: 
+  activerecord: 
+    attributes: 
+      diary_entry: 
+        language: Keel
+        user: Kasutaja
+      friend: 
+        friend: Sõber
+        user: Kasutaja
+      message: 
+        recipient: Vastuvõtja
+        sender: Saatja
+      trace: 
+        description: Kirjeldus
+        latitude: Laiuskraadid
+        longitude: Pikkuskraadid
+        name: Nimi
+        size: Suurus
+        user: Kasutaja
+        visible: Nähtav
+      user: 
+        description: Kirjeldus
+        email: E-posti aadress
+        languages: Keeled
+        pass_crypt: Parool
+    models: 
+      country: Riik
+      language: Keel
+  browse: 
+    map: 
+      deleted: Kustutatud
+    node: 
+      edit: redigeeri
+      view_history: vaata redigeerimiste ajalugu
+    node_details: 
+      coordinates: "Koordinaadid:"
+    relation_details: 
+      members: "Liikmed:"
+    start_rjs: 
+      details: Detailid
+      object_list: 
+        details: Detailid
+      show_history: Näita ajalugu
+      wait: Oota...
+    way: 
+      edit: redigeeri
+      view_history: vaata ajalugu
+    way_history: 
+      view_details: vaata detaile
+  changeset: 
+    changesets: 
+      comment: Kommentaar
+  diary_entry: 
+    edit: 
+      language: "Keel:"
+      save_button: Salvesta
+      subject: "Teema:"
+    list: 
+      title: Kasutajate päevikud
+  geocoder: 
+    direction: 
+      east: ida
+      north: põhja
+      north_east: kirde
+      north_west: loode
+      south: lõuna
+      south_east: kagu
+      south_west: edela
+      west: lääne
+    search_osm_nominatim: 
+      prefix: 
+        amenity: 
+          airport: Lennujaam
+          atm: Pangaautomaat
+          auditorium: Auditoorium
+          bank: Pank
+          bench: Pink
+          bicycle_parking: Jalgrattaparkla
+          bicycle_rental: Jalgrattarent
+          bureau_de_change: Rahavahetus
+          bus_station: Bussijaam
+          cafe: Kohvik
+          car_rental: Autorent
+          car_wash: Autopesu
+          casino: Kasiino
+          cinema: Kino
+          clinic: Kliinik
+          club: Klubi
+          courthouse: Kohtuhoone
+          crematorium: Krematoorium
+          dentist: Hambaarst
+          drinking_water: Joogivesi
+          driving_school: Autokool
+          embassy: Saatkond
+          fast_food: Kiirtoit
+          fuel: Kütus
+          grave_yard: Surnuaed
+          hospital: Haigla
+          hotel: Hotell
+          ice_cream: Jäätis
+          kindergarten: Lasteaed
+          library: Raamatukogu
+          market: Turg
+          nightclub: Ööklubi
+          pharmacy: Apteek
+          police: Politsei
+          post_box: Postkast
+          post_office: Postkontor
+          preschool: Lasteaed
+          prison: Vangla
+          reception_area: Vastuvõtt
+          restaurant: Restoran
+          retirement_home: Vanadekodu
+          sauna: Saun
+          school: Kool
+          shop: Kauplus
+          supermarket: Supermarket
+          taxi: Takso
+          theatre: Teater
+          toilets: WC
+          university: Ülikool
+          waste_basket: Prügikast
+          wifi: WiFi
+          youth_centre: Noortekeskus
+        building: 
+          chapel: Kabel
+          church: Kirik
+          hotel: Hotell
+          school: Koolihoone
+          shop: Kauplus
+          stadium: Staadion
+          tower: Torn
+          train_station: Raudteejaam
+          university: Ülikoolihoone
+          "yes": Hoone
+        highway: 
+          bus_stop: Bussipeatus
+          cycleway: Jalgrattatee
+          footway: Jalgrada
+          pedestrian: Jalakäijatele
+        historic: 
+          castle: Kindlus
+          church: Kirik
+          icon: Ikoon
+          manor: Mõis
+          museum: Muuseum
+          ruins: Varemed
+          tower: Torn
+        landuse: 
+          cemetery: Surnuaed
+          forest: Mets
+          mountain: Mägi
+          railway: Raudtee
+          wetland: Soo
+        leisure: 
+          garden: Aed
+          golf_course: Golfiväljak
+          ice_rink: Uisuväli
+          miniature_golf: Minigolf
+          park: Park
+          playground: Mänguväljak
+          sports_centre: Spordikeskus
+          stadium: Saadion
+          swimming_pool: Ujula
+          water_park: Veepark
+        natural: 
+          beach: Rand
+          cave_entrance: Koopa sissepääs
+          coastline: Rannajoon
+          crater: Kraater
+          fjord: Fjord
+          geyser: Geiser
+          hill: Mägi
+          island: Saar
+          mud: Muda
+          peak: Mäetipp
+          river: Jõgi
+          spring: Allikas
+          tree: Puu
+          volcano: Vulkaan
+          water: Vesi
+          wetlands: Soo
+        place: 
+          airport: Lennujaam
+          city: Linn
+          country: Riik
+          county: Maakond
+          house: Maja
+          houses: Majad
+          island: Saar
+          islet: Saareke
+          municipality: Vald
+          postcode: Sihtnumber
+          state: Osariik
+          town: Linn
+          village: Küla
+        railway: 
+          station: Raudteejaam
+          tram: Trammitee
+          tram_stop: Trammipeatus
+        shop: 
+          books: Raamatupood
+          car_repair: Autoparandus
+          carpet: Vaibakauplus
+          clothes: Riidepood
+          computer: Arvutikauplus
+          cosmetics: Kosmeetikapood
+          drugstore: Apteek
+          dry_cleaning: Keemiline puhastus
+          fish: Kalapood
+          food: Toidupood
+          furniture: Mööbel
+          gallery: Galerii
+          hairdresser: Juuksur
+          insurance: Kindlustus
+          jewelry: Juveelipood
+          kiosk: Kiosk
+          mobile_phone: Mobiiltelefonide pood
+          music: Muusikapood
+          pet: Lemmikloomapood
+          shoes: Kingapood
+          sports: Spordipood
+          supermarket: Supermarket
+          toys: Mänguasjapood
+          travel_agency: Reisiagentuur
+        tourism: 
+          attraction: Turismiatraktsioon
+          camp_site: Laagriplats
+          guest_house: Külalistemaja
+          hotel: Hotell
+          information: Informatsioon
+          motel: Motell
+          museum: Muuseum
+          picnic_site: Piknikuplats
+          theme_park: Teemapark
+          zoo: Loomaaed
+  layouts: 
+    edit: Redigeeri
+    log_in: logi sisse
+    logout_tooltip: Logi välja
+    shop: Kauplus
+    welcome_user_link_tooltip: Sinu kasutajaleht
+  message: 
+    inbox: 
+      date: Kuupäev
+    message_summary: 
+      delete_button: Kustuta
+      read_button: Märgi loetuks
+      reply_button: Vasta
+    outbox: 
+      date: Kuupäev
+      subject: Teema
+    read: 
+      date: Kuupäev
+      from: Kellelt
+      reply_button: Vasta
+      subject: Teema
+      to: Kellele
+      unread_button: Märgi mitteloetuks
+    sent_message_summary: 
+      delete_button: Kustuta
+  notifier: 
+    email_confirm_html: 
+      greeting: Tere,
+    email_confirm_plain: 
+      greeting: Tere,
+    gpx_notification: 
+      greeting: Tere,
+    lost_password_html: 
+      greeting: Tere,
+    lost_password_plain: 
+      greeting: Tere,
+    message_notification: 
+      hi: Tere, {{to_user}},
+  oauth_clients: 
+    edit: 
+      submit: Redigeeri
+      title: Redigeeri oma avaldust
+    index: 
+      application: Avalduse nimi
+    new: 
+      submit: Registreeri
+      title: Registreeri uus avaldus
+  site: 
+    edit: 
+      user_page_link: kasutajaleht
+    key: 
+      table: 
+        entry: 
+          cemetery: Surnuaed
+          cycleway: Jalgrattatee
+          footway: Jalgtee
+          park: Park
+    search: 
+      search: Otsi
+      submit_text: Otsi
+      where_am_i: Kus ma olen?
+    sidebar: 
+      close: Sulge
+      search_results: Otsingu tulemused
+  trace: 
+    edit: 
+      description: "Kirjeldus:"
+      download: laadi alla
+      edit: redigeeri
+      filename: "Failinimi:"
+      map: kaart
+      owner: "Omanik:"
+      points: "Punktid:"
+      save_button: Salvesta muudatused
+      start_coord: "Alguskoordinaadid:"
+      visibility: "Nähtavus:"
+      visibility_help: mida see tähendab?
+    no_such_user: 
+      title: Sellist kasutajat ei ole
+    trace: 
+      view_map: Vaata kaarti
+    trace_form: 
+      description: Kirjeldus
+      help: Abi
+      upload_button: Laadi üles
+      visibility: Nähtavus
+      visibility_help: mida see tähendab?
+    view: 
+      description: "Kirjeldus:"
+      download: laadi alla
+      edit: redigeeri
+      filename: "Failinimi:"
+      map: kaardil
+      owner: "Omanik:"
+      points: "Punktid:"
+      start_coordinates: "Alguskoordinaadid:"
+      visibility: "Nähtavus:"
+  user: 
+    account: 
+      latitude: "Laiuskraadid:"
+      longitude: "Pikkuskraadid:"
+      preferred languages: "Eelistatud keeled:"
+      public editing: 
+        disabled link text: miks ma ei saa redigeerida?
+        enabled link text: mis see on?
+      save changes button: Salvesta muudatused
+    confirm: 
+      button: Kinnita
+    login: 
+      create_account: loo uus kasutajanimi
+      email or username: "E-posti aadress või kasutajanimi:"
+      heading: Logi sisse
+      login_button: Logi sisse
+      password: "Parool:"
+      title: Sisselogimise lehekülg
+    lost_password: 
+      email address: "E-posti aadress:"
+      heading: Parool ununenud?
+    make_friend: 
+      success: "{{name}} on nüüd Sinu sõber."
+    new: 
+      confirm email address: "Kinnita e-posti aadress:"
+      confirm password: "Kinnita parool:"
+      email address: "E-posti aadress:"
+      heading: Loo uus kasutajanimi
+      password: "Parool:"
+    reset_password: 
+      confirm password: "Kinnita parool:"
+      flash changed: Sinu parool on muudetud.
+      password: "Parool:"
+    view: 
+      activate_user: aktiveeri see kasutaja
+      add as friend: lisa sõbraks
+      create_block: blokeeri see kasutaja
+      delete_user: kustuta see kasutaja
+      description: Kirjeldus
+      diary: päevik
+      edits: muudatused
+      email address: "E-posti aadress:"
+      km away: "{{count}} kilomeetri kaugusel"
+      m away: "{{count}} meetri kaugusel"
+      my diary: minu päevik
+      new diary entry: uus päevikusissekanne
+      role: 
+        administrator: See kasutaja on administraator
+        moderator: See kasutaja on moderaator
+      send message: saada sõnum
+      your friends: Sinu sõbrad
+  user_block: 
+    edit: 
+      back: Vaata kõiki blokeeringuid
+    new: 
+      back: Vaata kõiki blokeeringuid
+    partial: 
+      confirm: Oled Sa kindel?
+    show: 
+      confirm: Oled Sa kindel?
+  user_role: 
+    revoke: 
+      confirm: Kinnita

config/locales/eu.yml

@@ -489,7 +489,6 @@ eu:
         noname: Izenik gabe
   layouts: 
     edit: Aldatu
-    edit_tooltip: Mapak aldatu
     export: Esportatu
     help_wiki: Laguntza eta Wiki
     history: Historia
@@ -511,10 +510,6 @@ eu:
     view_tooltip: Mapak ikusi
     welcome_user: Ongietorri, {{user_link}}
     welcome_user_link_tooltip: Zure lankide orrialdea
-  map: 
-    coordinates: "Koordenatuak:"
-    edit: Aldatu
-    view: Ikusi
   message: 
     delete: 
       deleted: Mezua ezabatuta
@@ -690,9 +685,6 @@ eu:
       heading: Erabiltzaile kontua baieztatu
     confirm_email: 
       button: Berretsi
-    friend_map: 
-      nearby mapper: "Hurbileko mapeatzaileak: [[nearby_user]]"
-      your location: Zure kokapena
     login: 
       create_account: kontua sortu
       email or username: "Eposta helbidea edo Erabiltzaile izena:"
@@ -713,6 +705,9 @@ eu:
       password: "Pasahitza:"
       signup: Izena eman
       title: Kontua sortu
+    popup: 
+      nearby mapper: Hurbileko mapeatzaileak
+      your location: Zure kokapena
     remove_friend: 
       not_a_friend: "{{name}} ez da zure laguna."
     reset_password: 
@@ -723,10 +718,8 @@ eu:
       title: Pasahitza berrezarri
     view: 
       add as friend: lagun bezala
-      add image: Irudia gehitu
       ago: (duela {{time_in_words_ago}})
       confirm: Berretsi
-      delete image: Irudia ezabatu
       description: Deskribapen
       edits: aldaketak
       email address: "Helbide elektronikoa:"

config/locales/fa.yml

@@ -0,0 +1,341 @@
+# Messages for Persian (فارسی)
+# Exported from translatewiki.net
+# Export driver: syck
+# Author: Grille chompa
+fa: 
+  activerecord: 
+    attributes: 
+      diary_entry: 
+        language: زبان
+        latitude: عرض جغرافیایی
+        longitude: طول جغرافیایی
+        user: کاربر
+      friend: 
+        friend: دوست
+        user: کاربر
+      trace: 
+        latitude: عرض جغرافیایی
+        longitude: طول جغرافیایی
+        name: نام
+        user: کاربر
+      user: 
+        pass_crypt: کلمه عبور
+    models: 
+      country: کشور
+      friend: دوست
+      language: زبان
+      message: پیغام
+      node: گره
+      relation: ارتباط
+      user: کاربر
+      way: راه
+  browse: 
+    common_details: 
+      version: "نسخه :"
+    containing_relation: 
+      entry: ارتباطات {{relation_name}}
+    node: 
+      download: "{{download_xml_link}}، {{view_history_link}} یا {{edit_link}}"
+      edit: ویرایش
+      node: گره
+      node_title: "گره: {{node_name}}"
+    node_details: 
+      part_of: "قسمتی از:"
+    not_found: 
+      type: 
+        node: گره
+        relation: ارتباط
+        way: راه
+    paging_nav: 
+      of: از
+    relation: 
+      relation: ارتباط
+      relation_title: "ارتباطات: {{relation_name}}"
+    relation_details: 
+      part_of: "قسمتی از:"
+    relation_member: 
+      entry_role: "{{type}} {{name}} به عنوان {{role}}"
+      type: 
+        node: گره
+        relation: ارتباط
+        way: راه
+    start_rjs: 
+      details: جزئیات
+      object_list: 
+        details: جزئیات
+        history: 
+          type: 
+            node: گره [[id]]
+            way: راه [[id]]
+        selected: 
+          type: 
+            node: گره [[id]]
+            way: راه [[id]]
+        type: 
+          node: گره
+          way: راه
+    tag_details: 
+      tags: "برچسب‌ها:"
+    timeout: 
+      type: 
+        node: گره
+        relation: ارتباط
+        way: راه
+    way: 
+      download: "{{download_xml_link}}، {{view_history_link}} یا {{edit_link}}"
+      edit: ویرایش
+      way: راه
+      way_title: "راه: {{way_name}}"
+    way_details: 
+      nodes: "گره ها :"
+      part_of: "قسمتی از:"
+  changeset: 
+    changeset: 
+      big_area: (بزرگ)
+    changesets: 
+      user: کاربر
+  diary_entry: 
+    edit: 
+      language: "زبان:"
+      latitude: "عرض جغرافیایی:"
+      longitude: "طول جغرافیایی:"
+      save_button: ذخیره
+    location: 
+      edit: ویرایش
+    view: 
+      save_button: ذخیره
+  export: 
+    start: 
+      latitude: "عرض:"
+      longitude: "طول:"
+      options: تنظیمات
+  geocoder: 
+    description_osm_namefinder: 
+      prefix: "{{distance}} {{direction}} {{type}}"
+    direction: 
+      east: شرق
+      north: شمال
+      north_east: شمال شرقی
+      north_west: شمال غربی
+      south: جنوب
+      south_east: جنوب شرقی
+      south_west: جنوب غربی
+      west: غرب
+    search_osm_namefinder: 
+      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} {{parentname}})"
+      suffix_place: ", {{distance}} {{direction}} {{placename}}"
+    search_osm_nominatim: 
+      prefix: 
+        amenity: 
+          airport: فرودگاه
+          atm: عابر بانک
+          bank: بانک
+          bench: نیمکت
+          brothel: فاحشه خانه
+          cafe: کافه
+          cinema: سینما
+          clinic: درمانگاه
+          courthouse: دادگاه
+          dentist: دندانپزشک
+          dormitory: خوابگاه دانشجویی
+          embassy: سفارت
+          fire_station: آتش نشانی
+          fuel: پمپ بنزین
+          hospital: بیمارستان
+          hotel: هتل
+          kindergarten: کودکستان
+          library: کتابخانه
+          market: بازار
+          marketplace: بازار
+          office: دفتر
+          park: پارک
+          parking: پارکینگ
+          pharmacy: داروخانه
+          police: پلیس
+          post_box: صندوق پست
+          post_office: اداره پست
+          prison: زندان
+          pub: میخانه
+          recycling: بازیافت
+          restaurant: رستوران
+          school: مدرسه
+          supermarket: سوپرمارکت
+          taxi: تاکسی
+          theatre: تئاتر
+          townhall: شهر داری
+          university: دانشگاه
+          waste_basket: سطل اشغال
+        building: 
+          garage: گاراژ
+          hotel: هتل
+          house: خانه
+          stadium: ورزشگاه
+          tower: برج
+        highway: 
+          bus_stop: ایستگاه اتوبوس
+          motorway: اتوبان
+          path: مسیر
+          road: جاده
+          steps: پله
+          trunk: بزرگراه
+        historic: 
+          castle: قلعه
+          museum: موزه
+          tower: برج
+        landuse: 
+          farmland: زمین کشاورزی
+          forest: جنگل
+          mountain: کوه
+          park: پارک
+          railway: ریل
+        leisure: 
+          garden: باغ
+          park: پارک
+          stadium: ورزشگاه
+        natural: 
+          beach: ساحل
+          channel: کانال
+          coastline: ساحل
+          hill: تپه
+          island: جزیره
+          point: نقطه
+          river: رود خانه
+          rock: صخره
+          tree: درخت
+          valley: دره
+          volcano: کوه آتشفشان
+          water: اب
+          wood: جنگل
+        place: 
+          airport: فرودگاه
+          city: شهر بزرگ
+          country: کشور
+          farm: مزرعه
+          house: خانه
+          island: جزیره
+          sea: دریا
+          suburb: محله
+          town: شهر
+          village: دهکده
+        shop: 
+          bakery: نانوایی
+          butcher: قصاب
+          kiosk: کیوسک
+          market: بازار
+          supermarket: سوپرمارکت
+        tourism: 
+          hotel: هتل
+          motel: متل
+          museum: موزه
+          valley: دره
+          zoo: باغ وحش
+        waterway: 
+          canal: کانال
+          river: رودخانه
+          waterfall: ابشار
+  message: 
+    inbox: 
+      date: تاریخ
+      from: از
+      subject: عنوان
+    outbox: 
+      date: تاریخ
+      subject: عنوان
+      to: به
+    read: 
+      date: تاریخ
+      from: از
+      to: به
+  notifier: 
+    diary_comment_notification: 
+      hi: سلام {{to_user}} ،
+    email_confirm_html: 
+      greeting: سلام ،
+    email_confirm_plain: 
+      greeting: سلام ،
+    gpx_notification: 
+      greeting: سلام ،
+    lost_password_html: 
+      greeting: سلام ،
+    lost_password_plain: 
+      greeting: سلام ،
+    message_notification: 
+      hi: سلام {{to_user}},
+    signup_confirm_plain: 
+      greeting: سلام!
+  oauth_clients: 
+    edit: 
+      submit: ویرایش
+    form: 
+      name: نام
+  site: 
+    key: 
+      table: 
+        entry: 
+          cemetery: گورستان
+          farm: مزرعه
+          forest: جنگل
+          lake: 
+            - دریاچه
+          motorway: اتوبان
+          park: پارک
+          school: 
+            - مدرسه
+            - دانشگاه
+          summit: 
+            - قله
+            - قله
+          trunk: بزرگراه
+    sidebar: 
+      close: بستن
+  trace: 
+    edit: 
+      edit: ویرایش
+      map: نقشه
+      tags: "برچسب‌ها:"
+    trace: 
+      by: توسط
+      edit: ویرایش
+      edit_map: ویرایش نقشه
+      in: در
+      map: نقشه
+      more: بیشتر
+    trace_form: 
+      help: راهنما
+      tags: برچسب‌ها
+    trace_optionals: 
+      tags: برچسب‌ها
+    view: 
+      edit: ویرایش
+      map: نقشه
+      tags: "برچسب‌ها:"
+  user: 
+    account: 
+      image: "تصویر :"
+      latitude: "عرض جغرافیایی:"
+      longitude: "طول جغرافیایی:"
+    confirm_email: 
+      button: تأیید
+    login: 
+      heading: ورود به سیستم
+      login_button: ورود
+      password: "کلمه عبور:"
+      title: ورود به سیستم
+    new: 
+      password: "کلمه عبور:"
+    popup: 
+      friend: دوست
+    reset_password: 
+      password: "کلمه عبور:"
+    view: 
+      settings_link_text: تنظیمات
+  user_block: 
+    partial: 
+      edit: ویرایش
+    show: 
+      edit: ویرایش
+  user_role: 
+    grant: 
+      confirm: تائید
+    revoke: 
+      confirm: تأیید

config/locales/fi.yml

@@ -56,6 +56,7 @@ fi:
       node: Piste
       node_tag: Pisteen tägi
       notifier: Ilmoitus
+      old_node: Vanha piste
       old_relation: Vanha relaatio
       old_way: Vanha polku
       relation: Relaatio
@@ -122,7 +123,7 @@ fi:
         node: Näytä piste suurella kartalla
         relation: Näytä relaatio suurella kartalla
         way: Näytä polku suurella kartalla
-      loading: Lataa tietoja...
+      loading: Ladataan…
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} tai {{edit_link}}"
       download_xml: Lataa XML
@@ -304,6 +305,10 @@ fi:
       recent_entries: Uusimmat päiväkirjamerkinnät
       title: Käyttäjien päiväkirjamerkinnät
       user_title: Käyttäjän {{user}} päiväkirja
+    location: 
+      edit: Muokkaa
+      location: "Sijainti:"
+      view: Näytä
     new: 
       title: Uusi päiväkirjamerkintä
     no_such_entry: 
@@ -319,7 +324,7 @@ fi:
       login: Kirjaudu sisään
       login_to_leave_a_comment: "{{login_link}} kommentoidaksesi"
       save_button: Tallenna
-      title: Käyttäjien päiväkirjat | {{user}}
+      title: Käyttäjän {{user}} päiväkirja | {{title}}
       user_title: Käyttäjän {{user}} päiväkirja
   export: 
     start: 
@@ -506,6 +511,7 @@ fi:
           primary: Kantatie
           primary_link: Kantatie
           raceway: Kilparata
+          residential: Asuinkatu
           road: Tie
           secondary: Seututie
           secondary_link: Seututie
@@ -528,11 +534,13 @@ fi:
           wreck: Hylky
         landuse: 
           cemetery: Hautausmaa
+          commercial: Kaupallinen alue
           construction: Rakennustyömaa
           forest: Metsä
           grass: Nurmikko
           industrial: Teollisuusalue
           landfill: Kaatopaikka
+          meadow: Niitty
           military: Sotilasalue
           mine: Kaivos
           mountain: Vuori
@@ -607,12 +615,14 @@ fi:
           town: Kaupunki
           village: Kylä
         railway: 
+          abandoned: Hylätty rautatie
           construction: Rakenteilla oleva rautatie
           disused_station: Käytöstä poistunut rautatieasema
           level_crossing: Tasoristeys
           monorail: Yksikiskoinen raide
           platform: Asemalaituri
           station: Rautatieasema
+          subway: Metroasema
           subway_entrance: Metron sisäänkäynti
           yard: Ratapiha
         shop: 
@@ -691,18 +701,18 @@ fi:
       base: 
         cycle_map: Pyöräilykartta
         noname: Nimettömät tiet
+    site: 
+      edit_tooltip: Muokkaa karttaa
   layouts: 
     donate: Tue OpenStreetMapia {{link}} laitteistopäivitysrahastoon.
     donate_link_text: lahjoittamalla
     edit: Muokkaa
-    edit_tooltip: Muokkaa karttoja
     export: Vienti
     export_tooltip: Karttatiedon vienti
     gps_traces: GPS-jäljet
     help_wiki: Wiki ja ohjeet
     help_wiki_tooltip: Projektin ohje ja wiki
     history: Historia
-    history_tooltip: Muutoshistoria
     home: koti
     home_tooltip: Siirry kotisijaintiin
     inbox: viestit ({{count}})
@@ -734,13 +744,9 @@ fi:
     tag_line: Vapaa wikimaailmankartta
     user_diaries: Päiväkirjamerkinnät
     view: Kartta
-    view_tooltip: Näytä kartat
+    view_tooltip: Näytä kartta
     welcome_user: Tervetuloa, {{user_link}}
     welcome_user_link_tooltip: Käyttäjäsivusi
-  map: 
-    coordinates: "Koordinaatit:"
-    edit: Muokkaa
-    view: Näytä
   message: 
     delete: 
       deleted: Viesti poistettu
@@ -772,8 +778,8 @@ fi:
       subject: Otsikko
       title: Lähetä viesti
     no_such_user: 
-      heading: Käyttäjää tai viestiä ei ole
+      heading: Käyttäjää ei löydy
-      title: Käyttäjää tai viestiä ei ole
+      title: Käyttäjää ei löydy
     outbox: 
       date: Päiväys
       inbox: saapuneet
@@ -968,6 +974,9 @@ fi:
     sidebar: 
       close: Sulje
       search_results: Hakutulokset
+  time: 
+    formats: 
+      friendly: "%e. %Bta %Y kello %H:%M"
   trace: 
     create: 
       trace_uploaded: GPX-tiedostosi on nyt palvelimella ja jonossa tietokantaan syötettäväksi. Yleensä tämä valmistuu puolen tunnin sisällä. Saat vielä sähköpostiisi vahvistuksen asiasta.
@@ -1010,6 +1019,7 @@ fi:
         other: "{{count}} pistettä"
       edit: muokkaa
       edit_map: Muokkaa karttaa
+      identifiable: TUNNISTETTAVA
       in: tägeillä
       map: sijainti kartalla
       more: tiedot
@@ -1034,6 +1044,9 @@ fi:
       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.
     trace_optionals: 
       tags: Tägit
+    trace_paging_nav: 
+      next: Seuraava »
+      previous: "« Edellinen"
     view: 
       delete_track: Poista tämä jälki
       description: "Kuvaus:"
@@ -1058,14 +1071,21 @@ fi:
       trackable: Jäljitettävissä (pisteet jaetaan järjestettynä aikaleimoineen, mutta nimettömänä)
   user: 
     account: 
+      current email address: "Nykyinen sähköpostiosoite:"
+      delete image: Poista nykyinen kuva
       email never displayed publicly: (ei näy muille)
       flash update success: Käyttäjätiedot on päivitetty onnistuneesti.
       flash update success confirm needed: Käyttäjätiedot on päivitetty onnistuneesti. Vahvista sähköpostiosoitteesi sinulle lähetettyjen ohjeiden mukaisesti.
       home location: "Kodin sijainti:"
+      image: "Kuva:"
+      image size hint: (parhaiten toimivat neliöt kuvat, joiden koko on vähintään 100x100)
+      keep image: Säilytä nykyinen kuva
       latitude: "Leveyspiiri:"
       longitude: "Pituuspiiri:"
       make edits public button: Tee muokkauksistani julkisia
       my settings: Käyttäjän asetukset
+      new email address: "Uusi sähköpostiosoite:"
+      new image: Lisää kuva
       no home location: Et ole määrittänyt kodin sijaintia.
       preferred languages: "Kielivalinnat:"
       profile description: "Kuvaustekstisi:"
@@ -1078,6 +1098,7 @@ fi:
         heading: "Muokkaukset julkisia:"
       public editing note: 
         heading: Julkinen muokkaus
+      replace image: Korvaa nykyinen kuva
       return to profile: Palaa profiilisivulle
       save changes button: Tallenna muutokset
       title: Asetusten muokkaus
@@ -1096,9 +1117,6 @@ fi:
       success: Sähköpostiosoite on vahvistettu. Kiitos liittymisestä!
     filter: 
       not_an_administrator: Tähän toimintoon tarvitaan ylläpitäjän oikeudet.
-    friend_map: 
-      nearby mapper: "Lähellä oleva kartoittaja: [[nearby_user]]"
-      your location: Oma sijaintisi
     go_public: 
       flash success: Kaikki tekemäsi muokkaukset ovat nyt julkisia.
     login: 
@@ -1111,6 +1129,7 @@ fi:
       lost password link: Salasana unohtunut?
       password: "Salasana:"
       please login: Kirjaudu sisään tai {{create_user_link}}.
+      remember: "Muista minut:"
       title: Kirjautumissivu
     lost_password: 
       email address: "Sähköpostiosoite:"
@@ -1143,6 +1162,10 @@ fi:
       body: Käyttäjää {{user}} ei löytynyt. Tarkista oikeikirjoitus.
       heading: Käyttäjää {{user}} ei ole olemassa
       title: Haettua käyttäjää ei ole olemassa
+    popup: 
+      friend: Ystävä
+      nearby mapper: Lähellä oleva kartoittaja
+      your location: Oma sijaintisi
     remove_friend: 
       not_a_friend: "{{name}} ei ole enää kaverisi."
       success: "{{name}} poistettiin kaverilistastasi."
@@ -1159,16 +1182,13 @@ fi:
     view: 
       activate_user: aktivoi tämä käyttäjä
       add as friend: lisää kaveriksi
-      add image: Tallenna
       ago: ({{time_in_words_ago}} sitten)
       block_history: näytä estot
       blocks by me: tekemäni estot
       blocks on me: saadut estot
-      change your settings: muuta asetuksiasi
       confirm: Vahvista
       create_block: estä tämä käyttäjä
       deactivate_user: deaktivoi tämä käyttäjä
-      delete image: Poista kuva
       delete_user: poista käyttäjä
       description: Kuvaus
       diary: päiväkirja
@@ -1184,12 +1204,11 @@ fi:
       my edits: omat muokkaukset
       my settings: asetukset
       my traces: omat jäljet
-      my_oauth_details: Näytä omat OAuth-yksityiskohdat
+      nearby users: Muut lähialueen käyttäjät
-      nearby users: "Lähialueen käyttäjät:"
       new diary entry: uusi päiväkirjamerkintä
       no friends: Sinulla ei ole vielä kavereita.
-      no home location: Käyttäjä ei ole asettanut kotisijaintiaan.
       no nearby users: Valitun sijainnin lähellä ei ole tiedossa muita käyttäjiä.
+      oauth settings: oauth-asetukset
       remove as friend: poista kavereista
       role: 
         administrator: Tämä käyttäjä on ylläpitäjä.
@@ -1203,8 +1222,6 @@ fi:
       send message: lähetä viesti
       settings_link_text: asetussivulla
       traces: jäljet
-      upload an image: Tallenna kuva
-      user image heading: Käyttäjän kuva
       user location: Käyttäjän sijainti
       your friends: Kaverit
   user_block: 

config/locales/fr.yml

@@ -322,6 +322,10 @@ fr:
       recent_entries: "Entrées récentes:"
       title: Journaux des utilisateurs
       user_title: Journal de {{user}}
+    location: 
+      edit: Modifier
+      location: "Lieu :"
+      view: Afficher
     new: 
       title: Nouvelle entrée du journal
     no_such_entry: 
@@ -361,6 +365,9 @@ fr:
       output: Sortie
       paste_html: Collez le code HTML pour incorporer dans un site web.
       scale: Échelle
+      too_large: 
+        body: Cette zone est trop vaste pour être exportée comme données XML OpenStreetMap. Veuillez zoomer ou sélectionner une zone plus petite.
+        heading: Zone trop grande
       zoom: Zoom
     start_rjs: 
       add_marker: Ajouter un marqueur à la carte
@@ -777,7 +784,7 @@ fr:
           greengrocer: Marchand de fruits et légumes
           grocery: Épicerie
           hairdresser: Coiffeur
-          hardware: Magasin de matériel informatique
+          hardware: Quincaillerie
           hifi: Magasin Hi-Fi
           insurance: Assurance
           jewelry: Bijouterie
@@ -852,21 +859,23 @@ fr:
         cycle_map: Carte cyclable
         noname: SansNom
     site: 
+      edit_disabled_tooltip: Zoomez en avant pour modifier la carte
+      edit_tooltip: Modifier la carte
       edit_zoom_alert: Vous devez zoomer pour modifier la carte
+      history_disabled_tooltip: Zoomez en avant pour voir les modifications dans cette zone
+      history_tooltip: Voir les modifications dans cette zone
       history_zoom_alert: Vous devez zoomer pour voir l’historique des modifications
   layouts: 
     donate: Soutenez OpenStreetMap, {{link}} au fond pour améliorer le matériel.
     donate_link_text: participez
     edit: Modifier
-    edit_tooltip: Modifier des cartes
     export: Exporter
     export_tooltip: Exporter les données de la carte
     gps_traces: Traces GPS
-    gps_traces_tooltip: Gérer les traces
+    gps_traces_tooltip: Gérer les traces GPS
     help_wiki: Aide & Wiki
     help_wiki_tooltip: Aide et site Wiki du projet
     history: Historique
-    history_tooltip: Historique du groupe de modifications
     home: Chez moi
     home_tooltip: Aller à l'emplacement de mon domicile
     inbox: Boîte aux lettres ({{count}})
@@ -902,13 +911,9 @@ fr:
     user_diaries: Journaux
     user_diaries_tooltip: Voir les journaux d'utilisateurs
     view: Voir
-    view_tooltip: Afficher les cartes
+    view_tooltip: Afficher la carte
     welcome_user: Bienvenue, {{user_link}}
     welcome_user_link_tooltip: Votre page utilisateur
-  map: 
-    coordinates: Coordonnées
-    edit: Modifier
-    view: Carte
   message: 
     delete: 
       deleted: Message supprimé
@@ -939,10 +944,14 @@ fr:
       send_message_to: Envoyer un nouveau message à {{name}}
       subject: Sujet
       title: Envoyer un message
+    no_such_message: 
+      body: Désolé, il n'y a aucun message avec cet identifiant.
+      heading: Message introuvable
+      title: Message introuvable
     no_such_user: 
-      body: Désolé, il n'y a aucun utilisateur ni message avec ce nom ou cet identifiant
+      body: Désolé, aucun utilisateur ne porte ce nom.
-      heading: Utilisateur ou message inexistant
+      heading: Utilisateur inexistant
-      title: Utilisateur ou message inexistant
+      title: Utilisateur inexistant
     outbox: 
       date: Date
       inbox: boîte de réception
@@ -966,6 +975,9 @@ fr:
       title: Lire le message
       to: À
       unread_button: Marque comme non lu
+      wrong_user: Vous êtes identifié comme « {{user}} » mais le message que vous essayez de lire n'a été envoyé ni à ni par cet utilisateur. Veuillez vous connecter avec l'identifiant correct pour pouvoir le lire.
+    reply: 
+      wrong_user: Vous êtes identifié(e) comme « {{user}} » mais le message auquel vous souhaitez répondre n'a pas été envoyé à cet utilisateur. Veuillez vous connecter avec l'identifiant correct pour pouvoir répondre.
     sent_message_summary: 
       delete_button: Supprimer
   notifier: 
@@ -986,8 +998,9 @@ fr:
       hopefully_you_1: Quelqu'un (problablement vous) voudrait changer son adresse de courriel de
       hopefully_you_2: "{{server_url}} à {{new_address}}."
     friend_notification: 
+      befriend_them: "Vous pouvez également l'ajouter comme ami ici : {{befriendurl}}."
       had_added_you: "{{user}} vous a ajouté comme ami dans OpenStreetMap."
-      see_their_profile: Vous pouvez voir son profil sur {{userurl}} et l’ajouter comme ami si vous le souhaitez.
+      see_their_profile: "Vous pouvez voir son profil ici : {{userurl}}."
       subject: "[OpenStreetMap] {{user}} vous a ajouté comme ami"
     gpx_notification: 
       and_no_tags: et sans balise.
@@ -1214,6 +1227,9 @@ fr:
     sidebar: 
       close: Fermer
       search_results: Résultats de la recherche
+  time: 
+    formats: 
+      friendly: "%e %B %Y à %H:%M"
   trace: 
     create: 
       trace_uploaded: Votre fichier GPX a été envoyé et est en attente de son intégration dans la base de données. Ceci prend en général moins d'une demie heure, et un email vous sera envoyé lorsque cette tâche sera finie.
@@ -1247,7 +1263,7 @@ fr:
     no_such_user: 
       body: Désolé, aucun utilisateur ne porte le nom {{user}}. Veuillez vérifier l'orthographe. Si vous avez cliqué sur un lien, celui-ci est faux.
       heading: L’utilisateur {{user}} n’existe pas
-      title: Aucun utilisteur trouvé
+      title: Utilisateur inexistant
     offline: 
       heading: Stockage GPX hors ligne
       message: Le système de stockage et d'envoi des GPX est actuellement indisponible.
@@ -1316,15 +1332,20 @@ fr:
   user: 
     account: 
       current email address: "Adresse de courriel actuelle :"
+      delete image: Supprimer l'image actuelle
       email never displayed publicly: (jamais affiché publiquement)
       flash update success: Informations sur l'utilisateur mises à jour avec succès.
       flash update success confirm needed: Informations sur l'utilisateur mises à jour avec succès. Vérifiez votre boîte mail afin de valider la vérification de votre nouvelle adresse e-mail.
       home location: "Emplacement du domicile :"
+      image: "Image :"
+      image size hint: (les images carrées d'au moins 100×100 pixels fonctionnent le mieux)
+      keep image: Garder l'image actuelle
       latitude: "Latitude:"
       longitude: "Longitude:"
       make edits public button: Rendre toutes mes modifications publiques
       my settings: Mes options
       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 languages: "Langues préférées :"
       profile description: "Description du profil :"
@@ -1338,6 +1359,7 @@ fr:
       public editing note: 
         heading: Modification publique
         text: "Votre compte est actuellement en mode \"modifications anonymes\" : il n'existe pas de lien entre vos modifications et votre compte utilisateur et les autres contributeurs ne peuvent pas vous envoyer de message ni connaître votre localisation géographique. Pour qu'il soit possible de lister vos contributions et permettre aux autres personnes de vous contacter via ce site, cliquez sur le bouton ci-dessous. <b>Depuis le basculement de l'API en version 0.6, seuls les utilisateurs en mode \"modifications publiques\" peuvent modifier les cartes</b> (<a href=\"http://wiki.openstreetmap.org/wiki/Anonymous_edits\">en savoir plus</a>).<ul><li>Votre adresse de courriel ne sera pas rendue publique.</li><li>Cette opération ne peut pas être annulée et tous les nouveaux utilisateurs sont en mode \"modifications publiques\" par défaut.</li></ul>"
+      replace image: Remplacer l'image actuelle
       return to profile: Retourner au profil
       save changes button: Sauvegarder les changements
       title: Modifier le compte
@@ -1356,9 +1378,6 @@ fr:
       success: Adresse email confirmée, merci de vous être enregistré !
     filter: 
       not_an_administrator: Vous devez être administrateur pour effectuer cette action.
-    friend_map: 
-      nearby mapper: "Mappeur dans les environs: [[nearby_user]]"
-      your location: Votre emplacement
     go_public: 
       flash success: Toutes vos modifications sont dorénavant publiques, et vous êtes autorisé a modifier.
     login: 
@@ -1371,7 +1390,12 @@ fr:
       lost password link: Vous avez perdu votre mot de passe ?
       password: "Mot de passe :"
       please login: Veuillez vous connecter ou {{create_user_link}}.
+      remember: "Se souvenir de moi :"
       title: Se connecter
+    logout: 
+      heading: Déconnexion d'OpenStreetMap
+      logout_button: Déconnexion
+      title: Déconnexion
     lost_password: 
       email address: "Adresse e-mail :"
       heading: Vous avez perdu votre mot de passe ?
@@ -1404,6 +1428,10 @@ fr:
       body: Désolé, il n'y a pas d'utilisateur avec le nom {{user}}. Veuillez vérifier l'orthographe, ou le lien que vous avez cliqué n'est pas valide.
       heading: L'utilisateur {{user}} n'existe pas
       title: Utilisateur inexistant
+    popup: 
+      friend: Ami
+      nearby mapper: Mappeur dans les environs
+      your location: Votre emplacement
     remove_friend: 
       not_a_friend: "{{name}} n'est pas parmi vos amis."
       success: "{{name}} a été retiré de vos amis."
@@ -1420,17 +1448,14 @@ fr:
     view: 
       activate_user: activer cet utilisateur
       add as friend: ajouter en tant qu'ami
-      add image: Ajouter une image
       ago: (il y a {{time_in_words_ago}})
       block_history: blocages reçus
       blocks by me: blocages donnés
       blocks on me: mes blocages
-      change your settings: modifiez vos options
       confirm: Confirmer
       create_block: bloquer cet utilisateur
       created from: "Créé depuis :"
       deactivate_user: désactiver cet utilisateur
-      delete image: Effacer l'image
       delete_user: supprimer cet utilisateur
       description: Description
       diary: journal
@@ -1446,12 +1471,11 @@ fr:
       my edits: mes modifications
       my settings: mes options
       my traces: mes traces
-      my_oauth_details: Voir mes détails OAuth
+      nearby users: Autres utilisateurs à proximité
-      nearby users: "Utilisateurs proches de vous :"
       new diary entry: nouvelle entrée dans le journal
       no friends: Vous n'avez pas encore ajouté d'ami
-      no home location: Aucun lieu n'a été défini.
+      no nearby users: Aucun utilisateur n'a encore signalé qu'il cartographiait à proximité.
-      no nearby users: Il n'y a pas encore d'utilisateur à proximité.
+      oauth settings: paramètres OAuth
       remove as friend: enlever en tant qu'ami
       role: 
         administrator: Cet utilisateur est un adminstrateur
@@ -1466,8 +1490,6 @@ fr:
       settings_link_text: options
       traces: traces
       unhide_user: ré-afficher cet utilisateur
-      upload an image: Envoyer une image
-      user image heading: Image utilisateur
       user location: Emplacement de l'utilisateur
       your friends: Vos amis
   user_block: 

config/locales/fur.yml

@@ -243,6 +243,10 @@ fur:
       recent_entries: "Ultimis vôs dal diari:"
       title: Diaris dai utents
       user_title: Diari di {{user}}
+    location: 
+      edit: Cambie
+      location: "Lûc:"
+      view: Viôt
     new: 
       title: Gnove vôs dal diari
     view: 
@@ -328,6 +332,7 @@ fur:
           bureau_de_change: Ufizi di cambi
           bus_station: Stazion des corieris
           car_wash: Lavaç machinis
+          casino: Casinò
           cinema: Cine
           clinic: Cliniche
           dentist: Dentist
@@ -378,17 +383,21 @@ fur:
         landuse: 
           cemetery: Simiteri
           commercial: Aree comerciâl
+          construction: In costruzion
           industrial: Aree industriâl
           military: Aree militâr
           nature_reserve: Riserve naturâl
           park: Parc
+          railway: Ferade
           residential: Aree residenziâl
         leisure: 
           garden: Zardin
           golf_course: Troi di golf
           miniature_golf: Minigolf
+          nature_reserve: Riserve naturâl
           park: Parc
           sports_centre: Centri sportîf
+          stadium: Stadi
           swimming_pool: Pissine
         natural: 
           bay: Rade
@@ -427,6 +436,7 @@ fur:
           supermarket: Supermarcjât
           toys: Negozi di zugatui
         tourism: 
+          information: Informazions
           museum: Museu
           valley: Val
           viewpoint: Pont panoramic
@@ -446,15 +456,13 @@ fur:
     donate: Sosten OpenStreetMap {{link}} al font pal inzornament dal hardware.
     donate_link_text: donant
     edit: Cambie
-    edit_tooltip: Modifiche mapis
     export: Espuarte
     export_tooltip: Espuarte i dâts de mape
     gps_traces: Percors GPS
-    gps_traces_tooltip: Gjestìs i percors
+    gps_traces_tooltip: Gjestìs i percors GPS
     help_wiki: Jutori & Vichi
     help_wiki_tooltip: Jutori & Vichi pal progjet
     history: Storic
-    history_tooltip: Storic dal grup di cambiaments
     home: lûc iniziâl
     home_tooltip: Va al lûc iniziâl
     inbox: "{{count}} in jentrade"
@@ -489,13 +497,9 @@ fur:
     user_diaries: Diaris dai utents
     user_diaries_tooltip: Viôt i diaris dai utents
     view: Viôt
-    view_tooltip: Viôt lis mapis
+    view_tooltip: Viôt la mape
     welcome_user: Benvignût/de, {{user_link}}
     welcome_user_link_tooltip: La tô pagjine utent
-  map: 
-    coordinates: "Coordenadis:"
-    edit: Cambie
-    view: Viôt
   message: 
     delete: 
       deleted: Messaç eliminât
@@ -708,6 +712,7 @@ fur:
       visibility: "Visibilitât:"
   user: 
     account: 
+      current email address: "Direzion di pueste eletroniche atuâl:"
       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.
@@ -736,9 +741,6 @@ fur:
       button: Conferme
       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
-    friend_map: 
-      nearby mapper: "Mapadôr dongje: [[nearby_user]]"
-      your location: La tô posizion
     login: 
       auth failure: Nus displâs, ma no si à rivât a jentrâ cun i dâts inserîts.
       create_account: cree un profîl
@@ -747,7 +749,12 @@ fur:
       login_button: Jentre
       lost password link: Password pierdude?
       please login: Jentre o {{create_user_link}}.
+      remember: Visiti di me
       title: Jentre
+    logout: 
+      heading: Va fûr di OpenStreetMap
+      logout_button: Jes
+      title: Jes
     lost_password: 
       email address: "Direzion di pueste:"
     make_friend: 
@@ -767,6 +774,10 @@ fur:
       body: Nol esist un utent di non {{user}}. Controle par plasê la grafie o che tu vedis seguît il leam just.
       heading: L'utent {{user}} nol esist
       title: Utent no cjatât
+    popup: 
+      friend: Amì
+      nearby mapper: Mapadôr dongje
+      your location: La tô posizion
     remove_friend: 
       not_a_friend: "{{name}} nol è un dai tiei amîs."
       success: "{{name}} al è stât gjavât dai tiei amîs."
@@ -774,21 +785,19 @@ fur:
       flash success: Lûc iniziâl salvât cun sucès
     view: 
       add as friend: zonte ai amîs
-      add image: Zonte figure
       ago: ({{time_in_words_ago}} fa)
       block_history: viôt i blocs ricevûts
       blocks by me: blocs aplicâts di me
       blocks on me: blocs su di me
-      change your settings: cambie lis tôs impostazions
       confirm: Conferme
       create_block: bloche chest utent
       created from: "Creât di:"
-      delete image: Elimine figure
       description: Descrizion
       diary: diari
       edits: cambiaments
       email address: "Direzion di pueste:"
       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
       m away: "{{count}}m di distance"
       mapper since: "Al mape dai:"
@@ -797,17 +806,14 @@ fur:
       my edits: miei cambiaments
       my settings: mês impostazions
       my traces: percors personâi
-      nearby users: "Utents dongje:"
+      nearby users: Altris utents dongje
       new diary entry: gnove vôs dal diari
       no friends: No tu âs ancjemò nissun amì.
-      no home location: Nol è stât configurât un lûc iniziâl.
       no nearby users: Ancjemò nissun utent che al declare di mapâ dongje di te.
       remove as friend: gjave dai amîs
       send message: mande messaç
       settings_link_text: impostazions
       traces: percors
-      upload an image: Cjame une figure
-      user image heading: Figure dal utent
       user location: Lûc dal utent
       your friends: I tiei amîs
   user_block: 

config/locales/gcf.yml

@@ -133,12 +133,6 @@ gcf:
     user_diaries: Jounal
     view: Vwè
     welcome_user: Bienvini, {{user_link}}
-  map: 
-    coordinates: Sitiyasion
-    edit: Édité
-    view: Kat
-  notifier: 
-    diary_comment_notification: 
   site: 
     edit: 
       anon_edits_link_text: Ka y ni la.
@@ -196,9 +190,6 @@ gcf:
       button: Konfirmé
       heading: Konfirmé chanjman a adres imél aw
       press confirm button: Apiyé asi bouton la ki an ba pou konfirmé nouvo adres imél aw.
-    friend_map: 
-      nearby mapper: "Arpantè owa aw: [[nearby_user]]"
-      your location: Koté ou yé
     go_public: 
       flash success: Tou sa ou fè jis alè ki lé piblik ou pa otorizé édité.
     login: 
@@ -229,13 +220,13 @@ gcf:
       signup: Enskriw
     no_such_user: 
       body: Malérezman, pa ti ni pon itilisatè èvè non la sa {{user}}. Kontrolé lòtograf la ouben lien la ou kliké asiy la pa bon.
+    popup: 
+      nearby mapper: Arpantè owa aw
+      your location: Koté ou yé
     set_home: 
       flash success: La ou ka rété la bien anrèjistré
     view: 
       add as friend: Ajouté on zanmi
-      add image: Ajouté on imaj
-      change your settings: Chanjé opsion aw
-      delete image: Woté on imaj
       description: Deskription
       diary: Jounal
       edits: Édision
@@ -249,13 +240,10 @@ gcf:
       nearby users: "Itilizatè owa aw :"
       new diary entry: On dot nouvel an jounal la
       no friends: Ou poko ni pon zanmi
-      no home location: Pa ni pon koté défini.
       no nearby users: Ou poko ni itilizatè owa aw.
       remove as friend: Woté on zanmi
       send message: Voyé on mésaj
       settings_link_text: Opsion
       traces: Chimen
-      upload an image: Voyé on imaj
-      user image heading: Foto itilizatè
       user location: Ola itilizatè yé
       your friends: Kanmarad aw

config/locales/gl.yml

@@ -1,21 +1,99 @@
 # Messages for Galician (Galego)
 # Exported from translatewiki.net
 # Export driver: syck
+# Author: Gallaecio
 # Author: Toliño
 gl: 
   activerecord: 
     attributes: 
+      diary_comment: 
+        body: Corpo
+      diary_entry: 
+        language: Lingua
+        latitude: Latitude
+        longitude: Lonxitude
+        title: Título
+        user: Usuario
+      friend: 
+        friend: Amigo
+        user: Usuario
+      message: 
+        body: Corpo
+        recipient: Destinatario
+        sender: Remitente
+        title: Título
+      trace: 
+        description: Descrición
+        latitude: Latitude
+        longitude: Lonxitude
+        name: Nome
+        public: Público
+        size: Tamaño
+        user: Usuario
+        visible: Visible
       user: 
+        active: Activo
+        description: Descrición
+        display_name: Nome mostrado
+        email: Correo electrónico
+        languages: Linguas
         pass_crypt: Contrasinal
     models: 
+      changeset: Conxunto de cambios
+      changeset_tag: Etiqueta do conxunto de cambios
+      country: País
+      friend: Amigo
+      language: Lingua
+      message: Mensaxe
       node: Nodo
+      node_tag: Etiqueta do nodo
+      notifier: Notificador
+      relation: Relación
+      relation_tag: Etiqueta da relación
+      session: Sesión
+      user: Usuario
+      user_preference: Preferencia do usuario
       way: Camiño
   browse: 
+    changeset: 
+      changeset: "Conxunto de cambios: {{id}}"
+      changesetxml: Conxunto de cambios XML
+      download: Descargar {{changeset_xml_link}} ou {{osmchange_xml_link}}
+      feed: 
+        title: Conxunto de cambios {{id}}
+        title_comment: Conxunto de cambios {{id}} - {{comment}}
+      osmchangexml: osmChange XML
+      title: Conxunto de cambios
     changeset_details: 
+      belongs_to: "Pertence a:"
+      bounding_box: "Caixa de envoltura:"
       box: caixa
+      closed_at: "Pechouse o:"
+      created_at: "Creado o:"
+      has_nodes: 
+        one: "Ten o seguinte {{count}} nodo:"
+        other: "Ten os seguintes {{count}} nodos:"
+      has_relations: 
+        one: "Ten a seguinte relación:"
+        other: "Ten as seguintes {{count}} relacións:"
+      has_ways: 
+        one: "Ten o seguinte camiño:"
+        other: "Ten os seguintes {{count}} camiños:"
+      no_bounding_box: Non se seleccionou ningunha caixa de envoltura para este conxunto de cambios.
+      show_area_box: Amosar a caixa de zona
+    changeset_navigation: 
+      all: 
+        next_tooltip: Seguinte conxunto de cambios
+        prev_tooltip: Conxunto de cambios anterior
+      user: 
+        name_tooltip: Ver as edicións de {{user}}
+        next_tooltip: Seguinte edición de {{user}}
+        prev_tooltip: Edición anterior de {{user}}
     common_details: 
       changeset_comment: "Comentario:"
+      edited_at: "Editado o:"
       edited_by: "Editado por:"
+      in_changeset: "No conxunto de cambios:"
       version: "Versión:"
     containing_relation: 
       entry: Relación {{relation_name}}
@@ -45,7 +123,7 @@ gl:
       node_history_title: "Historial do nodo: {{node_name}}"
       view_details: ver os detalles
     not_found: 
-      sorry: Sentímolo, non se puido atopar o {{type}} co ID {{id}}.
+      sorry: Sentímolo, non se puido atopar o {{type}} co id {{id}}.
       type: 
         changeset: conxunto de cambios
         node: nodo
@@ -75,12 +153,20 @@ gl:
         node: Nodo
         relation: Relación
         way: Camiño
+    start: 
+      manually_select: Escoller manualmente unha zona distinta
+      view_data: Ver os datos para a vista do mapa actual
     start_rjs: 
       data_frame_title: Datos
       data_layer_name: Datos
       details: Detalles
+      drag_a_box: Arrastre unha caixa sobre o mapa para escoller unha zona
+      edited_by_user_at_timestamp: Editado por [[user]] o [[timestamp]]
+      history_for_feature: Historial de [[feature]]
       load_data: Cargar os datos
+      loaded_an_area_with_num_features: Cargou unha zona que contén [[num_features]] funcionalidades. Pode que algúns navegadores teñan problemas para amosar correctamente esta cantidade de datos. Xeralmente, os navegadores traballan mellor amosando menos de 100 funcionalidades á vez. Utilizar máis pode provocar que o navegador vaia lento ou non responda. Se está seguro de que quere amosar estes datos, pode facelo premendo no seguinte botón.
       loading: Cargando...
+      manually_select: Escoller manualmente unha zona distinta
       object_list: 
         api: Obter esta área desde o API
         back: Mostrar a lista de obxectos
@@ -97,10 +183,20 @@ gl:
         type: 
           node: Nodo
           way: Camiño
+      private_user: usuario privado
       show_history: Mostrar o historial
+      unable_to_load_size: "Non se puido cargar: o tamaño [[bbox_size]] da caixa de envoltura é grande de máis (ten que ser menor de {{max_bbox_size}})"
       wait: Agarde...
+      zoom_or_select: Escolla unha zona do mapa ou achéguese a ela para vela
     tag_details: 
       tags: "Etiquetas:"
+    timeout: 
+      sorry: Tardouse demasiado en obter os datos para o {{type}} co id {{id}}.
+      type: 
+        changeset: conxunto de cambios
+        node: nodo
+        relation: relación
+        way: camiño
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} ou {{edit_link}}"
       download_xml: Descargar en XML
@@ -120,53 +216,477 @@ gl:
       view_details: ver os detalles
       way_history: Historial do camiño
       way_history_title: "Historial co camiño: {{way_name}}"
+  changeset: 
+    changesets: 
+      area: Zona
+      comment: Comentario
+      id: ID
+      saved_at: Gardado o
+      user: Usuario
+    list: 
+      description: Cambios recentes
+      description_bbox: Conxuntos de cambios en {{bbox}}
+      description_user: Conxuntos de cambios por {{user}}
+      description_user_bbox: Conxuntos de cambios por {{user}} en {{bbox}}
+      heading: Conxuntos de cambios
+      heading_bbox: Conxuntos de cambios
+      heading_user: Conxuntos de cambios
+      heading_user_bbox: Conxuntos de cambios
+      title: Conxuntos de cambios
+      title_bbox: Conxuntos de cambios en {{bbox}}
+      title_user: Conxuntos de cambios por {{user}}
+      title_user_bbox: Conxuntos de cambios por {{user}} en {{bbox}}
   diary_entry: 
+    diary_comment: 
+      confirm: Confirmar
+      hide_link: Agochar este comentario
+    diary_entry: 
+      comment_count: 
+        one: 1 comentario
+        other: "{{count}} comentarios"
+      comment_link: Comentar esta entrada
+      confirm: Confirmar
+      edit_link: Editar esta entrada
+      hide_link: Agochar esta entrada
     edit: 
+      body: "Corpo:"
+      language: "Lingua:"
+      latitude: "Latitude:"
+      location: "Localización:"
+      longitude: "Lonxitude:"
       save_button: Gardar
+      subject: "Asunto:"
+    location: 
+      edit: Editar
+      location: "Localización:"
+      view: Ver
     view: 
       save_button: Gardar
+  export: 
+    start: 
+      add_marker: Engadir un marcador ao mapa
+      area_to_export: Zona a exportar
+      export_button: Exportar
+      format: Formato
+      format_to_export: Formato de exportación
+      image_size: Tamaño da imaxe
+      latitude: "Lat:"
+      licence: Licenza
+      longitude: "Lon:"
+      mapnik_image: Imaxe de Mapnik
+      max: máx.
+      options: Opcións
+      osm_xml_data: Datos XML do OpenStreetMap
+      scale: Escala
+      too_large: 
+        body: Esta zona é grande de máis para ser exportada como datos XML do OpenStreetMap. Amplíe a zona ou escolla unha menor.
+        heading: Zona demasiado grande
+      zoom: Zoom
+    start_rjs: 
+      add_marker: Engadir un marcador ao mapa
+      change_marker: Cambiar a posición do marcador
+      click_add_marker: Prema sobre o mapa para engadir un marcador
+      drag_a_box: Arrastre unha caixa sobre o mapa para escoller unha zona
+      export: Exportar
+      manually_select: Escoller manualmente unha zona distinta
+      view_larger_map: Ver un mapa máis grande
   geocoder: 
     description: 
       title: 
         geonames: Localización desde <a href="http://www.geonames.org/">GeoNames</a>
         osm_namefinder: "{{types}} desde <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
+        osm_nominatim: Localización desde <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
+      types: 
+        cities: Cidades
+        places: Lugares
+        towns: Municipios
+    description_osm_namefinder: 
+      prefix: "{{distance}} ao {{direction}} de {{type}}"
+    direction: 
+      east: leste
+      north: norte
+      north_east: nordés
+      north_west: noroeste
+      south: sur
+      south_east: sueste
+      south_west: suroeste
+      west: oeste
+    distance: 
+      one: arredor de 1km
+      other: arredor de {{count}}km
+      zero: menos de 1km
+    results: 
+      more_results: Máis resultados
+      no_results: Non se atopou ningún resultado
     search: 
       title: 
         ca_postcode: Resultados desde <a href="http://geocoder.ca/">Geocoder.CA</a>
         geonames: Resultados desde <a href="http://www.geonames.org/">GeoNames</a>
         latlon: Resultados <a href="http://openstreetmap.org/">internos</a>
         osm_namefinder: Resultados desde <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        osm_nominatim: Resultados desde <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
         uk_postcode: Resultados desde <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Resultados desde <a href="http://geocoder.us/">Geocoder.us</a>
+    search_osm_namefinder: 
+      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} de {{parentname}})"
+      suffix_place: ", {{distance}} ao {{direction}} de {{placename}}"
+    search_osm_nominatim: 
+      prefix: 
+        highway: 
+          emergency_access_point: Punto de acceso de emerxencia
+          footway: Carreiro
+          motorway_junction: Cruce de autovías
+          primary_link: Estrada principal
+          secondary_link: Estrada secundaria
+        leisure: 
+          beach_resort: Balneario
+          common: Terreo común
+          fishing: Área de pesca
+          garden: Xardín
+          golf_course: Campo de golf
+          ice_rink: Pista de patinaxe sobre xeo
+          marina: Porto deportivo
+          miniature_golf: Minigolf
+          nature_reserve: Reserva natural
+          park: Parque
+          pitch: Cancha deportiva
+          playground: Patio de recreo
+          recreation_ground: Área recreativa
+          slipway: Varadoiro
+          sports_centre: Centro deportivo
+          stadium: Estadio
+          swimming_pool: Piscina
+          track: Pista de carreiras
+          water_park: Parque acuático
+        natural: 
+          bay: Baía
+          beach: Praia
+          cape: Cabo
+          cave_entrance: Entrada de cova
+          channel: Canal
+          cliff: Cantil
+          coastline: Litoral
+          crater: Cráter
+          feature: Elemento
+          fell: Brañal
+          fjord: Fiorde
+          glacier: Glaciar
+          hill: Outeiro
+          island: Illa
+          land: Terra
+          marsh: Marisma
+          moor: Páramo
+          mud: Lama
+          peak: Pico
+          point: Punto
+          reef: Arrecife
+          river: Río
+          rock: Rocha
+          scree: Pedregal
+          shoal: Cardume
+          spring: Primavera
+          strait: Estreito
+          tree: Árbore
+          valley: Val
+          volcano: Volcán
+          water: Auga
+          wetland: Pantano
+          wetlands: Pantano
+          wood: Bosque
+        place: 
+          airport: Aeroporto
+          city: Cidade
+          country: País
+          county: Condado
+          farm: Granxa
+          hamlet: Aldea
+          house: Casa
+          houses: Casas
+          island: Illa
+          islet: Illote
+          locality: Localidade
+          moor: Páramo
+          municipality: Municipio
+          postcode: Código postal
+          region: Rexión
+          sea: Mar
+          state: Estado/Provincia
+          subdivision: Subdivisión
+          suburb: Barrio
+          town: Cidade
+          unincorporated_area: Área non incorporada
+          village: Vila
+        tourism: 
+          alpine_hut: Cabana alpina
+          artwork: Obra de arte
+          attraction: Atracción
+          bed_and_breakfast: Cama e almorzo
+          cabin: Cabana
+          camp_site: Campamento
+          caravan_site: Sitio de caravanas
+          chalet: Chalé
+          guest_house: Albergue
+          hostel: Hostal
+          hotel: Hotel
+          information: Información
+          lean_to: Caseta
+          motel: Motel
+          museum: Museo
+          picnic_site: Sitio de pícnic
+          theme_park: Parque temático
+          valley: Val
+          viewpoint: Miradoiro
+          zoo: Zoolóxico
   layouts: 
     edit: Editar
-  map: 
+    export: Exportar
-    coordinates: "Coordenadas:"
+    export_tooltip: Exportar os datos do mapa
-    edit: Editar
+    history: Historial
+    intro_3_partners: wiki
+    make_a_donation: 
+      text: Facer unha doazón
+    news_blog: Blogue de novas
+    sign_up_tooltip: Crear unha conta para editar
+    view: Ver
+    view_tooltip: Ver o mapa
   message: 
+    inbox: 
+      date: Data
+      subject: Asunto
     message_summary: 
       delete_button: Borrar
+      read_button: Marcar como lido
+      reply_button: Responder
+      unread_button: Marcar como non lido
+    new: 
+      body: Corpo
+      subject: Asunto
+    outbox: 
+      date: Data
+      subject: Asunto
+    read: 
+      date: Data
+      reply_button: Responder
+      subject: Asunto
     sent_message_summary: 
       delete_button: Borrar
+  notifier: 
+    email_confirm: 
+      subject: "[OpenStreetMap] Confirme o seu enderezo de correo electrónico"
   oauth_clients: 
     edit: 
       submit: Editar
+      title: Editar a súa aplicación
+    index: 
+      application: Nome da aplicación
+      register_new: Rexistrar a súa aplicación
+  time: 
+    formats: 
+      friendly: "%e %B %Y ás %H:%M"
   trace: 
     edit: 
+      description: "Descrición:"
+      download: descargar
       edit: editar
+      filename: "Nome do ficheiro:"
+      map: mapa
+      owner: "Propietario:"
+      points: "Puntos:"
       save_button: Gardar os cambios
+      start_coord: "Coordenada de inicio:"
+      tags: "Etiquetas:"
+      tags_help: separadas por comas
+      uploaded_at: "Cargado o:"
+      visibility: "Visibilidade:"
+      visibility_help: que significa isto?
+    no_such_user: 
+      title: Non existe tal usuario
     trace: 
+      ago: hai {{time_in_words_ago}}
+      by: por
+      count_points: "{{count}} puntos"
       edit: editar
+      edit_map: Editar o mapa
+      identifiable: IDENTIFICABLE
+      in: en
+      map: mapa
+      more: máis
+      pending: PENDENTE
+      private: PRIVADO
+      public: PÚBLICO
+      view_map: Ver o mapa
+    trace_form: 
+      description: Descrición
+      help: Axuda
+      tags: Etiquetas
+      tags_help: separadas por comas
+      upload_button: Cargar
+      visibility: Visibilidade
+      visibility_help: que significa isto?
+    trace_optionals: 
+      tags: Etiquetas
+    trace_paging_nav: 
+      next: Seguinte &raquo;
+      previous: "&laquo; Anterior"
     view: 
+      description: "Descrición:"
+      download: descargar
       edit: editar
+      filename: "Nome do ficheiro:"
+      map: mapa
+      none: Ningún
+      owner: "Propietario:"
+      pending: PENDENTE
+      points: "Puntos:"
+      start_coordinates: "Coordenada de inicio:"
+      tags: "Etiquetas:"
+      uploaded: "Cargado o:"
+      visibility: "Visibilidade:"
   user: 
     account: 
+      current email address: "Enderezo de correo electrónico actual:"
+      delete image: Eliminar a imaxe actual
+      email never displayed publicly: (nunca mostrado publicamente)
+      flash update success: Información de usuario actualizada correctamente.
+      flash update success confirm needed: Información de usuario actualizada correctamente. Busque no seu correo electrónico unha mensaxe para confirmar o seu novo enderezo.
+      home location: "Lugar de orixe:"
+      image: "Imaxe:"
+      keep image: Manter a imaxe actual
+      latitude: "Latitude:"
+      longitude: "Lonxitude:"
+      make edits public button: Facer públicas todas as miñas edicións
+      my settings: Os meus axustes
+      new email address: "Novo enderezo de correo electrónico:"
+      new image: Engadir unha imaxe
+      preferred languages: "Linguas preferidas:"
+      profile description: "Descrición do perfil:"
+      public editing: 
+        disabled link text: por que non podo editar?
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: que é isto?
+        heading: "Edición pública:"
+      public editing note: 
+        heading: Edición pública
+      replace image: Substituír a imaxe actual
+      return to profile: Voltar ao perfil
       save changes button: Gardar os cambios
+      title: Editar a conta
+      update home location on click: Quere actualizar o domicilio ao premer sobre o mapa?
+    confirm: 
+      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.
+      success: Confirmouse a súa conta. Grazas por se rexistrar!
+    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!
+    filter: 
+      not_an_administrator: Ten que ser administrador para poder levar a cabo esta acción.
     login: 
+      create_account: cree unha conta
+      email or username: "Enderezo de correo electrónico ou nome de usuario:"
+      lost password link: Perdeu o seu contrasinal?
       password: "Contrasinal:"
+      please login: Identifíquese ou {{create_user_link}}.
+      remember: "Lembrádeme:"
+    lost_password: 
+      email address: "Enderezo de correo electrónico:"
+      heading: Esqueceu o contrasinal?
+      new password button: Restablecer o contrasinal
+      notice email cannot find: Non se puido atopar o enderezo de correo electrónico.
+      notice email on way: Por desgraza perdeuno, pero hai en camiño unha mensaxe de correo electrónico coa que o poderá restablecer axiña.
+      title: Contrasinal perdido
+    make_friend: 
+      already_a_friend: Xa é amigo de {{name}}.
+      failed: Houbo un erro ao engadir a {{name}} como amigo.
+      success: "{{name}} xa é o seu amigo."
     new: 
+      confirm email address: Confirmar o enderezo de correo electrónico
+      confirm password: "Confirmar o contrasinal:"
+      display name: "Nome mostrado:"
+      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.
+      heading: Crear unha conta de usuario
+      no_auto_account_create: Por desgraza, arestora non podemos crear automaticamente unha conta para vostede.
       password: "Contrasinal:"
+      title: Crear unha conta
+    no_such_user: 
+      body: Non existe ningún usuario co nome "{{user}}". Comprobe a ortografía ou que a ligazón que seguiu estea ben.
+      heading: O usuario {{user}} non existe
+      title: Non existe tal usuario
+    popup: 
+      friend: Amigo
+      your location: A súa localización
+    remove_friend: 
+      not_a_friend: "{{name}} non é un dos seus amigos."
+      success: "{{name}} foi eliminado dos seus amigos."
     reset_password: 
+      confirm password: "Confirmar o contrasinal:"
+      flash changed: Cambiouse o seu contrasinal.
+      flash token bad: Non se atopou o pase. Quizais debería comprobar o enderezo URL.
+      heading: Restablecer o contrasinal de {{user}}
       password: "Contrasinal:"
+      reset: Restablecer o contrasinal
+      title: Restablecer o contrasinal
+    set_home: 
+      flash success: Gardouse o domicilio
     view: 
+      activate_user: activar este usuario
+      add as friend: engadir como amigo
+      ago: (hai {{time_in_words_ago}})
+      block_history: ver os bloqueos recibidos
+      confirm: Confirmar
+      create_block: bloquear este usuario
+      created from: "Creado a partir de:"
+      deactivate_user: desactivar este usuario
+      delete_user: borrar este usuario
+      description: Descrición
       edits: edicións
+      email address: "Enderezo de correo electrónico:"
+      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
+      m away: a {{count}}m de distancia
+      moderator_history: ver os bloqueos dados
+      my edits: as miñas edicións
+      my settings: os meus axustes
+      no friends: Aínda non engadiu ningún amigo.
+      oauth settings: axustes OAuth
+      remove as friend: eliminar como amigo
+      role: 
+        administrator: Este usuario é administrador
+        grant: 
+          administrator: Conceder o acceso de administrador
+          moderator: Conceder o acceso de moderador
+        moderator: Este usuario é moderador
+        revoke: 
+          administrator: Revogar o acceso de administrador
+          moderator: Revogar o acceso de moderador
+      send message: enviar unha mensaxe
+      settings_link_text: axustes
+      unhide_user: descubrir este usuario
+      user location: Localización do usuario
+      your friends: Os seus amigos
+  user_role: 
+    filter: 
+      already_has_role: O usuario xa ten o rol {{role}}.
+      doesnt_have_role: O usuario non ten o rol {{role}}.
+      not_a_role: A cadea "{{role}}" non é un rol correcto.
+      not_an_administrator: Só os administradores poden xestionar os roles dos usuarios, e vostede non é administrador.
+    grant: 
+      are_you_sure: Seguro que quere concederlle o rol "{{role}}" ao usuario "{{name}}"?
+      confirm: Confirmar
+      fail: Non se lle puido conceder o rol "{{role}}" ao usuario "{{name}}". Comprobe que tanto o usuario coma o rol son correctos.
+      heading: Confirmar a concesión do rol
+      title: Confirmar a concesión do rol
+    revoke: 
+      are_you_sure: Seguro que quere revogarlle o rol "{{role}}" ao usuario "{{name}}"?
+      confirm: Confirmar
+      fail: Non se lle puido revogar o rol "{{role}}" ao usuario "{{name}}". Comprobe que tanto o usuario coma o rol son correctos.
+      heading: Confirmar a revogación do rol
+      title: Confirmar a revogación do rol

config/locales/gsw.yml

@@ -162,6 +162,8 @@ gsw:
     create: 
       trace_uploaded: Dyy GPX-Datei isch uffeglade wore un wartet uf d Ufnahm in d Datebank. Des gschiht normalerwyys innerhalb vun ere halbe Stund, derno wird Dir e Bstetigungs-E-Mail gschickt.
       upload_trace: E GPS-Track uffelade
+    delete: 
+      scheduled_for_deletion: Track, wu zum Lesche vorgsäh isch
     edit: 
       description: "Bschryybig:"
       download: abelade
@@ -179,14 +181,111 @@ gsw:
       uploaded_at: "Uffegladen am:"
       visibility: "Sichtbarkeit:"
       visibility_help: Was heißt des?
+    list: 
+      public_traces: Effetligi GPS-Track
+      public_traces_from: Effetligi GPS-Track vu {{user}}
+      tagged_with: Gchännzeichnet mit {{tags}}
+      your_traces: Dyy GPS-Track
+    make_public: 
+      made_public: Track, wu vereffetligt isch
+    no_such_user: 
+      body: Äxgisi, s git kei Benutzer mit em Name {{user}}. Bitte iberprief Dyy Schryybwyys, oder villicht isch s Gleich, wu Du nogange bisch, falsch.
+      heading: Dr Benutzer {{user}} git s nit
+      title: Benutzer nit gfunde
     trace: 
+      ago: "{{time_in_words_ago}} här"
+      by: vu
       count_points: "{{count}} Pinkt"
+      edit: bearbeite
       edit_map: Charte bearbeite
+      in: in
+      map: Charte
+      more: meh
       pending: HÄNGIG
       private: PRIVAT
+      public: EFFETLI
+      trace_details: Track-Einzelheite aaluege
       view_map: Charten aazeige
+    trace_form: 
+      description: Bschryybig
+      help: Hilf
+      tags: Markierige
+      tags_help: Trännig dur Komma
+      upload_button: Uffelade
+      upload_gpx: GPX-Datei uffelade
+      visibility: Sichtbarkeit
+      visibility_help: Was heißt des?
     trace_header: 
       see_all_traces: Alli Tracks aaluege
       see_just_your_traces: Eigeni GPS-Tracks aazeige oder neji uffelade
       see_your_traces: Eigeni GPS-Tracks aazeige
       traces_waiting: "{{count}} vu Dyyne Tracks sin zur Zyt in dr Warteschlang. Bitte wart, bis die fertig sin go d Verarbeitig nit fir anderi Nutzer blockiere."
+    trace_optionals: 
+      tags: Markierige
+    view: 
+      delete_track: Dää Track lesche
+      description: "Bschryybig:"
+      download: abelade
+      edit: bearbeite
+      edit_track: Dää Track bearbeite
+      filename: "Dateiname:"
+      heading: Am Bschaue vum Track {{name}}
+      map: Charte
+      none: Keini
+      owner: "Bsitzer:"
+      pending: HÄNGIG
+      points: "Pinkt:"
+      start_coordinates: "Startkoordinate:"
+      tags: "Markierige:"
+      title: Am Aaluege vum Track {{name}}
+      trace_not_found: Track nit gfunde!
+      uploaded: "Uffegladen am:"
+      visibility: "Sichtbarkeit:"
+    visibility: 
+      identifiable: Identifizierbar (wird in dr Tracklischt as anonymi, sortierti Punktfolg mit Zytstämpfel aazeigt)
+      private: Privat (nume as anonymi, nit sortierti Pinkt ohni Zytstämpfel aazeigt)
+      public: Effentlig (wird in dr Tracklischt aazeigt, aber numen as anonymi, nit sortierti Punktfolg ohni Zytstämpfel)
+      trackable: Track (wird in dr Tracklischt as anonymi, sortierti Punktfolg mit Zytstämpfel aazeigt)
+  user: 
+    confirm_email: 
+      button: Bstetige
+      failure: E E-Mail-Adräss isch scho mit däm Gleich bstetigt wore.
+      heading: Änderig vu dr E-Mail-Adräss bstetige
+      press confirm button: Druck unte uf dr „Bstetige“-Chnopf go Dyy nej E-Mail-Adräss bstetige.
+      success: Dyy E-Mail-Adräss isch bstetigt wore, dankschen fir s Regischtriere!
+    filter: 
+      not_an_administrator: Du muesch e Administrator syy go die Aktion uusfiere.
+    go_public: 
+      flash success: Alli Dyyni Bearbeitige sion jetz effetlig, un Du derfsch jetz Bearbeitige mache.
+    make_friend: 
+      already_a_friend: Du bisch scho ne Frynd vu {{name}}.
+      failed: Excusez, {{name}} het nit as Frynd chenne zuegfiegt wäre.
+      success: "{{name}} isch jetz Dyy Frynd."
+    popup: 
+      nearby mapper: Mapper in dr Nechi
+      your location: Dyy Standort
+    reset_password: 
+      confirm password: "Passwort bstetige:"
+      flash changed: Dyy Passwort isch gänderet wore.
+      flash token bad: Mir hän des Chirzel leider nit chenne finde. Iberprief d URL.
+      heading: Passwort fir {{user}} zrucksetze
+      reset: Passwort zrucksetze
+      title: Passwort zrucksetze
+  user_role: 
+    filter: 
+      already_has_role: Dr Nutzer ghert scho zue dr Rolle {{role}}.
+      doesnt_have_role: Dr Nutzer het kei Roll {{role}}.
+      not_a_role: D Zeichechette „{{role}}“ bezeichnet kei giltigi Rolle.
+      not_an_administrator: Benutzerrolle chenne nume vu Adminischtratore verwaltet wäre, un Du bisch kei Adminischtrator.
+    grant: 
+      are_you_sure: Bisch sicher, ass Du dr Benutzer „{{name}}“ dr Rolle „{{role}}“ witt zueordne?
+      confirm: Bstetige
+      fail: Dr Benutzer „{{name}}“ het dr Rolle „{{role}}“ nit chenne zuegordnet wären. Bitte iberprief, eb s sich um e giltige Benutzer un e giltigi Rolle handlet.
+      heading: Rollezueornig bstetige
+      title: Rollezueornig bstetige
+    revoke: 
+      are_you_sure: Bisch sicher, ass Du d Zueornig vum Benutzer „{{name}}“ zue dr Rolle „{{role}}“ witt ufhebe?
+      confirm: Bstetige
+      fail: Het d Zueornig vum Benutzer „{{name}}“ zue dr Rolle „{{role}}“ nit chenne ufhebe. Bitte iberprief, eb s sich um e giltige Benutzer un e giltigi Rolle handlet.
+      heading: D Ufhebig vu dr Rollezueornig bstetige
+      title: Ufhebig vu dr Rollezueornig bstetige

config/locales/he.yml

@@ -205,7 +205,6 @@ he:
       zero: פחות מקילומטר
   layouts: 
     edit: עריכה
-    edit_tooltip: עריכת מפות
     export: יצוא
     export_tooltip: ייצוא נתוני המפה
     gps_traces_tooltip: ניהול מסלולים
@@ -235,9 +234,6 @@ he:
     view_tooltip: צפייה במפות
     welcome_user: "{{user_link}}ברוך הבא"
     welcome_user_link_tooltip: דף המשתמש שלך
-  map: 
-    edit: עריכה
-    view: תצוגה
   message: 
     delete: 
       deleted: ההודעה נמחקה
@@ -340,8 +336,6 @@ he:
       save changes button: שמירת השינויים
     confirm: 
       heading: אימות חשבון משתמש
-    friend_map: 
-      your location: מיקומך
     login: 
       create_account: יצירת חשבון
       login_button: כניסה
@@ -359,6 +353,8 @@ he:
     no_such_user: 
       heading: המשתמש {{user}} אינו קיים
       title: אין משתמש כזה
+    popup: 
+      your location: מיקומך
     reset_password: 
       confirm password: "אימות הסיסמה:"
       flash changed: סיסמתך השתנתה.
@@ -367,23 +363,17 @@ he:
       reset: איפוס הסיסמה
       title: reset password
     view: 
-      add image: הוספת תמונה
       ago: (לפני {{time_in_words_ago}})
-      change your settings: שינוי ההגדרות שלך
-      delete image: מחיקת תמונה
       description: תאור
       edits: עריכות
       km away: במרחק {{count}} ק"מ
       m away: במרחק {{count}} מ'
       my diary: היומן שלי
       my edits: העריכות שלי
-      my_oauth_details: צפייה בפרטי ה־OAuth שלי
       new diary entry: רשומה חדשה ביומן
       no friends: לא הוספת חברים כלל עדיין.
       remove as friend: הסרה כחבר
       send message: שליחת הודעה
       settings_link_text: הגדרות
       traces: מסלולים
-      upload an image: העלאת תמונה
-      user image heading: תמונת המשתמש
       your friends: החברים שלך

config/locales/hi.yml

@@ -97,7 +97,7 @@ hi:
       node_history_title: "नोड इतिहास: {{node_name}}"
       view_details: विवरण देखें
     not_found: 
-      sorry: क्षमा करें, ये {{type}} इस आईडी {{id}} के साथ, पाया नहीं जा सका
+      sorry: क्षमा करें, ये {{type}} इस आईडी {{id }} के साथ, पाया नहीं जा सका
       type: 
         node: आसंधि
         relation: संबंध
@@ -174,6 +174,8 @@ hi:
       no_edits: (कोई संपादित नहीं है)
       still_editing: (संपादित किया जा रहा है)
       view_changeset_details: इस changeset के विवरण देखे
+    changeset_paging_nav: 
+      showing_page: "इस पृष्ठ का प्रदर्शन:"
     changesets: 
       area: क्षेत्र
       comment: टिप्पणी
@@ -239,7 +241,6 @@ hi:
       other: करीब {{count}} किमी
       zero: 1 किमी से कम
   layouts: 
-    edit_tooltip: नक्शा संपादन
     home: गृह
     inbox_tooltip: 
       other: आपके इनबॉक्स में {{count}} अपठित संदेश हैं
@@ -247,10 +248,6 @@ hi:
     sign_up_tooltip: संपादन के लिए खाता बनाएं
     view_tooltip: नक्शा देखें
     welcome_user_link_tooltip: आपका प्रयोक्ता पन्ना
-  map: 
-    coordinates: "निर्देशांक:"
-    edit: संपादित करें
-    view: दृश्य
   message: 
     delete: 
       deleted: संदेश खात्मा

config/locales/hr.yml

@@ -857,7 +857,6 @@ hr:
     donate: Podržite OpenStreetMap sa {{link}} Hardware Upgrade Fond.
     donate_link_text: donacije
     edit: Uredi
-    edit_tooltip: Uredi kartu
     export: Izvoz
     export_tooltip: Izvoz podataka karte
     gps_traces: GPS trase
@@ -866,7 +865,6 @@ hr:
     help_wiki_tooltip: Pomoć & Wiki-site za projekt
     help_wiki_url: http://wiki.openstreetmap.org/wiki/Hr:Main_Page?uselang=hr
     history: Povijest
-    history_tooltip: Povijest seta promjena
     home: dom
     home_tooltip: Idi na lokaciju svog doma
     inbox: pošta ({{count}})
@@ -904,10 +902,6 @@ hr:
     view_tooltip: Prikaži kartu
     welcome_user: Dobrodošli, {{user_link}}
     welcome_user_link_tooltip: Tvoja korisnička stranica
-  map: 
-    coordinates: "Koordinate:"
-    edit: Uredi
-    view: Karta
   message: 
     delete: 
       deleted: Poruka obrisana
@@ -1353,9 +1347,6 @@ hr:
       success: Potvrđena je vaša email adresa, hvala za priključenje!
     filter: 
       not_an_administrator: Morate biti administrator za izvođenje ovih akcija.
-    friend_map: 
-      nearby mapper: "Obližnji maper: [[nearby_user]]"
-      your location: Vaša lokacija
     go_public: 
       flash success: Sve vaše promjene su sada javne i sada vam je dozvoljeno uređivanje.
     login: 
@@ -1401,6 +1392,9 @@ hr:
       body: Žao mi je, ne postoji korisnik s imenom {{user}}. Molim provjerite ukucano ili je link na koji ste kliknuli neispravan.
       heading: Korisnik {{user}}  ne postoji
       title: Nema takvog korisnika
+    popup: 
+      nearby mapper: Obližnji maper
+      your location: Vaša lokacija
     remove_friend: 
       not_a_friend: "{{name}} nije tvoj prijatelj."
       success: "{{name}} je izbačen iz prijatelja."
@@ -1417,17 +1411,14 @@ hr:
     view: 
       activate_user: aktiviraj ovog korisnika
       add as friend: dodaj kao prijatelja
-      add image: Dodaj sliku
       ago: prije ({{time_in_words_ago}})
       block_history: prikaži dobivene blokade
       blocks by me: blokade koje sam postavio
       blocks on me: blokade na mene
-      change your settings: promjeni svoje postavke
       confirm: Potvrdi
       create_block: blokiraj ovog korisnika
       created from: "Napravljeno iz:"
       deactivate_user: deaktiviraj ovog korisnika
-      delete image: Izbriši sliku
       delete_user: obriši ovog korisnika
       description: Opis
       diary: dnevnik
@@ -1443,11 +1434,9 @@ hr:
       my edits: moje promjene
       my settings: moje postavke
       my traces: moje trase
-      my_oauth_details: Prikaži moje OAuth detalje
       nearby users: "Okolni korisnici:"
       new diary entry: novi unos u dnevnik
       no friends: Nisi dodao niti jednog prijatelja.
-      no home location: Nije postavljena lokacija doma
       no nearby users: Nema okolnih korisnika koji mapiraju.
       remove as friend: ukloni kao prijatelja
       role: 
@@ -1463,8 +1452,6 @@ hr:
       settings_link_text: postavke
       traces: trase
       unhide_user: otkrij ovog korisnika
-      upload an image: Postavite sliku
-      user image heading: Slika korisnika
       user location: Lokacija boravišta korisnika
       your friends: Tvoji prijatelji
   user_block: 

config/locales/hsb.yml

@@ -326,6 +326,10 @@ hsb:
       recent_entries: "Najnowše dźenikowe zapiski:"
       title: Dźeniki wužiwarjow
       user_title: dźenik wužiwarja {{user}}
+    location: 
+      edit: Wobdźěłać
+      location: "Městno:"
+      view: Pokazać
     new: 
       title: Nowy dźenikowy zapisk
     no_such_entry: 
@@ -341,7 +345,7 @@ hsb:
       login: Přizjew so
       login_to_leave_a_comment: "{{login_link}}, zo by komentar spisał"
       save_button: Składować
-      title: Dźeniki wužiwarja | {{user}}
+      title: Dźenik {{user}} | {{title}}
       user_title: dźenik wužiwarja {{user}}
   export: 
     start: 
@@ -365,6 +369,9 @@ hsb:
       output: Wudaće
       paste_html: HTML-kod kopěrować, zo by so do websydła zasunył
       scale: Měritko
+      too_large: 
+        body: Tutón wobłuk je přewulki za eksportowanje jako XML-daty OpenStreetMap. Prošu powjetš abo wubjer mjeńši wobłuk.
+        heading: Wobłuk přewulki
       zoom: Skalowanje
     start_rjs: 
       add_marker: Karće marku přidać
@@ -856,21 +863,23 @@ hsb:
         cycle_map: Kolesowa karta
         noname: ŽaneMjeno
     site: 
+      edit_disabled_tooltip: Za wobdźěłowanje karty powjetšić
+      edit_tooltip: Kartu wobdźěłać
       edit_zoom_alert: Dyrbiš powjetšić, zo by kartu wobdźěłał
+      history_disabled_tooltip: Za zwobraznjenje změnow za tutón wobłuk powjetšić
+      history_tooltip: Změny za tutón wobłuk pokazać
       history_zoom_alert: Dyrbiš powjetšić, zo by wobdźěłowansku historiju widźał
   layouts: 
     donate: Podpěraj OpenStreetMap přez {{link}} k fondsej aktualizacije hardwary.
     donate_link_text: Darjenje
     edit: Wobdźěłać
-    edit_tooltip: Karty wobdźěłać
     export: Eksport
     export_tooltip: Kartowe daty eksportować
     gps_traces: GPS-ćěrje
-    gps_traces_tooltip: Ćěrje zrjadować
+    gps_traces_tooltip: GPS-ćěrje zrjadować
     help_wiki: Pomoc & wiki
     help_wiki_tooltip: Sydło Pomoc & wiki za projekt
     history: Historija
-    history_tooltip: Historija sadźbow změnow
     home: domoj
     home_tooltip: Domoj hić
     inbox: póst ({{count}})
@@ -882,7 +891,8 @@ hsb:
       zero: Twój póstowy kašćik žane njepřečitane powěsće njewobsahuje.
     intro_1: OpenStreetMap je swobodna wobdźěłujomna karta cyłeho swěta. Bu za ludźi kaž wy wutworjena.
     intro_2: OpenStreetMap ći dowola geografiske daty na zhromadne wašnje wot něhdźe na zemi pokazać, wobdźěłać a wužiwać.
-    intro_3: Hospodowanje OpenStreetMap so přećelnje wot {{ucl}} a {{bytemark}} podpěruje.
+    intro_3: Hospodowanje OpenStreetMap so přećelnje wot {{ucl}} a {{bytemark}} podpěruje. Druzy podpěraćeljo projekta su we {{partners}} nalistowani.
+    intro_3_partners: wiki
     license: 
       alt: CC by-sa 2.0
       title: Daty OpenStreetMap licencuja so pod licencu Creative Commons Attribution-Share Alike 2.0 Generic
@@ -908,13 +918,9 @@ hsb:
     user_diaries: Dźeniki
     user_diaries_tooltip: Wužiwarske dźeniki čitać
     view: Karta
-    view_tooltip: Karty pokazać
+    view_tooltip: Kartu pokazać
     welcome_user: Witaj, {{user_link}}
     welcome_user_link_tooltip: Twoja wužiwarska strona
-  map: 
-    coordinates: "Koordinaty:"
-    edit: Wobdźěłać
-    view: Karta
   message: 
     delete: 
       deleted: Powěsć zničena
@@ -945,10 +951,14 @@ hsb:
       send_message_to: Wužiwarjej {{name}} nowu powěsć pósłać
       subject: Temowe nadpismo
       title: Powěsć pósłać
+    no_such_message: 
+      body: Bohužel powěsć z tutym ID njeje.
+      heading: Powěsć njeeksistuje
+      title: Powěsć njeeksistuje
     no_such_user: 
-      body: Bohužel wužiwar abo powěsć z tym mjenom resp. id njeje
+      body: Bohužel wužiwar z tym mjenom njeeksistuje.
-      heading: Wužiwar abo powěsć njeeksistuje
+      heading: Wužiwar njeeksistuje
-      title: Wužiwar abo powěsć njeeksistuje
+      title: Wužiwar njeeksistuje
     outbox: 
       date: Datum
       inbox: póstowy kašćik
@@ -972,6 +982,9 @@ hsb:
       title: Powěsć čitać
       to: Komu
       unread_button: Jako njepřečitany markěrować
+      wrong_user: Sy jako `{{user}}' přizjewjeny, ale powěsć, kotruž chcyše čitać, njebu na toho wužiwarja pósłana. Prošu přizjew so jako korektny wužiwar, zo by čitał.
+    reply: 
+      wrong_user: Sy jako `{{user}}' přizjewjeny, ale powěsć, na kotruž chcyše wotmołwić, njebu na toho wužiwarja pósłana. Prošu přizjew so jako korektny wužiwar, zo by wotmołwił.
     sent_message_summary: 
       delete_button: Zničić
   notifier: 
@@ -992,8 +1005,9 @@ hsb:
       hopefully_you_1: Něchtó (najskerje ty) chce swoju e-mejlowu adresu
       hopefully_you_2: na {{server_url}} do {{new_address}} změnić.
     friend_notification: 
+      befriend_them: Móžeš jich na {{befriendurl}} jako přećelow přidać.
       had_added_you: "{{user}} je će na OpenStreetMap jako přećela přidał."
-      see_their_profile: Móžeš sej jich profil na {{userurl}} wobhladać a přidaj jich jako přećelow, jeli to chceš.
+      see_their_profile: Móžeš jeho abo jeje profil na {{userurl}} widźeć.
       subject: "[OpenStreetMap] {{user}} je će jako přećela přidał"
     gpx_notification: 
       and_no_tags: a žane atributy.
@@ -1219,6 +1233,9 @@ hsb:
     sidebar: 
       close: Začinić
       search_results: Pytanske wuslědki
+  time: 
+    formats: 
+      friendly: "%e %B %Y %H:%M"
   trace: 
     create: 
       trace_uploaded: Twoja GPX-dataja je so nahrała a čaka na zasunjenje do datoweje banki. To so zwjetša za poł hodźiny stawa a po dokónčenju budźe so ći e-mejl słać.
@@ -1320,14 +1337,21 @@ hsb:
       trackable: Čarujomny (jenož jako anonymny dźěleny, zrjadowane dypki z časowymi kołkami)
   user: 
     account: 
+      current email address: "Aktualna e-mejlowa adresa:"
+      delete image: Aktualny wobraz wotstronić
       email never displayed publicly: (njeje ženje zjawnje widźomna)
       flash update success: Wužiwarske informacije wuspěšnje zaktualizowane.
       flash update success confirm needed: Wužiwarske informacije wuspěšnje zaktualizowane. Dóstanješ e-mejl z namołwu, swoju nowu e-mejlowu adresu wobkrućić.
       home location: "Domjace stejnišćo:"
+      image: "Wobraz:"
+      image size hint: (kwadratiske wobrazy z wulkosću wot znajmjeńša 100x100 najlěpje funguja)
+      keep image: Aktualny wobraz wobchować
       latitude: "Šěrokostnik:"
       longitude: "Dołhostnik:"
       make edits public button: Wšě moje změny zjawne činić
       my settings: Moje nastajenja
+      new email address: "Nowa e-mejlowa adresa:"
+      new image: Wobraz přidać
       no home location: Njejsy swoje domjace stejnišćo zapodał.
       preferred languages: "Preferowane rěče:"
       profile description: "Profilowe wopisanje:"
@@ -1341,6 +1365,7 @@ hsb:
       public editing note: 
         heading: Zjawne wobdźěłowanje
         text: Tuchwilu twoje změny su anonymne a ludźo njemóžeja ći powěsće pósłać abo twoje stejnišćo widźeć. Zo by pokazał, štož sy wobdźěłał a ludźom dowolił, so z tobu přez websydło do zwiska stajić, klikń deleka na tłóčatko. <b>Wot přeńdźenja do API 0.6, jenož zjawni wužiwarjo móžeja kartowe daty wobdźěłać</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">hlej přičiny</a>).<ul><li>Twoja e-mejlowa adresa njebudźe so zjawnej pokazać.</li><li>Tuta akcija njeda so wobroćić a wšitcy nowi wužiwarjo su nětko po standardźe zjawni.</li></ul>
+      replace image: Aktualny wobraz narunać
       return to profile: Wróćo k profilej
       save changes button: Změny składować
       title: Konto wobdźěłać
@@ -1359,9 +1384,6 @@ hsb:
       success: Twoja e-mejlowa adresa bu wobkrućena, dźakujemy so za registrowanje!
     filter: 
       not_an_administrator: Dyrbiš administrator być, zo by tutu akciju wuwjedł.
-    friend_map: 
-      nearby mapper: "Kartěrowar w bliskosći: [[nearby_user]]"
-      your location: Twoje městno
     go_public: 
       flash success: Wšě twoje změny su nětko zjawne, a směš nětko wobdźěłać.
     login: 
@@ -1374,7 +1396,12 @@ hsb:
       lost password link: Swoje hesło zabył?
       password: "Hesło:"
       please login: Prošu přizjew so abo {{create_user_link}}.
+      remember: "Spomjatkować sej:"
       title: Přizjewjenje
+    logout: 
+      heading: Z OpenStreetMap wotzjewić
+      logout_button: Wotzjewić
+      title: Wotzjewić
     lost_password: 
       email address: "E-mejlowa adresa:"
       heading: Sy hesło zabył?
@@ -1407,6 +1434,10 @@ hsb:
       body: Bohužel žadyn wužiwar z mjenom {{user}} njeje. Prošu skontroluj prawopis, abo wotkaz, na kotryž sy kliknył, je njepłaćiwy.
       heading: Wužiwar {{user}} njeeksistuje
       title: Wužiwar njeeksistuje
+    popup: 
+      friend: Přećel
+      nearby mapper: Kartěrowar w bliskosći
+      your location: Twoje městno
     remove_friend: 
       not_a_friend: "{{name}} twój přećel njeje."
       success: "{{name}} je so jako přećel wotstronił."
@@ -1423,17 +1454,14 @@ hsb:
     view: 
       activate_user: tutoho wužiwarja aktiwizować
       add as friend: jako přećela přidać
-      add image: Wobraz přidać
       ago: (před {{time_in_words_ago}})
       block_history: Dóstane blokowanja pokazać
       blocks by me: blokowanja wote mnje
       blocks on me: blokowanja přećiwo mi
-      change your settings: Twoje nastajenja změnić
       confirm: Wobkrućić
       create_block: tutoho wužiwarja blokować
       created from: "Wutworjeny z:"
       deactivate_user: tutoho wužiwarja znjemóžnić
-      delete image: Wobraz zničić
       delete_user: tutoho wužiwarja zničić
       description: Wopisanje
       diary: dźenik
@@ -1449,12 +1477,11 @@ hsb:
       my edits: moje změny
       my settings: moje nastajenja
       my traces: moje ćěrje
-      my_oauth_details: Moje podrobnosće OAuth pokazać
+      nearby users: Druzy wužiwarjo w bliskosći
-      nearby users: "Wužiwarjo w bliskosći:"
       new diary entry: nowy dźenikowy zapisk
       no friends: Hišće njejsy přećelow přidał.
-      no home location: Žane domjace stejnišćo podate.
+      no nearby users: Njejsu druzy wužiwarjo, kotřiž w bliskosći kartěruja.
-      no nearby users: Hišće wužiwarjo njejsu, kotřiž w bliskosći kartěruja.
+      oauth settings: OAUTH-nastajenja
       remove as friend: jako přećela wotstronić
       role: 
         administrator: Tutón wužiwar je administrator
@@ -1469,8 +1496,6 @@ hsb:
       settings_link_text: nastajenja
       traces: ćěrje
       unhide_user: tutoho wužiwarja pokazaś
-      upload an image: Wobraz nahrać
-      user image heading: Wužiwarski wobraz
       user location: Wužiwarske stejnišćo
       your friends: Twoji přećeljo
   user_block: 

config/locales/hu.yml

@@ -319,6 +319,10 @@ hu:
       recent_entries: "Legutóbbi naplóbejegyzések:"
       title: Felhasználók naplói
       user_title: "{{user}} naplója"
+    location: 
+      edit: Szerkesztés
+      location: "Hely:"
+      view: Megtekintés
     new: 
       title: Új naplóbejegyzés
     no_such_entry: 
@@ -358,6 +362,9 @@ hu:
       output: Kimenet
       paste_html: Webhelyekbe való beágyazáshoz illeszd be a HTML kódot
       scale: Méretarány
+      too_large: 
+        body: Ez a terület túl nagy ahhoz, hogy exportálásra kerüljön OpenStreetMap XML adatként. Közelíts, vagy jelölj ki kisebb területet.
+        heading: Túl nagy terület
       zoom: Nagyítási szint
     start_rjs: 
       add_marker: Jelölő hozzáadása a térképhez
@@ -851,13 +858,16 @@ hu:
         cycle_map: Kerékpártérkép
         noname: NincsNév
     site: 
+      edit_disabled_tooltip: Közelíts a térkép szerkesztéséhez
+      edit_tooltip: Térkép szerkesztése
       edit_zoom_alert: Közelítened kell a térkép szerkesztéséhez
+      history_disabled_tooltip: Közelíts ahhoz, hogy lásd a szerkesztéseket ezen a területen.
+      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: 
     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_tooltip: Térkép szerkesztése
     export: Exportálás
     export_tooltip: Térképadatok exportálása
     gps_traces: Nyomvonalak
@@ -866,7 +876,6 @@ hu:
     help_wiki_tooltip: Segítség és wikioldal a projekthez
     help_wiki_url: http://wiki.openstreetmap.org/wiki/HU:Main_Page?uselang=hu
     history: Előzmények
-    history_tooltip: Módosításcsomagok előzményei
     home: otthon
     home_tooltip: Ugrás otthonra
     inbox: postaláda ({{count}})
@@ -906,10 +915,6 @@ hu:
     view_tooltip: Térkép megjelenítése
     welcome_user: Üdvözlünk {{user_link}}
     welcome_user_link_tooltip: Felhasználói oldalad
-  map: 
-    coordinates: "Koordináták:"
-    edit: Szerkesztés
-    view: Térkép
   message: 
     delete: 
       deleted: Üzenet törölve
@@ -940,10 +945,14 @@ hu:
       send_message_to: "Új üzenet küldése neki: {{name}}"
       subject: Tárgy
       title: Üzenet küldése
+    no_such_message: 
+      body: Sajnálom, nincs üzenet ezzel az azonosítóval.
+      heading: Nincs ilyen üzenet
+      title: Nincs ilyen üzenet
     no_such_user: 
-      body: Sajnálom, nincs felhasználó vagy üzenet ezzel a névvel vagy azonosítóval
+      body: Sajnálom, nincs felhasználó ezzel a névvel.
-      heading: Nincs ilyen felhasználó vagy üzenet
+      heading: Nincs ilyen felhasználó
-      title: Nincs ilyen felhasználó vagy üzenet
+      title: Nincs ilyen felhasználó
     outbox: 
       date: Elküldve
       inbox: Beérkezett üzenetek
@@ -967,6 +976,9 @@ hu:
       title: Üzenet olvasása
       to: Címzett
       unread_button: Jelölés olvasatlanként
+      wrong_user: „{{user}}” néven jelentkeztél be, de a levelet, amit lekérdeztél olvasásra, nem ez a felhasználó küldte vagy kapta. Annak érdekében, hogy elolvashasd a levelet, jelentkezz be a helyes felhasználóval.
+    reply: 
+      wrong_user: „{{user}}” néven jelentkeztél be, de a levelet, amit lekérdeztél válaszolásra, nem ez a felhasználó kapta. Annak érdekében, hogy válaszolhass, jelentkezz be a helyes felhasználóval.
     sent_message_summary: 
       delete_button: Törlés
   notifier: 
@@ -987,8 +999,9 @@ hu:
       hopefully_you_1: "Valaki (remélhetőleg Te) meg szeretné változtatni az e-mail címét erről:"
       hopefully_you_2: "{{server_url}} erre: {{new_address}}."
     friend_notification: 
+      befriend_them: "Felveheted őt barátnak is itt: {{befriendurl}}."
       had_added_you: "{{user}} felvett a barátai közé az OpenStreetMapon."
-      see_their_profile: "Megnézheted a profilját itt: {{userurl}} és felveheted őt is barátnak, ha szeretnéd."
+      see_their_profile: "Megnézheted a profilját itt: {{userurl}}."
       subject: "[OpenStreetMap] {{user}} felvett a barátai közé"
     gpx_notification: 
       and_no_tags: és címkék nélkül
@@ -1220,6 +1233,9 @@ hu:
     sidebar: 
       close: Bezár
       search_results: Keresés eredményei
+  time: 
+    formats: 
+      friendly: "%Y. %B %e., %H.%M"
   trace: 
     create: 
       trace_uploaded: A GPX fájl feltöltése megtörtént, és várakozik az adatbázisba való beillesztésre. Ez általában fél órán belül megtörténik, és fogsz kapni egy e-mailt, amint elkészült.
@@ -1322,15 +1338,20 @@ hu:
   user: 
     account: 
       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)
       flash update success: Felhasználói információk sikeresen frissítve.
       flash update success confirm needed: Felhasználói információk sikeresen frissítve. Nézd meg az e-mailjeidet az új e-mail címedet megerősítő levélhez.
       home location: "Otthon:"
+      image: "Kép:"
+      image size hint: (legalább 100x100 pixel nagyságú négyzetes kép javasolt)
+      keep image: Jelenlegi kép megtartása
       latitude: "Földrajzi szélesség:"
       longitude: "Földrajzi hosszúság:"
       make edits public button: Szerkesztéseim nyilvánossá tétele
       my settings: Beállításaim
       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 languages: "Előnyben részesített nyelvek:"
       profile description: "Profil leírása:"
@@ -1344,6 +1365,7 @@ hu:
       public editing note: 
         heading: Nyilvános szerkesztés
         text: Jelenleg a szerkesztéseid névtelenek, és az emberek nem küldhetnek neked üzeneteket, és nem láthatják a tartózkodási helyedet. Hogy megmutasd, mit szerkesztettél, és megengedd az embereknek, hogy a webhelyen keresztül kapcsolatba lépjenek veled, kattints az alábbi gombra. <b>A 0.6 API-ra történt átállás óta csak nyilvános felhasználók szerkeszthetik a térképadatokat</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">nézz utána, miért</a>).<ul><li>Az e-mail címed nem kerül felfedésre azzal, hogy nyilvános leszel.</li><li>Ez a művelet nem vonható vissza, és alapértelmezésben az összes új felhasználó már nyilvános.</li></ul>
+      replace image: Jelenlegi kép cseréje
       return to profile: Vissza a profilhoz
       save changes button: Módosítások mentése
       title: Felhasználói fiók szerkesztése
@@ -1362,9 +1384,6 @@ hu:
       success: E-mail címed megerősítve, köszönjük a regisztrációt!
     filter: 
       not_an_administrator: Ennek a műveletnek az elvégzéséhez adminisztrátori jogosultsággal kell rendelkezned.
-    friend_map: 
-      nearby mapper: "Közeli térképszerkesztő: [[nearby_user]]"
-      your location: Helyed
     go_public: 
       flash success: Mostantól az összes szerkesztésed nyilvános, és engedélyezett a szerkesztés.
     login: 
@@ -1377,7 +1396,12 @@ hu:
       lost password link: Elfelejtetted a jelszavad?
       password: "Jelszó:"
       please login: Jelentkezz be, vagy {{create_user_link}}.
+      remember: "Emlékezz rám:"
       title: Bejelentkezés
+    logout: 
+      heading: Kijelentkezés az OpenStreetMapból
+      logout_button: Kijelentkezés
+      title: Kijelentkezés
     lost_password: 
       email address: "E-mail cím:"
       heading: Elfelejtetted jelszavad?
@@ -1410,6 +1434,10 @@ hu:
       body: Sajnálom, nincs {{user}} nevű felhasználó. Ellenőrizd a helyességét, vagy lehet, hogy a link, amire kattintottál, rossz.
       heading: "{{user}} felhasználó nem létezik"
       title: Nincs ilyen felhasználó
+    popup: 
+      friend: Barát
+      nearby mapper: Közeli térképszerkesztő
+      your location: Helyed
     remove_friend: 
       not_a_friend: "{{name}} nem tartozik a barátaid közé."
       success: "{{name}} eltávolítva a barátaid közül."
@@ -1426,17 +1454,14 @@ hu:
     view: 
       activate_user: felhasználó aktiválása
       add as friend: felvétel barátnak
-      add image: Kép hozzáadása
       ago: ({{time_in_words_ago}} óta)
       block_history: kapott blokkolások megjelenítése
       blocks by me: általam kiosztott blokkolások
       blocks on me: saját blokkolásaim
-      change your settings: beállítások módosítása
       confirm: Megerősítés
       create_block: ezen felhasználó blokkolása
       created from: "Készítve innen:"
       deactivate_user: felhasználó deaktiválása
-      delete image: Kép törlése
       delete_user: ezen felhasználó törlése
       description: Leírás
       diary: napló
@@ -1452,12 +1477,11 @@ hu:
       my edits: szerkesztéseim
       my settings: beállításaim
       my traces: saját nyomvonalak
-      my_oauth_details: OAuth részletek megtekintése
+      nearby users: Egyéb közeli felhasználók
-      nearby users: "Közeli felhasználók:"
       new diary entry: új naplóbejegyzés
       no friends: Még nem adtál meg egyetlen barátot sem.
-      no home location: Nincs otthon beállítva.
+      no nearby users: Még nincsenek más felhasználók, akik megadták, hogy a közelben szerkesztenek.
-      no nearby users: Még nincsenek felhasználók, akik megadták, hogy a közelben szerkesztenek.
+      oauth settings: oauth beállítások
       remove as friend: barát eltávolítása
       role: 
         administrator: Ez a felhasználó adminisztrátor
@@ -1472,8 +1496,6 @@ hu:
       settings_link_text: beállítások
       traces: nyomvonalak
       unhide_user: felhasználó elrejtésének megszüntetése
-      upload an image: Kép feltöltése
-      user image heading: Felhasználó képe
       user location: Felhasználó helye
       your friends: Barátaid
   user_block: 

config/locales/ia.yml

@@ -331,7 +331,7 @@ ia:
       login: Aperir session
       login_to_leave_a_comment: "{{login_link}} pro lassar un commento"
       save_button: Salveguardar
-      title: Diarios de usatores | {{user}}
+      title: Diario de {{user}} | {{title}}
       user_title: Diario de {{user}}
   export: 
     start: 
@@ -355,6 +355,9 @@ ia:
       output: Resultato
       paste_html: Colla HTML pro incorporar in sito web
       scale: Scala
+      too_large: 
+        body: Iste area es troppo grande pro esser exportate como datos XML de OpenStreetMap. Per favor face zoom avante o selige un area minor.
+        heading: Area troppo grande
       zoom: Zoom
     start_rjs: 
       add_marker: Adder un marcator al carta
@@ -408,6 +411,7 @@ ia:
         amenity: 
           airport: Aeroporto
           arts_centre: Centro artistic
+          atm: Cassa automatic
           auditorium: Auditorio
           bank: Banca
           bar: Bar
@@ -430,6 +434,7 @@ ia:
           courthouse: Tribunal
           crematorium: Crematorio
           dentist: Dentista
+          doctors: Medicos
           dormitory: Dormitorio
           drinking_water: Aqua potabile
           driving_school: Autoschola
@@ -438,11 +443,13 @@ ia:
           fast_food: Fast food
           ferry_terminal: Terminal de ferry
           fire_hydrant: Hydrante de incendio
+          fire_station: Caserna de pumperos
           fountain: Fontana
           fuel: Carburante
           grave_yard: Cemeterio
           gym: Centro de fitness / Gymnasio
           hall: Hall
+          health_centre: Centro de sanitate
           hospital: Hospital
           hotel: Hotel
           hunting_stand: Posto de cacia
@@ -458,6 +465,7 @@ ia:
           office: Officio
           park: Parco
           parking: Parking
+          pharmacy: Pharmacia
           place_of_worship: Loco de adoration
           police: Policia
           post_box: Cassa postal
@@ -488,6 +496,7 @@ ia:
           vending_machine: Distributor automatic
           veterinary: Clinica veterinari
           village_hall: Casa communal
+          waste_basket: Corbe a papiro
           wifi: Accesso WiFi
           youth_centre: Centro pro le juventute
         highway: 
@@ -529,6 +538,9 @@ ia:
           unclassified: Via non classificate
           unsurfaced: Cammino de terra
         landuse: 
+          commercial: Area commercial
+          farm: Ferma
+          military: Area militar
           nature_reserve: Reserva natural
         leisure: 
           beach_resort: Loco de vacantias al plagia
@@ -612,6 +624,77 @@ ia:
           town: Urbe
           unincorporated_area: Area sin municipalitate
           village: Village
+        shop: 
+          alcohol: Magazin de bibitas alcoholic
+          apparel: Boteca de vestimentos
+          art: Magazin de arte
+          bakery: Paneteria
+          beauty: Salon de beltate
+          beverages: Boteca de bibitas
+          bicycle: Magazin de bicyclettas
+          books: Libreria
+          butcher: Macelleria
+          car: Magazin de automobiles
+          car_dealer: Venditor de automobiles
+          car_parts: Partes de automobiles
+          car_repair: Reparation de automobiles
+          carpet: Magazin de tapetes
+          charity: Magazin de beneficentia
+          chemist: Pharmacia
+          clothes: Magazin de vestimentos
+          computer: Magazin de computatores
+          confectionery: Confecteria
+          convenience: Magazin de quartiero
+          copyshop: Centro de photocopias
+          cosmetics: Boteca de cosmetica
+          department_store: Grande magazin
+          discount: Boteca de disconto
+          doityourself: Magazin de bricolage
+          drugstore: Drogeria
+          dry_cleaning: Lavanderia a sic
+          electronics: Boteca de electronica
+          estate_agent: Agentia immobiliari
+          farm: Magazin agricole
+          fashion: Boteca de moda
+          fish: Pischeria
+          florist: Florista
+          food: Magazin de alimentation
+          funeral_directors: Directores de pompas funebre
+          furniture: Magazin de mobiles
+          gallery: Galeria
+          garden_centre: Jardineria
+          general: Magazin general
+          gift: Boteca de donos
+          greengrocer: Verdurero
+          grocery: Specieria
+          hairdresser: Perruccheria
+          hardware: Quincalieria
+          hifi: Hi-fi
+          insurance: Assecurantia
+          jewelry: Joieleria
+          kiosk: Kiosque
+          laundry: Lavanderia
+          mall: Galeria mercante
+          market: Mercato
+          mobile_phone: Boteca de telephonos mobile
+          motorcycle: Magazin de motocyclos
+          music: Magazin de musica
+          newsagent: Venditor de jornales
+          optician: Optico
+          organic: Boteca de alimentos organic
+          outdoor: Magazin de sport al aere libere
+          pet: Boteca de animales
+          photo: Magazin de photographia
+          salon: Salon
+          shoes: Scarperia
+          shopping_centre: Centro commercial
+          sports: Magazin de sport
+          stationery: Papireria
+          supermarket: Supermercato
+          toys: Magazin de joculos
+          travel_agency: Agentia de viages
+          video: Magazin de video
+          wine: Magazin de vinos
         tourism: 
           alpine_hut: Cabana alpin
           artwork: Obra de arte
@@ -633,6 +716,18 @@ ia:
           valley: Valle
           viewpoint: Puncto de vista
           zoo: Zoo
+        waterway: 
+          derelict_canal: Canal abandonate
+          ditch: Fossato
+          dock: Dock
+          drain: Aquiero
+          lock: Esclusa
+          lock_gate: Porta de esclusa
+          mooring: Ammarrage
+          rapids: Rapidos
+          river: Fluvio/Riviera
+          riverbank: Ripa de fluvio/riviera
+          waterfall: Cascada
   javascripts: 
     map: 
       base: 
@@ -645,15 +740,13 @@ ia:
     donate: Supporta OpenStreetMap per {{link}} al Fundo de Actualisation de Hardware.
     donate_link_text: donation
     edit: Modificar
-    edit_tooltip: Modificar cartas
     export: Exportar
     export_tooltip: Exportar datos cartographic
     gps_traces: Tracias GPS
-    gps_traces_tooltip: Gerer tracias
+    gps_traces_tooltip: Gerer tracias GPS
     help_wiki: Adjuta & Wiki
     help_wiki_tooltip: Adjuta & sito Wiki pro le projecto
     history: Historia
-    history_tooltip: Historia del gruppo de modificationes
     home: initio
     home_tooltip: Ir al position de origine
     inbox: cassa de entrata ({{count}})
@@ -663,7 +756,9 @@ ia:
       zero: Tu cassa de entrata non contine messages non legite
     intro_1: OpenStreetMap es un carta libere e modificabile del mundo integre. Illo es facite per gente como te.
     intro_2: OpenStreetMap permitte vider, modificar e usar datos geographic de modo collaborative desde ubique in le mundo.
-    intro_3: Le albergamento de OpenStreetMap es gratiosemente supportate per le {{ucl}} e {{bytemark}}.
+    intro_3: Le albergamento de OpenStreetMap es gratiosemente supportate per le {{ucl}} e per {{bytemark}}. Altere sponsores del projecto es listate in le {{partners}}.
+    intro_3_bytemark: Bytemark
+    intro_3_ucl: Centro VR del UCL
     license: 
       title: Le datos de OpenStreetMap es disponibile sub le licentia Attribution-Share Alike 2.0 Generic de Creative Commons
     log_in: aperir session
@@ -688,13 +783,9 @@ ia:
     user_diaries: Diarios de usatores
     user_diaries_tooltip: Leger diarios de usatores
     view: Vider
-    view_tooltip: Vider cartas
+    view_tooltip: Vider le carta
     welcome_user: Benvenite, {{user_link}}
     welcome_user_link_tooltip: Tu pagina de usator
-  map: 
-    coordinates: "Coordinatas:"
-    edit: Modificar
-    view: Vider
   message: 
     delete: 
       deleted: Message delite
@@ -726,9 +817,9 @@ ia:
       subject: Subjecto
       title: Inviar message
     no_such_user: 
-      body: Pardono, il non ha un usator o message con iste nomine o ID.
+      body: Regrettabilemente, il non ha un usator o message con iste nomine.
-      heading: Nulle tal usator o message
+      heading: Iste usator non existe
-      title: Nulle tal usator o message
+      title: Iste usator non existe
     outbox: 
       date: Data
       inbox: cassa de entrata
@@ -772,8 +863,9 @@ ia:
       hopefully_you_1: Alcuno (sperabilemente tu) vole cambiar su adresse de e-mail a
       hopefully_you_2: "{{server_url}} a {{new_address}}."
     friend_notification: 
+      befriend_them: Tu pote equalmente adder le/la como amico a {{befriendurl}}.
       had_added_you: "{{user}} te ha addite como amico in OpenStreetMap."
-      see_their_profile: Tu pote vider su profilo a {{userurl}} e adder le/la tamben como amico si tu lo vole.
+      see_their_profile: Tu pote vider su profilo a {{userurl}}.
       subject: "[OpenStreetMap] {{user}} te ha addite como amico"
     gpx_notification: 
       and_no_tags: e sin etiquettas.
@@ -842,7 +934,7 @@ ia:
       allow_to: "Permitter al application cliente:"
       allow_write_api: modificar le carta.
       allow_write_diary: crear entratas de diario, commentos e adder amicos.
-      allow_write_gpx: cargar tracias GPS.
+      allow_write_gpx: incargar tracias GPS.
       allow_write_prefs: modificar tu preferentias de usator.
       request_access: Le application {{app_name}} requesta accesso a tu conto. Per favor verifica si tu vole que le application ha le sequente capabilitates. Tu pote seliger tantes o si poches como tu vole.
     revoke: 
@@ -860,7 +952,7 @@ ia:
       allow_read_prefs: leger su preferentias de usator.
       allow_write_api: modificar le carta.
       allow_write_diary: crear entratas de diario, commentos e adder amicos.
-      allow_write_gpx: cargar tracias GPS.
+      allow_write_gpx: incargar tracias GPS.
       allow_write_prefs: modificar su preferentias de usator.
       callback_url: URL de reappello
       name: Nomine
@@ -890,7 +982,7 @@ ia:
       allow_read_prefs: leger su preferentias de usator.
       allow_write_api: modificar le carta.
       allow_write_diary: crear entratas de diario, commentos e adder amicos.
-      allow_write_gpx: cargar tracias GPS.
+      allow_write_gpx: incargar tracias GPS.
       allow_write_prefs: modificar su preferentias de usator.
       authorize_url: "URL de autorisation:"
       edit: Modificar detalios
@@ -999,10 +1091,13 @@ ia:
     sidebar: 
       close: Clauder
       search_results: Resultatos del recerca
+  time: 
+    formats: 
+      friendly: "%e %B %Y a %H:%M"
   trace: 
     create: 
-      trace_uploaded: Tu file GPX ha essite cargate 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.
+      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.
-      upload_trace: Cargar tracia GPS
+      upload_trace: Incargar tracia GPS
     delete: 
       scheduled_for_deletion: Tracia programmate pro deletion
     edit: 
@@ -1014,12 +1109,12 @@ ia:
       map: carta
       owner: "Proprietario:"
       points: "Punctos:"
-      save_button: Immagazinar modificationes
+      save_button: Salveguardar modificationes
       start_coord: "Coordinata initial:"
       tags: "Etiquettas:"
       tags_help: separate per commas
       title: Modification del tracia {{name}}
-      uploaded_at: "Cargate le:"
+      uploaded_at: "Incargate le:"
       visibility: "Visibilitate:"
       visibility_help: que significa isto?
     list: 
@@ -1035,9 +1130,9 @@ ia:
       title: Nulle tal usator
     offline: 
       heading: Immagazinage GPX foras de linea
-      message: Le systema pro immagazinar e cargar files GPX es actualmente indisponibile.
+      message: Le systema pro immagazinar e incargar files GPX es actualmente indisponibile.
     offline_warning: 
-      message: Le systema pro cargar files GPX es actualmente indisponibile
+      message: Le systema pro incargar files GPX es actualmente indisponibile
     trace: 
       ago: "{{time_in_words_ago}} retro"
       by: per
@@ -1059,15 +1154,15 @@ ia:
       help: Adjuta
       tags: Etiquettas
       tags_help: separate per commas
-      upload_button: Cargar
+      upload_button: Incargar
       upload_gpx: Incargar file GPX
       visibility: Visibilitate
       visibility_help: que significa isto?
     trace_header: 
       see_all_traces: Vider tote le tracias
-      see_just_your_traces: Vider solo tu tracias, o cargar un tracia
+      see_just_your_traces: Vider solo tu tracias, o incargar un tracia
       see_your_traces: Vider tote tu tracias
-      traces_waiting: Tu ha {{count}} tracias attendente cargamento. Per favor considera attender le completion de istes ante de cargar alteres, pro non blocar le cauda pro altere usatores.
+      traces_waiting: Tu ha {{count}} tracias attendente incargamento. Per favor considera attender le completion de istes ante de incargar alteres, pro non blocar le cauda pro altere usatores.
     trace_optionals: 
       tags: Etiquettas
     trace_paging_nav: 
@@ -1091,7 +1186,7 @@ ia:
       tags: "Etiquettas:"
       title: Visualisation del tracia {{name}}
       trace_not_found: Tracia non trovate!
-      uploaded: "Cargate le:"
+      uploaded: "Incargate le:"
       visibility: "Visibilitate:"
     visibility: 
       identifiable: Identificabile (monstrate in le lista de tracias e como identificabile, punctos ordinate con datas e horas)
@@ -1101,15 +1196,20 @@ ia:
   user: 
     account: 
       current email address: "Adresse de e-mail actual:"
+      delete image: Remover le imagine actual
       email never displayed publicly: (nunquam monstrate publicamente)
       flash update success: Informationes del usator actualisate con successo.
       flash update success confirm needed: Informationes del usator actualisate con successo. Tu recipera in e-mail un nota pro confirmar tu nove adresse de e-mail.
       home location: "Position de origine:"
+      image: "Imagine:"
+      image size hint: (imagines quadrate de al minus 100×100 functiona melio)
+      keep image: Retener le imagine actual
       latitude: "Latitude:"
       longitude: "Longitude:"
       make edits public button: Render tote mi modificationes public
       my settings: Mi configurationes
       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 languages: "Linguas preferite:"
       profile description: "Description del profilo:"
@@ -1123,8 +1223,9 @@ ia:
       public editing note: 
         heading: Modification public
         text: A iste momento tu modificationes es anonyme, e le gente non pote inviar te messages ni vider tu position. Pro poter monstrar tu contributiones e pro permitter al gente de contactar te per le sito web, clicca le button ci infra. <b>Post le cambio al API 0.6, solo le usatores public pote modificar datos cartographic</b> (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">lege proque</a>).<ul><li>Tu adresse de e-mail non essera revelate si tu deveni public.</li><li>Iste action non pote esser revertite e tote le nove usatores es ora public per predefinition.</li></ul>
+      replace image: Reimplaciar le imagine actual
       return to profile: Retornar al profilo
-      save changes button: Immagazinar modificationes
+      save changes button: Salveguardar modificationes
       title: Modificar conto
       update home location on click: Actualisar le position de origine quando io clicca super le carta?
     confirm: 
@@ -1141,9 +1242,6 @@ ia:
       success: Tu adresse de e-mail ha essite confirmate, gratias pro inscriber te!
     filter: 
       not_an_administrator: Tu debe esser administrator pro executar iste action.
-    friend_map: 
-      nearby mapper: "Cartographo vicin: [[nearby_user]]"
-      your location: Tu position
     go_public: 
       flash success: Tote tu modificationes es ora public, e tu ha ora le permission de modificar.
     login: 
@@ -1156,7 +1254,12 @@ ia:
       lost password link: Tu perdeva le contrasigno?
       password: "Contrasigno:"
       please login: Per favor aperi un session o {{create_user_link}}.
+      remember: "Memorar me:"
       title: Aperir session
+    logout: 
+      heading: Clauder le session de OpenStreetMap
+      logout_button: Clauder session
+      title: Clauder session
     lost_password: 
       email address: "Adresse de e-mail:"
       heading: Contrasigno oblidate?
@@ -1189,6 +1292,10 @@ ia:
       body: Non existe un usator con le nomine {{user}}. Per favor verifica le orthographia, o pote esser que le ligamine que tu sequeva es incorrecte.
       heading: Le usator {{user}} non existe
       title: Nulle tal usator
+    popup: 
+      friend: Amico
+      nearby mapper: Cartographo vicin
+      your location: Tu position
     remove_friend: 
       not_a_friend: "{{name}} non es un de tu amicos."
       success: "{{name}} ha essite removite de tu amicos."
@@ -1205,17 +1312,14 @@ ia:
     view: 
       activate_user: activar iste usator
       add as friend: adder como amico
-      add image: Adder imagine
       ago: ({{time_in_words_ago}} retro)
       block_history: vider blocadas recipite
       blocks by me: blocadas per me
       blocks on me: blocadas super me
-      change your settings: cambiar tu configurationes
       confirm: Confirmar
       create_block: blocar iste usator
       created from: "Create ex:"
       deactivate_user: disactivar iste usator
-      delete image: Deler imagine
       delete_user: deler iste usator
       description: Description
       diary: diario
@@ -1231,12 +1335,11 @@ ia:
       my edits: mi modificationes
       my settings: mi configurationes
       my traces: mi tracias
-      my_oauth_details: Vider mi detalios OAuth
+      nearby users: Altere usatores vicin
-      nearby users: "Usatores vicin:"
       new diary entry: nove entrata de diario
       no friends: Tu non ha ancora addite alcun amico.
-      no home location: Nulle position de origine ha essite definite.
+      no nearby users: Il non ha ancora altere cartographos in le vicinitate.
-      no nearby users: Il non ha ancora cartographos in le vicinitate.
+      oauth settings: configuration oauth
       remove as friend: remover como amico
       role: 
         administrator: Iste usator es un administrator
@@ -1251,8 +1354,6 @@ ia:
       settings_link_text: configurationes
       traces: tracias
       unhide_user: revelar iste usator
-      upload an image: Cargar un imagine
-      user image heading: Imagine del usator
       user location: Position del usator
       your friends: Tu amicos
   user_block: 

config/locales/is.yml

@@ -212,6 +212,13 @@ is:
       zoom_or_select: Þú verður að þysja að eða velja svæði á kortinu
     tag_details: 
       tags: "Eigindi:"
+    timeout: 
+      sorry: Ekki var hægt að ná í gögn fyrir {{type}} með kennitöluna {{id}}, það tók of langann tíma að ná í gögnin.
+      type: 
+        changeset: breytingarsettið
+        node: hnútinn
+        relation: venslin
+        way: veginn
     way: 
       download: "{{download_xml_link}} eða {{view_history_link}} eða {{edit_link}}"
       download_xml: Sækja veginn á XML sniði
@@ -383,6 +390,7 @@ is:
       other: u.þ.b. {{count}} km
       zero: minna en 1 km
     results: 
+      more_results: Fleiri niðurstöður
       no_results: Ekkert fannst
     search: 
       title: 
@@ -405,6 +413,7 @@ is:
           bicycle_rental: Reiðhjólaleigan
           brothel: Hóruhúsið
           cafe: Kaffihúsið
+          car_rental: Bílaleigan
           car_wash: Bílaþvottastöðin
           cinema: Kvikmyndarhúsið
           dentist: Tannlæknirinn
@@ -437,6 +446,7 @@ is:
           swimming_pool: Sundlaugin
           water_park: Vatnsleikjagarðurinn
         natural: 
+          bay: Flóinn
           beach: Ströndin
           cave_entrance: Hellisop
           crater: Gígurinn
@@ -517,7 +527,6 @@ is:
     donate: Hjálpaðu OpenStreetMap verkefninu með {{link}} í vélbúnaðarsjóðinn.
     donate_link_text: fjárframlagi
     edit: Breyta
-    edit_tooltip: Breyta kortagögnunum
     export: Niðurhala
     export_tooltip: Niðurhala kortagögnum á hinum ýmsu sniðum
     gps_traces: GPS ferlar
@@ -526,7 +535,6 @@ is:
     help_wiki_tooltip: Hjálpar og wiki-síða fyrir verkefnið
     help_wiki_url: http://wiki.openstreetmap.org/wiki/Fors%C3%AD%C3%B0a?uselang=is
     history: Breytingarskrá
-    history_tooltip: Sjá skrá yfir breytingarsett
     home: heim
     home_tooltip: Færa kortasýnina á þína staðsetningu
     inbox: innhólf ({{count}})
@@ -565,10 +573,6 @@ is:
     view_tooltip: Kortasýn
     welcome_user: Hæ {{user_link}}
     welcome_user_link_tooltip: Notandasíðan þín
-  map: 
-    coordinates: "Hnit:"
-    edit: Breyta
-    view: Kort
   message: 
     delete: 
       deleted: Skilaboðunum var eytt
@@ -852,6 +856,9 @@ is:
     sidebar: 
       close: Loka
       search_results: Leitarniðurstöður
+  time: 
+    formats: 
+      friendly: "%e .%B %Y kl. %H:%M"
   trace: 
     create: 
       trace_uploaded: Búið er að hlaða upp GPS ferlinum og bíður hann núna eftir því að vera settur inn í gagnagrunninn, sem gerist yfirleitt innan stundar. Póstur verður sendur á netfangið þitt þegar því er lokið.
@@ -892,13 +899,15 @@ is:
       count_points: "{{count}} punktar"
       edit: breyta
       edit_map: Breyta kortinu með ferilin til hliðsjónar
+      identifiable: AUÐKENNANLEGUR
       in: í
       map: kort
       more: upplýsingar
       pending: Í BIÐ
-      private: BARA ÞÚ SÉRÐ
+      private: PRÍVAT
       public: ALLIR SJÁ
       trace_details: Sýna upplýsingar um ferilinn
+      trackable: REKJANLEGUR
       view_map: Sjá kort
     trace_form: 
       description: Lýsing
@@ -917,6 +926,10 @@ is:
       traces_waiting: Þú ert með {{count}} ferla í bið. Íhugaðu að bíða með að senda inn fleiri ferla til að aðrir notendur komist að.
     trace_optionals: 
       tags: Tögg
+    trace_paging_nav: 
+      next: Næsta »
+      previous: "« Fyrri"
+      showing_page: Sýni síðu {{page}}
     view: 
       delete_track: Eyða
       description: "Lýsing:"
@@ -943,14 +956,19 @@ is:
       trackable: Rekjanlegur (aðeins deilt sem óauðkennanlegir punktar með tímastimpli)
   user: 
     account: 
+      current email address: "Núverandi netfang:"
+      delete image: Eyða þessari mynd
       email never displayed publicly: (aldrei sýnt opinberlega)
       flash update success: Stillingarnar þínar voru uppfærðar.
       flash update success confirm needed: Stillingarnar þínar voru uppfærðar. Póstur var sendur á netfangið þitt sem þú þarft að bregðast við til að netfangið þitt verði staðfest.
       home location: "Staðsetning:"
+      image: "Mynd:"
+      keep image: Halda þessari mynd
       latitude: "Lengdargráða:"
       longitude: "Breiddargráða:"
       make edits public button: Gera allar breytingarnar mínar opinberar
       my settings: Mínar stillingar
+      new email address: "Nýtt netfang:"
       no home location: Þú hefur ekki stillt staðsetningu þína.
       preferred languages: "Viðmótstungumál:"
       profile description: "Lýsing á þér:"
@@ -982,9 +1000,6 @@ is:
       success: Netfangið þitt hefur verið staðfest.
     filter: 
       not_an_administrator: Þú þarft að vera möppudýr til að framkvæma þessa aðgerð.
-    friend_map: 
-      nearby mapper: "Nálægur notandi: [[nearby_user]]"
-      your location: Þín staðsetning
     go_public: 
       flash success: Allar breytingar þínar eru nú opinberar, og þú getur breytt gögnum.
     login: 
@@ -997,7 +1012,12 @@ is:
       lost password link: Gleymt lykilorð?
       password: "Lykilorð:"
       please login: Vinsamlegast innskráðu þig eða {{create_user_link}}.
+      remember: "Muna innskráninguna:"
       title: Innskrá
+    logout: 
+      heading: Útskrá
+      logout_button: Útskrá
+      title: Útskrá
     lost_password: 
       email address: "Netfang:"
       heading: Gleymt lykilorð?
@@ -1030,6 +1050,10 @@ is:
       body: Það er ekki til notandi með nafninu {{user}}. Kannski slóstu nafnið rangt inn eða fylgdir ógildum tengli.
       heading: Notandinn {{user}} er ekki til
       title: Notandi ekki til
+    popup: 
+      friend: Vinur
+      nearby mapper: Nálægur notandi
+      your location: Þín staðsetning
     remove_friend: 
       not_a_friend: "{{name}} er ekki vinur þinn."
       success: "{{name}} er ekki lengur vinur þinn."
@@ -1046,17 +1070,14 @@ is:
     view: 
       activate_user: virkja þennan notanda
       add as friend: bæta við sem vin
-      add image: Senda
       ago: ({{time_in_words_ago}} síðan)
       block_history: bönn gegn þessum notanda
       blocks by me: bönn eftir mig
       blocks on me: bönn gegn mér
-      change your settings: breyttu stillingunum þínum
       confirm: Staðfesta
       create_block: banna þennan notanda
       created from: "Búin til frá:"
       deactivate_user: óvirkja þennan notanda
-      delete image: Eyða myndinni
       delete_user: eyða þessum notanda
       description: Lýsing
       diary: blogg
@@ -1072,12 +1093,11 @@ is:
       my edits: mínar breytingar
       my settings: mínar stillingar
       my traces: mínir ferlar
-      my_oauth_details: OAuth stillingar
       nearby users: "Nálægir notendur:"
       new diary entry: ný bloggfærsla
       no friends: Þú átt enga vini
-      no home location: Engin staðsetning hefur verið stillt..
       no nearby users: Engir notendur hafa stillt staðsetningu sína nálægt þér.
+      oauth settings: oauth stillingar
       remove as friend: fjarlægja sem vin
       role: 
         administrator: Þessi notandi er möppudýr
@@ -1092,8 +1112,6 @@ is:
       settings_link_text: stillingarsíðunni
       traces: ferlar
       unhide_user: af-fela þennan notanda
-      upload an image: Senda inn mynd
-      user image heading: Notandamynd
       user location: Staðsetning
       your friends: Vinir þínir
   user_block: 

config/locales/it.yml

@@ -3,6 +3,7 @@
 # Export driver: syck
 # Author: Bellazambo
 # Author: Davalv
+# Author: McDutchie
 it: 
   activerecord: 
     attributes: 
@@ -598,14 +599,12 @@ it:
     donate: Supporta OpenStreetMap {{link}} al fondo destinato all'aggiornamento dell'hardware.
     donate_link_text: donando
     edit: Modifica
-    edit_tooltip: Modifica mappe
     export: Esporta
     export_tooltip: Esporta i dati della mappa
     gps_traces: Tracciati GPS
     gps_traces_tooltip: Gestione tracciati
     help_wiki: Aiuto & Wiki
     history: Storico
-    history_tooltip: Storico delle modifiche
     home: posizione iniziale
     inbox: in arrivo ({{count}})
     inbox_tooltip: 
@@ -639,10 +638,6 @@ it:
     view_tooltip: Visualizza mappe
     welcome_user: Benvenuto, {{user_link}}
     welcome_user_link_tooltip: Pagina utente personale
-  map: 
-    coordinates: "Coordinate:"
-    edit: Modifica
-    view: Visualizza
   message: 
     delete: 
       deleted: Messaggio eliminato
@@ -721,7 +716,7 @@ it:
       hopefully_you_2: "{{server_url}} con il nuovo indirizzo {{new_address}}."
     friend_notification: 
       had_added_you: "{{user}} ti ha aggiunto come suo amico su OpenStreetMap."
-      see_their_profile: Puoi vedere il loro profilo su {{userurl}} e aggiungerli anche come amici, se lo si desidera.
+      see_their_profile: Puoi vedere il suo profilo su {{userurl}}.
       subject: "[OpenStreetMap] {{user}} ti ha aggiunto come amico"
     gpx_notification: 
       and_no_tags: e nessuna etichetta.
@@ -1007,15 +1002,12 @@ it:
       success: L'indirizzo email è stato confermato, grazie per l'iscrizione!
     filter: 
       not_an_administrator: Bisogna essere amministratori per poter eseguire questa azione.
-    friend_map: 
-      nearby mapper: "Mappatore vicino: [[nearby_user]]"
-      your location: Propria posizione
     go_public: 
       flash success: Tutte le tue modifiche sono ora pubbliche, e hai il permesso di modificare.
     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.
       auth failure: Spiacenti, non si può accedere con questi dettagli.
-      create_account: crea un profilo
+      create_account: crealo ora
       email or username: "Indirizzo email o nome utente:"
       heading: Entra
       login_button: Entra
@@ -1055,6 +1047,9 @@ it:
       body: Spiacenti, non c'è alcun utente con il nome {{user}}. Controllare la digitazione, oppure potrebbe essere che il collegamento che si è seguito sia errato.
       heading: L'utente {{user}} non esiste
       title: Nessun utente
+    popup: 
+      nearby mapper: Mappatore vicino
+      your location: Propria posizione
     remove_friend: 
       not_a_friend: "{{name}} non è uno dei tuoi amici."
       success: "{{name}} è stato rimosso dai tuoi amici."
@@ -1071,17 +1066,14 @@ it:
     view: 
       activate_user: attiva questo utente
       add as friend: aggiungi come amico
-      add image: Aggiungi immagine
       ago: ({{time_in_words_ago}} fa)
       block_history: visualizza i blocchi ricevuti
       blocks by me: blocchi applicati da me
       blocks on me: blocchi su di me
-      change your settings: modifica le impostazioni personali
       confirm: Conferma
       create_block: blocca questo utente
       created from: "Creato da:"
       deactivate_user: disattiva questo utente
-      delete image: Elimina immagine
       delete_user: elimina questo utente
       description: Descrizione
       diary: diario
@@ -1100,7 +1092,6 @@ it:
       nearby users: "Utenti nelle vicinanze:"
       new diary entry: nuova voce del diario
       no friends: Non ci sono ancora amici.
-      no home location: Non è stato impostato alcun luogo.
       no nearby users: Non c'è ancora alcun utente che ammette di mappare nelle vicinanze.
       remove as friend: rimuovi come amico
       role: 
@@ -1116,8 +1107,6 @@ it:
       settings_link_text: impostazioni
       traces: tracciati
       unhide_user: mostra questo utente
-      upload an image: Carica una immagine
-      user image heading: Immagine dell'utente
       user location: Luogo dell'utente
       your friends: Amici personali
   user_block: 

config/locales/ja.yml

@@ -414,7 +414,6 @@ ja:
     donate: ハードウェアーアップグレード基金への{{link}} で、OpenStreetMap を支援する。
     donate_link_text: 寄付
     edit: 編集
-    edit_tooltip: 地図を編集する
     export: エクスポート
     export_tooltip: 地図データのエクスポート
     gps_traces: GPS トレース
@@ -423,7 +422,6 @@ ja:
     help_wiki_tooltip: プロジェクトのヘルプと Wiki
     help_wiki_url: http://wiki.openstreetmap.org/wiki/Ja:Main_Page?uselang=ja
     history: 履歴
-    history_tooltip: 変更セットの履歴
     home: ホーム
     home_tooltip: ホームへ戻る
     inbox: 受信箱 ({{count}})
@@ -460,10 +458,6 @@ ja:
     view_tooltip: 地図を見る
     welcome_user: "{{user_link}} さん、ようこそ。"
     welcome_user_link_tooltip: あなたの個人ページ
-  map: 
-    coordinates: "座標:"
-    edit: 編集
-    view: 表示
   message: 
     delete: 
       deleted: メッセージは削除されました
@@ -816,9 +810,6 @@ ja:
       success: あなたのメールアドレスが確認できました。登録ありがとうございます。
     filter: 
       not_an_administrator: この作業を行うには、管理者になる必要があります。
-    friend_map: 
-      nearby mapper: "周辺のマッパー: [[nearby_user]]"
-      your location: あなたの位置
     go_public: 
       flash success: あなたの全ての編集は公開されます。今から編集できます。
     login: 
@@ -863,6 +854,9 @@ ja:
       body: "{{user}}. という名前のユーザは存在しません。スペルミスが無いかチェックしてください。もしくはリンク元が間違っています。"
       heading: "{{user}} というユーザは存在しません。"
       title: ユーザが存在しません
+    popup: 
+      nearby mapper: 周辺のマッパー
+      your location: あなたの位置
     remove_friend: 
       not_a_friend: "{{name}} はあなたの友達ではありません。"
       success: "{{name}} はあなたの友達から外しました。"
@@ -878,12 +872,9 @@ ja:
       flash success: 活動地域を保存しました。
     view: 
       add as friend: 友達に追加
-      add image: 画像の追加
       ago: （{{time_in_words_ago}} 前）
-      change your settings: 設定を変更する
       confirm: 確認する
       create_block: このユーザーをブロック
-      delete image: 画像の削除
       delete_user: このユーザーを消す
       description: 詳細
       diary: 日記
@@ -898,11 +889,9 @@ ja:
       my edits: 私の編集
       my settings: ユーザ情報の設定
       my traces: 私のトレース
-      my_oauth_details: 自分の OAuth の詳細を表示
       nearby users: "周辺のユーザ:"
       new diary entry: 新しい日記エントリ
       no friends: あなたは誰も友達として登録していません。
-      no home location: 活動地域が設定されていません。
       no nearby users: あなたの活動地域周辺にマッパーはいないようです。
       remove as friend: 友達から削除
       role: 
@@ -914,8 +903,6 @@ ja:
       send message: メッセージ送信
       settings_link_text: 設定
       traces: トレース
-      upload an image: 画像のアップロード
-      user image heading: ユーザの画像
       user location: ユーザの位置
       your friends: あなたの友達
   user_block: 

config/locales/km.yml

@@ -226,12 +226,10 @@ km:
         us_postcode: លទ្ធផលពី <a href="http://geocoder.us/">Geocoder.us</a>
   layouts: 
     edit: កែប្រែ​
-    edit_tooltip: កែប្រែ​ផែនទី​
     export: នាំចេញ​
     export_tooltip: នាំចេញ​ទិន្នន័យផែនទី​
     help_wiki_tooltip: ជំនួយ &amp; តំបន់​វិគីសម្រាប់​គម្រោង​នេះ
     history: ប្រវត្តិ​
-    history_tooltip: ប្រវត្តិនៃសំនុំ​បំលាស់ប្តូរ​
     home_tooltip: ទៅទីតាំងដើម​
     inbox: ប្រអប់សំបុត្រ​ ({{count}})
     intro_2: OpenStreetMap អនុញ្ញាតឲ្យអ្នក​មើល កែប្រែ និងប្រើប្រាស់​ទិន្នន័យ​ភូមិសាស្រ្ត ក្នុងភាពរួមសហការគ្នា​ពីគ្រប់ទិសទី​លើផែនដី​។
@@ -245,9 +243,6 @@ km:
     view: មើល​
     view_tooltip: មើលផែនទី
     welcome_user_link_tooltip: ទំព័រអ្នកប្រើប្រាស់​របស់អ្នក​
-  map: 
-    edit: កែប្រែ​
-    view: មើល​
   message: 
     inbox: 
       date: កាលបរិច្ឆេទ​
@@ -415,6 +410,4 @@ km:
       my edits: កំណែប្រែ​របស់ខ្ញុំ​
       no friends: អ្នកមិនទាន់បានបន្ថែមមិត្តណាមួយនៅឡើយទេ​។
       remove as friend: ដកចេញជាមិត្ត​
-      upload an image: ផ្ទុកឡើង​រូបភាព​
-      user image heading: រូបភាព​អ្នកប្រើប្រាស់​
       your friends: មិត្តរបស់អ្នក​

config/locales/ko.yml

@@ -244,7 +244,6 @@ ko:
   layouts: 
     donate_link_text: 기부
     edit: 편집
-    edit_tooltip: 지도 편집
     export: 추출
     export_tooltip: 맵 정보 추출
     gps_traces: GPS 추적
@@ -252,7 +251,6 @@ ko:
     help_wiki: 도움말 & 위키
     help_wiki_tooltip: 프로젝트 도움말 & 위키
     history: 이력
-    history_tooltip: 변경셋 이력
     inbox: 받은 쪽지함 ({{count}})
     inbox_tooltip: 
       one: 한 개의 읽지 않은 쪽지가 있습니다.
@@ -275,10 +273,6 @@ ko:
     view: 보기
     view_tooltip: 지도 보기
     welcome_user: "{{user_link}}님 환영합니다."
-  map: 
-    coordinates: "좌표:"
-    edit: 편집
-    view: 보기
   message: 
     inbox: 
       date: 날짜

config/locales/ksh.yml

@@ -1,4 +1,4 @@
-# Messages for Ripoarisch (Ripoarisch)
+# Messages for Colognian (Ripoarisch)
 # Exported from translatewiki.net
 # Export driver: syck
 # Author: Purodha
@@ -102,12 +102,8 @@ ksh:
     start: 
       osm_xml_data: <i lang="en">OpenStreetMap</i> sing <i lang="en">XML</i> Daate
   layouts: 
-    edit_tooltip: Landkaate ändere
     view_tooltip: Landkaate beloore
-  map: 
-    coordinates: "Ko'oodinate:"
   notifier: 
-    diary_comment_notification: 
     email_confirm: 
       subject: "[OpenStreetMap] Donn Ding Addräß för de <i lang=\"en\">e-mail</i> beshtääteje"
     email_confirm_html: 
@@ -116,7 +112,6 @@ ksh:
       hopefully_you_1: Someone (hopefully you) would like to change their Adräß för de <i lang="en">e-mail</i> ändere
     lost_password: 
       subject: "[OpenStreetMap] Aanfrooch: Paßwoot neu säze"
-    message_notification: 
     signup_confirm: 
       subject: "[OpenStreetMap] Donn Ding Addräß för de <i lang=\"en\">e-mail</i> beshtääteje"
     signup_confirm_html: 

config/locales/lt.yml

@@ -15,9 +15,6 @@ lt:
     history: Istorija
     news_blog: Naujienų tinklaraštis
     shop: Parduotuvė
-  map: 
-    edit: Redaguoti
-    view: Žemėlapis
   site: 
     key: 
       map_key: Žemėlapio legenda

config/locales/lv.yml

@@ -24,6 +24,3 @@ lv:
   browse: 
     common_details: 
       version: "Versija:"
-  map: 
-    edit: Labot
-    view: Skatīties

config/locales/mk.yml

@@ -316,6 +316,10 @@ mk:
       recent_entries: "Скорешни дневнички записи:"
       title: Дневници на корисници
       user_title: Дневник на {{user}}
+    location: 
+      edit: Уреди
+      location: "Местоположба:"
+      view: Види
     new: 
       title: Нова дневничка ставка
     no_such_entry: 
@@ -355,6 +359,9 @@ mk:
       output: Излезни податоци
       paste_html: Ископирајте го HTML кодот за да го вметнете во страницата.
       scale: Размер
+      too_large: 
+        body: Подрачјето е преголемо за да може да се извезе како OpenStreetMap XML податоци. Приближете или изберете помала површина.
+        heading: Подрачјето е преголемо
       zoom: Приближи
     start_rjs: 
       add_marker: Стави бележник на картата
@@ -846,21 +853,23 @@ mk:
         cycle_map: Велосипедска карта
         noname: БезИме
     site: 
+      edit_disabled_tooltip: Приближете за да ја уредите картата
+      edit_tooltip: Уреди карта
       edit_zoom_alert: Морате да зумирате за да можете да ја уредувате картата.
+      history_disabled_tooltip: Приближете за да ги видите уредувањата за ова подрачје
+      history_tooltip: Види уредувања за ова подрачје
       history_zoom_alert: Морате да зумирате за да можете да ја видите историјата на уредувања
   layouts: 
     donate: Поддржете ја OpenStreetMap со {{link}} за Фондот за обнова на хардвер.
     donate_link_text: донирање
     edit: Уреди
-    edit_tooltip: Уредување карти
     export: Извези
     export_tooltip: Извези податоци од картата
     gps_traces: GPS-траги
-    gps_traces_tooltip: Раководење со траги
+    gps_traces_tooltip: Работа со GPS траги
     help_wiki: Помош и вики
     help_wiki_tooltip: Помош и Вики-страница за овој проект
     history: Историја
-    history_tooltip: Историја на измените
     home: дома
     home_tooltip: Оди на домашна локација
     inbox: пораки ({{count}})
@@ -898,13 +907,9 @@ mk:
     user_diaries: Кориснички дневници
     user_diaries_tooltip: Види кориснички дневници
     view: Карта
-    view_tooltip: Преглед на картите
+    view_tooltip: Види карта
     welcome_user: Добредојде, {{user_link}}
     welcome_user_link_tooltip: Ваша корисничка страница
-  map: 
-    coordinates: "Координати:"
-    edit: Уреди
-    view: Карта
   message: 
     delete: 
       deleted: Пораката е избришана
@@ -935,10 +940,14 @@ mk:
       send_message_to: Испрати нова порака за {{name}}
       subject: Наслов
       title: Испрати ја пораката
+    no_such_message: 
+      body: Нажалост нема порака со тој id.
+      heading: Нема таква порака
+      title: Нема таква порака
     no_such_user: 
-      body: Жалиме, нема корисник или порака со тоа име или ид. бр.
+      body: Нажалост нема корисник со тоа име.
-      heading: Нема таков корисник или порака
+      heading: Нема таков корисник
-      title: Нема таков корисник или порака
+      title: Нема таков корисник
     outbox: 
       date: Даѕум
       inbox: примени пораки
@@ -962,6 +971,9 @@ mk:
       title: Прочитај ја пораката
       to: За
       unread_button: Означи како непрочитано
+      wrong_user: Најавени сте како „{{user}}“, но пораката што побаравте да ја прочитате не е испратена до или од тој корисник. Најавете се под правилно корисничко име за да ја прочитате.
+    reply: 
+      wrong_user: Најавени сте како „{{user}}“, но пораката на којашто побаравте да одговорите не е испратена до тој корисник. Најавете се под правилно корисничко име за да одговорите.
     sent_message_summary: 
       delete_button: Избриши
   notifier: 
@@ -982,8 +994,9 @@ mk:
       hopefully_you_1: Некој (се надеваме Вие) сака да ја замени е-поштенската адреса на
       hopefully_you_2: "{{server_url}} со новата адреса {{new_address}}."
     friend_notification: 
+      befriend_them: Можете личноста и да ја додадете како пријател на {{befriendurl}}.
       had_added_you: "{{user}} ве додаде како пријател на OpenStreetMap."
-      see_their_profile: Можете да му го погледате профилот на {{userurl}} и да го додадете како пријател, ако сакате.
+      see_their_profile: Можете да го погледате профилот на оваа личност на {{userurl}}.
       subject: "[OpenStreetMap] {{user}} ве додаде како пријател"
     gpx_notification: 
       and_no_tags: и без ознаки.
@@ -1209,6 +1222,9 @@ mk:
     sidebar: 
       close: Затвори
       search_results: Резултати од пребарувањето
+  time: 
+    formats: 
+      friendly: "%e %B %Y во %H:%M"
   trace: 
     create: 
       trace_uploaded: Вашата GPX податотека е подигната и чека да биде вметната во базата на податоци. Ова обично се врши во рок од половина час, и откога ќе заврши, ќе ви биде испратена порака по е-пошта.
@@ -1310,14 +1326,21 @@ mk:
       trackable: Проследиво (споделено само како анонимни, подредени точки со време)
   user: 
     account: 
+      current email address: "Тековна е-поштенска адреса:"
+      delete image: Отстрани тековна слика
       email never displayed publicly: (никогаш не се прикажува јавно)
       flash update success: Корисничките информации се успешно ажурирани.
       flash update success confirm needed: Корисничките информации се успешно ажурирани. Проверете е-пошта за да ја потврдите на адресата.
       home location: "Домашна локација:"
+      image: "Слика:"
+      image size hint: (најдобро работат квадратни слики, барем 100x100)
+      keep image: Задржи ја тековната слика
       latitude: Геог. ширина
       longitude: Геог. должина
       make edits public button: Објавувај ми ги сите уредувања
       my settings: Мои прилагодувања
+      new email address: "Нова е-поштенска адреса:"
+      new image: Додај слика
       no home location: Немате внесено домашна локација.
       preferred languages: "Претпочитани јазици:"
       profile description: "Опис за профилот:"
@@ -1331,6 +1354,7 @@ mk:
       public editing note: 
         heading: Јавно уредување
         text: Во моментов вашите уредувања се анонимни и луѓето не можат да ви пратат порака или да ви ја видат локацијата. За да покажете што уредувате и да овозможите корисниците да ве контактираат преку оваа страница, кликнете на копчето подолу. <b>По преодот на 0.6 API, само јавни корисници можат да уредуваат податоци на карти</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">дознајте зошто</a>).<ul> <li>Ако станете јавен корисник, вашата е-пошта сепак нема да се открие.</li> <li>Оваа постапка не може да се врати, и сите нови корисници сега се автоматски јавни.</li> </ul>
+      replace image: Замени тековна слика
       return to profile: Назад кон профилот
       save changes button: Зачувај ги промените
       title: Уреди сметка
@@ -1349,9 +1373,6 @@ mk:
       success: Вашата е-пошта е потврдена. Ви благодариме што се регистриравте!
     filter: 
       not_an_administrator: За да го изведете тоа, треба да се администратор.
-    friend_map: 
-      nearby mapper: "Соседен картограф: [[nearby_user]]"
-      your location: Ваша локација
     go_public: 
       flash success: Сега сите уредувања ви се јавни, и ви е дозволено да уредувате.
     login: 
@@ -1364,7 +1385,12 @@ mk:
       lost password link: Си ја загубивте лозинката?
       password: "Лозинка:"
       please login: Најавете се или {{create_user_link}}.
+      remember: "Запомни ме:"
       title: Најавување
+    logout: 
+      heading: Одјавување од OpenStreetMap
+      logout_button: Одјава
+      title: Одјава
     lost_password: 
       email address: "Е-пошта:"
       heading: Ја заборавивте лозинката?
@@ -1397,6 +1423,10 @@ mk:
       body: Жалиме, но не постои корисник по име {{user}}. Проверете да не сте згрешиле во пишувањето, или пак да не сте кликнале на погрешна врска.
       heading: Корисникот {{user}} не постои.
       title: Нема таков корисник
+    popup: 
+      friend: Пријател
+      nearby mapper: Соседен картограф
+      your location: Ваша локација
     remove_friend: 
       not_a_friend: "{{name}} не е меѓу вашите пријатели."
       success: Корисникот {{name}} е отстранет од вашите пријатели.
@@ -1413,17 +1443,14 @@ mk:
     view: 
       activate_user: активирај го корисников
       add as friend: додај како пријател
-      add image: Додај слика
       ago: (пред {{time_in_words_ago}})
       block_history: погледај добиени блокови
       blocks by me: извршени болокови
       blocks on me: добиени блокови
-      change your settings: измени прилагодувања
       confirm: Потврди
       create_block: блокирај го корисников
       created from: "Создадено од:"
       deactivate_user: деактивирај го корисников
-      delete image: Избриши ја сликата
       delete_user: избриши го корисников
       description: Опис
       diary: дневник
@@ -1439,12 +1466,11 @@ mk:
       my edits: мои уредувања
       my settings: мои прилагодувања
       my traces: мои траги
-      my_oauth_details: Моите OAuth детали
+      nearby users: Други соседни корисници
-      nearby users: "Соседни корисници:"
       new diary entry: нова ставка во дневникот
       no friends: Сè уште немате додадено пријатели.
-      no home location: Немате поставено домашна локација.
+      no nearby users: Сè уште нема други корисници во вашата околина што признаваат дека работат на карти.
-      no nearby users: Сè уште нема корисници во вашата околина кои признаваат дека работат на карти.
+      oauth settings: oauth поставки
       remove as friend: отстрани од пријатели
       role: 
         administrator: Овој корисник е администратор
@@ -1459,8 +1485,6 @@ mk:
       settings_link_text: прилагодувања
       traces: траги
       unhide_user: покажи го корисникот
-      upload an image: Подигни слика
-      user image heading: Корисничка слика
       user location: Локација на корисникот
       your friends: Ваши пријатели
   user_block: 

config/locales/nb.yml

@@ -0,0 +1,2 @@
+nb:
+  dummy: dummy

config/locales/nds.yml

@@ -235,7 +235,6 @@ nds:
   layouts: 
     donate_link_text: Spennen
     edit: Ännern
-    edit_tooltip: Koorten ännern
     export: Export
     export_tooltip: Koortendaten exporteren
     help_wiki: Hülp & Wiki
@@ -258,10 +257,6 @@ nds:
     view_tooltip: Koorten ankieken
     welcome_user: Willkamen, {{user_link}}
     welcome_user_link_tooltip: Dien Brukersied
-  map: 
-    coordinates: "Koordinaten:"
-    edit: Ännern
-    view: Ankieken
   message: 
     delete: 
       deleted: Naricht wegdaan
@@ -459,9 +454,6 @@ nds:
       return to profile: Trüch na’t Profil
       save changes button: Ännern spiekern
       title: Brukerkonto ännern
-    friend_map: 
-      nearby mapper: "Koortenmaker in de Neegd: [[nearby_user]]"
-      your location: Dien Standoort
     login: 
       create_account: Brukerkonto opstellen
       email or username: "E-Mail-Adress oder Brukernaam:"
@@ -489,6 +481,9 @@ nds:
     no_such_user: 
       heading: Den Bruker {{user}} gifft dat nich
       title: Bruker nich funnen
+    popup: 
+      nearby mapper: Koortenmaker in de Neegd
+      your location: Dien Standoort
     remove_friend: 
       not_a_friend: "{{name}} is keen von dien Frünn."
       success: "{{name}} is rutnahmen bi de Frünn."
@@ -502,9 +497,7 @@ nds:
       flash success: Standoort is spiekert.
     view: 
       add as friend: as Fründ tofögen
-      add image: Bild tofögen
       ago: (vör {{time_in_words_ago}})
-      delete image: Bild wegdoon
       description: Beschrieven
       diary: Dagbook
       edits: Ännern
@@ -516,11 +509,8 @@ nds:
       my edits: mien Ännern
       nearby users: "Brukers in de Neegd:"
       new diary entry: Nee Dagbook-Indrag
-      no home location: Keen Standoort angeven.
       remove as friend: as Fründ rutnehmen
       send message: Naricht sennen
-      upload an image: Bild hoochladen
-      user image heading: Brukerbild
       your friends: Dien Frünn
   user_block: 
     partial: 

config/locales/ne.yml

@@ -0,0 +1,300 @@
+# Messages for Nepali (नेपाली)
+# Exported from translatewiki.net
+# Export driver: syck
+# Author: सरोज कुमार ढकाल
+ne: 
+  browse: 
+    changeset: 
+      changeset: "चेन्जसेट: {{id}}"
+      changesetxml: चेन्जसेट XML
+      download: डाउनलोड गर्ने {{changeset_xml_link}} वा {{osmchange_xml_link}}
+      feed: 
+        title: चेन्जसेट {{id}}
+        title_comment: चेन्जसेट {{id}} - {{comment}}
+      title: चेन्जसेट
+    changeset_details: 
+      belongs_to: "स्वामित्व:"
+      box: बाकस
+      closed_at: "बन्द गरिएको:"
+      created_at: "श्रृजना गरिएको:"
+      show_area_box: क्षेत्र बाकस देखाउने
+    changeset_navigation: 
+      all: 
+        next_tooltip: पछिल्लो चेन्जसेट
+        prev_tooltip: अघिल्लो चेन्जसेट
+      user: 
+        name_tooltip: " {{user}}को सम्पादन हेर्ने"
+        next_tooltip: पछिल्लो सम्पादन {{user}}
+        prev_tooltip: पहिलो सम्पादन {{user}}
+    common_details: 
+      changeset_comment: "टिप्पणी:"
+      edited_at: "समपादित :"
+      edited_by: "सम्पादक:"
+      in_changeset: "चेन्जसेटमा:"
+      version: "संस्करण:"
+    containing_relation: 
+      entry: सम्बन्ध {{relation_name}}
+      entry_role: सम्बन्ध {{relation_name}} (as {{relation_role}})
+    map: 
+      deleted: मेटियो
+      larger: 
+        area: क्षेत्र ठूलो नक्सामा हेर्ने
+        node: नोड ठूलो नक्सामा हेर्ने
+        relation: सम्बन्ध ठूलो नक्सामा हेर्ने
+        way: बाटो ठूलो नक्सामा हेर्ने \
+      loading: लोड हुदैछ...
+    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: माफ गर्नुहोस, {{id}} आईडी भएको {{type}}  , फेला पार्न सकिएन ।
+      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: " [[user]]द्रारा  [[timestamp]]मा सम्पादित \\"
+      history_for_feature: " [[feature]]को इतिहास"
+      load_data: डेटा लोडगर्ने
+      loading: लोड हुदैछ...
+      manually_select: आफै अर्को क्षेत्र छान्नुहोस \
+      object_list: 
+        api: यो क्षेत्र API बाट निकाल्नुहोस \
+        back: वस्तु सुची देखाउने
+        details: विस्तृत जानकारीहरु \
+        heading: वस्तु सुची
+        history: 
+          type: 
+            node: नोड [[id]]
+            way: बाटो [[id]]
+        selected: 
+          type: 
+            node: नोड [[id]]
+            way: बाटो [[id]]
+        type: 
+          node: नोड
+          way: बाटो
+      private_user: निजी प्रयोगकर्ता
+      show_history: इतिहास देखाउने
+      wait: पर्खनुहोस.....
+    tag_details: 
+      tags: "ट्यागहरु:"
+    way: 
+      download: "{{download_xml_link}}, {{view_history_link}} वा {{edit_link}}"
+      download_xml: " XML डाउनलोड गर्ने"
+      edit: सम्पादन
+      view_history: इतिहास हेर्ने
+      way: बाटो
+      way_title: "बाटो: {{way_name}}"
+    way_details: 
+      nodes: "नोडहरु:"
+      part_of: "को खण्ड:"
+    way_history: 
+      download: "{{download_xml_link}} वा {{view_details_link}}"
+      download_xml: " XML डाउनलोड गर्ने"
+      view_details: विस्तृत जानकारी हेर्ने
+      way_history: बाटो इतिहास \
+      way_history_title: "बाटो इतिहास: {{way_name}}"
+  diary_entry: 
+    diary_comment: 
+      confirm: " निश्चित गर्ने"
+    diary_entry: 
+      comment_link: यो प्रविष्टीमा टिप्पणीगर्ने
+      confirm: निश्चित गर्ने
+      edit_link: यो प्रविष्टी सम्पादन गर्ने
+      hide_link: यो प्रविष्टी लुकाउने
+      reply_link: यो प्रविष्टीमा जवाफ लेख्ने
+    edit: 
+      body: "मूख्य भाग:"
+      language: "भाषा:"
+      latitude: "देशान्तर:"
+      location: "स्थान:"
+      longitude: "अक्षांश:"
+      marker_text: दैनिकी प्रविष्ठी स्थान
+      save_button: संग्रह गर्ने
+      subject: "विषय:"
+      title: दैनिकी प्रविष्ठी सम्पादन गर्ने
+      use_map_link: नक्सा प्रयोगर्ने
+    view: 
+      leave_a_comment: टिप्पणी छोड्ने
+      login_to_leave_a_comment: "{{login_link}} टिप्पणी छोड्नलाई"
+  trace: 
+    create: 
+      upload_trace: " GPS 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: सारवजनिक GPS ट्रेसहरु \
+      public_traces_from: "{{user}}बाट सार्वकनिक GPS ट्रेसहरु"
+      tagged_with: " {{tags}}हरु द्वारा ट्याग गरिएको"
+      your_traces: तपाईको GPS ट्रेसहरु
+    make_public: 
+      made_public: सार्वजनिक बनाइएको ट्रेस
+    no_such_user: 
+      heading: प्रयोगकर्ता {{user}} अस्तित्वमा छैन \
+      title: कुनै त्यस्तो प्रयोगकर्ता छैन
+    trace: 
+      ago: "{{time_in_words_ago}} पहिले"
+      by: द्वारा
+      count_points: पोइन्टहरु {{count}}
+      edit: सम्पादन
+      edit_map: नक्सा सम्पादन गर्ने
+      in: मा
+      map: नक्सा
+      more: थप
+      pending: बाँकी रहेको
+      private: निजी
+      public: सार्वजनिक
+      trace_details: ट्रेसको विस्तृत जानकारी हेर्ने
+      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: तपाईको सबै ट्रेसहरु हेर्नुहोस \
+    trace_optionals: 
+      tags: ट्यागहरु
+    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: "दृश्यक्षमता:"
+  user: 
+    account: 
+      flash update success: प्रयोगकर्ताको जानकारीहरु सफलतापूर्वक अध्यावधिक गरियो।
+      home location: "गृह स्थान:"
+      my settings: मेरो अनुकुलताहरु
+      no home location: तपाईले आफ्नो गृहस्थान प्रविष्ठ गर्नुभएको छैन।
+      preferred languages: "रुचाइएका भाषाहरु:"
+      public editing: 
+        disabled link text: म किन सम्पादन गर्न सक्दिन?
+        enabled link text: यो के हो ?
+        heading: "सार्वजनिक सम्पादन:"
+      public editing note: 
+        heading: सार्वजनिक सम्पादन
+      save changes button: परिवर्तनहरु संग्रह गर्नुहोस \
+    confirm_email: 
+      button: निश्चित
+      failure: यो टोकन को साथम एक इमेल पहिले नै निश्चित गरिसकिएको छ।
+      heading: इमेल परिवर्तन भएको निश्चित गर्नुहोस् \
+      press confirm button: इमेल निश्चित गर्नको लागि निश्चितमा क्लिक गर्नुहोस् ।
+      success: तपाईको इमेल निश्चित गर्नुहोस, ग्राह्याताको लागि धन्यवाद!
+    filter: 
+      not_an_administrator: यो कार्य गर्न तपाई प्रवन्धक हुनुपर्छ .
+    go_public: 
+      flash success: तपाईको सबै सम्पादनहरु सार्वाजनिक छन् ,तपाई अब सम्पान लायक हुनु भयो ।
+    make_friend: 
+      already_a_friend: " {{name}} सँग तपाई पहिले नै मित्रता गरिसक्नु भएको छ ।"
+      failed: माफ गर्नुहोला, {{name}}लाई मित्रको रुपमा थप्न सकिएन।
+      success: "{{name}} अब तपाईको मित्र हुनुभएको छ।"
+    popup: 
+      nearby mapper: नजिकको मानचित्रकर्मी
+      your location: तपाईको स्थान
+    reset_password: 
+      confirm password: "प्रवेशशव्द निश्चित गर्ने:"
+      flash changed: तपाईको प्रवेशशव्द परिवर्तन गरिएको छ।
+      heading: " {{name}}को लागि प्रवेशशव्द परिवर्तन गर्ने \\"
+      password: "प्रवेशशव्द:"
+      reset: नयाँ प्रवेशशव्द \
+      title: प्रवेशशव्द परिवर्तन गर्ने
+  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: Confirm role revoking

config/locales/nl.yml

@@ -319,6 +319,10 @@ nl:
       recent_entries: "Recente dagboekberichten:"
       title: Gebruikersdagboeken
       user_title: Dagboek van {{user}}
+    location: 
+      edit: Bewerken
+      location: "Locatie:"
+      view: Bekijken
     new: 
       title: Nieuw dagboekbericht
     no_such_entry: 
@@ -328,7 +332,7 @@ nl:
     no_such_user: 
       body: Sorry, er is geen gebruiker met de naam {{user}}. Controleer de spelling, of misschien is de verwijzing waarop u geklikt hebt onjuist.
       heading: De gebruiker {{user}} bestaat niet
-      title: De opgevraagde gebruiker bestaat niet
+      title: Deze gebruiker bestaat niet
     view: 
       leave_a_comment: Opmerking achterlaten
       login: aanmelden
@@ -358,6 +362,9 @@ nl:
       output: Uitvoer
       paste_html: Kopieer de HTML-code en voeg deze toe aan uw website
       scale: Schaal
+      too_large: 
+        body: Dit gebied is te groot om als OpenStreetMap XML-gegevens te exporteren. Zoom in of selecteer een kleiner gebied.
+        heading: Gebied te groot
       zoom: Zoom
     start_rjs: 
       add_marker: Marker op de kaart zetten
@@ -731,7 +738,7 @@ nl:
           tram_stop: Tramhalte
           yard: Rangeerterrein
         shop: 
-          alcohol: Verkooppunt alcoholische dranken
+          alcohol: Slijterij
           apparel: Kledingwinkel
           art: Kunstwinkel
           bakery: Bakkerij
@@ -756,7 +763,7 @@ nl:
           department_store: Warenhuis
           discount: Discountwinkel
           doityourself: Doe-het-zelf-winkel
-          drugstore: Apotheek
+          drugstore: Drogisterij
           dry_cleaning: Stomerij
           electronics: Elektronicawinkel
           estate_agent: Makelaar
@@ -766,13 +773,13 @@ nl:
           florist: Bloemist
           food: Etenswarenwinkel
           funeral_directors: Uitvaartcentrum
-          furniture: Meulbelzaak
+          furniture: Meubelzaak
           gallery: Galerie
           garden_centre: Tuincentrum
           general: Algemene winkel
           gift: Cadeauwinkel
           greengrocer: Groenteboer
-          grocery: Groentenwinkel
+          grocery: Kruidenierswinkel
           hairdresser: Kapper
           hardware: Gereedschappenwinkel
           hifi: Hi-fi
@@ -800,7 +807,7 @@ nl:
           toys: Speelgoedwinkel
           travel_agency: Reisbureau
           video: Videotheek
-          wine: Verkooppunt alcoholische dranken
+          wine: Slijterij
         tourism: 
           alpine_hut: Berghut
           artwork: Kunst
@@ -831,7 +838,7 @@ nl:
           ditch: Sloot
           dock: Dock
           drain: Afvoerkanaal
-          lock: Sluis
+          lock: Schutsluis
           lock_gate: Sluisdeur
           mineral_spring: Bron
           mooring: Aanlegplaats
@@ -849,21 +856,23 @@ nl:
         cycle_map: Fietskaart
         noname: GeenNaam
     site: 
+      edit_disabled_tooltip: Zoom in om de kaart te bewerken
+      edit_tooltip: Kaart bewerken
       edit_zoom_alert: U moet inzoomen om de kaart te bewerken
+      history_disabled_tooltip: Zoom in om de bewerkingen voor dit gebied te bekijken
+      history_tooltip: Bewerkingen voor dit gebied bekijken
       history_zoom_alert: U moet inzoomen om de kaart te bewerkingsgeschiedenis te bekijken
   layouts: 
     donate: Ondersteun OpenStreetMap door te {{link}} aan het Hardware Upgrade-fonds.
     donate_link_text: doneren
     edit: Bewerken
-    edit_tooltip: Kaarten bewerken
     export: Exporteren
     export_tooltip: Kaartgegevens exporteren
     gps_traces: GPS-tracks
-    gps_traces_tooltip: Tracks beheren
+    gps_traces_tooltip: GPS-tracks beheren
     help_wiki: Help & wiki
     help_wiki_tooltip: Help en wikisite voor het project
     history: Geschiedenis
-    history_tooltip: Wijzigingensetgeschiedenis
     home: home
     home_tooltip: Naar thuislocatie gaan
     inbox: Postvak IN ({{count}})
@@ -899,13 +908,9 @@ nl:
     user_diaries: Gebruikersdagboeken
     user_diaries_tooltip: Gebruikersdagboeken bekijken
     view: Bekijken
-    view_tooltip: Kaarten bekijken
+    view_tooltip: Kaart bekijken
     welcome_user: Welkom, {{user_link}}
     welcome_user_link_tooltip: Uw gebruikerspagina
-  map: 
-    coordinates: "Coördinaten:"
-    edit: Bewerken
-    view: Bekijken
   message: 
     delete: 
       deleted: Het bericht is verwijderd
@@ -936,10 +941,14 @@ nl:
       send_message_to: Een persoonlijk bericht naar {{name}} versturen
       subject: Onderwerp
       title: Bericht verzenden
+    no_such_message: 
+      body: Er is geen bericht met dat ID.
+      heading: Bericht bestaat niet
+      title: Dat bericht bestaat niet
     no_such_user: 
-      body: Sorry, er is geen gebruiker of bericht met die naam of id
+      body: Er is geen gebruiker die naam.
-      heading: Deze gebruiker of dit bericht bestaat niet
+      heading: Deze gebruiker bestaat niet
-      title: De gebruiker of het bericht bestaat niet
+      title: Deze gebruiker bestaat niet
     outbox: 
       date: Datum
       inbox: Postvak IN
@@ -963,6 +972,9 @@ nl:
       title: Bericht lezen
       to: Aan
       unread_button: Markeren als ongelezen
+      wrong_user: "U bent aangemeld als \"{{user}}\", maar het bericht dat u wilt lezen is niet aan die gebruiker gericht.\nMeld u aan als de juiste gebruiker om het te lezen."
+    reply: 
+      wrong_user: U bent aangemeld als "{{user}}", maar het bericht waarop u wilt antwoorden is niet aan die gebruiker gericht. Meld u aan als de juiste gebruiker om te antwoorden.
     sent_message_summary: 
       delete_button: Verwijderen
   notifier: 
@@ -983,8 +995,9 @@ nl:
       hopefully_you_1: Iemand - hopelijk u - wil zijn e-mailadres  op
       hopefully_you_2: "{{server_url}} wijzigen naar {{new_address}}."
     friend_notification: 
+      befriend_them: U kunt deze gebruiker ook als vriend toevoegen op {{befriendurl}}.
       had_added_you: "{{user}} heeft u toegevoegd als vriend op OpenStreetMap."
-      see_their_profile: U kunt zijn/haar profiel bekijken op {{userurl}} en deze gebruiker ook als vriend toevoegen.
+      see_their_profile: U kunt zijn/haar profiel bekijken op {{userurl}}.
       subject: "[OpenStreetMap] {{user}} heeft u als vriend toegevoegd"
     gpx_notification: 
       and_no_tags: en geen labels.
@@ -1210,6 +1223,9 @@ nl:
     sidebar: 
       close: Sluiten
       search_results: Zoekresultaten
+  time: 
+    formats: 
+      friendly: "%e %B %Y om %H:%M"
   trace: 
     create: 
       trace_uploaded: Uw track is geüpload en staat te wachten totdat hij in de database wordt opgenomen. Dit gebeurt meestal binnen een half uur. U ontvangt dan een e-mail.
@@ -1243,7 +1259,7 @@ nl:
     no_such_user: 
       body: Sorry, er is geen gebruiker {{user}}. Controleer de spelling, of misschien is de verwijzing waarop u geklikt hebt onjuist.
       heading: De gebruiker {{user}} bestaat niet
-      title: De gebruiker bestaat niet
+      title: Deze gebruiker bestaat niet
     offline: 
       heading: De opslag van GPX-bestanden is niet beschikbaar
       message: Het systeem voor het opslaan en uploaden van GPX-bestanden is op het moment niet beschikbaar.
@@ -1313,15 +1329,20 @@ nl:
   user: 
     account: 
       current email address: "Huidige e-mailadres:"
+      delete image: Huidige afbeelding verwijderen
       email never displayed publicly: (nooit openbaar gemaakt)
       flash update success: De gebruikersinformatie is bijgewerkt.
       flash update success confirm needed: De gebruikersinformatie is bijgewerkt. Controleer uw e-mail om uw nieuwe e-mailadres te bevestigen.
       home location: "Thuislocatie:"
+      image: "Afbeelding:"
+      image size hint: (vierkante afbeeldingen van minstens 100x100 pixels werken het beste)
+      keep image: Huidige afbeelding behouden
       latitude: "Breedtegraad:"
       longitude: "Lengtegraad:"
       make edits public button: Al mijn wijzigingen  openbaar maken
       my settings: Mijn instellingen
       new email address: "Nieuw e-mailadres:"
+      new image: Afbeelding toevoegen
       no home location: Er is geen thuislocatie ingevoerd.
       preferred languages: "Voorkeurstalen:"
       profile description: "Profielbeschrijving:"
@@ -1335,6 +1356,7 @@ nl:
       public editing note: 
         heading: Publiek bewerken
         text: Op dit moment zijn uw bewerkingen anoniem en kunnen andere gebruikers u geen berichten sturen of uw locatie zien. Om uw bewerkingen weer te kunnen geven en andere gebruikers in staat te stellen in contact met u te komen, kunt u op de onderstaande knop klikken. <b>Sinds de overgang naar versie 0.6 van de API kunnen alleen publieke gebruikers de kaartgegevens bewerken</b> (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">meer informatie</a>).<ul><li>Uw e-mailadres wordt niet publiek gemaakt door uw bewerkingen publiek te maken.</li><li>Deze handeling kan niet ongedaan gemaakt worden en alle nieuwe gebrukers zijn nu standaard publiek.</li></ul>
+      replace image: Huidige afbeelding vervangen
       return to profile: Terug naar profiel
       save changes button: Wijzgingen opslaan
       title: Gebruiker bewerken
@@ -1353,9 +1375,6 @@ nl:
       success: Uw e-mailadres is bevestigd. Dank u wel voor het registreren!
     filter: 
       not_an_administrator: U moet beheerder zijn om deze handeling uit te kunnen voeren.
-    friend_map: 
-      nearby mapper: "Dichtbijzijnde mapper: [[nearby_user]]"
-      your location: Uw locatie
     go_public: 
       flash success: Al uw bewerkingen zijn nu openbaar en u kunt bewerken.
     login: 
@@ -1368,7 +1387,12 @@ nl:
       lost password link: Wachtwoord vergeten?
       password: "Wachtwoord:"
       please login: Aanmelden of {{create_user_link}}.
+      remember: "Aanmeldgegevens onthouden:"
       title: Aanmelden
+    logout: 
+      heading: Afmelden van OpenStreetMap
+      logout_button: Afmelden
+      title: Afmelden
     lost_password: 
       email address: "E-mailadres:"
       heading: Wachtwoord vergeten?
@@ -1401,6 +1425,10 @@ nl:
       body: Sorry, er is geen gebruiker met de naam {{user}}. Controleer de spelling, of misschien is de link waarop je klikte onjuist.
       heading: De gebruiker {{user}} bestaat niet
       title: Deze gebruiker bestaat niet
+    popup: 
+      friend: Vriend
+      nearby mapper: Dichtbijzijnde mapper
+      your location: Uw locatie
     remove_friend: 
       not_a_friend: "{{name}} staat niet in uw vriendelijst."
       success: "{{name}} is verwijderd uit uw vriendenlijst."
@@ -1417,17 +1445,14 @@ nl:
     view: 
       activate_user: gebruiker actief maken
       add as friend: vriend toevoegen
-      add image: Afbeelding toevoegen
       ago: ({{time_in_words_ago}} geleden)
       block_history: blokkades voor mij
       blocks by me: blokkades door mij
       blocks on me: blokkades door mij
-      change your settings: Instellingen aanpassen
       confirm: Bevestigen
       create_block: gebruiker blokkeren
       created from: "Aangemaakt door:"
       deactivate_user: gebruiker inactief maken
-      delete image: Afbeelding verwijderen
       delete_user: gebruiker verwijderen
       description: Beschrijving
       diary: dagboek
@@ -1435,7 +1460,7 @@ nl:
       email address: "E-mailadres:"
       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 ver"
+      km away: "{{count}} km verwijderd"
       m away: "{{count}} m verwijderd"
       mapper since: "Mapper sinds:"
       moderator_history: ingesteld blokkades bekijken
@@ -1443,12 +1468,11 @@ nl:
       my edits: mijn bewerkingen
       my settings: mijn instellingen
       my traces: mijn tracks
-      my_oauth_details: Mijn OAuth-gegevens bekijken
+      nearby users: Andere dichtbijzijnde gebruikers
-      nearby users: "Dichtbijzijnde mappers:"
       new diary entry: nieuw dagboekbericht
       no friends: U hebt nog geen vrienden toegevoegd.
-      no home location: Geen thuislocatie ingesteld.
+      no nearby users: Er zijn geen andere gebruikers die hebben aangegeven in de buurt te mappen.
-      no nearby users: Er zijn geen dichtbijzijnde mappers.
+      oauth settings: Oauth-instellingen
       remove as friend: vriend verwijderen
       role: 
         administrator: Deze gebruiker is beheerder
@@ -1463,8 +1487,6 @@ nl:
       settings_link_text: voorkeuren
       traces: tracks
       unhide_user: gebruiker weer zichtbaar maken
-      upload an image: Afbeelding uploaden
-      user image heading: Gebruikersafbeelding
       user location: Gebruikerslocatie
       your friends: Uw vrienden
   user_block: 

config/locales/nn.yml

@@ -1,7 +1,9 @@
 # Messages for Norwegian Nynorsk (‪Norsk (nynorsk)‬)
 # Exported from translatewiki.net
 # Export driver: syck
+# Author: Eirik
 # Author: Gunnernett
+# Author: Nghtwlkr
 nn: 
   activerecord: 
     attributes: 
@@ -13,7 +15,75 @@ nn:
       friend: Ven
       user: Brukar
   browse: 
+    changeset_details: 
+      box: boks
     map: 
       deleted: Sletta
       larger: 
         area: Sjå området på eit større kart
+      loading: Lastar inn …
+    node: 
+      download_xml: Last ned XML
+      view_history: vis historikk
+    node_history: 
+      download_xml: Last ned XML
+    paging_nav: 
+      of: av
+    relation_details: 
+      members: "Medlemmar:"
+    relation_member: 
+      entry_role: "{{type}} {{name}} som {{role}}"
+      type: 
+        node: Punkt
+        relation: Relasjon
+        way: Veg
+    start_rjs: 
+      data_frame_title: Data
+      data_layer_name: Data
+      load_data: Last data
+      loading: Lastar...
+      object_list: 
+        back: Syn objektliste
+        details: Detaljer
+        heading: Objektliste
+      wait: Vent...
+    way: 
+      download: "{{download_xml_link}}, {{view_history_link}} eller {{edit_link}}"
+      download_xml: Last ned XML
+      edit: rediger
+      view_history: vis historikk
+      way: Veg
+      way_title: "Veg: {{way_name}}"
+    way_details: 
+      also_part_of: 
+        one: også del av vegen {{related_ways}}
+        other: også del av vegane {{related_ways}}
+      nodes: Punkt
+      part_of: "Del av:"
+    way_history: 
+      download_xml: Last ned XML
+      view_details: syn detaljer
+  geocoder: 
+    distance: 
+      one: omkring 1 km
+      other: omkring {{count}}km
+      zero: mindre enn 1 km
+  time: 
+    formats: 
+      friendly: "%e %B %Y kl %H:%M"
+  trace: 
+    edit: 
+      download: last ned
+    trace: 
+      count_points: "{{count}} punkt"
+      in: i
+      map: kart
+    view: 
+      download: last ned
+      filename: "Filnamn:"
+      map: kart
+      none: Inga
+      owner: "Eigar:"
+  user: 
+    account: 
+      image: "Bilete:"

config/locales/no.yml

@@ -75,6 +75,11 @@
       way: Vei
       way_node: Veinode
       way_tag: Veimerkelapp
+  application: 
+    require_cookies: 
+      cookies_needed: Du ser ut til å ha deaktivert informasjonskapsler. Aktiver informasjonskapsler i nettleseren din før du fortsetter.
+    setup_user_auth: 
+      blocked: Din tilgang til API-et er blokkert. Logg inn på nettstedet for å finne ut mer.
   browse: 
     changeset: 
       changeset: "Endringssett: {{id}}"
@@ -315,12 +320,18 @@
       recent_entries: "Nye oppføringer i dagboka:"
       title: Brukernes dagbøker
       user_title: Dagboken for {{user}}
+    location: 
+      edit: Rediger
+      location: "Posisjon:"
+      view: Vis
     new: 
       title: Ny dagbokoppføring
     no_such_entry: 
+      body: Det er ingen dagbokinnlegg eller kommentar med ID {{id}}. Sjekk om du har skrevet feil eller om lenka du klikket er feil.
       heading: Ingen oppføring med {{id}}
       title: Ingen slik dagbokoppføring
     no_such_user: 
+      body: Beklager, det finnes ingen bruker med navnet {{user}}. Vennligst sjekk at du har stavet riktig, eller kanskje lenken du fulgte er feil.
       heading: Brukeren {{user}} finnes ikke
       title: Ingen bruker funnet
     view: 
@@ -352,6 +363,9 @@
       output: Utdata
       paste_html: Lim inn HTML som skal bygges inn i nettsted
       scale: Skala
+      too_large: 
+        body: Dette området er for stort for å bli eksportert som OpenStreetMap XML-data. Zoom inn eller velg et mindre område.
+        heading: For stort område
       zoom: Zoom
     start_rjs: 
       add_marker: Legg til en markør på kartet
@@ -366,6 +380,7 @@
       title: 
         geonames: Posisjon fra <a href="http://www.geonames.org/">GeoNames</a>
         osm_namefinder: "{{types}} fra <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
+        osm_nominatim: Sted fra <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
       types: 
         cities: Byer
         places: Steder
@@ -394,6 +409,7 @@
         geonames: Resultat fra <a href="http://www.geonames.org/">GeoNames</a>
         latlon: Resultat fra <a href="http://openstreetmap.org/">Internt</a>
         osm_namefinder: Resultat fra <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        osm_nominatim: Resultat fra <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
         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: 
@@ -409,23 +425,27 @@
           bank: Bank
           bar: Bar
           bench: Benk
+          bicycle_parking: Sykkelparkering
           bicycle_rental: Sykkelutleie
           brothel: Bordell
           bureau_de_change: Vekslingskontor
           bus_station: Busstasjon
           cafe: Kafé
           car_rental: Bilutleie
+          car_sharing: Bildeling
           car_wash: Bilvask
           casino: Kasino
           cinema: Kino
           clinic: Klinikk
           club: Klubb
           college: Høyskole
+          courthouse: Rettsbygning
           crematorium: Krematorium
           dentist: Tannlege
           doctors: Leger
           dormitory: Sovesal
           drinking_water: Drikkevann
+          driving_school: Kjøreskole
           embassy: Ambassade
           emergency_phone: Nødtelefon
           fast_food: Hurtigmat
@@ -444,6 +464,7 @@
           library: Bibliotek
           market: Marked
           marketplace: Markedsplass
+          mountain_rescue: Fjellredning
           nightclub: Nattklubb
           office: Kontor
           park: Park
@@ -457,9 +478,14 @@
           prison: Fengsel
           pub: Pub
           public_building: Offentlig bygning
+          reception_area: Oppsamlingsområde
+          recycling: Resirkuleringspunkt
           restaurant: Restaurant
           retirement_home: Gamlehjem
+          sauna: Sauna
           school: Skole
+          shop: Butikk
+          shopping: Handel
           studio: Studio
           supermarket: Supermarked
           taxi: Drosje
@@ -467,6 +493,8 @@
           theatre: Teater
           toilets: Toaletter
           townhall: Rådhus
+          university: Universitet
+          vending_machine: Vareautomat
           veterinary: Veterinærklinikk
           wifi: WiFi-tilgangspunkt
           youth_centre: Ungdomssenter
@@ -480,6 +508,7 @@
           church: Kirke
           city_hall: Rådhus
           dormitory: Sovesal
+          entrance: Bygningsinngang
           farm: Gårdsbygg
           flats: Leiligheter
           garage: Garasje
@@ -501,11 +530,25 @@
           "yes": Bygning
         highway: 
           bus_stop: Busstopp
+          construction: Motorvei under konstruksjon
           cycleway: Sykkelsti
+          distance_marker: Avstandsmarkør
           motorway: Motorvei
+          motorway_junction: Motorveikryss
+          path: Sti
           pedestrian: Gangvei
+          primary: Primær vei
+          primary_link: Primær vei
           road: Vei
+          secondary: Sekundær vei
+          secondary_link: Sekundær vei
           steps: Trapper
+          tertiary: Tertiær vei
+          track: Sti
+          trunk: Hovedvei
+          trunk_link: Hovedvei
+          unclassified: Uklassifisert vei
+          unsurfaced: Vei uten dekke
         historic: 
           archaeological_site: Arkeologisk plass
           battlefield: Slagmark
@@ -541,64 +584,92 @@
           park: Park
           quarry: Steinbrudd
           railway: Jernbane
+          recreation_ground: Idrettsplass
           reservoir: Reservoar
           residential: Boligområde
           vineyard: Vingård
           wetland: Våtland
           wood: Skog
         leisure: 
+          beach_resort: Strandsted
+          common: Allmenning
           fishing: Fiskeområde
           garden: Hage
           golf_course: Golfbane
           ice_rink: Skøytebane
+          marina: Båthavn
           miniature_golf: Minigolf
           nature_reserve: Naturreservat
           park: Park
           playground: Lekeplass
+          recreation_ground: Idrettsplass
+          slipway: Slipp
           sports_centre: Sportssenter
           stadium: Stadion
           swimming_pool: Svømmebaseng
+          track: Løpebane
           water_park: Vannpark
         natural: 
+          bay: Bukt
           beach: Strand
+          cape: Nes
           cave_entrance: Huleinngang
           channel: Kanal
           cliff: Klippe
           coastline: Kystlinje
           crater: Krater
+          feature: Egenskap
+          fell: Fjellskrent
           fjord: Fjord
           geyser: Geysir
           glacier: Isbre
+          heath: Vidde
+          hill: Ås
           island: Øy
+          land: Land
+          marsh: Sump
+          moor: Myr
           mud: Gjørme
           peak: Topp
+          point: Punkt
           reef: Rev
+          ridge: Rygg
           river: Elv
           rock: Stein
+          scree: Ur
           scrub: Kratt
+          shoal: Grunning
           spring: Kilde
+          strait: Stred
           tree: Tre
           valley: Dal
           volcano: Vulkan
           water: Vann
+          wetland: Våtmark
           wetlands: Våtland
           wood: Skog
         place: 
           airport: Flyplass
           city: By
           country: Land
+          county: Fylke
           farm: Gård
+          hamlet: Grend
           house: Hus
           houses: Hus
           island: Øy
           islet: Holme
+          locality: Plass
+          moor: Myr
           municipality: Kommune
           postcode: Postnummer
           region: Område
           sea: Hav
+          state: Delstat
           subdivision: Underavdeling
           suburb: Forstad
           town: Tettsted
+          village: Landsby
         railway: 
           abandoned: Forlatt jernbane
           construction: Jernbane under konstruksjon
@@ -606,10 +677,13 @@
           disused_station: Nedlagt jernbanestasjon
           halt: Togstopp
           historic_station: Historisk jernbanestasjon
+          junction: Jernbanekryss
           platform: Jernbaneperrong
           station: Jernbanestasjon
           subway: T-banestasjon
           subway_entrance: T-baneinngang
+          tram: Sporvei
+          tram_stop: Trikkestopp
         shop: 
           alcohol: Utenfor lisens
           art: Kunstbutikk
@@ -675,13 +749,16 @@
           alpine_hut: Fjellhytte
           artwork: Kunstverk
           attraction: Attraksjon
+          bed_and_breakfast: Bed and Breakfast
           cabin: Hytte
           camp_site: Teltplass
           caravan_site: Campingplass
+          chalet: Fjellhytte
           guest_house: Gjestehus
           hostel: Vandrerhjem
           hotel: Hotell
           information: Informasjon
+          lean_to: Lenne inntil
           motel: Motell
           museum: Museum
           picnic_site: Piknikplass
@@ -693,8 +770,10 @@
           canal: Kanal
           dam: Demning
           ditch: Grøft
+          mooring: Fortøyning
           rapids: Stryk
           river: Elv
+          riverbank: Elvebredd
           stream: Strøm
           waterfall: Foss
   javascripts: 
@@ -702,19 +781,24 @@
       base: 
         cycle_map: Sykkelkart
         noname: IntetNavn
+    site: 
+      edit_disabled_tooltip: Zoom inn for å redigere kartet
+      edit_tooltip: Rediger kartet
+      edit_zoom_alert: Du må zoome inn for å redigere kartet
+      history_disabled_tooltip: Zoom inn for å vise redigeringer i dette området
+      history_tooltip: Vis redigeringer for dette området
+      history_zoom_alert: Du må zoome inn for å vise redigeringer i dette området
   layouts: 
     donate: Støtt OpenStreetMap ved {{link}} til Hardware Upgrade Fund (et fond for maskinvareoppgraderinger).
     donate_link_text: donering
     edit: Rediger
-    edit_tooltip: Rediger kart
     export: Eksporter
     export_tooltip: Eksporter kartdata
     gps_traces: GPS-spor
-    gps_traces_tooltip: Behandle spor
+    gps_traces_tooltip: Behandle GPS-spor
     help_wiki: Hjelp &amp; Wiki
     help_wiki_tooltip: Hjelp- &amp; Wiki-side for prosjektet
     history: Historikk
-    history_tooltip: Historikk for endringssett
     home: hjem
     home_tooltip: Gå til hjemmeposisjon
     inbox: innboks ({{count}})
@@ -749,13 +833,9 @@
     user_diaries: Brukerdagbok
     user_diaries_tooltip: Vis brukerens dagbok
     view: Vis
-    view_tooltip: Vis kart
+    view_tooltip: Vis kartet
     welcome_user: Velkommen, {{user_link}}
     welcome_user_link_tooltip: Din brukerside
-  map: 
-    coordinates: "Koordinater:"
-    edit: Rediger
-    view: Vis
   message: 
     delete: 
       deleted: Melding slettet
@@ -786,10 +866,14 @@
       send_message_to: Send en ny melding til {{name}}
       subject: Emne
       title: Send melding
+    no_such_message: 
+      body: Det er ingen melding med den ID-en.
+      heading: Ingen melding funnet
+      title: Ingen melding funnet
     no_such_user: 
-      body: Det er ingen bruker eller melding med det navnet eller den id-en
+      body: Det er ingen bruker med det navnet.
-      heading: Ingen bruker eller melding funnet
+      heading: Ingen bruker funnet
-      title: Ingen bruker eller melding funnet
+      title: Ingen bruker funnet
     outbox: 
       date: Dato
       inbox: innboks
@@ -813,6 +897,9 @@
       title: Les melding
       to: Til
       unread_button: Marker som ulest
+      wrong_user: Du er logget inn som «{{user}}», men meldingen du ønsker å lese ble ikke sendt til den brukeren. Logg inn som korrekt bruker for å lese.
+    reply: 
+      wrong_user: Du er logget inn som «{{user}}», men meldingen du ønsker å svare på ble ikke sendt til den brukeren. Logg inn som korrekt bruker for å svare.
     sent_message_summary: 
       delete_button: Slett
   notifier: 
@@ -833,8 +920,9 @@
       hopefully_you_1: Noen (forhåpentligvis deg) ønsker å endre e-postadressen for
       hopefully_you_2: "{{server_url}} til {{new_address}}."
     friend_notification: 
+      befriend_them: Du kan også legge dem til som venn på {{befriendurl}}.
       had_added_you: "{{user}} har lagt deg til som venn på OpenStreetMap."
-      see_their_profile: Du kan se profilen deres på {{userurl}} og legge dem til som venn også om du vil det.
+      see_their_profile: Du kan se profilen deres på {{userurl}}.
       subject: "[OpenStreetMap] {{user}} la deg til som en venn"
     gpx_notification: 
       and_no_tags: og ingen merkelapper.
@@ -846,6 +934,7 @@
         subject: "[OpenStreetMap] Feil under import av GPX"
       greeting: Hei,
       success: 
+        loaded_successfully: lastet med {{trace_points}} av {{possible_points}} mulige punkter.
         subject: "[OpenStreetMap] Vellykket import av GPX"
       with_description: med beskrivelse
       your_gpx_file: Det ser ut som GPX-filen din
@@ -859,6 +948,7 @@
       click_the_link: Om dette er deg, vennligst klikk på lenken under for å tilbakestille passordet.
       greeting: Hei,
       hopefully_you_1: Noen (muligens deg) har bedt om å tilbakestille passordet på denne
+      hopefully_you_2: e-postadressser for openstreetmap.org-konto.
     message_notification: 
       footer1: Du kan også lese meldingen på {{readurl}}
       footer2: og du kan svare til {{replyurl}}
@@ -868,23 +958,31 @@
     signup_confirm: 
       subject: "[OpenStreetMap] Bekreft din e-postadresse"
     signup_confirm_html: 
+      click_the_link: Hvis dette er deg, så er du velkommen! Klikke lenka nedenfor for å bekrefte kontoen og les videre for mer informasjon om OpenStreetMap
       current_user: En liste over nåværende brukere i kategorier, basert på hvor i verden de er, er tilgjengelig fra <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
+      get_reading: Start å lese om OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">på wikien</a>, få med deg de siste nyhetene via  <a href="http://blog.openstreetmap.org/">OpenStreetMap-bloggen</a> eller <a href="http://twitter.com/openstreetmap">Twitter</a>. Eller bla gjennom OpenStreetMaps grunnlegger Steve Coasts <a href="http://www.opengeodata.org/">OpenGeoData-blogg</a> for hele historien til prosjektet, som også har <a href="http://www.opengeodata.org/?cat=13">engelske podkaster</a> du kan lytte til.
       greeting: Hei der!
+      hopefully_you: Noen (forhåpentligvis deg) ønsker å opprette en konto på
       introductory_video: Du kan se en {{introductory_video_link}}.
       more_videos: Det er {{more_videos_link}}.
       more_videos_here: flere videoer her
+      user_wiki_page: Det anbefales at du oppretter en brukerside på wiki-en som inkluderer kategorimerker som viser hvor du er, f.eks <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.
       video_to_openstreetmap: introduksjonsvideo til OpenStreetMap
       wiki_signup: Du vil kanskje <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">melde deg inn i OpenStreetMap-wikien</a> også.
     signup_confirm_plain: 
       blog_and_twitter: "Få med deg de siste nyhetene gjennom OpenStreetMap-bloggen eller Twitter:"
       click_the_link_1: Om dette er deg, velkommen! Vennligst klikk på lenken under for å bekrefte din
       click_the_link_2: konto og les videre for mer informasjon om OpenStreetMap.
+      current_user_1: En liste over nåværende brukere i kategorier, basert på hvor i verden
       current_user_2: "de er, er tilgjengelig fra:"
       greeting: Hei der!
+      hopefully_you: Noen (forhåpentligvis deg) ønsker å opprette en konto på
       introductory_video: "Du kan se en introduksjonsvideo for OpenStreetMap her:"
       more_videos: "Det er flere videoer her:"
+      opengeodata: "OpenGeoData.org er bloggen til OpenStreetMap-grunnlegger Steve Coast, og den har podcast-er også:"
       the_wiki: "Les mer om OpenStreetMap på wikien:"
-      user_wiki_1: Det anbefales at du oppretter en wikibrukerside som inkluderer
+      user_wiki_1: Det anbefales at du oppretter en brukerside på wiki-en som inkluderer
+      user_wiki_2: kategorimerker som viser hvor du er, f.eks [[Category:Users_in_London]].
       wiki_signup: "Du vil kanskje også melde deg inn i OpenStreetMap-wikien på:"
   oauth: 
     oauthorize: 
@@ -904,11 +1002,15 @@
       submit: Rediger
       title: Rediger ditt programvare
     form: 
+      allow_read_gpx: les deres private GPS-spor.
+      allow_read_prefs: les brukerinnstillingene deres.
       allow_write_api: endre kartet.
       allow_write_diary: opprett dagbokoppføringer, kommentarer og finn venner.
       allow_write_gpx: last opp GPS-spor.
+      allow_write_prefs: endre brukerinnstillingene deres.
       callback_url: "URL til sårbarhetsinformasjon:"
       name: Navn
+      requests: "Be om følgende tillatelser fra brukeren:"
       required: Påkrevet
       support_url: Støtte-URL
       url: "URL til sårbarhetsinformasjon:"
@@ -933,19 +1035,23 @@
       allow_write_diary: opprett dagbokoppføringer, kommentarer og finn venner.
       allow_write_gpx: last opp GPS-spor.
       allow_write_prefs: endre brukerinnstillingene deres.
-      authorize_url: "URL til sårbarhetsinformasjon:"
+      authorize_url: "Godkjenn URL:"
       edit: Rediger detaljer
       key: "Forbrukernøkkel:"
       requests: "Ber om følgende tillatelser fra brukeren:"
       secret: "Forbrukerhemmelighet:"
       support_notice: Vi støtter HMAC-SHA1 (anbefalt) så vel som ren tekst i ssl-modus.
       title: OAuth-detaljer for {{app_name}}
-      url: "URL til sårbarhetsinformasjon:"
+      url: "URL for forespørelsnøkkel:"
     update: 
       flash: Oppdaterte klientinformasjonen
   site: 
     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.
+      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}}.
+      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: 
       js_1: Du har en nettleser som ikke støtter JavaScript eller så har du slått av JavaScript.
@@ -1018,6 +1124,7 @@
           trunk: Hovedvei
           tunnel: Streket kant = tunnel
           unclassified: Uklassifisert vei
+          unsurfaced: Vei uten dekke
           wood: Ved
         heading: Legend for z{{zoom_level}}
     search: 
@@ -1029,6 +1136,9 @@
     sidebar: 
       close: Lukk
       search_results: Søkeresultater
+  time: 
+    formats: 
+      friendly: "%e %B %Y kl. %H:%M"
   trace: 
     create: 
       trace_uploaded: Din GPX-fil er last opp og venter på å bli satt inn i databasen. Dette skjer vanligvis innen en halvtime og en e-post blir sendt til deg når det er gjort.
@@ -1063,12 +1173,18 @@
       body: Beklager, det finnes ingen bruker med navnet {{user}}. Vennligst sjekk at du har stavet riktig, eller kanskje lenken du fulgte er feil.
       heading: Brukeren {{user}} finnes ikke
       title: Ingen bruker funnet
+    offline: 
+      heading: GPX-lagring er utilgjengelig
+      message: Systemet for opplasting og lagring av GPX-filer er ikke tilgjengelig for øyeblikket.
+    offline_warning: 
+      message: Systemet for opplasting av GPX-filer er ikke tilgjengelig for øyeblikket.
     trace: 
       ago: "{{time_in_words_ago}} siden"
       by: av
       count_points: "{{count}} punkter"
       edit: rediger
       edit_map: Rediger kart
+      identifiable: IDENTIFISERBAR
       in: i
       map: kart
       more: mer
@@ -1076,6 +1192,7 @@
       private: PRIVAT
       public: OFFENTLIG
       trace_details: Vis detaljer for spor
+      trackable: SPORBAR
       view_map: Vis kart
     trace_form: 
       description: Beskrivelse
@@ -1124,26 +1241,33 @@
   user: 
     account: 
       current email address: "Nåværende e-postadresse:"
+      delete image: Fjern gjeldende bilde
       email never displayed publicly: " (vis aldri offentlig)"
       flash update success: Brukerinformasjon oppdatert.
       flash update success confirm needed: Brukerinformasjon oppdatert. Sjekk eposten din for å bekrefte din epostadresse.
       home location: "Hjemmeposisjon:"
+      image: "Bilde:"
+      image size hint: (kvadratiske bilder som er minst 100x100 fungerer best)
+      keep image: Behold gjeldende bilde
       latitude: "Breddegrad:"
       longitude: "Lengdegrad:"
       make edits public button: Gjør alle mine redigeringer offentlig
       my settings: Mine innstillinger
       new email address: "Ny e-postadresse:"
+      new image: Legg til et bilde
       no home location: Du har ikke skrevet inn din hjemmelokasjon.
       preferred languages: "Foretrukne språk:"
       profile description: "Profilbeskrivelse:"
       public editing: 
         disabled: Deaktivert og kan ikke redigere data. Alle tidligere redigeringer er anonyme.
         disabled link text: hvorfor can jeg ikke redigere?
+        enabled: Aktivert. Ikke anonym og kan redigere data.
         enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: hva er dette?
         heading: "Offentlig redigering:"
       public editing note: 
         heading: Offentlig redigering
+      replace image: Erstatt gjeldende bilde
       return to profile: Returner til profil
       save changes button: Lagre endringer
       title: Rediger konto
@@ -1162,9 +1286,6 @@
       success: E-postadressen din er bekreftet - takk for at du registrerte deg.
     filter: 
       not_an_administrator: Du må være administrator for å gjøre det.
-    friend_map: 
-      nearby mapper: "Bruker i nærheten: [[nearby_user]]"
-      your location: Din posisjon
     go_public: 
       flash success: Alle dine redigeringer er nå offentlig, og du har lov til å redigere.
     login: 
@@ -1177,7 +1298,12 @@
       lost password link: Mistet passordet ditt?
       password: "Passord:"
       please login: Logg inn eller {{create_user_link}}.
+      remember: "Huske meg:"
       title: Logg inn
+    logout: 
+      heading: Logg ut fra OpenStreetMap
+      logout_button: Logg ut
+      title: Logg ut
     lost_password: 
       email address: "E-postadresse:"
       heading: Glemt passord?
@@ -1193,17 +1319,27 @@
     new: 
       confirm email address: "Bekreft e-postadresse:"
       confirm password: "Bekreft passord:"
+      contact_webmaster: Kontakt <a href="mailto:webmaster@openstreetmap.org">webmaster</a> for å opprette en konto. Vi vil prøve å behandle forespørselen så fort som mulig.
       display name: "Visningsnavn:"
       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).
       heading: Opprett en brukerkonto
+      license_agreement: Ved å opprette en konto, godtar du at alle data du sender inn til OpenStreetMap-prosjektet vil bli (ikke-eksklusivt) lisensiert under <a href="http://creativecommons.org/licenses/by-sa/2.0/">denne Creative Commons-lisensen (by-sa)</a>.
+      no_auto_account_create: Beklageligvis kan vi for øyeblikket ikke opprette en konto for deg automatisk.
+      not displayed publicly: Ikke vist offentlig (se <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="Personvernpolitikk for Wiki-en inklusiv avsnitt om e-postadressser">vår personvernpolitikk</a>)
       password: "Passord:"
       signup: Registrering
       title: Opprett konto
     no_such_user: 
+      body: Det er ingen bruker med navnet {{user}}. Sjekk om du har skrevet navnet feil eller om lenka du klikket er feil.
       heading: Brukeren {{user}} finnes ikke
       title: Ingen bruker funnet
+    popup: 
+      friend: Venn
+      nearby mapper: Bruker i nærheten
+      your location: Din posisjon
     remove_friend: 
       not_a_friend: "{{name}} er ikke en av dine venner."
       success: "{{name}} ble fjernet fra dine venner"
@@ -1220,23 +1356,21 @@
     view: 
       activate_user: aktiver denne brukeren
       add as friend: legg til som en venn
-      add image: Legg til bilde
       ago: ({{time_in_words_ago}} siden)
       block_history: vis mottatte blokkeringer
       blocks by me: blokkeringer utført av meg
       blocks on me: mine blokkeringer
-      change your settings: endre dine innstillinger
       confirm: Bekreft
       create_block: blokker denne brukeren
       created from: "Opprettet fra:"
       deactivate_user: deaktiver denne brukeren
-      delete image: Slett bilde
       delete_user: slett denne brukeren
       description: Beskrivelse
       diary: dagbok
       edits: redigeringer
       email address: "E-postadresse:"
       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"
       m away: "{{count}}m unna"
       mapper since: "Bruker siden:"
@@ -1245,12 +1379,11 @@
       my edits: mine redigeringer
       my settings: mine innstillinger
       my traces: mine spor
-      my_oauth_details: Vis mine OAuth-detaljer
+      nearby users: Andre nærliggende brukere
-      nearby users: "Næreliggende brukere:"
       new diary entry: ny dagbokoppføring
       no friends: Du har ikke lagt til noen venner ennå.
-      no home location: Ingen hjemmelokasjon satt.
+      no nearby users: Det er ingen andre brukere som innrømmer kartlegging i ditt område ennå.
-      no nearby users: Det er ingen brukere som innrømmer kartlegging i ditt område ennå.
+      oauth settings: oauth-innstillinger
       remove as friend: fjern som venn
       role: 
         administrator: Denne brukeren er en administrator
@@ -1265,8 +1398,6 @@
       settings_link_text: innstillinger
       traces: spor
       unhide_user: stopp å skjule denne brukeren
-      upload an image: Last opp et bilde
-      user image heading: Brukerbilde
       user location: Brukerens posisjon
       your friends: Dine venner
   user_block: 
@@ -1276,6 +1407,7 @@
       title: Blokkeringer av {{name}}
     blocks_on: 
       empty: "{{name}} har ikke blitt blokkert ennå."
+      heading: Liste over blokkeringer av {{name}}
       title: Blokkeringer av {{name}}
     create: 
       flash: Opprettet en blokkering av bruker {{name}}.
@@ -1284,6 +1416,8 @@
     edit: 
       back: Vis alle blokkeringer
       heading: Endrer blokkering av {{name}}
+      needs_view: Må brukeren logge inn før denne blokkeringen blir fjernet?
+      period: Hvor lenge, fra nå, brukeren vil bli blokkert fra API-en.
       reason: Årsaken til hvorfor {{name}} blir blokkert. Vennligst vær så rolig og rimelig som mulig og oppgi så mange detaljer du kan om situasjonen. Husk at ikke alle brukere forstår felleskapssjargongen så prøv å bruke lekmannsuttrykk.
       show: Vis denne blokkeringen
       submit: Oppdater blokkering
@@ -1306,6 +1440,8 @@
     new: 
       back: Vis alle blokkeringer
       heading: Oppretter blokkering av {{name}}
+      needs_view: Brukeren må logge inn før denne blokkeringen blir fjernet.
+      period: Hvor lenge, fra nå, brukeren vil bli blokkert fra API-en.
       reason: Årsaken til at {{name}} blir blokkert. Vennligst vær så rolig og rimelig som mulig og gi så mange detaljer du kan om situasjonen, og husk på at meldingen blir synlig for offentligheten. Husk på at ikke alle brukere forstår fellesskapssjargongen så prøv å bruke lekmannsuttrykk.
       submit: Opprett blokkering
       title: Oppretter blokkering av {{name}}
@@ -1313,6 +1449,7 @@
       tried_waiting: Jeg har gitt brukeren rimelig med tid til å svare på disse kommunikasjonene.
     not_found: 
       back: Tilbake til indeksen
+      sorry: Beklager, brukerblokkeringen med ID {{id}} ble ikke funnet.
     partial: 
       confirm: Er du sikker?
       creator_name: Opprettet av
@@ -1336,8 +1473,12 @@
       time_future: Denne blokkeringen ender i {{time}}
       title: Tilbakekaller blokkering på {{block_on}}
     show: 
+      back: Vis alle blokkeringer
       confirm: Er du sikker?
       edit: Rediger
+      heading: "{{block_on}} blokkert av {{block_by}}"
+      needs_view: Brukeren må logge inn før denne blokkeringen blir fjernet.
+      reason: "Årsak for blokkering:"
       revoke: Tilbakekall!
       show: Vis
       status: Status

config/locales/pl.yml

@@ -323,6 +323,10 @@ pl:
       recent_entries: "Ostatnie wpisy do dziennika:"
       title: Dzienniki użytkowników
       user_title: Dziennik dla {{user}}
+    location: 
+      edit: Edytuj
+      location: "Położenie:"
+      view: Podgląd
     new: 
       title: Nowy wpis do dziennika
     no_such_entry: 
@@ -859,15 +863,13 @@ pl:
     donate: Wspomóż Projekt OpenStreetMap {{link}} na Konto Aktualizacji Naszego Sprzętu.
     donate_link_text: dokonując darowizny
     edit: Edycja
-    edit_tooltip: Edycja mapy
     export: Eksport
     export_tooltip: Eksport danych mapy
     gps_traces: Ślady GPS
-    gps_traces_tooltip: Zarządzaj śladami
+    gps_traces_tooltip: Zarządzanie śladami GPS
     help_wiki: Pomoc & Wiki
     help_wiki_tooltip: Pomoc i strony Wiki projektu
     history: Zmiany
-    history_tooltip: Historia zestawów zmian
     home: główna
     home_tooltip: Przejdź do strony głównej
     inbox: poczta ({{count}})
@@ -905,10 +907,6 @@ pl:
     view_tooltip: Zobacz mapę
     welcome_user: Witaj, {{user_link}}
     welcome_user_link_tooltip: Strona użytkownika
-  map: 
-    coordinates: "Współrzędne:"
-    edit: Edycja
-    view: Mapa
   message: 
     delete: 
       deleted: Wiadomość usunięta
@@ -1155,7 +1153,7 @@ pl:
           tunnel: Kreskowany obrys – tunel
           unclassified: Drogi niesklasyfikowane
           unsurfaced: Droga nieutwardzona
-          wood: Las
+          wood: Puszcza
         heading: Legenda dla przybliżenia {{zoom_level}}
     search: 
       search: Szukaj
@@ -1268,15 +1266,18 @@ pl:
   user: 
     account: 
       current email address: "Aktualny adres e-mail:"
+      delete image: Usuń obecną grafikę
       email never displayed publicly: (nie jest wyświetlany publicznie)
       flash update success: Zaktualizowano profil użytkownika.
       flash update success confirm needed: Zaktualizowano profil użytkownika.  Sprawdź czy przyszedł już mail potwierdzający nowy adres mailowy.
       home location: "Lokalizacja domowa:"
+      image: "Grafika:"
       latitude: "Szerokość:"
       longitude: "Długość geograficzna:"
       make edits public button: Niech wszystkie edycje będą publiczne.
       my settings: Moje ustawienia
       new email address: "Nowy adres e-mail:"
+      new image: Dodaj grafikę
       no home location: Nie wpisałeś swojej lokalizacji domowej.
       preferred languages: "Preferowane Języki:"
       profile description: "Opis profilu:"
@@ -1290,6 +1291,7 @@ pl:
       public editing note: 
         heading: Publiczna edycja
         text: Obecnie twoje edycje są anonimowe i ludzie nie mogą wysyłać do ciebie wiadomości lub zobaczyć twojej lokalizacji. Aby pokazać, co edytowałeś i umożliwić ludziom kontakt z Tobą za pośrednictwem strony internetowej, kliknij przycisk poniżej. <b>W międzyczasie API 0.6 zmienił się, jedynie publiczni użytkownicy mogą edytować dane mapy. </b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">dowiedz się dlaczego</a>).<ul><li>Twój adres e-mail nie zostanie ujawniony przez stawanie się publicznym. Tej akcji nie można cofnąć i wszyscy nowi użytkownicy są już domyślnie publiczni.</ul></li>
+      replace image: Zmień obecną grafikę
       return to profile: Powrót do profilu.
       save changes button: Zapisz zmiany
       title: Zmiana ustawień konta
@@ -1308,9 +1310,6 @@ pl:
       success: Twój nowy adres został zatwierdzony, cieszymy się że do nas dołączyłeś!
     filter: 
       not_an_administrator: Musisz mieć uprawnienia administratora do wykonania tego działania.
-    friend_map: 
-      nearby mapper: "Mapowicz z okolicy: [[nearby_user]]"
-      your location: Twoje położenie
     go_public: 
       flash success: Wszystkie Twoje modyfikacje są od teraz publiczne i jesteś uprawniony/a do edycji.
     login: 
@@ -1356,6 +1355,9 @@ pl:
       body: Niestety nie znaleziono użytkownika o nazwie {{user}}, sprawdź pisownię.  Być może użyłeś(aś) linku który był niepoprawny.
       heading: Użytkownik{{user}} nie istnieje
       title: Nie znaleziono użytkownika
+    popup: 
+      nearby mapper: Mapowicz z okolicy
+      your location: Twoje położenie
     remove_friend: 
       not_a_friend: "{{name}} nie był Twoim znajomym."
       success: "{{name}} został wyłączony z grona Twoich znajomych."
@@ -1372,17 +1374,14 @@ pl:
     view: 
       activate_user: aktywuj tego użytkownika
       add as friend: dodaj do znajomych
-      add image: Dodaj zdjęcie
       ago: ({{time_in_words_ago}} temu)
       block_history: otrzymane blokady
       blocks by me: nałożone blokady
       blocks on me: otrzymane blokady
-      change your settings: zmień swoje ustawienia
       confirm: Potwierdź
       create_block: zablokuj tego użytkownika
       created from: "Stworzony z:"
       deactivate_user: dezaktywuj tego użytkownika
-      delete image: Usuń zdjęcie
       delete_user: usuń to konto
       description: Opis
       diary: dziennik
@@ -1398,12 +1397,11 @@ pl:
       my edits: moje zmiany
       my settings: moje ustawienia
       my traces: moje ślady
-      my_oauth_details: Pokaż moje szczegóły OAuth
+      nearby users: Najbliżsi użytkownicy
-      nearby users: "Najbliżsi użytkownicy:"
       new diary entry: nowy wpis w dzienniku
       no friends: Nie dodałeś/aś jeszcze żadnych znajomych.
-      no home location: Lokalizacja domowa nie została podana.
       no nearby users: Nikt nie przyznał się jeszcze do mapowania w tej okolicy.
+      oauth settings: ustawienia oauth
       remove as friend: usuń ze znajomych
       role: 
         administrator: Ten użytkownik jest administratorem
@@ -1418,8 +1416,6 @@ pl:
       settings_link_text: stronie ustawień
       traces: ślady
       unhide_user: odkryj tego użytkownika
-      upload an image: Wgraj zdjęcie
-      user image heading: Zdjęcie użytkownika
       user location: Lokalizacja użytkownika
       your friends: Twoi znajomi
   user_block: 

config/locales/ps.yml

@@ -10,6 +10,7 @@ ps:
         title: سرليک
         user: کارن
       friend: 
+        friend: ملګری
         user: کارن
       message: 
         title: سرليک
@@ -29,5 +30,172 @@ ps:
   browse: 
     map: 
       deleted: ړنګ شو
-  map: 
+    node: 
+      edit: سمول
+      view_history: پېښليک کتل
+    node_details: 
+      coordinates: "کوارډيناټونه:"
+    not_found: 
+      type: 
+        way: لار
+    relation_details: 
+      members: "غړي:"
+    relation_member: 
+      type: 
+        way: لار
+    start_rjs: 
+      object_list: 
+        type: 
+          way: لار
+    timeout: 
+      type: 
+        way: لار
+    way: 
+      edit: سمول
+      view_history: پېښليک کتل
+      way: لار
+  changeset: 
+    changesets: 
+      user: کارن
+  diary_entry: 
+    edit: 
+      language: "ژبه:"
+      save_button: خوندي کول
+      use_map_link: نخشه کارول
+    location: 
+      edit: سمول
+      view: کتل
+    view: 
+      login: ننوتل
+      save_button: خوندي کول
+  geocoder: 
+    description: 
+      types: 
+        cities: ښارونه
+        towns: ښارګوټي
+    direction: 
+      east: ختيځ
+      north: سهېل
+      north_east: سهېل-ختيځ
+      north_west: سهېل-لوېديځ
+      south: سوېل
+      south_east: سوېل-ختيځ
+      south_west: سوېل-لوېديځ
+      west: لوېديځ
+    search_osm_nominatim: 
+      prefix: 
+        amenity: 
+          bank: بانک
+          clinic: کلينيک
+          college: پوهنځی
+          embassy: سفارت
+          hospital: روغتون
+          hotel: هوټل
+          park: پارک
+          pharmacy: درملتون
+          police: پوليس
+          school: ښوونځی
+          shop: هټۍ
+          theatre: نندارتون
+        building: 
+          hotel: هوټل
+          shop: هټۍ
+          stadium: لوبغالی
+          tower: برج
+        highway: 
+          bus_stop: تمځای
+          road: واټ
+        historic: 
+          castle: ماڼۍ
+          church: کليسا
+          house: کور
+          museum: موزيم
+          tower: برج
+        landuse: 
+          cemetery: هديره
+          forest: ځنګل
+          park: پارک
+        leisure: 
+          park: پارک
+        natural: 
+          hill: غونډۍ
+          island: ټاپو
+          peak: څوکه
+          tree: ونه
+          valley: دره
+          water: اوبه
+        place: 
+          airport: هوايي ډګر
+          city: ښار
+          country: هېواد
+          farm: فارم
+          house: کور
+          houses: کورونه
+          island: ټاپو
+          region: سيمه
+          town: ښارګوټی
+          village: کلی
+        shop: 
+          bakery: بټيارۍ
+          gallery: ګالېري
+        tourism: 
+          guest_house: مېلمستون
+          hostel: ليليه
+          hotel: هوټل
+          information: مالومات
+          museum: موزيم
+          picnic_site: مېله ځای
+          valley: دره
+          zoo: ژوبڼ
+  layouts: 
+    home: کور
+    intro_3_partners: ويکي
+    log_in: ننوتل
+    shop: هټۍ
     view: کتل
+  message: 
+    inbox: 
+      date: نېټه
+    outbox: 
+      date: نېټه
+  site: 
+    search: 
+      submit_text: ورځه
+    sidebar: 
+      close: تړل
+  trace: 
+    edit: 
+      edit: سمول
+      filename: "د دوتنې نوم:"
+      map: نخشه
+      save_button: بدلونونه خوندي کول
+    trace: 
+      edit: سمول
+      map: نخشه
+      view_map: نخشه کتل
+    view: 
+      edit: سمول
+      filename: "د دوتنې نوم:"
+      map: نخشه
+      none: هېڅ
+  user: 
+    account: 
+      image: "انځور:"
+    login: 
+      heading: ننوتل
+      login_button: ننوتل
+      password: "پټنوم:"
+      title: ننوتل
+    logout: 
+      logout_button: وتل
+      title: وتل
+    new: 
+      email address: "برېښليک پته:"
+      password: "پټنوم:"
+    popup: 
+      friend: ملګری
+    reset_password: 
+      password: "پټنوم:"
+    view: 
+      email address: "برېښليک پته:"
+      send message: پيغام لېږل

config/locales/pt-BR.yml

@@ -329,6 +329,10 @@ pt-BR:
       recent_entries: "Entradas recentes no Diário:"
       title: Diários dos Usuários
       user_title: Diário de {{user}}
+    location: 
+      edit: Editar
+      location: "Local:"
+      view: Exibir
     new: 
       title: Nova Entrada de Diário
     no_such_entry: 
@@ -368,6 +372,9 @@ pt-BR:
       output: Saída
       paste_html: Cole o HTML para publicar no site
       scale: Escala
+      too_large: 
+        body: Esta área é muito grande para ser exportada como dados XML do OpenStreetMap. Por gentileza, aumente o zoom ou selecione uma área menor.
+        heading: Área muito grande
       zoom: Zoom
     start_rjs: 
       add_marker: Adicionar um marcador ao mapa
@@ -867,22 +874,24 @@ pt-BR:
       overlays: 
         maplint: Maplint
     site: 
+      edit_disabled_tooltip: Aumente o zoom para editar o mapa
+      edit_tooltip: Edite o mapa
       edit_zoom_alert: Você deve aumentar o zoom para editar o mapa
+      history_disabled_tooltip: Aumente o zoom para ver as edições desta área
+      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: 
     donate: "Ajude o OpenStreetMap fazendo doações para o Fundo de Upgrade de Hardware: {{link}}."
     donate_link_text: doando
     edit: Editar
-    edit_tooltip: Editar mapas
     export: Exportar
     export_tooltip: Exportar dados do mapa
     gps_traces: Trilhas GPS
-    gps_traces_tooltip: Gerenciar trilhas
+    gps_traces_tooltip: Gerenciar trilhas GPS
     help_wiki: Ajuda & Wiki
     help_wiki_tooltip: Ajuda & Wiki do projeto
     help_wiki_url: http://wiki.openstreetmap.org/wiki/Pt-br:Main_Page?uselang=pt-br
     history: Histórico
-    history_tooltip: Histórico de alterações
     home: início
     home_tooltip: Ir para a sua localização
     inbox: caixa de entrada ({{count}})
@@ -926,13 +935,9 @@ pt-BR:
     user_diaries: Diários de Usuário
     user_diaries_tooltip: Ver os diários dos usuários
     view: Ver
-    view_tooltip: Ver mapas
+    view_tooltip: Veja o mapa
     welcome_user: Bem vindo, {{user_link}}
     welcome_user_link_tooltip: Sua Página de usuário
-  map: 
-    coordinates: "Coordenadas:"
-    edit: Editar
-    view: Ver
   message: 
     delete: 
       deleted: Mensagem apagada
@@ -963,10 +968,14 @@ pt-BR:
       send_message_to: Enviar uma nova mensagem para {{name}}
       subject: Assunto
       title: Enviar mensagem
+    no_such_message: 
+      body: Desculpe, mas não existe uma mensagem com este id.
+      heading: Esta mensagem não existe
+      title: Esta mensagem não existe
     no_such_user: 
-      body: Me desculpe, não há nenhum usuário ou mensagem com esse nome ou id
+      body: Desculpe, mas não existe usuário com este nome.
-      heading: Não há tal usuário ou mensagem
+      heading: Este usuário não existe
-      title: Não existe usuário ou mensagem
+      title: Este usuário não existe
     outbox: 
       date: Data
       inbox: caixa de entrada
@@ -990,6 +999,9 @@ pt-BR:
       title: Ler Mensagem
       to: Para
       unread_button: Marcar como não lida
+      wrong_user: Você está conectado como `{{user}}' mas a mensagem que você quer ler não foi enviada para este usuário. Por gentileza, faça o login com o usuário correto para poder responder.
+    reply: 
+      wrong_user: Você está conectado como `{{user}}' mas a mensagem que você quer responder não foi enviada para este usuário. Por gentileza, faça o login com o usuário correto para poder responder.
     sent_message_summary: 
       delete_button: Apagar
   notifier: 
@@ -1010,8 +1022,9 @@ pt-BR:
       hopefully_you_1: Alguém (esperamos que você) quer alterar seu endereço de e-mail de
       hopefully_you_2: "{{server_url}} para {{new_address}}."
     friend_notification: 
+      befriend_them: Você também pode adicioná-lo como amigo em {{befriendurl}}.
       had_added_you: "{{user}} adicionou você como amigo no OpenStreetMap."
-      see_their_profile: Você pode ver seu perfil em {{userurl}} e adicioná-lo também se desejar.
+      see_their_profile: Você pode ver o perfil dele em {{userurl}}.
       subject: "[OpenStreetMap] {{user}} adicionou você como amigo"
     gpx_notification: 
       and_no_tags: e sem etiquetas.
@@ -1248,6 +1261,9 @@ pt-BR:
     sidebar: 
       close: Fechar
       search_results: Resultados da Busca
+  time: 
+    formats: 
+      friendly: "%e %B %E às %H:%M"
   trace: 
     create: 
       trace_uploaded: Seu arquivo GPX foi enviado e está aguardando para ser inserido no banco de dados. Isso normalmente leva meia hora, e um e-mail será enviado para você quando ocorrer.
@@ -1353,15 +1369,20 @@ pt-BR:
   user: 
     account: 
       current email address: "Endereço de e-mail atual:"
+      delete image: Remova a imagem atual
       email never displayed publicly: (nunca mostrado publicamente)
       flash update success: Informação de usuário atualizada com sucesso.
       flash update success confirm needed: Informação de usuário atualizada com sucesso. Verifique sua caixa de entrada do email para confirmar seu novo endereço.
       home location: "Localização:"
+      image: "Imagem:"
+      image size hint: (imagens quadradas, com pelo menos 100x100, funcionam melhor)
+      keep image: Mantenha a imagem atual
       latitude: "Latitude:"
       longitude: "Longitude:"
       make edits public button: Tornar todas as minhas edições públicas
       my settings: Minhas configurações
       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 languages: "Preferência de Idioma:"
       profile description: "Descrição do Perfil:"
@@ -1375,6 +1396,7 @@ pt-BR:
       public editing note: 
         heading: Edição pública
         text: Atualmente suas edições são anônimas e ninguém pode lhe enviar mensagens ou saber sua localização. Para mostrar o que você editou e permitir que pessoas entrem em contato através do website, clique no botão abaixo. <b>Desde as mudanças na API 0.6, apenas usuários públicos podem editar o mapa</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">Veja por quê</a>).<ul><li>O seu endereço de e-mail não será revelado para o público.</li><li>Esta ação não pode ser desfeita e todos os novos usuários são agora públicos por padrão.</li></ul>
+      replace image: Substitua a imagem atual
       return to profile: Retornar para o perfil
       save changes button: Salvar Mudanças
       title: Editar conta
@@ -1393,9 +1415,6 @@ pt-BR:
       success: Confirmamos seu endereço de email. Obrigado por se cadastrar!
     filter: 
       not_an_administrator: Você precisa ser um administrador para executar essa ação.
-    friend_map: 
-      nearby mapper: "Mapeador próximo: [[nearby_user]]"
-      your location: Sua localização
     go_public: 
       flash success: Todas as suas edições agora são públicas, e você está com permissão para edição.
     login: 
@@ -1408,7 +1427,12 @@ pt-BR:
       lost password link: Esqueceu sua senha?
       password: "Senha:"
       please login: Por favor entre as informações de sua conta para entrar, ou {{create_user_link}}.
+      remember: Lembrar neste computador
       title: Entrar
+    logout: 
+      heading: Sair do OpenStreetMap
+      logout_button: Sair
+      title: Sair
     lost_password: 
       email address: "Endereço de Email:"
       heading: Esqueceu sua senha?
@@ -1441,6 +1465,10 @@ pt-BR:
       body: Desculpe, não há nenhum usuário com o nome {{user}}. Por favor verifique se você digitou corretamente, ou talvez o link que você tenha clicado esteja errado.
       heading: O usuário {{user}} não existe
       title: Usuário não existe
+    popup: 
+      friend: Amigo
+      nearby mapper: Mapeador próximo
+      your location: Sua localização
     remove_friend: 
       not_a_friend: "{{name}} não é um de seus amigos."
       success: "{{name}} foi removido de seus amigos."
@@ -1457,17 +1485,14 @@ pt-BR:
     view: 
       activate_user: ativar este usuário
       add as friend: adicionar como amigos
-      add image: Adicionar Imagem
       ago: ({{time_in_words_ago}} atrás)
       block_history: ver bloqueios recebidos
       blocks by me: bloqueios em mim
       blocks on me: bloqueios sobre mim
-      change your settings: mudar suas configurações
       confirm: Confirmar
       create_block: bloquear este usuário
       created from: "Criado de:"
       deactivate_user: desativar este usuário
-      delete image: Apagar Imagem
       delete_user: excluir este usuário
       description: Descrição
       diary: diário
@@ -1483,12 +1508,11 @@ pt-BR:
       my edits: minhas edições
       my settings: minhas configurações
       my traces: minhas trilhas
-      my_oauth_details: Ver meus detalhes OAuth
+      nearby users: Outros usuários próximos
-      nearby users: "Usuários próximos:"
       new diary entry: nova entrada de diário
       no friends: Você ainda não adicionou amigos.
-      no home location: Nenhuma localização foi definida.
+      no nearby users: Ainda não há outros usuários mapeando por perto.
-      no nearby users: Não existem usuários mapeando por perto.
+      oauth settings: configurações do oauth
       remove as friend: remover da lista de amigos
       role: 
         administrator: Este usuário é um administrador
@@ -1503,8 +1527,6 @@ pt-BR:
       settings_link_text: configurações
       traces: trilhas
       unhide_user: mostrar esse usuário
-      upload an image: Enviar uma Imagem
-      user image heading: Imagem do usuário
       user location: Local do usuário
       your friends: Seus amigos
   user_block: 

config/locales/pt.yml

@@ -98,6 +98,13 @@ pt:
       view_details: ver detalhes
       way_history: Histórico do Trajeto
       way_history_title: "Histórico do Trajeto: {{way_name}}"
+  geocoder: 
+    search_osm_nominatim: 
+      prefix: 
+        historic: 
+          ruins: Ruínas
+        railway: 
+          funicular: Funicular
   notifier: 
     email_confirm_plain: 
       greeting: Olá,
@@ -130,6 +137,8 @@ pt:
       more: mais
       pending: PENDENTE
       view_map: Ver Mapa
+    trace_form: 
+      help: Ajuda
     view: 
       edit: editar
       map: mapa

config/locales/ro.yml

@@ -210,6 +210,8 @@ ro:
       show_area_box: afișează chenarul zonei
       still_editing: (încă se editează)
       view_changeset_details: Vizualizare detalii set de schimbări
+    changeset_paging_nav: 
+      showing_page: Se afișează pagina
     changesets: 
       area: Zonă
       comment: Comentariu
@@ -220,10 +222,6 @@ ro:
   geocoder: 
     search_osm_namefinder: 
       prefix: "{{type}}"
-  map: 
-    coordinates: "Coordonate:"
-    edit: Editare
-    view: Vizualizare
   message: 
     delete: 
       deleted: Mesaj şters

config/locales/ru.yml

@@ -322,6 +322,10 @@ ru:
       recent_entries: "Недавние записи:"
       title: Дневники
       user_title: Дневник пользователя {{user}}
+    location: 
+      edit: Правка
+      location: "Положение:"
+      view: Вид
     new: 
       title: Сделать новую запись в дневнике
     no_such_entry: 
@@ -361,6 +365,9 @@ ru:
       output: Результат
       paste_html: HTML-код для встраивания на сайт
       scale: Масштаб
+      too_large: 
+        body: Эта область слишком велика, для экспорта в качестве XML данных OpenStreetMap. Пожалуйста, увеличьте масштаб или выберите меньший размер.
+        heading: Область слишком большая
       zoom: Приблизить
     start_rjs: 
       add_marker: Добавить маркер на карту
@@ -856,22 +863,24 @@ ru:
       overlays: 
         maplint: Maplint
     site: 
+      edit_disabled_tooltip: Увеличить масштаб для редактирования карты
+      edit_tooltip: Править карту
       edit_zoom_alert: Необходимо увеличить масштаб карты, если вы хотите ее править.
+      history_disabled_tooltip: Увеличить масштаб для просмотра правок в этой области
+      history_tooltip: Просмотр правок в этой области
       history_zoom_alert: Необходимо увеличить масштаб карты, чтобы увидеть историю правок
   layouts: 
     donate: Поддержите OpenStreetMap {{link}} в Фонд обновления оборудования.
     donate_link_text: пожертвованиями
     edit: Правка
-    edit_tooltip: Редактировать карты
     export: Экспорт
     export_tooltip: Экспортировать данные карты
     gps_traces: GPS-треки
-    gps_traces_tooltip: Работать с треками
+    gps_traces_tooltip: Работать с GPS треками
     help_wiki: Справка и вики
     help_wiki_tooltip: Справка и вики-сайт проекта
     help_wiki_url: http://wiki.openstreetmap.org/wiki/RU:Main_Page?uselang=ru
     history: История
-    history_tooltip: История пакета правок
     home: домой
     home_tooltip: Показать мой дом
     inbox: входящие ({{count}})
@@ -908,13 +917,9 @@ ru:
     user_diaries: Дневники
     user_diaries_tooltip: Посмотреть дневники
     view: Карта
-    view_tooltip: Посмотреть карты
+    view_tooltip: Посмотреть карту
     welcome_user: Добро пожаловать, {{user_link}}
     welcome_user_link_tooltip: Ваша страница пользователя
-  map: 
-    coordinates: "Координаты:"
-    edit: Правка
-    view: Карта
   message: 
     delete: 
       deleted: Сообщение удалено
@@ -945,10 +950,14 @@ ru:
       send_message_to: Отправить новое сообщение для {{name}}
       subject: "Тема:"
       title: Отправить сообщение
+    no_such_message: 
+      body: "\nИзвините, но сообщения с таким ID нет."
+      heading: "\nНет такого сообщения"
+      title: "\nНет такого сообщения"
     no_such_user: 
-      body: К сожалению, не удалось найти пользователя или сообщение с таким именем или идентификатором
+      body: Извините, пользователя с таким именем нет.
-      heading: Нет такого пользователя/сообщения
+      heading: Нет такого пользователя
-      title: Нет такого пользователя/сообщения
+      title: Нет такого пользователя
     outbox: 
       date: Дата
       inbox: входящие
@@ -972,6 +981,9 @@ ru:
       title: Просмотр сообщения
       to: "Кому:"
       unread_button: Пометить как непрочитанное
+      wrong_user: "\nВы вошли как пользователь `{{user}}' но сообщение, которое вы хотите прочитать, отправлено не этим или не этому пользователю. Пожалуйста, войдите как правильный пользователь, чтобы прочитать его."
+    reply: 
+      wrong_user: "\nВы вошли как `{{user}}' но ответ на ваш вопрос был отправлен не этому пользователю. Пожалуйста, войдите как соответствующий вашему вопросу пользователь, чтобы прочитать ответ."
     sent_message_summary: 
       delete_button: Удалить
   notifier: 
@@ -992,8 +1004,9 @@ ru:
       hopefully_you_1: Кто-то (надеемся, что вы) хочет изменить свой адрес электронной почты в
       hopefully_you_2: "{{server_url}} на адрес: {{new_address}}."
     friend_notification: 
+      befriend_them: Вы также можете добавить их в качестве друзей в {{befriendurl}}.
       had_added_you: "{{user}} добавил вас в друзья на OpenStreetMap."
-      see_their_profile: "Вы можете просмотреть информацию о нем по ссылке: {{userurl}} и тоже добавить его в друзья."
+      see_their_profile: "Вы можете просмотреть информацию о них по ссылке: {{userurl}}."
       subject: "[OpenStreetMap] {{user}} добавил вас в список своих друзей"
     gpx_notification: 
       and_no_tags: и без меток.
@@ -1222,6 +1235,9 @@ ru:
     sidebar: 
       close: Закрыть
       search_results: Результаты поиска
+  time: 
+    formats: 
+      friendly: "%e %B %Y в %H:%M"
   trace: 
     create: 
       trace_uploaded: Ваш файл GPX был передан на сервер и сейчас вносится в базу данных. Обычно это занимает от минуты до получаса. По завершении вам будет прислано уведомление на электронную почту.
@@ -1327,15 +1343,20 @@ ru:
   user: 
     account: 
       current email address: "Текущий адрес эл. почты:"
+      delete image: Удалить текущее изображение
       email never displayed publicly: (не будет показан)
       flash update success: Информация о пользователе успешно обновлена.
       flash update success confirm needed: Информация о пользователе успешно обновлена. Проверьте свою электронную почту, чтобы подтвердить ваш новый адрес.
       home location: "Основное местоположение:"
+      image: "Изображение:"
+      image size hint: (квадратные изображения, по крайней мере 100x100 работают лучше)
+      keep image: Хранить текущее изображение
       latitude: "Широта:"
       longitude: "Долгота:"
       make edits public button: Сделать все мои правки доступными
       my settings: Мои настройки
       new email address: "Новый адрес эл. почты:"
+      new image: Добавить изображение
       no home location: Вы не обозначили свое основное местоположение.
       preferred languages: "Предпочитаемые языки:"
       profile description: "Описание профиля:"
@@ -1349,6 +1370,7 @@ ru:
       public editing note: 
         heading: Общедоступная правка
         text: В настоящий момент ваши правки анонимны и никто не может отправлять вам сообщения или видеть ваше местоположение. Чтобы указать авторство своих правок и позволить другим связываться с вами через вебсайт, нажмите на кнопку внизу. <b>После перехода на API  версии 0.6, только доступные для связи пользователи могут править данные карты</b>. (<a href="http://wiki.openstreetmap.org/wiki/RU:Anonymous_edits">узнайте, почему</a>).<ul> <li>Ваш адрес электронной почты не будет раскрыт для других, но связаться с вами будет возможно.</li> <li>Это действие не имеет обратной силы, а все новые пользователи теперь доступны для связи по умолчанию.</li> </ul>
+      replace image: Заменить текущее изображение
       return to profile: Возврат к профилю
       save changes button: Сохранить изменения
       title: Изменение учётной записи
@@ -1367,9 +1389,6 @@ ru:
       success: Ваш адрес электронной почты подтверждён, спасибо за регистрацию!
     filter: 
       not_an_administrator: Только администратор может выполнить это действие.
-    friend_map: 
-      nearby mapper: "Ближайший пользователь: [[nearby_user]]"
-      your location: Ваше местоположение
     go_public: 
       flash success: Все ваши правки теперь общедоступны, и вы теперь можете редактировать.
     login: 
@@ -1382,7 +1401,12 @@ ru:
       lost password link: Забыли пароль?
       password: "Пароль:"
       please login: Пожалуйста, представьтесь или {{create_user_link}}.
+      remember: "\nЗапомнить меня:"
       title: Представьтесь
+    logout: 
+      heading: Выйти из OpenStreetMap
+      logout_button: Выйти
+      title: Выйти
     lost_password: 
       email address: "Аадрес эл. почты:"
       heading: Забыли пароль?
@@ -1415,6 +1439,10 @@ ru:
       body: Извините, нет пользователя с именем {{user}}. Пожалуйста, проверьте правильность ввода. Возможно, вы перешли по ошибочной ссылке.
       heading: Пользователя {{user}} не существует
       title: Нет такого пользователя
+    popup: 
+      friend: Друг
+      nearby mapper: Ближайший пользователь
+      your location: Ваше местоположение
     remove_friend: 
       not_a_friend: "{{name}} не является вашим другом."
       success: "{{name}} удалён из вашего списка друзей."
@@ -1431,17 +1459,14 @@ ru:
     view: 
       activate_user: активировать этого пользователя
       add as friend: добавить в друзья
-      add image: Загрузить
       ago: ({{time_in_words_ago}} назад)
       block_history: полученные блокировки
       blocks by me: наложенные мною блокировки
       blocks on me: мои блокировки
-      change your settings: изменить настройки
       confirm: Подтвердить
       create_block: блокировать пользователя
       created from: "Создано из:"
       deactivate_user: деактивировать этого пользователя
-      delete image: Удалить аватар
       delete_user: удалить этого пользователя
       description: Описание
       diary: дневник
@@ -1457,12 +1482,11 @@ ru:
       my edits: мои правки
       my settings: мои настройки
       my traces: мои треки
-      my_oauth_details: Просмотр подробностей OAuth
+      nearby users: Другие ближайшие пользователи
-      nearby users: "Ближайшие пользователи:"
       new diary entry: новая запись
       no friends: Вы не добавили ещё ни одного друга.
-      no home location: Местонахождение не было указано.
+      no nearby users: Пока нет других пользователей, признающих, что занимающихся составлением карты поблизости.
-      no nearby users: Поблизости пока нет пользователей, занимающихся составлением карты.
+      oauth settings: "\nнастройки OAuth"
       remove as friend: удалить из друзей
       role: 
         administrator: Этот пользователь является администратором
@@ -1477,8 +1501,6 @@ ru:
       settings_link_text: настройки
       traces: треки
       unhide_user: отобразить этого пользователя
-      upload an image: Передать аватар на сервер
-      user image heading: Аватар
       user location: Местонахождение пользователя
       your friends: Ваши друзья
   user_block: 

config/locales/sl.yml

@@ -1,6 +1,7 @@
 # Messages for Slovenian (Slovenščina)
 # Exported from translatewiki.net
 # Export driver: syck
+# Author: Dbc334
 sl: 
   activerecord: 
     attributes: 
@@ -103,7 +104,7 @@ sl:
         node: Prikaz vozlišča na večjem zemljevidu
         relation: Prikaz relacije na večjem zemljevidu
         way: Prikaz poti na večjem zemljevidu
-      loading: Nalaganje...
+      loading: Nalaganje ...
     node: 
       download: "{{download_xml_link}} ali {{view_history_link}}"
       download_xml: prenesi XML
@@ -159,7 +160,7 @@ sl:
       history_for_feature: Zgodovina [[feature]]
       load_data: Naloži podatke
       loaded_an_area_with_num_features: "Naložili ste področje, ki vsebuje [[num_features]] elementov. Nekateri spletni brskalniki ne zmorejo prikaza takšne količine podatkov. Na splošno brskalniki najbolje prikazujejo 100 ali manj elementov hkrati: karkoli drugega lahko upočasni vaš brskalnik ali ga naredi neodzivnega. Če ste prepričani, da želite prikazati vse te podatke, pritisnite na spodnji gumb."
-      loading: Nalaganje...
+      loading: Nalaganje ...
       manually_select: Ročno izberite drugo področje
       object_list: 
         api: Pridobi področje iz programskega vmesnika (API)
@@ -213,7 +214,7 @@ sl:
       still_editing: (še ureja)
       view_changeset_details: Ogled podrobnosti paketa sprememb
     changeset_paging_nav: 
-      showing_page: Prikaz strani
+      showing_page: Prikazovanje strani {{page}}
     changesets: 
       area: Področje
       comment: Komentar
@@ -245,7 +246,7 @@ sl:
       reply_link: Odgovori na ta vnos
     edit: 
       body: "Besedilo:"
-      language: "Jezki:"
+      language: "Jezik:"
       latitude: "Z. širina:"
       location: "Lokacija:"
       longitude: "Z. dolžina:"
@@ -289,7 +290,7 @@ sl:
       login: Prijavite se
       login_to_leave_a_comment: "{{login_link}} za vpis komentarja"
       save_button: Shrani
-      title: Dnevnik uporabnika {{user}}
+      title: Dnevnik uporabnika {{user}} | {{title}}
       user_title: Dnevnik uporabnika {{user}}
   export: 
     start: 
@@ -298,11 +299,11 @@ sl:
       embeddable_html: HTML za vključitev na spletno stran
       export_button: Izvozi
       export_details: OpenStreetMap podatki imajo licenco <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.sl">Creative Commons Priznanje avtorstva-Deljenje pod enakimi pogoji 2.0</a>.
-      format: Oblika zapisa
+      format: Oblika
       format_to_export: Oblika izvoženih podatkov
       image_size: Velikost slike
       latitude: "Šir:"
-      licence: Licenca
+      licence: Dovoljenje
       longitude: "Dol:"
       manually_select: Ročno izberite drugo področje
       mapnik_image: Mapnik slika zemljevida
@@ -363,7 +364,6 @@ sl:
     donate: Podprite OpenStreetMap z {{link}} v fond za nadgradnjo strojne opreme.
     donate_link_text: donacijo
     edit: Uredi
-    edit_tooltip: Uredite zemljevid
     export: Izvoz
     export_tooltip: Izvozite podatke zemljevida
     gps_traces: GPS sledi
@@ -372,7 +372,6 @@ sl:
     help_wiki_tooltip: Pomoč in Wiki strani projekta
     help_wiki_url: http://wiki.openstreetmap.org/wiki/Sl:Main_Page?uselang=sl
     history: Zgodovina
-    history_tooltip: Zgodovina sprememb
     home: domov
     home_tooltip: Prikaži domači kraj
     inbox_tooltip: 
@@ -408,10 +407,6 @@ sl:
     view_tooltip: Prikaz zemljevida
     welcome_user: Dobrodošli, {{user_link}}
     welcome_user_link_tooltip: Vaša uporabniška stran
-  map: 
-    coordinates: "Koordinate:"
-    edit: Urejanje
-    view: Zemljevid
   message: 
     delete: 
       deleted: Sporočilo izbrisano
@@ -442,9 +437,9 @@ sl:
       subject: Zadeva
       title: Pošiljanje sporočila
     no_such_user: 
-      body: Oprostite, uporabnika s tem imenom ali sporočila s tem ID-jem ni
+      body: Oprostite, uporabnika s tem imenom ni.
-      heading: Ni ustreznega uporabnika ali sporočila
+      heading: Ni takega uporabnika
-      title: Ni ustreznega uporabnika ali sporočila
+      title: Ni takega uporabnika
     outbox: 
       date: Datum
       inbox: prejeta
@@ -745,9 +740,6 @@ sl:
       heading: Potrdite spremembo naslova e-pošte
       press confirm button: Za potrditev spremembe vašega naslova elektronske pošte pritisnite na gumb Potrdi spodaj.
       success: Vaš naslov elektronske pošte je potrjen. Hvala, da ste se vpisali!
-    friend_map: 
-      nearby mapper: "Bližnji kartograf: [[nearby_user]]"
-      your location: Vaša lokacija
     go_public: 
       flash success: Vsi vaši prispevki so sedaj javni in sedaj imate pravico do urejanja.
     login: 
@@ -791,6 +783,9 @@ sl:
       body: Oprostite, uporabnika z imenom {{user}} ni. Prosimo, preverite črkovanje in povezavo, ki ste jo kliknili.
       heading: Uporabnik {{user}} ne obstaja
       title: Ni tega uporabnika
+    popup: 
+      nearby mapper: Bližnji kartograf
+      your location: Vaša lokacija
     remove_friend: 
       not_a_friend: Uporabnika {{name}} ni med vašimi prijatelji.
       success: Uporabnika {{name}} ste odstranili izmed svojih prijateljev.
@@ -801,10 +796,7 @@ sl:
       flash success: Domača lokacija uspešno shranjena
     view: 
       add as friend: dodaj med prijatelje
-      add image: Dodaj sliko
       ago: ({{time_in_words_ago}} nazaj)
-      change your settings: uredite vaše nastavitve
-      delete image: Izbriši sliko
       description: Opis
       diary: dnevnik
       edits: prispevki
@@ -814,16 +806,13 @@ sl:
       my edits: moji prispevki
       my settings: moje nastavitve
       my traces: moje sledi
-      nearby users: "Bližnji uporabniki:"
+      nearby users: Drugi bližnji uporabniki
       new diary entry: nov vnos v dnevnik
       no friends: Niste še dodali nobenih prijateljev.
-      no home location: Domača lokacija uporabnika še ni bila nastavljena.
+      no nearby users: Ni še drugih uporabnikov, ki bi priznali, da kartirajo v vaši bližini.
-      no nearby users: Ni uporabnikov, ki bi priznali, da kartirajo v vaši bližini.
       remove as friend: odstrani izmed prijateljev
       send message: pošlji sporočilo
       settings_link_text: vaših nastavitvah
       traces: sledi
-      upload an image: Objavite sliko
-      user image heading: Slika uporabnika
       user location: Lokacija uporabnika
       your friends: Vaši prijatelji

config/locales/sr-EC.yml

@@ -36,6 +36,7 @@ sr-EC:
       user: 
         active: Активан
         description: Опис
+        display_name: Приказано име
         email: Е-пошта
         languages: Језици
         pass_crypt: Лозинка
@@ -120,7 +121,7 @@ sr-EC:
     map: 
       deleted: Обрисано
       larger: 
-        area: Погледај зону на већој мапи
+        area: Погледај област на већој мапи
         node: Погледај чвор на већој мапи
         relation: Погледај однос на већој мапи
         way: Погледај путању на већој мапи
@@ -176,7 +177,7 @@ sr-EC:
       data_frame_title: Подаци
       data_layer_name: Подаци
       details: Детаљи
-      drag_a_box: Развуци правоугаоник на мапи да би обележио област
+      drag_a_box: Превуците правоугаоник преко мапе како бисте обележили област
       edited_by_user_at_timestamp: Изменио [[user]] на [[timestamp]]
       history_for_feature: Историја за [[feature]]
       load_data: Учитај податке
@@ -205,6 +206,12 @@ sr-EC:
       zoom_or_select: Увећајте или изаберите место на мапи које желите да погледате
     tag_details: 
       tags: "Ознаке:"
+    timeout: 
+      type: 
+        changeset: скуп измена
+        node: чвор
+        relation: однос
+        way: путања
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} или {{edit_link}}"
       download_xml: Преузми XML
@@ -226,10 +233,15 @@ sr-EC:
       way_history_title: "Историја путање: {{way_name}}"
   changeset: 
     changeset: 
+      anonymous: Анонимно
       big_area: (велика)
       no_comment: (нема)
       no_edits: (нема измена)
       still_editing: (још увек уређује)
+    changeset_paging_nav: 
+      next: Следећа »
+      previous: "« Претходна"
+      showing_page: Приказ стране {{page}}
     changesets: 
       area: Област
       comment: Напомена
@@ -237,6 +249,7 @@ sr-EC:
       saved_at: Сачувано у
       user: Корисник
     list: 
+      description: Скорашње измене
       description_bbox: Скупови измена унутар {{bbox}}
       heading: Скупови измена
       heading_bbox: Скупови измена
@@ -275,6 +288,10 @@ sr-EC:
       recent_entries: "Скорашњи дневнички уноси:"
       title: Кориснички дневници
       user_title: Дневник корисника {{user}}
+    location: 
+      edit: Уреди
+      location: "Локација:"
+      view: Преглед
     new: 
       title: Нови дневнички унос
     no_such_user: 
@@ -289,6 +306,7 @@ sr-EC:
       add_marker: Додајте маркер на мапу
       area_to_export: Област за извоз
       export_button: Извези
+      export_details: OpenStreetMap подаци су лиценцирани под <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.sr">Creative Commons Attribution-ShareAlike 2.0 лиценцом</a>.
       format: Формат
       format_to_export: Формат за извоз
       image_size: Величина слике
@@ -307,6 +325,7 @@ sr-EC:
       add_marker: Додајте маркер на мапу
       change_marker: Промените положај маркера
       click_add_marker: Кликните на мапу како бирте додали маркер
+      drag_a_box: Превуците правоугаоник преко мапе како бисте обележили област
       export: Извези
       manually_select: Ручно изаберите другу област
       view_larger_map: Погледајте већу мапу
@@ -334,6 +353,9 @@ sr-EC:
     results: 
       more_results: Још резултата
       no_results: Нема резултата претраге
+    search_osm_namefinder: 
+      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} од {{parentname}})"
+      suffix_place: ", {{distance}} {{direction}} од {{placename}}"
     search_osm_nominatim: 
       prefix: 
         amenity: 
@@ -342,6 +364,7 @@ sr-EC:
           bank: Банка
           bar: Бар
           bench: Клупа
+          bicycle_parking: Паркинг за бицике
           brothel: Бордел
           bureau_de_change: Мењачница
           bus_station: Аутобуска станица
@@ -355,17 +378,20 @@ sr-EC:
           courthouse: Зграда суда
           crematorium: Крематоријум
           dentist: Зубар
+          drinking_water: Пијаћа вода
           driving_school: Ауто-школа
           embassy: Амбасада
           fast_food: Брза храна
           fire_hydrant: Хидрант
           fire_station: Ватрогасна станица
           fountain: Фонтана
+          fuel: Гориво
           grave_yard: Гробље
           gym: Фитнес центар / Теретана
           health_centre: Дом здравља
           hospital: Болница
           hotel: Хотел
+          ice_cream: Сладолед
           kindergarten: Обданиште
           library: Библиотека
           marketplace: Пијаца
@@ -384,6 +410,7 @@ sr-EC:
           retirement_home: Старачки дом
           sauna: Сауна
           school: Школа
+          shelter: Склониште
           shop: Продавница
           studio: Студио
           supermarket: Супермаркет
@@ -392,6 +419,8 @@ sr-EC:
           theatre: Позориште
           toilets: Тоалети
           university: Универзитет
+          waste_basket: Корпа за отпатке
+          wifi: Wi-Fi приступ
           youth_centre: Дом омладине
         boundary: 
           administrative: Административна граница
@@ -418,9 +447,11 @@ sr-EC:
           footway: Стаза
           gate: Капија
           motorway: Аутопут
+          motorway_link: Мото-пут
           path: Стаза
           platform: Платформа
           primary_link: Главни пут
+          raceway: Тркачка стаза
           road: Пут
           steps: Степенице
           trail: Стаза
@@ -437,16 +468,21 @@ sr-EC:
           ruins: Рушевине
           tower: Торањ
         landuse: 
+          basin: Басен
           cemetery: Гробље
           construction: Градилиште
           farm: Фарма
           forest: Шума
+          grass: Трава
           industrial: Индустријска зона
+          meadow: Ливада
           military: Војна област
           mine: Рудник
           mountain: Планина
           park: Парк
+          piste: Скијашка стаза
           quarry: Каменолом
+          railway: Железничка пруга
           reservoir: Резервоар
           residential: Стамбена област
           vineyard: Виноград
@@ -457,6 +493,7 @@ sr-EC:
           ice_rink: Клизалиште
           marina: Марина
           miniature_golf: Мини голф
+          nature_reserve: Резерват природе
           park: Парк
           pitch: Спортско игралиште
           playground: Игралиште
@@ -471,6 +508,7 @@ sr-EC:
           cape: Рт
           cave_entrance: Улаз у пећину
           channel: Канал
+          cliff: Литица
           crater: Кратер
           fjord: Фјорд
           geyser: Гејзир
@@ -479,6 +517,7 @@ sr-EC:
           island: Острво
           marsh: Мочвара
           mud: Блато
+          peak: Врх
           reef: Гребен
           ridge: Гребен
           river: Река
@@ -489,6 +528,7 @@ sr-EC:
           valley: Долина
           volcano: Вулкан
           water: Вода
+          wood: Гај
         place: 
           airport: Аеродром
           city: Град
@@ -509,11 +549,14 @@ sr-EC:
           village: Село
         railway: 
           narrow_gauge: Пруга уског колосека
+          tram_stop: Трамвајско стајалиште
         shop: 
           art: Продавница слика
           bakery: Пекара
+          beauty: Салон лепоте
           books: Књижара
           butcher: Месара
+          car_parts: Продавница ауто-делова
           car_repair: Ауто-сервис
           clothes: Бутик
           copyshop: Копирница
@@ -531,9 +574,12 @@ sr-EC:
           market: Маркет
           music: Музичка продавница
           optician: Оптичар
+          photo: Фотографска радња
           salon: Салон
+          shoes: Продавница ципела
           shopping_centre: Тржни центар
           supermarket: Супермаркет
+          toys: Продавница играчака
           travel_agency: Туристичка агенција
         tourism: 
           artwork: Галерија
@@ -557,22 +603,33 @@ sr-EC:
           river: Река
           waterfall: Водопад
   javascripts: 
+    map: 
+      base: 
+        noname: Без назива
     site: 
-      history_zoom_alert: Морате зумирати како бисте видели историју уређивања
+      edit_disabled_tooltip: Увећајте како бисте уредили мапу
+      edit_tooltip: Уреди мапу
+      history_zoom_alert: Морате увећати како бисте видели историју уређивања
   layouts: 
     donate_link_text: донирање
     edit: Уреди
-    edit_tooltip: Уредите мапе
     export: Извези
     export_tooltip: Извоз мапа
     gps_traces: ГПС трагови
     help_wiki: Помоћ и вики
     history: Историја
-    history_tooltip: Историја скупа измена
     home: мој дом
     home_tooltip: Иди на почетну локацију
-    inbox: поруке
+    inbox: поруке ({{count}})
+    inbox_tooltip: 
+      few: Имате {{count}} непрочитане поруке
+      one: Имате једну непрочитану поруку
+      other: Имате {{count}} непрочитаних порука
+      zero: Немате непрочитаних порука
+    intro_1: OpenStreetMap је слободна мапа целог света. Сачињавају је корисници као што сте ви.
+    intro_2: OpenStreetMap вам омогућава да прегледате, уређујете и користите географске податке са било ког места на Земљи.
     intro_3: Одржавање OpenStreetMap је подржано од стране {{ucl}} и {{bytemark}}.
+    intro_3_partners: вики
     license: 
       title: Подаци OpenStreetMap сајта су лиценцирани под Creative Commons Attribution-Share Alike 2.0 општом лиценцом
     log_in: пријавите се
@@ -586,27 +643,28 @@ sr-EC:
       title: Подржите OpenStreetMap новчаним прилогом
     news_blog: Вест на блогу
     shop: Продавница
+    shop_tooltip: пазарите у регистрованој OpenStreetMap продавници
     sign_up: региструјте се
     sign_up_tooltip: Направите налог како бисте уређивали мапе
     user_diaries: Кориснички дневници
     user_diaries_tooltip: Погледајте дневнике корисника
     view: Преглед
-    view_tooltip: Погледајте мапе
+    view_tooltip: Погледајте мапу
     welcome_user: Добродошли, {{user_link}}
     welcome_user_link_tooltip: Ваша корисничка страна
-  map: 
-    coordinates: "Координате:"
-    edit: Уреди
-    view: Види
   message: 
     delete: 
       deleted: Порука је обрисана
     inbox: 
       date: Датум
       from: Од
-      my_inbox: Примљене
+      my_inbox: Моје примљене поруке
       no_messages_yet: Тренутно немате порука. Зашто не успоставите контакт са {{people_mapping_nearby_link}}?
+      outbox: послате
+      people_mapping_nearby: маперима у вашој околини
       subject: Тема
+      title: Моје примљене поруке
+      you_have: Имате {{new_count}} нових порука и {{old_count}} старих порука
     mark: 
       as_read: Порука је означена као прочитана
       as_unread: Порука је означена као непрочитана
@@ -616,33 +674,49 @@ sr-EC:
       reply_button: Одговори
       unread_button: Означи као непрочитано
     new: 
+      back_to_inbox: Назад на примљене
       body: Тело
       message_sent: Порука је послата
       send_button: Пошаљи
+      send_message_to: Пошаљи нову поруку {{name}}
       subject: Тема
       title: Пошаљи поруку
+    no_such_user: 
+      heading: Овде таквог нема
+      title: Овде таквог нема
     outbox: 
       date: Датум
-      inbox: долазна пошта
+      inbox: примљене поруке
-      my_inbox: Мој {{inbox_link}}
+      my_inbox: Моје {{inbox_link}}
-      outbox: одлазна пошта
+      no_sent_messages: Тренутно немате послатих порука. Зашто не успоставите контакт са {{people_mapping_nearby_link}}?
-      people_mapping_nearby: маперима у вашој близини
+      outbox: послате
+      people_mapping_nearby: маперима у вашој околини
       subject: Тема
       title: Одлазна пошта
       to: За
       you_have_sent_messages: Имате {{count}} послатих порука
     read: 
+      back_to_inbox: Назад на примљене
+      back_to_outbox: Назад на послате
       date: Датум
       from: Од
       reply_button: Одговори
       subject: Тема
+      title: Прочитај поруку
       to: За
       unread_button: Означи као непрочитано
     sent_message_summary: 
       delete_button: Обриши
   notifier: 
+    diary_comment_notification: 
+      hi: Поздрав {{to_user}},
+      subject: "[OpenStreetMap] {{user}} је коментарисао ваш дневнички унос"
     email_confirm: 
       subject: "[OpenStreetMap] Потврдите вашу адресу е-поште"
+    email_confirm_html: 
+      click_the_link: Ако сте то ви, молимо кликните на везу испод како бисте потврдили измене.
+      greeting: Поздрав,
+      hopefully_you: Неко (вероватно ви) би желео да промени адресу е-поште са {{server_url}} на {{new_address}}.
     email_confirm_plain: 
       greeting: Поздрав,
     friend_notification: 
@@ -651,6 +725,7 @@ sr-EC:
       greeting: Поздрав,
     lost_password_html: 
       click_the_link: Ако сте то ви, молимо кликните на линк испод како бисте ресетивали лозинку.
+      greeting: Поздрав,
     lost_password_plain: 
       click_the_link: Ако сте то ви, молимо кликните на линк испод како бисте ресетивали лозинку.
       greeting: Поздрав,
@@ -662,6 +737,8 @@ sr-EC:
       subject: "[OpenStreetMap] Потврдите вашу адресу е-поште"
     signup_confirm_html: 
       greeting: Поздрав!
+    signup_confirm_plain: 
+      greeting: Поздрав!
   oauth: 
     oauthorize: 
       allow_read_gpx: учитајте ваше GPS путање.
@@ -674,6 +751,8 @@ sr-EC:
     form: 
       name: Име
   site: 
+    edit: 
+      user_page_link: корисничка страна
     index: 
       license: 
         license_name: Creative Commons Attribution-Share Alike 2.0
@@ -691,7 +770,7 @@ sr-EC:
           centre: Спортски центар
           commercial: Пословна област
           common: 
-            1: Ливада
+            1: ливада
           construction: Путеви у изградњи
           cycleway: Бициклистичка стаза
           farm: Фарма
@@ -707,6 +786,7 @@ sr-EC:
           park: Парк
           pitch: Спортско игралиште
           primary: Главни пут
+          private: Приватни посед
           rail: Железничка пруга
           reserve: Парк природе
           resident: Стамбена област
@@ -717,6 +797,9 @@ sr-EC:
             - универзитет
           station: Железничка станица
           subway: Подземна железница
+          summit: 
+            - Узвишење
+            - врх
           tourist: Туристичка атракција
           track: Стаза
           tram: 
@@ -725,14 +808,20 @@ sr-EC:
           trunk: Магистрални пут
           tunnel: Испрекидан оквир = тунел
           unsurfaced: Подземни пут
+          wood: Гај
         heading: Легенда за  увећање {{zoom_level}}
     search: 
       search: Претрага
+      search_help: "примери: 'Берлин', 'Војводе Степе, Београд', 'CB2 5AQ' <a href='http://wiki.openstreetmap.org/wiki/Search'>још примера...</a>"
       submit_text: Иди
       where_am_i: Где сам?
+      where_am_i_title: Установите тренутну локацију помоћу претраживача
     sidebar: 
       close: Затвори
       search_results: Резултати претраге
+  time: 
+    formats: 
+      friendly: "%e %B %Y у %H:%M"
   trace: 
     create: 
       trace_uploaded: Ваш GPX фајл је послат и чека на унос у базу. Он обично траје око пола сата, и добићете поруку е-поштом кад се заврши.
@@ -749,16 +838,18 @@ sr-EC:
       save_button: Сними промене
       start_coord: "Почетне координате:"
       tags: "Ознаке:"
+      tags_help: раздвојене зарезима
       title: Мењање трага {{name}}
       uploaded_at: "Послато:"
       visibility: "Видљивост:"
       visibility_help: шта ово значи?
     list: 
       public_traces: Јавни ГПС трагови
+      tagged_with: " означени са {{tags}}"
       your_traces: Ваши ГПС трагови
     no_such_user: 
       heading: Корисник {{user}} не постоји
-      title: Овде таквих нема
+      title: Овде таквог нема
     trace: 
       ago: пре {{time_in_words_ago}}
       by: од
@@ -796,6 +887,7 @@ sr-EC:
       edit_track: Уреди ову стазу
       filename: "Име фајла:"
       map: мапа
+      none: Нема
       owner: "Власник:"
       pending: НА_ЧЕКАЊУ
       points: "Тачке:"
@@ -804,16 +896,26 @@ sr-EC:
       trace_not_found: Траг није пронађен!
       uploaded: "Послато:"
       visibility: "Видљивост:"
+    visibility: 
+      identifiable: Омогућавају препознавање (приказани у списку трагова и као јавне, поређане и датиране тачке)
+      private: Приватни (дељиви само као анонимне, непоређане тачке)
+      public: Јавни (приказани у списку трагова и као јавне, непоређане тачке)
+      trackable: Омогућавају праћење (дељиви само као анонимне, поређане и датиране тачке)
   user: 
     account: 
       current email address: "Тренутна адреса е-поште:"
+      delete image: Уклони тренутну слику
       email never displayed publicly: (не приказуј јавно)
+      flash update success: Подаци о кориснику успешно ажурирани.
+      flash update success confirm needed: Подаци о кориснику успешно ажурирани. Проверите вашу е-пошту како бисте потврдивли нову адресу е-поште.
       home location: "Моја локација:"
+      image: "Слика:"
       latitude: "Географска ширина:"
       longitude: "Географска дужина:"
       make edits public button: Нека све моје измене буду јавне
       my settings: Моја подешавања
       new email address: "Нова адреса е-поште:"
+      new image: Додајте вашу слику
       no home location: Нисте унели ваше место становања.
       preferred languages: "Подразумевани језици:"
       profile description: "Опис профила:"
@@ -831,8 +933,8 @@ sr-EC:
       button: Потврди
       heading: Потврдите промену е-мејл адресе
       success: Потврдите вашу е-мејл адресу, хвала на регистрацији!
-    friend_map: 
+    filter: 
-      your location: Ваша локација
+      not_an_administrator: Морате бити администратор да бисте извели ову акцију.
     login: 
       create_account: направите налог
       email or username: "Адреса е-поште или корисничко име:"
@@ -841,7 +943,11 @@ sr-EC:
       lost password link: Изгубили сте лозинку?
       password: "Лозинка:"
       please login: Молимо пријавите се или {{create_user_link}}.
+      remember: "Запамти ме:"
       title: Пријављивање
+    logout: 
+      logout_button: Одјави се
+      title: Одјави се
     lost_password: 
       email address: "Адреса е-поште:"
       heading: Заборављена лозинка?
@@ -851,40 +957,52 @@ sr-EC:
     make_friend: 
       success: "{{name}} је постао ваш пријатељ."
     new: 
-      confirm email address: "Потврдите е-мејл адресу:"
+      confirm email address: "Потврдите адресу е-поште:"
-      confirm password: "Потврди лозинку:"
+      confirm password: "Потврдите лозинку:"
+      display name: "Приказано име:"
+      display name description: Име вашег корисничког налога. Можете га касније променити у подешавањима.
       email address: "Адреса е-поште:"
       fill_form: Попуните упитник и убрзо ћемо вам послати мејл како бисте активирали налог.
       heading: Креирајте кориснички налог
+      license_agreement: Креирањем налога, прихватате услове да сви подаци које шаљете на Openstreetmap пројекат буду (неискључиво) лиценциран под <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.sr">овом Creative Commons лиценцом (by-sa)</a>.
+      not displayed publicly: Не приказује се јавно (погледајте <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="вики политика приватности која садржи и одељак о адресама е-поште">политику приватности</a>)
       password: "Лозинка:"
       signup: Пријава
       title: Направи налог
     no_such_user: 
       heading: Корисник {{user}} не постоји
       title: Овде таквог нема
+    popup: 
+      friend: Пријатељ
+      your location: Ваша локација
     reset_password: 
-      confirm password: "Потврди лозинку:"
+      confirm password: "Потврдите лозинку:"
       flash changed: Ваша лозинка је промењена.
+      heading: Обнови лозинку за {{user}}
       password: Лозинка
+      reset: Обнови лозинку
+      title: Обнови лозинку
+    set_home: 
+      flash success: Ваша локација је успешно сачувана
     view: 
       add as friend: додај за пријатеља
-      add image: Додај слику
       confirm: Потврди
       create_block: блокирај овог корисника
-      delete image: Обриши слику
       delete_user: избриши овог корисника
       description: Опис
       diary: дневник
       edits: измене
       email address: "Е-мејл адреса:"
-      km away: удаљено {{count}}km
+      km away: "{{count}}km далеко"
       m away: "{{count}}m далеко"
+      mapper since: "Мапер од:"
       my diary: мој дневник
       my edits: моје измене
       my settings: моја подешавања
       my traces: моји трагови
-      nearby users: "Корисници у близини:"
+      nearby users: "Остали корисници у близини:"
       new diary entry: нови дневнички унос
+      no friends: Још нисте додали ни једног пријатеља.
       remove as friend: уклони као пријатеља
       role: 
         administrator: Овај корисник је администратор
@@ -895,21 +1013,30 @@ sr-EC:
       send message: пошаљи поруку
       settings_link_text: подешавања
       traces: трагови
-      user image heading: Слика корисника
       user location: Локација корисника
       your friends: Ваши пријатељи
   user_block: 
     partial: 
       confirm: Јесте ли сигурни?
+      display_name: Блокирани корисник
       edit: Уреди
+      reason: Разлози блокирања
       show: Прикажи
       status: Стање
+    period: 
+      few: "{{count}} сата"
+      one: 1 сат
+      other: "{{count}} сати"
     show: 
       back: Погледај сва блокирања
       confirm: Јесте ли сигурни?
       edit: Уреди
+      needs_view: Овај корисник мора да се пријави пре него што се блокада уклони.
       reason: "Разлози блокирања:"
+      show: Прикажи
       status: Статус
+      time_future: Завршава се у  {{time}}
+      time_past: Завршена пре {{time}}
   user_role: 
     filter: 
       doesnt_have_role: Корисник нема улогу {{role}}.