From: Kai Krueger <kakrueger@gmail.com>
Date: Sat, 23 Jan 2010 15:31:01 +0000 (+0000)
Subject: merge 19364:19600 of rails_port into the openID branch
X-Git-Tag: live~6438
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/84db1d66b7d819a4a777d2b9e5909cffe82c514e?hp=45f12aa99e9f9634b5494c9f56a5a92168c62305

merge 19364:19600 of rails_port into the openID branch

renamed migration 049_add_open_id_authentication_tables.rb to
050_add_open_id_authentication_tables.rb
---

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index acadfcc25..6750b5d8e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -208,9 +208,11 @@ class ApplicationController < ActionController::Base
   end
 
   def api_call_timeout
-    Timeout::timeout(APP_CONFIG['api_timeout'], OSM::APITimeoutError) do
+    SystemTimer.timeout_after(APP_CONFIG['api_timeout']) do
       yield
     end
+  rescue Timeout::Error
+    raise OSM::APITimeoutError
   end
 
   ##
@@ -226,6 +228,8 @@ class ApplicationController < ActionController::Base
       case
       when user.nil? then user = :none
       when user.display_name == controller.params[:display_name] then user = :self
+      when user.administrator? then user = :administrator
+      when user.moderator? then user = :moderator
       else user = :other
       end
 
@@ -240,10 +244,16 @@ class ApplicationController < ActionController::Base
   ##
   # extend expire_action to expire all variants
   def expire_action(options = {})
-    path = fragment_cache_key(options).gsub('?', '.').gsub(':', '.')
+    path = ActionCachePath.path_for(self, options, false).gsub('?', '.').gsub(':', '.')
     expire_fragment(Regexp.new(Regexp.escape(path) + "\\..*"))
   end
 
+  ##
+  # is the requestor logged in?
+  def logged_in?
+    !@user.nil?
+  end
+
 private 
 
   # extract authorisation credentials from headers, returns user = nil if none
diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index 96cec3943..a77b0f94a 100644
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -81,9 +81,15 @@ class BrowseController < ApplicationController
 private
 
   def timeout
-    Timeout::timeout(30) do
+    SystemTimer.timeout_after(30) do
       yield
     end
+  rescue ActionView::TemplateError => ex
+    if ex.original_exception.is_a?(Timeout::Error)
+      render :action => "timeout", :status => :request_timeout
+    else
+      raise
+    end
   rescue Timeout::Error
     render :action => "timeout", :status => :request_timeout
   end
diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index 4c4ec60a7..ea107c2b5 100644
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -15,6 +15,12 @@ class TraceController < ApplicationController
   before_filter :offline_redirect, :only => [:create, :edit, :delete, :data, :api_data, :api_create]
   around_filter :api_call_handle_error, :only => [:api_details, :api_data, :api_create]
 
+  caches_action :list, :unless => :logged_in?, :layout => false
+  caches_action :view, :layout => false
+  caches_action :georss, :layout => true
+  cache_sweeper :trace_sweeper, :only => [:create, :edit, :delete, :api_create]
+  cache_sweeper :tracetag_sweeper, :only => [:create, :edit, :delete, :api_create]
+
   # Counts and selects pages of GPX traces for various criteria (by user, tags, public etc.).
   #  target_user - if set, specifies the user to fetch traces for.  if not set will fetch all traces
   def list(target_user = nil, action = "list")
@@ -75,11 +81,15 @@ class TraceController < ApplicationController
     conditions[0] += " AND gpx_files.visible = ?"
     conditions << true
 
-    @trace_pages, @traces = paginate(:traces,
-                                     :include => [:user, :tags],
-                                     :conditions => conditions,
-                                     :order => "gpx_files.timestamp DESC",
-                                     :per_page => 20)
+    @page = (params[:page] || 1).to_i
+    @page_size = 20
+
+    @traces = Trace.find(:all,
+                         :include => [:user, :tags],
+                         :conditions => conditions,
+                         :order => "gpx_files.timestamp DESC",
+                         :offset => (@page - 1) * @page_size,
+                         :limit => @page_size)
 
     # put together SET of tags across traces, for related links
     tagset = Hash.new
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 3a4b00920..f9bbd5dd5 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -16,6 +16,8 @@ class UserController < ApplicationController
 
   filter_parameter_logging :password, :pass_crypt, :pass_crypt_confirmation
   
+  cache_sweeper :user_sweeper, :only => [:account, :hide, :unhide, :delete]
+
   def save
     @title = t 'user.new.title'
 
diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 7fc276042..1f3d39808 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -84,7 +84,7 @@ class Notifier < ActionMailer::Base
          :replyurl => url_for(:host => SERVER_URL,
                               :controller => "message",
                               :action => "new",
-                              :user_id => comment.user.id,
+                              :display_name => comment.user.display_name,
                               :title => "Re: #{comment.diary_entry.title}")
   end
 
diff --git a/app/models/trace_sweeper.rb b/app/models/trace_sweeper.rb
new file mode 100644
index 000000000..52780f9e4
--- /dev/null
+++ b/app/models/trace_sweeper.rb
@@ -0,0 +1,28 @@
+class TraceSweeper < ActionController::Caching::Sweeper
+  observe Trace
+
+  def after_create(record)
+    expire_cache_for(record)
+  end
+
+  def after_update(record)
+    expire_cache_for(record)
+  end
+
+  def after_destroy(record)
+    expire_cache_for(record)
+  end
+
+private
+
+  def expire_cache_for(record)
+    expire_action(:controller => 'trace', :action => 'view', :id => record.id)
+    expire_action(:controller => 'trace', :action => 'view', :display_name => record.user.display_name, :id => record.id)
+
+    expire_action(:controller => 'trace', :action => 'list', :display_name => nil, :tag => nil)
+    expire_action(:controller => 'trace', :action => 'list', :display_name => record.user.display_name, :tag => nil)
+
+    expire_action(:controller => 'trace', :action => 'georss', :display_name => nil, :tag => nil)
+    expire_action(:controller => 'trace', :action => 'georss', :display_name => record.user.display_name, :tag => nil)
+  end
+end
diff --git a/app/models/tracetag_sweeper.rb b/app/models/tracetag_sweeper.rb
new file mode 100644
index 000000000..f9de1dd82
--- /dev/null
+++ b/app/models/tracetag_sweeper.rb
@@ -0,0 +1,25 @@
+class TracetagSweeper < ActionController::Caching::Sweeper
+  observe Tracetag
+
+  def after_create(record)
+    expire_cache_for(record)
+  end
+
+  def after_update(record)
+    expire_cache_for(record)
+  end
+
+  def after_destroy(record)
+    expire_cache_for(record)
+  end
+
+private
+
+  def expire_cache_for(record)
+    expire_action(:controller => 'trace', :action => 'list', :display_name => nil, :tag => record.tag)
+    expire_action(:controller => 'trace', :action => 'list', :display_name => record.trace.user.display_name, :tag => record.tag)
+
+    expire_action(:controller => 'trace', :action => 'georss', :display_name => nil, :tag => record.tag)
+    expire_action(:controller => 'trace', :action => 'georss', :display_name => record.trace.user.display_name, :tag => record.tag)
+  end
+end
diff --git a/app/models/user_sweeper.rb b/app/models/user_sweeper.rb
new file mode 100644
index 000000000..84373be74
--- /dev/null
+++ b/app/models/user_sweeper.rb
@@ -0,0 +1,51 @@
+class UserSweeper < ActionController::Caching::Sweeper
+  observe User
+
+  def before_update(record)
+    expire_cache_for(User.find(record.id), record)
+  end
+
+  def before_destroy(record)
+    expire_cache_for(record, nil)
+  end
+
+private
+
+  def expire_cache_for(old_record, new_record)
+    if old_record and
+        (new_record.nil? or
+         old_record.visible != new_record.visible or
+         old_record.display_name != new_record.display_name)
+      old_record.diary_entries.each do |entry|
+        expire_action(:controller => 'diary_entry', :action => 'view', :id => entry.id)
+        expire_action(:controller => 'diary_entry', :action => 'list', :language => entry.language_code, :display_name => nil)
+        expire_action(:controller => 'diary_entry', :action => 'rss', :language => entry.language_code, :display_name => nil)
+      end
+
+      expire_action(:controller => 'diary_entry', :action => 'list', :language => nil, :display_name => nil)
+      expire_action(:controller => 'diary_entry', :action => 'list', :language => nil, :display_name => old_record.display_name)
+
+      expire_action(:controller => 'diary_entry', :action => 'rss', :language => nil, :display_name => nil)
+      expire_action(:controller => 'diary_entry', :action => 'rss', :language => nil, :display_name => old_record.display_name)
+
+      old_record.traces.each do |trace|
+        expire_action(:controller => 'trace', :action => 'view', :id => trace.id)
+        expire_action(:controller => 'trace', :action => 'view', :display_name => old_record.display_name, :id => trace.id)
+
+        trace.tags.each do |tag|
+          expire_action(:controller => 'trace', :action => 'list', :display_name => nil, :tag => tag.tag)
+          expire_action(:controller => 'trace', :action => 'list', :display_name => old_record.display_name, :tag => tag.tag)
+
+          expire_action(:controller => 'trace', :action => 'georss', :display_name => nil, :tag => tag.tag)
+          expire_action(:controller => 'trace', :action => 'georss', :display_name => old_record.display_name, :tag => tag.tag)
+        end
+      end
+
+      expire_action(:controller => 'trace', :action => 'list', :display_name => nil, :tag => nil)
+      expire_action(:controller => 'trace', :action => 'list', :display_name => old_record.display_name, :tag => nil)
+
+      expire_action(:controller => 'trace', :action => 'georss', :display_name => nil, :tag => nil)
+      expire_action(:controller => 'trace', :action => 'georss', :display_name => old_record.display_name, :tag => nil)
+    end
+  end
+end
diff --git a/app/views/trace/_trace_paging_nav.html.erb b/app/views/trace/_trace_paging_nav.html.erb
index 9ac80d4cd..c338a1469 100644
--- a/app/views/trace/_trace_paging_nav.html.erb
+++ b/app/views/trace/_trace_paging_nav.html.erb
@@ -1,12 +1,17 @@
-<% current_page = @trace_pages.current_page %>
+<p>
 
-<%= t'trace.trace_paging_nav.showing' %> 
-<%= current_page.number %> (<%= current_page.first_item %><% 
-if (current_page.first_item < current_page.last_item) # if more than 1 trace on page 
-  %>-<%= current_page.last_item %><% 
-end %>
-<%= t'trace.trace_paging_nav.of' %> <%= @trace_pages.item_count %>)
+<% if @page > 1 %>
+<%= link_to t('trace.trace_paging_nav.previous'), params.merge({ :page => @page - 1 }) %>
+<% else %>
+<%= t('trace.trace_paging_nav.previous') %>
+<% end %>
+
+| <%= t('trace.trace_paging_nav.showing_page', :page => @page) %> |
 
-<% if @trace_pages.page_count > 1 %>
- | <%= pagination_links_each(@trace_pages, {}) { |n| link_to_page(n) } %>
+<% if @traces.size < @page_size %>
+<%= t('trace.trace_paging_nav.next') %>
+<% else %>
+<%= link_to t('trace.trace_paging_nav.next'), params.merge({ :page => @page + 1 }) %>
 <% end %>
+
+</p>
diff --git a/config/environment.rb b/config/environment.rb
index da71cc572..70a1ddbd5 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -42,7 +42,7 @@ Rails::Initializer.run do |config|
     config.frameworks -= [ :active_record ]
   end
 
-  # Specify gems that this application depends on. 
+  # Specify gems that this application depends on.
   # They can then be installed with "rake gems:install" on new installations.
   # config.gem "bj"
   # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
@@ -53,8 +53,9 @@ Rails::Initializer.run do |config|
   config.gem 'oauth', :version => '>= 0.3.6'
   config.gem 'httpclient'
   config.gem 'ruby-openid', :lib => 'openid', :version => '>=2.0.4'
+  config.gem 'SystemTimer', :version => '>= 1.1.3', :lib => 'system_timer'
 
-  # Only load the plugins named here, in the order given. By default, all plugins 
+  # Only load the plugins named here, in the order given. By default, all plugins
   # in vendor/plugins are loaded in alphabetical order.
   # :all can be used as a placeholder for all plugins not explicitly named
   # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
@@ -71,7 +72,7 @@ Rails::Initializer.run do |config|
 
   # Your secret key for verifying cookie session data integrity.
   # If you change this key, all old sessions will become invalid!
-  # Make sure the secret is at least 30 characters and all random, 
+  # Make sure the secret is at least 30 characters and all random,
   # no regular words or you'll be exposed to dictionary attacks.
   config.action_controller.session = {
     :session_key => '_osm_session',
diff --git a/config/initializers/abstract_adapter.rb b/config/initializers/abstract_adapter.rb
index 24d7c56e1..5cc24d25c 100644
--- a/config/initializers/abstract_adapter.rb
+++ b/config/initializers/abstract_adapter.rb
@@ -15,6 +15,8 @@ module ActiveRecord
       rescue ActiveRecord::StatementInvalid => ex
         if ex.message =~ /^OSM::APITimeoutError: /
           raise OSM::APITimeoutError.new
+        elsif ex.message =~ /^Timeout::Error: /
+          raise Timeout::Error.new("time's up!")
         else
           raise
         end
diff --git a/config/locales/af.yml b/config/locales/af.yml
index 3c8345ac5..3c5d9d323 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -685,9 +685,6 @@ af:
       see_your_traces: Sien al u spore
     trace_optionals: 
       tags: Etikette
-    trace_paging_nav: 
-      of: van
-      showing: Wys bladsy
     view: 
       delete_track: Verwyder hierdie spoor
       description: "Beskrywing:"
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 3d43e7c65..1bdabfbb1 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -220,6 +220,13 @@ ar:
       zoom_or_select: قم بالتكبير أو اختر منطقة من الخريطة لعرضها
     tag_details: 
       tags: "الوسوم:"
+    timeout: 
+      sorry: عذرًا، بيانات {{type}} بالمعرّف {{id}} استغرقت وقتًا طويلا للاسترداد.
+      type: 
+        changeset: حزمة التغييرات
+        node: العقدة
+        relation: العلاقة
+        way: الطريق
     way: 
       download: "{{download_xml_link}}، {{view_history_link}} أو {{edit_link}}"
       download_xml: نزّل إكس إم إل
@@ -395,6 +402,7 @@ ar:
       other: حوالي {{count}}كم
       zero: أقل من 1 كم
     results: 
+      more_results: المزيد من النتائج
       no_results: لم يتم العثور على نتائج
     search: 
       title: 
@@ -1285,8 +1293,9 @@ ar:
     trace_optionals: 
       tags: الوسوم
     trace_paging_nav: 
-      of: من
-      showing: إظهار الصفحة
+      next: التالي &raquo;
+      previous: "&laquo; السابق"
+      showing_page: إظهار الصفحة {{page}}
     view: 
       delete_track: احذف هذا الأثر
       description: "الوصف:"
diff --git a/config/locales/arz.yml b/config/locales/arz.yml
index 5ba43d9e2..c49bdbfa9 100644
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@@ -1224,9 +1224,6 @@ arz:
       traces_waiting: لديك {{count}} أثر فى انتظار التحميل. يرجى مراعاه الانتظار قبل تحميل أكثر من ذلك، بحيث تتجنب إعاقه طابور التحميل لباقى المستخدمين.
     trace_optionals: 
       tags: الوسوم
-    trace_paging_nav: 
-      of: من
-      showing: إظهار الصفحة
     view: 
       delete_track: احذف هذا الأثر
       description: "الوصف:"
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 7822d26f5..b176549b5 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -541,9 +541,6 @@ be:
       traces_waiting: У вас {{count}} трэкаў у чарзе. Калі ласка, пачакайце, пакуль яны будуць апрацаваныя, каб не блакірваць чаргу для астатніх карстальнікаў.
     trace_optionals: 
       tags: Цэтлікі
-    trace_paging_nav: 
-      of: з
-      showing: Прагляд старонкі
     view: 
       delete_track: Выдаліць гэты трэк
       description: "Апісанне:"
diff --git a/config/locales/br.yml b/config/locales/br.yml
index b107e641d..2342aa496 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -1271,9 +1271,6 @@ br:
       traces_waiting: Bez' hoc'h eus {{count}} roud a c'hortoz bezañ kaset. Gwell e vefe gortoz a-raok kas re all, evit chom hep stankañ al lostennad evit an implijerien all.
     trace_optionals: 
       tags: Balizennoù
-    trace_paging_nav: 
-      of: eus
-      showing: O tiskouez ar bajenn
     view: 
       delete_track: Dilemel ar roudenn-mañ
       description: "Deskrivadur :"
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 6131c7a73..6379d3763 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: syck
 # Author: Bilbo
+# Author: Masox
 # Author: Mormegil
 cs: 
   activerecord: 
@@ -156,17 +157,22 @@ cs:
         node: Uzel
         relation: Relace
         way: Cesta
+    start: 
+      manually_select: Ručně vybrat jinou oblast
+      view_data: Ukázat data k zobrazené mapě
     start_rjs: 
       data_frame_title: Data
       data_layer_name: Data
       details: Detaily
       drag_a_box: Myší na mapě označte zvolenou oblast
+      edited_by_user_at_timestamp: Upravil [[user]] dne [[timestamp]]
       history_for_feature: Historie pro [[feature]]
       load_data: Nahrát data
       loaded_an_area_with_num_features: Máte načtenu oblast, která obsahuje [[num_features]] prvků. Některé prohlížeče mohou mít potíže při zobrazování takového množství dat. Obecně fungují prohlížeče nejlépe při zobrazování ne více než sta prvků současně – větší množství může způsobit, že bude prohlížeč reagovat pomalu či vůbec. Pokud jste si jisti, že chcete tato data zobrazit, klikněte na tlačítko níže.
       loading: Načítá se…
       manually_select: Ručně vybrat jinou oblast
       object_list: 
+        api: Získat tuto oblast pomocí API
         back: Zobrazit seznam objektů
         details: Detaily
         heading: Seznam objektů
@@ -187,6 +193,13 @@ cs:
       zoom_or_select: Zvolte větší měřítko nebo vyberte nějakou oblast mapy
     tag_details: 
       tags: "Tagy:"
+    timeout: 
+      sorry: Promiňte, ale načítání dat {{type}} číslo {{id}} trvalo příliš dlouho.
+      type: 
+        changeset: sady změn
+        node: uzlu
+        relation: relace
+        way: cesty
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} nebo {{edit_link}}"
       download_xml: Stáhnout XML
@@ -235,11 +248,28 @@ cs:
       title_user: Sady změn uživatele {{user}}
       title_user_bbox: Sady změn uživatele {{user}} v {{bbox}}
   diary_entry: 
+    diary_entry: 
+      comment_count: 
+        few: "{{count}} komentáře"
+        one: 1 komentář
+        other: "{{count}} komentářů"
+      comment_link: Okomentovat tento zápis
+      posted_by: Zapsal {{link_user}} v {{created}} v jazyce {{language_link}}
+      reply_link: Odpovědět na tento zápis
     edit: 
       language: "Jazyk:"
       save_button: Uložit
       subject: "Předmět:"
       use_map_link: použít mapu
+    feed: 
+      language: 
+        description: Aktuální záznamy v deníčcích uživatelů OpenStreetMap v jazyce {{language_name}}
+        title: Deníčkové záznamy OpenStreetMap v jazyce {{language_name}}
+    list: 
+      in_language_title: Deníčkové záznamy v jazyce {{language}}
+      recent_entries: "Aktuální deníčkové záznamy:"
+      title: Deníčky uživatelů
+      user_title: Deníček uživatele {{user}}
     no_such_user: 
       heading: Uživatel {{user}} neexistuje
     view: 
@@ -247,6 +277,7 @@ cs:
       login: Přihlaste se
       login_to_leave_a_comment: "{{login_link}} k zanechání komentáře"
       save_button: Uložit
+      title: Deníčky uživatelů | {{user}}
   export: 
     start: 
       add_marker: Přidat do mapy značku
@@ -260,6 +291,7 @@ cs:
       latitude: "Šířka:"
       licence: Licence
       longitude: "Délka:"
+      manually_select: Ručně vybrat jinou oblast
       mapnik_image: Obrázek z Mapniku
       max: max.
       options: Nastavení
@@ -306,11 +338,52 @@ cs:
         geonames: Výsledky z <a href="http://www.geonames.org/">GeoNames</a>
         latlon: Výsledky z <a href="http://openstreetmap.org/">interní databáze</a>
         osm_namefinder: Výsledky z <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        osm_nominatim: Výsledky z <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
         uk_postcode: Výsledky z <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Výsledky z <a href="http://geocoder.us/">Geocoder.us</a>
     search_osm_namefinder: 
       suffix_parent: "{{suffix}} ({{parentdistance}} na {{parentdirection}} od {{parentname}})"
       suffix_place: ", {{distance}} na {{direction}} od {{placename}}"
+    search_osm_nominatim: 
+      prefix: 
+        leisure: 
+          garden: Zahrada
+          miniature_golf: Minigolf
+          park: Park
+        place: 
+          airport: Letiště
+          city: Velkoměsto
+          country: Stát
+          farm: Farma
+          hamlet: Osada
+          house: Dům
+          houses: Budovy
+          island: Ostrov
+          locality: Oblast
+          municipality: Obecní úřad
+          postcode: PSČ
+          region: Region
+          sea: Moře
+          state: Stát
+          town: Město
+          village: Vesnice
+        tourism: 
+          alpine_hut: Vysokohorská chata
+          attraction: Turistická atrakce
+          camp_site: Tábořiště, kemp
+          caravan_site: Autokemping
+          chalet: Velká chata
+          guest_house: Penzion
+          hostel: Hostel
+          hotel: Hotel
+          information: Turistické informace
+          lean_to: Přístřešek
+          motel: Motel
+          museum: Muzeum
+          theme_park: Zábavní park
+          valley: Údolí
+          viewpoint: Místo s dobrým výhledem
+          zoo: Zoo
   javascripts: 
     map: 
       base: 
@@ -505,24 +578,34 @@ cs:
       close: Zavřít
       search_results: Výsledky vyhledávání
   trace: 
+    create: 
+      trace_uploaded: Váš GPX soubor byl uložen a čeká na zařazení do databáze. Obvykle to netrvá víc jak půl hodiny. Až bude zařazen, budete informováni emailem.
+      upload_trace: Nahrát GPS záznam
     edit: 
       description: "Popis:"
       download: stáhnout
       edit: upravit
       filename: "Název souboru:"
+      heading: Úprava GPS záznamu {{name}}
       map: mapa
       owner: "Vlastník:"
+      points: "Body:"
       save_button: Uložit změny
+      start_coord: "Souřadnice začátku:"
       tags: "Tagy:"
       tags_help: oddělené čárkou
       uploaded_at: "Nahráno v:"
       visibility: "Viditelnost:"
       visibility_help: co tohle znamená?
+    list: 
+      your_traces: Vaše GPS záznamy
     no_such_user: 
       heading: Uživatel {{user}} neexistuje
     trace: 
       ago: před {{time_in_words_ago}}
+      count_points: "{{count}} body"
       edit: upravit
+      edit_map: Upravit mapu
       in: v
       map: mapa
       more: více
@@ -536,11 +619,14 @@ cs:
       upload_gpx: Nahrát GPX soubor
       visibility: Viditelnost
       visibility_help: co tohle znamená?
+    trace_header: 
+      see_all_traces: Zobrazit všechny GPS záznamy
+      see_just_your_traces: Zobrazit pouze vaše GPS záznamy nebo nahrát nový GPS záznam
+      see_your_traces: Zobrazit všechny vaše GPS záznamy
     trace_optionals: 
       tags: Tagy
     trace_paging_nav: 
-      of: z
-      showing: Zobrazuji stranu
+      showing_page: Zobrazuji stranu {{page}}
     view: 
       description: "Popis:"
       download: stáhnout
@@ -549,8 +635,14 @@ cs:
       map: mapa
       owner: "Vlastník:"
       tags: "Tagy:"
+      trace_not_found: GPS záznam nenalezen!
       uploaded: "Nahráno v:"
       visibility: "Viditelnost:"
+    visibility: 
+      identifiable: Identifikovatelný (zobrazuje se v seznamu a jako identifikovatelné, uspořádané body s časovou značkou)
+      private: Soukromý (dostupná jedině jako anonymní, neuspořádané body)
+      public: Veřejný (zobrazuje se v seznamu i jako anonymní, neuspořádané body)
+      trackable: Trackable (dostupný jedině jako anonymní, uspořádané body s časovými značkami)
   user: 
     account: 
       email never displayed publicly: (nikde se veřejně nezobrazuje)
@@ -559,6 +651,7 @@ cs:
       longitude: "Délka:"
       make edits public button: Zvěřejnit všechny moje úpravy
       my settings: Moje nastavení
+      no home location: Nezadali jste polohu svého bydliště.
       preferred languages: "Preferované jazyky:"
       profile description: "Popis profilu:"
       public editing: 
@@ -575,6 +668,8 @@ cs:
       button: Potvrdit
     confirm_email: 
       button: Potvrdit
+      failure: Tento kód byl už pro potvrzení e-mailové adresy použit.
+      success: Vaše e-mailová adresa byla potvrzena, děkujeme za registraci!
     friend_map: 
       nearby mapper: "Nedaleký uživatel: [[nearby_user]]"
       your location: Vaše poloha
@@ -625,6 +720,7 @@ cs:
     reset_password: 
       confirm password: "Potvrdit heslo:"
       flash changed: Vaše heslo bylo změněno.
+      flash token bad: Odpovídající kód nebyl nalezen, možná zkontrolujte URL?
       heading: Vyresetovat heslo pro {{user}}
       password: "Heslo:"
       reset: Vyresetovat heslo
@@ -637,6 +733,7 @@ cs:
       ago: (před {{time_in_words_ago}})
       blocks on me: moje zablokování
       change your settings: změnit vaše nastavení
+      confirm: Potvrdit
       delete image: Smazat obrázek
       description: Popis
       diary: deníček
@@ -660,3 +757,8 @@ cs:
       user image heading: Obrázek uživatele
       user location: Pozice uživatele
       your friends: Vaši přátelé
+  user_role: 
+    grant: 
+      confirm: Potvrdit
+    revoke: 
+      confirm: Potvrdit
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 55f0b9ea8..d55c92850 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -6,18 +6,26 @@
 da: 
   activerecord: 
     attributes: 
+      diary_comment: 
+        body: Brødtekst
       diary_entry: 
+        language: Sprog
+        latitude: Breddegrad
+        longitude: Længdegrad
         title: Titel
         user: Bruger
       friend: 
         friend: Ven
         user: Bruger
       message: 
+        body: Brødtekst
         recipient: Modtager
         sender: Afsender
         title: Titel
       trace: 
         description: Beskrivelse
+        latitude: Breddegrad
+        longitude: Længdegrad
         name: Navn
         public: Offentlig
         size: Størrelse
@@ -28,7 +36,7 @@ da:
         description: Beskrivelse
         email: E-mail
         languages: Sprog
-        pass_crypt: Kodeord
+        pass_crypt: Adgangskode
     models: 
       country: Land
       diary_comment: Dagbogskommentar
@@ -92,6 +100,7 @@ da:
       loading: Indlæsning...
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} eller {{edit_link}}"
+      download_xml: Hent XML
       edit: redigér
       node: Punkt
       node_title: "Punkt: {{node_name}}"
@@ -101,6 +110,7 @@ da:
       part_of: "Del af:"
     node_history: 
       download: "{{download_xml_link}} eller {{view_details_link}}"
+      download_xml: Hent XML
       node_history: Punkthistorik
       node_history_title: "Punkthistorik: {{node_name}}"
       view_details: vis detaljer
@@ -125,6 +135,7 @@ da:
       part_of: "Del af:"
     relation_history: 
       download: "{{download_xml_link}} eller {{view_details_link}}"
+      download_xml: Hent XML
       relation_history: Relationshistorik
       relation_history_title: "Relationshistorik: {{relation_name}}"
       view_details: vis detaljer
@@ -144,6 +155,7 @@ da:
       drag_a_box: Træk en kasse på kortet for at vælge et område
       edited_by_user_at_timestamp: Redigeret af [[user]], [[timestamp]]
       history_for_feature: Historik for [[feature]]
+      load_data: Indlæs data
       loaded_an_area_with_num_features: "Du har indlæst et område som indeholder [[num_features]] objekter. Nogle browsere kan have problemer ved håndtering af så meget data. Browsere fungerer generelt bedst med mindre end 100 objekter ad gangen: flere objekter kan gøre at din browser bliver langsom. Hvis du er sikker på, at du vil se alle disse data, så klik på knappen nedenfor."
       loading: Indlæsning...
       manually_select: Vælg et andet område manuelt
@@ -172,6 +184,7 @@ da:
       tags: "Egenskaber:"
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} eller {{edit_link}}"
+      download_xml: Hent XML
       edit: redigér
       view_history: vis historik
       way: Vej
@@ -184,6 +197,7 @@ da:
       part_of: "Del af:"
     way_history: 
       download: "{{download_xml_link}} eller {{view_details_link}}"
+      download_xml: Hent XML
       view_details: vis detaljer
       way_history: Vejhistorik
       way_history_title: "Vejhistorik: {{way_name}}"
@@ -211,6 +225,8 @@ da:
       confirm: Bekræft
     edit: 
       language: "Sprog:"
+      latitude: "Breddegrad:"
+      longitude: "Længdegrad:"
       save_button: Gem
       subject: "Emne:"
       use_map_link: brug kort
@@ -218,13 +234,17 @@ da:
     start: 
       add_marker: Tilføj en markør på kortet
       area_to_export: Område at eksportere
+      embeddable_html: HTML-kode
       export_button: Eksportér
       format: "Format:"
       format_to_export: Format for eksport
       image_size: "Billedestørrelse:"
+      latitude: "Bredde:"
       licence: Licens
+      longitude: "Længde:"
       manually_select: Vælg et andet område manuelt
       mapnik_image: Mapnik billede
+      max: maks
       osm_xml_data: OpenStreetMap XML-data
       osmarender_image: Osmarender billede
       scale: Skala
@@ -238,6 +258,8 @@ da:
       manually_select: Vælg et andet område manuelt
       view_larger_map: Vis større kort
   geocoder: 
+    description_osm_namefinder: 
+      prefix: "{{distance}} {{direction}} for {{type}}"
     direction: 
       east: øst
       north: nord
@@ -253,6 +275,15 @@ da:
       zero: mindre end 1 km
     results: 
       no_results: Ingen resultater fundet
+    search: 
+      title: 
+        ca_postcode: Resultater fra <a href="http://geocoder.ca/">Geocoder.CA</a>
+        geonames: Resultater fra <a href="http://www.geonames.org/">GeoNames</a>
+        latlon: Resultater for koordinater
+        osm_namefinder: Resultater fra <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        osm_nominatim: Resultater fra <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
+        uk_postcode: Resultater fra <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
+        us_postcode: Resultater fra <a href="http://geocoder.us/">Geocoder.us</a>
     search_osm_namefinder: 
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} for {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} for {{placename}}"
@@ -330,6 +361,7 @@ da:
       unread_button: Marker som ulæst
     new: 
       back_to_inbox: Tilbage til indbakke
+      body: Brødtekst
       limit_exceeded: Du har sendt mange beskeder på det sidste. Vent venligst lidt før du forsøger at sende flere.
       message_sent: Besked sendt
       send_button: Send
@@ -367,7 +399,9 @@ da:
       delete_button: Slet
   site: 
     key: 
-      map_key: Kortnøgle
+      map_key: Signaturforklaring
+      table: 
+        heading: Signaturforklaring for z{{zoom_level}}
     search: 
       search: Søg
       where_am_i: Hvor er jeg?
@@ -381,6 +415,7 @@ da:
       scheduled_for_deletion: Spor planlagt for sletning
     edit: 
       description: "Beskrivelse:"
+      download: hent
       edit: redigér
       filename: "Filnavn:"
       heading: Redigerer spor {{name}}
@@ -417,13 +452,15 @@ da:
       count_points: "{{count}} punkter"
       edit: redigér
       edit_map: Redigér kort
+      identifiable: IDENTIFICERBAR
       in: i
       map: kort
-      more: mere
+      more: detaljer
       pending: VENTENDE
       private: PRIVAT
       public: OFFENTLIG
       trace_details: Vis spordetaljer
+      trackable: SPORBAR
       view_map: Vis kort
     trace_form: 
       description: "Beskrivelse:"
@@ -442,11 +479,13 @@ da:
     trace_optionals: 
       tags: Egenskaber
     trace_paging_nav: 
-      of: af
-      showing: Viser side
+      next: Næste &raquo;
+      previous: "&laquo; Forrige"
+      showing_page: Viser side {{page}}
     view: 
       delete_track: Slet dette spor
       description: "Beskrivelse:"
+      download: hent
       edit: redigér
       edit_track: Rediger dette spor
       filename: "Filnavn:"
@@ -472,6 +511,8 @@ da:
       email never displayed publicly: (vises aldrig offentligt)
       flash update success: Brugerinformation opdateret.
       home location: "Hjemmeposition:"
+      latitude: "Breddegrad:"
+      longitude: "Længdegrad:"
       my settings: Mine indstillinger
       no home location: Du har ikke angivet din hjemmeposition.
       preferred languages: "Foretrukne sprog:"
@@ -504,10 +545,10 @@ da:
       title: Log på
     lost_password: 
       email address: "E-mailadresse:"
-      heading: Glemt kodeord?
-      new password button: Nulstil kodeord
+      heading: Glemt adgangskode?
+      new password button: Nulstil adgangskode
       notice email cannot find: Kunne ikke finde din e-mail. Beklager.
-      title: Glemt kodeord
+      title: Glemt adgangskode
     make_friend: 
       already_a_friend: Du er allerede ven med {{name}}.
       failed: Desværre, kunne ikke tilføje {{name}} som din ven.
@@ -520,9 +561,9 @@ da:
       heading: Brugeren {{user}} findes ikke
       title: Ingen sådan bruger
     reset_password: 
-      confirm password: "Bekræft kodeord:"
-      password: "Kodeord:"
-      reset: Nulstil kodeord
+      confirm password: "Bekræft adgangskode:"
+      password: "Adgangskode:"
+      reset: Nulstil adgangskode
     set_home: 
       flash success: Hjemmeposition gemt
     view: 
diff --git a/config/locales/de.yml b/config/locales/de.yml
index c3addc0e9..f3f3d8c68 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1287,9 +1287,6 @@ de:
       traces_waiting: "{{count}} deiner Tracks sind momentan in der Warteschlange. Bitte warte bis diese fertig sind, um die Verarbeitung nicht für andere Nutzer zu blockieren."
     trace_optionals: 
       tags: Tags
-    trace_paging_nav: 
-      of: von
-      showing: Zeige Seite
     view: 
       delete_track: Diesen Track löschen
       description: "Beschreibung:"
diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index f261650e1..a3c78b9e9 100644
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -218,6 +218,13 @@ dsb:
       zoom_or_select: Kórtu powětšyś abo kórtowy wurězk wubraś
     tag_details: 
       tags: "Atributy:"
+    timeout: 
+      sorry: Wódaj, trajo pśedłujko, daty za {{type}} z ID {{id}} wótwołaś.
+      type: 
+        changeset: sajźba změnow
+        node: suk
+        relation: relacija
+        way: puś
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} abo {{edit_link}}"
       download_xml: XML ześěgnuś
@@ -1207,8 +1214,9 @@ dsb:
     trace_optionals: 
       tags: Atributy
     trace_paging_nav: 
-      of: z
-      showing: Pokazujo se bok
+      next: Pśiducy &raquo;
+      previous: "&laquo; Pjerwjejšny"
+      showing_page: Pokazujo se bok {{page}}
     view: 
       delete_track: Toś tu ceru wulašowaś
       description: "Wopisanje:"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4ba9c5de2..5c8e1fe19 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1235,8 +1235,9 @@ en:
       trace_not_found: "Trace not found!"
       visibility: "Visibility:"
     trace_paging_nav:
-      showing: "Showing page"
-      of: "of"
+      showing_page: "Showing page {{page}}"
+      next: "Next &raquo;"
+      previous: "&laquo; Previous"
     trace:
       pending: "PENDING"
       count_points: "{{count}} points"
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 28bae4f3d..6197737dd 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -482,7 +482,7 @@ eo:
           building: Grava konstruaĵo
           byway: Flanka strato
           cable: 
-            - seĝtelfero
+            1: seĝtelfero
           cemetery: Tombejo
           common: 
             - herbejo
@@ -594,9 +594,6 @@ eo:
       traces_waiting: Vi havas {{count}} spurojn atendanta alŝutado. Bonvolu konsideri atendi ke ili terminas alŝuti antaŭ alŝuti aliajn. Tiel vi ne blokus la atendovicon por aliaj uzantoj.
     trace_optionals: 
       tags: Etikedoj
-    trace_paging_nav: 
-      of: de
-      showing: Montrante paĝon
     view: 
       delete_track: Forviŝi tiun spuron
       description: "Priskribo:"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 0f2b4bba9..e79721209 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -214,6 +214,13 @@ es:
       zoom_or_select: Para ver los datos, haga más zoom o seleccione un Área del mapa
     tag_details: 
       tags: Etiquetas
+    timeout: 
+      sorry: Lo sentimos, los datos para el {{type}} con el identificador {{id}} han tomado demasiado tiempo para obtenerse.
+      type: 
+        changeset: conjunto de cambios
+        node: nodo
+        relation: relación
+        way: vía
     way: 
       download: "{{download_xml_link}} o {{view_history_link}}"
       download_xml: Descargar XML
@@ -385,6 +392,7 @@ es:
       other: aproximadamente {{count}}km
       zero: menos de 1Km
     results: 
+      more_results: Más resultados
       no_results: No se han encontrado resultados
     search: 
       title: 
@@ -415,6 +423,7 @@ es:
           bus_station: Estación de autobuses
           cafe: Café
           car_rental: Alquiler de vehículos
+          car_sharing: Car Sharing
           car_wash: Autolavado
           casino: Casino
           cinema: Cine
@@ -493,6 +502,7 @@ es:
           administrative: Frontera administrativa
         building: 
           apartments: Bloque de apartamentos
+          block: Bloque de edificios
           bunker: Búnker
           chapel: Capilla
           church: Iglesia
@@ -504,6 +514,7 @@ es:
           farm: Granja
           flats: Apartamentos
           garage: Garaje
+          hall: Mansión
           hospital: Edificio hospitalario
           hotel: Hotel
           house: Casa
@@ -533,6 +544,7 @@ es:
           footway: Sendero
           ford: Vado
           gate: Puerta
+          living_street: Calle residencial
           motorway: Autovía
           motorway_junction: Cruce de autovías
           path: Camino
@@ -572,6 +584,8 @@ es:
           museum: Museo
           ruins: Ruinas
           tower: Torre
+          wayside_cross: Cruz de término
+          wayside_shrine: Sepulcro
           wreck: Pecio
         landuse: 
           allotments: Huertos
@@ -579,6 +593,7 @@ es:
           brownfield: Terreno baldío
           cemetery: Cementerio
           commercial: área comercial
+          conservation: Conservación
           construction: Construcción
           farm: Granja
           farmland: Tierra de labranza
@@ -698,6 +713,7 @@ es:
           historic_station: Estación histórica de trenes
           junction: Encrucijada de vías ferroviarias
           level_crossing: Paso a nivel
+          light_rail: Metro ligero
           monorail: Monorail
           narrow_gauge: Vía ferroviaria angosta
           platform: Plataforma de tren
@@ -707,6 +723,7 @@ es:
           subway_entrance: Entrada al metro
           tram: Ruta de tranvía
           tram_stop: Parada de tranvía
+          yard: Estación de clasificación
         shop: 
           alcohol: Licorería
           apparel: Tienda de ropa
@@ -742,6 +759,7 @@ es:
           fish: Tienda de artículos de pesca
           florist: Floristería
           food: Tienda de alimentación
+          funeral_directors: Tanatorio
           furniture: Mobiliario
           gallery: Galería
           garden_centre: Vivero
@@ -767,6 +785,7 @@ es:
           outdoor: Tienda de deportes de aventura
           pet: Tienda de mascotas
           photo: Tienda fotográfica
+          salon: Salón de belleza
           shoes: Zapatería
           shopping_centre: Centro comercial
           sports: Tienda de artículos deportivos
@@ -789,6 +808,7 @@ es:
           hostel: Hostel
           hotel: Hotel
           information: Información
+          lean_to: Nave
           motel: Motel
           museum: Museo
           picnic_site: Área de picnic
@@ -803,6 +823,7 @@ es:
           ditch: Acequia
           dock: Muelle
           drain: Desagüe
+          lock: Esclusa
           lock_gate: Esclusa
           mineral_spring: Fuente mineral
           mooring: Amarradero
@@ -1254,8 +1275,9 @@ es:
     trace_optionals: 
       tags: Etiquetas
     trace_paging_nav: 
-      of: de
-      showing: Mostrando página
+      next: Siguiente &raquo;
+      previous: "&laquo; Anterior"
+      showing_page: Mostrando página {{page}}
     view: 
       delete_track: Borrar esta traza
       description: "Descripción:"
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 6cb05c525..b3c2733d1 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -42,12 +42,14 @@ eu:
       old_relation: Erlazio zaharra
       old_way: Bide zaharra
       relation: Erlazioa
+      user: Lankide
       way: Bidea
       way_tag: Bidearen etiketa
   browse: 
     changeset: 
       download: "{{changeset_xml_link}} edo {{osmchange_xml_link}} jaitsi"
     changeset_details: 
+      box: kutxa
       closed_at: "Noiz itxita:"
       created_at: "Noiz sortua:"
     common_details: 
@@ -94,6 +96,7 @@ eu:
     start_rjs: 
       data_frame_title: Datuak
       data_layer_name: Datuak
+      details: Xehetasunak
       loading: Kargatzen...
       object_list: 
         history: 
@@ -212,6 +215,7 @@ eu:
           cinema: Zinema
           clinic: Klinika
           club: Diskoteka
+          community_centre: Komunitate Zentroa
           courthouse: Epaitegia
           crematorium: Errauste labe
           dentist: Dentista
@@ -243,10 +247,12 @@ eu:
           pharmacy: Farmazia
           place_of_worship: Otoitzerako Lekua
           police: Polizia
+          post_box: Postontzia
           post_office: Postetxe
           preschool: Eskolaurre
           prison: Espetxe
           public_building: Eraikin publiko
+          public_market: Herri Azoka
           recycling: Birziklatze gune
           restaurant: Jatetxe
           sauna: Sauna
@@ -264,6 +270,8 @@ eu:
           vending_machine: Salmenta automatiko
           wifi: WiFi Sarbidea
           youth_centre: Gaztelekua
+        boundary: 
+          administrative: Muga Administratiboa
         building: 
           bunker: Bunker
           chapel: Kapera
@@ -277,6 +285,7 @@ eu:
           stadium: Estadio
           store: Denda
           tower: Dorre
+          train_station: Tren Geltokia
           "yes": Eraikina
         highway: 
           bus_stop: Autobus-geraleku
@@ -390,6 +399,7 @@ eu:
         railway: 
           construction: Eraikitze-lanetan dagoen Trenbidea
           halt: Tren Geralekua
+          historic_station: Tren Geltoki Historikoa
           light_rail: Tren Arina
           monorail: Monoraila
           station: Tren Geltokia
@@ -469,10 +479,15 @@ eu:
     export: Esportatu
     help_wiki: Laguntza eta Wiki
     history: Historia
+    home: hasiera
     inbox: sarrera-ontzia ({{count}})
     license: 
       title: OpenStreetMap-eko datuak Creative Commons Aitortu-Partekatu 2.0 Generiko baimen baten mende daude.
+    log_in: Saioa hasi
+    logo: 
+      alt_text: OpenStreetMap logoa
     logout: saioa itxi
+    logout_tooltip: Saioa itxi
     make_a_donation: 
       text: Dohaintza egin
     shop: Denda
@@ -480,6 +495,7 @@ eu:
     view: Ikusi
     view_tooltip: Mapak ikusi
     welcome_user: Ongietorri, {{user_link}}
+    welcome_user_link_tooltip: Zure lankide orrialdea
   map: 
     coordinates: "Koordenatuak:"
     edit: Aldatu
@@ -560,8 +576,9 @@ eu:
     key: 
       table: 
         entry: 
+          admin: Muga administratiboa
           apron: 
-            - terminala
+            1: terminala
           cable: 
             - Funikularra
           cemetery: Hilerri
@@ -588,7 +605,7 @@ eu:
           station: Tren geltokia
           subway: Metroa
           tram: 
-            - tranbia
+            1: tranbia
     search: 
       search: Bilatu
       submit_text: Joan
@@ -600,6 +617,7 @@ eu:
       description: "Deskribapen:"
       download: jaitsi
       edit: aldatu
+      filename: "Fitxategi izena:"
       map: mapa
       points: "Puntuak:"
       save_button: Aldaketak gorde
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index e233f8e23..fcbae9779 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -201,6 +201,12 @@ fi:
       zoom_or_select: Katso pienempää aluetta tai valitse kartalta alue, jonka tiedot haluat
     tag_details: 
       tags: "Tägit:"
+    timeout: 
+      type: 
+        changeset: muutoskokoelma
+        node: piste
+        relation: relaatio
+        way: polku
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} tai {{edit_link}}"
       download_xml: Lataa XML
@@ -496,6 +502,7 @@ fi:
           pedestrian: Jalkakäytävä
           primary: Kantatie
           primary_link: Kantatie
+          raceway: Kilparata
           road: Tie
           secondary: Seututie
           secondary_link: Seututie
@@ -665,6 +672,7 @@ fi:
           drain: Oja
           lock_gate: Sulku
           rapids: Pohjapato
+          river: Joki
           riverbank: Joki
           stream: Puro
   javascripts: 
@@ -1013,9 +1021,6 @@ fi:
       traces_waiting: Lähettämiäsi jälkiä on jo {{count}} käsittelyjonossa odottamassa tallennusta tietokantaan. Olisi huomaavaista jos odottaisit näiden valmistuvan ennen kuin lähetät lisää jälkiä. Näin muidenkin käyttäjien lähettämät jäljet pääsevät aiemmin tietokantaan.
     trace_optionals: 
       tags: Tägit
-    trace_paging_nav: 
-      of: " /"
-      showing: Sivu
     view: 
       delete_track: Poista tämä jälki
       description: "Kuvaus:"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index a2b08c60c..c45e161dd 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -218,6 +218,13 @@ fr:
       zoom_or_select: Zoomer ou sélectionner une zone de la carte pour la visualiser
     tag_details: 
       tags: "Balises :"
+    timeout: 
+      sorry: Désolé, les données pour le type {{type}} avec l'id {{id}} prennent trop de temps à être récupérées.
+      type: 
+        changeset: groupe de modifications
+        node: nœud
+        relation: relation
+        way: chemin
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} ou {{edit_link}}"
       download_xml: Télécharger XML
@@ -389,6 +396,7 @@ fr:
       other: environ {{count}} km
       zero: moins de 1 km
     results: 
+      more_results: Plus de résultats
       no_results: Aucun résultat n'a été trouvé
     search: 
       title: 
@@ -1037,6 +1045,7 @@ fr:
       more_videos: "Davantage de vidéos sont disponibles ici :"
       opengeodata: "OpenGeoData.org est le blog de Steve Coast, le fondateur d’OpenStreetMap et il propose également des podcasts :"
       the_wiki: "Lisez à propos d'OpenStreetMap sur le wiki :"
+      the_wiki_url: http://wiki.openstreetmap.org/wiki/FR:Beginners_Guide
       user_wiki_1: Il est recommandé de créer une page utilisateur qui inclut
       user_wiki_2: des catégories qui indiquent votre localisation, comme [[Category:Users_in_London]].
       wiki_signup: "Vous pouvez également vous créer un compte sur le wiki d'OpenStreetMap sur :"
@@ -1276,8 +1285,9 @@ fr:
     trace_optionals: 
       tags: Balises
     trace_paging_nav: 
-      of: sur
-      showing: Affichage de la page
+      next: Suivant &raquo;
+      previous: "&laquo; Précédent"
+      showing_page: Affichage de la page {{page}}
     view: 
       delete_track: Supprimer cette piste
       description: "Description :"
diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index d55fa5b07..598cb9c7b 100644
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -510,9 +510,6 @@ fur:
       see_all_traces: Cjale ducj i percors
       see_just_your_traces: Cjale dome i tiei percors o cjame un percors
       see_your_traces: Cjale ducj i miei percors
-    trace_paging_nav: 
-      of: su
-      showing: Mostrant la pagjine
     view: 
       delete_track: Elimine chest percors
       description: "Descrizion:"
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index abb05694c..b3957609c 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -218,6 +218,13 @@ hr:
       zoom_or_select: Zoomiraj ili izaberi područje karte za pregled
     tag_details: 
       tags: "Oznake:"
+    timeout: 
+      sorry: Žao mi je, podaci za {{type}} sa id {{id}}, predugo se čekaju.
+      type: 
+        changeset: changeset
+        node: točka
+        relation: relacija
+        way: put
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} ili {{edit_link}}"
       download_xml: Preuzimanje XML
@@ -389,6 +396,7 @@ hr:
       other: oko {{count}}km
       zero: manje od 1km
     results: 
+      more_results: Više rezultata
       no_results: Nisu nađeni rezultati
     search: 
       title: 
@@ -402,6 +410,402 @@ hr:
     search_osm_namefinder: 
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} od {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} od {{placename}}"
+    search_osm_nominatim: 
+      prefix: 
+        amenity: 
+          airport: Zračna luka
+          arts_centre: Umjetnički centar
+          atm: Bankomat
+          auditorium: Auditorij
+          bank: Banka
+          bar: Bar
+          bench: Klupa
+          bicycle_parking: Biciklistički parking
+          bicycle_rental: Rent a bicikl
+          brothel: Bordel
+          bureau_de_change: Mjenjačnica
+          bus_station: Autobusni kolodvor
+          cafe: Caffe bar
+          car_rental: Rent-a-car
+          car_sharing: Carsharing
+          car_wash: Autopraonica
+          casino: Casino
+          cinema: Kino
+          clinic: Klinika
+          club: Klub
+          college: Fakultet
+          community_centre: Društveni centar
+          courthouse: Sud
+          crematorium: Krematorij
+          dentist: Zubar
+          doctors: Doktor
+          dormitory: Studentski dom
+          drinking_water: Pitka voda
+          driving_school: Autoškola
+          embassy: Veleposlanstvo
+          emergency_phone: Telefon (S.O.S)
+          fast_food: Fast food
+          ferry_terminal: Trajektni terminal
+          fire_hydrant: Hidrant
+          fire_station: Vatrogasna postaja
+          fountain: Fontana
+          fuel: Benzinska
+          grave_yard: Groblje
+          gym: Fitness centar
+          hall: Hala
+          health_centre: Zdravstveni centar
+          hospital: Bolnica
+          hotel: Hotel
+          hunting_stand: Čeka
+          ice_cream: Slastičarna
+          kindergarten: Dječji vrtić
+          library: Knjižnica
+          market: Tržnica
+          marketplace: Tržnica
+          mountain_rescue: GSS - Gorska služba spašavanja
+          nightclub: 'Noćni klub'
+          nursery: Čuvanje djece
+          nursing_home: Starački dom
+          office: Kancelarija
+          park: Park
+          parking: Parking
+          pharmacy: Ljekarna
+          place_of_worship: Crkva
+          police: Policija
+          post_box: Poštanski sandučić
+          post_office: Pošta
+          preschool: Predškolska ustanova
+          prison: Zatvor
+          pub: Pub
+          public_building: Ustanova
+          reception_area: Recepcija
+          recycling: Reciklažna točka
+          restaurant: Restoran
+          retirement_home: Dom za starije osobe
+          sauna: Sauna
+          school: Å kola
+          shelter: Sklonište
+          shop: Trgovina
+          shopping: Trgovački centar
+          social_club: Društveni klub
+          studio: Studio
+          supermarket: Supermarket
+          taxi: Taxi
+          telephone: Telefonska govornica
+          theatre: Kazalište
+          toilets: WC
+          townhall: Gradsko poglavarstvo
+          university: Sveučilište
+          vending_machine: Automat
+          veterinary: Veterinar
+          waste_basket: Kanta za otpatke
+          wifi: WiFi pristupna točka
+          youth_centre: Centar za mladež
+        boundary: 
+          administrative: Administrativna granica
+        building: 
+          bunker: Bunker
+          chapel: Kapelica
+          church: Crkva
+          city_hall: Gradska vjećnica
+          commercial: Poslovna zgrada
+          dormitory: Studentski dom
+          entrance: Ulaz
+          faculty: Zgrada fakulteta
+          flats: Stanovi
+          garage: Garaža
+          hall: Dvorana
+          hospital: Bolnica
+          hotel: Hotel
+          house: Kuća
+          office: Uredska zgrada
+          residential: Stambena zgrada
+          school: Å kolska zgrada
+          shop: Trgovina
+          stadium: Stadion
+          store: Trgovina
+          terrace: Terasa
+          tower: Toranj
+          train_station: Željeznički kolodvor
+          university: Zgrada Sveučilišta
+          "yes": Zgrada
+        highway: 
+          bridleway: Konjička staza
+          bus_guideway: Autobusna traka
+          bus_stop: Autobusno stajalište
+          byway: Prečica
+          construction: Autocesta u izgradnji
+          cycleway: Biciklistička staza
+          distance_marker: Oznaka km
+          emergency_access_point: S.O.S. točka
+          footway: Pješačka staza
+          ford: Ford
+          gate: Kapija
+          living_street: Ulica smirenog prometa
+          minor: Drugorazredna cesta
+          motorway: Autocesta
+          motorway_junction: Čvor (autoputa)
+          motorway_link: Autocesta (pristupna cesta)
+          path: Staza
+          pedestrian: Pješački put
+          platform: Platforma
+          primary: Državna cesta
+          primary_link: Državna cesta
+          raceway: Trkalište
+          residential: Ulica
+          road: Cesta
+          secondary: Županijska cesta
+          secondary_link: Županijska cesta
+          service: Servisna cesta
+          services: Autocesta - usluge
+          steps: Stepenice
+          stile: Prijelaz preko ograde
+          tertiary: Lokalna cesta
+          track: Makadam
+          trail: Staza
+          trunk: Cesta rezervirana za motorna vozila
+          trunk_link: Cesta rezrevirana za mot. voz. - prilazna cesta
+          unclassified: Nerazvrstana cesta
+          unsurfaced: Neasfaltirana cesta
+        historic: 
+          archaeological_site: Arheološko nalazište
+          battlefield: Bojno polje
+          boundary_stone: Granični kamen
+          building: Zgrada
+          castle: Dvorac
+          church: Crkva
+          house: Kuća
+          manor: Zamak
+          memorial: Spomen dom
+          mine: Rudnik
+          monument: Spomenik
+          museum: Muzej
+          ruins: Ruševine
+          tower: Toranj
+          wreck: Olupina
+        landuse: 
+          allotments: Vrtovi
+          basin: Bazen
+          cemetery: Groblje
+          commercial: Poslovno područje
+          construction: Gradilište
+          farm: Farma
+          farmland: Polje
+          farmyard: Farma
+          forest: Å uma
+          grass: Trava
+          industrial: Industrijsko područje
+          landfill: Deponija
+          meadow: Livada
+          military: Vojno područje
+          mine: Rudnik
+          mountain: Planina
+          nature_reserve: Rezervat prirode
+          park: Park
+          piste: Pista
+          plaza: Plaza
+          quarry: Kamenolom
+          railway: Željeznica
+          recreation_ground: Rekreacijsko područje
+          reservoir: Rezervoar
+          residential: Stambeno područje
+          retail: Trgovina
+          vineyard: Vinograd
+          wetland: Močvara
+          wood: Å uma
+        leisure: 
+          beach_resort: Plaža
+          common: Općinsko zemljište
+          fishing: Ribičko područje
+          garden: Vrt
+          golf_course: Golf igralište
+          ice_rink: Klizalište
+          marina: Marina
+          miniature_golf: Minigolf
+          nature_reserve: Rezervat prirode
+          park: Park
+          pitch: Sportski teren
+          playground: Igralište
+          recreation_ground: Rekreacijski teren
+          slipway: Navoz
+          sports_centre: Sportski centar
+          stadium: Stadion
+          swimming_pool: Bazen
+          track: Staza za trčanje
+          water_park: Vodeni park
+        natural: 
+          bay: Zaljev
+          beach: Plaža
+          cape: Rt
+          cave_entrance: Pećina (ulaz)
+          channel: Kanal
+          cliff: Litica
+          coastline: Obala
+          crater: Krater
+          feature: Obilježje
+          fell: Brdo
+          fjord: Fjord
+          geyser: Gejzir
+          glacier: Glečer
+          heath: Ravnica
+          hill: Brdo
+          island: Otok
+          land: Zemlja
+          marsh: Močvara
+          moor: Močvara
+          mud: Blato
+          peak: Vrh
+          point: Točka
+          reef: Greben
+          ridge: Greben
+          river: Rijeka
+          rock: Stijena
+          scree: Å ljunak
+          scrub: Guštara
+          shoal: Sprud
+          spring: Izvor
+          strait: Tjesnac
+          tree: Drvo
+          valley: Dolina
+          volcano: Vulkan
+          water: Voda
+          wetland: Močvara
+          wetlands: Močvara
+          wood: Å uma
+        place: 
+          airport: Zračna luka
+          city: Grad
+          country: Država
+          county: Županija/grofovija
+          farm: Farma
+          hamlet: Zaseok
+          house: Kuća
+          houses: Kuće
+          island: Otok
+          islet: Otočić
+          locality: Lokalitet
+          moor: Močvara
+          municipality: Općina
+          postcode: Poštanski broj
+          region: Područje
+          sea: More
+          state: Pokrajina / država (USA)
+          subdivision: Podgrupa
+          suburb: Predgrađe
+          town: grad
+          unincorporated_area: Slobodna zemlja
+          village: Selo
+        railway: 
+          construction: Pruga u izgradnji
+          disused: Napuštena pruga
+          disused_station: Željeznička stanica (nije u upotrebi)
+          halt: Željeznička stanica
+          historic_station: Povijesna željeznička stanica
+          junction: Željeznički čvor
+          level_crossing: Pružni prijelaz
+          light_rail: Laka željeznica
+          monorail: Jednotračna pruga
+          station: Željeznički kolodvor
+          subway: Podzemna - stanica
+          subway_entrance: Podzemna - ulaz
+          tram: Tramvaj
+          tram_stop: Tramvajska stanica
+          yard: Ranžirni kolodvor
+        shop: 
+          alcohol: Trgovina pićem
+          art: Atelje
+          bakery: Pekara
+          beauty: Parfumerija
+          beverages: Trgovina pićem
+          bicycle: Trgovina biciklima
+          books: Knjižara
+          butcher: Mesnica
+          car: Autokuća
+          car_dealer: Autokuća
+          car_parts: Autodijelovi
+          car_repair: Autoservis
+          carpet: Trgovina tepisima
+          chemist: Ljekarna
+          clothes: Butik
+          computer: Computer Shop
+          confectionery: Delikatesa
+          convenience: Minimarket
+          copyshop: Kopiraona
+          cosmetics: Parfumerija
+          department_store: Robna kuća
+          discount: Diskont
+          doityourself: Uradi sam
+          drugstore: Drogerija
+          dry_cleaning: Kemijska čistionica
+          electronics: Trgovina elektronikom
+          estate_agent: Agencija za nekretnine
+          farm: Poljo-apoteka
+          fish: Ribarnica
+          florist: Cvjećarnica
+          food: Trgovina prehranom
+          funeral_directors: Pogrebno poduzeće
+          furniture: Namještaj
+          gallery: Galerija
+          garden_centre: Vrtni centar
+          gift: Poklon trgovina
+          greengrocer: Voćarna
+          grocery: Trgovina prehranom
+          hairdresser: Frizer
+          hardware: Željezar
+          hifi: Hi-Fi
+          insurance: Osiguranje
+          jewelry: Zlatarna
+          kiosk: Kiosk
+          laundry: Praonica rublja
+          mall: Trgovački centar
+          market: Tržnica
+          music: Trgovina glazbom
+          newsagent: Novinar
+          optician: Optičar
+          outdoor: Trgovina za slobodno vrijeme
+          pet: Trgovina za kućne ljubimce
+          photo: Fotograf
+          salon: Salon
+          shoes: Trgovina obućom
+          shopping_centre: Trgovački centar
+          sports: Trgovina sportskom opremom
+          stationery: Papirnica
+          supermarket: Supermarket
+          toys: Trgovina igračkama
+          travel_agency: Putnička agencija
+          video: Videoteka
+          wine: Vinoteka
+        tourism: 
+          alpine_hut: Alpska kuća
+          artwork: Umjetničko djelo
+          attraction: Atrakcija
+          bed_and_breakfast: 'Noćenje i doručak'
+          cabin: Koliba
+          camp_site: Kamp
+          caravan_site: Kamp-kućice (mjesto)
+          chalet: Planinska kuća
+          guest_house: Apartman
+          hostel: Hostel
+          hotel: Hotel
+          information: Informacije
+          lean_to: Lean to
+          motel: Motel
+          museum: Muzej
+          picnic_site: Piknik-mjesto
+          theme_park: Tematski park
+          valley: Dolina
+          viewpoint: Vidikovac
+          zoo: Zoo
+        waterway: 
+          canal: Kanal
+          dam: Brana
+          dock: Dok
+          mineral_spring: Mineralni izvor
+          mooring: Sidrište
+          river: Rijeka
+          riverbank: Riječna obala
+          stream: Potok
+          waterfall: Vodopad
   javascripts: 
     map: 
       base: 
@@ -804,12 +1208,18 @@ hr:
       body: Žao mi je, ali ne postoji korisnik s imenom {{user}}. Provjerite svoj upis, ili link kojeg ste kliknuli.
       heading: Korisnik {{user}} ne postoji
       title: Nema takvog korisnika
+    offline: 
+      heading: GPX spremište Offline
+      message: Sustav za GPX spremanje i upload trenutno nisu u funkciji.
+    offline_warning: 
+      message: Sustav za GPX upload trenutno nije u funkciji.
     trace: 
       ago: prije {{time_in_words_ago}}
       by: od
       count_points: "{{count}} točaka"
       edit: uredi
       edit_map: Uredi kartu
+      identifiable: IDENTIFICIRAJUĆI
       in: u
       map: karta
       more: više
@@ -817,6 +1227,7 @@ hr:
       private: PRIVATNI
       public: JAVNI
       trace_details: Detalji trase
+      trackable: TRACKABLE
       view_map: Prikaži kartu
     trace_form: 
       description: Opis
@@ -835,8 +1246,9 @@ hr:
     trace_optionals: 
       tags: Oznake
     trace_paging_nav: 
-      of: od
-      showing: Prikazujem stranicu
+      next: Slijedeća &raquo;
+      previous: "&laquo; Prethodna"
+      showing_page: Prikazujem stranicu {{page}}
     view: 
       delete_track: Izbriši ovu trasu
       description: "Opis:"
diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index 945dd4a7e..dc4e463b5 100644
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -218,6 +218,13 @@ hsb:
       zoom_or_select: Wobłuk karty powjetšić abo wubrać
     tag_details: 
       tags: "Atributy:"
+    timeout: 
+      sorry: Wodaj, traje předołho, daty za {{type}} z ID {{id}} wotwołać.
+      type: 
+        changeset: sadźba změnow
+        node: suk
+        relation: relacija
+        way: puć
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} abo {{edit_link}}"
       download_xml: XML sćahnyć
@@ -393,6 +400,7 @@ hsb:
       other: něhdźe {{count}} km
       zero: mjenje hač 1 km
     results: 
+      more_results: Dalše wuslědki
       no_results: Žane wuslědki namakane
     search: 
       title: 
@@ -1283,8 +1291,9 @@ hsb:
     trace_optionals: 
       tags: Atributy
     trace_paging_nav: 
-      of: wot
-      showing: Pokazuje so strona
+      next: Přichodny &raquo;
+      previous: "&laquo; Předchadny"
+      showing_page: Pokazuje so strona {{page}}
     view: 
       delete_track: Tutu čaru zničić
       description: "Wopisanje:"
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 13ecf1c16..94af8c060 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -947,9 +947,6 @@ hu:
       traces_waiting: "{{count}} nyomvonalad várakozik feltöltésre. Kérlek fontold meg, hogy megvárod, amíg ezek befejeződnek mielőtt feltöltesz továbbiakat, hogy így ne tartsd fel a többi felhasználót a sorban."
     trace_optionals: 
       tags: Címkék
-    trace_paging_nav: 
-      of: "összesen:"
-      showing: "Jelenlegi oldal:"
     view: 
       delete_track: Ezen nyomvonal törlése
       description: "Leírás:"
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 4c542a00e..9d2c2be77 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -933,9 +933,6 @@ ia:
       traces_waiting: Tu ha {{count}} tracias attendente cargamento. Per favor considera attender le completion de istes ante de cargar alteres, pro non blocar le cauda pro altere usatores.
     trace_optionals: 
       tags: Etiquettas
-    trace_paging_nav: 
-      of: de
-      showing: Monstrante pagina
     view: 
       delete_track: Deler iste tracia
       description: "Description:"
diff --git a/config/locales/is.yml b/config/locales/is.yml
index cbbb44614..dddaa16d0 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -917,9 +917,6 @@ is:
       traces_waiting: Þú ert með {{count}} ferla í bið. Íhugaðu að bíða með að senda inn fleiri ferla til að aðrir notendur komist að.
     trace_optionals: 
       tags: Tögg
-    trace_paging_nav: 
-      of: af
-      showing: Sýni síðu
     view: 
       delete_track: Eyða
       description: "Lýsing:"
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 2b22b1f28..5076c5dcf 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -861,7 +861,7 @@ it:
           station: Stazione ferroviaria
           subway: Metropolitana
           summit: 
-            - picco
+            1: picco
           tourist: Attrazione turistica
           tram: 
             - Metropolitana di superficie
@@ -942,9 +942,6 @@ it:
       traces_waiting: Ci sono {{count}} tracciati in attesa di caricamento. Si consiglia di aspettare il loro completamento prima di caricarne altri, altrimenti si blocca la lista di attesa per altri utenti.
     trace_optionals: 
       tags: Etichette
-    trace_paging_nav: 
-      of: di
-      showing: Visualizzata la pagina
     view: 
       delete_track: Elimina questo tracciato
       description: "Descrizione:"
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 7449fc5cf..57b67b53e 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -752,8 +752,6 @@ ja:
       traces_waiting: あなたは {{count}} のトレースがアップロード待ちになっています。それらのアップロードが終了するまでお待ちください。他のユーザーのアップロードが制限されてしまいます。
     trace_optionals: 
       tags: タグ（複数可）
-    trace_paging_nav: 
-      showing: ページ表示
     view: 
       delete_track: このトラックの削除
       description: "詳細:"
diff --git a/config/locales/km.yml b/config/locales/km.yml
index 0c421cae0..68305de82 100644
--- a/config/locales/km.yml
+++ b/config/locales/km.yml
@@ -369,8 +369,6 @@ km:
       visibility_help: តើនេះមានន័យ​ដូចម្ដេច​?
     trace_optionals: 
       tags: ស្លាក​
-    trace_paging_nav: 
-      of: នៃ​
     view: 
       description: បរិយាយ​៖
       download: ទាញយក
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 52fe522e6..3defbf60c 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -212,6 +212,13 @@ mk:
       zoom_or_select: Приближи и избери простор на картата за преглед
     tag_details: 
       tags: "Ознаки:"
+    timeout: 
+      sorry: Жалиме, но добивањето на податоците за {{type}} со id {{id}} трае предолго.
+      type: 
+        changeset: менувач
+        node: јазол
+        relation: релација
+        way: пат
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} или {{edit_link}}"
       download_xml: Преземи XML
@@ -383,6 +390,7 @@ mk:
       other: околу {{count}}km
       zero: помалку од 1km
     results: 
+      more_results: Повеќе резултати
       no_results: Нема пронајдено резултати
     search: 
       title: 
@@ -1245,6 +1253,7 @@ mk:
       count_points: "{{count}} точки"
       edit: уреди
       edit_map: Уредување
+      identifiable: ПРЕПОЗНАТЛИВ
       in: во
       map: карта
       more: повеќе
@@ -1252,6 +1261,7 @@ mk:
       private: ПРИВАТНО
       public: ЈАВНО
       trace_details: Погледајте ги деталите за трагата
+      trackable: ПРОСЛЕДЛИВ
       view_map: Погледај ја картата
     trace_form: 
       description: Опис
@@ -1270,8 +1280,9 @@ mk:
     trace_optionals: 
       tags: Ознаки
     trace_paging_nav: 
-      of: од
-      showing: Приказ на страницата
+      next: Следна &raquo;
+      previous: "&laquo; Претходна"
+      showing_page: Прикажувам страница {{page}}
     view: 
       delete_track: Избриши ја трагава
       description: "Опис:"
@@ -1322,7 +1333,7 @@ mk:
       return to profile: Назад кон профилот
       save changes button: Зачувај ги промените
       title: Уреди сметка
-      update home location on click: Ажурирање на домашната локација кога ќе се кликне на картата?
+      update home location on click: Подновувај ја домашната локација кога ќе кликнам на картата
     confirm: 
       button: Потврди
       failure: Веќе имаме потврдено корисничка сметка со овој жетон.
diff --git a/config/locales/nds.yml b/config/locales/nds.yml
index e2cc0eab2..e2ac2427c 100644
--- a/config/locales/nds.yml
+++ b/config/locales/nds.yml
@@ -437,8 +437,6 @@ nds:
       upload_button: Hoochladen
       upload_gpx: GPX-Datei hoochladen
       visibility: Sichtborkeit
-    trace_paging_nav: 
-      of: von
     view: 
       description: "Beschrieven:"
       download: dalladen
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index ab16d389e..b5884b980 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -3,6 +3,7 @@
 # Export driver: syck
 # Author: Freek
 # Author: Fruggo
+# Author: Greencaps
 # Author: McDutchie
 # Author: SPQRobin
 # Author: Siebrand
@@ -47,7 +48,7 @@ nl:
       changeset_tag: Label van set wijzigingen
       country: Land
       diary_comment: Dagboekopmerking
-      diary_entry: Dagboekingave
+      diary_entry: Dagboekbericht
       friend: Vriend
       language: Taal
       message: Bericht
@@ -281,49 +282,49 @@ nl:
       comment_count: 
         one: 1 reactie
         other: "{{count}} reacties"
-      comment_link: Reactie op deze ingave geven
+      comment_link: Reageren op dit bericht
       confirm: Bevestigen
-      edit_link: Deze ingave bewerken
-      hide_link: Ingave verbergen
+      edit_link: Dit bericht bewerken
+      hide_link: Bericht verbergen
       posted_by: Geplaatst door {{link_user}} op {{created}} in het {{language_link}}
-      reply_link: Op deze ingave reageren
+      reply_link: Reageren op dit bericht
     edit: 
       body: "Tekst:"
       language: "Taal:"
       latitude: "Breedtegraad:"
       location: "Locatie:"
       longitude: "Lengtegraad:"
-      marker_text: Locatie van ingave
+      marker_text: Locatie van bericht
       save_button: Opslaan
       subject: "Onderwerp:"
-      title: Dagboekingave bewerken
+      title: Dagboekbericht bewerken
       use_map_link: kaart gebruiken
     feed: 
       all: 
-        description: Recente dagboekingaven van OpenStreetMap-gebruikers
-        title: OpenStreetMap dagboekingaven
+        description: Recente dagboekberichten van OpenStreetMap-gebruikers
+        title: OpenStreetMap dagboekberichten
       language: 
-        description: Recente dagboekingaven van OpenStreetMap-gebruikers in het {{language_name}}
-        title: OpenStreetMap dagboekingaven in het {{language_name}}
+        description: Recente dagboekberichten van OpenStreetMap-gebruikers in het {{language_name}}
+        title: OpenStreetMap dagboekberichten in het {{language_name}}
       user: 
-        description: Recente OpenStreetMap dagboekingaven van {{user}}
-        title: OpenStreetMap dagboekingaven van {{user}}
+        description: Recente OpenStreetMap dagboekberichten van {{user}}
+        title: OpenStreetMap dagboekberichten van {{user}}
     list: 
-      in_language_title: Dagboekingaven in het {{language}}
-      new: Nieuwe dagboekingave
-      new_title: Nieuwe ingave voor uw dagboek schrijven
-      newer_entries: Nieuwere ingaven
-      no_entries: Geen dagboekingaven
-      older_entries: Oudere ingaven
-      recent_entries: "Recente dagboekingaven:"
+      in_language_title: Dagboekberichten in het {{language}}
+      new: Nieuw dagboekbericht
+      new_title: Nieuwe bericht voor uw dagboek schrijven
+      newer_entries: Nieuwere berichten
+      no_entries: Het dagboek is leeg
+      older_entries: Oudere berichten
+      recent_entries: "Recente dagboekberichten:"
       title: Gebruikersdagboeken
       user_title: Dagboek van {{user}}
     new: 
-      title: Nieuwe dagboekingave
+      title: Nieuw dagboekbericht
     no_such_entry: 
-      body: Sorry, er is geen dagboekingave of opmerking met het id {{id}}. Controleer de spelling, of misschien is de verwijzing waarop u geklikt hebt onjuist.
-      heading: De ingave met het id {{id}} bestaat niet
-      title: De opgevraagde dagboekingave bestaat niet
+      body: Sorry, er is geen dagboekbericht of opmerking met het id {{id}}. Controleer de spelling, of misschien is de verwijzing waarop u geklikt hebt onjuist.
+      heading: Een bericht met id {{id}} bestaat niet
+      title: Het opgevraagde dagboekbericht bestaat niet
     no_such_user: 
       body: Sorry, er is geen gebruiker met de naam {{user}}. Controleer de spelling, of misschien is de verwijzing waarop u geklikt hebt onjuist.
       heading: De gebruiker {{user}} bestaat niet
@@ -931,7 +932,7 @@ nl:
       limit_exceeded: U hebt recentelijk veel berichten verstuurd. Wacht even voordat u weer berichten kunt versturen.
       message_sent: Bericht verzonden
       send_button: Verzenden
-      send_message_to: Nieuw bericht naar {{name}} verzenden
+      send_message_to: Een persoonlijk bericht naar {{name}} versturen
       subject: Onderwerp
       title: Bericht verzenden
     no_such_user: 
@@ -1050,7 +1051,7 @@ nl:
       allow_read_prefs: uw gebruikersvoorkeuren lezen
       allow_to: "De clienttoepassing de volgende rechten geven:"
       allow_write_api: de kaart wijzigen
-      allow_write_diary: dagboekingaven aanmaken, reacties geven en vrienden maken
+      allow_write_diary: dagboekberichten schrijven, reacties geven en vrienden maken
       allow_write_gpx: GPS-tracks uploaden
       allow_write_prefs: uw gebruikersvoorkeuren wijzigen
       request_access: De applicatie {{app_name}} vraagt toegang tot uw gebruiker. Controleer of u deze applicatie de volgende mogelijkheden wilt bieden. U kunt zoveel of zo weinig rechten toewijzen als u wilt.
@@ -1068,7 +1069,7 @@ nl:
       allow_read_gpx: privé-GPS-tracks lezen
       allow_read_prefs: gebruikersinstellingen lezen
       allow_write_api: de kaart wijzigen
-      allow_write_diary: dagboekingaven aanmaken, reacties en vrienden toevoegen
+      allow_write_diary: dagboekberichten schrijven, reacties en vrienden toevoegen
       allow_write_gpx: GPS-tracks uploaden
       allow_write_prefs: gebruikersinstellingen wijzigen
       callback_url: Callback-URL
@@ -1098,7 +1099,7 @@ nl:
       allow_read_gpx: eigen GPS-tracks bekijken
       allow_read_prefs: gebruikerseigenschappen bekijken.
       allow_write_api: kaart wijzigen
-      allow_write_diary: dagboekingaven maken, reacties geven en vrienden maken
+      allow_write_diary: dagboekberichten schrijven, reacties geven en vrienden maken
       allow_write_gpx: GPS-tracks uploaden
       allow_write_prefs: gebruikerseigenschappen wijzigen
       authorize_url: "URL voor autorisatie:"
@@ -1281,8 +1282,9 @@ nl:
     trace_optionals: 
       tags: Labels
     trace_paging_nav: 
-      of: van
-      showing: Bezig met weergeven van pagina
+      next: Volgende &raquo;
+      previous: "&laquo; Vorige"
+      showing_page: Pagina {{page}}
     view: 
       delete_track: Deze track verwijderen
       description: "Beschrijving:"
@@ -1440,7 +1442,7 @@ nl:
       my traces: mijn tracks
       my_oauth_details: Mijn OAuth-gegevens bekijken
       nearby users: "Dichtbijzijnde mappers:"
-      new diary entry: nieuwe dagboekingave
+      new diary entry: nieuw dagboekbericht
       no friends: U hebt nog geen vrienden toegevoegd.
       no home location: Geen thuislocatie ingesteld.
       no nearby users: Er zijn geen dichtbijzijnde mappers.
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 82ffb851a..0909c2b98 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -813,9 +813,6 @@
       traces_waiting: Du har {{count}} spor som venter på opplasting. Du bør vurdere å la disse bli ferdig før du laster opp flere spor slik at du ikke blokkerer køa for andre brukere.
     trace_optionals: 
       tags: Markelapper
-    trace_paging_nav: 
-      of: av
-      showing: Viser side
     view: 
       delete_track: Slett dette sporet
       description: "Beskrivelse:"
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index be45322e3..b3ace69d6 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -218,6 +218,13 @@ pl:
       zoom_or_select: Przybliż albo wybierz inny obszar mapy
     tag_details: 
       tags: "Znaczniki:"
+    timeout: 
+      sorry: Niestety, pobranie danych dla {{type}} o identyfikatorze {{id}} trwało zbyt długo.
+      type: 
+        changeset: Zestaw zmian
+        node: węzeł
+        relation: relacja
+        way: droga
     way: 
       download: "{{download_xml_link}} lub {{view_history_link}}"
       download_xml: Ściągnij XML
@@ -389,6 +396,7 @@ pl:
       other: około {{count}}km
       zero: mniej niż 1km
     results: 
+      more_results: Więcej wyników
       no_results: Nie znaleziono
     search: 
       title: 
@@ -971,6 +979,9 @@ pl:
       click_the_link: Jeśli to ty, kliknij na poniższy link, aby potwierdzić zmianę.
       greeting: Cześć,
       hopefully_you: Ktoś (prawdopodobnie Ty) chce zmienić adres e-mail w {{server_url}} na {{new_address}}.
+    email_confirm_plain: 
+      hopefully_you_1: Ktoś (prawdopodobnie Ty sam(a)) chciałby zmienić adres e-mail w serwisie
+      hopefully_you_2: "{{server_url}} na {{new_address}}."
     friend_notification: 
       had_added_you: "{{user}} dodał(a) Cię jako swojego znajomego na OpenStreetMap."
       see_their_profile: Możesz przeczytać jego/jej profil pod {{userurl}} oraz dodać jako Twojego znajomego/ą jeśli chcesz.
@@ -979,19 +990,33 @@ pl:
       and_no_tags: i brak znaczników
       and_the_tags: i następujące znaczniki
       failure: 
+        failed_to_import: "nie udało się zaimportować. Komunikat błędu:"
+        more_info_1: Więcej informacji na temat błędów przesyłania danych GPX i sposobach ich
+        more_info_2: "uniknięcia można znaleźć na stronie:"
         subject: "[OpenStreetMap] Błąd importu pliku GPX"
       greeting: Witaj,
       success: 
+        loaded_successfully: udało się załadować, wraz z {{trace_points}} z {{possible_points}} punktów łącznie.
         subject: "[OpenStreetMap] Sukces importu pliku GPX"
       with_description: z opisem
       your_gpx_file: Wygląda, ze Twój plik GPX
+    lost_password_html: 
+      click_the_link: Jeśli to Ty, kliknij na poniższy link, aby zresetować hasło.
+      greeting: Witaj,
+      hopefully_you: Ktoś - prawdopodobnie Ty - poprosił w serwisie openstreetmap.org o zresetowanie hasła do konta należącego do tego adresu e-mail.
     lost_password_plain: 
       click_the_link: Jeśli to ty, kliknij na poniższy link, aby zresetować hasło.
       greeting: Cześć,
       hopefully_you_1: Ktoś (prawdopodobnie Ty) poprosił o zresetowanie hasła dla tego
       hopefully_you_2: adresy e-mail konto openstreetmap.org.
     message_notification: 
+      footer1: Możesz też przeczytać tę wiadomość pod adresem {{readurl}}
+      footer2: możesz odpowiedzieć pod adresem {{replyurl}}
+      header: "{{from_user}} wysłał do Ciebie wiadomość z OpenStreetMap o temacie {{subject}}:"
+      hi: Witaj {{to_user}},
       subject: "[OpenStreetMap] Użytkownik {{user}} przysłał nową wiadomość"
+    signup_confirm: 
+      subject: "[OpenStreetMap] Prośba o potwierdzenie adresu e-mail"
     signup_confirm_html: 
       click_the_link: Jeśli to Ty, witamy!  Kliknij poniższy link żeby potwierdzić Twoje nowe konto i dowiedzieć się więcej o OpenStreetMap.
       current_user: Aktualne listy użytkowników według ich położenia na Ziemi znajdziesz na stronie <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
@@ -1031,6 +1056,9 @@ pl:
       request_access: Aplikacja {{app_name}} żąda dostępu do Twojego konta użytkownika. Sprawdź, czy chcesz pozwolić aplikacji na poniższe działania. Możesz wybrać dowolną liczbę opcji.
     revoke: 
       flash: Cofnąłeś prawa dostępu dla aplikacji {{application}}
+  oauth_clients: 
+    edit: 
+      submit: Edytuj
   site: 
     edit: 
       anon_edits_link_text: Tu dowiesz się dlaczego.
@@ -1173,7 +1201,7 @@ pl:
       count_points: "{{count}} punktów"
       edit: edycja
       edit_map: Edytuj Mapę
-      identifiable: Możliwy do zidentyfikowania
+      identifiable: IDENTYFIKOWALNY
       in: w
       map: mapa
       more: więcej
@@ -1181,7 +1209,7 @@ pl:
       private: PRYWATNY
       public: PUBLICZNY
       trace_details: Pokaż szczegóły śladu
-      trackable: Możliwy do śledzenia
+      trackable: MOŻLIWY DO ŚLEDZENIA
       view_map: Pokaż mapę
     trace_form: 
       description: Opis
@@ -1200,8 +1228,9 @@ pl:
     trace_optionals: 
       tags: Znaczniki
     trace_paging_nav: 
-      of: z
-      showing: Widoczna jest strona
+      next: Następny &raquo;
+      previous: "&laquo; Poprzedni"
+      showing_page: Wyświetlanie strony {{page}}
     view: 
       delete_track: Wykasuj ten ślad
       description: "Opis:"
@@ -1403,9 +1432,20 @@ pl:
       block_expired: Blokada zakończyła się i nie można jej edytować.
       block_period: Długość blokady należy wybrać z listy rozwijanej.
       not_a_moderator: Musisz być moderatorem, by wykonać to działanie.
+    helper: 
+      time_future: Blokada wygasa {{time}}.
+      time_past: Zakończono {{time}} temu.
+      until_login: Aktywne do momentu zalogowania użytkownika.
+    index: 
+      empty: Nie nałożono do tej pory żadnych blokad.
+      heading: Lista blokad użytkowników
+      title: Blokady użytkownika
     model: 
       non_moderator_revoke: Musisz być moderatorem, żeby odwoływać blokady.
       non_moderator_update: Musisz być moderatorem, żeby ustalać i edytować blokady.
+    not_found: 
+      back: Powrót do spisu
+      sorry: Niestety, nie udało się odnaleźć blokady użytkownika o identyfikatorze {{id}}.
     partial: 
       confirm: Na pewno?
       creator_name: Twórca
@@ -1420,6 +1460,14 @@ pl:
     period: 
       one: 1 godzina
       other: "{{count}} godzin"
+    revoke: 
+      confirm: Czy na pewno chcesz odwołać tę blokadę?
+      flash: Blokada została odwołana.
+      heading: Odwoływanie blokady użytkownika {{block_on}} nałożonej przez użytkownika {{block_by}}
+      past: Blokada zakończyła się {{time}} temu i nie można jej odwołać.
+      revoke: Odwołaj
+      time_future: Blokada zakończy się za {{time}}.
+      title: Odwoływanie blokady użytkownika {{block_on}}
     show: 
       back: Przejrzyj wszystkie blokady
       confirm: Na pewno?
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index c415c7456..8a54cdae2 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -969,9 +969,6 @@ pt-BR:
       traces_waiting: Você tem {{count}} trilhas esperando para subir. Por favor considere esperar que elas terminem antes de subir mais, para não bloquear a fila para outros usuários.
     trace_optionals: 
       tags: Etiquetas
-    trace_paging_nav: 
-      of: de
-      showing: Mostrando página
     view: 
       delete_track: Apague esta trilha
       description: "Descrição:"
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 838dcacdd..4ac591b2f 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -130,9 +130,6 @@ pt:
       more: mais
       pending: PENDENTE
       view_map: Ver Mapa
-    trace_paging_nav: 
-      of: de
-      showing: Mostrando página
     view: 
       edit: editar
       map: mapa
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 4aeec76bf..a559e47d0 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -7,6 +7,7 @@
 # Author: Chilin
 # Author: Ezhick
 # Author: Komzpa
+# Author: Lockal
 # Author: Yuri Nazarov
 # Author: Александр Сигачёв
 ru: 
@@ -217,6 +218,13 @@ ru:
       zoom_or_select: Увеличьте или выберите область для просмотра
     tag_details: 
       tags: "Теги:"
+    timeout: 
+      sorry: Извините, данные для {{type}} с id {{id}} слишком длинные для извлечения.
+      type: 
+        changeset: пакета правок
+        node: точки
+        relation: отношения
+        way: линии
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} или {{edit_link}}"
       download_xml: Скачать XML
@@ -388,6 +396,7 @@ ru:
       other: около {{count}} км
       zero: менее 1 км
     results: 
+      more_results: Ещё результаты
       no_results: Ничего не найдено
     search: 
       title: 
@@ -1287,8 +1296,9 @@ ru:
     trace_optionals: 
       tags: "Теги:"
     trace_paging_nav: 
-      of: из
-      showing: Страница
+      next: Следующая →
+      previous: ← Предыдущая
+      showing_page: Показывается страница {{page}}
     view: 
       delete_track: Удалить этот трек
       description: "Описание:"
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 87b23ee5e..463928394 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -7,15 +7,19 @@
 sk: 
   activerecord: 
     attributes: 
+      diary_comment: 
+        body: Telo
       diary_entry: 
         language: Jazyk
         latitude: Zem. šírka
         longitude: Zem. dĺžka
+        title: Nadpis
         user: Užívateľ
       friend: 
         friend: Priateľ
         user: Užívateľ
       message: 
+        body: Telo
         sender: Odosielateľ
       trace: 
         description: Popis
@@ -33,6 +37,7 @@ sk:
         languages: Jazyky
         pass_crypt: Heslo
     models: 
+      country: Krajina
       friend: Priateľ
       language: Jazyk
       message: Správa
@@ -181,6 +186,9 @@ sk:
       zoom_or_select: Priblížiť alebo zvoliť oblasť na mape na zobrazenie
     tag_details: 
       tags: "Tagy:"
+    timeout: 
+      type: 
+        node: uzol
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} alebo {{edit_link}}"
       download_xml: Stiahnuť XML
@@ -201,13 +209,26 @@ sk:
       way_history: História Cesty
       way_history_title: "História Cesty: {{way_name}}"
   changeset: 
+    changeset: 
+      still_editing: (stále sa upravuje)
+    changeset_paging_nav: 
+      next: Ďalšia &raquo;
+      previous: "&laquo; Predošlá"
+      showing_page: Zobrazená stránka {{page}}
     changesets: 
       area: Oblasť
       comment: Komentár
       id: ID
       saved_at: Uložené
       user: Používateľ
+    list: 
+      description: Posledné zmeny
   diary_entry: 
+    diary_entry: 
+      comment_count: 
+        few: "{{count}} komentáre"
+        one: 1 komentár
+        other: "{{count}} komentárov"
     edit: 
       language: "Jazyk:"
       save_button: Uložiť
@@ -219,11 +240,11 @@ sk:
   export: 
     start: 
       add_marker: Pridať marker na mapu
-      area_to_export: Oblasť pre Export
+      area_to_export: Oblasť pre export
       export_button: Export
       export_details: OpenStreetMap údaje sú licencované pod <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.
-      format: Format
-      format_to_export: Formát pre Export
+      format: Formát
+      format_to_export: Formát pre export
       image_size: Veľkosť Obrazu
       latitude: "Zem.šírka:"
       licence: Licencia
@@ -239,14 +260,18 @@ sk:
       add_marker: Pridať marker na mapu
       change_marker: Zmena polohy markera
       click_add_marker: Kliknite na mapu, pre pridanie markera
+      drag_a_box: Označte myšou na mape zvolenú oblasť
       export: Export
       manually_select: Ručne vyberte rôzne oblasti
+      view_larger_map: Zobraziť väčšiu mapu
   geocoder: 
     description: 
       types: 
         cities: Veľkomestá
         places: Miesta
         towns: Mestá
+    description_osm_namefinder: 
+      prefix: "{{distance}} na {{direction}} od {{type}}"
     direction: 
       east: východ
       north: sever
@@ -254,10 +279,21 @@ sk:
       north_west: severozápad
       south: juh
       south_east: juhovýchod
-      south_west: johozápad
+      south_west: juhozápad
       west: západ
+    distance: 
+      one: asi 1 km
+      other: asi {{count}} km
+      zero: menej ako 1 km
     results: 
+      more_results: Viac výsledkov
       no_results: Neboli nájdené žiadne výsledky
+    search: 
+      title: 
+        ca_postcode: Výsledky z <a href="http://geocoder.ca/">Geocoder.CA</a>
+        geonames: Výsledky z <a href="http://www.geonames.org/">GeoNames</a>
+        osm_namefinder: Výsledky z <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        us_postcode: Výsledky z <a href="http://geocoder.us/">Geocoder.us</a>
     search_osm_nominatim: 
       prefix: 
         amenity: 
@@ -272,6 +308,8 @@ sk:
           brothel: Nevestinec
           bus_station: Autobusová stanica
           cafe: Kaviareň
+          car_rental: Požičovňa áut
+          car_wash: Autoumývareň
           casino: Kasíno
           cinema: Kino
           clinic: Poliklinika
@@ -288,10 +326,14 @@ sk:
           emergency_phone: Núdzový telefón
           fast_food: Rýchle občerstvenie
           ferry_terminal: Terminál trajektu
+          fire_hydrant: Požiarny hydrant
           fire_station: Požiarna stanica
           fountain: Fontána
           fuel: Benzínová pumpa
           grave_yard: Cintorín
+          gym: Fitnes centrum / telocvičňa
+          health_centre: Zdravotné stredisko
+          hospital: Nemocnica
           hotel: Hotel
           hunting_stand: Poľovnícky posed
           ice_cream: Zmrzlina
@@ -329,11 +371,14 @@ sk:
           townhall: Radnica
           vending_machine: Predajný automat
           veterinary: Veterinárna ordinácia
+          waste_basket: Odpadkový kôš
+          wifi: Prístup Wi-Fi
           youth_centre: Mládežnícke centrum
         boundary: 
           administrative: Administratívne hranice
         building: 
           apartments: Bytový dom
+          bunker: Bunker
           chapel: Kaplnka
           church: Kostol,cirkev
           city_hall: Radnica,magistrát
@@ -369,6 +414,7 @@ sk:
           pedestrian: Chodník pre chodcov
           primary: Cesta I. triedy
           primary_link: Cesta I. triedy
+          road: Cesta
           secondary: Cesta II. triedy
           secondary_link: Cesta II. triedy
           steps: Schody
@@ -399,29 +445,33 @@ sk:
           cemetery: Cintorín
           commercial: Obchodná štvrť
           farm: Farma
+          farmyard: Dvor
           forest: Les
           grass: Tráva
           industrial: Priemyslová oblasť
+          landfill: Skládka odpadu
           meadow: Lúka
           military: Vojenský priestor
           mine: Baňa
+          mountain: Hora
           nature_reserve: Prírodná rezervácia
           park: Park
           piste: Zjazdovka
           quarry: Lom
+          railway: Železnica
           village_green: Verejná zeleň
           vineyard: Vinica
           wetland: Mokrina
           wood: Drevo
         leisure: 
           common: Verejné priestranstvo
-          fishing: Rybolov(športový)
+          fishing: Rybolov (športový)
           garden: Záhrada
           golf_course: Golfové ihrisko
           ice_rink: Umelé klzisko
           marina: Prístav pre jachty
           miniature_golf: Mini golf
-          nature_reserve: Prírodná Rezervácia
+          nature_reserve: Prírodná rezervácia
           park: Park
           pitch: Športové ihrisko
           playground: Detské ihrisko
@@ -431,9 +481,9 @@ sk:
           stadium: Štadión
           swimming_pool: Plaváreň
           track: Bežecká dráha
-          water_park: Vodný Park
+          water_park: Aquapark
         natural: 
-          bay: Zátoka,Záliv
+          bay: Zátoka, záliv
           beach: Pláž
           cape: Mys
           cave_entrance: Vstup do jaskyne
@@ -452,6 +502,7 @@ sk:
           moor: Močiar
           mud: Bahno
           peak: Vrchol
+          point: Bod
           reef: Bradlo, Skalisko
           ridge: Hrebeň
           river: Rieka
@@ -498,6 +549,8 @@ sk:
           historic_station: Zastávka historickej železnice
           junction: Železničný uzol
           level_crossing: Železničný prejazd
+          light_rail: Ľahká železnica
+          monorail: Jednokoľajka
           narrow_gauge: Úzkokoľajná železnica
           spur: Železničná vlečka
           station: Železničná stanica
@@ -523,15 +576,18 @@ sk:
           confectionery: Cukráreň
           department_store: Obchodný dom
           doityourself: Urob si sám
+          drugstore: Lekáreň
           dry_cleaning: Chemická čistiareň
           electronics: Elektro
           estate_agent: Realitná kancelária
           fish: Obchod s rybami
           florist: Kvetinárstvo
+          food: Obchod s potravinami
           furniture: Nábytok
           gallery: Galéria
           garden_centre: Záhradnícke centrum
           general: Zmiešaný tovar
+          gift: Suveníry
           greengrocer: Obchod so zeleninou
           grocery: Potraviny
           hairdresser: Kaderníctvo,holičstvo
@@ -547,19 +603,20 @@ sk:
           shoes: Obuva
           sports: Športový obchod
           stationery: Papierníctvo
+          supermarket: Supermarket
           toys: Hračkárstvo
           travel_agency: Cestovná kancelária
         tourism: 
           alpine_hut: Vysokohorská chata
           artwork: Umelecké dielo
           attraction: Atrakcia
-          bed_and_breakfast: Posteľ a Raňajky
+          bed_and_breakfast: Nocľah a raňajky
           cabin: Malá chata
           camp_site: Kemping
           caravan_site: Autokemping
           chalet: Veľká chata
           guest_house: Penzión
-          hostel: Ubytovňa,Internát
+          hostel: Ubytovňa, internát
           hotel: Hotel
           information: Informácie
           lean_to: Prístrešok
@@ -582,6 +639,7 @@ sk:
           river: Rieka
           stream: Potok
           wadi: Občasné riečisko(Vádí)
+          water_point: Vodný bod
           waterfall: Vodopád
           weir: Splav
   javascripts: 
@@ -592,17 +650,24 @@ sk:
     edit: Upraviť
     edit_tooltip: Upravovať mapy
     export: Export
+    export_tooltip: Export mapových dát
     help_wiki: Pomocník &amp; Wiki
     history: História
     home: domov
     inbox: správy ({{count}})
+    inbox_tooltip: 
+      few: V schránke máte {{count}} neprečítané správy
+      one: V schránke máte 1 neprečítanú správu
+      other: V schránke máte {{count}} neprečítaných správ
+      zero: Nemáte žiadne neprečítané správy
     log_in: prihlásiť sa
     logo: 
       alt_text: Logo OpenStreetMap
     logout: odhlásiť
     logout_tooltip: Odhlásiť
+    news_blog: Novinkový blog
     shop: Obchod
-    sign_up: prihlásenie
+    sign_up: zaregistrovať sa
     sign_up_tooltip: Vytvorte si účet pre úpravy
     view: Zobraziť
     view_tooltip: Zobraziť mapy
@@ -616,7 +681,12 @@ sk:
     delete: 
       deleted: Správa vymazaná
     inbox: 
+      date: Dátum
       from: Od
+      you_have: Máte {{new_count}} nových a {{old_count}} starých správ
+    mark: 
+      as_read: Správa označená ako prečítaná
+      as_unread: Správa označená ako neprečítaná
     message_summary: 
       delete_button: Zmazať
       read_button: Označiť ako prečítané
@@ -628,15 +698,18 @@ sk:
       send_button: Odoslať
       send_message_to: Poslať novú správu užívateľovi {{name}}
       subject: Predmet
+      title: Odoslať správu
     outbox: 
       date: Dátum
       to: Komu
+      you_have_sent_messages: Máte {{count}} odoslaných správ
     read: 
       date: Dátum
       from: Od
       reply_button: Odpovedať
       subject: Predmet
       to: Komu
+      unread_button: Označiť ako neprečítané
     sent_message_summary: 
       delete_button: Zmazať
   notifier: 
@@ -666,7 +739,7 @@ sk:
       table: 
         entry: 
           apron: 
-            - terminál
+            1: terminál
           bridleway: Chodník pre kone
           building: Významná budova
           cable: 
@@ -676,7 +749,7 @@ sk:
           centre: Športové centrum
           commercial: Komerčná oblasť
           common: 
-            - lúka
+            1: lúka
           cycleway: Cyklotrasa
           farm: Farma
           footway: Chodník pre peších
@@ -706,7 +779,7 @@ sk:
           tourist: Turistická atrakcia
           track: Lesná, poľná cesta
           tram: 
-            - električka
+            1: električka
         heading: Legenda pre z{{zoom_level}}
     search: 
       search: Vyhľadať
@@ -728,7 +801,7 @@ sk:
       map: mapa
       owner: "Vlastník:"
       points: "Body:"
-      save_button: Uložiť Zmeny
+      save_button: Uložiť zmeny
       tags: "Tagy:"
       title: Úprava stopy {{name}}
       uploaded_at: "Nahrať na:"
@@ -747,11 +820,12 @@ sk:
     offline: 
       message: Ukladací priestor GPX súborov a nahrávací systém je teraz neprístupný.
     trace: 
-      ago: "{{time_in_words_ago}} pred"
+      ago: pred {{time_in_words_ago}}
       by: od
       count_points: "{{count}} body"
       edit: upraviť
       edit_map: Upraviť Mapu
+      identifiable: IDENTIFIKOVATEĽNÝ
       in: v
       map: mapa
       more: viac
@@ -764,6 +838,7 @@ sk:
       description: Popis
       help: Pomoc
       tags: Tagy
+      tags_help: oddelené čiarkou
       upload_button: Nahrať
       upload_gpx: Nahrať GPX Súbor
       visibility: Viditeľnosť
@@ -775,9 +850,6 @@ sk:
       traces_waiting: Máte {{count}} stopy čakajúce na nahratie. Prosím zvážte toto čakanie, dokedy neukončíte nahrávanie niečoho iného, pokiaľ  nie je blok v rade pre iných užívateľov.
     trace_optionals: 
       tags: Tagy
-    trace_paging_nav: 
-      of: z
-      showing: Náhľad stránky
     view: 
       delete_track: Vymazať túto stopu
       description: "Popis:"
@@ -806,18 +878,18 @@ sk:
       email never displayed publicly: (nezobrazovaný verejne)
       flash update success: Informácie používateľa boli obnovené.
       flash update success confirm needed: Užívateľské informácie boli úspešne aktualizované. Skontrolujte vašu emailovú adresu pre správu na potvrdenie vašej novej emailovej adresy.
-      home location: "Domáca poloha:"
+      home location: "Domovské miesto:"
       latitude: "Zem. šírka:"
       longitude: "Zem. dĺžka:"
       make edits public button: Zverejniť všetky moje úpravy
       my settings: Moje nastavenia
-      no home location: Nemáte zapísanú vašu domácu polohu.
-      preferred languages: "Prioritné jazyky:"
-      profile description: "Popis Profilu:"
+      no home location: Nezadali ste svoje domovské miesto.
+      preferred languages: "Uprednostňované jazyky:"
+      profile description: "Popis profilu:"
       public editing: 
         disabled: Vypnutý a nemôže upravovať údaje, všetky predchádzajúce úpravy sú anonymné.
         disabled link text: prečo nemôžem upravovať?
-        enabled: Zapnutý. Neanonymný a môže upravovať dáta.
+        enabled: Zapnutý. Nie je anonym a môže upravovať dáta.
         enabled link text: čo je toto?
         heading: "Verejná úprava:"
       public editing note: 
@@ -826,7 +898,7 @@ sk:
       return to profile: Návrat do profilu
       save changes button: Uložiť Zmeny
       title: Upraviť účet
-      update home location on click: Aktualizujem domácu polohu, keď kliknem na mapu?
+      update home location on click: Upraviť polohu domova, kliknutím na mapu?
     confirm: 
       button: Potvrdiť
       failure: Užívateľský účet s týmito údajmi už bol založený.
@@ -903,6 +975,7 @@ sk:
       activate_user: aktivovať tohto užívateľa
       add as friend: pridať ako priateľa
       add image: Pridať Obrázok
+      ago: (pred {{time_in_words_ago}})
       block_history: zobraziť prijaté položky
       blocks on me: v mojom bloku
       change your settings: zmeniť vaše nastavenia
@@ -910,7 +983,7 @@ sk:
       create_block: blokovať tohto užívateľa
       created from: "Vytvorené od:"
       deactivate_user: deaktivovať tohto užívateľa
-      delete image: Zmazať Obrázok
+      delete image: Zmazať obrázok
       delete_user: vymazať tohto užívateľa
       description: Popis
       diary: denník
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index d5e8a03c1..4f3165f82 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -692,9 +692,6 @@ sl:
       see_your_traces: Seznam vseh mojih sledi
     trace_optionals: 
       tags: Oznake
-    trace_paging_nav: 
-      of: od
-      showing: Prikaz strani
     view: 
       delete_track: Izbriši to sled
       description: "Opis:"
diff --git a/config/locales/sr-EC.yml b/config/locales/sr-EC.yml
index 5480d5821..97981417f 100644
--- a/config/locales/sr-EC.yml
+++ b/config/locales/sr-EC.yml
@@ -537,7 +537,7 @@ sr-EC:
         entry: 
           admin: Административна граница
           common: 
-            - ливада
+            1: ливада
           cycleway: Бициклистичка стаза
           farm: Фарма
           footway: Пешачка стаза
@@ -613,8 +613,6 @@ sr-EC:
       see_your_traces: Види све твоје трагове
     trace_optionals: 
       tags: Ознаке
-    trace_paging_nav: 
-      of: од
     view: 
       description: "Опис:"
       download: преузми
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index a674a0027..01f785258 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -442,7 +442,7 @@ sv:
           terrace: Terass
           train_station: Järnvägsstation
         highway: 
-          bus_stop: Busstopp
+          bus_stop: Busshållplats
           construction: Väg under konstruktion
           cycleway: Cykelspår
           footway: Gångväg
@@ -927,9 +927,6 @@ sv:
       traces_waiting: Du har {{count}} GPS-spår som laddas upp. Det är en bra idé att låta dessa bli klara innan du laddar upp fler, så att du inte blockerar uppladdningskön för andra användare.
     trace_optionals: 
       tags: Taggar
-    trace_paging_nav: 
-      of: av
-      showing: Visar sida
     view: 
       delete_track: Radera detta spår
       description: "Beskrivning:"
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index dcdc10709..da1ac19fd 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -217,6 +217,12 @@ uk:
       zoom_or_select: Збільшить масштаб або виберіть ділянку на мапі для перегляду
     tag_details: 
       tags: "Теґи:"
+    timeout: 
+      type: 
+        changeset: набір змін
+        node: точка
+        relation: зв’язок
+        way: лінія
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} або {{edit_link}}"
       download_xml: Завантажити XML
@@ -389,6 +395,7 @@ uk:
       other: близько {{count}} км
       zero: менше ніж 1 км
     results: 
+      more_results: Більше результатів
       no_results: Нічого не знайдено
     search: 
       title: 
@@ -528,6 +535,7 @@ uk:
           tower: Башта
           train_station: Залізнична станція
           university: Університет
+          "yes": Будівля
         highway: 
           bridleway: Дорога для їзди верхи
           bus_stop: Автобусна зупинка
@@ -1259,8 +1267,9 @@ uk:
     trace_optionals: 
       tags: "Теґи:"
     trace_paging_nav: 
-      of: з
-      showing: Сторінка
+      next: Наступна →
+      previous: ← Попередня
+      showing_page: Сторінка {{page}}
     view: 
       delete_track: Вилучити цей трек
       description: "Опис:"
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index dce68a0c6..323a77f80 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1115,9 +1115,6 @@ vi:
       traces_waiting: Bạn có {{count}} tuyến đường đang chờ được tải lên. Xin hãy chờ đợi việc xong trước khi tải lên thêm tuyến đường, để cho người khác vào hàng đợi kịp.
     trace_optionals: 
       tags: Thẻ
-    trace_paging_nav: 
-      of: trong
-      showing: Xem trang
     view: 
       delete_track: Xóa tuyến đường này
       description: "Miêu tả:"
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 09bc53176..a62f76d65 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -463,8 +463,6 @@ zh-CN:
       traces_waiting: 您有 {{count}} 条追踪路径正等待上传，请再您上传更多路径前等待这些传完，以确保不会给其他用户造成队列拥堵。
     trace_optionals: 
       tags: 标签
-    trace_paging_nav: 
-      showing: 显示页
     view: 
       delete_track: 删除这条路径
       description: "描述:"
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index de558359a..2885c3afd 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -770,9 +770,6 @@ zh-TW:
       traces_waiting: 您有 {{count}} 個軌跡等待上傳。請先等待這些結束後才做進一步的上傳，如此才不會阻擋其他使用者的排程。
     trace_optionals: 
       tags: 標籤
-    trace_paging_nav: 
-      of: ／
-      showing: 正在顯示頁面
     view: 
       delete_track: 刪除這個軌跡
       description: 描述：
diff --git a/config/potlatch/autocomplete.txt b/config/potlatch/autocomplete.txt
index 9e60ea372..39a43a844 100644
--- a/config/potlatch/autocomplete.txt
+++ b/config/potlatch/autocomplete.txt
@@ -87,9 +87,9 @@ is_in/way		-
 note/point		-
 note/POI		-
 note/way		-
-source/point	survey,Yahoo,NPE,local_knowledge,GPS,cadastre,OS7,nearmap
-source/POI		survey,Yahoo,NPE,local_knowledge,GPS,cadastre,OS7,nearmap
-source/way		survey,Yahoo,NPE,local_knowledge,GPS,cadastre,OS7,nearmap
+source/point	survey,Yahoo,NPE,local_knowledge,GPS,cadastre,OS7,nearmap,GeoEye,digitalglobe
+source/POI		survey,Yahoo,NPE,local_knowledge,GPS,cadastre,OS7,nearmap,GeoEye,digitalglobe
+source/way		survey,Yahoo,NPE,local_knowledge,GPS,cadastre,OS7,nearmap,GeoEye,digitalglobe
 postal_code/point	-
 postal_code/POI		-
 postal_code/way		-
@@ -122,3 +122,6 @@ wikipedia/point			-
 website/POI				-
 website/way				-
 website/point			-
+earthquake_damage/POI	no,moderate,severe,collapsed
+earthquake_damage/way	no,moderate,severe,collapsed
+earthquake_damage/point	no,moderate,severe,collapsed
diff --git a/config/potlatch/icon_presets.txt b/config/potlatch/icon_presets.txt
index f81d47c3f..d90bc5c60 100644
--- a/config/potlatch/icon_presets.txt
+++ b/config/potlatch/icon_presets.txt
@@ -24,3 +24,4 @@ police	amenity=police
 place_of_worship	amenity=place_of_worship
 museum	tourism=museum
 school	amenity=school
+disaster	building=yes;earthquake_damage=(type damage here)
diff --git a/config/potlatch/locales/en.yml b/config/potlatch/locales/en.yml
index 8d32f98f7..a6852df21 100644
--- a/config/potlatch/locales/en.yml
+++ b/config/potlatch/locales/en.yml
@@ -124,6 +124,10 @@ en:
   option_external: "External launch:"
   option_fadebackground: Fade background
   option_layer_cycle_map: OSM - cycle map
+  option_layer_streets_haiti: "Haiti: street names"
+  option_layer_geoeye_gravitystorm_haiti: "Haiti: GeoEye Jan 13"
+  option_layer_geoeye_nypl_haiti: "Haiti: GeoEye Jan 13+"
+  option_layer_digitalglobe_haiti: "Haiti: DigitalGlobe"
   option_layer_maplint: OSM - Maplint (errors)
   option_layer_mapnik: OSM - Mapnik
   option_layer_nearmap: "Australia: NearMap"
@@ -149,6 +153,7 @@ en:
   preset_icon_cafe: Cafe
   preset_icon_cinema: Cinema
   preset_icon_convenience: Convenience shop
+  preset_icon_disaster: Haiti building
   preset_icon_fast_food: Fast food
   preset_icon_ferry_terminal: Ferry
   preset_icon_fire_station: Fire station
diff --git a/config/potlatch/locales/es.yml b/config/potlatch/locales/es.yml
index 1f6965a4d..6986f977b 100644
--- a/config/potlatch/locales/es.yml
+++ b/config/potlatch/locales/es.yml
@@ -78,6 +78,7 @@ es:
   heading_introduction: Introducción
   heading_pois: Primeros pasos
   heading_quickref: Referencia rápida
+  heading_surveying: Recogida de datos
   heading_tagging: Etiquetando
   heading_troubleshooting: Problemas
   help: Ayuda
@@ -127,6 +128,7 @@ es:
   option_layer_ooc_25k: "Histórico de UK: 1:25k"
   option_layer_ooc_7th: "Histórico de UK: 7th"
   option_layer_ooc_npe: "Histórico de UK: NPE"
+  option_layer_streets_haiti: "Haiti: nombres de calles"
   option_layer_tip: Elija el fondo a mostrar
   option_limitways: Lanza una advertencia al cargar gran cantidad de datos.
   option_microblog_id: "Nombre del microblog:"
@@ -144,6 +146,7 @@ es:
   preset_icon_cafe: Cafetería
   preset_icon_cinema: Cine
   preset_icon_convenience: Tienda de abarrotes, badulaque
+  preset_icon_disaster: Edificio en Haití
   preset_icon_fast_food: Comida rápida
   preset_icon_ferry_terminal: Transbordador
   preset_icon_fire_station: Parque de bomberos
diff --git a/config/potlatch/locales/fr.yml b/config/potlatch/locales/fr.yml
index 6fe6203e1..1f9812725 100644
--- a/config/potlatch/locales/fr.yml
+++ b/config/potlatch/locales/fr.yml
@@ -149,6 +149,7 @@ fr:
   preset_icon_cafe: Café
   preset_icon_cinema: Cinéma
   preset_icon_convenience: Épicerie
+  preset_icon_disaster: Bâtiment à Haiti
   preset_icon_fast_food: Restauration rapide
   preset_icon_ferry_terminal: Terminal de ferry
   preset_icon_fire_station: Caserne de pompiers
diff --git a/config/potlatch/locales/gl.yml b/config/potlatch/locales/gl.yml
index 09740c3b5..b3539eeb4 100644
--- a/config/potlatch/locales/gl.yml
+++ b/config/potlatch/locales/gl.yml
@@ -125,6 +125,7 @@ gl:
   option_layer_ooc_25k: "Historial UK: 1:25k"
   option_layer_ooc_7th: "Historial UK: 7º"
   option_layer_ooc_npe: "Historial UK: NPE"
+  option_layer_streets_haiti: "Haití: nomes de rúas"
   option_layer_tip: Escolla o fondo a mostrar
   option_limitways: Avisar ao cargar moitos datos
   option_microblog_id: "Nome do blogue de mensaxes curtas:"
@@ -142,6 +143,7 @@ gl:
   preset_icon_cafe: Cafetaría
   preset_icon_cinema: Sala de cine
   preset_icon_convenience: Tenda
+  preset_icon_disaster: Construción en Haití
   preset_icon_fast_food: Comida rápida
   preset_icon_ferry_terminal: Terminal de transbordador
   preset_icon_fire_station: Parque de bombeiros
diff --git a/config/potlatch/locales/hr.yml b/config/potlatch/locales/hr.yml
index e302c11e7..0ab4fa424 100644
--- a/config/potlatch/locales/hr.yml
+++ b/config/potlatch/locales/hr.yml
@@ -34,6 +34,7 @@ hr:
   advice_bendy: Previše zavojito za izravnavanje (SHIFT za nasilno)
   advice_deletingpoi: Brisanje POI (Z - poništi)
   advice_deletingway: Brisanje puta (poništi sa Z)
+  advice_microblogged: $1 status je ažuriran
   advice_nocommonpoint: Putevi ne dijele zajedničku točku
   advice_revertingpoi: Vraćam nazad na zadnje spremljeno POI (poništi sa Z)
   advice_revertingway: Vraćanje na zadnji spremljeni put (Z za poništavanje)
@@ -62,6 +63,7 @@ hr:
   emailauthor: \n\nMolim pošalji e-mail richard\@systemeD.net sa izvješćem o bug-u, recite što ste radili u to vrijeme.
   error_anonymous: Ne možete kontaktirati anonimnog mappera.
   error_connectionfailed: Žao mi je, veza sa OpenstreetMap serverom nije uspjela. Neke nedavne promjene nisu spremljene.\n\nŽelite li pokušati ponovno?
+  error_microblog_long: "Slanje na $1 nije uspjelo:\nHTTP code: $2\nPoruka o grešci: $3\n$1 greška: $4"
   error_nopoi: POI se ne može naći (možda ste pomakli kartu), tako da nemogu poništiti.
   error_nosharedpoint: Putevi $1 i $2 više ne dijele zajedničku točku, pa se ne mogu razdvojiti.
   error_noway: Put $1 se ne može pronaći (možda ste pomakli kartu?), pa ne mogu poništiti.
@@ -126,6 +128,8 @@ hr:
   option_layer_ooc_npe: "UK povijesni: NPE"
   option_layer_tip: Izaberite pozadinu za prikaz
   option_limitways: Upozori kada se učitava puno podataka
+  option_microblog_id: "Naziv Microbloga:"
+  option_microblog_pwd: "Microblog lozinka:"
   option_noname: Osvjetli neimenovane ceste
   option_photo: "Fotografija KML:"
   option_thinareas: Koristi take linije za područja
@@ -139,6 +143,7 @@ hr:
   preset_icon_cafe: Caffe bar
   preset_icon_cinema: Kino
   preset_icon_convenience: Trgovina (dućan)
+  preset_icon_disaster: Zgrada u Haiti-u
   preset_icon_fast_food: Fast food
   preset_icon_ferry_terminal: Trajektni terminal
   preset_icon_fire_station: Vatrogasna postaja
@@ -170,6 +175,7 @@ hr:
   prompt_launch: Pokreni eksterni URL
   prompt_live: U načinu "Uredi uživo", svaka stavka koju promjenite će biti trenutno spremljena u OpenstreetMap bazu podataka - nije preporučljivo za početnike. Jeste li sigurni?
   prompt_manyways: Ovo područje je vrlo detaljno i trebati će puno vremena za učitavanje. Želite li zoomirati?
+  prompt_microblog: Å alji na $1 ($2 ostalo)
   prompt_revertversion: "Vrati na prijašnju spremljenu verziju:"
   prompt_savechanges: Spremi promjene
   prompt_taggedpoints: Neke točke na ovom putu su označene (Tags). Stvarno obrisati?
diff --git a/config/potlatch/locales/hu.yml b/config/potlatch/locales/hu.yml
index b131dfbcf..1ca823cde 100644
--- a/config/potlatch/locales/hu.yml
+++ b/config/potlatch/locales/hu.yml
@@ -36,6 +36,7 @@ hu:
   advice_bendy: Túl görbe a kiegyenesítéshez (SHIFT a kényszerítéshez)
   advice_deletingpoi: POI törlése (Z a visszavonáshoz)
   advice_deletingway: Vonal törlése (Z a visszavonáshoz)
+  advice_microblogged: $1 állapotod frissítve
   advice_nocommonpoint: A vonalaknak nincs közös pontjuk
   advice_revertingpoi: Visszaállítás a legutóbb mentett POI-ra (Z a viszavonáshoz)
   advice_revertingway: Visszaállítás a legutóbb mentett vonalra (Z a visszavonáshoz)
@@ -128,6 +129,8 @@ hu:
   option_layer_ooc_npe: "UK történelmi: NPE"
   option_layer_tip: Válaszd ki a megjelenítendő hátteret
   option_limitways: Figyelmeztetés sok adat betöltése előtt
+  option_microblog_id: "Mikroblog neve:"
+  option_microblog_pwd: "Mikroblog jelszava:"
   option_noname: Névtelen utak kiemelése
   option_photo: "Fotó KML:"
   option_thinareas: Vékonyabb vonalak használata területekhez
diff --git a/config/potlatch/locales/mk.yml b/config/potlatch/locales/mk.yml
index 273853657..82efea14d 100644
--- a/config/potlatch/locales/mk.yml
+++ b/config/potlatch/locales/mk.yml
@@ -126,6 +126,7 @@ mk:
   option_layer_ooc_25k: "Историски британски: 1:25k"
   option_layer_ooc_7th: "Историски британски: 7-ми"
   option_layer_ooc_npe: "Историски британски: NPE"
+  option_layer_streets_haiti: "Хаити: имиња на улици"
   option_layer_tip: Изберете позадина
   option_limitways: Предупреди ме кога се вчитува голем број на податоци
   option_microblog_id: "Име на микроблогот:"
@@ -143,6 +144,7 @@ mk:
   preset_icon_cafe: Кафуле
   preset_icon_cinema: Кино
   preset_icon_convenience: Продавница
+  preset_icon_disaster: Објект во Хаити
   preset_icon_fast_food: Брза храна
   preset_icon_ferry_terminal: Ферибот
   preset_icon_fire_station: Пожарна
diff --git a/config/potlatch/locales/nl.yml b/config/potlatch/locales/nl.yml
index 1ba8b97f6..2c977dac7 100644
--- a/config/potlatch/locales/nl.yml
+++ b/config/potlatch/locales/nl.yml
@@ -127,6 +127,7 @@ nl:
   option_layer_ooc_25k: "VK historisch: 1:25k"
   option_layer_ooc_7th: "VK historisch: 7e"
   option_layer_ooc_npe: "VK historisch: NPE"
+  option_layer_streets_haiti: "Haïti: straatnamen"
   option_layer_tip: De achtergrondweergave kiezen
   option_limitways: Waarschuwen als er veel gegevens geladen moeten worden
   option_microblog_id: "Naam microblogdienst:"
@@ -144,6 +145,7 @@ nl:
   preset_icon_cafe: Café
   preset_icon_cinema: Bioscoop
   preset_icon_convenience: Gemakswinkel
+  preset_icon_disaster: Gebouw op Haïti
   preset_icon_fast_food: Fastfood
   preset_icon_ferry_terminal: Veer
   preset_icon_fire_station: Brandweerkazerne
diff --git a/config/potlatch/locales/ru.yml b/config/potlatch/locales/ru.yml
index db19612b1..71756aade 100644
--- a/config/potlatch/locales/ru.yml
+++ b/config/potlatch/locales/ru.yml
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: syck
 # Author: Calibrator
+# Author: Chilin
 # Author: Ilis
 # Author: Александр Сигачёв
 ru: 
@@ -132,6 +133,7 @@ ru:
   option_layer_ooc_7th: "UK historic: 7th"
   option_layer_ooc_npe: "UK historic: NPE"
   option_layer_osmarender: OSM - Osmarender
+  option_layer_streets_haiti: "Гаити: названия улиц"
   option_layer_tip: Выберите фон
   option_layer_yahoo: Yahoo!
   option_limitways: Предупрежд. когда много данных
@@ -150,11 +152,12 @@ ru:
   preset_icon_cafe: Кафе
   preset_icon_cinema: Кинотеатр
   preset_icon_convenience: Минимаркет
-  preset_icon_fast_food: Палатка с едой
+  preset_icon_disaster: Здание на Гаити
+  preset_icon_fast_food: Фастфуд
   preset_icon_ferry_terminal: Паром
   preset_icon_fire_station: Пожарная часть
   preset_icon_hospital: Больница
-  preset_icon_hotel: Гостинница
+  preset_icon_hotel: Гостиница
   preset_icon_museum: Музей
   preset_icon_parking: Стоянка
   preset_icon_pharmacy: Аптека
diff --git a/config/potlatch/locales/sk.yml b/config/potlatch/locales/sk.yml
index aa691e6da..06d837e59 100644
--- a/config/potlatch/locales/sk.yml
+++ b/config/potlatch/locales/sk.yml
@@ -106,7 +106,7 @@ sk:
   offset_choose: Zvoliť vyrovnanie (m)
   offset_dual: Dvojprúdová cesta (D2)
   offset_motorway: Dialnica (D3)
-  ok: V poriadku(Ok)
+  ok: Ok
   openchangeset: Otvorenie súboru zmien
   option_custompointers: Použitie ukazovateľa pera a ruky
   option_external: "Externé spustenie:"
diff --git a/config/potlatch/locales/sv.yml b/config/potlatch/locales/sv.yml
index 58db3d757..80103e73d 100644
--- a/config/potlatch/locales/sv.yml
+++ b/config/potlatch/locales/sv.yml
@@ -117,7 +117,7 @@ sv:
   openchangeset: Öppnar ändringsset
   option_custompointers: Använd penna och handpekare
   option_fadebackground: Mattad bakgrund
-  option_layer_cycle_map: OSM - cykel karta
+  option_layer_cycle_map: OSM - cykelkarta
   option_layer_maplint: OSM - Maplint (fel)
   option_layer_nearmap: "Australien: NearMap"
   option_layer_ooc_25k: Historisk UK karta 1:25k
diff --git a/db/migrate/049_improve_changeset_user_index.rb b/db/migrate/049_improve_changeset_user_index.rb
new file mode 100644
index 000000000..af5d1a2ac
--- /dev/null
+++ b/db/migrate/049_improve_changeset_user_index.rb
@@ -0,0 +1,11 @@
+class ImproveChangesetUserIndex < ActiveRecord::Migration
+  def self.up
+    add_index :changesets, [:user_id, :id], :name => "changesets_user_id_id_idx"
+    remove_index :changesets, :name => "changesets_user_id_idx"
+  end
+
+  def self.down
+    add_index :changesets, [:user_id], :name => "changesets_user_id_idx"
+    remove_index :changesets, [:user_id, :id], :name => "changesets_user_id_id_idx"
+  end
+end
diff --git a/db/migrate/049_add_open_id_authentication_tables.rb b/db/migrate/050_add_open_id_authentication_tables.rb
similarity index 100%
rename from db/migrate/049_add_open_id_authentication_tables.rb
rename to db/migrate/050_add_open_id_authentication_tables.rb
diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf
index 075cdf225..1832aea4b 100644
Binary files a/public/potlatch/potlatch.swf and b/public/potlatch/potlatch.swf differ
diff --git a/test/fixtures/changesets.yml b/test/fixtures/changesets.yml
index f7d898210..d80b517fe 100644
--- a/test/fixtures/changesets.yml
+++ b/test/fixtures/changesets.yml
@@ -1,5 +1,5 @@
 # FIXME! all of these changesets need their bounding boxes set correctly!
-# 
+#
 <% SCALE = 10000000 unless defined?(SCALE) %>
 
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
@@ -7,18 +7,18 @@ normal_user_first_change:
   id: 1
   user_id: 1
   created_at: "2007-01-01 00:00:00"
-  closed_at: <%= DateTime.now + Rational(1,24) %>
+  closed_at: <%= Time.now.utc + 86400 %>
   min_lon: <%= 1 * SCALE %>
   min_lat: <%= 1 * SCALE %>
   max_lon: <%= 5 * SCALE %>
   max_lat: <%= 5 * SCALE %>
   num_changes: 11
-  
+
 public_user_first_change:
   id: 2
   user_id: 2
-  created_at: <%= DateTime.now.utc %>
-  closed_at: <%= DateTime.now + Rational(1,24) %>
+  created_at: <%= Time.now.utc %>
+  closed_at: <%= Time.now.utc + 86400 %>
   num_changes: 0
 
 normal_user_closed_change:
@@ -38,8 +38,8 @@ public_user_closed_change:
 public_user_version_change:
   id: 4
   user_id: 2
-  created_at: <%= DateTime.now.utc %>
-  closed_at: <%= DateTime.now + Rational(1,24) %>
+  created_at: <%= Time.now.utc %>
+  closed_at: <%= Time.now.utc + 86400 %>
   min_lon: <%= 1 * SCALE %>
   min_lat: <%= 1 * SCALE %>
   max_lon: <%= 4 * SCALE %>
@@ -62,7 +62,7 @@ too_many_elements_changeset:
   id: 6
   user_id: 1
   created_at: "2008-01-01 00:00:00"
-  closed_at: <%= DateTime.now + Rational(1,24) %>
+  closed_at: <%= Time.now.utc + 86400 %>
   min_lon: <%= 1 * SCALE %>
   min_lat: <%= 1 * SCALE %>
   max_lon: <%= 4 * SCALE %>
diff --git a/test/functional/trace_controller_test.rb b/test/functional/trace_controller_test.rb
index f60d75679..eb8e675b0 100644
--- a/test/functional/trace_controller_test.rb
+++ b/test/functional/trace_controller_test.rb
@@ -4,82 +4,80 @@ class TraceControllerTest < ActionController::TestCase
   fixtures :users, :gpx_files
   set_fixture_class :gpx_files => 'Trace'
 
-  
+
   # Check that the list of changesets is displayed
   def test_list
     get :list
     assert_response :success
     assert_template 'list'
   end
-  
+
   # Check that I can get mine
   def test_list_mine
     # First try to get it when not logged in
     get :mine
     assert_redirected_to :controller => 'user', :action => 'login', :referer => '/traces/mine'
-    
+
     # Now try when logged in
     get :mine, {}, {:user => users(:public_user).id}
-    assert_response :success
-    assert_template 'mine'
-    # Should really test to see which files are shown to the user
+    assert_redirected_to :controller => 'trace', :action => 'list', :display_name => users(:public_user).display_name
   end
-  
+
   # Check that the rss loads
   def test_rss
     get :georss
     assert_rss_success
-    
+
     get :georss, :display_name => users(:normal_user).display_name
     assert_rss_success
   end
-  
-  def assert_rss_success 
+
+  def assert_rss_success
     assert_response :success
     assert_template nil
     assert_equal "application/rss+xml", @response.content_type
   end
-  
+
   # Check getting a specific trace through the api
   def test_api_details
     # First with no auth
     get :api_details, :id => gpx_files(:public_trace_file).id
     assert_response :unauthorized
-    
+
     # Now with some other user, which should work since the trace is public
     basic_authorization(users(:public_user).display_name, "test")
     get :api_details, :id => gpx_files(:public_trace_file).id
     assert_response :success
-    
+
     # And finally we should be able to do it with the owner of the trace
     basic_authorization(users(:normal_user).display_name, "test")
     get :api_details, :id => gpx_files(:public_trace_file).id
     assert_response :success
   end
-  
+
   # Check an anoymous trace can't be specifically fetched by another user
   def test_api_details_anon
     # Furst with no auth
     get :api_details, :id => gpx_files(:anon_trace_file).id
     assert_response :unauthorized
-    
+
     # Now try with another user, which shouldn't work since the trace is anon
     basic_authorization(users(:normal_user).display_name, "test")
     get :api_details, :id => gpx_files(:anon_trace_file).id
     assert_response :forbidden
-    
+
     # And finally we should be able to get the trace details with the trace owner
     basic_authorization(users(:public_user).display_name, "test")
     get :api_details, :id => gpx_files(:anon_trace_file).id
     assert_response :success
   end
-  
+
   # Check the api details for a trace that doesn't exist
   def test_api_details_not_found
     # Try first with no auth, as it should requure it
     get :api_details, :id => 0
     assert_response :unauthorized
-    
+
     # Login, and try again
     basic_authorization(users(:public_user).display_name, "test")
     get :api_details, :id => 0
diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb
index 361daa996..77d73552a 100644
--- a/test/integration/user_creation_test.rb
+++ b/test/integration/user_creation_test.rb
@@ -10,19 +10,19 @@ class UserCreationTest < ActionController::IntegrationTest
       assert_template 'user/new'
     end
   end
-  
+
   def test_user_create_submit_duplicate_email
     I18n.available_locales.each do |localer|
       dup_email = users(:public_user).email
       display_name = "#{localer.to_s}_new_tester"
       assert_difference('User.count', 0) do
         assert_difference('ActionMailer::Base.deliveries.size', 0) do
-          post '/user/save', 
+          post '/user/save',
             {:user => { :email => dup_email, :email_confirmation => dup_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}},
             {"accept_language" => localer.to_s}
         end
       end
-      assert_response :success                                                                       
+      assert_response :success
       assert_template 'user/new'
       assert_equal response.headers['Content-Language'][0..1], localer.to_s[0..1] unless localer == :root
       assert_select "div#errorExplanation"
@@ -30,7 +30,7 @@ class UserCreationTest < ActionController::IntegrationTest
       assert_no_missing_translations
     end
   end
-  
+
   def test_user_create_submit_duplicate_username
     I18n.available_locales.each do |locale|
       dup_display_name = users(:public_user).display_name
@@ -49,34 +49,34 @@ class UserCreationTest < ActionController::IntegrationTest
       assert_no_missing_translations
     end
   end
-  
+
   def test_user_create_success
     I18n.available_locales.each do |locale|
       new_email = "#{locale.to_s}newtester@osm.org"
       display_name = "#{locale.to_s}_new_tester"
       assert_difference('User.count') do
         assert_difference('ActionMailer::Base.deliveries.size', 1) do
-          post_via_redirect "/user/save", 
+          post_via_redirect "/user/save",
             {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}},
             {"accept_language" => "#{locale.to_s}"}
         end
       end
-      
+
       # Check the e-mail
       register_email = ActionMailer::Base.deliveries.first
-    
+
       assert_equal register_email.to[0], new_email
       # Check that the confirm account url is correct
       assert_match /#{@url}/, register_email.body
-      
+
       # Check the page
       assert_response :success
       assert_template 'login'
-      
+
       ActionMailer::Base.deliveries.clear
     end
   end
-  
+
   # Check that the user can successfully recover their password
   def lost_password_recovery_success
     # Open the lost password form
@@ -94,24 +94,24 @@ class UserCreationTest < ActionController::IntegrationTest
     referer = "/traces/mine"
     assert_difference('User.count') do
       assert_difference('ActionMailer::Base.deliveries.size', 1) do
-        post_via_redirect "/user/save", 
+        post_via_redirect "/user/save",
         {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => password, :pass_crypt_confirmation => password}, :referer => referer }
       end
     end
-      
+
     # Check the e-mail
     register_email = ActionMailer::Base.deliveries.first
-    
+
     assert_equal register_email.to[0], new_email
     # Check that the confirm account url is correct
     confirm_regex = Regexp.new("/user/confirm\\?confirm_string=([a-zA-Z0-9]*)")
     assert_match(confirm_regex, register_email.body)
     confirm_string = confirm_regex.match(register_email.body)[1]
-    
+
     # Check the page
     assert_response :success
     assert_template 'login'
-    
+
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
@@ -120,9 +120,11 @@ class UserCreationTest < ActionController::IntegrationTest
     assert_template 'user/confirm'
 
     post 'user/confirm', { :confirm_string => confirm_string, :confirm_action => 'submit' }
-    assert_response :redirect
+    assert_response :redirect # to trace/mine in original referrer
+    follow_redirect!
+    assert_response :redirect # but it not redirects to /user/<display_name>/traces
     follow_redirect!
     assert_response :success
-    assert_template "trace/mine"
+    assert_template "trace/list.html.erb"
   end
 end