From: Tom Hughes <tom@compton.nu>
Date: Thu, 28 Mar 2013 00:36:07 +0000 (+0000)
Subject: Merge branch 'master' into notes
X-Git-Tag: live~5096^2~13
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/898cc828dd1f1167f85abbf35c8e3f0ed640ac1e?hp=38255f9f8d7363b51350338fdda5753647aca1af

Merge branch 'master' into notes

Conflicts:
	Gemfile.lock
---

diff --git a/Gemfile b/Gemfile
index b06702fb3..f841dc19a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@
 source 'http://rubygems.org'
 
 # Require rails
-gem 'rails', '3.2.11'
+gem 'rails', '3.2.12'
 
 # Require things which have moved to gems in ruby 1.9
 gem 'bigdecimal', :platforms => :ruby_19
@@ -38,7 +38,7 @@ gem 'ruby-openid', '>= 2.2.0'
 gem 'redcarpet'
 
 # Character conversion support for ruby 1.8
-gem 'iconv', :platforms => :ruby_18
+gem 'iconv', '= 0.1', :platforms => :ruby_18
 
 # Load libxml support for XML parsing and generation
 gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml'
diff --git a/Gemfile.lock b/Gemfile.lock
index ec1d4e357..7679a6ccb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,31 +2,31 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    actionmailer (3.2.11)
-      actionpack (= 3.2.11)
+    actionmailer (3.2.12)
+      actionpack (= 3.2.12)
       mail (~> 2.4.4)
-    actionpack (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
+    actionpack (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.11)
-      activesupport (= 3.2.11)
+    activemodel (3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
-    activerecord (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
+    activerecord (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-    activesupport (3.2.11)
+    activeresource (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
+    activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
@@ -42,8 +42,8 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.4.0)
-    composite_primary_keys (5.0.10)
+    coffee-script-source (1.6.2)
+    composite_primary_keys (5.0.12)
       activerecord (~> 3.2.0, >= 3.2.9)
     deadlock_retry (1.2.0)
     dynamic_form (1.1.4)
@@ -51,52 +51,54 @@ GEM
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    faraday (0.8.4)
+    faraday (0.8.7)
       multipart-post (~> 1.1)
     hike (1.2.1)
     htmlentities (4.3.1)
     http_accept_language (1.0.2)
     httpauth (0.2.0)
-    httpclient (2.3.2)
-    i18n (0.6.1)
-    i18n-js (3.0.0.rc3)
+    httpclient (2.3.3)
+    i18n (0.6.4)
+    i18n-js (3.0.0.rc5)
       i18n
     iconv (0.1)
     journey (1.0.4)
-    jquery-rails (2.1.4)
+    jquery-rails (2.2.1)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.7.6)
+    json (1.7.7)
     jsonify (0.3.1)
       multi_json (~> 1.0)
     jsonify-rails (0.3.2)
       actionpack
       jsonify (< 0.4.0)
-    jwt (0.1.5)
-      multi_json (>= 1.0)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
     libv8 (3.3.10.4)
-    libxml-ruby (2.4.0)
+    libxml-ruby (2.6.0)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     memcached (1.5.0)
-    mime-types (1.19)
-    minitest (4.4.0)
-    multi_json (1.5.0)
-    multipart-post (1.1.5)
-    nokogiri (1.5.6)
+    mime-types (1.21)
+    minitest (4.7.0)
+    multi_json (1.7.2)
+    multi_xml (0.5.3)
+    multipart-post (1.2.0)
+    nokogiri (1.5.9)
     oauth (0.4.7)
     oauth-plugin (0.4.1)
       multi_json
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack
-    oauth2 (0.8.0)
+    oauth2 (0.9.1)
       faraday (~> 0.8)
       httpauth (~> 0.1)
       jwt (~> 0.1.4)
       multi_json (~> 1.0)
+      multi_xml (~> 0.5)
       rack (~> 1.2)
     open_id_authentication (1.1.0)
       rack-openid (~> 1.3)
@@ -105,10 +107,10 @@ GEM
       activesupport (>= 2.3.2)
       cocaine (>= 0.0.2)
       mime-types
-    pg (0.14.1)
+    pg (0.15.0)
     polyglot (0.3.3)
-    r2 (0.0.3)
-    rack (1.4.4)
+    r2 (0.1.0)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-cors (0.2.7)
@@ -116,36 +118,36 @@ GEM
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.11)
-      actionmailer (= 3.2.11)
-      actionpack (= 3.2.11)
-      activerecord (= 3.2.11)
-      activeresource (= 3.2.11)
-      activesupport (= 3.2.11)
+    rails (3.2.12)
+      actionmailer (= 3.2.12)
+      actionpack (= 3.2.12)
+      activerecord (= 3.2.12)
+      activeresource (= 3.2.12)
+      activesupport (= 3.2.12)
       bundler (~> 1.0)
-      railties (= 3.2.11)
-    rails-i18n (0.7.2)
+      railties (= 3.2.12)
+    rails-i18n (0.7.3)
       i18n (~> 0.5)
-    railties (3.2.11)
-      actionpack (= 3.2.11)
-      activesupport (= 3.2.11)
+    railties (3.2.12)
+      actionpack (= 3.2.12)
+      activesupport (= 3.2.12)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
-    rdoc (3.12)
+    rake (10.0.4)
+    rdoc (3.12.2)
       json (~> 1.4)
     redcarpet (2.2.2)
     rinku (1.7.2)
-    ruby-openid (2.2.2)
+    ruby-openid (2.2.3)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)
-    sass (3.2.5)
+    sass (3.2.7)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
@@ -157,13 +159,13 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     therubyracer (0.10.2)
       libv8 (~> 3.3.10)
-    thor (0.16.0)
-    tilt (1.3.3)
-    timecop (0.5.9)
+    thor (0.18.0)
+    tilt (1.3.6)
+    timecop (0.6.1)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
+    tzinfo (0.3.37)
     uglifier (1.3.0)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
@@ -184,7 +186,7 @@ DEPENDENCIES
   http_accept_language (>= 1.0.2)
   httpclient
   i18n-js (>= 3.0.0.rc2)
-  iconv
+  iconv (= 0.1)
   jquery-rails
   jsonify-rails
   libxml-ruby (>= 2.0.5)
@@ -196,7 +198,7 @@ DEPENDENCIES
   pg
   r2
   rack-cors
-  rails (= 3.2.11)
+  rails (= 3.2.12)
   rails-i18n (>= 0.6.3)
   redcarpet
   rinku (>= 1.2.2)
diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js
index 5ca29e568..dcea8e0c0 100644
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -69,10 +69,10 @@ $(document).ready(function () {
     map.on("moveend", updateData);
     updateData();
 
-    $("#browse_filter_toggle").toggle(enableFilter, disableFilter);
+    $("#browse_filter_toggle").click(toggleFilter);
 
     $("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.hide_areas'));
-    $("#browse_hide_areas_box").toggle(hideAreas, showAreas);
+    $("#browse_hide_areas_box").click(toggleAreas);
 
     $("#sidebar").one("closed", function () {
       map.removeLayer(dataLayer);
@@ -96,28 +96,28 @@ $(document).ready(function () {
     }
   }
 
-  function enableFilter() {
-    $("#browse_filter_toggle").html(I18n.t('browse.start_rjs.view_data'));
-    locationFilter.setBounds(map.getBounds().pad(-0.2));
-    locationFilter.enable();
-    getData();
-  }
+  function toggleFilter() {
+    if (locationFilter.isEnabled()) {
+      $("#browse_filter_toggle").html(I18n.t('browse.start_rjs.manually_select'));
+      locationFilter.disable();
+    } else {
+      $("#browse_filter_toggle").html(I18n.t('browse.start_rjs.view_data'));
+      locationFilter.setBounds(map.getBounds().pad(-0.2));
+      locationFilter.enable();
+    }
 
-  function disableFilter() {
-    $("#browse_filter_toggle").html(I18n.t('browse.start_rjs.manually_select'));
-    locationFilter.disable();
     getData();
   }
 
-  function hideAreas() {
-    $("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.show_areas'));
-    areasHidden = true;
-    getData();
-  }
+  function toggleAreas() {
+    if (areasHidden) {
+      $("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.hide_areas'));
+      areasHidden = false;
+    } else {
+      $("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.show_areas'));
+      areasHidden = true;
+    }
 
-  function showAreas() {
-    $("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.hide_areas'));
-    areasHidden = false;
     getData();
   }
 
diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index b280de589..c7cb245f3 100644
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -161,6 +161,10 @@ class ChangesetController < ApplicationController
       end
     end
 
+    # create changeset and user caches
+    changeset_cache = {}
+    user_display_name_cache = {}
+
     # create an osmChange document for the output
     result = OSM::API.new.get_xml_doc
     result.root.name = "osmChange"
@@ -173,16 +177,16 @@ class ChangesetController < ApplicationController
         if (elt.version == 1)
           # first version, so it must be newly-created.
           created = XML::Node.new "create"
-          created << elt.to_xml_node
+          created << elt.to_xml_node(changeset_cache, user_display_name_cache)
         else
           unless elt.visible
             # if the element isn't visible then it must have been deleted
             deleted = XML::Node.new "delete"
-            deleted << elt.to_xml_node
+            deleted << elt.to_xml_node(changeset_cache, user_display_name_cache)
           else
             # must be a modify
             modified = XML::Node.new "modify"
-            modified << elt.to_xml_node
+            modified << elt.to_xml_node(changeset_cache, user_display_name_cache)
           end
         end
     end
diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 12f3fdcc8..6f1f7240c 100644
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -80,36 +80,15 @@ class DiaryEntryController < ApplicationController
 
       if @this_user
         @title = t 'diary_entry.list.user_title', :user => @this_user.display_name
-        @entry_pages, @entries = paginate(:diary_entries,
-                                          :conditions => {
-                                            :user_id => @this_user.id,
-                                            :visible => true
-                                          },
-                                          :order => 'created_at DESC',
-                                          :per_page => 20)
+        @entries = @this_user.diary_entries
       else
         render_unknown_user params[:display_name]
+        return
       end
-    elsif params[:language]
-      @title = t 'diary_entry.list.in_language_title', :language => Language.find(params[:language]).english_name
-      @entry_pages, @entries = paginate(:diary_entries, :include => :user,
-                                        :conditions => {
-                                          :users => { :status => ["active", "confirmed"] },
-                                          :visible => true,
-                                          :language_code => params[:language]
-                                        },
-                                        :order => 'created_at DESC',
-                                        :per_page => 20)
     elsif params[:friends]
       if @user
         @title = t 'diary_entry.list.title_friends'
-        @entry_pages, @entries = paginate(:diary_entries, :include => :user,
-                                          :conditions => {
-                                            :user_id => @user.friend_users,
-                                            :visible => true
-                                          },
-                                          :order => 'created_at DESC',
-                                          :per_page => 20)
+        @entries = DiaryEntry.where(:user_id => @user.friend_users)
       else
           require_user
           return
@@ -117,54 +96,61 @@ class DiaryEntryController < ApplicationController
     elsif params[:nearby]
       if @user
         @title = t 'diary_entry.list.title_nearby'
-        @entry_pages, @entries = paginate(:diary_entries, :include => :user,
-                                          :conditions => {
-                                            :user_id => @user.nearby,
-                                            :visible => true
-                                          },
-                                          :order => 'created_at DESC',
-                                          :per_page => 20)
+        @entries = DiaryEntry.where(:user_id => @user.nearby)
       else
           require_user
           return
       end
     else
-      @title = t 'diary_entry.list.title'
-      @entry_pages, @entries = paginate(:diary_entries, :include => :user,
-                                        :conditions => {
-                                          :users => { :status => ["active", "confirmed"] },
-                                          :visible => true
-                                        },
-                                        :order => 'created_at DESC',
-                                        :per_page => 20)
+      @entries = DiaryEntry.joins(:user).where(:users => { :status => ["active", "confirmed"] })
+      
+      if params[:language]
+        @title = t 'diary_entry.list.in_language_title', :language => Language.find(params[:language]).english_name
+        @entries = @entries.where(:language_code => params[:language])
+      else
+        @title = t 'diary_entry.list.title'
+      end
     end
+
+    @page = (params[:page] || 1).to_i
+    @page_size = 20
+
+    @entries = @entries.visible
+    @entries = @entries.order("created_at DESC")
+    @entries = @entries.offset((@page - 1) * @page_size)
+    @entries = @entries.limit(@page_size)
+    @entries = @entries.includes(:user, :language)
   end
 
   def rss
-    @entries = DiaryEntry.includes(:user).order("created_at DESC").limit(20)
-
     if params[:display_name]
       user = User.active.find_by_display_name(params[:display_name])
 
       if user
-        @entries = user.diary_entries.visible
+        @entries = user.diary_entries
         @title = I18n.t('diary_entry.feed.user.title', :user => user.display_name)
         @description = I18n.t('diary_entry.feed.user.description', :user => user.display_name)
         @link = "http://#{SERVER_URL}/user/#{user.display_name}/diary"
       else
         render :nothing => true, :status => :not_found
+        return
       end
-    elsif params[:language]
-      @entries = @entries.visible.where(:language_code => params[:language]).joins(:user).where(:users => { :status => ["active", "confirmed"] })
-      @title = I18n.t('diary_entry.feed.language.title', :language_name => Language.find(params[:language]).english_name)
-      @description = I18n.t('diary_entry.feed.language.description', :language_name => Language.find(params[:language]).english_name)
-      @link = "http://#{SERVER_URL}/diary/#{params[:language]}"
     else
-      @entries = @entries.visible.joins(:user).where(:users => { :status => ["active", "confirmed"] })
-      @title = I18n.t('diary_entry.feed.all.title')
-      @description = I18n.t('diary_entry.feed.all.description')
-      @link = "http://#{SERVER_URL}/diary"
+      @entries = DiaryEntry.joins(:user).where(:users => { :status => ["active", "confirmed"] })
+
+      if params[:language]
+        @entries = @entries.where(:language_code => params[:language])
+        @title = I18n.t('diary_entry.feed.language.title', :language_name => Language.find(params[:language]).english_name)
+        @description = I18n.t('diary_entry.feed.language.description', :language_name => Language.find(params[:language]).english_name)
+        @link = "http://#{SERVER_URL}/diary/#{params[:language]}"
+      else
+        @title = I18n.t('diary_entry.feed.all.title')
+        @description = I18n.t('diary_entry.feed.all.description')
+        @link = "http://#{SERVER_URL}/diary"
+      end
     end
+
+    @entries = @entries.visible.includes(:user).order("created_at DESC").limit(20)
   end
 
   def view
diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index ced95dce6..7f5065b2f 100644
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -1,3 +1,5 @@
+# coding: utf-8
+
 class GeocoderController < ApplicationController
   require 'uri'
   require 'net/http'
@@ -5,6 +7,7 @@ class GeocoderController < ApplicationController
 
   before_filter :authorize_web
   before_filter :set_locale
+  before_filter :convert_latlon, :only => [:search]
 
   def search
     @query = params[:query]
@@ -312,4 +315,63 @@ private
   def escape_query(query)
     return URI.escape(query, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]", false, 'N'))
   end
+
+  def convert_latlon
+    @query = params[:query]
+
+    if latlon = @query.match(/^([NS])\s*(\d{1,3}(\.\d*)?)\W*([EW])\s*(\d{1,3}(\.\d*)?)$/).try(:captures) # [NSEW] decimal degrees
+      params[:query] = nsew_to_decdeg(latlon)
+    elsif latlon = @query.match(/^(\d{1,3}(\.\d*)?)\s*([NS])\W*(\d{1,3}(\.\d*)?)\s*([EW])$/).try(:captures) # decimal degrees [NSEW]
+      params[:query] = nsew_to_decdeg(latlon)
+
+    elsif latlon = @query.match(/^([NS])\s*(\d{1,3})°?\s*(\d{1,3}(\.\d*)?)?['′]?\W*([EW])\s*(\d{1,3})°?\s*(\d{1,3}(\.\d*)?)?['′]?$/).try(:captures) # [NSEW] degrees, decimal minutes
+      params[:query] = ddm_to_decdeg(latlon)
+    elsif latlon = @query.match(/^(\d{1,3})°?\s*(\d{1,3}(\.\d*)?)?['′]?\s*([NS])\W*(\d{1,3})°?\s*(\d{1,3}(\.\d*)?)?['′]?\s*([EW])$/).try(:captures) # degrees, decimal minutes [NSEW]
+      params[:query] = ddm_to_decdeg(latlon)
+
+    elsif latlon = @query.match(/^([NS])\s*(\d{1,3})°?\s*(\d{1,2})['′]?\s*(\d{1,3}(\.\d*)?)?["″]?\W*([EW])\s*(\d{1,3})°?\s*(\d{1,2})['′]?\s*(\d{1,3}(\.\d*)?)?["″]?$/).try(:captures) # [NSEW] degrees, minutes, decimal seconds
+      params[:query] = dms_to_decdeg(latlon)
+    elsif latlon = @query.match(/^(\d{1,3})°?\s*(\d{1,2})['′]?\s*(\d{1,3}(\.\d*)?)?["″]\s*([NS])\W*(\d{1,3})°?\s*(\d{1,2})['′]?\s*(\d{1,3}(\.\d*)?)?["″]?\s*([EW])$/).try(:captures) # degrees, minutes, decimal seconds [NSEW]
+      params[:query] = dms_to_decdeg(latlon)
+    else
+      return
+    end
+  end
+
+  def nsew_to_decdeg(captures)
+    begin
+      Float(captures[0])
+      captures[1].downcase != 's' ? lat = captures[0].to_f : lat = -(captures[0].to_f)
+      captures[4].downcase != 'w' ? lon = captures[3].to_f : lon = -(captures[3].to_f)
+    rescue
+      captures[0].downcase != 's' ? lat = captures[1].to_f : lat = -(captures[1].to_f)
+      captures[3].downcase != 'w' ? lon = captures[4].to_f : lon = -(captures[4].to_f)
+    end
+    return "#{lat}, #{lon}"
+  end
+
+  def ddm_to_decdeg(captures)
+    begin
+      Float(captures[0])
+      captures[3].downcase != 's' ? lat = captures[0].to_f + captures[1].to_f/60 : lat = -(captures[0].to_f + captures[1].to_f/60)
+      captures[7].downcase != 'w' ? lon = captures[4].to_f + captures[5].to_f/60 : lon = -(captures[4].to_f + captures[5].to_f/60)
+    rescue
+      captures[0].downcase != 's' ? lat = captures[1].to_f + captures[2].to_f/60 : lat = -(captures[1].to_f + captures[2].to_f/60)
+      captures[4].downcase != 'w' ? lon = captures[5].to_f + captures[6].to_f/60 : lon = -(captures[5].to_f + captures[6].to_f/60)
+    end
+    return "#{lat}, #{lon}"
+  end
+
+  def dms_to_decdeg(captures)
+    begin
+      Float(captures[0])
+      captures[4].downcase != 's' ? lat = captures[0].to_f + (captures[1].to_f + captures[2].to_f/60)/60 : lat = -(captures[0].to_f + (captures[1].to_f + captures[2].to_f/60)/60)
+      captures[9].downcase != 'w' ? lon = captures[5].to_f + (captures[6].to_f + captures[7].to_f/60)/60 : lon = -(captures[5].to_f + (captures[6].to_f + captures[7].to_f/60)/60)
+    rescue
+      captures[0].downcase != 's' ? lat = captures[1].to_f + (captures[2].to_f + captures[3].to_f/60)/60 : lat = -(captures[1].to_f + (captures[2].to_f + captures[3].to_f/60)/60)
+      captures[5].downcase != 'w' ? lon = captures[6].to_f + (captures[7].to_f + captures[8].to_f/60)/60 : lon = -(captures[6].to_f + (captures[7].to_f + captures[8].to_f/60)/60)
+    end
+    return "#{lat}, #{lon}"
+  end
+
 end
diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index c3ffe3c0f..9f797d1d8 100644
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -64,6 +64,7 @@ class WayController < ApplicationController
     way = Way.includes(:nodes => :node_tags).find(params[:id])
     
     if way.visible
+      visible_nodes = {}
       changeset_cache = {}
       user_display_name_cache = {}
 
@@ -71,9 +72,10 @@ class WayController < ApplicationController
       way.nodes.uniq.each do |node|
         if node.visible
           doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)
+          visible_nodes[node.id] = node
         end
       end
-      doc.root << way.to_xml_node(nil, changeset_cache, user_display_name_cache)
+      doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache)
       
       render :text => doc.to_s, :content_type => "text/xml"
     else
diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index c2ec43c9c..ab25d4dbc 100644
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -42,9 +42,37 @@ class OldNode < ActiveRecord::Base
     return doc
   end
 
-  def to_xml_node
+  def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
     el1 = XML::Node.new 'node'
     el1['id'] = self.node_id.to_s
+    el1['version'] = self.version.to_s
+    el1['changeset'] = self.changeset_id.to_s
+
+    if self.visible?
+      el1['lat'] = self.lat.to_s
+      el1['lon'] = self.lon.to_s
+    end
+
+    if changeset_cache.key?(self.changeset_id)
+      # use the cache if available
+    else
+      changeset_cache[self.changeset_id] = self.changeset.user_id
+    end
+
+    user_id = changeset_cache[self.changeset_id]
+
+    if user_display_name_cache.key?(user_id)
+      # use the cache if available
+    elsif self.changeset.user.data_public?
+      user_display_name_cache[user_id] = self.changeset.user.display_name
+    else
+      user_display_name_cache[user_id] = nil
+    end
+
+    if not user_display_name_cache[user_id].nil?
+      el1['user'] = user_display_name_cache[user_id]
+      el1['uid'] = user_id.to_s
+    end
 
     self.tags.each do |k,v|
       el2 = XML::Node.new('tag')
@@ -53,20 +81,8 @@ class OldNode < ActiveRecord::Base
       el1 << el2
     end
 
-    if self.visible?
-      el1['lat'] = self.lat.to_s
-      el1['lon'] = self.lon.to_s
-    end
-    
-    el1['changeset'] = self.changeset.id.to_s
-    if self.changeset.user.data_public?
-      el1['user'] = self.changeset.user.display_name
-      el1['uid'] = self.changeset.user.id.to_s
-    end
-
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
-    el1['version'] = self.version.to_s
     
     el1['redacted'] = self.redaction.id.to_s if self.redacted?
 
diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index 390c142db..b2e86c930 100644
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -93,17 +93,34 @@ class OldRelation < ActiveRecord::Base
     return doc
   end
 
-  def to_xml_node
+  def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
     el1 = XML::Node.new 'relation'
     el1['id'] = self.relation_id.to_s
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
-    if self.changeset.user.data_public?
-      el1['user'] = self.changeset.user.display_name
-      el1['uid'] = self.changeset.user.id.to_s
-    end
     el1['version'] = self.version.to_s
     el1['changeset'] = self.changeset_id.to_s
+
+    if changeset_cache.key?(self.changeset_id)
+      # use the cache if available
+    else
+      changeset_cache[self.changeset_id] = self.changeset.user_id
+    end
+
+    user_id = changeset_cache[self.changeset_id]
+
+    if user_display_name_cache.key?(user_id)
+      # use the cache if available
+    elsif self.changeset.user.data_public?
+      user_display_name_cache[user_id] = self.changeset.user.display_name
+    else
+      user_display_name_cache[user_id] = nil
+    end
+
+    if not user_display_name_cache[user_id].nil?
+      el1['user'] = user_display_name_cache[user_id]
+      el1['uid'] = user_id.to_s
+    end
     
     el1['redacted'] = self.redaction.id.to_s if self.redacted?
     
diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index bc114d73a..591389243 100644
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -92,17 +92,34 @@ class OldWay < ActiveRecord::Base
     @tags = t
   end
 
-  def to_xml_node
+  def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
     el1 = XML::Node.new 'way'
     el1['id'] = self.way_id.to_s
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
-    if self.changeset.user.data_public?
-      el1['user'] = self.changeset.user.display_name
-      el1['uid'] = self.changeset.user.id.to_s
-    end
     el1['version'] = self.version.to_s
-    el1['changeset'] = self.changeset.id.to_s
+    el1['changeset'] = self.changeset_id.to_s
+
+    if changeset_cache.key?(self.changeset_id)
+      # use the cache if available
+    else
+      changeset_cache[self.changeset_id] = self.changeset.user_id
+    end
+
+    user_id = changeset_cache[self.changeset_id]
+
+    if user_display_name_cache.key?(user_id)
+      # use the cache if available
+    elsif self.changeset.user.data_public?
+      user_display_name_cache[user_id] = self.changeset.user.display_name
+    else
+      user_display_name_cache[user_id] = nil
+    end
+
+    if not user_display_name_cache[user_id].nil?
+      el1['user'] = user_display_name_cache[user_id]
+      el1['uid'] = user_id.to_s
+    end
 
     el1['redacted'] = self.redaction.id.to_s if self.redacted?
     
diff --git a/app/models/user.rb b/app/models/user.rb
index 33f01c06b..778afbf8a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -4,9 +4,9 @@ class User < ActiveRecord::Base
   has_many :traces, :conditions => { :visible => true }
   has_many :diary_entries, :order => 'created_at DESC'
   has_many :diary_comments, :order => 'created_at DESC'
-  has_many :messages, :foreign_key => :to_user_id, :conditions => { :to_user_visible => true }, :order => 'sent_on DESC'
+  has_many :messages, :foreign_key => :to_user_id, :conditions => { :to_user_visible => true }, :order => 'sent_on DESC', :include => [:sender, :recipient]
   has_many :new_messages, :class_name => "Message", :foreign_key => :to_user_id, :conditions => { :to_user_visible => true, :message_read => false }, :order => 'sent_on DESC'
-  has_many :sent_messages, :class_name => "Message", :foreign_key => :from_user_id, :conditions => { :from_user_visible => true }, :order => 'sent_on DESC'
+  has_many :sent_messages, :class_name => "Message", :foreign_key => :from_user_id, :conditions => { :from_user_visible => true }, :order => 'sent_on DESC', :include => [:sender, :recipient]
   has_many :friends, :include => :befriendee, :conditions => "users.status IN ('active', 'confirmed')"
   has_many :friend_users, :through => :friends, :source => :befriendee
   has_many :tokens, :class_name => "UserToken"
@@ -144,14 +144,7 @@ class User < ActiveRecord::Base
   end
 
   def is_friends_with?(new_friend)
-    res = false
-    @new_friend = new_friend
-    self.friends.each do |friend|
-      if friend.friend_user_id == @new_friend.id
-        return true
-      end
-    end
-    return false
+    self.friends.where(:friend_user_id => new_friend.id).exists?
   end
 
   ##
diff --git a/app/views/diary_entry/list.html.erb b/app/views/diary_entry/list.html.erb
index 3353fef79..09d8af2fd 100644
--- a/app/views/diary_entry/list.html.erb
+++ b/app/views/diary_entry/list.html.erb
@@ -28,16 +28,25 @@
 <% else %>
   <h4><%= t 'diary_entry.list.recent_entries' %></h4>
 
-<% if @this_user %>
-  <%= render :partial => 'diary_entry', :collection => @entries %>
-<% else %>
-  <%= render :partial => 'diary_list_entry', :collection => @entries %>
-<% end %>
+  <% 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 %>
+  <% if @page > 1 -%>
+    <%= link_to t('diary_entry.list.older_entries'), params.merge(:page => @page - 1 ) %>
+  <% else -%>
+    <%= t('diary_entry.list.older_entries') %>
+  <% end -%>
 
+  |
+
+  <% if @entries.size < @page_size -%>
+    <%= t('diary_entry.list.newer_entries') %>
+  <% else -%>
+    <%= link_to t('diary_entry.list.newer_entries'), params.merge(:page => @page + 1) %>
+  <% end -%>
 <% end %>
 
 <% unless params[:friends] or params[:nearby] -%>
diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb
index 9bbf937cf..1a8ce106d 100644
--- a/config/initializers/cors.rb
+++ b/config/initializers/cors.rb
@@ -1,11 +1,26 @@
 require "rack/cors"
 
+# Mark CORS responses as uncacheable as we don't want a browser to
+# try and reuse a response that had a different origin, even with
+# revalidation, as the origin check will fail.
+module OpenStreetMap
+  class Cors < Rack::Cors
+    def call(env)
+      status, headers, body = super env
+      if headers['Access-Control-Allow-Origin']
+        headers['Cache-Control'] = 'no-cache'
+      end
+      [status, headers, body]
+    end
+  end
+end
+
 # Allow any and all cross-origin requests to the API. Allow any origin, and
 # any headers. Non-browser requests do not have origin or header restrictions,
 # so browser-requests should be similarly permitted. (Though the API does not
 # require any custom headers, Ajax frameworks may automatically add headers
 # such as X-Requested-By to requests.)
-Rails.configuration.middleware.use Rack::Cors do
+Rails.configuration.middleware.use OpenStreetMap::Cors do
   allow do
     origins "*"
     resource "/oauth/*", :headers => :any, :methods => [:get, :post]
diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 48d1ec976..c8bbdcce0 100644
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -41,3 +41,7 @@ I18n::Backend::Simple.include(I18n::Backend::PluralizationFallback)
 I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
 
 I18n.fallbacks.map("no" => "nb")
+
+Rails.configuration.after_initialize do |app|
+  I18n.available_locales
+end
diff --git a/config/locales/af.yml b/config/locales/af.yml
index bce2fcc7f..8c6dbda11 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -778,7 +778,6 @@ af:
       back_to_outbox: Terug na uitboks
       date: Datum
       from: Van
-      reading_your_messages: Besig om u boodskappe te lees
       reply_button: Antwoord
       subject: Onderwerp
       title: Lees boodskap
diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index 657eb9cfa..41261adc1 100644
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -924,8 +924,6 @@ aln:
       back_to_outbox: Kthehu në Dalje
       date: Data
       from: Prej
-      reading_your_messages: Tu i lexu mesazhet e tua
-      reading_your_sent_messages: Tu i lexue mesazhet e dërgume
       reply_button: Përgjigju
       subject: Titulli
       title: Lexo mesazhin
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index a987962fc..679f7d121 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1044,8 +1044,6 @@ ar:
       back_to_outbox: العودة إلى صندوق الصادر
       date: التاريخ
       from: من
-      reading_your_messages: اقرأ الرسائل المرسلة الخاصة بك
-      reading_your_sent_messages: قراءة الرسائل المرسلة الخاصة بك
       reply_button: رد
       subject: الموضوع
       title: اقرأ الرسالة
diff --git a/config/locales/arz.yml b/config/locales/arz.yml
index e49be7635..c9174eb03 100644
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@@ -833,8 +833,6 @@ arz:
       back_to_outbox: العوده إلى صندوق الصادر
       date: التاريخ
       from: من
-      reading_your_messages: اقرأ الرسائل المرسله الخاصه بك
-      reading_your_sent_messages: قراءه الرسائل المرسله الخاصه بك
       reply_button: رد
       subject: الموضوع
       title: اقرأ الرسالة
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index dd99a48a6..df49bb572 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -696,6 +696,8 @@ ast:
           airfield: Aeródromu militar
           barracks: Cuartel
           bunker: Bunker
+        mountain_pass: 
+          "yes": Puertu de montaña
         natural: 
           bay: Golfu
           beach: Playa
@@ -1083,8 +1085,6 @@ ast:
       back_to_outbox: Tornar al buzón de salida
       date: Data
       from: De
-      reading_your_messages: Lleendo los mensaxes
-      reading_your_sent_messages: Lleendo los mensaxes unviaos
       reply_button: Contestar
       subject: Asuntu
       title: Lleer el mensaxe
@@ -1237,7 +1237,7 @@ ast:
       key: "Clave del consumidor:"
       requests: "Pidir los permisos darréu al usuariu:"
       secret: "Pregunta secreta del consumidor:"
-      support_notice: Tenemos sofitu pa HMAC-SHA1 (encamentáu) igual que pa testu planu en mou ssl.
+      support_notice: Tenemos sofitu pa HMAC-SHA1 (encamentáu) y pa robles RSA-SHA1.
       title: Detalles d'OAuth pa %{app_name}
       url: "URL del Token de Solicitú:"
     update: 
diff --git a/config/locales/az.yml b/config/locales/az.yml
index 835f7c151..be20ce30e 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -90,6 +90,15 @@ az:
       box: çərçivə
       closed_at: "Bağlanılıb:"
       created_at: "Yaradılıb:"
+      has_nodes: 
+        one: "%{count} nöqtədən idarətdir"
+        other: "%{count} nöqtədən idarətdir:"
+      has_relations: 
+        one: "%{count} əlaqədən idarətdir"
+        other: "%{count} əlaqədən idarətdir:"
+      has_ways: 
+        one: "%{count} xəttdən idarətdir"
+        other: "%{count} xəttdən idarətdir:"
       no_bounding_box: Bu dəyişikliklər dəsti üçün məhdudlaşdırıcı çərçivə təyin edilməmişdir.
       show_area_box: Ərazi çərçivəsini göstər
     common_details: 
@@ -419,9 +428,9 @@ az:
       south_west: cənub-qərbə
       west: qərbə
     distance: 
-      one: təqribən 1km
+      one: təqribən %{count}km
       other: təqribən %{count}km
-      zero: 1km-dən az
+      zero: 1 km-dən az
     results: 
       more_results: Daha çox nəticə
       no_results: Nəticələr tapılmadı
@@ -920,6 +929,7 @@ az:
     gps_traces_tooltip: GPS cizgilər ilə işləmək
     help: Kömək
     help_centre: Kömək mərkəzi
+    help_title: Layihənin kömək saytı
     history: Tarix
     home: evə
     home_tooltip: Mənim ev yerimi göstər
@@ -949,19 +959,28 @@ az:
     view_tooltip: Xəritəyə bax
     welcome_user_link_tooltip: Sizin şəxsi istifadəçi səhifəniz
     wiki: Viki
+    wiki_title: Layihənin Viki-saytı
   license_page: 
     foreign: 
+      english_link: ingiliscə orijinalına
       title: Bu tərcümə haqqında
     legal_babble: 
+      attribution_example: 
+        alt: Nümunə üçün, veb-səhifədən OpenStreetMap-ə necə istinad vermək
+        title: Müəllifin göstərilməsinin nümunəsi
       contributors_ca_html: <strong>Kanada</strong> GeoBase ®, GeoGratis (© Kanadanın Təbii Ehtiyatlar Departamenti), CanVec (© Kanadanın Təbii Ehtiyatlar Departamenti) və StatCan (Kanadanın Statistika şöbəsinin, Coğrafiya bölməsi) tərəfindən məlumatlar.
       contributors_fr_html: "<strong>Fransa</strong>: Baş Vergi İdarəsi tərəfindən məlumatlar."
       contributors_gb_html: <strong>Böyük Britaniya Krallığı</strong> Ordnance Survey © Crown copyright tərəfindən məlumatlar. Verilənlər bazasına icazə 2010-12.
       contributors_nz_html: <strong>Yeni Zelandiya</strong> Yeni Zelandiyanın torpaq resursları haqqında məlumatlardan. Crown Copyright reserved.
       contributors_title_html: Kimlər bizim layihəyə töhfə verir
+      credit_title_html: OpenStreetMap-ə Necə istinad etmək olar
+      infringement_title_html: Müəllif hüquqlarının pozulması
+      intro_1_html: "OpenStreetMap <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL) lisenziyası üzrə istifadə olunan <i>açıq məlumatlardan</i> ibarətdir."
       more_title_html: Daha çox öyrən
       title_html: Müəllif hüquqları və Lisenziyalar
     native: 
       mapping_link: kartoqrafiyalaşdırmağa başla
+      native_link: azərbaycan versiyası
       title: Bu səhifə haqqında
   message: 
     delete: 
@@ -1008,6 +1027,7 @@ az:
       inbox: gələnlər
       my_inbox: Mənim %{inbox_link}
       outbox: göndərilənlər
+      people_mapping_nearby: yaxınlıqdakı istifadəçilərlə
       subject: Mövzu
       title: Göndərilənlər
       to: Kimə
@@ -1016,8 +1036,6 @@ az:
       back_to_outbox: Göndərilənlərə geri qayıt
       date: Tarix
       from: Kimdən
-      reading_your_messages: Mesajlarını oxu
-      reading_your_sent_messages: Göndərdiyin mesajı oxu
       reply_button: Geri göndər
       subject: Mövzu
       title: Mesajı oxu
@@ -1035,6 +1053,9 @@ az:
     email_confirm_plain: 
       greeting: Salam,
     gpx_notification: 
+      and_no_tags: və teqlərsiz.
+      failure: 
+        more_info_2: "nasazlığı, buradan tapmaq olar:"
       greeting: Salam,
     lost_password: 
       subject: "[OpenStreetMap] Parolu yeniləmək tələbi"
diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index 299596be3..0ab2a07df 100644
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -1028,8 +1028,6 @@ be-Tarask:
       back_to_outbox: Вярнуцца да выходных
       date: Дата
       from: Ад
-      reading_your_messages: Чытаньне Вашых паведамленьняў
-      reading_your_sent_messages: Чытаньне Вашых дасланых паведамленьняў
       reply_button: Адказаць
       subject: Тэма
       title: Чытаць паведамленьне
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 4adb2ab57..b2fcc1e0e 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -170,7 +170,7 @@ br:
         way: hent
     paging_nav: 
       of: eus
-      showing_page: O tiskouez ar bajenn
+      showing_page: pajenn
     redacted: 
       message_html: ↓Stumm %{version} eus an %{type}-mañ na c'hall ket bezañ diskouezet evel m"eo bet aozet. Sellit ouzh %{redaction_link} evit gouzout hiroc'h, mar plij.
       redaction: ↓Aozañ %{id}
@@ -210,7 +210,7 @@ br:
       manually_select: Diuzañ un takad disheñvel gant an dorn
       object_list: 
         api: Tapout an takad-mañ diwar an API
-        back: Diskwel roll an traezoù
+        back: Distreiñ d'ar roll an traezoù
         details: Munudoù
         heading: Roll traezoù
         history: 
@@ -228,6 +228,7 @@ br:
       show_areas: Diskouez an takadoù
       show_history: Diskouez an istor
       unable_to_load_size: "Ne c'haller ket kargañ : re vras eo ment ar voest bevenniñ (%{bbox_size}). Ret eo dezhi bezañ bihanoc'h eget %{max_bbox_size})"
+      view_data: Gwelet ar roadennoù evit gwel red ar gartenn
       wait: Gortozit...
       zoom_or_select: Zoumañ pe diuzañ un takad eus ar gartenn da welet
     tag_details: 
@@ -251,8 +252,8 @@ br:
       way_title: "Hent : %{way_name}"
     way_details: 
       also_part_of: 
-        one: lodenn ivez eus an hent %{related_ways}
-        other: lodenn ivez eus an hentoù %{related_ways}
+        one: lodenn eus an hent %{related_ways}
+        other: lodenn eus an hentoù %{related_ways}
       nodes: "Skoulmoù :"
       part_of: "Lodenn eus :"
     way_history: 
@@ -272,7 +273,7 @@ br:
     changeset_paging_nav: 
       next: War-lerc'h »
       previous: « Kent
-      showing_page: O tiskouez ar bajenn %{page}
+      showing_page: Pajenn %{page}
     changesets: 
       area: Takad
       comment: Addispleg
@@ -280,13 +281,13 @@ br:
       saved_at: Enrollet da
       user: Implijer
     list: 
-      description: Kemmoù diwezhañ
+      description: Gwelet al labourioù graet nevez zo war ar gartenn
       description_bbox: Strolladoù kemmoù e-barzh %{bbox}
       description_friend: Hollad ar c'hemmoù degaset gant ho mignoned
       description_nearby: Hollad kemmoù deuet gant an implijerien a-dost
       description_user: Strolladoù kemmoù gant %{user}
       description_user_bbox: Strolladoù kemmoù gant %{user} e-barzh %{bbox}
-      empty_anon_html: ↓N'eo ket bet aozet c'hoazh
+      empty_anon_html: N'eo ket bet aozet c'hoazh
       empty_user_html: Hañvalout a ra n'ho peus graet kemm ebet. Evit kregiñ ganti, sellit ouzh  <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Sturlevr  an deraouidi</a>.
       heading: Hollad kemmoù
       heading_bbox: Hollad kemmoù
@@ -398,7 +399,7 @@ br:
       format_to_export: Furmad da ezporzhiañ
       image_size: Ment ar skeudenn
       latitude: "Led. :"
-      licence: Aotre implijout
+      licence: Aotre-implijout
       longitude: "Hed. :"
       manually_select: Diuzañ un takad disheñvel gant an dorn
       map_image: Skeudenn gartenn (diskouez ur gwiskad boutin)
@@ -699,6 +700,8 @@ br:
           airfield: Nijva milourel
           barracks: Kazarn
           bunker: Bunker
+        mountain_pass: 
+          "yes": Ode menez
         natural: 
           bay: Bae
           beach: Traezhenn
@@ -1017,7 +1020,7 @@ br:
       infringement_1_html: "Degas a reomp da soñj da genlabourerien OSM ne zleont morse lakaat roadennoù a zeu\neus mammennoù dindan wirioù (da sk. : Google Maps pe kartennoù moullet) hep aotre\nezpleg ar re zo ar gwirioù-aozer ganto."
       infringement_2_html: ma kredit ez eus bet ouzhpennet danvez dindan aotre-implijout e gaou da diaz roadennoù OpenStreetMat pe d'al lec'hienn-mañ, roit an dra-se da c'houzout d'hon <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">argerzh dizober</a>, mar plij, pe skrivit war-eeun war hor <a href="http://dmca.openstreetmap.org/">furmskrid enlinenn</a>.
       infringement_title_html: Terriñ ar gwir-eilañ
-      intro_1_html: "OpenStreetMap is <i>open data</i>, licensed under the <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
+      intro_1_html: "OpenStreetMap zo <i>dindan un aotre-implijout digor</i>, a c'haller kavout en <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
       intro_2_html: "Dieub oc'h da eilañ, da skignañ, da gas ha da azasaat hor c'hartennoù\n  hag hor roadennoù, gant ma root kred da OpenStreetMap ha d'e\n  genlabourerien. Ma kemmit pe ma implijit hor c'hartennoù pe hor roadennoù e labourioù all,\n  ne c'hallit ket skignañ ar re-se dindan un aotre-implijout all. En \n  <a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">legal\ncode</a> e kavot munudoù ho kwirioù hag ho teverioù."
       intro_3_html: "Emañ tammoù hor c'hartennoù hag hon teulioù dindan an aotre-implijout <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative \nCommons Attribution-ShareAlike 2.0</a> license (CC-BY-SA)."
       more_1_html: "Ma fell deoc'h kaout muioc'h a ditouroù diwar-benn adimplij hor roadennoù, lennit <a\n  href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">FAG ar reolennoù</a>."
@@ -1087,8 +1090,6 @@ br:
       back_to_outbox: Distreiñ d'ar voest kas
       date: Deiziad
       from: A-berzh
-      reading_your_messages: O lenn ho kemennadennoù
-      reading_your_sent_messages: O lenn ho kemennadennoù kaset
       reply_button: Respont
       subject: Danvez
       title: Lenn ar gemennadenn
@@ -1219,7 +1220,7 @@ br:
       no_apps: Ha bez' hoc'h eus un arload ho pefe c'hoant da varilhañ evit implijout ar standard %{oauth} ganimp ? Ret eo deoc'h marilhañ hoc'h arload web a-raok dezhi ober rekedoù d'ar servij-mañ.
       register_new: Marilhañ hoc'h arload
       registered_apps: "Marilhet eo an arloadoù arvalien-mañ ganeoc'h :"
-      revoke: Terriñ !
+      revoke: Disteuler !
       title: Ma munudoù OAuth
     new: 
       submit: Marilhañ
@@ -1241,7 +1242,7 @@ br:
       key: "Alc'hwez implijer :"
       requests: "O c'houlenn an aotreoù-mañ digant an implijer :"
       secret: "Sekred an implijer :"
-      support_notice: Skorañ a reomp HMAC-SHA1 (erbedet) hag an destenn diaoz er mod ssl.
+      support_notice: Degemer a reomp ar sinadurioù HMAC-SHA1 (erbedet) ha RSA-SHA1.
       title: Munudoù OAuth evit %{app_name}
       url: "URL ar jedouer reked :"
     update: 
@@ -1418,6 +1419,7 @@ br:
       visibility: "Gwelusted :"
       visibility_help: Petra a dalvez an dra-mañ ?
     list: 
+      description: Furchal ar roud GPS pellgarget nevez zo
       empty_html: N'eus netra da welet amañ. <a href='%{upload_link}'>Pellgargit ur roudenn nevez</a> evit gouzout hiroc'h diwar-benn an tresañ GPS, sellit ouzh ar <abajenn wiki>href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2i</a>.
       public_traces: Roudoù GPS foran
       public_traces_from: Roudoù GPS foran gant %{user}
@@ -1465,7 +1467,7 @@ br:
     trace_paging_nav: 
       newer: ↓Roudoù nevez
       older: ↓Roudoù kozh
-      showing_page: O tiskouez ar bajenn %{page}
+      showing_page: Page %{page}
     view: 
       delete_track: Dilemel ar roudenn-mañ
       description: "Deskrivadur :"
@@ -1569,8 +1571,8 @@ br:
       heading: Implijerien
       hide: Kuzhat an implijerien diuzet
       showing: 
-        one: Diskwel ar bajenn %{page} (%{first_item} war %{items})
-        other: Diskwel ar bajenn %{page} (%{first_item}-%{last_item} war %{items})
+        one: Pajenn %{page} (%{first_item} diwar %{items})
+        other: Pajenn %{page} (%{first_item}-%{last_item} diwar %{items})
       summary: "%{name} krouet eus %{ip_address} d'an %{date}"
       summary_no_ip: "%{name} krouet d'an %{date}"
       title: Implijerien
@@ -1632,7 +1634,7 @@ br:
       button: Ozhpennañ evel mignon
       failed: Ho tigarez, n'eus ket bet gallet ouzhpennañ %{name} evel mignon.
       heading: ↓Ouzhpennañ %{user} evel mignon ?
-      success: "%{name} zo ho mignon bremañ."
+      success: "%{name} eo ho mignon bremañ !"
     new: 
       confirm email address: "Kadarnaat ar chomlec'h postel :"
       confirm password: "Kadarnaat ar ger-tremen :"
@@ -1665,8 +1667,8 @@ br:
       nearby mapper: Kartennour en ardremez
       your location: Ho lec'hiadur
     remove_friend: 
-      button: ↓Lemel eus ar vignoned
-      heading: ↓Lemel %{user} eus ar vignoned ?
+      button: Lemel eus ar vignoned
+      heading: Lemel %{user} eus ar vignoned ?
       not_a_friend: "%{name} n'eo ket unan eus ho mignoned."
       success: "%{name} zo bet lamet eus ho mignoned."
     reset_password: 
@@ -1701,7 +1703,7 @@ br:
       you need to accept or decline: Lennit da gentañ Termenoù ar berzhidi nevez ha goude-se nac'hit pe asantit evit gallout kenderc'hel.
     view: 
       activate_user: gweredekaat an implijer-mañ
-      add as friend: Ouzhpennañ evel mignon
+      add as friend: Ouzhpennañ d'ar vignoned
       ago: (%{time_in_words_ago} zo)
       block_history: stankadurioù resevet
       blocks by me: stankadurioù graet ganin
@@ -1721,10 +1723,10 @@ br:
       diary: deizlevr
       edits: kemmoù
       email address: "Chomlec'h postel :"
-      friends_changesets: Furchal dre an holl gemmoù degaset gant ho mignoned
-      friends_diaries: Furchal holl enmontoù ar marilh personel gant e vignoned
+      friends_changesets: Strolladoù kemmoù graet gant mignoned
+      friends_diaries: Enmonedoù deizlevr ar vignoned
       hide_user: kuzhat an implijer-mañ
-      if set location: Ma lakait ho lec'hiadur e teuio ur gartenn vrav war wel dindani. Gallout a rit lakaat ho lec'hiadur war ho pajenn %{settings_link}.
+      if set location: Lakait ho lec'h-annez war ar bajenn %{settings_link} da welet an implijerien war-dro.
       km away: war-hed %{count} km
       latest edit: "Kemm ziwezhañ %{ago} :"
       m away: war-hed %{count} m
@@ -1736,13 +1738,13 @@ br:
       my settings: ma arventennoù
       my traces: ma roudoù
       nearby users: "Implijerien all tost deoc'h :"
-      nearby_changesets: Furchal an holl holladoù kemmoù gant an implijerien a-dost
-      nearby_diaries: Furchal holl enmontoù ar marilh personel gant implijerien a-dost
+      nearby_changesets: Strolladoù kemmoù an implijer tro-war-dro
+      nearby_diaries: Enmonedoù deizlevr an implijerien tro-war-dro
       new diary entry: enmoned nevez en deizlevr
       no friends: N'hoc'h eus ouzhpennet mignon ebet c'hoazh.
       no nearby users: N'eus implijer ebet all en ardremez c'hoazh.
       oauth settings: arventennoù oauth
-      remove as friend: Lemel evel mignon
+      remove as friend: Lemel eus ar vignoned
       role: 
         administrator: Ur merour eo an implijer-mañ
         grant: 
@@ -1750,8 +1752,8 @@ br:
           moderator: Reiñ ar moned habaskaer
         moderator: Un habaskaer eo an implijer-mañ
         revoke: 
-          administrator: Terriñ ar moned merour
-          moderator: Terriñ ar moned habaskaer
+          administrator: Disteurel ar moned merour
+          moderator: Disteurel ar moned habaskaer
       send message: Kas ur gemennadenn
       settings_link_text: arventennoù
       spam score: "Notenn evit ar strob :"
@@ -1794,7 +1796,7 @@ br:
       heading: Roll stankadurioù an implijer
       title: Stankadurioù an implijer
     model: 
-      non_moderator_revoke: Ret eo bezañ un habaskaer evit terriñ ur stankadur.
+      non_moderator_revoke: Ret eo bezañ un habaskaer evit disteurel ur stankadur.
       non_moderator_update: Ret eo deoc'h bezañ habaskaer evit krouiñ pe hizivaat ur stankadur.
     new: 
       back: Gwelet an holl stankadurioù
@@ -1816,12 +1818,12 @@ br:
       edit: Aozañ
       next: ↓War-lerc'h »
       not_revoked: (n'eo ket torret)
-      previous: ↓« Previous
+      previous: ↓« Kent
       reason: Abeg evit stankañ
-      revoke: Terriñ !
+      revoke: Disteuler !
       revoker_name: Torret gant
       show: Diskouez
-      showing_page: ↓O tiskouez ar bajenn %{page}
+      showing_page: Page %{page}
       status: Statud
     period: 
       one: 1 eurvezh
@@ -1831,9 +1833,9 @@ br:
       flash: Torret eo bet ar stankadur-mañ.
       heading: O lemel ur stankadur war %{block_on} gant %{block_by}
       past: Echu eo ar stankadur-mañ %{time} zo ha ne c'hall ket bezañ torret bremañ.
-      revoke: Terriñ !
+      revoke: Disteuler !
       time_future: Echu e vo ar stankadur-mañ a-benn %{time}.
-      title: O terriñ ur stankadur evit %{block_on}
+      title: O tisteurel ur stankadur evit %{block_on}
     show: 
       back: Gwelet an holl stankadurioù
       confirm: Ha sur oc'h ?
@@ -1841,7 +1843,7 @@ br:
       heading: "%{block_on} stanket gant %{block_by}"
       needs_view: Ret eo d'an implijer kevreañ a-raok ma vefe diverket ar stankadur-mañ.
       reason: "Abeg ar stankadur :"
-      revoke: Terriñ !
+      revoke: Disteuler !
       revoker: "Torrer :"
       show: Diskouez
       status: Statud
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 43dd6c5f2..8accc2392 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1088,8 +1088,6 @@ bs:
       back_to_outbox: Nazad u odlaznu poštu
       date: Datum
       from: Od
-      reading_your_messages: Čitanje Vaših poruka
-      reading_your_sent_messages: Čitanje Vaših poslanih poruka
       reply_button: Odgovoriti
       subject: Predmet
       title: Pročitati poruku
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index d8340add7..2d43dfc3c 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -711,6 +711,8 @@ ca:
           airfield: Aeroport militar
           barracks: Caserna
           bunker: Búnquer
+        mountain_pass: 
+          "yes": Coll
         natural: 
           bay: Badia
           beach: Platja
@@ -1098,8 +1100,6 @@ ca:
       back_to_outbox: Torna a la safata de sortida
       date: Data
       from: De
-      reading_your_messages: S'estan llegint els missatges
-      reading_your_sent_messages: S'estan llegint els missatges enviats
       reply_button: Respon
       subject: Assumpte
       title: Llegeix el missatge
@@ -1252,7 +1252,7 @@ ca:
       key: "Clau de consum:"
       requests: "Sol·licitar els permisos següents des de l'usuari:"
       secret: "Secret de consum:"
-      support_notice: Donem suport a HMAC-SHA1 (recomanat), així com text sense format en el mode de ssl.
+      support_notice: Suportem les signatures de tipus HMAC-SHA1 (recomanat) i RSA-SHA1.
       title: OAuth detalls per %{app_name}
       url: "Sol·licitud Token URL:"
     update: 
@@ -1740,7 +1740,7 @@ ca:
       km away: "%{count}km de distància"
       latest edit: "Última edició %{ago}:"
       m away: "%{count}m de distància"
-      mapper since: "Mapant des de:"
+      mapper since: "Cartografiant des de:"
       moderator_history: blocs donats
       my comments: els meus comentaris
       my diary: el meu diari
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 7cc59153f..e7634c9ee 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -713,6 +713,8 @@ cs:
           airfield: Vojenské letiště
           barracks: Kasárna
           bunker: Bunkr
+        mountain_pass: 
+          "yes": Průsmyk
         natural: 
           bay: Záliv
           beach: Pláž
@@ -1105,8 +1107,6 @@ cs:
       back_to_outbox: Zpět do odeslaných zpráv
       date: Datum
       from: Od
-      reading_your_messages: Čtení zpráv
-      reading_your_sent_messages: Čtení odeslaných zpráv
       reply_button: Odpovědět
       subject: Předmět
       title: Čtení zprávy
@@ -1261,7 +1261,7 @@ cs:
       key: "Uživatelský klíč:"
       requests: "Uživatelé se žádají o následující oprávnění:"
       secret: "Tajný klíč uživatele:"
-      support_notice: Podporujeme HMAC-SHA1 (doporučeno) i prostý text v režimu SSL.
+      support_notice: Podporujeme HMAC-SHA1 (doporučeno) a podpisy RSA-SHA1.
       title: Podrobnosti OAuth pro %{app_name}
       url: "URL tokenu požadavku:"
     update: 
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 5b838e97b..7753146d5 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1,12 +1,15 @@
 # Messages for Danish (dansk)
 # Exported from translatewiki.net
 # Export driver: syck-pecl
+# Author: Brufnus
 # Author: Christian List
 # Author: Ebbe
+# Author: Fenrisdk
 # Author: Freek
 # Author: Gnonthgol
 # Author: Gorbi
 # Author: Hylle
+# Author: Kaare
 # Author: Nemo bis
 # Author: OleLaursen
 # Author: Peter Alberti
@@ -706,6 +709,8 @@ da:
           airfield: Militær flyveplads
           barracks: Kaserne
           bunker: Bunker
+        mountain_pass: 
+          "yes": Bjergpas
         natural: 
           bay: Bugt
           beach: Strand
@@ -966,7 +971,7 @@ da:
     intro_1: OpenStreetMap er et frit kort over hele verden, lavet af folk som dig.
     intro_2_create_account: Opret en brugerkonto
     intro_2_download: hent
-    intro_2_html: Dataene er gratis at %{download} og %{use} under sin %{license}. %{create_account} for at forbedre kortet.
+    intro_2_html: Dataene kan frit [[%{download}|hentes]] og [[%{use}|anvendes]] under den [[%{license}|Ã¥bne licens]]. %{create_account} for at forbedre kortet.
     intro_2_license: åben licens
     intro_2_use: brug
     log_in: log på
@@ -1092,8 +1097,6 @@ da:
       back_to_outbox: Tilbage til udbakke
       date: Dato
       from: Fra
-      reading_your_messages: Læser dine beskeder
-      reading_your_sent_messages: Læser dine sendte beskeder
       reply_button: Svar
       subject: Emne
       title: Læs besked
@@ -1246,7 +1249,7 @@ da:
       key: "Forbrugernøgle:"
       requests: "Anmoder brugeren om følgende tilladelser:"
       secret: "Forbrugerhemmelighed:"
-      support_notice: Vi understøtter HMAC-SHA1 (anbefales) og almindelig tekst i SSL-tilstand.
+      support_notice: Vi understøtter HMAC-SHA1- (anbefales) og RSA-SHA1-signaturer.
       title: OAuth detaljer for %{app_name}
       url: "Request Token URL:"
     update: 
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 1aa59411e..338c8bbf1 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -721,6 +721,8 @@ de:
           airfield: Militärflugplatz
           barracks: Kaserne
           bunker: Bunker
+        mountain_pass: 
+          "yes": Gebirgspass
         natural: 
           bay: Bucht
           beach: Strand
@@ -1127,8 +1129,6 @@ de:
       back_to_outbox: Zurück zu Gesendete Nachrichten
       date: Datum
       from: Absender
-      reading_your_messages: Eigene Nachrichten
-      reading_your_sent_messages: Deine versendeten Nachrichten lesen
       reply_button: Antworten
       subject: Betreff
       title: Nachricht lesen
@@ -1283,7 +1283,7 @@ de:
       key: "Schlüssel:"
       requests: "Die Benutzer werden um Folgendes um Erlaubnis gebeten:"
       secret: "Geheimnis:"
-      support_notice: Wir unterstützen HMAC-SHA1 (empfolen) und Reintext im SSL-Modus.
+      support_notice: Wir unterstützen HMAC-SHA1 (empfohlen) und RSA-SHA1-Signaturen.
       title: OAuth-Einzelheiten für %{app_name}
       url: "Tokenanfrage-URL:"
     update: 
diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index a5cba5aae..962464777 100644
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -947,7 +947,7 @@ diq:
     partial: 
       confirm: Vac welay?
       creator_name: Vıraştoğ
-      display_name: Karberê kılitbiyaey
+      display_name: Karberê kılitbiyayey
       edit: Timar ke
       next: Peyên »
       not_revoked: (nê terkiyayo)
diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index 65b1a53ad..61979a99a 100644
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -172,7 +172,7 @@ dsb:
         way: puś
     paging_nav: 
       of: z
-      showing_page: Pokazujo se bok
+      showing_page: bok
     redacted: 
       message_html: Wersija %{version} toś togo %{type}a njedajo se pokazaś, dokulaž jo se južo redigěrowała. Pšosym, glědaj %{redaction_link} za drobnostki.
       redaction: Redakcija %{id}
@@ -212,7 +212,7 @@ dsb:
       manually_select: Drugi wurězk wubraś
       object_list: 
         api: Toś ten wurězk z API wótwółaś
-        back: Lisćinu objektow zwobrazniś
+        back: Slědk k lisćinje objektow
         details: Drobnostki
         heading: Lisćina objektow
         history: 
@@ -230,6 +230,7 @@ dsb:
       show_areas: Wobcerki pokazaś
       show_history: Historiju pokazaś
       unable_to_load_size: "Njejo móžno zacytaś: Wjelikosć wobłuka %{bbox_size} jo pśewjelika (musy mjeńša ako %{max_bbox_size} byś)"
+      view_data: Daty aktualnego kórtowego wurězka zwobrazniś
       wait: Cakaś...
       zoom_or_select: Kórtu powětšyś abo kórtowy wurězk wubraś
     tag_details: 
@@ -253,10 +254,10 @@ dsb:
       way_title: "Puś: %{way_name}"
     way_details: 
       also_part_of: 
-        few: teke źěl puśow %{related_ways}
-        one: teke źěl puśa %{related_ways}
-        other: teke źěl puśow %{related_ways}
-        two: teke źěl puśowu %{related_ways}
+        few: źěl puśow %{related_ways}
+        one: źěl puśa %{related_ways}
+        other: źěl puśow %{related_ways}
+        two: źěl puśowu %{related_ways}
       nodes: "Suki:"
       part_of: "Źěl wót:"
     way_history: 
@@ -276,7 +277,7 @@ dsb:
     changeset_paging_nav: 
       next: Pśiducy »
       previous: « Pjerwjejšny
-      showing_page: Pokazujo se bok %{page}
+      showing_page: Bok %{page}
     changesets: 
       area: Wurězk
       comment: Komentar
@@ -284,13 +285,13 @@ dsb:
       saved_at: Datum składowanja
       user: Wužywaŕ
     list: 
-      description: Aktualne změny
+      description: Nejnowše pśinoski za kórtu pśeglědaś
       description_bbox: Sajźby změnow w %{bbox}
       description_friend: Změny twójich pśijaśelow
       description_nearby: Sajźby změnow wužywarjow w bliskosći
       description_user: Sajźby změnow wót %{user}
       description_user_bbox: Sajźby změnow wót %{user} w %{bbox}
-      empty_anon_html: Doněnta žedne změny njecynjone
+      empty_anon_html: Doněnta žedne změny njecynjone.
       empty_user_html: Zda se, až hyšći njejsy žedne změny pśewjadł. Aby zachopił, pśecytaj <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Beginners Guide (wjednik za zachopjeńkarjow)</a>.
       heading: Sajźby změnow
       heading_bbox: Sajźby změnow
@@ -323,8 +324,9 @@ dsb:
       comment_count: 
         few: "%{count} komentary"
         one: 1 komentar
-        other: "%{count} komentarow"
+        other: "%{count} komentary"
         two: "%{count} komentara"
+        zero: Žedne komentary%{count} komentarow
       comment_link: Komentar k toś tomu zapiskoju
       confirm: Wobkšuśiś
       edit_link: Toś ten zapisk wobźěłaś
@@ -359,7 +361,7 @@ dsb:
       newer_entries: Nowše zapiski
       no_entries: Žedne zapiski dnjownika
       older_entries: Starše zapiski
-      recent_entries: "Nejnowše zapiski dnjownika:"
+      recent_entries: Nejnowše zapiski dnjownika
       title: Dnjowniki wužywarjow
       title_friends: Dnjowniki pśijaśelow
       title_nearby: Dnjowniki wužywarjow w bliskosći
@@ -706,6 +708,8 @@ dsb:
           airfield: Wójarske lětanišćo
           barracks: Kazerna
           bunker: Bunker
+        mountain_pass: 
+          "yes": Górski pas
         natural: 
           bay: Zalew
           beach: Pśibrjog
@@ -1019,15 +1023,17 @@ dsb:
       contributors_title_html: Naše sobustatkujuce
       contributors_za_html: "<strong>Pódpołdnjowa Afrika</strong>: Wopśimujo daty z  <a href=\"http://www.ngi.gov.za/\">Chief Directorate:  National Geo-Spatial Information</a>, Statne awtorske pšawo wuměnjone."
       credit_1_html: Pominamy se, až  pódawaš sobustatkujucych &ldquo;&copy; OpenStreetMap&rdquo;.
-      credit_2_html: Źož jo móžno, OpenStreetMap by měł wótkaz do <a href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a> a CC BY-SA do <a href="http://creativecommons.org/licenses/by-sa/2.0/">http://creativecommons.org/licenses/by-sa/2.0/</a> měś. Jolic wužywaš medij, źož wótkaze njejsu móžno (na pś. wuśišćane źěło), naraźujomy, až pokazujoš swójich cytarjow na www.openstreetmap.org a na www.creativecommons.org.
+      credit_2_html: Musyš teke wujasniś, až daty stoje pód licencu Open Database, a, jolicnaše kórtowe kachle se wužywaju, až kartografija licencěrujo se pód CC-BY-SA licencuje. Móžoš to cyniś, z tym až wótkazujoš do <a href="http://www.openstreetmap.org/copyright">toś togo boka awtorskego pšawa</a>. Alternatiwnje, a ako pótrěbnosć, jolic rozdźělujoš OSM w datowem formje, móžoš direktnje k licencam pomjenjowaś a wótkazaś. W medijach, źož wótkaze njejsu móžno (na pś. wuśišćane źěła), naraźujomy śi, twójich cytarjow na openstreetmap.org (snaź z tym až rozšyrjujoš 'OpenStreetMap' k toś tej połnej adresy), na opendatacommons.org a, jeli to je relewantne, na creativecommons.org dopomnjeś.
       credit_3_html: "Za pśepytujobnu elektronisku kórtu by měło se źěkowanje w rožku kórty pokazaś. Na pśikład:"
       credit_title_html: Kak naspomnjeś awtorstwo OpenStreetMap
+      infringement_1_html: Sobustatkujucych OSM napominamy, až njedodawaju nigda daty ze žrědłow, kótarež su pśez awtorske pšawo šćitane (na pś. z Google Maps abo z wuśišćanych kórtow) bźez wurazneje dowólnosći awtorow.
+      infringement_2_html: Joli měniš, aý awtorskopšawniski šćitany material jo se datowej bance OpenStreetMap abo toś tomu sedłoju bźez dowólnosći pśidał, póśěguj se pšosym na našo <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">póstupowanje za wótwónoźowanje wopśimjeśa</a>abo daj to direktnje na našom <a href="http://dmca.openstreetmap.org/">formularnem boku</a> k wěsći.
       infringement_title_html: Pśejźenje stwóriśelskego pšawa
-      intro_1_html: "OpenStreetMap is <i>open data</i>, licensed under the <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
+      intro_1_html: "OpenStreetMap su <i>zjawne daty</i>, licencěrowane pód licencu <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database</a> (ODbL)."
       intro_2_html: Móžoš naše daty kopěrowaś, rozdźěliś, pśenjasć a pśiměriś, tak dłujko ako  naspomnjejoš OpenStreetMap a jich sobustatkujucych. Jolic změnijoš naše kórty abo daty abo zepěraš se na nje, móžoš wuslědk jano pód teju sameju licencu rozdźěliś. Dopołny <a href="http://opendatacommons.org/licenses/odbl/1.0/">pšawniski code</a> wujasnjujo twóje pšawa a zagronitosći.
       intro_3_html: Kartografija w našych kórtowych kachlach a naša dokumentacija stej pód licencu <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA) licencěrowanej.
       more_1_html: Cytaj wěcej wó wužywanju našych datow a kak dajo se nas pśipóznaś pód <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Ceste pšawniske pšašenja</a>.
-      more_2_html: Sobustatkujucych OSM napominamy, až njedodawaju nigda daty ze žrědłow, kótarež su pśez awtorske pšawo šćitane (na pś. z Google Maps abo z wuśišćanych kórtow) bźez wurazneje dowólnosći awtorow.
+      more_2_html: "Lěcrownož OpenStreetMap wobstoj ze zjawnych datow, njamóžomy dermotny kórtowy API za wuwijarjow tśeśich póbitowaś. \nGlědaj naše <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">pšawidła za wužywanje API</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Pšawidła za wužywanje kachlow</a> a <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Pšawidła za wužywanje Nominatim</a>."
       more_title_html: Dalšne informacije
       title_html: Awtorske pšawo a licenca
     native: 
@@ -1099,8 +1105,6 @@ dsb:
       back_to_outbox: Slědk k pósłanym powěsćam
       date: Datum
       from: Wót
-      reading_your_messages: Swójske powěsći
-      reading_your_sent_messages: Twóje rozpósłane powěsći cytaś
       reply_button: Wótegroniś
       subject: Temowe nadpismo
       title: Powěsć cytaś
@@ -1164,9 +1168,11 @@ dsb:
       header: "%{from_user} jo śi pósłał powěsć pśez OpenStreetMap z temowym nadpismom %{subject}:"
       hi: Witaj %{to_user},
     signup_confirm: 
+      confirm: "Nježli až cynimy něco, musymy wobkšuśiś, až toś to napšašowanje pśiźo wóte tebje, jolic tomu tak jo, klikni pšosym na slědujucy wótkaz, aby swójo konto wobkšuśił:"
       created: Něchten (naźejamy se ty) jo rowno konto na %{site_url} załožył.
       greeting: Witaj!
       subject: "[OpenStreetMap] Witaj do OpenStreetMap"
+      welcome: My by śi rady witali a śi pśidatne informacije dali, aby ty mógał zachopiś.
     signup_confirm_html: 
       ask_questions: Móžoš se za něcym wó OpenStreetMap na našom sedle <a href="http://help.openstreetmap.org/">Pšašanja a wótegrona</a> pšašaś.
       current_user: Lisćina aktualnych wužywarjow w kategorijach pó jich městnje w swěśe stoj pód <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a> k dispoziciji.
@@ -1185,6 +1191,7 @@ dsb:
       more_videos: "Dalšne wideo su how:"
       opengeodata: "OpenGeoData.org jo blog załožarja OpenStreetMap Steve Coast a ma teke podkasty:"
       the_wiki: "Dalšne informacije namakajoš na wikiju OpenStreetMap:"
+      user_wiki_page: Porucujo se, až napórajoš wužywarski wikibok, kótaryž wopśimujo kategorijowe marki, kótarež wóznamjenjuju, źož sy, ako na pś. [[Kategorija:Wužywarje_z_Chóśebuza]].
       wiki_signup: "Móžoš se teke za wiki OpenStreetMap registrěrowaś:"
   oauth: 
     oauthorize: 
@@ -1250,7 +1257,7 @@ dsb:
       key: "Kluc pśetrjebowarja:"
       requests: "Pominaju se slědujuce pšawa wót wužywarja:"
       secret: "Pótajmnosć pśetrjebowarja:"
-      support_notice: Pódpěramy HMAC-SHA1 (pórucujo se) a lutny tekst w modusu SSL.
+      support_notice: Pódpěramy HMAC-SHA1 (pórucujo se) a signatury RSA_SH1.
       title: OAuth-drobnostki za %{app_name}
       url: "URL za napšašowański token:"
     update: 
@@ -1427,6 +1434,7 @@ dsb:
       visibility: "Widobnosć:"
       visibility_help: Co to groni?
     list: 
+      description: Nejnowše nagraśa GPS-cerow pśepytaś
       empty_html: How njejo nic. <a href='%{upload_link}'>Nagraj nowy slěd</a> abo wukni wěcej wó GPS-slědowanju na <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wikijowem boku</a>.
       public_traces: Zjawne GPS-slědy
       public_traces_from: Zjawne GPS-slědy wót %{user}
@@ -1474,7 +1482,7 @@ dsb:
     trace_paging_nav: 
       newer: Nowše slědy
       older: Starše slědy
-      showing_page: Pokazujo se bok %{page}
+      showing_page: Bok %{page}
     view: 
       delete_track: Toś tu ceru wulašowaś
       description: "Wopisanje:"
@@ -1577,8 +1585,8 @@ dsb:
       heading: Wužywarje
       hide: Wubranych wužywarjow schowaś
       showing: 
-        one: Pokazujo se bok %{page} (%{first_item} z %{items})
-        other: Pokazujo se bok %{page} (%{first_item}-%{last_item} z %{items})
+        one: Bok %{page} (%{first_item} z %{items})
+        other: Bok %{page} (%{first_item}-%{last_item} z %{items})
       summary: "%{name} wót %{ip_address} dnja %{date} napórany"
       summary_no_ip: "%{name} dnja %{date} napórany"
       title: Wužywarje
@@ -1640,7 +1648,7 @@ dsb:
       button: Ako pśijaśela pśidaś
       failed: Bóžko njejo se raźiło, %{name} ako twójogo pśijaśela pśidaś.
       heading: "%{user} ako pśijaśela pśidaś?"
-      success: "%{name} jo něnto twój pśijaśel."
+      success: "%{name} jo něnto twój pśijaśel!"
     new: 
       confirm email address: "E-mailowu adresu wobkšuśiś:"
       confirm password: "Gronidło wobkšuśiś:"
@@ -1673,7 +1681,7 @@ dsb:
       nearby mapper: Kartěrowaŕ w bliskosći
       your location: Twójo městno
     remove_friend: 
-      button: Ako pśijaśela wótpóraś
+      button: Pśijaśela wótpóraś
       heading: "%{user} ako pśijaśela wótpóraś?"
       not_a_friend: "%{name} njejo twój pśijaśel."
       success: "%{name} jo se z twójich pśijaśelow wótpórał."
@@ -1709,7 +1717,7 @@ dsb:
       you need to accept or decline: Pšosym pśecytaj nowe wužywarske wuměnjenja a akceptěruj abo wótpokaž je, nježli až dalej cyniš.
     view: 
       activate_user: toś togo wužywarja aktiwěrowaś
-      add as friend: ako pśijaśela pśidaś
+      add as friend: pśijaśela pśidaś
       ago: (pśed %{time_in_words_ago})
       block_history: dostane blokěrowanja
       blocks by me: blokěrowanja wóte mnjo
@@ -1729,10 +1737,10 @@ dsb:
       diary: dnjownik
       edits: změny
       email address: "E-mailowa adresa:"
-      friends_changesets: Sajźby změnow twójich pśijaśelow pśepytaś
-      friends_diaries: Wšykne dnjownikowe zapiski pśijaśelow pśepytaś
+      friends_changesets: Sajźby změnow twójich pśijaśelow
+      friends_diaries: dnjownikowe zapiski pśijaśelow
       hide_user: toś togo wužywarja schowaś
-      if set location: Jolic sy swójo městno nastajił, rědna kórta a někotare informacije pokažu se dołojce. Móžoś swójo stojnišćo na boku %{settings_link} nastajiś.
+      if set location: Pódaj swójo stojnišćo na boku  %{settings_link}, a by wiźeł wužywarjow w swójej bliskosći.
       km away: "%{count} km zdalony"
       latest edit: "Nejnowša změna %{ago}:"
       m away: "%{count} m zdalony"
@@ -1744,8 +1752,8 @@ dsb:
       my settings: móje nastajenja
       my traces: móje slědy
       nearby users: Druge wužywarje w bliskosći
-      nearby_changesets: Wšykne sajźby změnow wužywarjow w bliskosći pśepytaś
-      nearby_diaries: Wšykne dnjownikowe zapiski wužywarjow w bliskosći pśepytaś
+      nearby_changesets: sajźby změnow wužywarjow w bliskosći
+      nearby_diaries: dnjownikowe zapiski wužywarjow w bliskosći
       new diary entry: nowy dnjownikowy zapisk
       no friends: Hyšći njejsy žednych pśijaśelow pśidał.
       no nearby users: Hyšći njejsu žedne wužywarje, kótarež kartěruju w bliskosći.
@@ -1829,7 +1837,7 @@ dsb:
       revoke: Wótpóraś!
       revoker_name: Wótpórany wót
       show: Pokazaś
-      showing_page: Pokazujo se bok %{page}
+      showing_page: Bok %{page}
       status: Status
     period: 
       few: "%{count} góźiny"
diff --git a/config/locales/el.yml b/config/locales/el.yml
index f4fd12724..3b29235f7 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -85,6 +85,8 @@ el:
   application: 
     require_cookies: 
       cookies_needed: Φαίνεται ότι έχετε τα cookies απενεργοποιημένα - παρακαλούμε ενεργοποιήστε τα cookies στο πρόγραμμα περιήγησής σας πριν συνεχίσετε.
+    require_moderator: 
+      not_a_moderator: Θα πρέπει να είστε μεσολαβητής για να εκτελέσετε αυτή την ενέργεια.
   browse: 
     changeset: 
       changeset: "Ομάδα αλλαγών: %{id}"
@@ -141,6 +143,13 @@ el:
         prev_node_tooltip: Προηγούμενος κόμβος
         prev_relation_tooltip: Προηγούμενη σχέση
         prev_way_tooltip: Προηγούμενη διαδρομή
+      paging: 
+        all: 
+          next: "%{id} »"
+          prev: « %{id}
+        user: 
+          next: "%{id} »"
+          prev: « %{id}
       user: 
         name_changeset_tooltip: Προβολή αλλαγών από %{user}
         next_changeset_tooltip: Επόμενη επεξεργασία από τον %{user}
@@ -168,8 +177,9 @@ el:
         way: διαδρομή
     paging_nav: 
       of: από
-      showing_page: Εμφάνιση σελίδας
+      showing_page: σελίδα
     redacted: 
+      redaction: Αναθεώρηση %{id}
       type: 
         node: Κόμβος
         relation: σχέση
@@ -188,6 +198,7 @@ el:
       relation_history_title: "Ιστορικό σχέσης: %{relation_name}"
       view_details: Προβολή λεπτομερειών
     relation_member: 
+      entry: "%{type} %{name}"
       entry_role: "%{type} %{name} ως %{role}"
       type: 
         node: Κόμβος
@@ -206,7 +217,7 @@ el:
       manually_select: Χειροκίνητη επιλογή διαφορετικής περιοχής
       object_list: 
         api: Ανάκτηση περιοχής από το API
-        back: Εμφάνιση λίστας αντικειμένων
+        back: Πίσω στον κατάλογο αντικειμένων
         details: Λεπτομέρειες
         heading: Λίστα αντικειμένων
         history: 
@@ -224,6 +235,7 @@ el:
       show_areas: Εμφάνιση περιοχών
       show_history: Προβολή ιστορικού
       unable_to_load_size: "Δεν είναι δυνατή η φόρτωση: το μέγεθος %{bbox_size} του πλαισίου οριοθέτησης είναι πολύ μεγάλο (πρέπει να είναι μικρότερο από %{max_bbox_size})"
+      view_data: Προβολή δεδομένων στην τρέχουσα προβολή του χάρτη
       wait: Αναμονή...
       zoom_or_select: Μεγέθυνση ή επιλογή περιοχής του χάρτη προς εμφάνιση
     tag_details: 
@@ -247,8 +259,8 @@ el:
       way_title: "Διαδρομή: %{way_name}"
     way_details: 
       also_part_of: 
-        one: επίσης μέρος της διαδρομής %{related_ways}
-        other: επίσης μέρος των διαδρομών %{related_ways}
+        one: μέρος της διαδρομής %{related_ways}
+        other: μέρος των διαδρομών %{related_ways}
       nodes: "Κόμβοι:"
       part_of: "Μέρος του:"
     way_history: 
@@ -268,7 +280,7 @@ el:
     changeset_paging_nav: 
       next: Επόμενο »
       previous: « Προηγούμενο
-      showing_page: Εμφάνιση σελίδας %{page}
+      showing_page: Σελίδα %{page}
     changesets: 
       area: Περιοχή
       comment: Σχόλιο
@@ -276,13 +288,13 @@ el:
       saved_at: Αποθήκευση στις
       user: Χρήστης
     list: 
-      description: Πρόσφατες αλλαγές
+      description: Αναζήτηση πρόσφατων συνεισφορών στο χάρτη
       description_bbox: Ομάδες αλλαγών μεταξύ %{bbox}
       description_friend: Ομάδες αλλαγών από τους φίλους σας
       description_nearby: Ομάδες αλλαγών από κοντινούς χρήστες
       description_user: Ομάδες αλλαγών από %{user}
       description_user_bbox: Ομάδες αλλαγών από %{user} μεταξύ %{bbox}
-      empty_anon_html: Δεν έχει γίνει ακόμη καμία επεξεργασία
+      empty_anon_html: Δεν έχει γίνει ακόμη καμία επεξεργασία.
       heading: Ομάδες αλλαγών
       heading_bbox: Ομάδες αλλαγών
       heading_friend: Ομάδες αλλαγών
@@ -312,8 +324,9 @@ el:
       hide_link: Απόκρυψη αυτού του σχολίου
     diary_entry: 
       comment_count: 
-        one: 1 σχόλιο
+        one: "%{count} σχόλιο"
         other: "%{count} σχόλια"
+        zero: Κανένα σχόλιο
       comment_link: Σχόλιο για τη καταχώρηση
       confirm: Επιβεβαίωση
       edit_link: Επεξεργασία καταχώρησης
@@ -348,7 +361,7 @@ el:
       newer_entries: Νεότερες Καταχωρήσεις
       no_entries: Καμία καταχώρηση ημερολογίου
       older_entries: Παλιότερες Καταχωρήσεις
-      recent_entries: "Πρόσφατες καταχωρήσεις ημερολογίου:"
+      recent_entries: Πρόσφατες καταχωρίσεις ημερολογίου
       title: Ημερολόγια χρηστών
       title_friends: Ημερολόγια φίλων
       title_nearby: Ημερολόγια Κοντινών Χρηστών
@@ -387,7 +400,7 @@ el:
       area_to_export: Περιοχή προς εξαγωγή
       embeddable_html: Ενσωματούμενη HTML
       export_button: Εξαγωγή
-      export_details: Τα δεδομένα OpenStreetMap είναι αδειοδοτημένα κάτω από την <a href="http://creativecommons.org/licenses/by-sa/2.0/">άδεια Creative Commons Attribution-ShareAlike 2.0</a>.
+      export_details: Τα δεδομένα OpenStreetMap είναι αδειοδοτημένα υπό την <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL).
       format: Μορφοποίηση
       format_to_export: Μορφή προς εξαγωγή
       image_size: Μέγεθος Εικόνας
@@ -460,6 +473,7 @@ el:
           WLAN: Πρόσβαση WiFi
           airport: Αεροδρόμιο
           arts_centre: Κέντρο Τεχνών
+          artwork: Έργο τέχνης
           atm: ATM
           auditorium: Αμφιθέατρο
           bank: Τράπεζα
@@ -468,6 +482,7 @@ el:
           bench: Πάγκος
           bicycle_parking: Στάθμευση Ποδηλάτων
           bicycle_rental: Ενοικίαση Ποδηλάτων
+          biergarten: Υπαίθρια μπυραρία
           brothel: Οίκος ανοχής
           bureau_de_change: Ανταλλακτήριο Συναλλάγματος
           bus_station: Σταθμός Λεωφορείου
@@ -495,13 +510,16 @@ el:
           ferry_terminal: Σταθμός Πορθμείων
           fire_hydrant: Κρουνός πυροσβεστικής
           fire_station: Πυροσβεστικός σταθμός
+          food_court: Προαύλειο Φαγητού \
           fountain: Συντριβάνι
           fuel: Καύσιμα
           grave_yard: Νεκροταφείο
           gym: Γυμναστήριο
+          hall: Αίθουσα
           health_centre: Κέντρο Υγείας
           hospital: Νοσοκομείο
           hotel: Ξενοδοχείο
+          hunting_stand: Κυνηγητικό Κιόσκι
           ice_cream: Παγωτό
           kindergarten: Νηπιαγωγείο
           library: Βιβλιοθήκη
@@ -533,7 +551,9 @@ el:
           shelter: Καταφύγιο
           shop: Κατάστημα
           shopping: Αγορές
+          shower: Ντους
           social_centre: Κοινωνικό κέντρο
+          social_club: Κοινωνική λέσχη
           studio: Στούντιο
           supermarket: Σουπερμάρκετ
           swimming_pool: Πισίνα
@@ -545,6 +565,7 @@ el:
           university: Πανεπιστήμιο
           vending_machine: Μηχάνημα Αυτόματης Πώλησης
           veterinary: Κτηνιατρική Χειρουργική
+          village_hall: Αίθουσα Χωριού
           waste_basket: Καλάθι Απορριμμάτων
           wifi: Πρόσβαση WiFi
           youth_centre: Κέντρο Νεολαίας
@@ -556,11 +577,14 @@ el:
         bridge: 
           aqueduct: Υδραγωγείο
           suspension: Κρεμαστή Γέφυρα
+          swing: Αιωρούμενη Γέφυρα \
+          viaduct: Κοιλαδογέφυρα
           "yes": Γέφυρα
         building: 
           "yes": Κτίριο
         highway: 
           bridleway: Μονοπάτι για άλογα
+          bus_guideway: Καθορισμένη Λωρίδα Λεωφορείου \
           bus_stop: Στάση Λεωφορείου
           byway: Παράδρομος
           construction: Δρόμος υπό κατασκευή
@@ -569,6 +593,7 @@ el:
           footway: Μονοπάτι
           ford: Κοιτόστρωση
           milestone: Ορόσημο
+          minor: Επαρχιακός Δρόμος \
           motorway: Αυτοκινητόδρομος
           motorway_junction: Διασταύρωση Αυτοκινητόδρομου
           motorway_link: Αυτοκινητόδρομος
@@ -588,6 +613,8 @@ el:
           speed_camera: Κάμερα ταχύτητας
           steps: Σκαλοπάτια
           stile: Στήλη
+          tertiary: Τρίτος Δρόμος \
+          tertiary_link: Τρίτος Δρόμος \
           track: Χωματόδρομος
           trail: Μονοπάτι
           trunk_link: Εθνική Οδός
@@ -602,6 +629,7 @@ el:
           fort: Οχυρό
           house: Σπίτι
           icon: Εικονίδιο
+          manor: Έπαυλη \
           memorial: Μνημείο
           mine: Ορυχείο
           monument: Μνημείο
@@ -636,6 +664,7 @@ el:
           recreation_ground: Χώρος Αναψυχής
           reservoir: Ταμιευτήρας
           residential: Κατοικημένη Περιοχή
+          retail: Κατάστημα Λιανικής
           vineyard: Αμπέλι
           wetland: Υγρότοπος
           wood: Μη προσεγμένο δάσος
@@ -644,6 +673,7 @@ el:
           bird_hide: Καταφύγιο Πουλιών
           common: Κοινόχρηστη γη
           fishing: Αλιευτική Περιοχή
+          fitness_station: Γυμναστήριο \
           garden: Κήπος
           golf_course: Γήπεδο Γκολφ
           ice_rink: Παγοδρόμιο
@@ -671,11 +701,13 @@ el:
           channel: Κανάλι
           cliff: Γκρεμός
           crater: Κρατήρας
+          dune: Αμμόλοφος \
           feature: Χαρακτηριστικό
           fjord: Φιόρδ
           forest: Δάσος
           geyser: Θερμοπίδακας
           glacier: Παγετώνας
+          heath: Υγεία
           hill: Λόφος
           island: Νησί
           land: Ξηρά
@@ -755,10 +787,12 @@ el:
         shop: 
           antiques: Αντίκες
           bakery: Φούρνος
+          beauty: Σαλόνι ομορφιάς
           beverages: Κατάστημα ποτών
           bicycle: Κατάστημα Ποδηλάτων
           books: Βιβλιοπωλείο
           butcher: Κρεοπωλείο
+          car: Κατάστημα αυτοκινήτων
           car_parts: Εξαρτήματα Αυτοκινήτου
           car_repair: Επισκευή Αυτοκινήτων
           carpet: Κατάστημα Χαλιών
@@ -780,11 +814,13 @@ el:
           food: Κατάστημα Τροφίμων
           funeral_directors: Γραφείο τελετών
           furniture: Έπιπλα
+          gallery: Γκαλερί
           gift: Κατάστημα Δώρων
           greengrocer: Μανάβης
           grocery: Οπωροπωλείο
           hairdresser: Κομμωτήριο
           hardware: Κατάστημα Σιδηρικών
+          hifi: Hi-Fi
           insurance: Ασφαλιστική
           jewelry: Κοσμηματοπωλείο
           kiosk: Περίπτερο
@@ -792,9 +828,11 @@ el:
           mall: Εμπορικό Κέντρο
           market: Αγορά
           mobile_phone: Κατάστημα κινητής τηλεφωνίας
+          motorcycle: Κατάστημα μοτοσικλετών
           music: Κατάστημα Μουσικής
           newsagent: Πρακτορείο εφημερίδων
           optician: Οπτικός
+          organic: Κατάστημα οργανικών τροφίμων
           photo: Φωτογραφείο
           shoes: Κατάστημα Υποδημάτων
           sports: Κατάστημα Αθλητικών
@@ -827,6 +865,7 @@ el:
           riverbank: Όχθη ποταμού
           stream: Ρέμα
           waterfall: Καταρράχτης
+      prefix_format: "%{name}"
   javascripts: 
     map: 
       base: 
@@ -903,6 +942,8 @@ el:
       text: Σε περίπτωση διένεξης μεταξύ αυτής της μεταφρασμένης σελίδας και %{english_original_link}, Η Αγγλική σελίδα θα προτιμηθεί
       title: Σχετικά με αυτή την μετάφραση
     legal_babble: 
+      attribution_example: 
+        title: Παράδειγμα αναφοράς δημιουργού
       contributors_title_html: Οι συνεισφέροντές μας
       credit_title_html: Πως να πιστώσετε το OpenStreetMap
       infringement_title_html: Παραβιάσεις πνευματικών δικαιωμάτων
@@ -971,8 +1012,6 @@ el:
       back_to_outbox: Πίσω στα Εξερχόμενα
       date: Ημ/νία
       from: Από
-      reading_your_messages: Ανάγνωση μηνυμάτων
-      reading_your_sent_messages: Ανάγνωση απεσταλμένων μηνυμάτων
       reply_button: Απάντηση
       subject: Θέμα
       title: Ανάγνωση μηνύματος
@@ -1041,22 +1080,40 @@ el:
       opengeodata: "Το OpenGeoData.org είναι το ιστολόγιο του ιδρυτή του OpenStreetMap Steve Coast's , έχει επίσης και podcasts:"
       the_wiki: "Διάβασε σχετικά με το OpenStreetMap στο wiki:"
       wiki_signup: "Ίσως θες επίσης να κάνεις εγγραφή στο OpenStreetMap wiki:"
+  oauth: 
+    oauthorize: 
+      allow_read_gpx: διαβάστε τα ιδιωτικά σας GPS ίχνη.
+      allow_write_api: τροποποιήστε το χάρτη.
+      allow_write_gpx: ανεβάστε ίχνη GPS.
   oauth_clients: 
     edit: 
       submit: Επεξεργασία
       title: Επεξεργασία της αίτησής σας
     form: 
+      allow_write_api: τροποποιήστε το χάρτη. \
+      callback_url: Ανάκληση URL \
       name: Όνομα
       required: Απαιτείται
+      support_url: Υποστήριξη URL \
+      url: URL Κύριας Εφαρμογής \
     index: 
       application: Όνομα Εφαρμογής
       register_new: Εγγραφή αίτησής
       revoke: Ανάκληση!
+      title: Οι λεπτομέρειες της OAuth μου \
     new: 
       submit: Εγγραφή
     show: 
+      allow_read_prefs: διαβάστε τις δικές τους προτιμήσεις χρήστη.
+      allow_write_api: τροποποιήστε το χάρτη.
+      allow_write_diary: δημιουργήστε εγγραφές ημερολογίου, σχόλια και κάντε φίλους.
+      allow_write_gpx: επιφόρτωση ιχνών GPS. \
+      allow_write_prefs: τροποποιήστε τις δικές τους προτιμήσεις χρήστη.
       confirm: Είστε σίγουροι;
+      delete: Διαγραφή εξυπηρετητή
       requests: "Ζητά της ακόλουθες πληροφορίες από το χρήστη:"
+  printable_name: 
+    with_version: "%{id}, v%{version}"
   redaction: 
     edit: 
       description: Περιγραφή
@@ -1227,6 +1284,10 @@ el:
       delete image: Αφαίρεση της τρέχουσας εικόνας
       email never displayed publicly: (όχι δημόσια εμφάνιση)
       flash update success: Οι πληροφορίες χρήστη ενημερώθηκαν με επιτυχία.
+      flash update success confirm needed: Οι πληροφορίες του χρήστη ενημερώθηκαν επιτυχώς. Ελέγξτε το email για μια ειδοποίηση για να επιβεβαιώσετε την νέα σας διεύθυνση email.
+      gravatar: 
+        gravatar: Χρήση Gravatar
+        link text: Τι είναι αυτό;
       home location: "Τοποθεσία Σπιτιού:"
       image: "Εικόνα:"
       image size hint: (τετράγωνες εικόνες τουλάχιστον 100 x 100 λειτουργούν καλύτερα)
@@ -1256,6 +1317,7 @@ el:
       return to profile: Επιστροφή στο προφίλ
       save changes button: Αποθήκευση Αλλαγών
       title: Επεξεργασία λογαριασμού
+      update home location on click: Ενημέρωση τοποθεσίας σπιτιού όταν κάνω κλικ στον χάρτη;
     confirm: 
       already active: Αυτός ο λογαριασμός έχει ήδη επιβεβαιωθεί.
       button: Επιβεβαίωση
@@ -1286,7 +1348,7 @@ el:
       auth failure: Λυπάμαι, δεν μπορείς να συνδεθείς με αυτές τις λεπτομέρειες.
       create account minute: Δημιούργησε λογαριασμό. Παίρνει μόνο ένα λεπτό.
       email or username: "Διεύθυνση ηλεκτρονικού ταχυδρομείου ή Όνομα χρήστη:"
-      heading: Είσοδος
+      heading: Σύνδεση \
       login_button: Είσοδος
       lost password link: Έχασες τον κωδικό σου;
       new to osm: Νέος στο OpenStreetMap;
@@ -1314,7 +1376,7 @@ el:
       password: "Κωδικός:"
       register now: Εγγραφή
       remember: "Αποθήκευση:"
-      title: Είσοδος
+      title: Σύνδεση \
       to make changes: Για να κάνεις αλλαγές στα δεδομένα του OpenStreetMap, πρέπει να έχεις λογαριασμό.
     logout: 
       heading: Έξοδος από το OpenStreetMap
@@ -1330,8 +1392,9 @@ el:
       title: Έχασες τον κωδικό σου
     make_friend: 
       already_a_friend: Είστε ήδη φίλοι με τον χρήστη %{name}.
+      button: Προσθήκη ως φίλου
       failed: Λυπούμαστε, απέτυχε η προσθήκη του χρήστη %{name} ως φίλο.
-      success: Ο χρήστης %{name} είναι τώρα φίλος σου.
+      success: "%{name} είναι τώρα φίλος σου!"
     new: 
       confirm email address: "Επιβεβαιώση Διεύθυνσης ηλεκτρονικού ταχυδρομείου:"
       confirm password: "Επιβεβαίωση Κωδικού:"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6207ca61f..5d3e6bbae 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -699,6 +699,8 @@ en:
           airfield: "Military Airfield"
           barracks: "Barracks"
           bunker: "Bunker"
+        mountain_pass:
+          "yes" : "Mountain Pass"
         natural:
           bay: "Bay"
           beach: "Beach"
@@ -1533,7 +1535,7 @@ en:
       url: "Request Token URL:"
       access_url: "Access Token URL:"
       authorize_url: "Authorise URL:"
-      support_notice: "We support HMAC-SHA1 (recommended) as well as plain text in SSL mode."
+      support_notice: "We support HMAC-SHA1 (recommended) and RSA-SHA1 signatures."
       edit: "Edit Details"
       delete: "Delete Client"
       confirm: "Are you sure?"
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 4e81358a9..472a582f9 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -437,8 +437,6 @@ eo:
       back_to_inbox: Reen al mesaĝejo
       date: Dato
       from: De
-      reading_your_messages: Legante viajn mesaĝojn
-      reading_your_sent_messages: Legante viajn senditajn mesaĝojn
       reply_button: Respondi
       subject: Temo
       title: Legi mesaĝon
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 98a3496d1..2424a9079 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -14,6 +14,7 @@
 # Author: PerroVerd
 # Author: Peter17
 # Author: Remux
+# Author: Rubenwap
 # Author: Toliño
 # Author: Translationista
 # Author: VegaDark
@@ -51,7 +52,7 @@ es:
         active: Activo
         description: Descripción
         display_name: Nombre en pantalla
-        email: Correo
+        email: Correo electrónico
         languages: Idiomas
         pass_crypt: Contraseña
     models: 
@@ -181,7 +182,7 @@ es:
         way: la vía
     paging_nav: 
       of: de
-      showing_page: Mostrando página
+      showing_page: página
     redacted: 
       message_html: La versión %{version} de este %{type} no se puede mostrar tal como ha sido redactada. Consulte %{redaction_link} para obtener más detalles.
       redaction: Redacción %{id}
@@ -221,7 +222,7 @@ es:
       manually_select: Seleccionar manualmente un área diferente
       object_list: 
         api: Descargar esta área a través de la API
-        back: Mostrar lista de objetos
+        back: Volver a la lista de proyectos
         details: Detalles
         heading: Lista de objetos
         history: 
@@ -263,8 +264,8 @@ es:
       way_title: "Vía %{way_name}:"
     way_details: 
       also_part_of: 
-        one: también parte de la ví­a %{related_ways}
-        other: también parte de las ví­as %{related_ways}
+        one: parte del camino %{related_ways}
+        other: parte de los caminos %{related_ways}
       nodes: "Nodos:"
       part_of: "Parte de:"
     way_history: 
@@ -284,7 +285,7 @@ es:
     changeset_paging_nav: 
       next: Siguiente »
       previous: « Anterior
-      showing_page: Mostrando página %{page}
+      showing_page: Página %{page}
     changesets: 
       area: Área
       comment: Comentario
@@ -292,13 +293,13 @@ es:
       saved_at: Guardado en
       user: Usuario
     list: 
-      description: Cambios recientes
+      description: Examinar los cambios recientes hecho en el mapa
       description_bbox: Conjunto de cambios dentro de %{bbox}
       description_friend: Conjuntos de cambios realizados por vuestros amigos
       description_nearby: Conjuntos de cambios realizados por usuarios cercanos
       description_user: Conjunto de cambios por %{user}
       description_user_bbox: Conjunto de cambios por %{user} dentro de %{bbox}
-      empty_anon_html: No se han realizado ediciones todavía
+      empty_anon_html: Todavía no se ha hecho ninguna edición.
       empty_user_html: Parece que no has hecho ninguna edición todavía. Para comenzar, consulta la <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Guía para principiantes</a>.
       heading: Conjuntos de cambios
       heading_bbox: Conjuntos de cambios
@@ -366,7 +367,7 @@ es:
       newer_entries: Entradas más modernas
       no_entries: No hay entradas en el diario
       older_entries: Entradas más antiguas
-      recent_entries: "Entradas recientes en el diario:"
+      recent_entries: Entradas recientes en el diario
       title: Diarios de usuarios
       title_friends: Diarios de amigos
       title_nearby: Diarios de usuarios cercanos
@@ -1000,7 +1001,7 @@ es:
     user_diaries_tooltip: Ver diarios de usuario
     view: Ver
     view_tooltip: Ver el mapa
-    welcome_user_link_tooltip: Tu página de usuario
+    welcome_user_link_tooltip: Tu página de {{GENDER:|usuario|usuaria}}
     wiki: Wiki
     wiki_title: Sitio Wiki del proyecto
   license_page: 
@@ -1100,8 +1101,6 @@ es:
       back_to_outbox: Regresar a la bandeja de salida
       date: Fecha
       from: De
-      reading_your_messages: Leyendo tus mensajes
-      reading_your_sent_messages: Leyendo tus mensajes enviados
       reply_button: Responder
       subject: Asunto
       title: Leer mensaje
@@ -1256,7 +1255,7 @@ es:
       key: "Clave de Consumidor:"
       requests: "Solicitando los siguientes permisos del usuario:"
       secret: "Secreto de Consumidor:"
-      support_notice: Soportamos HMAC-SHA1 (recomendado) asi como texto plano en el modo ssl.
+      support_notice: Soportamos HMAC-SHA1 (recomendado) y firmas RSA-SHA1.
       title: Detalles OAuth para %{app_name}
       url: "URL de Token de Solicitud:"
     update: 
@@ -1433,6 +1432,7 @@ es:
       visibility: "Visibilidad:"
       visibility_help: ¿Qué significa esto?
     list: 
+      description: Explorar los itinerarios GPS subidos recientemente
       empty_html: No hay nada aquí todavía. <a href='%{upload_link}'>Carga una nueva traza</a> o aprende más acerca de cómo hacer trazas con el GPS en la <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>página wiki</a>.
       public_traces: Trazas GPS públicas
       public_traces_from: Trazas GPS públicas de %{user}
@@ -1480,7 +1480,7 @@ es:
     trace_paging_nav: 
       newer: Trazas más recientes
       older: Trazas más antiguas
-      showing_page: Mostrando página %{page}
+      showing_page: Página %{page}
     view: 
       delete_track: Borrar esta traza
       description: "Descripción:"
@@ -1573,7 +1573,7 @@ es:
       success: Dirección de correo electrónico confirmada. ¡Gracias por registrarse!
     confirm_resend: 
       failure: No se ha encontrado el usuario %{name}
-      success: Te hemos enviado un nuevo aviso de confirmación a %{email} y tan pronto confirmes tu cuenta podrás comenzar a mapear <br /><br />Si usas un sistema para control de spam que envíe solicitudes de confirmación, asegúrate, por favor, de incluir en tu lista blanca a webmaster@openstreetmap.org ya que no podemos responder a ninguna solicitud de confirmación.
+      success: Te hemos enviado un nuevo aviso de confirmación a %{email} y tan pronto confirmes tu cuenta podrás comenzar a crear mapas<br /><br />Si usas un sistema de antispam que envía solicitudes de confirmación, asegúrate, por favor, de incluir en tu lista blanca a webmaster@openstreetmap.org ya que no podemos responder a ninguna solicitud de confirmación.
     filter: 
       not_an_administrator: Necesitas ser administrador para ejecutar esta acción.
     go_public: 
diff --git a/config/locales/et.yml b/config/locales/et.yml
index f82e99592..f8d58710a 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -42,6 +42,9 @@ et:
         languages: Keeled
         pass_crypt: Parool
     models: 
+      acl: Pääsuloend
+      changeset: Muutuskogum
+      changeset_tag: Muutuskogumi silt
       country: Riik
       diary_comment: Päeviku kommentaar
       diary_entry: Päeviku sissekanne
@@ -54,25 +57,44 @@ et:
       old_relation: Vana relatsioon
       old_way: Vana joon
       relation: Relatsioon
+      relation_member: Relatsiooni liige
+      relation_tag: Relatsiooni silt
+      session: Seanss
       user: Kasutaja
+      user_preference: Kasutaja eelistused
       way: Joon
       way_node: Joone sõlm
       way_tag: Joone silt
   browse: 
     changeset: 
       changeset: "Muutustekogu: %{id}"
+      changesetxml: Muutuskogumi XML
+      feed: 
+        title: Muutuskogum %{id}
+        title_comment: Muutuskogum %{id} - %{comment}
+      osmchangexml: osmChange XML
       title: Muutustekogu
     changeset_details: 
       belongs_to: "Kuulub:"
       box: ala
       closed_at: "Suletud:"
       created_at: "Loodud:"
+      has_nodes: 
+        one: "Sisaldab järgmist %{count} sõlme:"
+        other: "Sisaldab järgmist %{count} sõlme:"
+      has_relations: 
+        one: "Sisaldab järgmist %{count} relatsiooni:"
+        other: "Sisaldab järgmist %{count} relatsiooni:"
+      has_ways: 
+        one: "Sisaldab järgmist %{count} joont:"
+        other: "Sisaldab järgmist %{count} joont:"
     common_details: 
       changeset_comment: "Kommentaar:"
       deleted_at: "Kustutamise aeg:"
       deleted_by: "Kustutaja:"
       edited_at: "Muudetud:"
       edited_by: "Muutja:"
+      in_changeset: "Muutuskogumis:"
       version: "Versioon:"
     containing_relation: 
       entry: Relatsioon %{relation_name}
@@ -106,27 +128,28 @@ et:
         prev_changeset_tooltip: Kasutaja %{user} eelmine muudatus
     node: 
       download_xml: Laadi XML
-      edit: redigeeri
+      edit: Muuda sõlme
       node: sõlm
-      node_title: "Punkt: %{node_name}"
-      view_history: vaata redigeerimiste ajalugu
+      node_title: "Sõlm: %{node_name}"
+      view_history: Vaata ajalugu
     node_details: 
-      coordinates: "koordinaadid:"
+      coordinates: "Koordinaadid:"
       part_of: "Osa joonest:"
     node_history: 
       download_xml: Laadi XML
-      node_history: Punkti muudatusteajalugu
-      node_history_title: Punkti %{node_name} ajalugu
-      view_details: vaata üksikasju
+      node_history: Sõlme ajalugu
+      node_history_title: Sõlme %{node_name} ajalugu
+      view_details: Vaata üksikasju
     not_found: 
       sorry: "Vabandame, %{type}\n id-ga %{id} ei leitud."
       type: 
+        changeset: muutuskogumit
         node: sõlme
         relation: relatsiooni
         way: joont
     paging_nav: 
       of: " /"
-      showing_page: Näitan lehte
+      showing_page: leht
     redacted: 
       redaction: Redaktsioon %{id}
       type: 
@@ -137,14 +160,14 @@ et:
       download_xml: Laadi XML
       relation: relatsioon
       relation_title: "Relatsioon: %{relation_name}"
-      view_history: vaata ajalugu
+      view_history: Vaata ajalugu
     relation_details: 
       members: "Liikmed:"
     relation_history: 
       download_xml: Laadi XML
       relation_history: Relatsiooni muudatuste ajalugu
       relation_history_title: Relatsiooni %{relation_name} ajalugu
-      view_details: vaata üksikasju
+      view_details: Vaata üksikasju
     relation_member: 
       entry_role: "%{type} %{name} kui %{role}"
       type: 
@@ -164,19 +187,19 @@ et:
       manually_select: Vali uus ala
       object_list: 
         api: Laadi antud ala APIst
-        back: Näita objektide nimekirja
+        back: Tagasi objektide nimekirja
         details: Detailid
         heading: Objektide nimekiri
         history: 
           type: 
-            node: Punkt %{id}
+            node: Sõlm %{id}
             way: Joon %{id}
         selected: 
           type: 
-            node: Punkt %{id}
+            node: Sõlm %{id}
             way: Joon %{id}
         type: 
-          node: Punkt
+          node: Sõlm
           way: Joon
       show_areas: Näita alasid
       show_history: Näita ajalugu
@@ -187,8 +210,8 @@ et:
     tag_details: 
       tags: "Sildid:"
       wiki_link: 
-        key: Sildi %{key} kirjelduse lehekülg wiki's
-        tag: Sildi %{key}=%{value} kirjelduse lehekülg wiki's
+        key: Sildi %{key} kirjelduse leht vikis
+        tag: Sildi %{key}=%{value} kirjelduse leht vikis
       wikipedia_link: Artikkel %{page} Vikipeedias
     timeout: 
       type: 
@@ -197,19 +220,19 @@ et:
         way: joone
     way: 
       download_xml: Laadi alla XML
-      edit: redigeeri
-      view_history: vaata ajalugu
+      edit: Muuda joont
+      view_history: Vaata ajalugu
       way: Joon
       way_title: "Joon: %{way_name}"
     way_details: 
       also_part_of: 
-        one: on ka osa joonest %{related_ways}
-        other: on ka osa joontest %{related_ways}
+        one: on osa joonest %{related_ways}
+        other: on osa joontest %{related_ways}
       nodes: "Sõlmed:"
       part_of: "Osa:"
     way_history: 
       download_xml: Laadi alla XML
-      view_details: vaata detaile
+      view_details: Vaata üksikasju
       way_history: Joone muudatuste ajalugu
       way_history_title: "Joone: %{way_name} ajalugu"
   changeset: 
@@ -219,10 +242,11 @@ et:
       no_comment: (puudub)
       no_edits: (muudatused puuduvad)
       still_editing: redigeerimine pooleli
+      view_changeset_details: Vaata muutuskogumi üksikasju
     changeset_paging_nav: 
       next: Järgmine »
       previous: « Eelmine
-      showing_page: Näitan lehekülge %{page}
+      showing_page: Leht %{page}
     changesets: 
       area: Ala
       comment: Kommentaar
@@ -230,8 +254,25 @@ et:
       saved_at: Salvestatud
       user: Kasutaja
     list: 
-      description: Viimased muudatused
-      empty_anon_html: Muudatusi ei ole veel tehtud
+      description: Viimased muudatused kaardil
+      description_bbox: Muutuskogumid raamis, koordinaatidega %{bbox}
+      description_friend: Sõprade muutuskogumid
+      description_nearby: Läheduses asuvate kasutajate muutuskogumid
+      description_user: Kasutaja %{user} muutuskogumid
+      description_user_bbox: Kasutaja %{user} muutuskogumid raamis, koordinaatidega %{bbox}
+      empty_anon_html: Muudatusi ei ole veel tehtud.
+      heading: Muutuskogumid
+      heading_bbox: Muutuskogumid
+      heading_friend: Muutuskogumid
+      heading_nearby: Muutuskogumid
+      heading_user: Muutuskogumid
+      heading_user_bbox: Muutuskogumid
+      title: Muutuskogumid
+      title_bbox: Muutuskogumid raamis, koordinaatidega %{bbox}
+      title_friend: Sõprade muutuskogumid
+      title_nearby: Läheduses asuvate kasutajate muutuskogumid
+      title_user: Kasutaja %{user} muutuskogumid
+      title_user_bbox: Kasutaja %{user} muutuskogumid raamis, koordinaatidega %{bbox}
   diary_entry: 
     comments: 
       ago: "%{ago} tagasi"
@@ -284,7 +325,7 @@ et:
       newer_entries: Uuemad...
       no_entries: Päevikus pole sissekandeid
       older_entries: Vanemad...
-      recent_entries: "Hiljutised päeviku sissekanded:"
+      recent_entries: Hiljutised päeviku sissekanded
       title: Kasutajate päevikud
       title_friends: Sõprade päevikud
       title_nearby: Lähedalasuvate kasutajate päevikud
@@ -308,8 +349,10 @@ et:
   editor: 
     default: Vaikimisi (praegu %{name})
     potlatch: 
+      description: Potlatch 1 (veebilehitsejapõhine redaktor)
       name: Potlatch 1
     potlatch2: 
+      description: Potlatch 2 (veebilehitsejapõhine redaktor)
       name: Potlatch 2
     remote: 
       description: Remote Control (JOSM või Merkaartor)
@@ -345,6 +388,9 @@ et:
       view_larger_map: Näita suuremat kaarti
   geocoder: 
     description: 
+      title: 
+        geonames: Asukoht teenusest <a href="http://www.geonames.org/">GeoNames</a>
+        osm_nominatim: Asukoht <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatimist</a>
       types: 
         cities: Linnad
         places: Kohad
@@ -591,12 +637,14 @@ et:
           historic_station: Ajalooline raudteejaam
           junction: Raudtee ülekäigukoht
           level_crossing: Raudtee ülesõidukoht
+          light_rail: Kergraudtee
           miniature: Miniatuurraudtee
           narrow_gauge: Kitsarööpmeline raudtee
           platform: Raudteeperroon
           spur: Raudtee harutee
           station: Raudteejaam
           subway: Metroojaam
+          subway_entrance: Metroo sissepääs
           switch: Pöörangud
           tram: Trammitee
           tram_stop: Trammipeatus
@@ -609,7 +657,9 @@ et:
           carpet: Vaibakauplus
           clothes: Riidepood
           computer: Arvutikauplus
+          copyshop: Paljunduskoda
           cosmetics: Kosmeetikapood
+          department_store: Kaubamaja
           dry_cleaning: Keemiline puhastus
           electronics: Elektroonikapood
           fish: Kalapood
@@ -620,6 +670,7 @@ et:
           gallery: Galerii
           garden_centre: Aianduskeskus
           hairdresser: Juuksur
+          hardware: Rauakauplus
           insurance: Kindlustus
           jewelry: Juveelipood
           kiosk: Kiosk
@@ -737,8 +788,8 @@ et:
     native: 
       mapping_link: alustada kaardistamist
       native_link: eestikeelse versiooni
-      text: Sa vaatad ingliskeelset versiooni autoriõiguste leheküljest. Sa võid minna tagasi selle lehe %{native_link} juurde või lõpetada autoriõiguste lugemise ja %{mapping_link}.
-      title: Sellest leheküljest
+      text: Sa vaatad ingliskeelset versiooni autoriõiguste lehest. Sa võid minna tagasi selle lehe %{native_link} juurde või lõpetada autoriõiguste lugemise ja %{mapping_link}.
+      title: Sellest lehest
   message: 
     delete: 
       deleted: Sõnum kustutatud
@@ -797,7 +848,6 @@ et:
       back_to_outbox: Tagasi saadetud sõnumite juurde
       date: Kuupäev
       from: Kellelt
-      reading_your_messages: Sissetulnud kirjad
       reply_button: Vasta
       subject: Teema
       title: Loe sõnumit
@@ -833,7 +883,7 @@ et:
       confirm: "Enne kasutajakonto loomist peame saama kinnituse, et see taotlus tuli sinult ja selleks klõpsa alloleval lingil:"
       created: Keegi (loodetavasti sina) lõi äsja %{site_url} kasutajakonto.
       greeting: Tere!
-      subject: "[OpenStreetMap] E-posti aadressi kinnitamine"
+      subject: "[OpenStreetMap] Tere tulemast OpenStreetMap-i"
       welcome: Teretulemast OpenStreetMap kaardirakendusse! Soovime pakkuda sulle lisainfot, et saaksid selle kasutamist hõlpsalt alustada.
     signup_confirm_html: 
       introductory_video: Võid vaadata %{introductory_video_link}.
@@ -881,6 +931,15 @@ et:
     new: 
       submit: Registreeri
       title: Registreeri uus rakendus
+    show: 
+      confirm: Kas oled kindel?
+      delete: Kustuta klient
+      edit: Muuda üksikasju
+  redaction: 
+    edit: 
+      description: Kirjeldus
+    show: 
+      description: "Kirjeldus:"
   site: 
     edit: 
       user_page_link: kasutajaleht
@@ -978,6 +1037,7 @@ et:
       search_help: "näit.: 'Laagri', 'Pargi, Tartu' või 'ATM near Kohila' <a href='http://wiki.openstreetmap.org/wiki/Search'>veel näiteid...</a> (ingl. k)"
       submit_text: Otsi
       where_am_i: Kus ma olen?
+      where_am_i_title: Määra praegune asukoht otsimootori abil
     sidebar: 
       close: Sulge
       search_results: Otsingu tulemused
@@ -998,6 +1058,7 @@ et:
       save_button: Salvesta muudatused
       start_coord: "Alguskoordinaadid:"
       tags: "Sildid:"
+      tags_help: komaga eraldatud
       uploaded_at: "Üles laaditud:"
       visibility: "Nähtavus:"
       visibility_help: Mida see tähendab?
@@ -1009,9 +1070,7 @@ et:
     trace: 
       ago: "%{time_in_words_ago} tagasi"
       by: kasutajalt
-      count_points: 
-        one: "%{count} punkt"
-        other: "%{count} punkti"
+      count_points: "%{count} punkti"
       edit: redigeeri
       edit_map: Redigeeri kaarti
       map: asukoht kaardil
@@ -1023,6 +1082,7 @@ et:
       description: "Kirjeldus:"
       help: Abi
       tags: "Sildid:"
+      tags_help: komaga eraldatud
       upload_button: Laadi üles
       upload_gpx: "Laadi üles GPX-fail:"
       visibility: "Nähtavus:"
@@ -1034,7 +1094,7 @@ et:
     trace_optionals: 
       tags: Sildid
     trace_paging_nav: 
-      showing_page: Näitan lehekülge %{page}
+      showing_page: Leht %{page}
     view: 
       delete_track: Kustuta see jälg
       description: "Kirjeldus:"
@@ -1046,7 +1106,7 @@ et:
       none: Puuduvad
       owner: "Omanik:"
       pending: OOTEL
-      points: "Punktid:"
+      points: "Punkte:"
       start_coordinates: "Alguskoordinaadid:"
       tags: "Sildid:"
       trace_not_found: Jälge ei leitud!
@@ -1129,7 +1189,7 @@ et:
       password: "Parool:"
       register now: "Registreeru:"
       remember: "Jäta mind meelde:"
-      title: Sisselogimise lehekülg
+      title: Sisselogimise leht
       with openid: "Või kasuta sisse logimiseks oma OpenID kasutajat:"
     logout: 
       heading: Välju OpenStreetMap -st
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 0408dc4c1..79b9fd357 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -92,7 +92,7 @@ eu:
       members: "Kideak:"
     relation_history: 
       download_xml: XML jaitsi
-      view_details: xehetasunak ikusi
+      view_details: Xehetasunak ikusi
     relation_member: 
       type: 
         node: Nodo
@@ -104,7 +104,7 @@ eu:
       details: Xehetasunak
       loading: Kargatzen...
       object_list: 
-        back: Objetu zerrenda erakutsi
+        back: Objetu zerrendara itzuli
         details: Xehetasunak
         heading: Objetu zerrenda
         history: 
@@ -128,8 +128,8 @@ eu:
         relation: erlazio
     way: 
       download_xml: XML jaitsi
-      edit: aldatu
-      view_history: historia ikusi
+      edit: Bidea aldatu
+      view_history: Historia ikusi
       way: Bide
       way_title: "%{way_name} bidea"
     way_details: 
@@ -155,8 +155,9 @@ eu:
       hide_link: Iruzkin hau ezkutatu
     diary_entry: 
       comment_count: 
-        one: iruzkin bat
+        one: iruzkin %{count}
         other: "%{count} iruzkin"
+        zero: Iruzkinik ez
       confirm: Berretsi
     edit: 
       body: "Testua:"
@@ -185,7 +186,7 @@ eu:
   export: 
     start: 
       export_button: Esportatu
-      export_details: OpenStreetMap-eko datuak <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Aitortu-Partekatu</a> baimen baten mende daude.
+      export_details: OpenStreetMap-eko datuak <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Datu-base Irekiko Lizentzia</a> baimen baten mende daude.
       format: Formatua
       format_to_export: Esportatzeko formatua
       image_size: Irudiaren tamaina
@@ -221,12 +222,21 @@ eu:
       zero: km bat baino gutxiago
     search_osm_nominatim: 
       prefix: 
+        aeroway: 
+          aerodrome: Aerodromoa
+          apron: Pista
+          gate: Atea
+          helipad: Heliportua
+          runway: Lurreratze pista
+          terminal: Terminala
         amenity: 
           airport: Aireportu
           arts_centre: Arte Zentroa
+          atm: Kutxazain automatikoa
           auditorium: Entzunareto
           bank: Banku
           bar: Taberna
+          bbq: Barbakoa
           bench: Eserleku
           bicycle_rental: Txirrindu Alokairua
           brothel: Putetxe
@@ -245,6 +255,7 @@ eu:
           crematorium: Errauste labe
           dentist: Dentista
           doctors: Medikuak
+          dormitory: Ikasle egoitza
           drinking_water: Edateko ur
           driving_school: Autoeskola
           embassy: Enbaxada
@@ -253,6 +264,7 @@ eu:
           ferry_terminal: Ferry terminal
           fire_station: Suhiltzaileak
           fountain: Iturri
+          fuel: Gasolindegia
           grave_yard: Hilerri
           gym: Osasun Zentroa / Gimnasioa
           hall: Aretoa
@@ -288,6 +300,7 @@ eu:
           shopping: Erosketak
           studio: Estudio
           supermarket: Supermerkatu
+          swimming_pool: Igerilekua
           taxi: Taxi
           telephone: Telefono publiko
           theatre: Antzokia
@@ -295,17 +308,27 @@ eu:
           townhall: Udaletxe
           university: Unibertsitate
           vending_machine: Salmenta automatiko
+          veterinary: Albaitaritza klinika
+          village_hall: Herriko aretoa
           wifi: WiFi Sarbidea
           youth_centre: Gaztelekua
         boundary: 
           administrative: Muga Administratiboa
+          census: Erroldaren muga
+          national_park: Parke Nazionala
+          protected_area: Babestutako Eremua
+        bridge: 
+          "yes": Zubia
         building: 
           "yes": Eraikina
         highway: 
           bus_stop: Autobus-geraleku
           construction: Eraikitze-lanetan dagoen Autopista
+          cycleway: Bidegorria
           emergency_access_point: Larrialdi Sarbide Gunea
           footway: Oinezkoen bide
+          ford: Ibia
+          milestone: Mugarria
           motorway: Autobide
           motorway_link: Autobidea
           platform: Nasa
@@ -317,6 +340,7 @@ eu:
           secondary_link: Bigarren mailako errepide
           service: Zerbitzu Errepidea
           services: Autobide Zerbitzuak
+          speed_camera: Radarra
           steps: Eskailera-mailak
           tertiary: Hirugarren mailako errepide
           track: Pista
@@ -349,6 +373,7 @@ eu:
           beach_resort: Hondartza konplexu
           common: Lur Komunak
           fishing: Arrantza Lekua
+          fitness_station: Gimnasioa
           garden: Lorategi
           golf_course: Golf-zelai
           ice_rink: Izotz-pista
@@ -387,6 +412,14 @@ eu:
           volcano: Sumendi
           water: Ura
           wood: Baso
+        office: 
+          employment_agency: Enplegu agentzia
+          estate_agent: Inmobiliaria
+          government: Gobernuko bulegoa
+          insurance: Aseguruetako bulegoa
+          lawyer: Abokatua
+          ngo: GKE bulegoa
+          "yes": Bulegoa
         place: 
           airport: Aireportu
           city: Hiria
@@ -656,12 +689,12 @@ eu:
       public: PUBLIKOA
       view_map: Mapa ikusi
     trace_form: 
-      description: Deskribapena
+      description: "Deskribapena:"
       help: Laguntza
       tags: "Etiketak:"
       upload_button: Igo
-      upload_gpx: GPX fitxategi igo
-      visibility: Ikusgarritasuna
+      upload_gpx: "GPX fitxategi igo:"
+      visibility: "Ikusgarritasuna:"
       visibility_help: Zer esan nahi du honek?
     trace_optionals: 
       tags: Etiketak
@@ -763,7 +796,7 @@ eu:
       legale_select: "Mesedez bizi zaren herrialdean aukeratu:"
     view: 
       activate_user: erabiltzaile hau gaitu
-      add as friend: lagun bezala
+      add as friend: lagun bezala gehitu
       ago: (duela %{time_in_words_ago})
       confirm: Berretsi
       confirm_user: erabiltzaile hau baieztatu
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index ab8df80cb..7c075c926 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -44,7 +44,7 @@ fa:
         description: توضیحات
         display_name: نام نمایشی
         email: پست الکترونیکی
-        languages: زبان ها
+        languages: زبان‌ها
         pass_crypt: کلمه عبور
     models: 
       acl: دسترسی به لیست کنترل
@@ -84,7 +84,8 @@ fa:
       closed_at: "بسته شده بر:"
       created_at: "ایجاد توسط:"
       has_nodes: 
-        other: "یک=دارای %{count} نقطه:"
+        one: "Has the following %{count} node:"
+        other: "Has the following %{count} nodes:"
       has_relations: 
         other: "یک=دارای %{count} مرتبط:"
       has_ways: 
@@ -777,7 +778,6 @@ fa:
       back_to_inbox: بازگشت به صندوق پستی
       date: تاریخ
       from: از
-      reading_your_sent_messages: خواندن پیام‌هایی که فرستاده‌اید
       reply_button: پاسخ
       subject: عنوان
       to: به
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 91cba33ac..409cce91c 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -180,7 +180,7 @@ fi:
         way: Polkua
     paging_nav: 
       of: " /"
-      showing_page: Nykyinen sivu
+      showing_page: sivu
     redacted: 
       message_html: Tämän %{type}-tyypin versiota ei voi näyttää koska se on laitostettu. Katso lisätietoja %{redaction_link}.
       redaction: Redaktio %{id}
@@ -287,7 +287,7 @@ fi:
     changesets: 
       area: Alue
       comment: Kommentti
-      id: ID
+      id: Tunniste
       saved_at: Tallennettu
       user: Käyttäjä
     list: 
@@ -297,7 +297,7 @@ fi:
       description_nearby: Lähellä olevien käyttäjien muutoskokoelmat
       description_user: Käyttäjän %{user} muutoskokoelmat
       description_user_bbox: Käyttäjän %{user} muutoskokoelmat %{bbox} sisällä
-      empty_anon_html: Muutoksia ei ole vielä tehty
+      empty_anon_html: Muutoksia ei ole vielä tehty.
       empty_user_html: Et ole tehnyt vielä mitään muutoksia. Lisätietoja kartan muokkaamisesta saa <a href='http://wiki.openstreetmap.org/wiki/Fi:Beginners_Guide_1.3'>Aloittelijan oppaasta</a>.
       heading: Muutoskokoelmat
       heading_bbox: Muutoskokoelmat
@@ -538,7 +538,7 @@ fi:
           park: Puisto
           parking: Parkkipaikka
           pharmacy: Apteekki
-          place_of_worship: Kirkko
+          place_of_worship: Kirkko, temppeli, pyhä paikka
           police: Poliisi
           post_box: Kirjelaatikko
           post_office: Postitoimisto
@@ -1095,8 +1095,6 @@ fi:
       back_to_outbox: Takaisin Lähetetyt-kansioon
       date: Päiväys
       from: "Lähettäjä:"
-      reading_your_messages: Saapunut viesti
-      reading_your_sent_messages: Lähetetty viesti
       reply_button: Vastaa
       subject: Otsikko
       title: Lue viesti
@@ -1824,7 +1822,7 @@ fi:
       revoke: Estä!
       revoker_name: Eston tehnyt
       show: Näytä
-      showing_page: Näytetään sivu %{page}
+      showing_page: Sivu %{page}
       status: Tila
     period: 
       one: 1 tunti
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 139dcdfbd..53a50eb01 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -723,6 +723,8 @@ fr:
           airfield: Terrain d'aviation militaire
           barracks: Caserne
           bunker: Bunker
+        mountain_pass: 
+          "yes": Col de montagne
         natural: 
           bay: Baie
           beach: Plage
@@ -1112,8 +1114,6 @@ fr:
       back_to_outbox: Revenir à la boîte d'envoi
       date: Date
       from: De
-      reading_your_messages: Lecture de vos messages
-      reading_your_sent_messages: Lecture de vos messages envoyés
       reply_button: Répondre
       subject: Objet
       title: Lire le message
@@ -1267,7 +1267,7 @@ fr:
       key: "Clé de l'utilisateur :"
       requests: "Demande des permission suivantes de l'utilisateur :"
       secret: "Secret de l'utilisateur :"
-      support_notice: Nous supportons hamc-sha1 (recommandé) et texte brut en mode ssl.
+      support_notice: Nous supportons les signatures HMAC-SHA1 (recommandé) et RSA-SHA1.
       title: Détails OAuth pour %{app_name}
       url: "URL du jeton de requête :"
     update: 
diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 475504a82..f53f543f6 100644
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -145,7 +145,7 @@ fur:
         way: vie
     paging_nav: 
       of: su
-      showing_page: Mostrant la pagjine
+      showing_page: pagjine
     redacted: 
       type: 
         node: grop
@@ -183,7 +183,7 @@ fur:
       manually_select: Sielç a man une aree divierse
       object_list: 
         api: Recupere cheste aree doprant l'API
-        back: Mostre liste dai ogjets
+        back: Torne ae liste dai ogjets
         details: Detais
         heading: di
         history: 
@@ -223,8 +223,8 @@ fur:
       way_title: "Vie: %{way_name}"
     way_details: 
       also_part_of: 
-        one: ancje part de vie %{related_ways}
-        other: ancje part des viis %{related_ways}
+        one: part de vie %{related_ways}
+        other: part des viis %{related_ways}
       nodes: "Grops:"
       part_of: "Part di:"
     way_history: 
@@ -242,9 +242,9 @@ fur:
       still_editing: (ancjemò in cambiament)
       view_changeset_details: Viôt detais dal grup di cambiaments
     changeset_paging_nav: 
-      next: Successîf »
+      next: Sucessîf »
       previous: « Precedent
-      showing_page: Daûr a mostrâ la pagjine %{page}
+      showing_page: Pagjine %{page}
     changesets: 
       area: Aree
       comment: Coment
@@ -252,13 +252,13 @@ fur:
       saved_at: Salvât ai
       user: Utent
     list: 
-      description: Ultins cambiaments
+      description: Sgarfe tai ultins cambiaments ae mape
       description_bbox: Grups di cambiaments jentri di %{bbox}
       description_friend: Grups di cambiaments dai tiei amîs
       description_nearby: Grups di cambiaments dai utents dongje
       description_user: Grups di cambiaments di %{user}
       description_user_bbox: Grups di cambiaments di %{user} jentri di %{bbox}
-      empty_anon_html: Ancjemò nissun cambiament
+      empty_anon_html: Ancjemò nissun cambiament.
       heading: Grups di cambiaments
       heading_bbox: Grups di cambiaments
       heading_friend: Grups di cambiaments
@@ -275,6 +275,7 @@ fur:
     comments: 
       ago: "%{ago} indaûr"
       comment: Coment
+      has_commented_on: "%{display_name} al à comentâts lis vôs dal diari ca sot"
       newer_comments: Coments plui gnûfs
       older_comments: Coments plui vieris
       post: Publiche
@@ -321,7 +322,7 @@ fur:
       newer_entries: Vôs plui gnovis
       no_entries: Nissune vôs tal diari
       older_entries: Vôs plui vieris
-      recent_entries: "Ultimis vôs dal diari:"
+      recent_entries: Ultimis vôs dal diari
       title: Diaris dai utents
       title_friends: Diaris dai amîs
       title_nearby: Diaris dai utents dongje
@@ -334,6 +335,7 @@ fur:
       title: Gnove vôs dal diari
     no_such_entry: 
       body: No esist une vôs dal diari o un coment cun id %{id}. Controle par plasê la grafie o che tu vedis seguît il leam just.
+      heading: Nissune vôs cun identificatîf %{id}
       title: La vôs dal diari no esist
     view: 
       leave_a_comment: Lasse un coment
@@ -493,6 +495,7 @@ fur:
           national_park: Parc nazionâl
           protected_area: Aree protezude
         bridge: 
+          viaduct: Viadot
           "yes": Puint
         building: 
           "yes": Edifici
@@ -561,6 +564,8 @@ fur:
           water: Aghe
         office: 
           architect: Architet
+          government: Ufizi governatîf
+          "yes": Ufizi
         place: 
           airport: Aeropuart
           city: Citât
@@ -606,6 +611,7 @@ fur:
           jewelry: Buteghe dal oresin
           laundry: Lavandarie
           market: Marcjât
+          newsagent: Buteghe dai gjornâi
           optician: Otic
           pet: Buteghe di animâi
           shoes: Buteghe di scarpis
@@ -756,8 +762,6 @@ fur:
       back_to_outbox: Torne ai messaçs in jessude
       date: Date
       from: Di
-      reading_your_messages: Leture dai tiei messaçs
-      reading_your_sent_messages: Leture dai messaçs che tu âs inviât
       reply_button: Rispuint
       subject: Sogjet
       title: Leture messaç
@@ -801,12 +805,25 @@ fur:
       more_videos: A son %{more_videos_link}.
       more_videos_here: altris videos culì
       video_to_openstreetmap: video di introduzion a OpenStreetMap
+  oauth: 
+    oauthorize: 
+      allow_read_prefs: lei lis tôs preferencis dal utent.
+      allow_to: "Permèt ae aplicazion client di:"
+      allow_write_api: modificâ la mape.
+      allow_write_diary: creâ vôs dal diari, comentâ e zontâ amîs.
+      allow_write_prefs: modificâ lis tôs preferencis dal utent.
+      request_access: La aplicazion %{app_name} e je daûr a domandâ di vê acès al to profîl, %{user}. Controle se tu sês dacuardi che la aplicazion e podedi fâ chestis robis. Tu puedis sielzi ogni opzion in mût indipendent.
   oauth_clients: 
     edit: 
       submit: Cambie
       title: Cambie la tô aplicazion
     form: 
+      allow_read_prefs: lei lis sôs preferencis dal utent.
+      allow_write_api: modificâ la mape.
+      allow_write_diary: creâ vôs dal diari, comentâ e zontâ amîs.
+      allow_write_prefs: modificâ lis sôs preferencis dal utent.
       name: Non
+      url: URL principâl de aplicazion
     index: 
       application: Non de aplicazion
       issued_at: Aprovade il
@@ -815,21 +832,31 @@ fur:
       my_tokens: Lis aplicazions che o ai autorizât
       no_apps: Âstu une aplicazion web che tu volaressis regjistrâ par doprâ ca di no cul standard %{oauth}? Tu scugnis regjistrâle prime che podedi fâ richiestis OAuth a chest servizi.
       register_new: Regjistre la tô aplicazion
+      registered_apps: "Tu âs chestis aplicazions client regjistradis:"
       revoke: Revoche!
       title: I miei detais OAuth
     new: 
       submit: Regjistre
       title: Regjistre une gnove aplicazion
     show: 
+      allow_read_prefs: lei lis sôs preferencis dal utent.
+      allow_write_api: modificâ la mape.
+      allow_write_diary: creâ vôs dal diari, comentâ e zontâ amîs.
+      allow_write_prefs: modificâ lis sôs preferencis dal utent.
       confirm: Sêstu sigûr?
+      delete: Elimine client
       edit: Cambie i detais
+      requests: "Domande i permès ca sot al utent:"
       title: Detais OAuth par {app_name}
   redaction: 
     edit: 
       description: Descrizion
+    new: 
+      description: Descrizion
     show: 
       confirm: Sêstu sigûr?
       description: "Descrizion:"
+      user: "Creadôr:"
     update: 
       flash: Cambiaments salvâts.
   site: 
@@ -974,7 +1001,7 @@ fur:
     trace_optionals: 
       tags: Etichetis
     trace_paging_nav: 
-      showing_page: Daûr a mostrâ la pagjine %{page}
+      showing_page: Pagjine %{page}
     view: 
       delete_track: Elimine chest percors
       description: "Descrizion:"
@@ -1119,7 +1146,7 @@ fur:
       already_a_friend: Tu sês za amì di %{name}.
       button: Zonte ai amîs
       heading: Zontâ %{user} ai amîs?
-      success: "%{name} al è cumò to amì."
+      success: "%{name} al è cumò to amì!"
     new: 
       confirm email address: "Conferme direzion pueste:"
       confirm password: "Conferme la password:"
@@ -1145,6 +1172,8 @@ fur:
       nearby mapper: Mapadôr dongje
       your location: La tô posizion
     remove_friend: 
+      button: Gjave dai amîs
+      heading: Vuelistu gjavâ dai amîs %{user}?
       not_a_friend: "%{name} nol è un dai tiei amîs."
       success: "%{name} al è stât gjavât dai tiei amîs."
     reset_password: 
@@ -1189,10 +1218,10 @@ fur:
       diary: diari
       edits: cambiaments
       email address: "Direzion di pueste:"
-      friends_changesets: Viôt ducj i grups di cambiaments dai amîs
-      friends_diaries: Viôt dutis lis vôs di diari dai amîs
+      friends_changesets: grups di cambiaments dai amîs
+      friends_diaries: vôs di diari dai amîs
       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}.
+      if set location: Impueste la tô locazion intes %{settings_link} par viodi i utents dongje di te.
       km away: "%{count}km di distance"
       latest edit: "Ultin cambiament %{ago}:"
       m away: "%{count}m di distance"
@@ -1204,8 +1233,8 @@ fur:
       my settings: mês impostazions
       my traces: percors personâi
       nearby users: Altris utents dongje
-      nearby_changesets: Viôt ducj i grups di cambiaments dai utents dongje
-      nearby_diaries: Viôt dutis lis vôs di diari dai utents dongje
+      nearby_changesets: grups di cambiaments dai utents dongje
+      nearby_diaries: vôs di diari dai utents dongje
       new diary entry: gnove vôs dal diari
       no friends: No tu âs ancjemò nissun amì.
       no nearby users: Nol è ancjemò nissun utent che al declare di mapâ dongje di te.
@@ -1251,11 +1280,14 @@ fur:
       creator_name: Creadôr
       display_name: Utent blocât
       edit: Cambie
+      next: Sucessîf »
       not_revoked: (no revocât)
+      previous: « Precedent
       reason: Reson dal bloc
       revoke: Revoche!
       revoker_name: Revocât di
       show: Mostre
+      showing_page: Pagjine %{page}
       status: Stât
     period: 
       one: 1 ore
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index f5048e6db..b8722113f 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -698,6 +698,8 @@ gl:
           airfield: Aeródromo militar
           barracks: Barracas
           bunker: Búnker
+        mountain_pass: 
+          "yes": Porto de montaña
         natural: 
           bay: Baía
           beach: Praia
@@ -1085,8 +1087,6 @@ gl:
       back_to_outbox: Volver á caixa de saída
       date: Data
       from: De
-      reading_your_messages: Lendo as súas mensaxes
-      reading_your_sent_messages: Lendo as mensaxes enviadas
       reply_button: Responder
       subject: Asunto
       title: Ler a mensaxe
@@ -1239,7 +1239,7 @@ gl:
       key: "Clave do consumidor:"
       requests: "Solicitar os seguintes permisos ao usuario:"
       secret: "Pregunta secreta do consumidor:"
-      support_notice: Soportamos HMAC-SHA1 (recomendado), así como texto sinxelo en modo ssl.
+      support_notice: Soportamos HMAC-SHA1 (recomendado) e sinaturas RSA-SHA1.
       title: Detalles OAuth para %{app_name}
       url: "Solicitar un URL de pase:"
     update: 
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 3f381252c..b9b086bd1 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -175,7 +175,7 @@ he:
         way: דרך
     paging_nav: 
       of: מתוך
-      showing_page: הצגת דף
+      showing_page: דף
     redacted: 
       message_html: "לא ניתן להציג את הגרסה %{version} של %{type} מכיוון שהיא נחתכה. למידע נוסף: %{redaction_link}."
       redaction: חיתוך %{id}
@@ -215,7 +215,7 @@ he:
       manually_select: בחירת אזור אחר ידנית
       object_list: 
         api: אחזור אזור זה מה־API
-        back: הצגת רשימת הפריטים
+        back: חזרה אל רשימת הפריטים
         details: פרטים
         heading: רשימת פריטים
         history: 
@@ -257,8 +257,8 @@ he:
       way_title: "דרך: %{way_name}"
     way_details: 
       also_part_of: 
-        one: גם כן חלק מהדרך %{related_ways}
-        other: גם כן חלק מהדרכים %{related_ways}
+        one: חלק מהדרך %{related_ways}
+        other: חלק מהדרכים %{related_ways}
       nodes: "צמתים:"
       part_of: "חלק מתוך:"
     way_history: 
@@ -278,7 +278,7 @@ he:
     changeset_paging_nav: 
       next: הבא »
       previous: « הקודם
-      showing_page: הצגת הדף %{page}
+      showing_page: הדף %{page}
     changesets: 
       area: שטח
       comment: הערה
@@ -286,13 +286,13 @@ he:
       saved_at: "נשמרו ב:"
       user: משתמש
     list: 
-      description: שינויים אחרונים
+      description: עיון בשינויים אחרונים למפה
       description_bbox: ערכות שינויים בתוך %{bbox}
       description_friend: ערכות שינויים של חברים שלכם
       description_nearby: ערכות שינויים של משתמשים בסביבה
       description_user: ערכות שינויים של %{user}
       description_user_bbox: ערכות שינויים של %{user} בתוך %{bbox}
-      empty_anon_html: עוד לא נעשו עריכות
+      empty_anon_html: עוד לא נעשו עריכות.
       empty_user_html: נראה שעוד לא ערכת דבר. כדי להתחיל, ר' <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>מדריך למתחילים</a>.
       heading: ערכות שינויים
       heading_bbox: ערכות שינויים
@@ -360,7 +360,7 @@ he:
       newer_entries: רשומות חדשות יותר
       no_entries: אין רשומות יומן
       older_entries: רשומות ישנות יותר
-      recent_entries: "רשומות יומן אחרונות:"
+      recent_entries: רשומות יומן אחרונות
       title: יומנים של המשתמש
       title_friends: יומנים של חברים
       title_nearby: יומנים של משתמשים בסביבה
@@ -705,6 +705,8 @@ he:
           airfield: מנחת צבאי
           barracks: מגורי חיילים
           bunker: בונקר
+        mountain_pass: 
+          "yes": מעבר הררי
         natural: 
           bay: מפרץ
           beach: חוף רחצה
@@ -1095,8 +1097,6 @@ he:
       back_to_outbox: חזרה לתיבת הדואר היוצא
       date: תאריך
       from: מאת
-      reading_your_messages: קריאת ההודעות שלך
-      reading_your_sent_messages: לקריאת ההודעות שנשלחו
       reply_button: להשיב
       subject: נושא
       title: הודעה שנקראה
@@ -1249,7 +1249,7 @@ he:
       key: "מפתח צרכן:"
       requests: "מבקש את ההרשאות הבאות מהמשתמש:"
       secret: "סוד צרכן:"
-      support_notice: אנחנו תומכים ב־HMAC-SHA1 (מומלץ) וגם בטקסט פשוט במצב SSL.
+      support_notice: אנחנו תומכים בחתימות ב־HMAC-SHA1 (מומלץ) וגם ב־RSA-SHA1.
       title: פרטי OAuth עבור %{app_name}
       url: "כתובת אסימון בקשה:"
     update: 
@@ -1426,6 +1426,7 @@ he:
       visibility: "נִראוּת:"
       visibility_help: מה זה אומר?
     list: 
+      description: עיון בהעלאות אחרונות של נתיבי GPS
       empty_html: אין פה עדיין שום דבר. אפשר <a href='%{upload_link}'>להעלות מידע חדש</a> או ללמוד עוד על מעקב מסלולים ב־GPS ב<a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>דף הוויקי</a>.
       public_traces: מסלולי GPS ציבוריים
       public_traces_from: מסלולי GPS ציבוריים מאת %{user}
@@ -1473,7 +1474,7 @@ he:
     trace_paging_nav: 
       newer: מסלולים חדשים יותר
       older: מסלולים ישנים יותר
-      showing_page: הצגת הדף %{page}
+      showing_page: הדף %{page}
     view: 
       delete_track: מחיקת המסלול הזה
       description: "תיאור:"
@@ -1577,8 +1578,8 @@ he:
       heading: משתמשים
       hide: הסתרת משתמשים נבחרים
       showing: 
-        one: מוצג דף %{page} (%{first_item} מתוך %{items})
-        other: מוצג דף %{page} (%{first_item}–%{last_item} מתוך %{items})
+        one: דף %{page} (%{first_item} מתוך %{items})
+        other: דף %{page} (%{first_item}–%{last_item} מתוך %{items})
       summary: "%{name} נוצר מכתובת %{ip_address} ב־%{date}"
       summary_no_ip: "%{name} נוצר ב־%{date}"
       title: משתמשים
@@ -1640,7 +1641,7 @@ he:
       button: להוסיף כחבר
       failed: סליחה, הוספת %{name} כחבר נכשלה.
       heading: להוסיף את %{user} בתור חבר?
-      success: "%{name} חבר שלך עכשיו."
+      success: "%{name} חבר שלך עכשיו!"
     new: 
       confirm email address: "אימות כתובת דוא״ל:"
       confirm password: "אימות ססמה:"
@@ -1729,10 +1730,10 @@ he:
       diary: יומן
       edits: עריכות
       email address: "כתובת דוא\"ל:"
-      friends_changesets: עיון בכל ערכות השינויים של חברים
-      friends_diaries: עיון בכל רשומות היומן של חברים
+      friends_changesets: ערכות שינויים של חברים
+      friends_diaries: רשומות יומן של חברים
       hide_user: להסתרת משתמש זה
-      if set location: אם הגדרת את מיקומך, מפה יפה ועוד דברים יופיעו פה. אפשר להגדיר את מיקומך הראשי בדף %{settings_link}.
+      if set location: הגדרה של מיקום הבית שלך בדף %{settings_link} תאפשר לך לראות משתמשים בסביבתך.
       km away: במרחק %{count} ק״מ
       latest edit: "עריכה אחרונה %{ago}:"
       m away: במרחק %{count} מ׳
@@ -1744,8 +1745,8 @@ he:
       my settings: ההגדרות שלי
       my traces: המסלולים שלי
       nearby users: עוד משתמשים בסביבה
-      nearby_changesets: עיון בכל ערכות השינויים של משתמשים בסביבה
-      nearby_diaries: עיון בכל רשומות היומן של משתמשים בסביבה
+      nearby_changesets: ערכות השינויים של משתמשים בסביבה
+      nearby_diaries: רשומות יומן של משתמשים בסביבה
       new diary entry: רשומה חדשה ביומן
       no friends: עדיין לא הוספת חברים כלל.
       no nearby users: אין עדיין עוד משתמשים שמודים שהם מיפו בסביבה.
@@ -1829,7 +1830,7 @@ he:
       revoke: לבטל!
       revoker_name: בוטלה על־ידי
       show: הצגה
-      showing_page: הצגת הדף %{page}
+      showing_page: הדף %{page}
       status: מצב
     period: 
       one: שעה אחת
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 7aee1236e..a03bfbd69 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -966,8 +966,6 @@ hr:
       back_to_outbox: Nazad u odlaznu poštu
       date: Datum
       from: Od
-      reading_your_messages: Vaše poruke
-      reading_your_sent_messages: Čitanje tvojih poslanih poruka
       reply_button: Odgovori
       subject: Tema
       title: Pročitaj poruku
diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index c694d52ef..288defb43 100644
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -172,7 +172,7 @@ hsb:
         way: puć
     paging_nav: 
       of: wot
-      showing_page: Pokazuje so strona
+      showing_page: strona
     redacted: 
       message_html: Wersija %{version} tutoho %{type}a njeda so pokazać, dokelž je so hižo redigowała. Prošu, hlej %{redaction_link} za podronosće.
       redaction: Redakcija %{id}
@@ -212,7 +212,7 @@ hsb:
       manually_select: Druhi wobłuk manuelnje wubrać
       object_list: 
         api: Tutón wobłuk wot API wotwołać
-        back: Objektowu lisćinu zwobraznić
+        back: Wróćo k lisćinje objektow
         details: Podrobnosće
         heading: Objektowa lisćina
         history: 
@@ -277,7 +277,7 @@ hsb:
     changeset_paging_nav: 
       next: Přichodna »
       previous: « Předchadna
-      showing_page: Pokazuje so strona %{page}
+      showing_page: Strona %{page}
     changesets: 
       area: Wobłuk
       comment: Komentar
@@ -285,13 +285,13 @@ hsb:
       saved_at: Datum składowanja
       user: Wužiwar
     list: 
-      description: Aktualne změny
+      description: Najnowše přinoški za kartu přehladać
       description_bbox: Sadźby změnow znutřka %{bbox}
       description_friend: Změny twojich přećelow
       description_nearby: Sadźby změnow wužiwarjow w bliskosći
       description_user: Sadźby změnow wot %{user}
       description_user_bbox: Sadźby změnow wot %{user} znutřka %{bbox}
-      empty_anon_html: Dotal žane změny nječinjene
+      empty_anon_html: Dotal žane změny nječinjene.
       empty_user_html: Zda so, zo hišće njejsy žane změny přewjedł. Zo by započał, přečitaj <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Beginners Guide (přewodnik za započatkarjow)</a>.
       heading: Sadźby změnow
       heading_bbox: Sadźby změnow
@@ -361,7 +361,7 @@ hsb:
       newer_entries: Nowše zapiski
       no_entries: Žane zapiski w dźeniku
       older_entries: Starše zapiski
-      recent_entries: "Najnowše dźenikowe zapiski:"
+      recent_entries: Najnowše dźenikowe zapiski
       title: Dźeniki wužiwarjow
       title_friends: Dźeniki přećelow
       title_nearby: Dźeniki wužiwarjow w bliskosći
@@ -706,6 +706,8 @@ hsb:
           airfield: Wojerske lětanišćo
           barracks: Kaserna
           bunker: Bunker
+        mountain_pass: 
+          "yes": Hórski přesmyk
         natural: 
           bay: Zaliw
           beach: Přibrjóh
@@ -1021,11 +1023,11 @@ hsb:
       contributors_title_html: Naši sobuskutkowacy
       contributors_za_html: "<strong>Južna Afrika</strong>: Wobsahuje daty z <a href=\"http://www.ngi.gov.za/\">Chief Directorate:   National Geo-Spatial Information</a>, Statne awtorske prawo wuměnjene."
       credit_1_html: Žadamy sej, zo  podawaš sobuskutkowarjow &ldquo;&copy; OpenStreetMap&rdquo;.
-      credit_2_html: Hdźež je móžno, OpenStreetMap měł wotkaz do <a href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a> a CC BY-SA do <a href="http://creativecommons.org/licenses/by-sa/2.0/">http://creativecommons.org/licenses/by-sa/2.0/</a> měć. Jeli medij wužiwaš, hdźež wotkazy móžno njejsu (na př. wućišćane dźěło), namjetujemy, zo pokazuješ swojich čitarjow na www.openstreetmap.org a na www.creativecommons.org.
+      credit_2_html: Dyrbiš tež wujasnić, zo daty steja pod licencu Open Database, a, jeli so naše kartowe kachlicy wužiwaja, zo kartografija so pod CC-BY-SA licencuje. Móžeš to činić, wotkazujo do <a href="http://www.openstreetmap.org/copyright">tuteje strony awtorskeho prawa</a>. Alternatiwnje, a jako žadanje, jeli rozdźěluješ OSM w datowym formje, móžeš direktnje k licencam mjenować a wotkazać. W medijach, hdźež wotkazy móžno njejsu (na př. wućišćane dźěła), namjetujemy ći, twojich čitarjow na openstreetmap.org (snadź rozšěrjejo 'OpenStreetMap' k tutej połnej adresy), na opendatacommons.org a, jeli to je relewantne, na creativecommons.org skedźbnić.
       credit_3_html: "Za přepytujomnu elektronisku kartu měło so dźakprajenje w róžku karty jewić. Na přikład:"
       credit_title_html: Kak awtorstwo OpenStreetMap naspomnić
       infringement_1_html: Sobuskutkowacych OSM namołwjamy, zo ženje daty ze žórłow, kotrež su přez awtorske prawo škitane (na př. z Google Maps abo z wućišćanych kartow) bjez wurazneje dowolnosće awtorow  njepřidawaja.
-      infringement_2_html: Jeli měniš, zo awtorskoprawnisće škitany material je so datowej bance OpenStreetMap abo tutomu sydłu bjez dowolnosće přidał, poćahuj so prošu na naše <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">postupowanje za wotstronjenje wobsaha</a>abo zdźěl to direktnje na našej <a href="http://dmca.openstreetmap.org/">formularnej stronje</a>
+      infringement_2_html: Jeli měniš, zo awtorskoprawnisce škitany material je so datowej bance OpenStreetMap abo tutomu sydłu bjez dowolnosće přidał, poćahuj so prošu na naše <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">postupowanje za wotstronjenje wobsaha</a>abo zdźěl to direktnje na našej <a href="http://dmca.openstreetmap.org/">formularnej stronje</a>.
       infringement_title_html: Přeńdźenje awtorskeho prawa
       intro_1_html: "OpenStreetMap su <i>zjawne daty</i>, licencowane pod licencu <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database</a> (ODbL)."
       intro_2_html: Móžeš naše daty kopěrować, rozdźělić, přenjesć a přiměrić, tak dołho kaž OpenStreetMap a jich sobuskutkowacych naspominaš. Jeli změniš naše daty abo zepěraš so na nje, móžeš wuslědk jenož pod samsnej licencu rozdźělić. Dospołny <a href="http://opendatacommons.org/licenses/odbl/1.0/">prawniski kod</a> wujasnja twoje prawa a zamołwitosće.
@@ -1103,8 +1105,6 @@ hsb:
       back_to_outbox: Wróćo k pósłanym powěsćam
       date: Datum
       from: Wot
-      reading_your_messages: Twoje powěsće čitać
-      reading_your_sent_messages: Twoje pósłane powěsće čitać
       reply_button: Wotmołwić
       subject: Temowe nadpismo
       title: Powěsć čitać
@@ -1172,7 +1172,7 @@ hsb:
       created: Něchtó (nadźijamy so ty) je runje konto na %{site_url} załožił.
       greeting: Witaj!
       subject: "[OpenStreetMap] Witaj do OpenStreetMap"
-      welcome: Bychmy će rady powitali a ći přidatne informacije dali zo ty móhł započeć.
+      welcome: Bychmy će rady powitali a ći přidatne informacije dali, zo by móhł započeć.
     signup_confirm_html: 
       ask_questions: Móžeš so za něčim wo OpenStreetMap  na našim sydle <a href="http://help.openstreetmap.org/">Prašenja a wotmołwy</a> prašeć.
       current_user: Lisćina tuchwilnych wužiwarjow po jich stejnišću w swěće steji na <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Lisćina wužiwarjow po geografiskim regionje</a> k dispoziciji.
@@ -1257,7 +1257,7 @@ hsb:
       key: "Kluč přetrjebowarja:"
       requests: "Požadanje slědowacych prawow wot wužiwarja:"
       secret: "Potajnstwo přetrjebowarja:"
-      support_notice: Podpěrujemy HMAC-SHA1 (poručeny) kaž tež luty tekst w modusu ssl.
+      support_notice: Podpěrujemy HMAC-SHA1 (poručeny) kaž tež signatury RSA_SH1.
       title: Podrobnosće OAuth za %{app_name}
       url: URL za naprašowanski token
     update: 
@@ -1434,6 +1434,7 @@ hsb:
       visibility: "Widźomnosć:"
       visibility_help: Å¡to to woznamjenja?
     list: 
+      description: Najnowše nahraća GPS-čarow přepytać
       empty_html: Ničo tu njeje. <a href='%{upload_link}'>Nahraj nowu ćěr</a> abo wukń wjace wo GPS-slědowanju na <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wikijowej stronje</a>.
       public_traces: Zjawne GPS-ćěrje
       public_traces_from: Zjawne GPS-ćěrje wot %{user}
@@ -1481,7 +1482,7 @@ hsb:
     trace_paging_nav: 
       newer: Nowše ćěrje
       older: Starše ćěrje
-      showing_page: Pokazuje so strona %{page}
+      showing_page: Strona %{page}
     view: 
       delete_track: Tutu čaru zničić
       description: "Wopisanje:"
@@ -1585,8 +1586,8 @@ hsb:
       heading: Wužiwarjo
       hide: Wubranych wužiwarjow schować
       showing: 
-        one: Pokazuje so strona %{page} (%{first_item} z %{items})
-        other: Pokazuje so strona %{page} (%{first_item}-%{last_item} z %{items})
+        one: Strona %{page} (%{first_item} z %{items})
+        other: Strona %{page} (%{first_item}-%{last_item} z %{items})
       summary: "%{name} wot %{ip_address} dnja %{date} wutworjeny"
       summary_no_ip: "%{name} dnja %{date} wutworjeny"
       title: Wužiwarjo
@@ -1648,7 +1649,7 @@ hsb:
       button: Jako přećela přidać
       failed: Wodaj, %{name} njeda so jako přećel přidać.
       heading: "%{user} jako přećela přidać?"
-      success: "%{name} je nětko twój přećel."
+      success: "%{name} je nětko twój přećel!"
     new: 
       confirm email address: "E-mejlowu adresu wobkrućić:"
       confirm password: "Hesło wobkrućić:"
@@ -1681,7 +1682,7 @@ hsb:
       nearby mapper: Kartěrowar w bliskosći
       your location: Twoje městno
     remove_friend: 
-      button: Jako přećela wotstronić
+      button: Přećela wotstronić
       heading: "%{user} jako přećela wotstronić?"
       not_a_friend: "%{name} twój přećel njeje."
       success: "%{name} je so jako přećel wotstronił."
@@ -1717,7 +1718,7 @@ hsb:
       you need to accept or decline: Prošu přečitaj nowe wužiwarske wuměnjenja a akceptuj abo wotpokazaj je, prjedy hač dale činiš.
     view: 
       activate_user: tutoho wužiwarja aktiwizować
-      add as friend: jako přećela přidać
+      add as friend: přećela přidać
       ago: (před %{time_in_words_ago})
       block_history: Dóstane blokowanja
       blocks by me: blokowanja wote mnje
@@ -1737,10 +1738,10 @@ hsb:
       diary: dźenik
       edits: změny
       email address: "E-mejlowa adresa:"
-      friends_changesets: Sadźby změnow twojich přećelow přepytać
-      friends_diaries: Wšě dźenikowe zapiski přećelow přepytać
+      friends_changesets: Sadźby změnow twojich přećelow
+      friends_diaries: Dźenikowe zapiski přećelow
       hide_user: tutoho wužiwarja schować
-      if set location: Jeli sy swoje stejnišćo podał, budźetej so deleka rjana karta a druhe material jewić. Móžeš swoje domjace stejnišćo na swojej stronje %{settings_link} nastajić.
+      if set location: Podaj swoje stejnišćo na boku  %{settings_link}, zo by wužiwarjow w swojej bliskosći widźał.
       km away: "%{count} km zdaleny"
       latest edit: "Najnowša změna %{ago}:"
       m away: "%{count} m zdaleny"
@@ -1752,13 +1753,13 @@ hsb:
       my settings: moje nastajenja
       my traces: moje ćěrje
       nearby users: Druzy wužiwarjo w bliskosći
-      nearby_changesets: Wšě sadźby změnow wužiwarjow w bliskosći přepytać
-      nearby_diaries: Wšě dźenikowe zapiski wužiwarjow w bliskosći přepytać
+      nearby_changesets: sadźby změnow wužiwarjow w bliskosći
+      nearby_diaries: dźenikowe zapiski wužiwarjow w bliskosći
       new diary entry: nowy dźenikowy zapisk
       no friends: Hišće njejsy přećelow přidał.
       no nearby users: Njejsu druzy wužiwarjo, kotřiž w bliskosći kartěruja.
       oauth settings: OAUTH-nastajenja
-      remove as friend: jako přećela wotstronić
+      remove as friend: přećela wotstronić
       role: 
         administrator: Tutón wužiwar je administrator
         grant: 
@@ -1837,7 +1838,7 @@ hsb:
       revoke: Zběhnyć!
       revoker_name: Zběhnjene wot
       show: Pokazać
-      showing_page: Pokazuje so strona %{page}
+      showing_page: Strona %{page}
       status: Status
     period: 
       few: "%{count} hodźiny"
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index a87c5dada..2713aeda8 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -231,6 +231,7 @@ hu:
       show_areas: Területek megjelenítése
       show_history: Előzmények megjelenítése
       unable_to_load_size: "Nem tölthető be: a határolónégyzet mérete (%{bbox_size}) túl nagy. (%{max_bbox_size}-nél kisebbnek kell lennie.)"
+      view_data: Adatok megtekintése a térkép jelenlegi nézetéhez
       wait: Várj...
       zoom_or_select: Közelíts rá vagy jelölj ki egy területet a térképen a megtekintéshez
     tag_details: 
@@ -960,7 +961,7 @@ hu:
     intro_1: Az OpenStreetMap egy szabadon szerkeszthető térkép az egész világról. Olyan emberek készítik, mint Te.
     intro_2_create_account: Felhasználói fiók létrehozása
     intro_2_download: letöltés
-    intro_2_html: Az adatok %{download} és%{use} ingyenes és korlátozásoktól mentes. Hozzon létre %{create_account} a térképek szerkesztéséhez.
+    intro_2_html: A %{download} és az  adatok %{use}a ingyenes és korlátozásoktól mentes. A %{create_account} linkre kattintva regisztrálás után be tud lépni a térképek szerkesztéséhez.
     intro_2_license: open license
     intro_2_use: használata
     log_in: bejelentkezés
@@ -1000,6 +1001,7 @@ hu:
         title: Példa egy hivatkozásra
       contributors_at_html: "<strong>Ausztria</strong>: adatokat tartalmaz a következő forrásból:\n   <a href=\"http://data.wien.gv.at/\">Bécs városa</a>\n   <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a> licenc alatt."
       contributors_ca_html: "<strong>Kanada</strong>: adatokat tartalmaz a következő forrásokból:\n   GeoBase&reg;, GeoGratis (&copy; Department of Natural\n   Resources Canada), CanVec (&copy; Department of Natural\n   Resources Canada), and StatCan (Geography Division,\n   Statistics Canada)."
+      contributors_footer_1_html: "További részletekért, és az OpenStreetMap javításához használt más forrásokról,\nkérjük, olvassa el <a href=\"http://wiki.openstreetmap.org/wiki/contributors\">a hozzájárulók oldalát\naz OpenStreetMap wikin.</a>"
       contributors_footer_2_html: "  Az adatok befoglalása az OpenStreetMapba nem jelenti azt, hogy az eredeti\n  adatszolgáltató támogatja az OpenStreetMapot, nyújt garanciát vagy\n  vállal rá felelősséget."
       contributors_fr_html: "<strong>France</strong>: adatokat tartalmaz a következő forrásból:\n   Direction Générale des Impôts."
       contributors_gb_html: "<strong>Egyesült Királyság</strong>: tartalmaz Ordnance\n   Survey adatokat &copy; Szerzői és adatbázisjog\n   2010."
@@ -1007,6 +1009,7 @@ hu:
       contributors_nl_html: "<strong>Hollandia</strong>: adatokat tartalmaz innen: Automotive Navigation Data, 2007\n(<a href=\"http://www.and.com\">www.and.com</a>)"
       contributors_nz_html: "<strong>Új-Zéland</strong>: adatokat tartalmaz a következő forrásból:\n   Land Information New Zealand. Szerzői jog fenntartva."
       contributors_title_html: Közreműködőink
+      contributors_za_html: "<strong>Dél-Afrika</strong>: tartalmaz olyan adatokat, amik a\n<a href=\"http://www.ngi.gov.za/\">Chief Directorate:\nNational Geo-Spatial Information</a>-tól származnak, az állami szerzői jogok fenntartva."
       credit_1_html: "  Ha az OpenStreetMap térkép képeit használod, kérjük \n  legyen feltüntetve legalább az &ldquo;&copy; OpenStreetMap\n  közreműködői, CC BY-SA&rdquo; szöveg. Ha csak a térkép adatait használod,\n  akkor a &ldquo;Térképadatok &copy; OpenStreetMap közreműködői,\n  CC BY-SA&rdquo; feltüntetését kérjük."
       credit_2_html: "Ahol lehetséges, ott az OpenStreetMapnak hiperhivatkoznia kell a <a\n  href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>,\n  a CC BY-SA-nak pedig a <a\n  href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a> webhelyre. Ha\n  olyan médiumot használsz, ahol a hivatkozás nem lehetséges (pl. egy\n  nyomtatott munka), javasoljuk, hogy irányítsd az olvasóidat a\n  www.openstreetmap.org (esetleg az\n  &lsquo;OpenStreetMap&rsquo; szöveg kibővítésével erre a teljes címre) és a\n  www.creativecommons.org webhelyre."
       credit_3_html: "Böngészhető elektronikus térkép esetén a forrásra vonatkozó hivatkozás jelenjen meg a térkép sarkában.\nPéldául:"
@@ -1083,8 +1086,6 @@ hu:
       back_to_outbox: Vissza az elküldött üzenetekhez
       date: Érkezett
       from: Feladó
-      reading_your_messages: Üzenetek olvasása
-      reading_your_sent_messages: Elküldött üzenetek olvasása
       reply_button: Válasz
       subject: Tárgy
       title: Üzenet olvasása
@@ -1148,6 +1149,7 @@ hu:
       header: "%{from_user} küldött neked egy üzenetet az OpenStreetMapon keresztül %{subject} tárggyal:"
       hi: Szia %{to_user}!
     signup_confirm: 
+      greeting: Szia!
       subject: "[OpenStreetMap] E-mail cím megerősítése"
     signup_confirm_html: 
       ask_questions: Ha bármilyen kérdésed merülne fel az OpenStreetMappal kapcsolatban, felteheted azt a mi <a href="http://help.openstreetmap.org/">kérdés és válasz oldalunkon</a>.
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 1c6bef350..fdf28bcc2 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -167,7 +167,7 @@ ia:
         way: via
     paging_nav: 
       of: de
-      showing_page: Monstrante pagina
+      showing_page: pagina
     redacted: 
       message_html: Le version %{version} de iste %{type} non pote esser monstrate perque illo ha essite obscurate. Vide %{redaction_link} pro detalios.
       redaction: Obscuration %{id}
@@ -207,7 +207,7 @@ ia:
       manually_select: Seliger manualmente un altere area
       object_list: 
         api: Obtener iste area per medio del API
-        back: Monstrar lista de objectos
+        back: Retornar al lista de objectos
         details: Detalios
         heading: Lista de objectos
         history: 
@@ -225,6 +225,7 @@ ia:
       show_areas: Monstrar areas
       show_history: Monstrar historia
       unable_to_load_size: "Impossibile cargar: Le dimension del quadro de delimitation %{bbox_size} es troppo grande (debe esser inferior a %{max_bbox_size})"
+      view_data: Vider datos pro le vista actual del carta
       wait: Un momento...
       zoom_or_select: Face zoom avante o selige un area del carta a visualisar
     tag_details: 
@@ -248,8 +249,8 @@ ia:
       way_title: "Via: %{way_name}"
     way_details: 
       also_part_of: 
-        one: tamben parte del via %{related_ways}
-        other: tamben parte del vias %{related_ways}
+        one: parte del via %{related_ways}
+        other: parte del vias %{related_ways}
       nodes: "Nodos:"
       part_of: "Parte de:"
     way_history: 
@@ -269,7 +270,7 @@ ia:
     changeset_paging_nav: 
       next: Sequente »
       previous: « Precedente
-      showing_page: Pagina %{page} monstrate
+      showing_page: Pagina %{page}
     changesets: 
       area: Area
       comment: Commento
@@ -277,13 +278,13 @@ ia:
       saved_at: Salveguardate le
       user: Usator
     list: 
-      description: Modificationes recente
+      description: Examinar le contributiones recente al carta
       description_bbox: Gruppos de modificationes intra %{bbox}
       description_friend: Gruppos de modificationes per tu amicos
       description_nearby: Gruppos de modificationes per usatores vicin
       description_user: Gruppos de modificationes per %{user}
       description_user_bbox: Gruppos de modificationes per %{user} intra %{bbox}
-      empty_anon_html: Nulle modification ancora facite
+      empty_anon_html: Nulle modification facite ancora.
       empty_user_html: Il pare que tu non ha ancora facite modificationes. Pro comenciar, consulta le <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Guida pro principiantes</a>.
       heading: Gruppos de modificationes
       heading_bbox: Gruppos de modificationes
@@ -351,7 +352,7 @@ ia:
       newer_entries: Entratas plus recente
       no_entries: Nulle entrata in diario
       older_entries: Entratas plus ancian
-      recent_entries: "Entratas recente de diario:"
+      recent_entries: Entratas recente del diario
       title: Diarios de usatores
       title_friends: Diarios de amicos
       title_nearby: Diarios de usatores vicin
@@ -696,6 +697,8 @@ ia:
           airfield: Aerodromo militar
           barracks: Barracas
           bunker: Bunker
+        mountain_pass: 
+          "yes": Passo de montania
         natural: 
           bay: Baia
           beach: Plagia
@@ -1002,8 +1005,8 @@ ia:
       contributors_footer_1_html: "Pro ulterior detalios de iste e altere fontes que ha essite usate\npro adjutar a meliorar OpenStreetMap, vide le <a\nhref=\"\"http://wiki.openstreetmap.org/wiki/Contributors\">pagina\nde contributores</a> in le wiki de OpenStreetMap."
       contributors_footer_2_html: "  Le inclusion de datos in OpenStreetMap non implica que le fornitor\n  original del datos indorsa OpenStreetMap, forni alcun garantia, o\n  accepta alcun responsabilitate."
       contributors_fr_html: "<strong>Francia</strong>: Contine datos fornite per le\n   Direction Générale des Impôts."
-      contributors_gb_html: "<strong>Regno Unite</strong>: Contine datos de Ordnance\n   Survey &copy; copyright del Corona e derecto de base de datos\n   2010."
-      contributors_intro_html: "  Nostre licentia CC BY-SA require que vos &ldquo;recognosce le Autor\n  Original de maniera rationabile pro le medio que Vos\n  utilisa&rdquo;. Le cartographos individual de OSM non requesta un\n  recognoscentia excedente illo del &ldquo;Contributores de\n  OpenStreetMap&rdquo;, sed ubi datos de un agentia cartographic\n  national o altere fonte major ha essite includite in\n  OpenStreetMap, il pote esser rationabile recognoscer les per\n  directemente reproducer lor recognoscentia o per ligar a illo in iste pagina."
+      contributors_gb_html: "<strong>Regno Unite</strong>: Contine datos de Ordnance\n   Survey &copy; copyright del Corona e derecto de base de datos\n   2010-12."
+      contributors_intro_html: "Nostre contributores es milles de personas. Nos include anque le datos sub licentia aperte de agentias cartographic national e de altere fontes, inter le quales:"
       contributors_nl_html: "<strong>Nederlandia</strong>: Contine datos &copy; AND, 2007\n(<a href=\"http://www.and.com\">www.and.com</a>)"
       contributors_nz_html: "<strong>Nove Zelandia</strong>: Contine datos proveniente de\n   Land Information New Zealand. Crown Copyright reservate."
       contributors_title_html: Nostre contributores
@@ -1012,11 +1015,14 @@ ia:
       credit_2_html: Vos debe anque clarificar que le datos es disponibile sub Open Database License, e si vos usa nostre tegulas cartographic, que le cartographia es licentiate sub CC-BY-SA. Vos pote facer isto con un ligamine a <a href="http://www.openstreetmap.org/copyright">iste pagina de copyright</a>. Alternativemente, e obligatorimente si vos distribue OSM in forma de datos, vos pote nominar e ligar directemente al licentia(s). Si vos usa un medio de communication in le qual le ligamines non es possibile (p.ex. un obra imprimite), nos suggere que vos dirige vostre lectores a www.openstreetmap.org (forsan per inserer iste adresse complete in loco del parola &lsquo;OpenStreetMap&rsquo;), a www.opendatacommosn.org, e (si relevante) a www.creativecommons.org.
       credit_3_html: "Pro un carta electronic navigabile, le recognoscentia debe apparer in le angulo del carta. Per exemplo:"
       credit_title_html: Como dar recognoscentia a OpenStreetMap
-      intro_1_html: "OpenStreetMap is <i>open data</i>, licensed under the <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
+      infringement_1_html: "  Nos rememora al contributores de OSM de nunquam adder datos de alcun\n  fonte sub derecto de autor (p.ex. Google Maps o cartas imprimite)\n  sin explicite permission del titulares del derecto de autor."
+      infringement_2_html: Si vos crede que material sub copyright ha essite inserite inappropriatemente in le base de datos de OpenStreetMap o in iste sito, per favor consulta nostre <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">procedura de remotion</a> o submitte un plancto immediate usante nostre <a href="http://dmca.openstreetmap.org/">formulario in linea</a>.
+      infringement_title_html: Violation de copyright
+      intro_1_html: "OpenStreetMap es <i>datos aperte</i>, licentiate sub le <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
       intro_2_html: "  Vos es libere de copiar, distribuer, transmitter e adaptar nostre cartas\n  e datos, a condition que vos da recognoscentia a OpenStreetMap e su\n  contributores. Si vos altera o extende nostre cartas e datos, vos\n  pote distribuer le resultato solmente sub le mesme licentia. Le\n  complete <a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">codice\n  legal</a> explica vostre derectos e responsabilitates."
       intro_3_html: "Le cartographia in nostre tegulas de carta, e nostre documentation, son\npublicate sub licentia <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons Attribution-ShareAlike 2.0</a> (CC-BY-SA)."
-      more_1_html: "  Lege plus super le uso de nostre datos al <a\n  href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">FAQ\n  Legal</a>."
-      more_2_html: "  Nos rememora al contributores de OSM de nunquam adder datos de alcun\n  fonte sub derecto de autor (p.ex. Google Maps o cartas imprimite)\n  sin explicite permission del titulares del derecto de autor."
+      more_1_html: "  Lege plus super le uso de nostre datos, e como recognoscer nos, al <a\n  href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">FAQ\n  Legal</a>."
+      more_2_html: "Ben que OpenStreetMap es datos aperte, nos non pote fornir un API cartographic gratuite pro disveloppatores tertie. Vide nostre <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">politica pro le uso del API</a>,\n<a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">politica pro le uso de tegulas</a>\ne <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">politica pro le uso de Nominatim</a>."
       more_title_html: Pro saper plus
       title_html: Copyright e Licentia
     native: 
@@ -1082,8 +1088,6 @@ ia:
       back_to_outbox: Retornar al cassa de exito
       date: Data
       from: De
-      reading_your_messages: Lectura de tu messages
-      reading_your_sent_messages: Lectura de tu messages inviate
       reply_button: Responder
       subject: Subjecto
       title: Leger message
@@ -1147,7 +1151,11 @@ ia:
       header: "%{from_user} te ha inviate un message per OpenStreetMap con le subjecto %{subject}:"
       hi: Salute %{to_user},
     signup_confirm: 
-      subject: "[OpenStreetMap] Confirma tu adresse de e-mail"
+      confirm: "Ante de facer altere cosa, nos debe confirmar que iste requesta proveniva de te. Dunque, si tu lo faceva, per favor clicca sur le ligamine sequente pro confirmar tu conto:"
+      created: Un persona (probabilemente tu) ha justo create un conto a %{site_url}.
+      greeting: Bon die!
+      subject: "[OpenStreetMap] Benvenite a OpenStreetMap"
+      welcome: Benvenite! Ecce alcun information supplementari pro adjutar te a comenciar.
     signup_confirm_html: 
       ask_questions: Tu pote poner qualcunque questiones super OpenStreetMap a nostre <a href="http://help.openstreetmap.org/">sito de questiones e responsas</a>.
       current_user: Un lista de usatores actual in categorias, a base de lor position geographic, es disponibile de <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
@@ -1161,10 +1169,12 @@ ia:
     signup_confirm_plain: 
       ask_questions: "Tu pote poner qualcunque questiones super OpenStreetMap a nostre sito de questiones e responsas:"
       blog_and_twitter: "Tene te al currente con le ultime novas al blog de OpenStreetMap o con Twitter:"
+      current_user: "Un lista de usatores actual in categorias, secundo ubi in le mundo illes se trova, es disponibile de:"
       introductory_video: "Tu pote reguardar un video de introduction a OpenStreetMap hic:"
       more_videos: "Il ha plus videos hic:"
       opengeodata: "OpenGeoData.org es le blog del fundator de OpenStreetMap, Steve Coast, e illo include tamben podcasts:"
       the_wiki: "Informa te super OpenStreetMap al wiki:"
+      user_wiki_page: Il es recommendate que tu crea un pagina de usator in le wiki, includente etiquettas de categoria denotante ubi tu es, per exemplo [[Category:Users_in_London]] (usatores in London).
       wiki_signup: "Considera tamben crear un conto al wiki de OpenStreetMap a:"
   oauth: 
     oauthorize: 
@@ -1230,7 +1240,7 @@ ia:
       key: "Clave de consumitor:"
       requests: "Le sequente permissiones es requestate del usator:"
       secret: "Secreto de consumitor:"
-      support_notice: Nos supporta HMAC-SHA1 (recommendate) e texto simple in modo SSL.
+      support_notice: Nos supporta le signaturas HMAC-SHA1 (recommendate) e RSA-SHA1.
       title: Detalios OAuth pro %{app_name}
       url: "URL del indicio de requesta:"
     update: 
@@ -1280,6 +1290,8 @@ ia:
     index: 
       js_1: O tu usa un navigator que non supporta JavaScript, o tu ha disactivate JavaScript.
       js_2: OpenStreetMap usa JavaScript pro su carta glissante.
+      license: 
+        copyright: Copyright OpenStreetMap e contributores, sub licentia aperte
       permalink: Permaligamine
       remote_failed: Modification fallite - assecura te que JOSM o Merkaartor es cargate e que le plug-in de controlo remote es activate
       shortlink: Ligamine curte
@@ -1405,6 +1417,7 @@ ia:
       visibility: "Visibilitate:"
       visibility_help: que significa isto?
     list: 
+      description: Percurrer le tracias GPS incargate recentemente
       empty_html: Ancora nihil a vider hic. <a href='%{upload_link}'>Incarga un nove tracia</a> o lege plus sur le traciamento GPS in le <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>pagina wiki</a>.
       public_traces: Tracias GPS public
       public_traces_from: Tracias GPS public de %{user}
@@ -1452,7 +1465,7 @@ ia:
     trace_paging_nav: 
       newer: Tracias plus nove
       older: Tracias plus ancian
-      showing_page: Pagina %{page} monstrate
+      showing_page: Pagina %{page}
     view: 
       delete_track: Deler iste tracia
       description: "Description:"
@@ -1491,6 +1504,9 @@ ia:
       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.
+      gravatar: 
+        gravatar: Usar Gravatar
+        link text: que es isto?
       home location: "Position de origine:"
       image: "Imagine:"
       image size hint: (imagines quadrate de al minus 100×100 functiona melio)
@@ -1552,8 +1568,8 @@ ia:
       heading: Usatores
       hide: Celar usatores seligite
       showing: 
-        one: Presentation del pagina %{page} (%{first_item} de %{items})
-        other: Presentation del pagina %{page} (%{first_item}-%{last_item} de %{items})
+        one: Pagina %{page} (%{first_item} de %{items})
+        other: Pagina %{page} (%{first_item}-%{last_item} de %{items})
       summary: "%{name} create ab %{ip_address} le %{date}"
       summary_no_ip: "%{name} create le %{date}"
       title: Usatores
@@ -1615,7 +1631,7 @@ ia:
       button: Adder como amico
       failed: Pardono, non poteva adder %{name} como amico.
       heading: Adder %{user} como amico?
-      success: "%{name} es ora tu amico."
+      success: "%{name} es ora tu amico!"
     new: 
       confirm email address: "Confirmar adresse de e-mail:"
       confirm password: "Confirmar contrasigno:"
@@ -1626,6 +1642,7 @@ ia:
       email address: "Adresse de e-mail:"
       fill_form: Completa le formulario e nos te inviara promptemente un e-mail pro activar tu conto.
       flash create success message: Gratias pro crear un conto. Nos ha inviate un message de confirmation a %{email} e si tosto que tu confirma le conto, tu potera comenciar a cartographiar.<br /><br />Si tu usa un systema anti-spam que invia requestas de confirmation, alora per favor assecura te de adder webmaster@openstreetmap.org al lista blanc, post que nos non pote responder a requestas de confirmation.
+      flash welcome: Gratias pro tu inscription. Nos ha inviate un message de benvenita a %{email} con alcun consilios pro adjutar te a comenciar.
       heading: Crear un conto de usator
       license_agreement: Quando tu confirma tu conto, tu debera acceptar le <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">conditiones de contributor</a>.
       no_auto_account_create: Infortunatemente in iste momento non es possibile crear un conto pro te automaticamente.
@@ -1647,7 +1664,7 @@ ia:
       nearby mapper: Cartographo vicin
       your location: Tu position
     remove_friend: 
-      button: Remover como amico
+      button: Remover amico
       heading: Remover %{user} como amico?
       not_a_friend: "%{name} non es un de tu amicos."
       success: "%{name} ha essite removite de tu amicos."
@@ -1683,7 +1700,7 @@ ia:
       you need to accept or decline: Per favor lege e postea accepta o declina le nove Conditiones del Contributor pro continuar.
     view: 
       activate_user: activar iste usator
-      add as friend: adder como amico
+      add as friend: adder amico
       ago: (%{time_in_words_ago} retro)
       block_history: blocadas recipite
       blocks by me: blocadas per me
@@ -1703,10 +1720,10 @@ ia:
       diary: diario
       edits: modificationes
       email address: "Adresse de e-mail:"
-      friends_changesets: Percurrer tote le gruppos de modificationes per amicos
-      friends_diaries: Navigar per tote le articulos de diario per amicos
+      friends_changesets: gruppos de modificationes de tu amicos
+      friends_diaries: articulos de diario de tu amicos
       hide_user: celar iste usator
-      if set location: Si tu ha definite tu position, il apparera ci infra un elegante carta e altere cosas. Tu pote definir tu position de origine in tu pagina de %{settings_link}.
+      if set location: Defini tu position de origine in le %{settings_link} pro vider le usatores a proximitate.
       km away: a %{count} km de distantia
       latest edit: "Ultime modification %{ago}:"
       m away: a %{count} m de distantia
@@ -1718,13 +1735,13 @@ ia:
       my settings: mi configurationes
       my traces: mi tracias
       nearby users: Altere usatores vicin
-      nearby_changesets: Navigar per tote le gruppos de modificationes per usatores vicin
-      nearby_diaries: Navigar per tote le articulos de diario per usatores vicin
+      nearby_changesets: gruppos de modificationes de usatores a proximitate
+      nearby_diaries: articulos de diario per usatores a proximitate
       new diary entry: nove entrata de diario
       no friends: Tu non ha ancora addite alcun amico.
       no nearby users: Il non ha ancora altere cartographos in le vicinitate.
       oauth settings: configuration oauth
-      remove as friend: remover como amico
+      remove as friend: remover amico
       role: 
         administrator: Iste usator es un administrator
         grant: 
@@ -1803,7 +1820,7 @@ ia:
       revoke: Revocar!
       revoker_name: Revocate per
       show: Monstrar
-      showing_page: Pagina %{page} monstrate
+      showing_page: Pagina %{page}
       status: Stato
     period: 
       one: 1 hora
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 91bbcda48..46368a85e 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1025,8 +1025,6 @@ id:
       back_to_outbox: Kembali ke kotak keluar
       date: Tanggal
       from: Dari
-      reading_your_messages: Membaca pesan Anda
-      reading_your_sent_messages: Membaca pesan terkirim Anda
       reply_button: Balas
       subject: Subjek
       title: Baca pesan
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 37314aec3..4c4de0063 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -682,8 +682,6 @@ is:
       back_to_outbox: Aftur í úthólf
       date: Dags
       from: Frá
-      reading_your_messages: Les móttekin skilaboð
-      reading_your_sent_messages: Les send skilaboð
       reply_button: Svara
       subject: Titill
       title: Les skilaboð
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 09fe68139..8741585cc 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -291,7 +291,7 @@ it:
       saved_at: Salvato il
       user: Utente
     list: 
-      description: Ultime modifiche
+      description: Naviga fra le ultime modifiche alla mappa
       description_bbox: Gruppi di modifiche all'interno di %{bbox}
       description_friend: Insieme di modifiche dei tuoi amici
       description_nearby: Gruppi di modifiche da parte di utenti nelle vicinanze
@@ -710,6 +710,8 @@ it:
           airfield: Aeroporto militare
           barracks: Caserma
           bunker: Bunker
+        mountain_pass: 
+          "yes": Passo di montagna
         natural: 
           bay: Baia
           beach: Spiaggia
@@ -1097,8 +1099,6 @@ it:
       back_to_outbox: Ritorna ai messaggi in uscita
       date: Data
       from: Da
-      reading_your_messages: Lettura dei propri messaggi
-      reading_your_sent_messages: Lettura dei propri messaggi inviati
       reply_button: Rispondi
       subject: Oggetto
       title: Leggi messaggio
@@ -1251,7 +1251,7 @@ it:
       key: "Chiave del consumatore:"
       requests: "Richieste le seguenti autorizzazioni da parte dell'utente:"
       secret: "Codice segreto dell'utilizzatore:"
-      support_notice: Supportiamo HMAC-SHA1 (consigliato), così come testo normale in modalità SSL.
+      support_notice: Supportiamo HMAC-SHA1 (consigliato) e firme RSA-SHA1.
       title: Dettagli OAuth per %{app_name}
       url: "URL del token di richiesta:"
     update: 
@@ -1428,6 +1428,7 @@ it:
       visibility: "Visibilità:"
       visibility_help: che cosa significa questo?
     list: 
+      description: Naviga fra i tracciati GPS caricati recentemente
       empty_html: Ancora niente qui. <a href='%{upload_link}'>Carica una nuova traccia</a> o leggi ulteriori informazioni sul tracciamento GPS nella <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>pagina wiki</a>.
       public_traces: Tracciati GPS pubblici
       public_traces_from: Tracciati GPS pubblici di %{user}
@@ -1730,10 +1731,10 @@ it:
       diary: diario
       edits: modifiche
       email address: "Indirizzo email:"
-      friends_changesets: Visualizza tutti i gruppi di modifica degli amici
-      friends_diaries: Sfoglia tutte le note dei diari degli amici
+      friends_changesets: gruppi di modifica degli amici
+      friends_diaries: note dei diari degli amici
       hide_user: nascondi questo utente
-      if set location: Se si imposta una propria posizione, una bella mappa ed altre informazioni compariranno di seguito. È possibile impostare la propria posizione sulla pagina delle %{settings_link}.
+      if set location: Puoi impostare la tua posizione sulla pagina delle %{settings_link} per vedere gli utenti nelle vicinanze.
       km away: distante %{count} km
       latest edit: "Ultima modifica %{ago}:"
       m away: "%{count}m di distanza"
@@ -1745,8 +1746,8 @@ it:
       my settings: impostazioni personali
       my traces: tracciati personali
       nearby users: Altri utenti nelle vicinanze
-      nearby_changesets: Sfoglia tutti i gruppi di modifiche da parte degli utenti nelle vicinanze
-      nearby_diaries: Sfoglia tutte le note dei diari degli utenti nelle vicinanze
+      nearby_changesets: gruppi di modifiche da parte degli utenti nelle vicinanze
+      nearby_diaries: note dei diari degli utenti nelle vicinanze
       new diary entry: nuova voce del diario
       no friends: Non ci sono ancora amici.
       no nearby users: Non ci sono ancora altri utenti che ammettono di mappare nelle vicinanze.
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index e8e4c7c28..6f993a875 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -234,6 +234,7 @@ ja:
       show_areas: 領域を表示
       show_history: 履歴を表示
       unable_to_load_size: "読み込めません: 境界囲みのサイズ %{bbox_size} が大きすぎます (%{max_bbox_size}より小さくする必要があります)"
+      view_data: 現在のマップのデータを表示
       wait: お待ちください...
       zoom_or_select: ズームアップするか、表示する領域を選択
     tag_details: 
@@ -704,6 +705,8 @@ ja:
           airfield: 軍用飛行場
           barracks: バラック
           bunker: 貯蔵庫
+        mountain_pass: 
+          "yes": 山道
         natural: 
           bay: 入り江
           beach: 砂浜
@@ -762,7 +765,7 @@ ja:
           airport: 空港
           city: 市
           country: 国
-          county: 国
+          county: 郡
           farm: 牧場
           hamlet: 村
           house: 住宅
@@ -789,6 +792,7 @@ ja:
           disused_station: 廃駅
           funicular: ケーブル鉄道
           halt: 列車停止
+          historic_station: 廃駅
           junction: 鉄道連絡駅
           level_crossing: 踏切
           light_rail: ライトレール
@@ -841,6 +845,7 @@ ja:
           funeral_directors: 葬儀屋
           furniture: 家具店
           gallery: ギャラリー
+          garden_centre: 園芸用品店
           general: 雑貨屋
           gift: ギフト ショップ
           greengrocer: 八百屋
@@ -900,6 +905,7 @@ ja:
           artificial: 人工的な水路
           boatyard: ボートヤード
           canal: 運河
+          connector: 水路コネクタ
           dam: ダム
           derelict_canal: 遺棄運河
           ditch: 溝
@@ -935,7 +941,7 @@ ja:
     community_blogs: コミュニティ ブログ
     community_blogs_title: OpenStreetMap コミュニティのメンバーからのブログ
     copyright: 著作権とライセンス
-    documentation: ドキュメント
+    documentation: 説明書
     documentation_title: プロジェクトのドキュメント
     donate: ハードウェア アップグレード基金への%{link}で、OpenStreetMap を支援します。
     donate_link_text: 寄付
@@ -1005,10 +1011,14 @@ ja:
       contributors_nz_html: "<strong>ニュージーランド</strong>: Land Information New Zealand によるデータを含みます。Crown が著作権を保持します。"
       contributors_title_html: 協力者
       contributors_za_html: "<strong>南アフリカ</strong>: <a href=\"http://www.ngi.gov.za/\">Chief Directorate: National Geo-Spatial Information</a>, State によるデータを含み、著作権を保持します。"
+      credit_1_html: 「&copy; OpenStreetMap contributors」のクレジットを使用してください。
+      credit_3_html: "閲覧可能な電子地図の場合は、地図の隅にクレジットを表示してください。\n例:"
       credit_title_html: OpenStreetMap のクレジット表記の仕方
       infringement_1_html: "OSM の協力者は、著作権者から明確な許諾を得ずに、著作権のある情報源 (例: Google マップや印刷された地図) からデータを持ち込まないよう注意するものとします。"
       infringement_title_html: 著作権侵害
       intro_1_html: "OpenStreetMap は<i>オープンデータ</i>であり、<a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL) の下にライセンスされています。"
+      intro_2_html: OpenStreetMapとその協力者をクレジットすれば、データを自由にコピー、配布、送信、利用することができます。変更したり翻案したりしたデータは、同じライセンスに従って提供することができます。あなたの権利と責任は、<a href="http://opendatacommons.org/licenses/odbl/1.0/">ライセンス契約</a>の全文で説明しています。
+      intro_3_html: "地図タイルの作成法やドキュメントは、<a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons Attribution-ShareAlike 2.0</a> ライセンス (CC-BY-SA) に基づいてライセンスされます。"
       title_html: 著作権とライセンス
     native: 
       mapping_link: マッピングを開始
@@ -1070,8 +1080,6 @@ ja:
       back_to_outbox: 送信箱に戻る
       date: 日付
       from: 差出人
-      reading_your_messages: メッセージを読む
-      reading_your_sent_messages: 送信したメッセージを読む
       reply_button: 返信
       subject: 件名
       title: メッセージを読む
@@ -1199,7 +1207,7 @@ ja:
       no_apps: OSMのサイトで使用するアプリケーションを新しく %{oauth} で登録するにはOAuthリクエストの前にあらかじめwebから登録しておく必要があります。
       register_new: アプリケーションの登録
       registered_apps: "以下のクライアント アプリケーションが登録済みです:"
-      revoke: 許可を取り消す!
+      revoke: 取り消す!
       title: 自分の OAuth の詳細
     new: 
       submit: 登録
@@ -1221,7 +1229,7 @@ ja:
       key: "コンシューマ キー:"
       requests: "ユーザーが以下の許可をリクエストしています:"
       secret: "コンシューマ シークレット:"
-      support_notice: SSL モードでの平文方式だけでなく、HMAC-SHA1 方式 (推奨) にも対応しています。
+      support_notice: HMAC-SHA1 署名 (推奨) および RSA-SHA1 署名に対応しています。
       title: "%{app_name} の OAuth の詳細"
       url: "リクエスト トークン URL:"
     update: 
@@ -1269,7 +1277,7 @@ ja:
     index: 
       js_1: JavaScript に対応していないブラウザーを使用しているか、JavaScript を無効にしているかのどちらかです。
       js_2: OpenStreetMap は地図の表示に JavaScript を使用します。
-      permalink: パーマリンク
+      permalink: 固定リンク
       remote_failed: 編集に失敗しました - JOSM または Merkaartor が読み込まれていること、遠隔制御オプションが有効になっていることを確認してください
       shortlink: 短縮リンク
     key: 
@@ -1395,6 +1403,7 @@ ja:
       visibility_help: これはどういう意味?
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Ja:Visibility_of_GPS_traces
     list: 
+      description: 最近のGPSトラックのアップロードを参照
       empty_html: ここにはまだ何もありません。<a href='%{upload_link}'>新しくトレースをアップロード</a>するか、<a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>ウィキ ページ</a>で GPS トレースの詳細情報をお読みください。
       public_traces: 公開 GPS トレース
       public_traces_from: "%{user} による公開 GPS トレース"
@@ -1463,10 +1472,10 @@ ja:
       uploaded: "アップロード日時:"
       visibility: "可視性:"
     visibility: 
-      identifiable: 識別可能 (トレース一覧に識別可能な状態で表示。点の順序はタイムスタンプ付きで分かる。)
-      private: 非公開 (匿名、順不同の点としての共有のみ)
-      public: 公開 (トレース一覧に匿名で表示する。点の順序は分からない。)
-      trackable: 追跡可能 (匿名で共有される。点の順序はタイムスタンプ付きで分かる。)
+      identifiable: 識別可能 (トレース一覧に識別可能な状態で表示。点は順序通りでタイムスタンプ付き)
+      private: 非公開 (匿名、点は順不同)
+      public: 公開 (トレース一覧に匿名で表示、点は順不同)
+      trackable: 追跡可能 (匿名、点は順序通りでタイムスタンプ付き)
   user: 
     account: 
       contributor terms: 
@@ -1599,7 +1608,7 @@ ja:
       email address: "メール アドレス:"
       heading: パスワードを忘れた場合はこちら
       help_text: ユーザー登録に使用したメール アドレスを入力してください。そのアドレス宛に、パスワードを再設定するためのリンクをお送りします。
-      new password button: パスワードのリセット
+      new password button: パスワードを再設定
       notice email cannot find: 申し訳ありませんが、このメール アドレスは見つかりません。
       notice email on way: すみません。紛失してしまいました :-( しかし、メールをお送りしたので、すぐにリセットできるでしょう。
       title: パスワードを忘れた
@@ -1652,7 +1661,7 @@ ja:
       heading: "%{user} のパスワードのリセット"
       password: "パスワード:"
       reset: パスワードを初期化
-      title: パスワードのリセット
+      title: パスワードの再設定
     set_home: 
       flash success: 活動地域を保存しました。
     suspended: 
@@ -1700,7 +1709,7 @@ ja:
       friends_changesets: 友達による変更セット
       friends_diaries: 友達の日記エントリ
       hide_user: このユーザーを隠す
-      if set location: 活動地域を指定すると、この下に周辺の地図と、近くで活動するマッパーが表示されます。%{settings_link} から設定をしてください。
+      if set location: "%{settings_link}ページから活動地域を指定すると、近くで活動しているユーザーを見ることができます。"
       km away: 距離 %{count} km
       latest edit: "最終編集 %{ago}:"
       m away: 距離 %{count} m
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index ed098cb87..42f3ba95b 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -858,8 +858,6 @@ ka:
       back_to_outbox: გაგზავნილებში დაბრუნება
       date: თარიღი
       from: გამომგზავნი
-      reading_your_messages: შეტყობინებების წაკითხვა
-      reading_your_sent_messages: გაგზავნილი შეტყობინებების წაკითხვა
       reply_button: პასუხი
       subject: თემა
       title: შეტყობინების წაკითხვა
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index e6b8235a5..8ecb0b758 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -695,6 +695,8 @@ ko:
           airfield: 군용 비행장
           barracks: 막사
           bunker: 벙커
+        mountain_pass: 
+          "yes": 산길
         natural: 
           bay: 만
           beach: 해변
@@ -955,7 +957,7 @@ ko:
     intro_1: OpenStreetMap은 여러분같은 사람에 의해 만들어진 우리 모두의 전세계 지도입니다.
     intro_2_create_account: 계정을 만들 수 있습니다
     intro_2_download: 다운로드
-    intro_2_html: 데이터는 %{license} 하에 무료로 %{download}와 %{use}합니다. 지도를 개선하려면 %{create_account}.
+    intro_2_html: 데이터는 %{license}에 따라 자유로 %{download}와 %{use}합니다. 지도를 개선하려면 %{create_account}.
     intro_2_license: 오픈 라이선스
     intro_2_use: 이용
     log_in: 로그인
@@ -1013,8 +1015,8 @@ ko:
       infringement_2_html: "저작권을 가진 자료가 부적절하게 OpenStreetMap 데이터베이스나 이 사이트에\n추가되었다고 생각하면 <a href=\"http://www.osmfoundation.org/wiki/License/Takedown_procedure\">게시\n중단 절차</a>를 참고하거나 <a href=\"http://dmca.openstreetmap.org/\">온라인\n신고 페이지</a>에서 직접 제출하세요."
       infringement_title_html: 저작권 침해
       intro_1_html: "OpenStreetMap은 <i>오픈 데이터</i>로 <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">오픈 데이터\n커먼즈 오픈 데이터베이스 라이선스</a>(ODbL)에 따라 사용할 수 있습니다."
-      intro_2_html: "당신은 가능하면 OpenStreetMap 제작진과 기여로\n자유롭게 복사, 배포, 전송 및 데이터를 적용할 수 있습니다.\n데이터를 바꾸거나 데이터에 기초로 할 때는 오로지\n같은 라이선스 하에만 결과를 배포할 수 있습니다.\n<a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">전문</a>은\n당신의 권리와 책임을 설명합니다."
-      intro_3_html: "지도 타일로 지도 제작과 설명서는\n<a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">크리에이티브\n커먼즈 저작자표시-동일조건변경허락 2.0</a> 라이선스(CC-BY-SA)하에 허가됩니다."
+      intro_2_html: "당신은 가능하면 OpenStreetMap 제작진과 기여로\n자유롭게 복사, 배포, 전송 및 데이터를 적용할 수 있습니다.\n데이터를 바꾸거나 데이터에 기초로 할 때는 오로지\n같은 라이선스에 따라서만 결과를 배포할 수 있습니다.\n<a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">전문</a>은\n당신의 권리와 책임을 설명합니다."
+      intro_3_html: "지도 타일의 지도 제작과 설명서는\n<a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">크리에이티브\n커먼즈 저작자표시-동일조건변경허락 2.0</a> 라이선스(CC-BY-SA)에 따라 허가됩니다."
       more_1_html: "데이터를 사용하는 방법과 제작진을 표시하는 방법에 대해서는 <a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">법적\nFAQ</a>를 자세히 읽으세요."
       more_2_html: "OpenStreetMap은 오픈 데이터이지만 타사 개발자를 위한\n지도 API는 무료로 제공할 수 없습니다.\n<a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">API 사용 정책</a>,\n<a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">타일 사용 정책</a>과\n<a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Nominatim(이름) 사용 정책</a>를 참고하세요."
       more_title_html: 자세히 찾기
@@ -1082,8 +1084,6 @@ ko:
       back_to_outbox: 보낸 쪽지함으로 돌아가기
       date: 날짜
       from: 보낸 사람
-      reading_your_messages: 메시지 읽기
-      reading_your_sent_messages: 보낸 메시지 읽기
       reply_button: 답글
       subject: 제목
       title: 메시지 읽기
@@ -1236,7 +1236,7 @@ ko:
       key: "컨슈머 키:"
       requests: "사용자가 다음 권한을 요청합니다:"
       secret: "컨슈머 비밀 값:"
-      support_notice: SSL 모드에서 일반 텍스트 뿐만 아니라 HMAC-SHA1(권장)도 지원하고 있습니다.
+      support_notice: HMAC-SHA1(권장)과 RSA-SHA1 서명을 지원합니다.
       title: "%{app_name}에 데한 OAuth 자세한 정보"
       url: "요청 토큰 URL:"
     update: 
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 88516e182..c86180c42 100644
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -1,6 +1,7 @@
 # Messages for Luxembourgish (Lëtzebuergesch)
 # Exported from translatewiki.net
 # Export driver: syck-pecl
+# Author: Les Meloures
 # Author: Robby
 lb: 
   activerecord: 
@@ -60,6 +61,8 @@ lb:
       entry_role: Relatioun %{relation_name} (als %{relation_role})
     map: 
       deleted: Geläscht
+      edit: 
+        way: Wee änneren
       larger: 
         area: Géigend op méi enger grousser Kaart weisen
         node: Knuet op méi enger grousser Kaart weisen
@@ -98,7 +101,7 @@ lb:
         way: Wee
     paging_nav: 
       of: vu(n)
-      showing_page: Säit gëtt gewisen
+      showing_page: Säit
     redacted: 
       type: 
         relation: Relatioun
@@ -175,14 +178,14 @@ lb:
     changeset_paging_nav: 
       next: Nächst »
       previous: « Vireg
-      showing_page: D'Säit %{page} gëtt gewisen
+      showing_page: Säit %{page}
     changesets: 
       area: Beräich
       comment: Bemierkung
       saved_at: Gespäichert de(n)
       user: Benotzer
     list: 
-      description: Rezent Ännerungen
+      description: Rezent KOntributioune un der Kaart duerchbliederen
   diary_entry: 
     comments: 
       comment: Bemierkung
@@ -202,6 +205,7 @@ lb:
       use_map_link: Kaart benotzen
     location: 
       edit: Änneren
+      location: "Plaz:"
       view: Weisen
     view: 
       leave_a_comment: Eng Bemierkung maachen
@@ -210,7 +214,7 @@ lb:
     start: 
       export_button: Exportéieren
       format: Format
-      image_size: "Gréisst vum Bild:"
+      image_size: Gréisst vum Bild
       licence: Lizenz
       max: max
       options: Optiounen
@@ -246,6 +250,8 @@ lb:
         us_postcode: Resultater vu <a href="http://geocoder.us/">Geocoder.us</a>
     search_osm_nominatim: 
       prefix: 
+        aeroway: 
+          aerodrome: Fluchhafen
         amenity: 
           airport: Fluchhafen
           auditorium: Auditoire
@@ -339,6 +345,7 @@ lb:
           nature_reserve: Naturschutzgebitt
           park: Park
           playground: Spillplaz
+          sauna: Sauna
           stadium: Stadion
           swimming_pool: Schwëmm
         natural: 
@@ -363,6 +370,10 @@ lb:
           volcano: Vulkan
           water: Waasser
           wood: Bësch
+        office: 
+          architect: Architekt
+          company: Firma
+          "yes": Büro
         place: 
           airport: Fluchhafen
           country: Land
@@ -421,10 +432,14 @@ lb:
           wadi: Wadi
           waterfall: Waasserfall
   javascripts: 
+    map: 
+      base: 
+        cycle_map: Vëloskaart
     site: 
       edit_disabled_tooltip: Erazoomen fir d'Kaart z'änneren
       edit_tooltip: Kaart änneren
   layouts: 
+    community: Communautéit
     copyright: Copyright & Lizenz
     documentation: Dokumentatioun
     documentation_title: Dokumentatioun vum Projet
@@ -434,6 +449,8 @@ lb:
     foundation: Fondatioun
     help: Hëllef
     home: Doheem
+    intro_2_download: erofgelueden
+    intro_2_use: benotzt
     logo: 
       alt_text: OpenStreetMap Logo
     logout: ausloggen
@@ -506,6 +523,8 @@ lb:
     message_notification: 
       footer1: Dir kënnt de Message och op %{readurl} liesen
       hi: Salut %{to_user},
+    signup_confirm: 
+      greeting: Bonjour !
     signup_confirm_html: 
       more_videos: Et gëtt nach méi %{more_videos_link}.
       more_videos_here: méi Videoen hei
@@ -522,6 +541,7 @@ lb:
     show: 
       allow_write_api: Kaart änneren
       confirm: Sidd Dir sécher?
+      delete: Client läschen
       edit: Detailer änneren
   redaction: 
     edit: 
@@ -566,6 +586,9 @@ lb:
       image: Bild
       link: Link
       text: Text
+      url: URL
+    richtext_area: 
+      edit: Änneren
     search: 
       search: Sichen
       submit_text: Lass
@@ -612,7 +635,7 @@ lb:
       visibility: "Visibilitéit:"
       visibility_help: wat heescht dat?
     trace_paging_nav: 
-      showing_page: D'Säit %{page} gëtt gewisen
+      showing_page: Säit %{page}
     view: 
       description: "Beschreiwung:"
       download: eroflueden
@@ -634,6 +657,8 @@ lb:
       delete image: Dat aktuellt Bild ewechhuelen
       email never displayed publicly: (ni ëffentlech gewisen)
       flash update success: Benotzerinformatioun ass elo aktualiséiert.
+      gravatar: 
+        link text: wat ass dat?
       image: "Bild:"
       keep image: Dat aktuellt Bild behalen
       make edits public button: All meng Ännerunge ëffentlech maachen
@@ -697,8 +722,10 @@ lb:
       title: Passwuert vergiess
     make_friend: 
       already_a_friend: Dir sidd schonn de Frënd vum %{name}.
+      button: Als Frënd derbäisetzen
       failed: Pardon, %{name} konnt net als Frënd derbäigesat ginn.
-      success: "%{name} ass elo Äre Frënd."
+      heading: "%{user} als Frënd derbäisetzen?"
+      success: "%{name} ass elo Äre Frënd!"
     new: 
       confirm email address: "E-Mailadress confirméieren:"
       confirm password: "Passwuert confirméieren:"
@@ -736,9 +763,10 @@ lb:
       legale_select: "Sicht w.e.g. d'Land eraus wou Dir wunnt:"
     view: 
       activate_user: dëse Benotzer aktivéieren
-      add as friend: als Frënd derbäisetzen
+      add as friend: Frënd derbäisetzen
       ago: (viru(n) %{time_in_words_ago})
       blocks by me: vu mir gespaart
+      comments: Bemierkungen
       confirm: Confirméieren
       confirm_user: dëse Benotzer confirméieren
       create_block: dëse Benotzer spären
@@ -756,7 +784,7 @@ lb:
       my settings: meng Astellungen
       nearby users: Aner Benotzer nobäi
       no friends: Dir hutt nach keng Frënn derbäi gesat.
-      remove as friend: als Frënd ewechhuelen
+      remove as friend: Frënd ewechhuelen
       role: 
         administrator: Dëse Benotzer ass en Administrateur
         grant: 
@@ -773,9 +801,11 @@ lb:
       your friends: Är Frënn
   user_block: 
     blocks_by: 
+      heading: Lëscht vun de Spären vum %(name)
       title: Späre vum %{name}
     blocks_on: 
       empty: "%{name} gouf bis elo nach net gespaart."
+      title: Späre vum %{name}
     edit: 
       back: All Späre weisen
       show: Dës Spär weisen
@@ -791,9 +821,13 @@ lb:
       confirm: Sidd Dir sécher?
       display_name: Gespaarte Benotzer
       edit: Änneren
+      next: Nächst »
+      previous: « Vireg
       reason: Grond fir d'Spär
       revoke: Ophiewen!
       show: Weisen
+      showing_page: Säit %{page}
+      status: Status
     period: 
       one: 1 Stonn
       other: "%{count} Stonnen"
@@ -807,6 +841,7 @@ lb:
       reason: "Grond fir d'Spär:"
       revoke: Ophiewen!
       show: Weisen
+      status: Status
       title: "%{block_on} gespaart vum %{block_by}"
     update: 
       success: Spär aktualiséiert
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index da2144dab..eb619fd22 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1022,8 +1022,6 @@ lt:
       back_to_outbox: Atgal į išsiųstus
       date: Data
       from: Nuo
-      reading_your_messages: Skaitomi jūsų pranešimai
-      reading_your_sent_messages: Skaitomi jūsų siųsti pranešimai
       reply_button: Atsakyti
       subject: Tema
       title: Skaityti pranešimą
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 5e6597981..51abf7f84 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -111,7 +111,7 @@ lv:
         one: "Ir sekojošais %{count} ceļš:"
         other: "Ir sekojošie %{count} ceļi:"
       no_bounding_box: Nav saglabāta rāmja priekš šīs izmaiņu kopas
-      show_area_box: Rādīt Apgabala Rāmi
+      show_area_box: Rādīt apgabala rāmi
     common_details: 
       changeset_comment: "Komentārs:"
       deleted_at: "Izdzēsts:"
@@ -152,7 +152,7 @@ lv:
         prev_changeset_tooltip: Iepriekšējais lietotāja %{user} labojums
     node: 
       download_xml: Lejupielādēt XML
-      edit: Rediģēt punktu
+      edit: Labot punktu
       node: Punkts
       node_title: "Punkts: %{node_name}"
       view_history: Skatīt vēsturi
@@ -1091,8 +1091,6 @@ lv:
       back_to_outbox: Atpakaļ uz izsūtni
       date: Datums
       from: 'No'
-      reading_your_messages: Lasu jūsu ziņas
-      reading_your_sent_messages: Lasu jūsu nosūtītās ziņas
       reply_button: Atbilde
       subject: Temats
       title: Lasīt ziņu
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index bf45976e0..b91915bb7 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -697,6 +697,8 @@ mk:
           airfield: Воено слетувалиште
           barracks: Касарна
           bunker: Бункер
+        mountain_pass: 
+          "yes": Планински превој
         natural: 
           bay: Залив
           beach: Плажа
@@ -1089,8 +1091,6 @@ mk:
       back_to_outbox: Назад во „за праќање“
       date: Датум
       from: Од
-      reading_your_messages: Читање на пораките
-      reading_your_sent_messages: Читање на вашите пратени пораки
       reply_button: Одговори
       subject: Наслов
       title: Прочитај ја пораката
@@ -1247,7 +1247,7 @@ mk:
       key: "Потрошувачки клуч:"
       requests: Ги барам следните дозволи од корисникот
       secret: "Потрошувачка тајна:"
-      support_notice: Поддржуваме hmac-sha1 (препорачано) како и  ssl режим со прост текст.
+      support_notice: Поддржуваме потписи во HMAC-SHA1 (препорачано) и RSA-SHA1.
       title: OAuth податоци за %{app_name}
       url: "Побарај URL адреса на жетонот:"
     update: 
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 895d26e5e..401e51169 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -161,7 +161,7 @@ ms:
         way: jalan
     paging_nav: 
       of: daripada
-      showing_page: Memaparkan laman
+      showing_page: halaman
     redacted: 
       message_html: Versi %{version} %{type} ini tidak boleh ditunjukkan kerana ia telah diredaksi. Sila lihat %{redaction_link} untuk perincian.
       redaction: Redaksi %{id}
@@ -201,7 +201,7 @@ ms:
       manually_select: Pilih kawasan yang lain secara insani
       object_list: 
         api: Ambil kawasan in dari API
-        back: Paparkan senarai objek
+        back: Kembali ke senarai objek
         details: Butiran
         heading: Senarai objek
         history: 
@@ -243,8 +243,8 @@ ms:
       way_title: "Jalan: %{way_name}"
     way_details: 
       also_part_of: 
-        one: juga sebahagian daripada jalan %{related_ways}
-        other: juga sebahagian daripada jalan-jalan %{related_ways}
+        one: sebahagian daripada jalan %{related_ways}
+        other: sebahagian daripada jalan-jalan %{related_ways}
       nodes: "Nod:"
       part_of: "Sebahagian:"
     way_history: 
@@ -264,7 +264,7 @@ ms:
     changeset_paging_nav: 
       next: Berikutnya &raquo;
       previous: "&laquo; Sebelumnya"
-      showing_page: Memaparkan halaman %{page}
+      showing_page: Page %{page}
     changesets: 
       area: Kawasan
       comment: Komen
@@ -272,13 +272,13 @@ ms:
       saved_at: Disimpan pada
       user: Pengguna
     list: 
-      description: Perubahan terkini
+      description: Semak imbas sumbangan terkini pada peta
       description_bbox: Set Ubah di dalam %{bbox}
       description_friend: Set ubah oleh kawan anda
       description_nearby: Set ubah pengguna berdekatan
       description_user: Set Ubah oleh %{user}
       description_user_bbox: Set Ubah oleh %{user} di dalam %{bbox}
-      empty_anon_html: Suntingan belum dibuat
+      empty_anon_html: Suntingan belum dibuat.
       empty_user_html: Nampaknya anda belum membuat suntingan. Untuk bermula, sila baca <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Panduan Permulaan</a>.
       heading: Set Ubah
       heading_bbox: Set Ubah
@@ -345,7 +345,7 @@ ms:
       newer_entries: Catatan Terkini
       no_entries: Tiada catatan diari
       older_entries: Catatan Terdahulu
-      recent_entries: "Catatan diari terkini:"
+      recent_entries: Catatan diari terkini
       title: Diari pengguna
       title_friends: Diari kawan
       title_nearby: Diari pengguna berdekatan
@@ -690,6 +690,8 @@ ms:
           airfield: Lapangan Terbang Tentera
           barracks: Tangsi
           bunker: Bunker
+        mountain_pass: 
+          "yes": Genting Gunung
         natural: 
           bay: Teluk
           beach: Pantai
@@ -1071,8 +1073,6 @@ ms:
       back_to_outbox: Kembali ke peti keluar
       date: Tarikh
       from: Daripada
-      reading_your_messages: Membaca pesanan anda
-      reading_your_sent_messages: Membaca pesanan yang dihantar
       reply_button: Balas
       subject: Subjek
       title: Baca pesanan
@@ -1225,7 +1225,7 @@ ms:
       key: "Kunci Pengguna:"
       requests: "Kebenaran-kebenaran berikut dipohon daripada pengguna tersebut:"
       secret: "Rahsia Pengguna:"
-      support_notice: Kami menyokong HMAC-SHA1 (disyorkan) dan juga teks biasa dalam mod ssl.
+      support_notice: Kam menyokong tandatangan HMAC-SHA1 (yang disyorkan) dan RSA-SHA1.
       title: Butiran OAuth untuk %{app_name}
       url: "URL Token Permohonan:"
     update: 
@@ -1402,6 +1402,7 @@ ms:
       visibility: "Keterlihatan:"
       visibility_help: apakah maksud ini?
     list: 
+      description: Semak imbas muatnaikan jejak GPS terkini
       empty_html: Belum ada apa-apa lagi di sini. <a href='%{upload_link}'>Muat naik jejak baru</a> atau ketahui lebih lanjut tentang penjejakan GPS di <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>halaman wiki</a> ini.
       public_traces: Jejak GPS umum
       public_traces_from: Jejak GPS umum oleh %{user}
@@ -1431,7 +1432,7 @@ ms:
       trackable: BOLEH DIJEJAKI
       view_map: Lihat Peta
     trace_form: 
-      description: Keterangan
+      description: "Keterangan:"
       help: Bantuan
       tags: "Tag:"
       tags_help: terbatas tanda koma
@@ -1449,7 +1450,7 @@ ms:
     trace_paging_nav: 
       newer: Jejak Baru
       older: Jejak Lama
-      showing_page: Memaparkan halaman %{page}
+      showing_page: Halaman %{page}
     view: 
       delete_track: Hapuskan jejak ini
       description: "Keterangan:"
@@ -1553,8 +1554,8 @@ ms:
       heading: Pengguna
       hide: Sorokkan Pengguna-Pengguna Terpilih
       showing: 
-        one: Menunjukkan halaman %{page} (%{first_item} daripada %{items})
-        other: Menunjukkan halaman %{page} (%{first_item}-%{last_item} daripada %{items})
+        one: Halaman %{page} (%{first_item} / %{items})
+        other: Halaman %{page} (%{first_item}-%{last_item} / %{items})
       summary: "%{name} diwujudkan dari %{ip_address} pada %{date}"
       summary_no_ip: "%{name} diwujudkan pada %{date}"
       title: Pengguna
@@ -1616,7 +1617,7 @@ ms:
       button: Jadikan kawan
       failed: Maaf, %{name} tidak dapat ditambahkan sebagai kawan.
       heading: Jadikan %{user} sebagai kawan?
-      success: "%{name} kini kawan anda."
+      success: "%{name} kini kawan anda!"
     new: 
       confirm email address: "Sahkan Alamat E-mel:"
       confirm password: "Sahkan Kata Laluan:"
@@ -1685,7 +1686,7 @@ ms:
       you need to accept or decline: Sila baca, kemudian terima atau tolak Terma-Terma Penyumbang yang baru untuk bersambung.
     view: 
       activate_user: aktifkan pengguna ini
-      add as friend: jadikan kawan
+      add as friend: perkawankan
       ago: (%{time_in_words_ago} lalu)
       block_history: sekatan yang diterima
       blocks by me: sekatan oleh saya
@@ -1705,10 +1706,10 @@ ms:
       diary: diari
       edits: suntingan
       email address: "Alamat e-mel:"
-      friends_changesets: Semak seimbas semua set ubah kawan-kawan
-      friends_diaries: Semak seimbas semua catatan diari kawan-kawan
+      friends_changesets: set ubah kawan-kawan
+      friends_diaries: catatan diari kawan-kawan
       hide_user: sorokkan pengguna ini
-      if set location: Jika anda menetapkan lokasi anda, peta yang cantik dan sebagainya akan muncul di sini. Anda boleh menetapkan lokasi rumah anda di laman %{settings_link} anda.
+      if set location: Tetapkan lokasi rumah anda di halaman %{settings_link} untuk melihat pengguna berdekatan.
       km away: "%{count}km jauhnya"
       latest edit: "Suntingan terkini %{ago}:"
       m away: "%{count}m jauhnya"
@@ -1720,8 +1721,8 @@ ms:
       my settings: tetapan saya
       my traces: jejak saya
       nearby users: Pengguna lain yang berdekatan
-      nearby_changesets: Semak seimbas semua set ubah pengguna berdekatan
-      nearby_diaries: Semak seimbas semua catatan diari pengguna berdekatan
+      nearby_changesets: set ubah pengguna berdekatan
+      nearby_diaries: catatan diari pengguna berdekatan
       new diary entry: catatan diari baru
       no friends: Anda belum mencari kawan lagi.
       no nearby users: Belum ada pengguna lain yang mengaku memetakan kawasan berdekatan.
@@ -1805,7 +1806,7 @@ ms:
       revoke: Tarik Balik!
       revoker_name: Ditarik balik oleh
       show: Tunjukkan
-      showing_page: Memaparkan halaman %{page}
+      showing_page: Halaman %{page}
       status: Status
     period: 
       one: 1 jam
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 3a0e445bf..9b94dfec1 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -1,4 +1,4 @@
-# Messages for Norwegian Bokmål (norsk (bokmål)‎)
+# Messages for Norwegian Bokmål (norsk bokmål)
 # Exported from translatewiki.net
 # Export driver: syck-pecl
 # Author: Danmichaelo
@@ -1097,8 +1097,6 @@ nb:
       back_to_outbox: Tilbake til utboks
       date: Dato
       from: Fra
-      reading_your_messages: Leser meldingene dine
-      reading_your_sent_messages: Les dine sendte meldinger
       reply_button: Svar
       subject: Emne
       title: Les melding
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 9fe37eaa5..7e8bd7f98 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -310,7 +310,7 @@ nl:
   diary_entry: 
     comments: 
       ago: "%{ago} geleden"
-      comment: Opmerking
+      comment: Reactie
       has_commented_on: "%{display_name} heeft gereageerd op het volgende dagboekbericht"
       newer_comments: Latere opmerkingen
       older_comments: Eerder opmerkingen
@@ -319,7 +319,7 @@ nl:
     diary_comment: 
       comment_from: Reactie van %{link_user} op %{comment_created_at}
       confirm: Bevestigen
-      hide_link: Opmerking verbergen
+      hide_link: Reactie verbergen
     diary_entry: 
       comment_count: 
         one: Eén reactie
@@ -375,7 +375,7 @@ nl:
       heading: Een bericht met id %{id} bestaat niet
       title: Het opgevraagde dagboekbericht bestaat niet
     view: 
-      leave_a_comment: Opmerking achterlaten
+      leave_a_comment: Reactie achterlaten
       login: aanmelden
       login_to_leave_a_comment: U moet moet zich %{login_link} om te kunnen reageren
       save_button: Opslaan
@@ -603,7 +603,7 @@ nl:
           primary: Primaire weg
           primary_link: Primaire weg
           raceway: Racecircuit
-          residential: Woonerf
+          residential: Straat
           rest_area: Rustplaats
           road: Weg
           secondary: Secundaire weg
@@ -704,6 +704,8 @@ nl:
           airfield: Militair vliegveld
           barracks: Kazerne
           bunker: Bunker
+        mountain_pass: 
+          "yes": Bergpas
         natural: 
           bay: Baai
           beach: Strand
@@ -1092,8 +1094,6 @@ nl:
       back_to_outbox: Terug naar Postvak UIT
       date: Datum
       from: Van
-      reading_your_messages: Bezig met het lezen van uw berichten
-      reading_your_sent_messages: Bezig met het lezen van uw verzonden berichten
       reply_button: Beantwoorden
       subject: Onderwerp
       title: Bericht lezen
@@ -1246,7 +1246,7 @@ nl:
       key: "Gebruikerssleutel:"
       requests: "Van de gebruiker worden de volgende rechten gevraagd:"
       secret: "Gebruikersgeheim:"
-      support_notice: HMAC-SHA-1 (aangeraden) wordt ondersteund, als ook platte tekst in SSL-modus.
+      support_notice: HMAC-SHA-1- (aangeraden) en RSA-SHA1-handtekeningen worden ondersteund.
       title: OAuth-gegevens voor %{app_name}
       url: "URL voor tokenverzoek:"
     update: 
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 3639118cd..c27aeefcf 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1,4 +1,4 @@
-# Messages for Norwegian Nynorsk (norsk (nynorsk)‎)
+# Messages for Norwegian Nynorsk (norsk nynorsk)
 # Exported from translatewiki.net
 # Export driver: syck-pecl
 # Author: Dittaeva
@@ -712,6 +712,8 @@ nn:
           airfield: Militær flyplass
           barracks: Kaserner
           bunker: Bunker
+        mountain_pass: 
+          "yes": Fjellovergang
         natural: 
           bay: Bukt
           beach: Strand
@@ -1109,8 +1111,6 @@ nn:
       back_to_outbox: Tilbake til utboks
       date: Dato
       from: Frå
-      reading_your_messages: Les meldingane dine
-      reading_your_sent_messages: Les dei sende meldingane dine
       reply_button: Svar
       subject: Emne
       title: Les melding
@@ -1267,7 +1267,7 @@ nn:
       key: "Forbrukarnøkkel:"
       requests: "Ber om følgjande løyve frå brukaren:"
       secret: "Forbrukarhemmelegheit:"
-      support_notice: Me støttar HMAC-SHA1 (tilrådt) så vel som rein tekst i ssl-modus.
+      support_notice: Me støttar HMAC-SHA1 (tilrådt) og RSA-SHA1 signaturar.
       title: OAuth-detaljar for %{app_name}
       url: "URL for forespørelsnøkkel:"
     update: 
@@ -1666,7 +1666,7 @@ nn:
       button: Legg til som ven
       failed: Klarte ikkje leggje til %{name} som ven.
       heading: Legg til %{user} som ein ven?
-      success: "!%{name} er no din ven!"
+      success: "%{name} er no venen din!"
     new: 
       confirm email address: "Stadfest e-postadresse:"
       confirm password: "Stadfest passord:"
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 03484d3c3..ab20b9acb 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -6,6 +6,7 @@
 # Author: BeginaFelicysym
 # Author: Cysioland
 # Author: Deejay1
+# Author: Kaligula
 # Author: Nemo bis
 # Author: Odie2
 # Author: Przemub
@@ -183,9 +184,10 @@ pl:
         way: droga
     paging_nav: 
       of: z
-      showing_page: Widoczna jest strona
+      showing_page: strona
     redacted: 
       message_html: Wersja %{version} tego %{type} nie może zostać pokazana jako zredagowana. Zapoznaj się z %{redaction_link}, aby uzyskać szczegółowe informacje.
+      redaction: Redakcja %{id}
       type: 
         node: węzeł
         relation: relacja
@@ -222,7 +224,7 @@ pl:
       manually_select: Ręcznie zaznacz inny obszar
       object_list: 
         api: Pobierz ten obszar z API
-        back: Wyświetlanie listy obiektów
+        back: Powrót do listy obiektów
         details: Szczegóły
         heading: Lista obiektów
         history: 
@@ -264,8 +266,8 @@ pl:
       way_title: "Droga: %{way_name}"
     way_details: 
       also_part_of: 
-        one: należy również do drogi %{related_ways}
-        other: należy również do dróg %{related_ways}
+        one: należy do drogi %{related_ways}
+        other: należy do dróg %{related_ways}
       nodes: "Węzły:"
       part_of: "Jest częścią:"
     way_history: 
@@ -299,7 +301,7 @@ pl:
       description_nearby: Zestawy zmian użytkowników znajdujących się w pobliżu
       description_user: Zestawy zmian utworzone przez użytkownika %{user}
       description_user_bbox: Zestawy zmian utworzone przez użytkownika %{user} w %{bbox}
-      empty_anon_html: Nie podjęto jeszcze edycji
+      empty_anon_html: Nie podjęto jeszcze edycji.
       empty_user_html: Wydaje się że jeszcze nie edytowałeś. By zacząć, przejrzyj <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Przewodnik dla początkujących</a>.
       heading: Zestawy zmian
       heading_bbox: Zestawy zmian
@@ -366,7 +368,7 @@ pl:
       newer_entries: Nowsze wpisy
       no_entries: Brak wpisów dziennika
       older_entries: Starsze wpisy
-      recent_entries: "Ostatnie wpisy do dziennika:"
+      recent_entries: Ostatnie wpisy do dziennika
       title: Dzienniki użytkowników
       title_friends: Dzienniki znajomych
       title_nearby: Dzienniki najbliższych użytkowników
@@ -1020,7 +1022,7 @@ pl:
       contributors_nz_html: "<strong>Nowa Zelandia</strong>: Zawiera dane uzyskane z ''Land Information New Zealand''. Crown Copyright reserved."
       contributors_title_html: Dane włączone do OpenStreetMap
       contributors_za_html: "<strong>Południowa Afryka</strong>: zawiera dane pochodzące\nz <a href=\"http://www.ngi.gov.za/\">zarządu głównego:\nNational Geo-Spatial Information</a>, prawa autorskie państwa zastrzeżone."
-      credit_1_html: Jeśli korzystasz z gotowej mapy OpenStreetMap, wymagane jest podanie źródła co najmniej w postaci &bdquo;&copy; użytkownicy OpenStreetMap, CC BY-SA&rdquo;. Jeśli korzystasz tylko z danych geograficznych, wymagane jest podanie źródła w postaci &bdquo;Dane mapy &copy; użytkownicy OpenStreetMap, CC BY-SA&rdquo;.
+      credit_1_html: Wymagane jest podanie źródła w postaci &bdquo;&copy; użytkownicy OpenStreetMap, CC BY-SA&rdquo;.
       credit_2_html: O ile jest to możliwe, nazwa OpenStreetMap powinna być hiperłączem do <a href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a>, zaś CC BY-SA do <a href="http://creativecommons.org/licenses/by-sa/2.0/">http://creativecommons.org/licenses/by-sa/2.0/</a>. Jeśli korzystasz z nośnika, który uniemożliwia tworzenie hiperłącz (np. druk na papierze), zalecane jest kierowanie oglądających do stron internetowych www.openstreetmap.org (np. przez rozwinięcie nazwy OpenStreetMap do pełnego adresu internetowego) oraz www.creativecommons.org.
       credit_3_html: Przy przeglądaniu map elektronicznych, podziękowania powinny pojawić się w rogu mapy.
       credit_title_html: Jak podać źródło
@@ -1028,7 +1030,7 @@ pl:
       infringement_2_html: Jeśli uważasz, że materiał chroniony prawem autorskim został niewłaściwie dodany do bazy OpenStreetMap, zajrzyj pod adres naszej <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">procedury usuwania danych</a> lub <a href="http://dmca.openstreetmap.org/">wypełnij formularz on-line</a>.
       infringement_title_html: Naruszenia praw autorskich
       intro_1_html: "OpenStreetMap zawiera <i>wolne dane</i>, rozpowszechniane na licencji <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
-      intro_2_html: Możesz swobodnie kopiować, rozpowszechniać, przekazywać innym i dostosowywać nasze mapy i dane, pod warunkiem podania OpenStreetMap i jego użytkowników jako źródło. Jeśli zmienisz, przekształcisz lub wykorzystasz nasze mapy lub dane, wynik swojej pracy możesz rozpowszechniać tylko na podstawie tej samej licencji. <a href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">Pełen tekst licencji</a> dokładnie opisuje Twoje prawa i obowiązki.
+      intro_2_html: Możesz swobodnie kopiować, rozpowszechniać, przekazywać innym i dostosowywać nasze dane, pod warunkiem podania OpenStreetMap i jego użytkowników jako źródło. Jeśli zmienisz, przekształcisz lub wykorzystasz nasze dane, wynik swojej pracy możesz rozpowszechniać tylko na podstawie tej samej licencji. <a href="http://opendatacommons.org/licenses/odbl/1.0/">Pełen tekst licencji</a> dokładnie opisuje Twoje prawa i obowiązki.
       intro_3_html: Mapy w postaci graficznej, a także dokumentacja rozpowszechniane na warunkach licencji <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.pl/">Uznanie autorstwa na tych samych warunkach 2.0</a> (CC-BY-SA 2.0).
       more_1_html: Więcej informacji o możliwości wykorzystania danych OpenStreetMap można znaleźć w <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal FAQ</a>.
       more_2_html: Użytkownicy OpenStreetMap powinni pamiętać, aby nigdy nie dodawać danych z jakichkolwiek źródeł chronionych prawami autorskimi (jak np. Google Maps i&nbsp;większość map drukowanych) bez wyraźnego pozwolenia właściciela praw autorskich.
@@ -1101,8 +1103,6 @@ pl:
       back_to_outbox: Powrót do skrzynki nadawczej
       date: Nadano
       from: Od
-      reading_your_messages: Czytanie odebranej wiadomości
-      reading_your_sent_messages: Czytanie wysłanej wiadomości
       reply_button: Odpowiedz
       subject: Temat
       title: Czytanie wiadomości
@@ -1169,7 +1169,7 @@ pl:
       confirm: "Musimy upewnić się, że wniosek pochodzi od ciebie, dlatego kliknij na łącze poniżej, aby potwierdzić założenie konta:"
       created: Ktoś (mamy nadzieję, że ty) właśnie założył konto w %{site_url}.
       greeting: Cześć!
-      subject: "[OpenStreetMap] Prośba o potwierdzenie adresu e-mail"
+      subject: "[OpenStreetMap] Witamy w OpenStreetMap"
       welcome: Chcielibyśmy powitać cię i dostarczyć kilka dodatkowych informacji na dobry początek.
     signup_confirm_html: 
       ask_questions: Możesz zadać nurtujące Cię pytania dotyczące OpenStreetMap na <a href="http://help.openstreetmap.org/">naszej stronie pytań i odpowiedzi</a>.
@@ -1218,6 +1218,7 @@ pl:
       my_tokens: Zarejestrowane programy
       no_apps: Czy chcesz zarejestrować programy korzystające ze standardu %{oauth}? Programy muszą być wcześniej zarejestrowane, nim będzie można skorzystać z zapytań OAuth do tego serwisu.
       register_new: Zarejestruj swoją aplikację
+      registered_apps: "Masz zarejestrowane następujące aplikacje klienckie:"
       revoke: Odwołaj!
       title: Szczegóły autoryzacji OAuth
     new: 
@@ -1230,6 +1231,7 @@ pl:
       delete: Usuń klienta
       edit: Edytuj szczegóły
       key: "Klucz odbiorcy:"
+      requests: "Zapytanie następujących uprawnień ze strony użytkownika:"
       secret: "Sekret odbiorcy:"
       support_notice: Wspieramy HMAC-SHA1 (zalecane) jak i zwykły tekst, w trybie SSL.
       title: Szczegóły OAuth dla %{app_name}
@@ -1402,6 +1404,7 @@ pl:
       visibility: "Widoczność:"
       visibility_help: co to znaczy?
     list: 
+      description: Przeglądaj najnowsze dodane ścieżki GPS
       public_traces: Publiczne ślady GPS
       public_traces_from: Publiczne ślady GPS użytkownika %{user}
       tagged_with: " otagowane %{tags}"
@@ -1640,8 +1643,8 @@ pl:
       nearby mapper: Mapowicz z okolicy
       your location: Twoje położenie
     remove_friend: 
-      button: Usuń z listy przyjaciół
-      heading: Usunąć %{user} z listy przyjaciół?
+      button: Usuń z przyjaciół
+      heading: Usunąć %{user} z przyjaciół?
       not_a_friend: "%{name} nie był Twoim znajomym."
       success: "%{name} został wyłączony z grona Twoich znajomych."
     reset_password: 
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 4d6d2b53d..702db2912 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1111,8 +1111,6 @@ pt-BR:
       back_to_outbox: Voltar para a caixa de saída
       date: Data
       from: De
-      reading_your_messages: Lendo suas mensagens
-      reading_your_sent_messages: Lendo suas mensagens enviadas
       reply_button: Responder
       subject: Assunto
       title: Ler Mensagem
@@ -1269,7 +1267,7 @@ pt-BR:
       key: Chave de Consumidor
       requests: "Pedindo as seguintes permissões ao usuário:"
       secret: Segredo do Consumidor
-      support_notice: Nós suportamos HMAC-SHA1 (recomendado) assim como texto simples em modo SSL.
+      support_notice: Nós adotamos assinaturas HMAC-SHA1 (recomendado) e RSA-SHA1.
       title: Detalhes OAuth de %{app_name}
       url: URL do token de requisição
     update: 
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 1f94ab6bd..94b4dad62 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -180,7 +180,7 @@ pt:
         way: linha
     paging_nav: 
       of: de
-      showing_page: Mostrando página
+      showing_page: página
     redacted: 
       message_html: A versão %{version} do elemento %{type} não pode ser mostrada porque foi suprimida. Por favor consulte %{redaction_link} para obter mais informações.
       redaction: Revisão %{id}
@@ -220,7 +220,7 @@ pt:
       manually_select: Selecionar manualmente uma área diferente
       object_list: 
         api: Descarregar esta área no formato XML OSM através da API
-        back: Mostrar lista de objetos
+        back: Regressar à lista de objetos
         details: Ver Detalhes
         heading: Lista de objetos
         history: 
@@ -238,6 +238,7 @@ pt:
       show_areas: Mostrar áreas
       show_history: Mostrar Histórico
       unable_to_load_size: "Não foi possível carregar: O tamanho da caixa de %{bbox_size} é muito grande (deve ser menor que %{max_bbox_size})"
+      view_data: Ver dados para a vista atual do mapa
       wait: Espere...
       zoom_or_select: Aproximar ou seleccionar uma área do mapa para visionamento
     tag_details: 
@@ -261,8 +262,8 @@ pt:
       way_title: "Linha: %{way_name}"
     way_details: 
       also_part_of: 
-        one: também faz parte da linha %{related_ways}
-        other: também faz parte das linhas %{related_ways}
+        one: parte da linha %{related_ways}
+        other: parte das linhas %{related_ways}
       nodes: "Nós:"
       part_of: "Faz parte de:"
     way_history: 
@@ -282,7 +283,7 @@ pt:
     changeset_paging_nav: 
       next: Seguinte »
       previous: « Anterior
-      showing_page: Mostrando página %{page}
+      showing_page: Página %{page}
     changesets: 
       area: Área
       comment: Comentário
@@ -290,13 +291,13 @@ pt:
       saved_at: Gravado em
       user: Utilizador
     list: 
-      description: Mudanças recentes
+      description: Ver mudanças recentes no mapa
       description_bbox: Conjunto de alterações em %{bbox}
       description_friend: Alterações feitas pelos seus amigos
       description_nearby: Alterações feitas por utilizadores das redondezas
       description_user: Conjunto de alterações feitas por %{user}
       description_user_bbox: Conjunto de alterações feitas por %{user} na área %{bbox}
-      empty_anon_html: Ainda sem edições feitas
+      empty_anon_html: Ainda sem edições feitas.
       empty_user_html: Parece que ainda não fez nenhuma edição. Para começar consulte o <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Guia para Iniciantes</a> (em inglês).
       heading: Conjunto de alterações
       heading_bbox: Conjunto de alterações
@@ -364,7 +365,7 @@ pt:
       newer_entries: Entradas Recentes
       no_entries: Diário sem entradas
       older_entries: Entradas Mais Antigas
-      recent_entries: "Entradas recentes no diário:"
+      recent_entries: Entradas recentes no diário
       title: Diário dos editores
       title_friends: Diários dos amigos
       title_nearby: Diários dos Editores das redondezas
@@ -1085,8 +1086,6 @@ pt:
       back_to_outbox: Voltar para a caixa de saída
       date: Data
       from: De
-      reading_your_messages: A ler a mensagem
-      reading_your_sent_messages: Lendo as mensagens enviadas
       reply_button: Responder
       subject: Assunto
       title: Ler mensagem
@@ -1233,7 +1232,7 @@ pt:
       key: "Chave de Utilizador:"
       requests: "Pedir as seguintes permissões do utilizador:"
       secret: "Segredo de Utilizador:"
-      support_notice: Suportamos HMAC-SHA1 (recomendado) assim como texto normal no modo SSL.
+      support_notice: Suportamos HMAC-SHA1 (recomendado) e RSA-SHA1.
       title: Detalhes do OAuth de %{app_name}
       url: "URL do Token de Pedido:"
     update: 
@@ -1410,6 +1409,7 @@ pt:
       visibility: "Visibilidade:"
       visibility_help: o que significa isto?
     list: 
+      description: Ver trilhos GPS carregados recentemente
       empty_html: Ainda não enviou nenhum trilho GPS. <a href='%{upload_link}'>Envie um novo trilho GPS</a> ou saiba mais sobre trilhos GPS na <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>página wiki</a> (em inglês).
       public_traces: Trilhos GPS públicos
       public_traces_from: Trilhos GPS públicos do utilizador %{user}
@@ -1457,7 +1457,7 @@ pt:
     trace_paging_nav: 
       newer: Trilhos GPS mais recentes
       older: Trilhos GPS mais antigos
-      showing_page: Mostrando página %{page}
+      showing_page: Página %{page}
     view: 
       delete_track: Eliminar este trilho
       description: "Descrição:"
@@ -1560,8 +1560,8 @@ pt:
       heading: Utilizadores
       hide: Ocultar Utilizadores Seleccionados
       showing: 
-        one: A mostrar a página %{page} (%{first_item} de %{items})
-        other: A mostrar a página %{page} (%{first_item}-%{last_item} de %{items})
+        one: Página %{page} (%{first_item} de %{items})
+        other: Página %{page} (%{first_item}-%{last_item} de %{items})
       summary: "%{name} criado com o ip %{ip_address} em %{date}"
       summary_no_ip: "%{name} criado na %{date}"
       title: Utilizadores
@@ -1623,7 +1623,7 @@ pt:
       button: Adicionar aos amigos
       failed: Desculpe, falha ao adicionar %{name} como um amigo.
       heading: Adicionar %{user} à lista de amigos?
-      success: "%{name} agora é teu amigo."
+      success: "%{name} já faz parte da sua lista de amigos!"
     new: 
       confirm email address: "Confirmar E-mail:"
       confirm password: "Confirmar palavra-passe:"
@@ -1655,8 +1655,8 @@ pt:
       nearby mapper: Mapeador das redondezas
       your location: Tua localização
     remove_friend: 
-      button: Remover da lista de amigos
-      heading: Remover %{user} da lista de amigos?
+      button: Remover amigo
+      heading: Remover %{user}da lista de amigos?
       not_a_friend: "%{name} não está na lista de seus amigos."
       success: "%{name} foi removido(a) da lista de seus amigos."
     reset_password: 
@@ -1711,10 +1711,10 @@ pt:
       diary: diário
       edits: edições
       email address: "E-mail:"
-      friends_changesets: Ver todos os conjuntos de alterações dos amigos
-      friends_diaries: Ver todas as entradas de diários dos amigos
+      friends_changesets: alterações dos amigos
+      friends_diaries: ver as entradas em diários dos amigos
       hide_user: ocultar este utilizador
-      if set location: Se definir a sua localização habitual, aparecerá aqui um mapa. Pode definir a sua localização na página %{settings_link}.
+      if set location: Indique a sua localização habitual na página %{settings_link} para ver outros editores nas redondezas.
       km away: "%{count}km de distância"
       latest edit: "Última edição %{ago}:"
       m away: "%{count}m de distância"
@@ -1726,8 +1726,8 @@ pt:
       my settings: as minhas configurações
       my traces: meus trilhos GPS
       nearby users: Outros editores nas redondezas
-      nearby_changesets: Ver todos os conjuntos de alterações de editores das redondezas
-      nearby_diaries: Ver todas as entradas em diários de editores das redondezas
+      nearby_changesets: Ver alterações de editores das redondezas
+      nearby_diaries: entradas em diários de editores das redondezas
       new diary entry: adicionar entrada no meu diário
       no friends: Ainda não adicionou nenhum amigo.
       no nearby users: Não existem outros editores nas redondezas que admitam que estão nas redondezas.
@@ -1811,7 +1811,7 @@ pt:
       revoke: Revogar!
       revoker_name: Revogado por
       show: Mostrar
-      showing_page: A mostrar página %{page}
+      showing_page: Página %{page}
       status: Estado
     period: 
       one: 1 hora
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 8366ed089..4cb94aed7 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1126,8 +1126,6 @@ ru:
       back_to_outbox: Назад к исходящим
       date: Дата
       from: От
-      reading_your_messages: Просмотр сообщения
-      reading_your_sent_messages: Просмотр отправленного сообщения
       reply_button: Ответить
       subject: Тема
       title: Просмотр сообщения
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 5179d7d19..2e6ed74d6 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -708,6 +708,8 @@ sk:
           airfield: Vojenské letisko
           barracks: Kasárne
           bunker: Bunker
+        mountain_pass: 
+          "yes": Priesmyk
         natural: 
           bay: Zátoka, záliv
           beach: Pláž
@@ -1100,8 +1102,6 @@ sk:
       back_to_outbox: Späť do schránky odoslanej pošty
       date: Dátum
       from: Od
-      reading_your_messages: Načítavam vaše správy
-      reading_your_sent_messages: Čítanie vašich odoslaných správ
       reply_button: Odpovedať
       subject: Predmet
       title: Čítať správu
@@ -1254,7 +1254,7 @@ sk:
       key: "Consumer Key:"
       requests: "Žiadam nasledujúce oprávnenia od používateľa:"
       secret: "Consumer Secret:"
-      support_notice: Podporujeme HMAC-SHA1 (odporúča sa) rovnako ako obyčajný text v ssl móde.
+      support_notice: Podporujeme HMAC-SHA1 (odporúča sa) a podpisy RSA-SHA1.
       title: Podrobnosti OAuth pre %{app_name}
       url: "Request Token URL:"
     update: 
@@ -1431,6 +1431,7 @@ sk:
       visibility: "Viditeľnosť:"
       visibility_help: čo má toto znamenať?
     list: 
+      description: Prechádzať nedávno nahrané GPS stopy
       empty_html: Nič tu zatiaľ nie je. <a href='%{upload_link}'>Nahrajte novú stopu</a>, alebo si niečo o GPS stopách prečítajte na <a href='http://wiki.openstreetmap.org/wiki/Sk:Beginners_Guide_1.2'>wiki</a>.
       public_traces: Verejné GPS stopy
       public_traces_from: Verejné GPS stopy od %{user}
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 136100204..db6911f00 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -256,7 +256,8 @@ sl:
       way_title: "Pot: %{way_name}"
     way_details: 
       also_part_of: 
-        other: tudi del poti %{related_ways}
+        one: del poti %{related_ways}
+        other: del poti %{related_ways}
       nodes: "Vozlišča:"
       part_of: "Del:"
     way_history: 
@@ -1057,8 +1058,6 @@ sl:
       back_to_outbox: Nazaj na poslano pošto
       date: Datum
       from: Od
-      reading_your_messages: Prebiranje vaših sporočil
-      reading_your_sent_messages: Prebiranje vaših poslanih sporočil
       reply_button: Odgovori
       subject: Zadeva
       title: Branje sporočila
@@ -1205,7 +1204,7 @@ sl:
       key: "Uporabnikov ključ:"
       requests: "Zahteva dovoljenja za naslednje dostope do uporabnikovih podatkov:"
       secret: "Uporabnikova skrivnost:"
-      support_notice: Podpiramo HMAC-SHA1 (priporočeno), pa tudi kot golo besedilo v ssl načinu.
+      support_notice: Podpiramo HMAC-SHA1 (priporočeno) in podpise RSA-SHA1.
       title: Podatki OAuth za %{app_name}
       url: "URL zahteve žetona:"
     update: 
@@ -1596,7 +1595,7 @@ sl:
       button: Dodaj prijatelja
       failed: Oprostite, uporabnika %{name} ni bilo mogoče dodati med prijatelje.
       heading: Dodaj %{user} med prijatelje?
-      success: Uporabnik %{name} je sedaj vaš prijatelj.
+      success: "%{name} je sedaj vaš prijatelj!"
     new: 
       confirm email address: "Potrdite naslov e-pošte:"
       confirm password: "Potrdite geslo:"
@@ -1684,10 +1683,10 @@ sl:
       diary: dnevnik
       edits: prispevki
       email address: "E-poštni naslov:"
-      friends_changesets: Brskanje po paketih sprememb vaših prijateljev
-      friends_diaries: Brskanje po dnevnikih vaših prijateljev
+      friends_changesets: paketi sprememb prijateljev
+      friends_diaries: dnevniki prijateljev
       hide_user: skriti tega uporabnika
-      if set location: Če nastavite vašo domačo lokacijo bo tu prikazan lep zemljevd in podobne dobrote. Domačo lokacijo lahko nastavite v %{settings_link}.
+      if set location: Nastavite vašo domačo lokacijo na strani %{settings_link}, da vidite bližnje uporabnike.
       km away: oddaljen %{count} km
       latest edit: "Zadnje urejanje %{ago}:"
       m away: oddaljen %{count} m
@@ -1699,8 +1698,8 @@ sl:
       my settings: moje nastavitve
       my traces: moje sledi
       nearby users: Drugi bližnji uporabniki
-      nearby_changesets: Brskanje po paketih sprememb bližnjih uporabnikov
-      nearby_diaries: Brskanje po dnevnikih bližnjih uporabnikov
+      nearby_changesets: paketi sprememb bližnjih uporabnikov
+      nearby_diaries: dnevniški vnosi bližnjih uporabnikov
       new diary entry: nov vnos v dnevnik
       no friends: Niste Å¡e dodali nobenih prijateljev.
       no nearby users: Ni še drugih uporabnikov, ki bi priznali, da kartirajo v vaši bližini.
@@ -1784,7 +1783,7 @@ sl:
       revoke: Prekliči!
       revoker_name: Preklical
       show: Prikaži
-      showing_page: Prikazujem stran %{page}
+      showing_page: Stran %{page}
       status: Stanje
     period: 
       few: "%{count} ure"
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index ef1f2f075..a3dbf7b46 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -603,8 +603,6 @@ sq:
     new: 
       limit_exceeded: Ju keni dërguar shumë mesazhe kohët e fundit. Ju lutem prisni një kohë para se të dërgoni ndonjë tjetër.
       title: Qo mesazh
-    read: 
-      reading_your_sent_messages: Tu i lexue mesazhet e dërgume
     sent_message_summary: 
       delete_button: Fshij
   notifier: 
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 110684916..6c713f8c6 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1096,8 +1096,6 @@ sr-Latn:
       back_to_outbox: Nazad na poslate
       date: Datum
       from: Od
-      reading_your_messages: Vaše poruke
-      reading_your_sent_messages: Vaše poslate poruke
       reply_button: Odgovori
       subject: Naslov
       title: Pročitaj poruku
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 326a89ccc..f67db3d9e 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1106,8 +1106,6 @@ sr:
       back_to_outbox: Назад на послате
       date: Датум
       from: Од
-      reading_your_messages: Ваше поруке
-      reading_your_sent_messages: Ваше послате поруке
       reply_button: Одговори
       subject: Наслов
       title: Прочитај поруку
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 024ed53af..0f7504e5d 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -21,6 +21,7 @@
 # Author: Sendelbach
 # Author: Sertion
 # Author: The real emj
+# Author: Tor.klingberg
 # Author: Ufred
 # Author: VickyC
 # Author: WikiPhoenix
@@ -719,6 +720,8 @@ sv:
           airfield: Militärt flygfält
           barracks: Kaserner
           bunker: Bunker
+        mountain_pass: 
+          "yes": Bergspass
         natural: 
           bay: Bukt
           beach: Strand
@@ -1107,8 +1110,6 @@ sv:
       back_to_outbox: Tillbaka till utkorgen
       date: Datum
       from: Från
-      reading_your_messages: Läser dina meddelanden
-      reading_your_sent_messages: Läser dina skickade meddelanden
       reply_button: Svara
       subject: Ärende
       title: Läs meddelande
@@ -1261,7 +1262,7 @@ sv:
       key: "Konsumentnyckel:"
       requests: "Begär följande behörigheter från användaren:"
       secret: "Konsumenthemlighet:"
-      support_notice: Vi stödjer HMAC-SHA1 (rekommenderas) såväl som oformaterad text i SSL-läge.
+      support_notice: Vi stödjer signaturer med HMAC-SHA1 (rekommenderas) och RSA-SHA1.
       title: OAuth-detaljer för %{app_name}
       url: Begäran av Token-adress
     update: 
diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 8e03213be..bd0d28e77 100644
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -1095,8 +1095,6 @@ tl:
       back_to_outbox: Bumalik sa kahong-labasan
       date: Petsa
       from: Mula sa
-      reading_your_messages: Binabasa ang mga mensahe mo
-      reading_your_sent_messages: Binabasa ang ipinadala mong mga mensahe
       reply_button: Tumugon
       subject: Paksa
       title: Basahin ang mensahe
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 5a8c187af..cf373d526 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -6,6 +6,7 @@
 # Author: Erdemaslancan
 # Author: George Animal
 # Author: Gizemb
+# Author: Incelemeelemani
 # Author: Katpatuka
 # Author: SalihB
 # Author: Szoszv
@@ -775,6 +776,7 @@ tr:
           shoes: Ayakkabı Dükkanı
           shopping_centre: Alışveriş Merkezi
           sports: Spor Malzemeleri Mağazası
+          stationery: Kırtasiye
           supermarket: Süpermarket
           toys: Oyuncakçı
           travel_agency: Seyahat Acentası
@@ -804,18 +806,27 @@ tr:
         tunnel: 
           "yes": Tünel
         waterway: 
+          artificial: Yapay su yolu
+          boatyard: Tersane
           canal: Kanal
+          connector: Su yolu bağlantısı
           dam: Baraj
+          derelict_canal: Sahipsiz kanal
           ditch: Sulama kanalı
           dock: Ä°skele
           drain: Atık su kanalı
           lock: Ä°skele
+          lock_gate: Menfez
           mineral_spring: Maden Suyu
+          mooring: Baba
+          rapids: Akıntı
           river: Nehir
           riverbank: Irmak kenarı
           stream: Çay
           wadi: Vadi
+          water_point: İçme suyu
           waterfall: Şelale
+          weir: Küçük köprü
   javascripts: 
     map: 
       base: 
@@ -853,12 +864,13 @@ tr:
     history: Geçmiş
     home: konum
     home_tooltip: Kendin konuma git
+    inbox_html: mesajlar %{count}
     inbox_tooltip: 
       one: Bir tane okunmamış mesajın var
       other: "%{count} okunmamış mesaj var"
       zero: Okunmamış mesajın yok
     intro_1: OpenStreetMap herkese serbest ve ücretsiz senin gibi insanlar tarafından oluşturduğu bir dünya haritasıdır.
-    intro_2_create_account: hesabı oluşturunuz
+    intro_2_create_account: hesap oluşturunuz
     intro_2_download: indirmesi
     intro_2_html: "%{license} olan verilerinin %{download} ve %{use} tamamen serbesttir. Harita geliştirmek için bir %{create_account}."
     intro_2_license: Kamuya açık lisansı
@@ -906,6 +918,7 @@ tr:
     inbox: 
       date: Tarih
       from: Gönderen
+      messages: "%{new_messages} yeni ve %{old_messages} eski mesaj var"
       my_inbox: Gelen kutusu
       outbox: Gönderilmiş kutusu
       people_mapping_nearby: yakın çevredeki haritacılar
@@ -945,8 +958,6 @@ tr:
       back_to_outbox: Gönderilmiş kutusuna dön
       date: Tarih
       from: Gönderen
-      reading_your_messages: Mesajlarını oku
-      reading_your_sent_messages: Gönderilmiş mesajlarını oku
       reply_button: Yanıtla
       subject: Konu
       title: Mesaj oku
@@ -962,9 +973,14 @@ tr:
     email_confirm: 
       subject: "[OpenStreetMap] E-posta adresi onaylama mesajı"
     email_confirm_html: 
+      click_the_link: Bu e-postayı sana aitse onaylamak için aşağıdaki bağlantıyı tıkla.
       greeting: Merhaba,
+      hopefully_you: Birisi (umarım sen) %{server_url} deki kayıtlı olan e-posta adresi %{new_address} olarak değiştirmek istiyor.
     email_confirm_plain: 
+      click_the_link: Bu e-posta adresi sana aitse onaylamak için aşağıdaki bağlantıyı tıkla.
       greeting: Merhaba,
+      hopefully_you_1: "Birisi (umarım sen) kendi e-posta adresini değiştirmek istiyor:"
+      hopefully_you_2: "%{server_url} deki %{new_address} olacak."
     friend_notification: 
       befriend_them: "%{befriendurl} üzerinden arkadaş olarak da ekleyebilirsiniz."
       had_added_you: Kullanıcı %{user} seni arkadaş olarak OpenStreetMap'te ekledi.
@@ -982,15 +998,21 @@ tr:
     lost_password: 
       subject: "[OpenStreetMap] Şifre sıfırlama isteği"
     lost_password_html: 
+      click_the_link: Bu istek sana aitse şifre sıfırlamak için aşağıdaki bağlantıyı tıkla.
       greeting: Merhaba,
     lost_password_plain: 
+      click_the_link: Bu istek sana aitse şifre sıfırlamak için aşağıdaki bağlantıyı tıkla.
       greeting: Merhaba,
+      hopefully_you_1: "Birisi (muhtemelen sen) şifre sıfırlanmak için başvurdu:"
+      hopefully_you_2: openstreetmap.org hesabı bu e-posta ile.
     message_notification: 
       footer1: Ayrıca mesajı %{readurl} tıklayarak okuyabilirsin
       footer2: ve %{replyurl} üzerinden cevap verebilirsiniz
       header: "OpenStreetMap kullanıcı %{from_user} sana %{subject} konulu bir mesaj gönderdi:"
       hi: Merhaba %{to_user},
     signup_confirm: 
+      created: Birisi (umarım sen) %{site_url} sitesinde yeni bir hesap açtı.
+      greeting: Merhaba!
       subject: "[OpenStreetMap] e-posta adresi onaylama mesajı"
     signup_confirm_html: 
       introductory_video: "%{introductory_video_link} seyretebilirsin."
@@ -1006,12 +1028,14 @@ tr:
       name: Isim
       required: Gerekli
     index: 
+      my_apps: Benim istemci uygulamalarım
       revoke: Ä°ptal!
       title: OAuth Ayrıntılarım
     new: 
       submit: Kayıt ol
     show: 
       confirm: Emin misiniz?
+      delete: Ä°stemci Sil
       edit: Ayrıntıları Düzenle
   redaction: 
     create: 
@@ -1232,9 +1256,12 @@ tr:
         not yet agreed: Yeni katılımcı şartları kabul etmedin.
       current email address: "Geçerli E-posta Adresi:"
       delete image: Geçerli resim kaldır
-      email never displayed publicly: (asla genel olarak görüntülenir)
+      email never displayed publicly: (hiçbir zaman görüntülenmez)
       flash update success: Kullanıcı bilgisi başarıyla güncellendi.
       flash update success confirm needed: Kullanıcı bilgisi başarıyla güncellendi. Yeni e-posta adresinizi onaylamak için e-mail'inizi lütfen kontrol ediniz.
+      gravatar: 
+        gravatar: Gravatar kullanın
+        link text: bu nedir?
       home location: "Konum:"
       image: "Resim:"
       image size hint: (100x100 olan kare görüntüleri en iyi görünür)
@@ -1270,7 +1297,7 @@ tr:
     confirm: 
       button: Onayla
       heading: Kullanıcı hesabı onayla
-      success: Hesabın onaylandı, teşekkür ve iyi çalışmaları!<br /><br /><a href="http://wiki.openstreetmap.org/wiki/Tr:Main_Page">Hoşgeldin sayfasında</a> Türkiye'deki harita durumu konusunda bilgi alabilirsin.
+      success: Hesabın onaylandı, teşekkür ve iyi çalışmalar!<br /><br /><a href="http://wiki.openstreetmap.org/wiki/Tr:Main_Page">Hoşgeldin sayfasında</a> Türkiye'deki harita durumu konusunda bilgi alabilirsin.
     confirm_email: 
       button: Onayla
       success: E-posta adresinizi doğrulandı, kaydolduğu için teşekkür ederiz! İyi çalışmaları dileriz!
@@ -1342,6 +1369,7 @@ tr:
       display name: "Görünen Ad:"
       display name description: Herkes tarafından görünen ad. Bu adı istediği zaman 'tercihlerim' bölümünde değiştirebilirsin.
       email address: "E-posta Adresi:"
+      flash create success message: Kayıt olduğunuz için teşekkür ederiz. Şu anda %{email} e-posta adresinize işlemlerin tamamlandığına dair son bir onaylama daha gönderildi. E-posta adresindeki onay işlemlerini gerçekleştirdikten sonra kendi haritalarınıza ulaşabilicek ve oluşturabileceksiniz<br /><br />Eğer siz antispam sistemi kullanıyorsanız, gönderdiğimiz onay e-postasının spam listesine düşmüş olabileceğini unutmayın. Ayrıca doğrulama istek e-postalarınıza cevap veremiyoruz. Bunun yerine sorun için bizimle webmaster@openstreetmap.org e-posta adresinden iletişim kurabilirsiniz.
       heading: Kullanıcı Hesabı Oluştur
       openid: "%{logo} OpenID:"
       password: "Şifre:"
@@ -1372,15 +1400,19 @@ tr:
       webmaster: site yönetici
     terms: 
       agree: Kabul Et
+      consider_pd: Yukarıdaki anlaşmaya ek olarak, katkılarınızın kamu malı olarak kabul edilmesini de seçebilirsiniz
       consider_pd_why: bu nedir?
       decline: Reddet
+      guidance: "Buradaki bilgileri anlamanıza yardımcı olabilecek bilgiler:  <a href=\"%{summary}\">okunabilir bir özet</a> ve ayrıca <a href=\"%{translations}\">genel çeviriler</a>"
       heading: Katılımcı Şartları
       legale_names: 
         france: Fransa
         italy: Ä°talya
         rest_of_world: Dünyanın geri kalanı
       legale_select: "İkamet ettiğiniz ülke seç:"
+      read and accept: Lütfen aşağıdaki anlaşmayı okuyun ve mevcut ya da gelecekteki katkılarınız için bu sözleşmenin şartlarını kabul ettiğinizi onaylamak için kabul et butonuna basın.
       title: Katılımcı Şartları
+      you need to accept or decline: Lütfen katılımcı şartlarını okuyunuz ve şartları kabul ya da ret ediniz.
     view: 
       activate_user: Bu kullanıcıyı etkinleştir
       add as friend: arkadaş olarak ekle
@@ -1426,7 +1458,13 @@ tr:
       remove as friend: Arkadaş listesinden çıkar
       role: 
         administrator: Bu kullanıcı bir yönetici dir.
+        grant: 
+          administrator: Yönetici erişim hakkı
+          moderator: Moderatör erişim izni
         moderator: Bu kullanıcı bir moderatör dür.
+        revoke: 
+          administrator: Yönetici erişimini iptal etme
+          moderator: Moderatör erişimini iptal etme
       send message: mesaj gönder
       settings_link_text: ayarları
       spam score: "Spam puanı:"
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 5618dcdbd..e05b49d54 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -7,6 +7,7 @@
 # Author: Base
 # Author: Dim Grits
 # Author: Dittaeva
+# Author: Dubyk
 # Author: KEL
 # Author: Nemo bis
 # Author: Olvin
@@ -182,7 +183,7 @@ uk:
         way: лінія
     paging_nav: 
       of: з
-      showing_page: Показано сторінку
+      showing_page: сторінка
     redacted: 
       message_html: Версія %{version} типу %{type} не може бути показана через те, що її було відредаговано. Будь ласка, перегляньте %{redaction_link} для отримання деталей.
       redaction: Редакція %{id}
@@ -219,10 +220,10 @@ uk:
       load_data: Завантажити Дані
       loaded_an_area_with_num_features: "Ви завантажили ділянку, яка містить %{num_features} об’єктів. Загалом, деякі оглядачі можуть не впоратися з відображенням такої кількості даних. Зазвичай, оглядачі працюють краще, коли водночас показується не більше %{max_features} об'єктів: якщо ж ви робите інакше, це може спричинити  сповільнення чи взагалі відсутність відгуку у вашому оглядачі. Коли ви впевнені, що слід показати ці дані, можете натиснути кнопку нижче."
       loading: Завантаження…
-      manually_select: Виберіть іншу дялінку
+      manually_select: Виберіть іншу ділянку
       object_list: 
         api: Отримати цю ділянку з API
-        back: Показати перелік об’єктів
+        back: Повернутися до списку об’єктів
         details: Подробиці
         heading: Перелік об’єктів
         history: 
@@ -240,7 +241,7 @@ uk:
       show_areas: Показати ділянки
       show_history: Показати історію
       unable_to_load_size: "Неможливо завантажити: розмір  %{bbox_size} завеликий (має бути менше, ніж %{max_bbox_size})"
-      view_data: Переглянути дані для поточного подання карти
+      view_data: Переглянути дані з поточної мапи
       wait: Зачекайте…
       zoom_or_select: Збільшить масштаб або виберіть ділянку на мапі для перегляду
     tag_details: 
@@ -293,13 +294,13 @@ uk:
       saved_at: Збережено
       user: Користувач
     list: 
-      description: Останні зміни
+      description: Останні зміни на мапі
       description_bbox: Набір змін в межах %{bbox}
       description_friend: Набори змін ваших друзів
       description_nearby: Набори змін користувачів поряд з вами
       description_user: Набір змін користувача %{user}
       description_user_bbox: Набір змін користувача %{user} в межах %{bbox}
-      empty_anon_html: Ще не було правок
+      empty_anon_html: Ще не було правок.
       empty_user_html: Схоже, що ви ще не зробили жодної правки. Перед тим, як розпочати, ознайомтесь з <a href='http://wiki.openstreetmap.org/wiki/Uk:Beginners_Guide_1.3'>Керівництвом для початківців</a>
       heading: Набори змін
       heading_bbox: Набори змін
@@ -368,7 +369,7 @@ uk:
       newer_entries: Нові записи
       no_entries: В щоденнику немає записів
       older_entries: Старі записи
-      recent_entries: "Останні записи:"
+      recent_entries: Останні записи в щоденнику
       title: Щоденник
       title_friends: Щоденники друзів
       title_nearby: Щоденники користувачів поряд з вами
@@ -713,6 +714,8 @@ uk:
           airfield: Військовий аеродром
           barracks: Казарма
           bunker: Бункер
+        mountain_pass: 
+          "yes": Гірський перевал
         natural: 
           bay: Затока
           beach: Пляж
@@ -947,10 +950,10 @@ uk:
     community: Спільнота
     community_blogs: Блоги спільноти
     community_blogs_title: Блоги членів спільноти OpenStreetMap
-    copyright: Авторські права & Ліцензія
+    copyright: Авторські права та Ліцензування
     documentation: Документація
     documentation_title: Документація проекту
-    donate: Підтримайте OpenStreetMap %{link} у фонді оновлення обладнання.
+    donate: Підтримайте OpenStreetMap %{link} у Фонді оновлення обладнання.
     donate_link_text: пожертвування
     edit: Правка
     edit_with: Правити у %{editor}
@@ -1059,7 +1062,7 @@ uk:
       no_messages_yet: У вас ще немає повідомлень. Чому б не поспілкуватись з кимось із %{people_mapping_nearby_link}?
       old_messages: 
         one: "%{count} старе повідомлення"
-        other: "%{count} стари повідомлень"
+        other: "%{count} старих повідомлень"
       outbox: вихідні
       people_mapping_nearby: користувачів поблизу вас
       subject: Тема
@@ -1092,7 +1095,7 @@ uk:
         one: У вас %{count} надіслане повідомлення
         other: У вас %{count} надісланих повідомлень
       my_inbox: Мої %{inbox_link}
-      no_sent_messages: У вас немає відправлених повідомлень. Чому б не поспілкуватись з кимось із %{people_mapping_nearby_link}?
+      no_sent_messages: У вас немає надісланих повідомлень. Чому б не поспілкуватись з кимось із %{people_mapping_nearby_link}?
       outbox: вихідні
       people_mapping_nearby: користувачів поблизу вас
       subject: Тема
@@ -1103,8 +1106,6 @@ uk:
       back_to_outbox: Назад до вихідних
       date: Дата
       from: Від
-      reading_your_messages: Перегляд повідомлення
-      reading_your_sent_messages: Перегляд відправленого повідомлення
       reply_button: Відповісти
       subject: Тема
       title: Перегляд повідомлення
@@ -1112,7 +1113,7 @@ uk:
       unread_button: Позначити як непрочитане
       wrong_user: Ви увійшли як `%{user}', але повідомлення, яке ви хочете прочитати, не було відправлено цим користувачем, чи призначено для цього користувача. Будь ласка, увійдіть під правильним ім'ям користувача, щоб прочитати його.
     reply: 
-      wrong_user: Ви увійшли як `%{user}', але повідомлення, на яке ви хочете відповісти, було відправлено не цьому користувачу. Будь ласка, увійдіть за правильним ім'ям користувача щоб відповісти.
+      wrong_user: Ви увійшли як `%{user}', але повідомлення, на яке ви хочете відповісти, було відправлено не цьому користувачу. Будь ласка, увійдіть з правильним ім’ям користувача щоб відповісти.
     sent_message_summary: 
       delete_button: Вилучити
   notifier: 
@@ -1171,7 +1172,7 @@ uk:
       confirm: "Перш ніж ми щось зробимо, ми повинні впевнитись, що запит надійшов від Вас; тож якщо це були Ви, будь ласка, натисніть на посилання нижче, щоб підтвердити Ваш обліковий запис:"
       created: Хтось (сподіваємось Ви) щойно створив обліковий запис на % {site_url}.
       greeting: Привіт!
-      subject: "[OpenStreetMap] Ласкаво просимо на OpenStreetMap"
+      subject: "[OpenStreetMap] Ласкаво просимо до OpenStreetMap"
       welcome: Ми хочемо привітати Вас і надати Вам деяку додаткову інформацію для початку.
     signup_confirm_html: 
       ask_questions: Ви можете задати питання про OpenStreetMap на нашому <a href="http://help.openstreetmap.org/">сайті питань і відповідей</a>.
@@ -1259,7 +1260,7 @@ uk:
       key: "Позначки абонента:"
       requests: "Запит наступних дозволів з боку користувача:"
       secret: "Секретна фраза абонента:"
-      support_notice: Ми підтримуємо HMAC-SHA1 (рекомендується) і звичайний текст в режимі SSL.
+      support_notice: Ми підтримуємо підписи HMAC-SHA1 (рекомендується) і RSA-SHA1.
       title: Подробиці OAuth для %{app_name}
       url: "URL маркеру запита:"
     update: 
@@ -1436,6 +1437,7 @@ uk:
       visibility: "Видимість:"
       visibility_help: ще це означає?
     list: 
+      description: Огляд останніх завантажених треків GPS
       empty_html: Досі нічого не має. <a href='%{upload_link}'>Завантажте нові треки</a> або дізнайтесь більше про створення GPS-треків на <a href='http://wiki.openstreetmap.org/wiki/Uk:Beginners_Guide_1.2'>сторінці вікі</a>.
       public_traces: Загальнодоступні GPS-треки
       public_traces_from: Загальнодоступні GPS треки користувача %{user}
@@ -1588,9 +1590,8 @@ uk:
       heading: Користувачі
       hide: Сховати вибраних користувачів
       showing: 
-        few: Показано %{page} сторінки (%{first_item} з %{items})
-        one: Показано %{page} сторінку (%{first_item} з %{items})
-        other: Показано %{page} сторінок (%{first_item}-%{last_item} з %{items})
+        one: Сторінка %{page} (%{first_item} з %{items})
+        other: Сторінка %{page} сторінок (%{first_item}-%{last_item} з %{items})
       summary: "%{name} зареєстрований з %{ip_address},  %{date}"
       summary_no_ip: "%{name} зареєстврований %{date}"
       title: Користувачі
@@ -1630,7 +1631,7 @@ uk:
           title: Увійти з Yahoo
       password: "Пароль:"
       register now: Зареєструйтеся зараз
-      remember: "Запам'ятати мене:"
+      remember: Запам’ятати мене
       title: Представтесь
       to make changes: Щоб вносити зміни до даних OpenStreetMap, ви повинні мати обліковий запис.
       with openid: "Крім того, для входу ви можете скористатись вашим OpenID:"
@@ -1652,7 +1653,7 @@ uk:
       button: Додати як друга
       failed: На жаль, %{name} не вдалось додати до списку друзів.
       heading: Додати %{user} як друга?
-      success: Тепер %{name} є вашим другом.
+      success: Тепер %{name} є вашим другом!
     new: 
       confirm email address: "Підтвердити адресу ел. пошти:"
       confirm password: "Повторіть пароль:"
@@ -1682,7 +1683,7 @@ uk:
       title: Немає такого користувача
     popup: 
       friend: Друг
-      nearby mapper: Найближчий користувач
+      nearby mapper: Користувач поруч з вами
       your location: Ваше місце розташування
     remove_friend: 
       button: Вилучити із списку друзів
@@ -1693,7 +1694,7 @@ uk:
       confirm password: "Підтвердження пароля:"
       flash changed: Ваш пароль було змінено.
       flash token bad: Неможливо знайти такий код підтвердження, перевірте посилання.
-      heading: Перевстановлення пароль для %{user}
+      heading: Перевстановлення паролю для %{user}
       password: "Пароль:"
       reset: Перевстановити пароль
       title: Перевстановлення пароля
@@ -1741,10 +1742,10 @@ uk:
       diary: щоденник
       edits: правки
       email address: "Адреса Е-пошти:"
-      friends_changesets: Переглянути усі набори змін друзів
-      friends_diaries: Переглянути всі записи в щоденнику друзів
+      friends_changesets: набори змін друзів
+      friends_diaries: записи в щоденниках друзів
       hide_user: приховати цього користувача
-      if set location: Якщо ви вкажете своє місце розташування, мапа і додаткові інструменти з’являться нижче. Ви можете встановити ваше місце розташування на вашій сторінці %{settings_link}.
+      if set location: Вкажіть ваше місце розташування на вашій сторінці %{settings_link}, щоб побачити користувачів, які є поруч з вами.
       km away: "%{count} км від вас"
       latest edit: "Остання правка %{ago}:"
       m away: "%{count} м від вас"
@@ -1755,9 +1756,9 @@ uk:
       my edits: мої правки
       my settings: мої налаштування
       my traces: мої треки
-      nearby users: Інші найближчі користувачі
-      nearby_changesets: Переглянути всі набори змін близьких користувачів
-      nearby_diaries: Переглянути всі записи в щоденниках близьких користувачів
+      nearby users: Інші користувачі поруч
+      nearby_changesets: набори змін користувачів, що знаходяться поруч з вами
+      nearby_diaries: записи в щоденниках користувачів, що знаходяться поруч з вами
       new diary entry: новий запис
       no friends: Ви не додали ще жодного друга.
       no nearby users: Поблизу поки немає користувачів, які займаються складанням мапи.
@@ -1811,7 +1812,7 @@ uk:
       until_login: Активне до тих пір, доки користувач не увійде в систему.
     index: 
       empty: Ще не накладено жодного блокування.
-      heading: Перелік блокувань користувача
+      heading: Перелік заблокованих користувачів
       title: Блокування користувача
     model: 
       non_moderator_revoke: Потрібно бути модератором, щоб зняти блокування.
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index dde68b3c1..72c5946ec 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -464,7 +464,7 @@ vi:
           terminal: Nhà ga Sân bay
         amenity: 
           WLAN: Điểm Truy cập Wi-Fi
-          airport: Phi trường
+          airport: Sân bay
           arts_centre: Trung tâm Nghệ thuật
           artwork: Tác phẩm Nghệ thuật
           atm: Máy Rút tiền Tự động
@@ -478,7 +478,7 @@ vi:
           biergarten: Quán rượu Ngoài trời
           brothel: Nhà chứa
           bureau_de_change: Tiệm Đổi tiền
-          bus_station: Trạm Xe buýt
+          bus_station: Bến Xe buýt
           cafe: Quán Cà phê
           car_rental: Chỗ Mướn Xe
           car_sharing: Chia sẻ Xe cộ
@@ -578,12 +578,12 @@ vi:
         highway: 
           bridleway: Đường Cưỡi ngựa
           bus_guideway: Làn đường Dẫn Xe buýt
-          bus_stop: Chỗ Đậu Xe buýt
+          bus_stop: Trạm Xe buýt
           byway: Đường mòn Đa mốt
           construction: Đường Đang Xây
           cycleway: Đường Xe đạp
           emergency_access_point: Địa điểm Truy nhập Khẩn cấp
-          footway: Đường bộ
+          footway: Đường Đi bộ
           ford: Khúc Sông Cạn
           living_street: Đường Hàng xóm
           milestone: Mốc
@@ -592,28 +592,28 @@ vi:
           motorway_junction: Ngã tư Đường Cao tốc
           motorway_link: Đường Cao tốc
           path: Lối
-          pedestrian: Đường bộ Lớn
+          pedestrian: Đường Dành cho Người Đi bộ
           platform: Sân ga
           primary: Đường Chính
           primary_link: Đường Chính
           raceway: Đường đua
-          residential: Đường Nhà ở
+          residential: Ngõ Dân cư
           rest_area: Trạm Nghỉ Dọc đường
           road: Đường
           secondary: Đường Lớn
           secondary_link: Đường Lớn
-          service: Đường phụ
+          service: Ngách
           services: Dịch vụ Dọc đường Cao tốc
           speed_camera: Máy chụp hình Tốc độ
           steps: Cầu thang
           stile: Cá»­a xoay
-          tertiary: Đường Lớn
-          tertiary_link: Đường Lớn
+          tertiary: Phố
+          tertiary_link: Phố
           track: Đường mòn
           trail: Đường mòn
           trunk: Xa lộ
           trunk_link: Xa lộ
-          unclassified: Đường Không Phân loại
+          unclassified: Ngõ
           unsurfaced: Đường Không Lát
         historic: 
           archaeological_site: Khu vực Khảo cổ
@@ -684,7 +684,7 @@ vi:
           miniature_golf: Golf Nhỏ
           nature_reserve: Khu Bảo tồn Thiên niên
           park: Công viên
-          pitch: Bãi Thể thao
+          pitch: Sân cỏ
           playground: Sân chơi
           recreation_ground: Sân Giải trí
           sauna: Nhà Tắm hơi
@@ -698,6 +698,8 @@ vi:
           airfield: Sân bay Không quân
           barracks: Trại Lính
           bunker: Boong ke
+        mountain_pass: 
+          "yes": Đèo
         natural: 
           bay: Vịnh
           beach: Bãi biển
@@ -753,7 +755,7 @@ vi:
           travel_agent: Văn phòng Du lịch
           "yes": Văn phòng
         place: 
-          airport: Phi trường
+          airport: Sân bay
           city: Thành phố
           country: Quốc gia
           county: Quận hạt
@@ -913,7 +915,7 @@ vi:
           wadi: Dòng sông Vào mùa
           water_point: Máy bơm nước
           waterfall: Thác
-          weir: Đập Cột nước Thấp
+          weir: Đập Tràn
   javascripts: 
     map: 
       base: 
@@ -1084,8 +1086,6 @@ vi:
       back_to_outbox: Trở về hộp thư đã gửi
       date: Ngày
       from: Từ
-      reading_your_messages: Đọc thư
-      reading_your_sent_messages: Đọc thư đã gửi
       reply_button: Trả lời
       subject: Tiêu đề
       title: Đọc thư
@@ -1241,7 +1241,7 @@ vi:
       key: "Từ khóa Tiêu dùng:"
       requests: "Yêu cầu các khả năng của người dùng ở dưới:"
       secret: "Mật khẩu Tiêu dùng:"
-      support_notice: Chúng tôi hỗ trợ mã hóa HMAC-SHA1 (khuyên dùng) cũng như văn bản thuần với chế độ ssl.
+      support_notice: Chúng tôi hỗ trợ các chữ ký HMAC-SHA1 (khuyên dùng) và RSA-SHA1.
       title: Chi tiết OAuth của %{app_name}
       url: "URL của Dấu Yêu cầu:"
     update: 
@@ -1336,7 +1336,7 @@ vi:
           motorway: Đường cao tốc
           park: Công viên
           permissive: Đường cho phép
-          pitch: Sân thể thao
+          pitch: Sân cỏ
           primary: Đường chính
           private: Đường riêng
           rail: Đường sắt
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index eab3e720c..50c752ddd 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -10,6 +10,7 @@
 # Author: PhiLiP
 # Author: Shizhao
 # Author: Xiaomingyan
+# Author: 乌拉跨氪
 zh-CN: 
   activerecord: 
     attributes: 
@@ -82,6 +83,8 @@ zh-CN:
   application: 
     require_cookies: 
       cookies_needed: 您似乎已禁用了 cookies - 请在浏览器中启用 cookies，然后继续。
+    require_moderator: 
+      not_a_moderator: 必须为管理员才能执行该操作。
     setup_user_auth: 
       blocked: 您对 API 的访问已经被阻挡了。请登录到网站以了解更多信息。
       need_to_see_terms: 您对 API 的访问已暂时中止。请登录到网站以查看贡献者条款。您不需要同意，但必须查看它们。
@@ -96,14 +99,14 @@ zh-CN:
       title: 修改集合
     changeset_details: 
       belongs_to: 属于：
-      bounding_box: 限定窗口：
+      bounding_box: 限定边框：
       box: 窗口
       closed_at: 关闭于：
       created_at: 创建于：
       has_nodes: 有如下 %{count} 个节点：
       has_relations: 有如下 %{count} 种关系：
       has_ways: 有如下 %{count} 条路径：
-      no_bounding_box: 没有为该修改集合所储存的限定窗口。
+      no_bounding_box: 没有为该修改集合所储存的限定边框。
       show_area_box: 显示区域窗口
     common_details: 
       changeset_comment: 评论：
@@ -173,8 +176,10 @@ zh-CN:
         way: 路径
     paging_nav: 
       of: /
-      showing_page: 显示页面
+      showing_page: 页面
     redacted: 
+      message_html: 该%{type}的版本%{version}无法显示，其已被删节。详情请见%{redaction_link}。
+      redaction: 删节 %{id}
       type: 
         node: 节点
         relation: 关系
@@ -212,7 +217,7 @@ zh-CN:
       manually_select: 手动选择一个不同区域
       object_list: 
         api: 从 API 取回这一区域
-        back: 显示对象列表
+        back: 回到对象列表
         details: 详细信息
         heading: 对象列表
         history: 
@@ -229,8 +234,9 @@ zh-CN:
       private_user: 个人用户
       show_areas: 显示区域
       show_history: 显示历史
-      unable_to_load_size: 无法读取：限定窗口的大小 %{bbox_size} 过大(需小于 %{max_bbox_size})
-      wait: 等待中...
+      unable_to_load_size: 无法读取：限定边框的大小 %{bbox_size} 过大(需小于 %{max_bbox_size})
+      view_data: 查看当前地图视图的数据
+      wait: 请稍等...
       zoom_or_select: 放大或选择查看一个地图区域
     tag_details: 
       tags: 标签：
@@ -252,7 +258,7 @@ zh-CN:
       way: 路径
       way_title: 路径：%{way_name}
     way_details: 
-      also_part_of: 也是 %{related_ways} 路径的一部分
+      also_part_of: 也是%{related_ways}路径的一部分
       nodes: 节点：
       part_of: 部分：
     way_history: 
@@ -272,7 +278,7 @@ zh-CN:
     changeset_paging_nav: 
       next: 下一页 »
       previous: « 上一页
-      showing_page: 显示第 %{page} 页
+      showing_page: 第%{page}页
     changesets: 
       area: 区域
       comment: 评论
@@ -280,13 +286,13 @@ zh-CN:
       saved_at: 保存时间
       user: 用户
     list: 
-      description: 最近更改
+      description: 浏览最近对地图的更改
       description_bbox: "%{bbox} 内的修改集合"
       description_friend: 您的朋友的修改集合
       description_nearby: 附近用户的修改集合
       description_user: "%{user} 的修改集合"
       description_user_bbox: "%{user} 在 %{bbox} 内的修改集合"
-      empty_anon_html: 尚未编辑
+      empty_anon_html: 尚未编辑。
       empty_user_html: 看起来您尚未编辑。若要开始，请参考<a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>初学者指南</a>。
       heading: 修改集合
       heading_bbox: 修改集合
@@ -317,8 +323,9 @@ zh-CN:
       hide_link: 隐藏此评论
     diary_entry: 
       comment_count: 
-        one: 1 回复
-        other: "%{count} 回复"
+        one: 一个回复
+        other: "%{count}个回复"
+        zero: 无回复
       comment_link: 关于此篇评论
       confirm: 确认
       edit_link: 编辑此篇
@@ -353,7 +360,7 @@ zh-CN:
       newer_entries: 更新的条目
       no_entries: 没有日记条目
       older_entries: 更早的条目
-      recent_entries: 最近的日记条目：
+      recent_entries: 最近的日记条目
       title: 用户的日记
       title_friends: 朋友的日记
       title_nearby: 附近用户的日记
@@ -392,7 +399,7 @@ zh-CN:
       area_to_export: 输出区域
       embeddable_html: 嵌入 HTML
       export_button: 输出
-      export_details: OpenStreetMap 数据是以<a href="http://creativecommons.org/licenses/by-sa/2.0/">知识共享 署名-相同方式 2.0 许可</a>授权。
+      export_details: OpenStreetMap数据以<a href="http://opendatacommons.org/licenses/odbl/1.0/">开放式数据共享开放式数据库许可</a>（ODbL）授权。
       format: 格式
       format_to_export: 输出格式
       image_size: 图像尺寸
@@ -698,6 +705,8 @@ zh-CN:
           airfield: 军用机场
           barracks: 军营
           bunker: 碉堡
+        mountain_pass: 
+          "yes": 隘口
         natural: 
           bay: æµ·æ¹¾
           beach: 海滩
@@ -708,7 +717,7 @@ zh-CN:
           crater: 火山口
           dune: 沙丘
           feature: 特征
-          fell: 下跌
+          fell: å±±
           fjord: 峡湾
           forest: 森林
           geyser: 喷泉
@@ -774,7 +783,7 @@ zh-CN:
           subdivision: 次级
           suburb: 郊区
           town: 镇
-          unincorporated_area: 团的区
+          unincorporated_area: 自由区
           village: 村
         railway: 
           abandoned: 废弃铁路
@@ -1004,12 +1013,32 @@ zh-CN:
       text: 这个翻译页面和%{english_original_link}在事件上有冲突时，以英文页面为准
       title: 关于这个翻译
     legal_babble: 
+      attribution_example: 
+        alt: 在网页上注明 OpenStreetMap 的样例
+        title: 注明样例
+      contributors_at_html: <strong>奥地利</strong>：包含来自 <a href="http://data.wien.gv.at/">Stadt Wien</a>（<a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>协议）、<a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a>及 Land Tirol（修订的<a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT</a>协议）的数据。
+      contributors_ca_html: <strong>加拿大</strong>：包含来自 GeoBase&reg;、GeoGratis（&copy;加拿大自然资源局）、CanVec（&copy;加拿大自然资源局）及 StatCan（加拿大统计局地理处）的数据。
+      contributors_footer_1_html: "关于其进一步的细节，及其他被用来帮助提升 OpenStreetMap 的来源，详见 OpenStreetMap Wiki 的<a\nhref=\"http://wiki.openstreetmap.org/wiki/Contributors\">贡献者页面</a>。"
+      contributors_footer_2_html: OpenStreetMap 纳入数据并不意味着原始数据提供者认可 OpenStreetMap、提供任何担保或担负任何法律责任。
+      contributors_fr_html: <strong>法国</strong>：包含来自 Direction Générale des Impôts 的数据。
+      contributors_gb_html: <strong>英国</strong>：包含来自 Ordnance 的调查数据，&copy; Crown 版权所有及数据库权利，2010-12。
+      contributors_intro_html: 我们的数据来源于成千上万人的贡献。但我们也从国家测绘机构等处获取公共版权的数据，其中包括：
+      contributors_nl_html: <strong>荷兰</strong>：包含来自 &copy; AND 2007 年的数据。（<a href="http://www.and.com">www.and.com</a>）
+      contributors_nz_html: <strong>新西兰</strong>：包含来自新西兰土地信息部的数据。Crown版权所有。
       contributors_title_html: 我们的贡献者
-      infringement_1_html: "OSM 的贡献者会被提醒，在没有\n版权持有人的明确许可下，绝不添加任何受版权保护的数据\n（例如：谷歌地图，或印刷地图）。"
+      contributors_za_html: <strong>南非</strong>：包含来自<a href="http://www.ngi.gov.za/">行政局：国家地球空间信息</a>，国家版权所有。
+      credit_1_html: "我们需要您注明 &ldquo;&copy; OpenStreetMap\ncontributors&rdquo;。"
+      credit_2_html: 您必须明确注明，我们的数据使用开放式数据库协议，若使用我们的地图瓦片，其协议须为 CC-BY-SA。您可以链接<a href="http://www.openstreetmap.org/copyright">此版权页</a>以注明。另外，若您要以数据形式发布 OSM，您可以属名并直接链接协议。若某些媒介无法进行链接（如印刷品），我们建议您引导您的读者至 openstreetmap.org（或OpenStreetMap的完整网址）、opendatacommons.org，及可能相关的creativecommons.org。
+      credit_3_html: "对于可浏览的电子地图，标记会出现在地图的右下角。\n例如："
+      credit_title_html: 如何注明 OpenStreetMap
+      infringement_1_html: OSM 的贡献者会被提醒，在没有版权持有人的明确许可下，绝不添加任何受版权保护的数据（例如：谷歌地图，或印刷地图）。
+      infringement_2_html: 如果你认为版权的材料已被不恰当地添加的OpenStreetMap数据库或该网站，请参见我们的<a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">撤除程序</a>，或直接在我们的<a href="http://dmca.openstreetmap.org/">在线申报页面</a>上提出。
       infringement_title_html: 侵权问题
-      intro_1_html: "OpenStreetMap is <i>open data</i>, licensed under the <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
-      intro_2_html: "  您可以自由地复制、发行、传播和创作演绎我们的地图\n  和数据，只要您信任 OpenStreetMap 和它的\n  贡献者。如果您改变、转换或者以我们的地图或数据为基础进行创作，您\n  只能采用与本协议相同的许可协议发布您的作品。完整\n  的<a\n  href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">法律\n  文本</a>阐明了您的权利和义务。"
-      more_1_html: "  阅读更多关于使用我们数据的 <a\n  href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">常见\n  法律问题</a>。"
+      intro_1_html: "OpenStreetMap 为<i>开放式数据</i>，在<a\nhref=\"http://opendatacommons.org/licenses/odbl/\">开放式数据共享开放式数据库许可</a>（ODbL）下授权。"
+      intro_2_html: 您可以自由地复制、发行、传播和创作演绎我们的数据，只要您注明 OpenStreetMap 和它的贡献者。如果您想改变、转换或者以我们的数据为基础进行创作，您只能采用与本协议相同的许可协议发布您的作品。完整的<a href="http://opendatacommons.org/licenses/odbl/1.0/">法律文本</a>阐明了您的权利和义务。
+      intro_3_html: 创作我们的地图瓦片及文档须在<a href="http://creativecommons.org/licenses/by-sa/2.0/">知识共享署名-相同方式共享 2.0</a>（CC-BY-SA）协议下进行的。
+      more_1_html: "阅读使用我们数据的<a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">常见法律问题</a>。"
+      more_2_html: 虽然 OpenStreetMap 是一个开发的数据库，但我们无法为第三方开发人员提供免费的地图 API。详见我们的<a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">API使用政策</a>、<a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">地图瓦片使用政策</a>及<a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">名称服务使用政策</a>。
       more_title_html: 了解更多
       title_html: 版权和许可
     native: 
@@ -1069,8 +1098,6 @@ zh-CN:
       back_to_outbox: 返回发件箱
       date: 日期
       from: 来自
-      reading_your_messages: 正在阅读您的信息
-      reading_your_sent_messages: 正在阅读您所发送的信息
       reply_button: 回复
       subject: 主题
       title: 阅读消息
@@ -1227,7 +1254,7 @@ zh-CN:
       key: 用户键：
       requests: 要向用户要求下列权限：
       secret: 用户密钥：
-      support_notice: 我们支持 HMAC-SHA1 (推荐)和 ssl 模式的纯文字。
+      support_notice: 我们支持HMAC-SHA1（推荐）和RSA-SHA1署名。
       title: "%{app_name} 的 OAuth 详细信息"
       url: 请求令牌 URL：
     update: 
@@ -1296,6 +1323,7 @@ zh-CN:
           footway: 步道
           forest: 森林
           golf: 高尔夫球场
+          heathland: 荒坡
           industrial: 工业区
           lake: 
             - 湖
@@ -1361,7 +1389,7 @@ zh-CN:
       search_results: 搜索结果
   time: 
     formats: 
-      friendly: "%Y 年 %B %e 日 %H:%M"
+      friendly: "%Y年 %B月 %e日 %H:%M"
   trace: 
     create: 
       trace_uploaded: 您的 GPX 文件已经被上传，正等待被输入数据库。这通常在半小时之内，当上传结束后会发邮件通知您。
@@ -1387,6 +1415,7 @@ zh-CN:
       visibility_help: 这是什么意思？
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
     list: 
+      description: 浏览最近上传的GPS轨迹
       empty_html: 尚无轨迹。<a href='%{upload_link}'>上传新轨迹</a>或在<a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>维基页面</a>上了解 GPS 轨迹。
       public_traces: 公开的 GPS 轨迹
       public_traces_from: "%{user} 的公开 GPS 轨迹"
@@ -1436,7 +1465,7 @@ zh-CN:
     trace_paging_nav: 
       newer: 较新轨迹
       older: 较旧轨迹
-      showing_page: 显示第 %{page} 页
+      showing_page: 第%{page}页
     view: 
       delete_track: 删除这条轨迹
       description: 说明：
@@ -1540,8 +1569,8 @@ zh-CN:
       heading: 用户
       hide: 隐藏所选用户
       showing: 
-        one: 显示页面 %{page} (%{first_item}/%{items})
-        other: 显示页面 %{page} (%{first_item}-%{last_item}/%{items})
+        one: "%{page}页（%{items}的第%{first_item}页）"
+        other: "%{page}页（%{items}的第%{first_item}至%{last_item}页）"
       summary: "%{name} 由 %{ip_address} 于 %{date} 创建"
       summary_no_ip: "%{name} 创建于 %{date}"
       title: 用户
@@ -1603,7 +1632,7 @@ zh-CN:
       button: 添加为好友
       failed: 对不起，未能添加 %{name} 为朋友。
       heading: 将 %{user} 加为好友？
-      success: "%{name} 现在是您的朋友。"
+      success: "%{name}现在是您的好友！"
     new: 
       confirm email address: 确认邮箱：
       confirm password: 确认密码：
@@ -1638,7 +1667,7 @@ zh-CN:
       your location: 您的位置
     remove_friend: 
       button: 删除好友
-      heading: 删除 %{user} 为好友？
+      heading: 删除好友%{user}？
       not_a_friend: "%{name} 不是您的朋友。"
       success: "%{name} 已从您的朋友中删除。"
     reset_password: 
@@ -1675,7 +1704,7 @@ zh-CN:
       you need to accept or decline: 请先阅读，然后接受或拒绝新的贡献者条款，再继续。
     view: 
       activate_user: 启用该用户
-      add as friend: 添加为好友
+      add as friend: 添加好友
       ago: (%{time_in_words_ago}之前)
       block_history: 接受的封禁
       blocks by me: 被我所封禁
@@ -1695,8 +1724,8 @@ zh-CN:
       diary: 日记
       edits: 编辑
       email address: 电子邮件地址：
-      friends_changesets: 浏览朋友的所有修改集合
-      friends_diaries: 浏览朋友的所有日记条目
+      friends_changesets: 好友作出的更改
+      friends_diaries: 好友的日记条目
       hide_user: 隐藏此用户
       if set location: 如果您设定您的位置，一张精美的地图及其他相关信息将出现在下方。您可以通过您的%{settings_link}页面来设置您的位置。
       km away: "%{count} 公里之外"
@@ -1710,8 +1739,8 @@ zh-CN:
       my settings: 我的设置
       my traces: 我的轨迹
       nearby users: 附近的其他用户
-      nearby_changesets: 浏览附近用户的所有修改集合
-      nearby_diaries: 浏览附近用户的所有日记条目
+      nearby_changesets: 最近用户的更改
+      nearby_diaries: 最近用户的日记条目
       new diary entry: 新日记入口
       no friends: 您还没有添加任何好友。
       no nearby users: 附近没有在进行制图的用户。
@@ -1768,8 +1797,8 @@ zh-CN:
       heading: 用户封禁列表
       title: 用户的封禁
     model: 
-      non_moderator_revoke: 必须撤消块的主持人。
-      non_moderator_update: 必须创建或更新一个块的主持人。
+      non_moderator_revoke: 必须为管理员才能撤消块。
+      non_moderator_update: 必须为管理员才能创建或更新一个块。
     new: 
       back: 查看所有封禁
       heading: 正在建立对 %{name} 的封禁
@@ -1795,7 +1824,7 @@ zh-CN:
       revoke: 撤销！
       revoker_name: 撤销由
       show: 显示
-      showing_page: 显示第 %{page} 页
+      showing_page: 第%{page}页
       status: 状态
     period: 
       one: 1 小时
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 669e76e64..138ed656b 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -170,7 +170,7 @@ zh-TW:
         way: 路徑
     paging_nav: 
       of: ／
-      showing_page: 正在顯示頁面
+      showing_page: 頁面
     redacted: 
       type: 
         node: 節點
@@ -208,7 +208,7 @@ zh-TW:
       manually_select: 手動選擇不同的區域
       object_list: 
         api: 從 API 取回這個區域
-        back: 顯示物件清單
+        back: 回到物件清單
         details: 詳細資訊
         heading: 物件清單
         history: 
@@ -226,6 +226,7 @@ zh-TW:
       show_areas: 顯示區域
       show_history: 顯示歷史
       unable_to_load_size: 無法載入：綁定方塊的大小 %{bbox_size} 太過巨大 (必須小於 %{max_bbox_size})
+      view_data: 檢視目前地圖的資料
       wait: 等待...
       zoom_or_select: 放大或選擇要檢視的地圖區域
     tag_details: 
@@ -270,7 +271,7 @@ zh-TW:
     changeset_paging_nav: 
       next: 下一頁 »
       previous: « 上一頁
-      showing_page: 正在顯示第 %{page} 頁
+      showing_page: 第 %{page}頁
     changesets: 
       area: 區域
       comment: 註解
@@ -278,13 +279,13 @@ zh-TW:
       saved_at: 儲存於
       user: 使用者
     list: 
-      description: 最近的變更組合
+      description: 瀏覽地圖的最近更改
       description_bbox: "%{bbox} 裡的變更組合"
       description_friend: 您朋友的變更組合
       description_nearby: 鄰近使用者的變更組合
       description_user: "%{user} 的變更組合"
       description_user_bbox: "%{user} 在 %{bbox} 裡的變更組合"
-      empty_anon_html: 尚未進行編輯
+      empty_anon_html: 尚未編輯。
       empty_user_html: 看起來您還沒有進行過任何編輯。要開始工作，請查閱<a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>初學者指南</a>。
       heading: 變更組合
       heading_bbox: 變更組合
@@ -315,8 +316,9 @@ zh-TW:
       hide_link: 隱藏此評論
     diary_entry: 
       comment_count: 
-        one: 1 個評論
-        other: "%{count} 個評論"
+        one: 1個評論
+        other: "%{count}個評論"
+        zero: 無評論
       comment_link: 對這個項目的評論
       confirm: 確認
       edit_link: 編輯此項目
@@ -351,7 +353,7 @@ zh-TW:
       newer_entries: 較新的項目
       no_entries: 沒有日記項目
       older_entries: 較舊的項目
-      recent_entries: 最近的日記項目：
+      recent_entries: 最近的日記項目
       title: 日記
       title_friends: 朋友的日記
       title_nearby: 附近的使用者的日記
@@ -390,7 +392,7 @@ zh-TW:
       area_to_export: 要匯出的區域
       embeddable_html: 內嵌式 HTML
       export_button: 匯出
-      export_details: OpenStreetMap 資料是以<a href="http://creativecommons.org/licenses/by-sa/2.0/">創用 CC 姓名標示-相同方式分享 2.0 條款</a>授權。
+      export_details: OpenStreetMap 資料是以<a href="http://opendatacommons.org/licenses/odbl/1.0/">開放資料共用 開放資料庫</a>（ODbL）授權。
       format: 格式
       format_to_export: 要匯出的格式
       image_size: 圖片大小
@@ -453,94 +455,239 @@ zh-TW:
     search_osm_nominatim: 
       prefix: 
         aeroway: 
+          aerodrome: 機場
+          apron: 停機坪
+          gate: 登機口
           helipad: 直升機停機坪
           runway: 跑道
+          taxiway: 滑行道
         amenity: 
           airport: 機場
+          arts_centre: 藝術中心
+          artwork: 藝術品
           atm: ATM
+          auditorium: 禮堂
           bank: 銀行
+          bar: 酒吧
+          bbq: 燒烤場
+          bicycle_parking: 單車停車
           bicycle_rental: 自行車租賃
+          biergarten: 啤酒花園
+          brothel: 妓院
+          bureau_de_change: 找換店
+          bus_station: 巴士站
+          cafe: 咖啡廳
+          car_rental: 租車
+          car_sharing: 汽車共用
+          car_wash: 洗車
           casino: è³­å ´
+          charging_station: 充電站
           cinema: 電影院
           clinic: 診所
           club: 俱樂部
+          college: 學院
           community_centre: 社區中心
+          courthouse: 法庭
           crematorium: 火葬場
           dentist: 牙醫
+          doctors: 醫生
+          dormitory: 宿舍
+          drinking_water: 飲用水
           driving_school: 駕駛學校
           embassy: 大使館
           emergency_phone: 緊急電話
           fast_food: 快餐
+          ferry_terminal: 渡輪碼頭
           fire_hydrant: 消防栓
           fire_station: 消防局
+          food_court: 美食廣場
+          fountain: 噴泉
+          fuel: 油店
           grave_yard: 墓地
+          gym: 健身中心 / 健身房
+          hall: 大廳
           health_centre: 健康中心
           hospital: 醫院
           hotel: 酒店
           ice_cream: 冰淇淋
+          kindergarten: 幼稚園
           library: 圖書館
+          market: 市場
+          marketplace: 市場
           nightclub: 夜總會
+          nursery: 托兒所
           office: 辦公室
           park: 公園
+          parking: 停車場
           pharmacy: 藥房
           place_of_worship: 宗教場所
           police: 警察
           post_box: 郵箱
           post_office: 郵局
+          preschool: 學前教育
           prison: 監獄
           pub: 酒吧
           public_building: 公共建築
+          public_market: 市集
+          reception_area: 接待區
+          recycling: 回收點
+          restaurant: 餐廳
+          retirement_home: 安老院
           sauna: 桑拿
           school: 學校
+          shelter: 庇護所
+          shop: 商店
+          shopping: 購物
+          shower: 淋浴
+          social_centre: 社區中心
+          studio: 錄音室
           supermarket: 超級市場
           swimming_pool: 游泳池
           taxi: 出租車
           telephone: 公共電話
+          theatre: 劇院
           toilets: 洗手間
+          townhall: 市政廳
           university: 大學
+          vending_machine: 自動販賣機
+          veterinary: 獸醫
+          village_hall: 村公所
+          waste_basket: 垃圾桶
+          youth_centre: 青少年中心
+        boundary: 
+          administrative: 行政區邊界
+          census: 人口普查邊界
+          national_park: 國家公園
+          protected_area: 保護區
+        bridge: 
+          suspension: 懸索橋
+          viaduct: 高架橋
+          "yes": 橋
+        building: 
+          "yes": 建築物
+        highway: 
+          bus_stop: 巴士站
+          cycleway: 單車徑
+          milestone: 里程碑
+          residential: 住宅
+          rest_area: 休息區
         historic: 
+          battlefield: 戰場
+          boundary_stone: 界碑
+          building: 建築物
+          castle: 城堡
+          church: 教堂
+          fort: å ¡
+          house: 房屋
+          memorial: 紀念館
           museum: 博物館
         landuse: 
           cemetery: 墳場
+          commercial: 商業區
+          farm: 農場
+          forest: 森林
+          garages: 車庫
+          grass: 草地
+          industrial: 工業區
+          landfill: 垃圾埋填區
           military: 軍事區
+          nature_reserve: 自然保護區
+          park: 公園
           reservoir: 水庫
+          reservoir_watershed: 水庫集水區
+          residential: 住宅區
+          retail: 零售
+        leisure: 
+          beach_resort: 海灘度假村
+          fishing: 垂釣區
+          fitness_station: 健身站
+          garden: 花園
+          golf_course: 高爾夫球道
+          park: 公園
+          playground: 遊樂場
+          recreation_ground: 遊樂場
+          sauna: 桑拿
+          swimming_pool: 游泳池
         natural: 
           volcano: 火山
+        office: 
+          company: 公司
+          employment_agency: 就業中介
+          estate_agent: 地產代理
+          government: 政府辦事處
+          insurance: 保險
+          lawyer: 律師
+          ngo: 非政府組織辦公室
+          telecommunication: 電信辦公室
+          travel_agent: 旅行社
+          "yes": 辦公室
         place: 
           airport: 機場
+          city: 城市
+          country: 國家
+          county: 縣
+          farm: 農場
+          house: 房屋
+          houses: 房屋
+          island: 島
         railway: 
           construction: 建造中鐵路
+          light_rail: 輕鐵
+          monorail: 單軌
+          platform: 鐵路月臺
+          station: 火車站
+          subway: 地鐵站
+          subway_entrance: 地鐵出入口
           tram_stop: 電車站
         shop: 
+          antiques: 古玩店
+          art: 藝術品店
           bakery: 麵包店
           beauty: 美容店
+          beverages: 飲料店
           bicycle: 自行車店
           books: 書店
+          butcher: 屠夫
+          car: 車店
           car_parts: 汽車零件
           car_repair: 汽車維修
+          carpet: 地毯店
+          charity: 慈善商店
+          clothes: 服裝店
           computer: 電腦商店
+          confectionery: 糖果店
           convenience: 便利店
           copyshop: 複印店
           cosmetics: 化妝品店
           department_store: 百貨商店
           discount: 特價商品店
+          doityourself: DIY
           dry_cleaning: 乾洗
           electronics: 電子產品商店
           estate_agent: 地產代理
           fashion: 時裝店
           fish: 魚店
+          florist: 花店
           food: 食品店
           funeral_directors: 殮葬服務
           furniture: 傢俬
+          gallery: 畫廊
+          garden_centre: 園藝中心
+          general: 一般商店
           gift: 禮品店
+          grocery: 雜貨店
+          hardware: 五金店
           hifi: 音響店
           insurance: 保險
           jewelry: 珠寶店
           laundry: 洗衣房
           mobile_phone: 手機店
           motorcycle: 摩托車店
+          optician: 驗眼師
           organic: 有機食品店
+          outdoor: 戶外店
           pet: 寵物店
+          photo: 照相館
           shoes: 鞋店
           shopping_centre: 購物中心
           sports: 體育用品店
@@ -550,6 +697,7 @@ zh-TW:
           travel_agency: 旅行社
         tourism: 
           artwork: 美工
+          attraction: 景點
           camp_site: 營地
           guest_house: 賓館
           hostel: 旅舍
@@ -558,9 +706,13 @@ zh-TW:
           motel: 汽車旅館
           museum: 博物館
           picnic_site: 野餐地
+          theme_park: 主題公園
           zoo: 動物園
+        tunnel: 
+          "yes": 隧道
         waterway: 
           dam: 水壩
+          waterfall: 瀑布
   javascripts: 
     map: 
       base: 
@@ -640,7 +792,9 @@ zh-TW:
       text: 這這個翻譯頁面和 %{english_original_link} 在事件上有衝突時，英文(English)網頁會有較高的優先權
       title: 關於這個翻譯
     legal_babble: 
-      intro_1_html: "OpenStreetMap is <i>open data</i>, licensed under the <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
+      contributors_title_html: 我們的貢獻者
+      infringement_title_html: 侵犯版權
+      intro_1_html: OpenStreetMap為<i>開放資料</i>，以<a href="http://opendatacommons.org/licenses/odbl/">開放資料共用 開放資料庫</a>（ODbL）授權。
       more_title_html: 了解更多
       title_html: 版權與授權條款
     native: 
@@ -696,8 +850,6 @@ zh-TW:
       back_to_outbox: 回到寄件匣
       date: 日期
       from: 寄件者
-      reading_your_messages: 閱讀您的訊息
-      reading_your_sent_messages: 閱讀您寄出的訊息
       reply_button: 回覆
       subject: 主旨
       title: 閱讀訊息
@@ -761,7 +913,8 @@ zh-TW:
       header: "%{from_user} 透過 OpenStreetMap 寄給您主旨為 %{subject} 的訊息："
       hi: "%{to_user}您好，"
     signup_confirm: 
-      subject: "[OpenStreetMap] 確認您的電子郵件"
+      greeting: 您好！
+      subject: "[OpenStreetMap] 歡迎加入OpenStreetMap"
     signup_confirm_html: 
       current_user: 一份目前使用者的清單，以他們在世界上何處為基礎的分類，可在這裡取得：<a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>。
       get_reading: 在<a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"> wiki 中</a>閱讀更多關於 OpenStreetMap 的資料或透過 <a href="http://blog.openstreetmap.org/">OpenStreetMap 部落格</a>及 <a href="http://twitter.com/openstreetmap">Twitter</a> 了解最新的消息。或是瀏覽 OpenStreetMap 創始人 Steve Coast 的 <a href="http://www.opengeodata.org/">OpenGeoData blog</a> 了解這個計畫的歷史，其中也有 <a href="http://www.opengeodata.org/?cat=13">podcasts 可以聽</a>！
@@ -836,11 +989,13 @@ zh-TW:
       allow_write_gpx: 上傳 GPS 軌跡。
       allow_write_prefs: 修改他們的使用者偏好設定。
       authorize_url: 授權 URL：
+      confirm: 您確定嗎？
+      delete: 刪除用戶端
       edit: 編輯詳細資料
       key: 消費者金鑰：
       requests: 向使用者要求下列權限：
       secret: 消費者密鑰：
-      support_notice: 我們支援 HMAC-SHA1 (建議值) 和 ssl 模式的純文字。
+      support_notice: 我們支援 HMAC-SHA1 (建議) 和RSA-SHA1署名。
       title: "%{app_name} 的 OAuth 詳細資料"
       url: 要求記號 URL：
     update: 
@@ -848,6 +1003,14 @@ zh-TW:
   redaction: 
     edit: 
       description: 描述
+    new: 
+      description: 描述
+    show: 
+      confirm: 您確定嗎？
+      description: 描述：
+      user: 建立者：
+    update: 
+      flash: 已儲存更改。
   site: 
     edit: 
       anon_edits_link_text: 了解為什麼這很重要。
@@ -899,9 +1062,11 @@ zh-TW:
           motorway: 高速公路
           park: 公園
           primary: 主要道路
+          private: 私有
           rail: 鐵路
           reserve: 自然保留區
           resident: 住宅區
+          retail: 零售區
           runway: 
             - 機場跑道
             - 飛機滑行道
@@ -912,8 +1077,9 @@ zh-TW:
           station: 火車站
           subway: 地下鐵
           summit: 
-            - Summit
+            - 提交
             - peak
+          tourist: 旅遊景站
           track: 產業道路
           tram: 
             - 輕軌電車
@@ -1022,7 +1188,7 @@ zh-TW:
     trace_paging_nav: 
       newer: 較新軌跡
       older: 較舊軌跡
-      showing_page: 顯示頁面 %{page}
+      showing_page: 第%{page}頁
     view: 
       delete_track: 刪除這個軌跡
       description: 描述：
@@ -1059,6 +1225,8 @@ zh-TW:
       email never displayed publicly: (永遠不公開顯示)
       flash update success: 使用者資訊成功的更新。
       flash update success confirm needed: 使用者資訊成功的更新。請檢查您的電子郵件是否收到確認新電子郵件位址的通知。
+      gravatar: 
+        link text: 這是什麼？
       home location: 家的位置：
       image: 圖片：
       image size hint: （方形圖片至少 100x100 的效果最好）
@@ -1130,12 +1298,29 @@ zh-TW:
       lost password link: 忘記您的密碼？
       new to osm: 第一次來到 OpenStreetMap？
       no account: 還沒有帳號嗎？
+      openid: "%{logo} OpenID："
       openid invalid: 很抱歉，您的 OpenID 格式似乎不正確
       openid missing provider: 很抱歉，無法聯繫您的 OpenID 提供者
+      openid_logo_alt: 使用 OpenID 登入
       openid_providers: 
         aol: 
           alt: 使用 AOL OpenID 登入
           title: 使用 AOL 登入
+        google: 
+          alt: 使用 Google OpenID 登入
+          title: 使用 Google 登入
+        myopenid: 
+          alt: 使用 myOpenID OpenID 登入
+          title: 使用 myOpenID 登入
+        openid: 
+          alt: 使用 OpenID URL 登入
+          title: 使用 OpenID 登入
+        wordpress: 
+          alt: 使用 Wordpress OpenID 登入
+          title: 使用 Wordpress 登入
+        yahoo: 
+          alt: 使用 Yahoo OpenID 登入
+          title: 使用 Yahoo 登入
       password: 密碼：
       register now: 立即註冊
       remember: 記住我：
@@ -1160,7 +1345,7 @@ zh-TW:
       button: 加入朋友
       failed: 抱歉，無法將 %{name} 加入為朋友。
       heading: 將 %{user} 加為朋友？
-      success: "%{name} 現在成為您的朋友。"
+      success: "%{name} 現在成為您的朋友！"
     new: 
       confirm email address: 確認電子郵件位址：
       confirm password: 確認密碼：
@@ -1191,7 +1376,7 @@ zh-TW:
       your location: 您的位置
     remove_friend: 
       button: 移除朋友
-      heading: 將 %{user} 從朋友移除？
+      heading: 移除朋友%{user}？
       not_a_friend: "%{name} 並不在您的朋友裡。"
       success: "%{name} 已從您的朋友中移除。"
     reset_password: 
@@ -1225,7 +1410,7 @@ zh-TW:
       activate_user: 啟用這個使用者
       add as friend: 加入朋友
       ago: (%{time_in_words_ago} 之前)
-      block_history: 檢視接收到的區塊
+      block_history: 接受封禁
       blocks by me: 被我所阻擋
       blocks on me: 對我的阻擋
       comments: 評論
@@ -1244,12 +1429,12 @@ zh-TW:
       edits: 編輯
       email address: 電子郵件位址：
       hide_user: 隱藏這個使用者
-      if set location: 如果您設定了位置，一張漂亮的地圖和小指標會出現在下面。您可以在%{settings_link}頁面設定您的家位置。
+      if set location: 您可以在%{settings_link}頁面設定您家的位置，以查看附近的用戶。
       km away: "%{count} 公里遠"
       latest edit: 上次編輯於 %{ago}：
       m away: "%{count} 公尺遠"
       mapper since: 成為製圖者於：
-      moderator_history: 檢視阻擋來自
+      moderator_history: 執行封禁者
       my comments: 我的評論
       my diary: 我的日記
       my edits: 我的編輯
@@ -1330,7 +1515,7 @@ zh-TW:
       revoke: 註銷！
       revoker_name: 提出註銷者
       show: 顯示
-      showing_page: 顯示頁面 %{page}
+      showing_page: 第%{page}頁
       status: 狀態
     period: 
       one: 1 小時
diff --git a/lib/potlatch2.rb b/lib/potlatch2.rb
index 1c6c81cd4..67bc529a9 100644
--- a/lib/potlatch2.rb
+++ b/lib/potlatch2.rb
@@ -50,8 +50,8 @@ module Potlatch2
     "sk" => "sk",
     "sl" => "sl",
     "sq" => "sq",
-    "sr-EC" => "sr-ec",
-    "sr-EL" => "sr-el",
+    "sr" => "sr-ec",
+    "sr-Latn" => "sr-el",
     "sv" => "sv_SE",
     "ta" => "ta",
     "tl" => "tl",
diff --git a/test/functional/geocoder_controller_test.rb b/test/functional/geocoder_controller_test.rb
index b678125d2..3d80b038a 100644
--- a/test/functional/geocoder_controller_test.rb
+++ b/test/functional/geocoder_controller_test.rb
@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require File.dirname(__FILE__) + '/../test_helper'
 require 'geocoder_controller'
 
@@ -55,4 +57,174 @@ class GeocoderControllerTest < ActionController::TestCase
       { :controller => "geocoder", :action => "description_geonames" }
     )
   end
+
+  ##
+  # test the regular expressions that split search queries into 'latlon', 'us_postcode', and the like
+
+  # latlon examples/motivation from https://trac.openstreetmap.org/ticket/4730 & https://trac.openstreetmap.org/ticket/4748
+  def test_identify_latlon_degdec
+    ['50.06773 14.37742', '50.06773, 14.37742', '+50.06773 +14.37742', '+50.06773, +14.37742'].each do |code|
+      post :search, :query => code
+      assert_response :success
+      assert_equal ['latlon'], assigns(:sources)
+      assert_equal code, assigns(:query)
+    end
+  end
+
+  ##
+  # this is a test helper for rounding latlon strings to a specified precision, e.g., at a precision 
+  # of 5, "50.06773333333334, -14.377416666666667" will become "50.06773, -14.37742"
+  def assert_latlon_equal_round(expected, actual, precision)
+    assert_equal expected.split(',').map {|i| i.to_f.round(precision)}.join(', '), actual.split(',').map {|i| i.to_f.round(precision)}.join(', ')
+  end
+
+  def test_identify_latlon_degdec_nsew
+    target = '50.06773, 14.37742'
+    [
+        'N50.06773 E14.37742',
+        'N50.06773, E14.37742',
+        '50.06773N 14.37742E',
+        '50.06773N, 14.37742E'
+    ].each do |code|
+      post :search, :query => code
+      assert_response :success
+      assert_equal ['latlon'], assigns(:sources)
+      assert_equal target, assigns(:query)
+    end
+  end
+
+  def test_identify_latlon_ddm
+    target = '50.06773, 14.37742'
+    [
+        'N 50° 04.064 E 014° 22.645',
+        "N 50° 04.064' E 014° 22.645",
+        "N 50° 04.064', E 014° 22.645'",
+        'N50° 04.064 E14° 22.645',
+        'N 50 04.064 E 014 22.645',
+        'N50 4.064 E14 22.645',
+        "50° 04.064' N, 014° 22.645' E"
+    ].each do |code|
+      post :search, :query => code
+      assert_response :success
+      assert_equal ['latlon'], assigns(:sources)
+      assert_latlon_equal_round(target, assigns(:query), 5)
+    end
+  end
+
+  def test_identify_latlon_dms
+    target = '50.06773, 14.37742'
+    [
+        "N 50° 4' 03.828\" E 14° 22' 38.712\"",
+        "N 50° 4' 03.828\", E 14° 22' 38.712\"",
+        'N50 4 03.828 E14 22 38.712',
+        'N50 4 03.828, E14 22 38.712',
+        "50°4'3.828\"N 14°22'38.712\"E"
+    ].each do |code|
+      post :search, :query => code
+      assert_response :success
+      assert_equal ['latlon'], assigns(:sources)
+      assert_equal target, assigns(:query)
+    end
+  end
+
+  def test_identify_us_postcode
+    ['12345', '12345-6789'].each do |code|
+      post :search, query: code
+      assert_response :success
+      assert_equal ['us_postcode', 'osm_nominatim'], assigns(:sources)
+    end
+  end
+
+  def test_identify_uk_postcode
+    # examples from http://en.wikipedia.org/wiki/Postcodes_in_the_United_Kingdom
+    ['EC1A 1BB', 'W1A 1HQ', 'M1 1AA', 'B33 8TH', 'CR2 6XH', 'DN55 1PT'].each do |code|
+      post :search, query: code
+      assert_response :success
+      assert_equal ['uk_postcode', 'osm_nominatim'], assigns(:sources)
+    end
+  end
+
+  def test_identify_ca_postcode
+    post :search, query: 'A1B 2C3'
+    assert_response :success
+    assert_equal ['ca_postcode', 'osm_nominatim'], assigns(:sources)
+  end
+
+  def test_identify_fall_through_no_geonames
+    post :search, query: 'foo bar baz'
+    assert_response :success
+    assert_equal ['osm_nominatim'], assigns(:sources)
+  end
+
+  def test_ne
+    target = '50.06773, 14.37742'
+    [
+        "N 50° 04.064', E 014° 22.645'",
+        "N 50° 4' 03.828\", E 14° 22' 38.712\"",
+        "50°4'3.828\"N 14°22'38.712\"E",
+        "50° 04.064' N, 014° 22.645' E"
+    ].each do |code|
+      post :search, :query => code
+      assert_response :success
+      assert_equal ['latlon'], assigns(:sources)
+      assert_latlon_equal_round(target, assigns(:query), 5)
+    end
+  end
+
+  def test_nw
+    target = '50.06773, -14.37742'
+    [
+        "N 50° 04.064', W 014° 22.645'",
+        "N 50° 4' 03.828\", W 14° 22' 38.712\"",
+        "50°4'3.828\"N 14°22'38.712\"W",
+        "50° 04.064' N, 014° 22.645' W"
+    ].each do |code|
+      post :search, :query => code
+      assert_response :success
+      assert_equal ['latlon'], assigns(:sources)
+      assert_latlon_equal_round(target, assigns(:query), 5)
+    end
+  end
+
+  def test_se
+    target = '-50.06773, 14.37742'
+    [
+        "S 50° 04.064', E 014° 22.645'",
+        "S 50° 4' 03.828\", E 14° 22' 38.712\"",
+        "50°4'3.828\"S 14°22'38.712\"E",
+        "50° 04.064' S, 014° 22.645' E"
+    ].each do |code|
+      post :search, :query => code
+      assert_response :success
+      assert_equal ['latlon'], assigns(:sources)
+      assert_latlon_equal_round(target, assigns(:query), 5)
+    end
+  end
+
+  def test_sw
+    target = '-50.06773, -14.37742'
+    [
+        "S 50° 04.064', W 014° 22.645'",
+        "S 50° 4' 03.828\", W 14° 22' 38.712\"",
+        "50°4'3.828\"S 14°22'38.712\"W",
+        "50° 04.064' S, 014° 22.645' W"
+    ].each do |code|
+      post :search, :query => code
+      assert_response :success
+      assert_equal ['latlon'], assigns(:sources)
+      assert_latlon_equal_round(target, assigns(:query), 5)
+    end
+  end
+
+  def test_primes_and_double_primes
+    target = '50.06773, -14.37742'
+    [
+        "N 50° 4′ 03.828″, W 14° 22′ 38.712″"
+    ].each do |code|
+      post :search, :query => code
+      assert_response :success
+      assert_equal ['latlon'], assigns(:sources)
+      assert_equal target, assigns(:query)
+    end
+  end
 end
diff --git a/vendor/assets/potlatch2/potlatch2/assets.zip b/vendor/assets/potlatch2/potlatch2/assets.zip
index 7193f69f7..f4b206ece 100644
Binary files a/vendor/assets/potlatch2/potlatch2/assets.zip and b/vendor/assets/potlatch2/potlatch2/assets.zip differ