From: Tom Hughes <tom@compton.nu>
Date: Tue, 9 Jun 2009 21:50:37 +0000 (+0000)
Subject: Merge 15722:15806 from head and adjust new views to rails 2 style names.
X-Git-Tag: live~6865^2~20
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/edaddbedaec78a252e988e2271962407e64483fd?hp=ea93ad2f077de1be04a9087c7d20547395fdef9e

Merge 15722:15806 from head and adjust new views to rails 2 style names.
---

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index dd0438218..aee31295c 100644
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -127,14 +127,13 @@ class AmfController < ApplicationController
           case message
             when 'putway';         orn=renumberednodes.dup
                                    r=putway(renumberednodes,*args)
-                                   renumberednodes=r[4].dup
-                                   r[4].delete_if { |k,v| orn.has_key?(k) }
+                                   r[4]=renumberednodes.reject { |k,v| orn.has_key?(k) }
                                    if r[2] != r[3] then renumberedways[r[2]] = r[3] end
                                    results[index]=AMF.putdata(index,r)
             when 'putrelation';    results[index]=AMF.putdata(index,putrelation(renumberednodes, renumberedways, *args))
             when 'deleteway';      results[index]=AMF.putdata(index,deleteway(*args))
             when 'putpoi';         r=putpoi(*args)
-                    	             if r[2] != r[3] then renumberednodes[r[2]] = r[3] end
+                                   if r[2] != r[3] then renumberednodes[r[2]] = r[3] end
                                    results[index]=AMF.putdata(index,r)
             when 'startchangeset'; results[index]=AMF.putdata(index,startchangeset(*args))
            end
@@ -588,11 +587,12 @@ class AmfController < ApplicationController
   # 
   # Returns:
   # 0. '0' (code for success),
-  # 1. original way id (unchanged),
-  # 2. new way id,
-  # 3. hash of renumbered nodes (old id=>new id),
-  # 4. way version,
-  # 5. hash of node versions (node=>version)
+  # 1. message,
+  # 2. original way id (unchanged),
+  # 3. new way id,
+  # 4. hash of renumbered nodes (old id=>new id),
+  # 5. way version,
+  # 6. hash of node versions (node=>version)
 
   def putway(renumberednodes, usertoken, changeset_id, wayversion, originalway, pointlist, attributes, nodes, deletednodes) #:doc:
     amf_handle_error("'putway' #{originalway}") do
diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 8c20ddb4d..d7f3d39c8 100644
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -265,7 +265,7 @@ class ChangesetController < ApplicationController
         else
           conditions = cond_merge conditions, ['false']
         end
-      elsif params[:format] == 'rhtml'
+      elsif request.format == :html
         @title = t 'user.no_such_user.title'
         @not_found_user = params[:display_name]
         render :template => 'user/no_such_user', :status => :not_found
diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 16186314f..165f41306 100644
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -78,6 +78,8 @@ class DiaryEntryController < ApplicationController
   end
 
   def rss
+    request.format = :rss
+
     if params[:display_name]
       user = User.find_by_display_name(params[:display_name], :conditions => {:visible => true})
 
@@ -86,8 +88,6 @@ class DiaryEntryController < ApplicationController
         @title = "OpenStreetMap diary entries for #{user.display_name}"
         @description = "Recent OpenStreetmap diary entries from #{user.display_name}"
         @link = "http://#{SERVER_URL}/user/#{user.display_name}/diary"
-
-        render :content_type => Mime::RSS
       else
         render :nothing => true, :status => :not_found
       end
@@ -98,8 +98,6 @@ class DiaryEntryController < ApplicationController
       @title = "OpenStreetMap diary entries in #{params[:language]}"
       @description = "Recent diary entries from users of OpenStreetMap"
       @link = "http://#{SERVER_URL}/diary/#{params[:language]}"
-      
-      render :content_type => Mime::RSS
     else
       @entries = DiaryEntry.find(:all, :include => :user,
                                  :conditions => ["users.visible = ?", true],
@@ -107,8 +105,6 @@ class DiaryEntryController < ApplicationController
       @title = "OpenStreetMap diary entries"
       @description = "Recent diary entries from users of OpenStreetMap"
       @link = "http://#{SERVER_URL}/diary"
-
-      render :content_type => Mime::RSS
     end
   end
 
diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index 19add265d..8eb698920 100644
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -16,12 +16,9 @@ class NodeController < ApplicationController
 
     node = Node.from_xml(request.raw_post, true)
 
-    if node
-      node.create_with_history @user
-      render :text => node.id.to_s, :content_type => "text/plain"
-    else
-      raise OSM::APIBadXMLError.new(:node, request.raw_post)
-    end
+    # Assume that Node.from_xml has thrown an exception if there is an error parsing the xml
+    node.create_with_history @user
+    render :text => node.id.to_s, :content_type => "text/plain"
   end
 
   # Dump the details on a node given in params[:id]
@@ -39,13 +36,12 @@ class NodeController < ApplicationController
   def update
     node = Node.find(params[:id])
     new_node = Node.from_xml(request.raw_post)
-    
-    if new_node and new_node.id == node.id
-      node.update_from(new_node, @user)
-      render :text => node.version.to_s, :content_type => "text/plain"
-    else
-      render :nothing => true, :status => :bad_request
+       
+    unless new_node and new_node.id == node.id
+      raise OSM::BadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})")
     end
+    node.update_from(new_node, @user)
+    render :text => node.version.to_s, :content_type => "text/plain"
   end
 
   # Delete a node. Doesn't actually delete it, but retains its history 
@@ -55,28 +51,26 @@ class NodeController < ApplicationController
     node = Node.find(params[:id])
     new_node = Node.from_xml(request.raw_post)
     
-    if new_node and new_node.id == node.id
-      node.delete_with_history!(new_node, @user)
-      render :text => node.version.to_s, :content_type => "text/plain"
-    else
-      render :nothing => true, :status => :bad_request
+    unless new_node and new_node.id == node.id
+      raise OSM::BadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})")
     end
+    node.delete_with_history!(new_node, @user)
+    render :text => node.version.to_s, :content_type => "text/plain"
   end
 
   # Dump the details on many nodes whose ids are given in the "nodes" parameter.
   def nodes
     ids = params['nodes'].split(',').collect { |n| n.to_i }
 
-    if ids.length > 0
-      doc = OSM::API.new.get_xml_doc
-
-      Node.find(ids).each do |node|
-        doc.root << node.to_xml_node
-      end 
+    if ids.length == 0
+      raise OSM::BadUserInput.new("No nodes were given to search for")
+    end
+    doc = OSM::API.new.get_xml_doc
 
-      render :text => doc.to_s, :content_type => "text/xml"
-    else
-      render :nothing => true, :status => :bad_request
+    Node.find(ids).each do |node|
+      doc.root << node.to_xml_node
     end
+
+    render :text => doc.to_s, :content_type => "text/xml"
   end
 end
diff --git a/app/models/node.rb b/app/models/node.rb
index 01b0f220e..6ef1b9e6f 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -92,17 +92,14 @@ class Node < ActiveRecord::Base
     node.version = create ? 0 : pt['version'].to_i
 
     unless create
+      raise OSM::APIBadXMLError.new("node", pt, "ID is required when updating.") if pt['id'].nil?
       if pt['id'] != '0'
         node.id = pt['id'].to_i
       end
     end
 
-    # visible if it says it is, or as the default if the attribute
-    # is missing.
-    # Don't need to set the visibility, when it is set explicitly in the create/update/delete
-    #node.visible = pt['visible'].nil? or pt['visible'] == 'true'
-
     # We don't care about the time, as it is explicitly set on create/update/delete
+    # We don't care about the visibility as it is implicit based on the action
 
     tags = []
 
diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 9793caee7..80a8ae485 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -33,7 +33,7 @@ class Notifier < ActionMailer::Base
 
   def gpx_success(trace, possible_points)
     common_headers trace.user
-    subject "[OpenStreetMap] GPX Import success"
+    subject I18n.t('notifier.gpx_notification.success.subject')
     body :trace_name => trace.name,
          :trace_points => trace.size,
          :trace_description => trace.description,
@@ -44,7 +44,7 @@ class Notifier < ActionMailer::Base
   def gpx_failure(trace, error)
     common_headers trace.user
     from "webmaster@openstreetmap.org"
-    subject "[OpenStreetMap] GPX Import failure"
+    subject I18n.t('notifier.gpx_notification.failure.subject')
     body :trace_name => trace.name,
          :trace_description => trace.description,
          :trace_tags => trace.tags,
diff --git a/app/views/api/map.rxml b/app/views/api/map.xml.builder
similarity index 100%
rename from app/views/api/map.rxml
rename to app/views/api/map.xml.builder
diff --git a/app/views/browse/_changeset_details.rhtml b/app/views/browse/_changeset_details.html.erb
similarity index 91%
rename from app/views/browse/_changeset_details.rhtml
rename to app/views/browse/_changeset_details.html.erb
index 92002b6e3..24d5da08c 100644
--- a/app/views/browse/_changeset_details.rhtml
+++ b/app/views/browse/_changeset_details.html.erb
@@ -49,7 +49,7 @@
 
   <% unless @nodes.empty? %>
     <tr valign="top">
-      <th><%= t 'browse.changeset_details.has_nodes', :node_count => @node_pages.item_count %></th>
+      <th><%= t 'browse.changeset_details.has_nodes', :count => @node_pages.item_count %></th>
       <td>
         <table cellpadding="0">
           <% @nodes.each do |node| %>
@@ -63,7 +63,7 @@
   
   <% unless @ways.empty? %>
     <tr valign="top">
-      <th><%= t 'browse.changeset_details.has_ways', :way_count => @way_pages.item_count %></th>
+      <th><%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %></th>
       <td>
         <table cellpadding="0">
           <% @ways.each do |way| %>
@@ -80,7 +80,7 @@
   
   <% unless @relations.empty? %>
     <tr valign="top">
-      <th><%= t 'browse.changeset_details.has_relations', :relation_count => @relation_pages.item_count %></th>
+      <th><%= t 'browse.changeset_details.has_relations', :count => @relation_pages.item_count %></th>
       <td>
         <table cellpadding="0">
           <% @relations.each do |relation| %>
diff --git a/app/views/browse/_common_details.rhtml b/app/views/browse/_common_details.html.erb
similarity index 100%
rename from app/views/browse/_common_details.rhtml
rename to app/views/browse/_common_details.html.erb
diff --git a/app/views/browse/_containing_relation.rhtml b/app/views/browse/_containing_relation.html.erb
similarity index 100%
rename from app/views/browse/_containing_relation.rhtml
rename to app/views/browse/_containing_relation.html.erb
diff --git a/app/views/browse/_map.rhtml b/app/views/browse/_map.html.erb
similarity index 100%
rename from app/views/browse/_map.rhtml
rename to app/views/browse/_map.html.erb
diff --git a/app/views/browse/_navigation.rhtml b/app/views/browse/_navigation.html.erb
similarity index 100%
rename from app/views/browse/_navigation.rhtml
rename to app/views/browse/_navigation.html.erb
diff --git a/app/views/browse/_node_details.rhtml b/app/views/browse/_node_details.html.erb
similarity index 100%
rename from app/views/browse/_node_details.rhtml
rename to app/views/browse/_node_details.html.erb
diff --git a/app/views/browse/_paging_nav.rhtml b/app/views/browse/_paging_nav.html.erb
similarity index 100%
rename from app/views/browse/_paging_nav.rhtml
rename to app/views/browse/_paging_nav.html.erb
diff --git a/app/views/browse/_relation_details.rhtml b/app/views/browse/_relation_details.html.erb
similarity index 100%
rename from app/views/browse/_relation_details.rhtml
rename to app/views/browse/_relation_details.html.erb
diff --git a/app/views/browse/_relation_member.rhtml b/app/views/browse/_relation_member.html.erb
similarity index 100%
rename from app/views/browse/_relation_member.rhtml
rename to app/views/browse/_relation_member.html.erb
diff --git a/app/views/browse/_start.rhtml b/app/views/browse/_start.html.erb
similarity index 100%
rename from app/views/browse/_start.rhtml
rename to app/views/browse/_start.html.erb
diff --git a/app/views/browse/_tag.rhtml b/app/views/browse/_tag.html.erb
similarity index 100%
rename from app/views/browse/_tag.rhtml
rename to app/views/browse/_tag.html.erb
diff --git a/app/views/browse/_tag_details.rhtml b/app/views/browse/_tag_details.html.erb
similarity index 100%
rename from app/views/browse/_tag_details.rhtml
rename to app/views/browse/_tag_details.html.erb
diff --git a/app/views/browse/_way_details.rhtml b/app/views/browse/_way_details.html.erb
similarity index 100%
rename from app/views/browse/_way_details.rhtml
rename to app/views/browse/_way_details.html.erb
diff --git a/app/views/browse/changeset.rhtml b/app/views/browse/changeset.html.erb
similarity index 100%
rename from app/views/browse/changeset.rhtml
rename to app/views/browse/changeset.html.erb
diff --git a/app/views/browse/node.rhtml b/app/views/browse/node.html.erb
similarity index 100%
rename from app/views/browse/node.rhtml
rename to app/views/browse/node.html.erb
diff --git a/app/views/browse/node_history.rhtml b/app/views/browse/node_history.html.erb
similarity index 100%
rename from app/views/browse/node_history.rhtml
rename to app/views/browse/node_history.html.erb
diff --git a/app/views/browse/not_found.rhtml b/app/views/browse/not_found.html.erb
similarity index 100%
rename from app/views/browse/not_found.rhtml
rename to app/views/browse/not_found.html.erb
diff --git a/app/views/browse/relation.rhtml b/app/views/browse/relation.html.erb
similarity index 100%
rename from app/views/browse/relation.rhtml
rename to app/views/browse/relation.html.erb
diff --git a/app/views/browse/relation_history.rhtml b/app/views/browse/relation_history.html.erb
similarity index 100%
rename from app/views/browse/relation_history.rhtml
rename to app/views/browse/relation_history.html.erb
diff --git a/app/views/browse/start.rjs b/app/views/browse/start.rjs
index 64e4431a4..707054526 100644
--- a/app/views/browse/start.rjs
+++ b/app/views/browse/start.rjs
@@ -76,7 +76,7 @@ page << <<EOJ
   }
 
   function startDrag() {
-    $("browse_select_box").innerHTML='#{I18n.t('browse.start_rjs.drag_a_box')}';
+    $("browse_select_box").innerHTML="#{I18n.t('browse.start_rjs.drag_a_box')}";
 
     browseBoxControl.activate();
 
@@ -131,7 +131,7 @@ page << <<EOJ
     var div = document.createElement("div");
 
     var p = document.createElement("p");
-    p.appendChild(document.createTextNode(i18n_js("#{I18n.t('browse.start_rjs.loaded_an_area_with_num_features', :num_features => '{{num_features}}')}", { num_features: browseFeatureList.length })));
+    p.appendChild(document.createTextNode(i18n("#{I18n.t('browse.start_rjs.loaded_an_area_with_num_features')}", { num_features: browseFeatureList.length })));
     div.appendChild(p);
 
     var input = document.createElement("input");
@@ -187,7 +187,7 @@ page << <<EOJ
     var size = projected.getWidth() * projected.getHeight();
 
     if (size > #{APP_CONFIG['max_request_area']}) {
-      setStatus(i18n_js("#{I18n.t('browse.start_rjs.unable_to_load_size', :bbox_size => '{{bbox_size}}', :max_bbox_size => APP_CONFIG['max_request_area'])}", { bbox_size: size }));
+      setStatus(i18n("#{I18n.t('browse.start_rjs.unable_to_load_size', :max_bbox_size => APP_CONFIG['max_request_area'])}", { bbox_size: size }));
     } else {
       loadGML("/api/#{API_VERSION}/map?bbox=" + projected.toBBOX());
     }
@@ -421,7 +421,7 @@ page << <<EOJ
     table.appendChild(tr);
 
     var heading = document.createElement("td");
-    heading.appendChild(document.createTextNode(i18n_js("#{I18n.t('browse.start_rjs.history_for_feature', :feature => '{{feature}}')}", { feature: featureNameHistory(this.feature) })));
+    heading.appendChild(document.createTextNode(i18n("#{I18n.t('browse.start_rjs.history_for_feature')}", { feature: featureNameHistory(this.feature) })));
     tr.appendChild(heading);
 
     var td = document.createElement("td");
@@ -442,7 +442,7 @@ page << <<EOJ
       var user = nodes[i].getAttribute("user") || "#{I18n.t('browse.start_rjs.private_user')}";
       var timestamp = nodes[i].getAttribute("timestamp");
       var item = document.createElement("li");
-      item.appendChild(document.createTextNode(i18n_js("#{I18n.t('browse.start_rjs.edited_by_user_at_timestamp', :user => '{{user}}', :timestamp => '{{timestamp}}')}", { user: user, timestamp: timestamp })));
+      item.appendChild(document.createTextNode(i18n("#{I18n.t('browse.start_rjs.edited_by_user_at_timestamp')}", { user: user, timestamp: timestamp })));
       history.appendChild(item);
     }
     div.appendChild(history);
@@ -470,9 +470,9 @@ page << <<EOJ
     if (feature.attributes.name) {
       return feature.attributes.name;
     } else if (featureType(feature) == "node") {
-      return i18n_js("#{I18n.t('browse.start_rjs.object_list.selected.type.node', :id => '{{id}}')}", { id: feature.osm_id });
+      return i18n("#{I18n.t('browse.start_rjs.object_list.selected.type.node')}", { id: feature.osm_id });
     } else if (featureType(feature) == "way") {
-      return i18n_js("#{I18n.t('browse.start_rjs.object_list.selected.type.way',  :id => '{{id}}')}", { id: feature.osm_id });
+      return i18n("#{I18n.t('browse.start_rjs.object_list.selected.type.way')}", { id: feature.osm_id });
     }
   }
 
@@ -480,28 +480,12 @@ page << <<EOJ
     if (feature.attributes.name) {
       return feature.attributes.name;
     } else if (featureType(feature) == "node") {
-      return i18n_js("#{I18n.t('browse.start_rjs.object_list.history.type.node', :id => '{{id}}')}", { id: feature.osm_id });
+      return i18n("#{I18n.t('browse.start_rjs.object_list.history.type.node')}", { id: feature.osm_id });
     } else if (featureType(feature) == "way") {
-      return i18n_js("#{I18n.t('browse.start_rjs.object_list.history.type.way',  :id => '{{id}}')}", { id: feature.osm_id });
+      return i18n("#{I18n.t('browse.start_rjs.object_list.history.type.way')}", { id: feature.osm_id });
     }
   }
 
-  /*
-   This is a hack so that we can interpolate JavaScript variables in
-   translation strings from Ruby, doing the string replacement
-   client-side instead of on the server.
-  */
-  function i18n_js(string, keys) {
-    for (var key in keys) {
-      var re_key = '\{\{' + key + '\}\}';
-      var re = new RegExp(re_key, "g");
-
-      string = string.replace(re, keys[key]);
-    }
-
-    return string;
-  } 
-
   function setStatus(status) {
     $("browse_status").innerHTML = status;
     $("browse_status").style.display = "block";
diff --git a/app/views/browse/way.rhtml b/app/views/browse/way.html.erb
similarity index 100%
rename from app/views/browse/way.rhtml
rename to app/views/browse/way.html.erb
diff --git a/app/views/browse/way_history.rhtml b/app/views/browse/way_history.html.erb
similarity index 100%
rename from app/views/browse/way_history.rhtml
rename to app/views/browse/way_history.html.erb
diff --git a/app/views/changeset/_changeset.rhtml b/app/views/changeset/_changeset.html.erb
similarity index 100%
rename from app/views/changeset/_changeset.rhtml
rename to app/views/changeset/_changeset.html.erb
diff --git a/app/views/changeset/_changeset_paging_nav.rhtml b/app/views/changeset/_changeset_paging_nav.html.erb
similarity index 100%
rename from app/views/changeset/_changeset_paging_nav.rhtml
rename to app/views/changeset/_changeset_paging_nav.html.erb
diff --git a/app/views/changeset/_changesets.rhtml b/app/views/changeset/_changesets.html.erb
similarity index 100%
rename from app/views/changeset/_changesets.rhtml
rename to app/views/changeset/_changesets.html.erb
diff --git a/app/views/changeset/list.rhtml b/app/views/changeset/list.html.erb
similarity index 100%
rename from app/views/changeset/list.rhtml
rename to app/views/changeset/list.html.erb
diff --git a/app/views/changeset/list.rxml b/app/views/changeset/list.rss.builder
similarity index 100%
rename from app/views/changeset/list.rxml
rename to app/views/changeset/list.rss.builder
diff --git a/app/views/diary_entry/_diary_comment.rhtml b/app/views/diary_entry/_diary_comment.html.erb
similarity index 100%
rename from app/views/diary_entry/_diary_comment.rhtml
rename to app/views/diary_entry/_diary_comment.html.erb
diff --git a/app/views/diary_entry/_diary_entry.rhtml b/app/views/diary_entry/_diary_entry.html.erb
similarity index 100%
rename from app/views/diary_entry/_diary_entry.rhtml
rename to app/views/diary_entry/_diary_entry.html.erb
diff --git a/app/views/diary_entry/edit.rhtml b/app/views/diary_entry/edit.html.erb
similarity index 100%
rename from app/views/diary_entry/edit.rhtml
rename to app/views/diary_entry/edit.html.erb
diff --git a/app/views/diary_entry/list.rhtml b/app/views/diary_entry/list.html.erb
similarity index 100%
rename from app/views/diary_entry/list.rhtml
rename to app/views/diary_entry/list.html.erb
diff --git a/app/views/diary_entry/no_such_entry.rhtml b/app/views/diary_entry/no_such_entry.html.erb
similarity index 100%
rename from app/views/diary_entry/no_such_entry.rhtml
rename to app/views/diary_entry/no_such_entry.html.erb
diff --git a/app/views/diary_entry/no_such_user.rhtml b/app/views/diary_entry/no_such_user.html.erb
similarity index 100%
rename from app/views/diary_entry/no_such_user.rhtml
rename to app/views/diary_entry/no_such_user.html.erb
diff --git a/app/views/diary_entry/rss.rxml b/app/views/diary_entry/rss.rss.builder
similarity index 100%
rename from app/views/diary_entry/rss.rxml
rename to app/views/diary_entry/rss.rss.builder
diff --git a/app/views/diary_entry/view.rhtml b/app/views/diary_entry/view.html.erb
similarity index 100%
rename from app/views/diary_entry/view.rhtml
rename to app/views/diary_entry/view.html.erb
diff --git a/app/views/export/_start.rhtml b/app/views/export/_start.html.erb
similarity index 100%
rename from app/views/export/_start.rhtml
rename to app/views/export/_start.html.erb
diff --git a/app/views/export/start.rjs b/app/views/export/start.rjs
index 8a17ca6ae..c146e236d 100644
--- a/app/views/export/start.rjs
+++ b/app/views/export/start.rjs
@@ -77,7 +77,7 @@ page << <<EOJ
   $("minlat").onchange = boundsChanged;
 
   function startDrag() {
-    $("drag_box").innerHTML='#{I18n.t('export.start_rjs.drag_a_box')}';
+    $("drag_box").innerHTML="#{I18n.t('export.start_rjs.drag_a_box')}";
 
     clearBox();
     box.activate();
@@ -248,7 +248,7 @@ page << <<EOJ
     
     var layers = getMapLayers();
 
-    html += '<br /><small><a href="http://#{SERVER_URL}/?lat='+center.lat+'&lon='+center.lon+'&zoom='+zoom+'&layers='+layers+markerUrl+'">#{I18n.t('export.start_rjs.view_larger_map')}</a></small>';
+    html += '<br /><small><a href="http://#{SERVER_URL}/?lat='+center.lat+'&lon='+center.lon+'&zoom='+zoom+'&layers='+layers+markerUrl+'">'+"#{I18n.t('export.start_rjs.view_larger_map')}"+'</a></small>';
 
     $("export_html_text").value = html;
 
diff --git a/app/views/geocoder/_results.rhtml b/app/views/geocoder/_results.html.erb
similarity index 100%
rename from app/views/geocoder/_results.rhtml
rename to app/views/geocoder/_results.html.erb
diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.html.erb
similarity index 77%
rename from app/views/layouts/site.rhtml
rename to app/views/layouts/site.html.erb
index 7cefc59d8..37d2b1962 100644
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.html.erb
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= I18n.locale %>" lang="<%= I18n.locale %>" dir="<% t'html.dir' %>">
   <head>
     <%= javascript_include_tag 'prototype' %>
     <%= javascript_include_tag 'site' %>
@@ -9,7 +9,7 @@
     <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => "/opensearch/osm.xml" }) %>
     <%= tag("meta", { :name => "description", :content => "OpenStreetMap is the free wiki world map." }) %>
     <%= yield :head %>
-    <title>OpenStreetMap<%= ' | '+ h(@title) if @title %></title>
+    <title><%= t 'layouts.project_name.title' %><%= ' | '+ h(@title) if @title %></title>
   </head>
   <body>
     <div id="content">
@@ -22,14 +22,18 @@
 
     <span id="greeting">
       <% if @user and @user.id %>
-        <%= t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), {:controller => 'user', :action => 'view', :display_name => @user.display_name}) %> | 
-        <% @inbox_weight = 'bold' if @user.new_messages.size > 0 %>
+        <%= t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), {:controller => 'user', :action => 'view', :display_name => @user.display_name}, :title => t('layouts.welcome_user_link_tooltip')) %> | 
         <%= yield :greeting %>
-        <%= link_to t('layouts.inbox', :size => @user.new_messages.size), {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, {:style => "font-weight: #{@inbox_weight};" } %> |
-        <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :referer => request.request_uri}, {:id => 'logoutanchor'}%>
-      <% else %>               
-        <%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.request_uri}, {:id => 'loginanchor'}%> |
-        <%= link_to t('layouts.sign_up'), {:controller => 'user', :action => 'new'}, {:id => 'registeranchor'} %>
+        <%
+        inbox_attributes = {}
+        inbox_attributes[:class] = 'greeting-bar-unread' if @user.new_messages.size > 0
+        inbox_attributes[:title] = t 'layouts.inbox_tooltip', :count => @user.new_messages.size
+        %>
+        <%= link_to t('layouts.inbox', :count => @user.new_messages.size), {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, inbox_attributes %> |
+        <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :referer => request.request_uri}, {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%>
+      <% else %>
+        <%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.request_uri}, {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %> |
+        <%= link_to t('layouts.sign_up'), {:controller => 'user', :action => 'new'}, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %>
       <% end %>
     </span>
 
@@ -65,8 +69,8 @@
 
       <div id="logo">
         <center>
-          <h1>OpenStreetMap</h1>
-          <%= link_to(image_tag("osm_logo.png", :size => "120x120", :border => 0), :controller => 'site', :action => 'index') %><br/>
+          <h1><%= t 'layouts.project_name.h1' %></h1>
+          <%= link_to(image_tag("osm_logo.png", :size => "120x120", :border => 0, :alt => t('layouts.logo.alt_text')), :controller => 'site', :action => 'index') %><br/>
           <h2 class="nowrap"><%= t('layouts.tag_line') %></h2>
         </center>
       </div>
@@ -81,8 +85,8 @@
         </p>
         <p>
         <%= t 'layouts.intro_3', 
-              :ucl => '<a href="http://www.vr.ucl.ac.uk">UCL VR Centre</a>', 
-              :bytemark => '<a href="http://www.bytemark.co.uk">bytemark</a>' %>
+              :ucl => link_to(t('layouts.intro_3_ucl'), "http://www.vr.ucl.ac.uk"), 
+              :bytemark => link_to(t('layouts.intro_3_bytemark'), "http://www.bytemark.co.uk") %>
         </p>
       </div>
       <% end %>
@@ -103,9 +107,9 @@
       <% end %>
 
       <div id="left_menu" class="left_menu">
-        <a href="<%= t 'layouts.help_wiki_url' %>"><%= t 'layouts.help_wiki' %></a><br />
-        <a href="http://www.opengeodata.org/"><%= t 'layouts.news_blog' %></a><br />
-        <a href="<%= t 'layouts.shop_url' %>"><%= t 'layouts.shop' %></a><br />
+        <a href="<%= t 'layouts.help_wiki_url' %>" title="<%= t 'layouts.help_wiki_tooltip' %>"><%= t 'layouts.help_wiki' %></a><br />
+        <a href="http://www.opengeodata.org" title="<%= t 'layouts.news_blog_tooltip' %>"><%= t 'layouts.news_blog' %></a><br />
+        <a href="<%= t 'layouts.shop_url' %>" title="<%= t 'layouts.shop_tooltip' %>"><%= t 'layouts.shop' %></a><br />
         <%= yield :left_menu %>
       </div>
 
diff --git a/app/views/layouts/site.rxml b/app/views/layouts/site.rss.builder
similarity index 100%
rename from app/views/layouts/site.rxml
rename to app/views/layouts/site.rss.builder
diff --git a/app/views/message/_message_summary.rhtml b/app/views/message/_message_summary.html.erb
similarity index 100%
rename from app/views/message/_message_summary.rhtml
rename to app/views/message/_message_summary.html.erb
diff --git a/app/views/message/_sent_message_summary.rhtml b/app/views/message/_sent_message_summary.html.erb
similarity index 100%
rename from app/views/message/_sent_message_summary.rhtml
rename to app/views/message/_sent_message_summary.html.erb
diff --git a/app/views/message/inbox.rhtml b/app/views/message/inbox.html.erb
similarity index 100%
rename from app/views/message/inbox.rhtml
rename to app/views/message/inbox.html.erb
diff --git a/app/views/message/new.rhtml b/app/views/message/new.html.erb
similarity index 100%
rename from app/views/message/new.rhtml
rename to app/views/message/new.html.erb
diff --git a/app/views/message/no_such_user.rhtml b/app/views/message/no_such_user.html.erb
similarity index 100%
rename from app/views/message/no_such_user.rhtml
rename to app/views/message/no_such_user.html.erb
diff --git a/app/views/message/outbox.rhtml b/app/views/message/outbox.html.erb
similarity index 100%
rename from app/views/message/outbox.rhtml
rename to app/views/message/outbox.html.erb
diff --git a/app/views/message/read.rhtml b/app/views/message/read.html.erb
similarity index 100%
rename from app/views/message/read.rhtml
rename to app/views/message/read.html.erb
diff --git a/app/views/notifier/_gpx_description.html.erb b/app/views/notifier/_gpx_description.html.erb
new file mode 100644
index 000000000..282579919
--- /dev/null
+++ b/app/views/notifier/_gpx_description.html.erb
@@ -0,0 +1,14 @@
+<%= t'notifier.gpx_notification.greeting' %>
+
+<%= t'notifier.gpx_notification.your_gpx_file' %>
+
+  <%= @trace_name %>
+
+<%= t'notifier.gpx_notification.with_description' %>
+
+  <%= @trace_description %>
+<% if @trace_tags.length>0 %>
+<%= t'notifier.gpx_notification.and_the_tags' %>
+<% @trace_tags.each do |tag| %>
+  <%= tag.tag.rstrip %><% end %><% else %>
+<%= t'notifier.gpx_notification.and_no_tags' %><% end %>
diff --git a/app/views/notifier/_gpx_description.rhtml b/app/views/notifier/_gpx_description.rhtml
deleted file mode 100644
index b31c7744e..000000000
--- a/app/views/notifier/_gpx_description.rhtml
+++ /dev/null
@@ -1,14 +0,0 @@
-Hi,
-
-It looks like your GPX file
-
-  <%= @trace_name %>
-
-with the description 
-
-  <%= @trace_description %>
-<% if @trace_tags.length>0 %>
-and the following tags:
-<% @trace_tags.each do |tag| %>
-  <%= tag.tag.rstrip %><% end %><% else %>
-and no tags.<% end %>
diff --git a/app/views/notifier/diary_comment_notification.rhtml b/app/views/notifier/diary_comment_notification.html.erb
similarity index 100%
rename from app/views/notifier/diary_comment_notification.rhtml
rename to app/views/notifier/diary_comment_notification.html.erb
diff --git a/app/views/notifier/email_confirm.text.html.rhtml b/app/views/notifier/email_confirm.text.html.erb
similarity index 100%
rename from app/views/notifier/email_confirm.text.html.rhtml
rename to app/views/notifier/email_confirm.text.html.erb
diff --git a/app/views/notifier/email_confirm.text.plain.rhtml b/app/views/notifier/email_confirm.text.plain.erb
similarity index 100%
rename from app/views/notifier/email_confirm.text.plain.rhtml
rename to app/views/notifier/email_confirm.text.plain.erb
diff --git a/app/views/notifier/friend_notification.rhtml b/app/views/notifier/friend_notification.html.erb
similarity index 100%
rename from app/views/notifier/friend_notification.rhtml
rename to app/views/notifier/friend_notification.html.erb
diff --git a/app/views/notifier/gpx_failure.html.erb b/app/views/notifier/gpx_failure.html.erb
new file mode 100644
index 000000000..f59aa3dbb
--- /dev/null
+++ b/app/views/notifier/gpx_failure.html.erb
@@ -0,0 +1,9 @@
+<%= render :partial => "gpx_description" %>
+<%= t'notifier.gpx_notification.failure.failed_to_import' %>
+
+  <%= @error %>
+
+<%= t'notifier.gpx_notification.failure.more_info_1' %>
+<%= t'notifier.gpx_notification.failure.more_info_2' %>
+
+  <%= t'notifier.gpx_notification.failure.import_failures_url' %>
diff --git a/app/views/notifier/gpx_failure.rhtml b/app/views/notifier/gpx_failure.rhtml
deleted file mode 100644
index 70d5d9b71..000000000
--- a/app/views/notifier/gpx_failure.rhtml
+++ /dev/null
@@ -1,9 +0,0 @@
-<%= render :partial => "gpx_description" %>
-failed to import. Here's the error:
-
-  <%= @error %>
-
-More information about GPX import failures and how to avoid
-them can be found at:
-
-  http://wiki.openstreetmap.org/wiki/GPX_Import_Failures
diff --git a/app/views/notifier/gpx_success.html.erb b/app/views/notifier/gpx_success.html.erb
new file mode 100644
index 000000000..1983fe71c
--- /dev/null
+++ b/app/views/notifier/gpx_success.html.erb
@@ -0,0 +1,2 @@
+<%= render :partial => "gpx_description" %>
+<%= t'notifier.gpx_notification.success.loaded_successfully', :trace_points => @trace_points, :possible_points => @possible_points %>
diff --git a/app/views/notifier/gpx_success.rhtml b/app/views/notifier/gpx_success.rhtml
deleted file mode 100644
index 2613d7429..000000000
--- a/app/views/notifier/gpx_success.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= render :partial => "gpx_description" %>
-loaded successfully with <%= @trace_points %> out of a possible
-<%= @possible_points %> points.
diff --git a/app/views/notifier/lost_password.text.html.rhtml b/app/views/notifier/lost_password.text.html.erb
similarity index 100%
rename from app/views/notifier/lost_password.text.html.rhtml
rename to app/views/notifier/lost_password.text.html.erb
diff --git a/app/views/notifier/lost_password.text.plain.rhtml b/app/views/notifier/lost_password.text.plain.erb
similarity index 100%
rename from app/views/notifier/lost_password.text.plain.rhtml
rename to app/views/notifier/lost_password.text.plain.erb
diff --git a/app/views/notifier/message_notification.rhtml b/app/views/notifier/message_notification.html.erb
similarity index 100%
rename from app/views/notifier/message_notification.rhtml
rename to app/views/notifier/message_notification.html.erb
diff --git a/app/views/notifier/reset_password.text.html.rhtml b/app/views/notifier/reset_password.text.html.erb
similarity index 100%
rename from app/views/notifier/reset_password.text.html.rhtml
rename to app/views/notifier/reset_password.text.html.erb
diff --git a/app/views/notifier/reset_password.text.plain.rhtml b/app/views/notifier/reset_password.text.plain.erb
similarity index 100%
rename from app/views/notifier/reset_password.text.plain.rhtml
rename to app/views/notifier/reset_password.text.plain.erb
diff --git a/app/views/notifier/signup_confirm.text.html.rhtml b/app/views/notifier/signup_confirm.text.html.erb
similarity index 100%
rename from app/views/notifier/signup_confirm.text.html.rhtml
rename to app/views/notifier/signup_confirm.text.html.erb
diff --git a/app/views/notifier/signup_confirm.text.plain.rhtml b/app/views/notifier/signup_confirm.text.plain.erb
similarity index 100%
rename from app/views/notifier/signup_confirm.text.plain.rhtml
rename to app/views/notifier/signup_confirm.text.plain.erb
diff --git a/app/views/site/_key.rhtml b/app/views/site/_key.html.erb
similarity index 86%
rename from app/views/site/_key.rhtml
rename to app/views/site/_key.html.erb
index bf7954783..f01cb67dd 100644
--- a/app/views/site/_key.rhtml
+++ b/app/views/site/_key.html.erb
@@ -1,5 +1,5 @@
 <% content_for :left_menu do %>
-<%= link_to_function t('site.key.map_key'), "showKey();" %>
+<%= link_to_function t('site.key.map_key'), "showKey();", { :title => t('site.key.map_key_tooltip') } %>
 <% end %>
 
 <script type="text/javascript">
diff --git a/app/views/site/_search.rhtml b/app/views/site/_search.html.erb
similarity index 100%
rename from app/views/site/_search.rhtml
rename to app/views/site/_search.html.erb
diff --git a/app/views/site/_sidebar.rhtml b/app/views/site/_sidebar.html.erb
similarity index 100%
rename from app/views/site/_sidebar.rhtml
rename to app/views/site/_sidebar.html.erb
diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.html.erb
similarity index 100%
rename from app/views/site/edit.rhtml
rename to app/views/site/edit.html.erb
diff --git a/app/views/site/index.rhtml b/app/views/site/index.html.erb
similarity index 90%
rename from app/views/site/index.rhtml
rename to app/views/site/index.html.erb
index 3bccb7e04..a69a6b4ee 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.html.erb
@@ -1,6 +1,6 @@
 <% content_for :greeting do %>
 <% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
-<%= link_to_function t('site.index.home'), "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)" %> |
+  <%= link_to_function t('layouts.home'), "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)", { :title => t('layouts.home_tooltip') } %> |
 <% end %>
 <% end %>
 
@@ -23,11 +23,15 @@
 <div id="attribution">
   <table width="100%">
     <tr>
-      <td align="left">http://creativecommons.org/licenses/by-sa/2.0/</td>
-      <td align="right">http://openstreetmap.org/</td>
+      <td align="left"><%= t'site.index.license.license_url' %></td>
+      <td align="right"><%= t'site.index.license.project_url' %></td>
     </tr>
     <tr>
-      <td colspan="2" align="center"><%= t 'site.index.license' %></td>
+      <td colspan="2" align="center"><%=
+        t'site.index.license.notice',
+          :license_name => t('site.index.license.license_name'),
+          :project_name => t('site.index.license.project_name')
+        %></td>
     </tr>
   </table>
 </div>
@@ -103,7 +107,7 @@ end
     map = createMap("map");
 
     <% unless OSM_STATUS == :api_offline or OSM_STATUS == :database_offline %>
-    map.dataLayer = new OpenLayers.Layer("Data", { "visibility": false });
+    map.dataLayer = new OpenLayers.Layer("<%= I18n.t 'browse.start_rjs.data_layer_name' %>", { "visibility": false });
     map.dataLayer.events.register("visibilitychanged", map.dataLayer, toggleData);
     map.addLayer(map.dataLayer);
     <% end %>
diff --git a/app/views/site/offline.rhtml b/app/views/site/offline.html.erb
similarity index 100%
rename from app/views/site/offline.rhtml
rename to app/views/site/offline.html.erb
diff --git a/app/views/trace/_trace.rhtml b/app/views/trace/_trace.html.erb
similarity index 100%
rename from app/views/trace/_trace.rhtml
rename to app/views/trace/_trace.html.erb
diff --git a/app/views/trace/_trace_form.rhtml b/app/views/trace/_trace_form.html.erb
similarity index 100%
rename from app/views/trace/_trace_form.rhtml
rename to app/views/trace/_trace_form.html.erb
diff --git a/app/views/trace/_trace_header.rhtml b/app/views/trace/_trace_header.html.erb
similarity index 100%
rename from app/views/trace/_trace_header.rhtml
rename to app/views/trace/_trace_header.html.erb
diff --git a/app/views/trace/_trace_list.rhtml b/app/views/trace/_trace_list.html.erb
similarity index 100%
rename from app/views/trace/_trace_list.rhtml
rename to app/views/trace/_trace_list.html.erb
diff --git a/app/views/trace/_trace_optionals.rhtml b/app/views/trace/_trace_optionals.html.erb
similarity index 100%
rename from app/views/trace/_trace_optionals.rhtml
rename to app/views/trace/_trace_optionals.html.erb
diff --git a/app/views/trace/_trace_paging_nav.rhtml b/app/views/trace/_trace_paging_nav.html.erb
similarity index 100%
rename from app/views/trace/_trace_paging_nav.rhtml
rename to app/views/trace/_trace_paging_nav.html.erb
diff --git a/app/views/trace/create.rhtml b/app/views/trace/create.html.erb
similarity index 100%
rename from app/views/trace/create.rhtml
rename to app/views/trace/create.html.erb
diff --git a/app/views/trace/edit.rhtml b/app/views/trace/edit.html.erb
similarity index 100%
rename from app/views/trace/edit.rhtml
rename to app/views/trace/edit.html.erb
diff --git a/app/views/trace/list.rhtml b/app/views/trace/list.html.erb
similarity index 100%
rename from app/views/trace/list.rhtml
rename to app/views/trace/list.html.erb
diff --git a/app/views/trace/mine.rhtml b/app/views/trace/mine.html.erb
similarity index 100%
rename from app/views/trace/mine.rhtml
rename to app/views/trace/mine.html.erb
diff --git a/app/views/trace/no_such_user.rhtml b/app/views/trace/no_such_user.html.erb
similarity index 100%
rename from app/views/trace/no_such_user.rhtml
rename to app/views/trace/no_such_user.html.erb
diff --git a/app/views/trace/view.rhtml b/app/views/trace/view.html.erb
similarity index 100%
rename from app/views/trace/view.rhtml
rename to app/views/trace/view.html.erb
diff --git a/app/views/user/_friend_map.rhtml b/app/views/user/_friend_map.html.erb
similarity index 100%
rename from app/views/user/_friend_map.rhtml
rename to app/views/user/_friend_map.html.erb
diff --git a/app/views/user/account.rhtml b/app/views/user/account.html.erb
similarity index 100%
rename from app/views/user/account.rhtml
rename to app/views/user/account.html.erb
diff --git a/app/views/user/confirm.rhtml b/app/views/user/confirm.html.erb
similarity index 100%
rename from app/views/user/confirm.rhtml
rename to app/views/user/confirm.html.erb
diff --git a/app/views/user/confirm_email.rhtml b/app/views/user/confirm_email.html.erb
similarity index 100%
rename from app/views/user/confirm_email.rhtml
rename to app/views/user/confirm_email.html.erb
diff --git a/app/views/user/index.rhtml b/app/views/user/index.html.erb
similarity index 100%
rename from app/views/user/index.rhtml
rename to app/views/user/index.html.erb
diff --git a/app/views/user/login.rhtml b/app/views/user/login.html.erb
similarity index 100%
rename from app/views/user/login.rhtml
rename to app/views/user/login.html.erb
diff --git a/app/views/user/lost_password.rhtml b/app/views/user/lost_password.html.erb
similarity index 100%
rename from app/views/user/lost_password.rhtml
rename to app/views/user/lost_password.html.erb
diff --git a/app/views/user/new.rhtml b/app/views/user/new.html.erb
similarity index 100%
rename from app/views/user/new.rhtml
rename to app/views/user/new.html.erb
diff --git a/app/views/user/no_such_user.rhtml b/app/views/user/no_such_user.html.erb
similarity index 100%
rename from app/views/user/no_such_user.rhtml
rename to app/views/user/no_such_user.html.erb
diff --git a/app/views/user/save.rhtml b/app/views/user/save.html.erb
similarity index 100%
rename from app/views/user/save.rhtml
rename to app/views/user/save.html.erb
diff --git a/app/views/user/view.rhtml b/app/views/user/view.html.erb
similarity index 93%
rename from app/views/user/view.rhtml
rename to app/views/user/view.html.erb
index 7113fc39c..6e54fbebb 100644
--- a/app/views/user/view.rhtml
+++ b/app/views/user/view.html.erb
@@ -4,14 +4,14 @@
 <!-- Displaying user's own profile page -->
 <%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %>
 | <%= link_to t('user.view.new diary entry'), :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %>
-| <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name, :format => 'rhtml' %>
+| <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name %>
 | <%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %>
 | <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %>
 <% else %>
 <!-- Displaying another user's profile page -->
 <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :user_id => @this_user.id %>
 | <%= link_to t('user.view.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %>
-| <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list', :display_name => @this_user.display_name, :format => 'rhtml' %>
+| <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list', :display_name => @this_user.display_name %>
 | <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'view', :display_name => @this_user.display_name %>
 | <% if @user and @user.is_friends_with?(@this_user) %>
   <%= link_to t('user.view.remove as friend'), :controller => 'user', :action => 'remove_friend', :display_name => @this_user.display_name %>
@@ -71,7 +71,7 @@
       <% end %>
       </td>
       <td class="username"><%= link_to h(@friend.display_name), :controller => 'user', :action => 'view',  :display_name => @friend.display_name %></td>
-      <td><% if @friend.home_lon and @friend.home_lat %><%= t 'user.view.km away', :distance => @this_user.distance(@friend).round %><% end %></td>
+      <td><% if @friend.home_lon and @friend.home_lat %><%= t 'user.view.km away', :count => @this_user.distance(@friend).round %><% end %></td>
       <td class="message">(<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :user_id => @friend.id %>)</td>
       </tr>
       <%end%>
@@ -93,7 +93,7 @@
       <% @this_user.nearby.each do |nearby| %>
       <tr>
       <td class="username"><%= link_to h(nearby.display_name), :controller => 'user', :action => 'view',  :display_name => nearby.display_name %></td>
-      <td><%= t 'user.view.km away', :distance => @this_user.distance(nearby).round %></td>
+      <td><%= t 'user.view.km away', :count => @this_user.distance(nearby).round %></td>
       <td class="message">(<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :user_id => nearby.id %>)</td>
       </tr>
       <% end %>
diff --git a/app/views/way_tag/search.rhtml b/app/views/way_tag/search.html.erb
similarity index 100%
rename from app/views/way_tag/search.rhtml
rename to app/views/way_tag/search.html.erb
diff --git a/config/locales/be.yml b/config/locales/be.yml
new file mode 100644
index 000000000..e328761f2
--- /dev/null
+++ b/config/locales/be.yml
@@ -0,0 +1,633 @@
+be:
+  activerecord:
+    # Translates all the model names, which is used in error handling on the web site
+    models:
+      acl: "Спіс правоў доступу"
+      changeset: "Набор зменаў"
+      changeset_tag: "Цэтлік набору зменаў"
+      country: "Краіна"
+      diary_comment: "Каментар дзённіка"
+      diary_entry: "Запіс дзённіка"
+      friend: "Сябар"
+      language: "Мова"
+      message: "Паведамленне"
+      node: "Вузел"
+      node_tag: "Цэтлік вузла"
+      notifier: "Абвяшчэнне"
+      old_node: "Стары вузел"
+      old_node_tag: "Стары цэтлік вузла"
+      old_relation: "Старая сувязь"
+      old_relation_member: "Стары ўдзельнік сувязі"
+      old_relation_tag: "Стары цэтлік сувязі"
+      old_way: "Стары шлях"
+      old_way_node: "Стары вузел шляху"
+      old_way_tag: "Стары цэтлік шляху"
+      relation: "Сувязь"
+      relation_member: "Удзельнік сувязі"
+      relation_tag: "Цэтлік сувязі"
+      session: "Сеанс"
+      trace: "Трэк"
+      tracepoint: "Пункт трэку"
+      tracetag: "Цэтлік трэку"
+      user: "Карыстальнік"
+      user_preference: "Настаўленне карыстальніка"
+      user_token: "Адметка карыстальніка"
+      way: "Шлях"
+      way_node: "Вузел шляху"
+      way_tag: "Цэтлік шляху"
+    # Translates all the model attributes, which is used in error handling on the web site
+    # Only the ones that are used on the web site are translated at the moment
+    attributes:
+      diary_comment:
+        body: "Тэкст"
+      diary_entry:
+        user: "Карыстальнік"
+        title: "Загаловак"
+        latitude: "Шырата"
+        longitude: "Даўгата"
+        language: "Мова"
+      friend:
+        user: "Карыстальнік"
+        friend: "Сябар"
+      trace:
+        user: "Сябар"
+        visible: "Бачны"
+        name: "Назва"
+        size: "Памер"
+        latitude: "Шырата"
+        longitude: "Даўгата"
+        public: "Публічны"
+        description: "Апісанне"
+      message:
+        sender: "Ад"
+        title: "Загаловак"
+        body: "Тэкст"
+        recipient: "Каму"
+      user:
+        email: "Email"
+        active: "Актыўны"
+        display_name: "Бачнае імя"
+        description: "Апісанне"
+        languages: "Мовы"
+        pass_crypt: "Пароль"
+  map:
+    view: Карта
+    edit: Змяніць
+    coordinates: "Каардынаты:"
+  browse:
+    changeset:
+      title: "Набор зменаў"
+      changeset: "Набор зменаў:"
+      download: "Сцягнуць {{changeset_xml_link}} ці {{osmchange_xml_link}}"
+      changesetxml: "Changeset XML"
+      osmchangexml: "osmChange XML"
+    changeset_details:
+      created_at: "Створаны:"
+      closed_at: "Закрыты:"
+      belongs_to: "Належыць:"
+      bounding_box: "Межы:"
+      no_bounding_box: "Межы гэтага набора зменаў не вызначаны."
+      show_area_box: "Паказаць мяжу мясцовасці"
+      box: "мяжа"
+      has_nodes: "Складаецца з {{count}} вузлоў:"
+      has_ways: "Складаецца з {{count}} шляхоў:"
+      has_relations: "Складаецца з {{count}} сувязей:"
+    common_details: 
+      edited_at: "Зменена:"
+      edited_by: "Карыстальнікам:"
+      version: "Версія:"
+      in_changeset: "У наборы зменаў:"
+    containing_relation:
+      relation: "Сувязь {{relation_name}}"
+      relation_as: "(як {{relation_role}})"
+    map:
+      loading: "Загрузка..."
+      deleted: "Выдалены"
+      view_larger_map: "Прагледзець большую карту"
+    node_details:
+      coordinates: "Каардынаты: "
+      part_of: "Частка:"
+    node_history:
+      node_history: "Гісторыя вузла"
+      download: "{{download_xml_link}} ці {{view_details_link}}"
+      download_xml: "Сцягнуць XML"
+      view_details: "прагледзіць дэталі"
+    node:
+      node: "Вузел"
+      node_title: "Вузел: {{node_name}}"
+      download: "{{download_xml_link}} ці {{view_history_link}}"
+      download_xml: "Сцягнуць XML"
+      view_history: "прагледзіць гісторыю"
+    not_found:
+      sorry: "Прабачце, {{type}} з нумарам {{id}} не знойдзены."
+    paging_nav:
+      showing_page: "Паказ старонкі"
+      of: "з"
+    relation_details:
+      members: "Удзельнікі:"
+      part_of: "Частка:"
+    relation_history:
+      relation_history: "Гісторыя сувязі"
+      relation_history_title: "Гісторыя сувязі: {{relation_name}}"
+    relation_member:
+      as: "як"
+    relation:
+      relation: "Сувязь"
+      relation_title: "Сувязь: {{relation_name}}"
+      download: "{{download_xml_link}} ці {{view_history_link}}"
+      download_xml: "Сцягнуць XML"
+      view_history: "прагледзець гісторыю"
+    start:
+      view_data: "Прагледзець дадзеныя па бягучым аглядзе"
+      manually_select: "Выбраць іншую мясцовасць"
+    start_rjs:
+      data_frame_title: "Дадзеныя"
+      zoom_or_select: "Наблізьцеся ці выберыце іншую мясцовасць для агляду"
+      drag_a_box: "Расцягніце рамку на карце для выбара іншай мясцовасці"
+      manually_select: "Выбраць іншую мясцовасць"
+      loaded_an_area_with_num_features: "Вы загрузілі мясцовасць, што змяшчае [[num_features]] элементаў.  Увогуле, некаторыя вандроўнікі могуць не здолець апрацаваць гэтакую колькасць дадзеных. Звычайна, найлепшы рэзультат назіраецца, калі элементаў менш за 100, пры большай колькасці вандроўнік можа згубіць хуткасць. Калі вы ўпэўненыя, што хочаце паглядзець на гэтыя дадзеныя, націсніце кнопку ніжэй."
+      load_data: "Загрузіць дадзеныя"
+      unable_to_load_size: "Нельга загрузіць: парем мяжы [[bbox_size]] занадта вялікі (павінен быць не больш як {{max_bbox_size}})"
+      loading: "Загрузка..."
+      show_history: "Паказаць гісторыю"
+      wait: "Пачакайце..."
+      history_for: "Гісторыя для [[feature]]"
+      details: "Падрабязней"
+      private_user: "таемны карыстальнік"
+      edited_by_user_at_timestamp: "Зменена [[user]] у [[timestamp]]"
+    tag_details:
+      tags: "Цэтлікі:"
+    way_details:
+      nodes: "Вузлы:"
+      part_of: "Частка:"
+      also_part_of:
+        one: "таксама частка шляху {{related_ways}}"
+        other: "таксама частка шляхоў {{related_ways}}"
+    way_history:
+      way_history: "Гісторыя шляху"
+      way_history_title: "Гісторыя шляху: {{way_name}}"
+      download: "{{download_xml_link}} ці {{view_details_link}}"
+      download_xml: "Сцягнуць XML"
+      view_details: "прагледзць падрабязней"
+    way:
+      way: "Шлях"
+      way_title: "Шлях: {{way_name}}"
+      download: "{{download_xml_link}} ці {{view_history_link}}"
+      download_xml: "Сцягнуць XML"
+      view_history: "прагледзець гісторыю"
+  changeset:
+    changeset_paging_nav: 
+      showing_page: "Паказваецца старонка"
+      of: "з"
+    changeset:
+      still_editing: "(у працэсе рэдагавання)"
+      anonymous: "Ананімна"
+      no_comment: "(няма)"
+      no_edits: "(без зменаў)"
+      show_area_box: "паказаць мяжу мясцовасці"
+      big_area: "(вялікая)"
+      view_changeset_details: "Падрабязней пра набор зменаў"
+      more: "больш"
+    changesets:
+      id: "ID"
+      saved_at: "Запісаны"
+      user: "Карыстальнік"
+      comment: "Каментар"
+      area: "Мясцовасць"
+    list_bbox:
+      history: "Гісторыя"
+      changesets_within_the_area: "Наборы зменаў у мясцовасці:"
+      show_area_box: "паказаць мяжу мясцовасці"
+      no_changesets: "Няма набораў зменаў"
+      all_changes_everywhere: "Для ўсіх зменаў паўсюль глядзіце {{recent_changes_link}}"
+      recent_changes: "Нядаўнія змены"
+      no_area_specified: "Мясцовасць не зададзена"
+      first_use_view: "Спачатку выкарыстайце {{view_tab_link}} каб выбраць патрэбную вам мясцовасць, і толькі потым заходзьце на картку 'Гісторыя'."
+      view_the_map: "прагледзіць карту"
+      view_tab: "картку агляду"
+      alternatively_view: "Ці вы можаце прагледзіць усе {{recent_changes_link}}"
+    list:
+      recent_changes: "Нядаўнія змены"
+      recently_edited_changesets: "Нядаўна змененыя наборы:"
+      for_more_changesets: "Каб убачыць больш набораў зменаў, выберыце карыстальніка і прагледзьце яго змены, ці перайдзіце на картку 'гісторыя' для пэўнай тэрыторыі."
+    list_user:
+      edits_by_username: "Змены карыстальніка {{username_link}}"
+      no_visible_edits_by: "Няма бычных зменаў карыстальніка {{name}}."
+      for_all_changes: "Для ўсіх зменаў усімі карыстальнікамі глядзіце {{recent_changes_link}}"
+      recent_changes: "Нядаўнія змены"
+  diary_entry:
+    new:
+      title: Новы запіс дзённіку
+    list:
+      title: "Дзённікі карыстальнікаў"
+      user_title: "Дзённік {{user}}"
+      new: Новы запіс дзённіку
+      new_title: Новы запіс для вашага дзённіку
+      no_entries: Няма запісаў
+      recent_entries: "Нядаўнія запісы ў дзённіку: "
+      older_entries: Старэйшыя запісы
+      newer_entries: Навейшыя запісы
+    edit:
+      title: "Змяніць запіс дзённіку"
+      subject: "Тэма: "
+      body: "Цела: "
+      language: "Мова: "
+      location: "Месца: "
+      latitude: "Шырата: "
+      longitude: "Даўгата: "
+      use_map_link: "карыстацца картай"
+      save_button: "Запісаць"
+      marker_text: Месцазнаходжанне запісу дзённіку
+    view:
+      title: "Дзённік карыстальніка | {{user}}"
+      leave_a_comment: "Пакінуць каментар"
+      save_button: "Запісаць"
+    no_such_entry:
+      heading: "Няма запісу з нумарам: {{id}}"
+      body: "Прабаце, не існуе запісу ў дзённіку ці каментара з нумарам {{id}}. Праверце свой правапіс, ці, магчыма, вам далі няправільную спасылку."
+    no_such_user:
+      body: "Прабачце, не існуе карыстальніка {{user}}. Праверце свой правапіс, ці, магчыма, вам далі няправільную спасылку."
+    diary_entry:
+      posted_by: "Напісана {{link_user}} у {{created}} на {{language}}"
+      comment_link: Каментаваць гэты запіс
+      reply_link: Адказаць на гэты запіс
+      comment_count:
+        one: 1 каментар
+        other: "Каментараў: {{count}}"
+      edit_link: Змяніць гэты запіс
+    diary_comment:
+      comment_from: "Каментар {{link_user}} у {{comment_created_at}}"
+  export:
+    start:
+      area_to_export: "Экспартаваць мясцовасць"
+      manually_select: "Выбраць іншую мясцовасць"
+      format_to_export: "Фармат для экспарту"
+      osm_xml_data: "OpenStreetMap XML"
+      mapnik_image: "выява Mapnik"
+      osmarender_image: "выява Osmarender"
+      embeddable_html: "HTML для ўстаўкі"
+      licence: "Ліцэнзія"
+      export_details: 'Дадзеныя праекту OpenStreetMap распаўсюджваюцца па ліцэнзіі <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a>.'
+      options: "Настаўленні"
+      format: "Фармат"
+      scale: "Маштаб"
+      max: "макс"
+      image_size: "Памер выявы"
+      zoom: "маштаб"
+      add_marker: "Дадаць маркер на карту"
+      latitude: "Шыр:"
+      longitude: "Даў:"
+      output: "Вывад"
+      paste_html: "Уставіць HTML для убудовы у вэб-сайт"
+      export_button: "Экспарт"
+    start_rjs:
+      export: "Экспарт"
+      drag_a_box: "Расцягніце рамку на карце для выбара мясцовасці"
+      manually_select: "Выбраць іншую мясцовасць"
+      click_add_marker: "Націсніце на карце, каб дадаць маркер"
+      change_marker: "Змяніць пазіцыю маркера"
+      add_marker: "Дадаць маркер на карту"
+      view_larger_map: "Прагледзець большую карту"
+  geocoder:
+    results:
+      results: "Рэзультаты"
+      type_from_source: "{{type}} з {{source_link}}"
+      no_results: "Нічога не знойдзена"
+  layouts:
+    welcome_user: "Вітаем, {{user_link}}"
+    home: "дамоў"
+    inbox: "уваходныя ({{count}})"
+    logout: выйсці
+    log_in: увайсці
+    sign_up: зарэгістравацца
+    view: Карта
+    edit: Змяніць
+    history: Гісторыя
+    export: Экспарт
+    gps_traces: GPS Трэкі
+    user_diaries: Дзённікі карыстальнікаў
+    tag_line: Свабодная Wiki-карта свету
+    intro_1: "OpenStreetMap - свабодная для рэдагавання карта усяго свету. Яе ствараюць такія ж людзі, як вы."
+    intro_2: "OpenStreetMap дазваляе вам прагледзець, рэдагаваць і карыстацца геаграфічнымі звесткамі ў любым пункце планеты."
+    intro_3: "Хостынг для OpenStreetMap: {{ucl}} і {{bytemark}}."
+    osm_offline: "База дадзеных OpenStreetMap зараз па-за сецівам, таму што праходзіць неабходная тэхнічная праца."
+    osm_read_only: "База дадзеных OpenStreetMap зараз даступная толькі для чытання, таму што праходзіць неабходная тэхнічная праца."
+    donate: "Падтрымайце OpenStreetMap {{link}} у фонд абнаўлення тэхнікі."
+    donate_link_text: ахвяраваннем
+    help_wiki: "Дапамога і Wiki"
+    news_blog: "Блог навінаў"
+    shop: Крама
+    sotm: 'Наведайце канферэнцыю OpenStreetMap, The State of the Map 2009, 10-12 ліпеня у Амстэрдаме!'
+    alt_donation: Зрабіць ахвяраванне
+  notifier:
+    diary_comment_notification:
+      banner1: "*            Калі ласка, не адказвайце на гэтае паведамленне.             *"
+      banner2: "*             Карыстайцеся сайтам OpenStreetMap для адказу.               *"
+      hi: "Вітанні, {{to_user}},"
+      header: "{{from_user}} пракаментаваў ваш запіс у дзённіку на OpenStreetMap з тэмай {{subject}}:"
+      footer: "Вы можаце прагледзець каментар на {{readurl}} і пракаментаваць на {{commenturl}} ці адказаць на {{replyurl}}"
+    friend_notification:
+      had_added_you: "{{user}} дадаў вас, як сябра, на OpenStreetMap."
+      see_their_profile: "Вы можаце прагледзець профіль на {{userurl}} і дадаць, як сябра, у адказ, калі хочаце."
+    signup_confirm_plain:
+      greeting: "Вітанні!"
+      hopefully_you: "Нехта (спадзяемся, вы) хоча стварць рахунак "
+      # next two translations run-on : please word wrap appropriately
+      click_the_link_1: "Калі гэта вы, вітаем! Калі ласка, націсніце спасылку ніжэй, каб "
+      click_the_link_2: "пацвердзіць ваш рахунак і прачытаць больш пра OpenStreetMap."
+      introductory_video: "Вы можаце прагледзець уводнае відэа пра OpenStreetMap тут:"
+      more_videos: "І яшчэ больш відэа тут:"
+      the_wiki: "Пачытайце пра OpenStreetMap на wiki:"
+      opengeodata: "OpenGeoData.org - афіцыйны блог OpenStreetMap, і таксама мае подкасты:"
+      wiki_signup: "Вы таксама можаце захацець зарэгістравацца на  OpenStreetMap wiki на:"
+      # next four translations are in pairs : please word wrap appropriately
+      user_wiki_1: "Рэкамендуем стварыць старонку карыстальніка на wiki, якая будзе уключаць цэтлікі катэгорый,"
+      user_wiki_2: "якія адзначаюць, дзе вы знаходзіцеся, напрыклад [[Category:Users_in_London]]."
+      current_user_1: "Спіс бягучых карыстальнікаў па катэгорыях іх геаграфічнага знаходжання"
+      current_user_2: "даступны на:"
+    signup_confirm_html:
+      greeting: "Вітанні!"
+      hopefully_you: "Нехта (спадзяемся, вы) хоча стварць рахунак"
+      click_the_link: "Калі гэта вы, вітаем! Калі ласка, націсніце спасылку ніжэй, каб пацвердзіць ваш рахунак і прачытаць больш пра OpenStreetMap"
+      introductory_video: "Вы можаце прагледзець {{introductory_video_link}}."
+      video_to_openstreetmap: "уводнае відэа пра OpenStreetMap"
+      more_videos: "Яшчэ больш {{more_videos_link}}."
+      more_videos_here: "відэа тут"
+      get_reading: 'Пачытайце пра OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">на wiki</p> ці  <a href="http://www.opengeodata.org/">блогу opengeodata</a>, на якім таксама ёсць <a href="http://www.opengeodata.org/?cat=13">подкасты</a>!'
+      wiki_signup: 'Вы таксама можаце захацець <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">зарэгістравацца на  OpenStreetMap wiki</a>.'
+      user_wiki_page: 'Рэкамендуем стварыць старонку карыстальніка на wiki, якая будзе уключаць цэтлікі катэгорый, якія адзначаюць, дзе вы знаходзіцеся, напрыклад <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
+      current_user: 'Спіс бягучых карыстальнікаў па катэгорыях іх геаграфічнага знаходжання даступны на  <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
+  message:
+    inbox:
+      title: "Уваходныя"
+      my_inbox: "Мае уваходныя"
+      outbox: "зыходныя"
+      you_have: "У вас {{new_count}} новых і {{old_count}} старых паведамленняў"
+      from: "Ад"
+      subject: "Тэма"
+      date: "Дата"
+      no_messages_yet: "У вас пакуль няма паведамленняў. Чаму б не зкаардэнавацца з  {{people_mapping_nearby_link}}?"
+      people_mapping_nearby: "людзьмі, што жывуць непадалёку" 
+    message_summary:
+      unread_button: "Адзначыць як нечытанае"
+      read_button: "Адзначыць як прачытанае"
+      reply_button: "Адказаць"
+    new:
+      title: "Даслаць паведамленне"
+      send_message_to: "Даслаць новае паведамленне {{name}}"
+      subject: "Тэма"
+      body: "Тэкст"
+      send_button: "Даслаць"
+      back_to_inbox: "Вярнуцца да уваходных"
+      message_sent: "Паведамленне адпраўлена"
+    no_such_user:
+      no_such_user: "Няма такога карыстальніка ці паведамлення"
+      sorry: "Прабачце, няма такога карыстальніка ці паведамлення з такім нумарам"
+    outbox: 
+      title: "Зыходныя"
+      my_inbox: "Мае {{inbox_link}}"
+      inbox: "уваходныя"
+      outbox: "зыходныя"
+      you_have_sent_messages: "У вас {{sent_count}} дасланых паведамленняў"
+      to: "Каму"
+      subject: "Тэма"
+      date: "Дата"
+      no_sent_messages: "У вас пакуль няма дасланых паведамленняў. Чаму б не зкаардэнавацца з {{people_mapping_nearby_link}}?"
+      people_mapping_nearby: "людзьмі, што жывуць непадалёку"
+    read:
+      title: "Прачытаць паведамленне"
+      reading_your_messages: "Чытанне вашых паведамленняў"
+      from: "Ад"
+      subject: "Тэма"
+      date: "Дата"
+      reply_button: "Адказаць"
+      unread_button: "Адзначыць, як непрачытанае"
+      back_to_inbox: "Вярнуцца да ўваходных"
+      reading_your_sent_messages: "Чытанне вашых дасланых паведамленняў"
+      to: "Камууу"
+      back_to_outbox: "Вярнуцца да зыходных"
+    mark:
+      as_read: "Паведамленне адмечана прачытаным"
+      as_unread: "Паведамленне адмечана нечытаным"
+  site:
+    index:
+      js_1: "Вы карыстаецеся вандроўнікам без падтрымкі javascript."
+      js_2: "OpenStreetMap выкарыстоўвае javascript для адлюстравання карты на сайце."
+      js_3: 'Вы можаце паспрабаваць выкарыстаць <a href="http://tah.openstreetmap.org/Browse/">статычны агляд Tiles@Home</a> калі не можаце уключыць javascript.'
+      permalink: Спасылка сюды
+      license:
+        notice: "Ліцэнзіруецца на ўмовах {{license_name}} праектам {{project_name}} і яго карыстальнікамі."
+        license_name: "Creative Commons Attribution-Share Alike 2.0"
+        project_name: "OpenStreetMap"
+    edit:
+      not_public: "Вы не дазволілі зрабіць усе вашыя змены публічнымі."
+      not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
+      user_page_link: user page
+      anon_edits: "({{link}})"
+      anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
+      anon_edits_link_text: "Find out why this is the case."
+      flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
+      potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current шлях ці point, if editing in list mode, ці click save if you have a save button.)"
+    sidebar:
+      search_results: Search Results
+      close: Close
+    search:
+      search: Пошук
+      where_am_i: "Дзе я?"
+      submit_text: "=>"
+      searching: "Пошук..."
+      search_help: "напрыклад: 'Мінск', 'Regent Street, Cambridge', 'CB2 5AQ', ці 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>больш прыкладаў...</a>"
+    key:
+      map_key: "Ключ карты"
+  trace:
+    create:
+      upload_trace: "Зацягнуць GPS-трэк"
+      trace_uploaded: "Ваш GPX-файл быў зацягнуты і чакае ўстаўкі ў базу дадзеных. Гэта звычайна робіцца не больш за паўгадзіны. Вы атрымаеце працврджанне аб заканчэнні працэсу па электроннай пошце"
+    edit:
+      filename: "Назва файла:"
+      uploaded_at: "Зацягнуты:"
+      points: "Пунктаў:"
+      start_coord: "Каардынаты пачатку:"
+      edit: "змяніць"
+      owner: "Уладальнік:"
+      description: "Апісанне:"
+      tags: "Цэтлікі:"
+      save_button: "Запісаць змены"
+    no_such_user:
+      no_such_user: "Прабачце, карыстальнік {{name}} не знойдзены. Калі ласка, праверце свой правапіс, ці, магчыма, вам далі няправільную спасылку."
+    trace_form:
+      upload_gpx: "Зацягнуць GPX-файл"
+      description: "Апісанне"
+      tags: "Цэтлікі"
+      public: "Публічны?"
+      upload_button: "Зацягнуць"
+      help: "Дапамога"
+    trace_header:
+      see_just_your_traces: "Бачыць толькі свае трэкі, ці дадаць трэк"
+      see_all_traces: "Бачыць усе трэкі"
+      see_your_traces: "Бачыць усе свае трэкі"
+      traces_waiting: "У вас {{count}} трэкаў у чарзе. Калі ласка, пачакайце, пакуль яны будуць апрацаваныя, каб не блакірваць чаргу для астатніх карстальнікаў."
+    trace_optionals:
+      tags: "Цэтлікі"
+    view:
+      pending: "У ЧАРЗЕ"
+      filename: "Назва файла:"
+      download: "сцягнуць"
+      uploaded: "Зацягнуты:"
+      points: "Пункты:"
+      start_coordinates: "Каардынаты пачатку:"
+      map: "карта"
+      edit: "змяніць"
+      owner: "Уладальнік:"
+      description: "Апісанне:"
+      tags: "Цэтлікі"
+      none: "Няма"
+      make_public: "Зрабіць гэты трэк агульнадаступным назаўсёды"
+      edit_track: "Змяніць бягучы трэк"
+      delete_track: "Выдаліць гэты трэк"
+      viewing_trace: "Прагляд трэку {{name}}"
+      trace_not_found: "Трэк не знойдзены!"
+    trace_paging_nav:
+      showing: "Прагляд старонкі"
+      of: "з"
+    trace:
+      pending: "У ЧАРЗЕ"
+      count_points: "{{count}} пунктаў"
+      ago: "{{time_in_words_ago}} таму"
+      more: "яшчэ"
+      trace_details: "Прагледзець уласцівасці трэку"
+      view_map: "Прагледзець карту"
+      edit: "змяніць"
+      edit_map: "Змяніць карту"
+      public: "ПУБЛІЧНЫ"
+      private: "ПРЫВАТНЫ"
+      by: " "
+      in: "у"
+      map: "карта"
+    list:
+      public_traces: "Публічныя GPS-трэкі"
+      your_traces: "Вашыя GPS-трэкі"
+      public_traces_from: "Публічныя GPS-трэкі карыстальніка {{user}}"
+      tagged_with: " адмечана як {{tags}}"
+    delete:
+      scheduled_for_deletion: "Трэк запланаваны на выдаленне"
+    make_public:
+      made_public: "Трэк зроблены публічным"
+  user:
+    login:
+      title: "Уваход"
+      heading: "Уваход"
+      please login: "Калі ласка, увайдзіце ці {{create_user_link}}."
+      create_account: "стварыце рахунак"
+      email or username: "Пошта ці імя карыстальніка: "
+      password: "Пароль: "
+      lost password link: "Згубліл пароль?"
+      login_button: "Увайсці"
+      account not active: "Прабачце, ваш рахунак пакуль не актывізаваны.<br>Калі ласка, націсніце на адпаведную спасылку ў лісце пацверджання рахунку, каб актывізаваць яго."
+      auth failure: "Прабачце, немагчыма увайсці з такім адрасам і паролем."
+    lost_password:
+      title: "згублены пароль"
+      heading: "Забылі пароль?"
+      email address: "Паштовы адрас:"
+      new password button: "Выслаць мне новы пароль"
+      notice email on way: "Жаль, што вы яго згубілі :-( але ліст ужо адпраўлены, і вы хутка зможаце яго скінуць."
+      notice email cannot find: "Немагчыма знайсці гэтакі паштовы адрас, прабачце."
+    reset_password:
+      title: "скінуць пароль"
+      flash changed check mail: "Ваш пароль быў скінуты і ўжо на шляху да вашай пошты :-)"
+      flash token bad: "Не знайшоў такі ключ, можа, праверце URL?"
+    new:
+      title: "Стварыць рахунак"
+      heading: "Стварыць рахунак карыстальніка"
+      no_auto_account_create: "На жаль, мы не можам стварыць для вас рахунак аўтаматычна."
+      contact_webmaster: 'Калі ласка, спішыцеся з <a href="mailto:webmaster@openstreetmap.org">вэм-майстрам</a> каб стварыць вам рахунак - мы паспрабуем выдаць вам рахунак як мага хутчэй. '
+      fill_form: "Запоўніце форму, і мы вышлем вам ліст для актывізацыі рахунка."
+      license_agreement: 'Ствараючы рахунак, вы згаджаецеся, што ўсё, што вы зацягнеце на openstreetmap.org і ўсе дадзеныя, створаныя пры выкарыстанні любой утыліты, што звязваецца з openstreetmap.org будуць ліцэнзіравацца (невыключна) на ўмовах <a href="http://creativecommons.org/licenses/by-sa/2.0/">гэтай ліцэнзіі Creative Commons (by-sa)</a>.'
+      email address: "Паштовы адрас: "
+      confirm email address: "Пацверджанне паштовага адрасу: "
+      not displayed publicly: 'Не паказваецца астатнім (глядзіце <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="палітыка неразглашэння на wiki, у тым ліку секцыя пра паштовыя адрасы">палітыку неразглашэння</a>)'
+      display name: "Бачнае імя: "
+      password: "Пароль: "
+      confirm password: "Пацверджанне паролю: "
+      signup: Зарэгістравацца
+      flash create success message: "Карыстальнік паспяхова створаны. Праверце сваю паштовую скрыню - у ёй павыінен быць код пацверджання, і вы зможаце пачаць маляваць наваі зараз! :-)<br /><br />Калі ласка, заўважце, што вы не можаце увайсці, пакуль вы не пацвердзілі свой паштовы адрас.<br /><br />Калі вы карыстаецеся супрацьспамавай сістэмай, якая рассылае запыты на пацверджанне, калі ласка, унясіце ў белы спіс webmaster@openstreetmap.org, бо мы не можам адказваць на запыты пацверджанняў."
+    no_such_user:
+      body: "Прабачце, карыстальнік {{user}} не знойдзены. Please check your spelling, Калі ласка, праверце свой правапіс, ці, магчыма, вам далі няправільную спасылку."
+    view:
+      my diary: мой дзённік
+      new diary entry: новы запіс у дзённіку
+      my edits: мае змены
+      my traces: мае трэкі
+      my settings: мае настаўленні
+      send message: даслаць паведамленне
+      diary: дзённік
+      edits: змены
+      traces: трэкі
+      remove as friend: выдаліць з сяброў
+      add as friend: дадаць у сябры
+      mapper since: "Малюе карту з: "
+      ago: "({{time_in_words_ago}} таму)"
+      user image heading: Выява карыстальніка
+      delete image: Выдаліць выяву
+      upload an image: Зацягнуць выяву
+      add image: Дадаць выяву
+      description: Апісанне
+      user location: Месцазнаходжанне
+      no home location: "Карыстальнік не паказаў сваё месцазнаходжанне."
+      if set location: "Калі вы вызначыце сваё месцазнаходжанне, ніжэй з'явіцца прыгожая карта і ўсё такое. Вы можаце вызначыць сваё месцазнаходжанне на старонцы {{settings_link}}."
+      settings_link_text: настаўленняў
+      your friends: Вашыя сябры
+      no friends: Вы пакуль не дадалі нікога ў сябры.
+      km away: "{{count}} км ад вас"
+      nearby users: "Карыстальнікі непадалёку: "
+      no nearby users: "Пакуль няма карыстальнікаў, што адмецілі сваё месцазнаходжанне непадалёку."
+      change your settings: змяніць вашыя настаўленні
+    friend_map:
+      your location: Ваша месцазнаходжанне
+      nearby mapper: "Карыстальнік: "
+    account:
+      title: "Змяніць рахунак"
+      my settings: Мае настаўленні
+      email never displayed publicly: "(ніколі нікому не паказваецца)"
+      public editing:
+        heading: "Публічнае рэдагаванне: "
+        enabled: "Уключана. Вы - не ананімны і можаце рэдагаваць дадзеныя."
+        enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
+        enabled link text: "што гэта?"
+        disabled: "Адключана. Вы не можаце больш рэдагаваць, але ўсе ранейшыя змены ананімныя."
+        disabled link text: "чаму я не магу рэдагаваць?"
+      profile description: "Апісанне профілю: "
+      preferred languages: "Абраныя мовы: "
+      home location: "Ваша месцазнаходжанне: "
+      no home location: "Вы не выбралі вашае асноўнае месцазнаходжанне."
+      latitude: "Шырата: "
+      longitude: "Даўгата: "
+      update home location on click: "Абнавіць каардэнаты, калі я пстрыкну па карце?"
+      save changes button: Запісаць змены
+      make edits public button: Зрабіць усе мае змены публічнымі
+      return to profile: Вярнуцца да профілю
+      flash update success confirm needed: "Звесткі аб карыстальніку паспяхова абноўленыя. Праверце сваю пошту, вам павінны прыйсці запыт на пацверджанне змены адрасу."
+      flash update success: "Звесткі аб карыстальніку паспяхова абноўленыя."
+    confirm:
+      heading: Пацверджанне рахунку
+      press confirm button: "Націсніце кнопку, каб актывізаваць рахунак."
+      button: Пацвердзіць
+      success: "Рахунак пацверджаны, дзякуй за рэгістрацыю!"
+      failure: "Рахунак карыстальніка з такім ключом ужо пацверджаны."
+    confirm_email:
+      heading: Пацвердзіць змену паштовага адрасу
+      press confirm button: "Націсніце кнопку, каб пацвердзіць ваш новы паштовы адрас."
+      button: Пацвердзіць
+      success: "Ваш адрас пацверджаны, дзякуй за рэгістрацыю!"
+      failure: "Паштовы адрас ужо быў пацаерджаны гэтым ключом."
+    set_home:
+      flash success: "Дамашняе месцазнаходжанне паспяхова запісана"
+    go_public:
+      flash success: "Усе вашыя змены цяпер публічныя, і вам цяпер дазволена рэдагаванне"
+    make_friend:
+      success: "{{name}} цяпер ваш сябар."
+      failed: "Прабачце, немагчыма дадаць {{name}} у якасці сябра."
+      already_a_friend: "Вы ўжо сябруеце з {{name}}."
+    remove_friend:
+      success: "{{name} выдалены са спіса сяброў."
+      not_a_friend: "{{name}} не з'яўляецца вашым сябрам."
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 53b437771..982ec4e66 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1,4 +1,6 @@
 de:
+  html: 
+    dir: ltr
   activerecord:
     # Translates all the model names, which is used in error handling on the web site (1. Teil nicht so wichtig!)
     models:
@@ -89,9 +91,9 @@ de:
       no_bounding_box: "Für dieses Changeset wurde kein Bereich gespeichert."
       show_area_box: "Bereichsgrenze anzeigen"
       box: "Bereichsgrenze"
-      has_nodes: "Enthält folgende {{node_count}} Knoten:"
-      has_ways: "Enthält folgende {{way_count}} Wege:"
-      has_relations: "Enthält folgende {{relation_count}} Relationen:"
+      has_nodes: "Enthält folgende {{count}} Knoten:"
+      has_ways: "Enthält folgende {{count}} Wege:"
+      has_relations: "Enthält folgende {{count}} Relationen:"
     common_details: 
       edited_at: "Bearbeitet am:"
       edited_by: "Bearbeitet von:"
@@ -121,7 +123,7 @@ de:
     not_found:
       sorry: "Wir konnten den {{type}} mit der Nummer {{id}} leider nicht finden. Du hast dich möglicherweise vertippt oder du bist einem ungültigem Link gefolgt."
       type:
-        node: Konten
+        node: Knoten
         way: Weg
         relation: Relation
     paging_nav:
@@ -149,34 +151,34 @@ de:
       zoom_or_select: "Karte vergrössern oder einen Bereich auf der Karte auswählen"
       drag_a_box: "Einen Rahmen über die Karte aufziehen, um einen Bereich auszuwählen"
       manually_select: "Einen anderen Kartenausschnitt manuell auswählen"
-      loaded_an_area_with_num_features: "Du hast einen Bereich geladen, der {{num_features}} Elemente enthält. Manche Browser haben Probleme bei der Darstellung einer so großen Datenmenge. Normalerweise ist es am besten, nur weniger als 100 Elemente zu betrachten; alles andere macht deinen Browser langsam bzw. lässt ihn nicht mehr auf Eingaben reagieren. Wenn du sicher bist, dass du diese Daten darstellen willst, klicke auf \'Daten laden\' unten."
+      loaded_an_area_with_num_features: "Du hast einen Bereich geladen, der [[num_features]] Elemente enthält. Manche Browser haben Probleme bei der Darstellung einer so großen Datenmenge. Normalerweise ist es am besten, nur weniger als 100 Elemente zu betrachten; alles andere macht deinen Browser langsam bzw. lässt ihn nicht mehr auf Eingaben reagieren. Wenn du sicher bist, dass du diese Daten darstellen willst, klicke auf \'Daten laden\' unten."
       load_data: "Daten laden"
-      unable_to_load_size: "Konnte nicht geladen werden: Bereich der Größe {{bbox_size}} ist zu groß (soll kleiner als {{max_bbox_size}} sein)"
+      unable_to_load_size: "Konnte nicht geladen werden: Bereich der Größe [[bbox_size]] ist zu groß (soll kleiner als {{max_bbox_size}} sein)"
       loading: "Laden..."
       show_history: "Chronik"
       wait: "Verarbeiten..."
-      history_for_feature: "Chronik für {{feature}}"
+      history_for_feature: "Chronik für [[feature]]"
       details: "Details"
       private_user: "Anonymer Benutzer"
-      edited_by_user_at_timestamp: "Bearbeitet von {{user}} am {{timestamp}}"
+      edited_by_user_at_timestamp: "Bearbeitet von [[user]] am [[timestamp]]"
       object_list:
         heading: "Object list"
         back: "Display object list"
         type:
-          node: "Konten"
+          node: "Knoten"
           way: "Weg"
           # There's no 'relation' type because it isn't represented in OpenLayers
         api: "Retrieve this area from the API"
         details: "Details"
         selected:
           type:
-            node: "Knoten {{id}}"
-            way: "Weg {{id}}"
+            node: "Knoten [[id]]"
+            way: "Weg [[id]]"
             # There's no 'relation' type because it isn't represented in OpenLayers
         history:
           type:
-            node: "Knoten {{id}}"
-            way: "Weg {{id}}"
+            node: "Knoten [[id]]"
+            way: "Weg [[id]]"
             # There's no 'relation' type because it isn't represented in OpenLayers
     tag_details:
       tags: "Tags:"
@@ -322,11 +324,28 @@ de:
       type_from_source: "{{type}} von {{source_link}}"
       no_results: "Keine Ergebnisse"
   layouts:
+    project_name:
+      # in <title>
+      title: OpenStreetMap
+      # in <h1>
+      h1: OpenStreetMap
+    logo:
+      alt_text: OpenStreetMap logo
     welcome_user: "Willkommen, {{user_link}}"
-    inbox: "Posteingang ({{size}})"
+    welcome_user_link_tooltip: Eigene Benutzerseite
+    home: Standort
+    home_tooltip: Eigener Standort
+    inbox: "Posteingang ({{count}})"
+    inbox_tooltip:
+      zero: Dein Posteingang enthält keine ungelesenen Nachrichten
+      one: Dein Posteingang enthält 1 ungelesene Nachricht
+      other: Dein Posteingang enthält {{count}} ungelesene Nachrichten
     logout: Abmelden
+    logout_tooltip: "Abmelden"
     log_in: Anmelden
+    log_in_tooltip: Für dein Benutzerkonto anmelden
     sign_up: Registrieren
+    sign_up_tooltip: Ein Benutzerkonto zum Daten bearbeiten erstellen
     view: Karte
     view_tooltip: Karte betrachten
     edit: Bearbeiten
@@ -343,13 +362,20 @@ de:
     intro_1: "OpenStreetMap ist eine freie, editierbare Karte der gesamten Welt, die von Menschen wie dir erstellt wird." 
     intro_2: "OpenStreetMap ermöglicht es geographische Daten gemeinschaftlich von überall auf der Welt anzuschauen und zu bearbeiten."
     intro_3: "Das Hosting der OpenStreetMap-Server wird freundlicherweise von {{ucl}} und {{bytemark}} unterstützt."
+    intro_3_ucl: "UCL VR Centre"
+    intro_3_bytemark: "bytemark"
     osm_offline: "Die OpenStreetMap-Datenbank ist im Moment wegen wichtiger Wartungsarbeiten nicht verfügbar."
     osm_read_only: 'Die OpenStreetMap-Datenbank ist im Moment wegen wichtiger Wartungsarbeiten im "Nur-Lesen-Modus".'
     donate: "Unterstütze die OpenStreetMap-Hardwarespendenaktion durch eine eigene {{link}}."
     donate_link_text: Spende
     help_wiki: "Hilfe & Wiki"
+    help_wiki_tooltip: "Hilfe & Wiki; Wiki des Projekts"
+    help_wiki_url: "http://wiki.openstreetmap.org/wiki/Hauptseite"
     news_blog: "News-Blog"
+    news_blog_tooltip: "News-Blog über OpenStreetMap, freie geographische Daten, etc."
     shop: Shop
+    shop_tooltip: Shop with branded OpenStreetMap 
+    shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
     sotm: 'Besuche die OpenStreetMap-Konferenz, The State of the Map 2009, am 10.-12. Juli in Amsterdam!'
     alt_donation: Spenden
   notifier:
@@ -363,7 +389,7 @@ de:
     message_notification:
       subject: "[OpenStreetMap] {{user}} hat dir eine Nachricht gesendet"
       banner1: "*                   Bitte antworte nicht auf diese E-Mail.                    *"
-      banner2: "*                Nutze die OpenStreetMap-Webseite, um zu antworten.                 *"
+      banner2: "*                Nutze die OpenStreetMap-Webseite, um zu antworten.           *"
       hi: "Hallo {{to_user}},"
       header: "{{from_user}} hat dir eine Nachricht über OpenStreetMap mit dem Betreff {{subject}} gesendet:"
       footer1: "Du kannst diese Nachricht auch hier {{readurl}} lesen"
@@ -372,6 +398,23 @@ de:
       subject: "[OpenStreetMap] {{user}} hat dich als Freund hinzugefügt"
       had_added_you: "{{user}} hat dich als Freund hinzugefügt."
       see_their_profile: "Sein Profil ist hier {{userurl}} zu finden, dort kannst du ihn ebenfalls als Freund hinzufügen."
+    gpx_notification:
+      greeting: "Hi,"
+      your_gpx_file: "It looks like your GPX file"
+      with_description: "with the description"
+      and_the_tags: "and the following tags:"
+      and_no_tags: "and no tags."
+      failure:
+        subject: "[OpenStreetMap] GPX Import failure"
+        failed_to_import: "failed to import. Here's the error:"
+        more_info_1: "More information about GPX import failures and how to avoid"
+        more_info_2: "them can be found at:"
+        import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
+      success:
+        subject: "[OpenStreetMap] GPX Import success"
+        loaded_successfully: |
+          loaded successfully with {{trace_points}} out of a possible
+          {{possible_points}} points.
     signup_confirm:
       subject: "[OpenStreetMap] Deine E-Mail-Adresse bestätigen"
     signup_confirm_plain:
@@ -383,8 +426,10 @@ de:
       introductory_video: "Ein Einführungsvideo zu OpenStreetMap kannst du dir hier anschauen:"
       more_videos: "Weitere Videos gibt es hier:"
       the_wiki: "Weitere Informationen über OSM findest du in unserem Wiki:"
+      the_wiki_url: "http://wiki.openstreetmap.org/wiki/DE:Beginners_Guide"
       opengeodata: "OpenGeoData.org ist das OpenStreetMap Blog; dort gibt es auch einen Podcast:"
       wiki_signup: "Im Wiki von OpenStreetMap kannst du dich ebenfalls registrieren:"
+      wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"
       # next four translations are in pairs : please word wrap appropriately
       user_wiki_1: "Es wird begrüßt wenn du dort eine Benutzerseite erstellst, welche"
       user_wiki_2: "einen Kategorie-Tag enthält der auf deinen Standort hinweist, zum Beispiel [[Category:Users_in_München]]."
@@ -398,8 +443,8 @@ de:
       video_to_openstreetmap: "Einführungsvideo zu OpenStreetMap"
       more_videos: "Darüber hinaus gibt es noch viele weitere {{more_videos_link}}."
       more_videos_here: "Videos über OpenStreetMap"
-      get_reading: 'Weitere Informationen über OSM findest du in <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">unserem Wiki</a><br /><a href="http://www.opengeodata.org/">OpenGeoData.org</a> ist das OpenStreetMap Blog; dort gibt es auch einen <a href="http://www.opengeodata.org/?cat=13">Podcast</a>.'
-      wiki_signup: 'Im <a href="http://wiki.openstreetmap.org/wiki/Main_Page">Wiki von OpenStreetMap</a> kannst du dich ebenfalls <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup">registrieren</a>.'
+      get_reading: 'Weitere Informationen über OSM findest du in <a href="http://wiki.openstreetmap.org/wiki/DE:Beginners_Guide">unserem Wiki</a><br /><a href="http://www.opengeodata.org/">OpenGeoData.org</a> ist das OpenStreetMap Blog; dort gibt es auch einen <a href="http://www.opengeodata.org/?cat=13">Podcast</a>.'
+      wiki_signup: 'Im <a href="http://wiki.openstreetmap.org/wiki/Hauptseite">Wiki von OpenStreetMap</a> kannst du dich ebenfalls <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup">registrieren</a>.'
       user_wiki_page: 'Es ist notwendig, dass du eine Wiki-Benutzerseite erstellst.  Bitte füge auch ein Kategorie-Tag ein, das deinen Standort anzeigt, zum Beispiel <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_München">[[Category:Users_in_München]]</a>.'
       current_user: 'Ebenso ist <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">eine Liste mit allen Benutzern in einer Kategorie</a>, die anzeigt wo diese auf der Welt sind, verfügbar.'
     email_confirm:
@@ -487,12 +532,16 @@ de:
       as_unread: "Nachricht als ungelesen markiert"
   site:
     index:
-      home: "home" 
       js_1: "Dein Browser unterstützt kein Javascript oder du hast es deaktiviert."
       js_2: "OpenStreetMap nutzt Javascript für die Kartendarstellung."
       js_3: 'Solltest bei dir kein Javascript möglich sein, kannst du auf der <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home Website</a> eine Version ohne Javascript benutzen.'
       permalink: Permalink
-      license: "Lizenziert unter Creative Commons Attribution-Share Alike 2.0 Lizenz durch das OpenStreetMap Projekt und seine Mitwirkenden."
+      license:
+        notice: "Lizenziert unter {{license_name}} Lizenz durch das {{project_name}} und seine Mitwirkenden."
+        license_name: "Creative Commons Attribution-Share Alike 2.0"
+        license_url: "http://creativecommons.org/licenses/by-sa/2.0/deed.de"
+        project_name: "OpenStreetMap Projekt"
+        project_url: "http://openstreetmap.org"
     edit:
       not_public: "Deine Einstellungen sind auf anonymes Bearbeiten gestellt."
       not_public_description: "Du musst deine Einstellungen auf öffentliches Bearbeiten umstellen. Dies kannst du auf deiner {{user_page}} tun."
@@ -513,6 +562,7 @@ de:
       search_help: "Beispiele: 'München', 'Heinestraße, Würzburg', 'CB2 5AQ', oder 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>mehr Beispiele...</a>"
     key:
       map_key: "Legende"
+      map_key_tooltip: "Map key for the mapnik rendering at this zoom level"
   trace:
     create:
       upload_trace: "Lade einen GPS-Track hoch"
@@ -538,6 +588,7 @@ de:
       public: "Öffentlich?"
       upload_button: "Hochladen"
       help: "Hilfe"
+      help_url: "http://wiki.openstreetmap.org/wiki/DE:Upload"
     trace_header:
       see_just_your_traces: "Eigene GPS-Tracks anzeigen oder neue hinzufügen"
       see_all_traces: "Alle GPS-Tracks"
@@ -656,7 +707,7 @@ de:
       settings_link_text: Einstellungen
       your friends: Eigene Freunde
       no friends: Du hast bis jetzt keine Freunde hinzugefügt.
-      km away: "{{distance}}km entfernt"
+      km away: "{{count}}km entfernt"
       nearby users: "Benutzer in der Nähe: "
       no nearby users: "Es gibt bisher keine Benutzer, die einen Standort in deiner Nähe angegeben haben."
       change your settings: Ändere deine Einstellungen
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d46245ad1..fe5f0f926 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,4 +1,6 @@
 en:
+  html:
+    dir: ltr
   activerecord:
     # Translates all the model names, which is used in error handling on the web site
     models:
@@ -89,9 +91,9 @@ en:
       no_bounding_box: "No bounding box has been stored for this changeset."
       show_area_box: "Show Area Box"
       box: "box"
-      has_nodes: "Has the following {{node_count}} nodes:"
-      has_ways: "Has the following {{way_count}} ways:"
-      has_relations: "Has the following {{relation_count}} relations:"
+      has_nodes: "Has the following {{count}} nodes:"
+      has_ways: "Has the following {{count}} ways:"
+      has_relations: "Has the following {{count}} relations:"
     common_details: 
       edited_at: "Edited at:"
       edited_by: "Edited by:"
@@ -145,20 +147,21 @@ en:
       view_data: "View data for current map view"
       manually_select: "Manually select a different area"
     start_rjs:
+      data_layer_name: "Data"
       data_frame_title: "Data"
       zoom_or_select: "Zoom in or select an area of the map to view"
       drag_a_box: "Drag a box on the map to select an area"
       manually_select: "Manually select a different area"
-      loaded_an_area_with_num_features: "You have loaded an area which contains {{num_features}} features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than 100 features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
+      loaded_an_area_with_num_features: "You have loaded an area which contains [[num_features]] features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than 100 features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
       load_data: "Load Data"
-      unable_to_load_size: "Unable to load: Bounding box size of {{bbox_size}} is too large (must be smaller than {{max_bbox_size}})"
+      unable_to_load_size: "Unable to load: Bounding box size of [[bbox_size]] is too large (must be smaller than {{max_bbox_size}})"
       loading: "Loading..."
       show_history: "Show History"
       wait: "Wait..."
-      history_for_feature: "History for {{feature}}"
+      history_for_feature: "History for [[feature]]"
       details: "Details"
       private_user: "private user"
-      edited_by_user_at_timestamp: "Edited by {{user}} at {{timestamp}}"
+      edited_by_user_at_timestamp: "Edited by [[user]] at [[timestamp]]"
       object_list:
         heading: "Object list"
         back: "Display object list"
@@ -170,13 +173,13 @@ en:
         details: "Details"
         selected:
           type:
-            node: "Node {{id}}"
-            way: "Way {{id}}"
+            node: "Node [[id]]"
+            way: "Way [[id]]"
             # There's no 'relation' type because it isn't represented in OpenLayers
         history:
           type:
-            node: "Node {{id}}"
-            way: "Way {{id}}"
+            node: "Node [[id]]"
+            way: "Way [[id]]"
             # There's no 'relation' type because it isn't represented in OpenLayers
     tag_details:
       tags: "Tags:"
@@ -307,11 +310,28 @@ en:
       type_from_source: "{{type}} from {{source_link}}"
       no_results: "No results found"
   layouts:
+    project_name:
+      # in <title>
+      title: OpenStreetMap
+      # in <h1>
+      h1: OpenStreetMap
+    logo:
+      alt_text: OpenStreetMap logo
     welcome_user: "Welcome, {{user_link}}"
-    inbox: "inbox ({{size}})"
+    welcome_user_link_tooltip: Your user page
+    home: home
+    home_tooltip: Go to home location
+    inbox: "inbox ({{count}})"
+    inbox_tooltip:
+      zero: Your inbox contains no unread messages
+      one: Your inbox contians 1 unread message
+      other: Your inbox contains {{count}} unread messages
     logout: logout
+    logout_tooltip: "Log out"
     log_in: log in
+    log_in_tooltip: Log in with an existing account
     sign_up: sign up
+    sign_up_tooltip: Create an account for editing
     view: View
     view_tooltip: View maps
     edit: Edit
@@ -328,14 +348,19 @@ en:
     intro_1: "OpenStreetMap is a free editable map of the whole world. It is made by people like you."
     intro_2: "OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth."
     intro_3: "OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}."
+    intro_3_ucl: "UCL VR Centre"
+    intro_3_bytemark: "bytemark"
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
     osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
     donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund."
     donate_link_text: donating
     help_wiki: "Help &amp; Wiki"
+    help_wiki_tooltip: "Help &amp; Wiki site for the project"
     help_wiki_url: "http://wiki.openstreetmap.org"
     news_blog: "News blog"
+    news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."
     shop: Shop
+    shop_tooltip: Shop with branded OpenStreetMap 
     shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
     sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
     alt_donation: Make a Donation
@@ -359,6 +384,23 @@ en:
       subject: "[OpenStreetMap] {{user}} added you as a friend"
       had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
       see_their_profile: "You can see their profile at {{userurl}} and add them as a friend too if you wish."
+    gpx_notification:
+      greeting: "Hi,"
+      your_gpx_file: "It looks like your GPX file"
+      with_description: "with the description"
+      and_the_tags: "and the following tags:"
+      and_no_tags: "and no tags."
+      failure:
+        subject: "[OpenStreetMap] GPX Import failure"
+        failed_to_import: "failed to import. Here's the error:"
+        more_info_1: "More information about GPX import failures and how to avoid"
+        more_info_2: "them can be found at:"
+        import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
+      success:
+        subject: "[OpenStreetMap] GPX Import success"
+        loaded_successfully: |
+          loaded successfully with {{trace_points}} out of a possible
+          {{possible_points}} points.
     signup_confirm:
       subject: "[OpenStreetMap] Confirm your email address"
     signup_confirm_plain:
@@ -476,12 +518,16 @@ en:
       as_unread: "Message marked as unread"
   site:
     index:
-      home: "home"
       js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript."
       js_2: "OpenStreetMap uses javascript for its slippy map."
       js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.'
       permalink: Permalink
-      license: "Licensed under the Creative Commons Attribution-Share Alike 2.0 license by the OpenStreetMap project and its contributors."
+      license:
+        notice: "Licensed under the {{license_name}} license by the {{project_name}} and its contributors."
+        license_name: "Creative Commons Attribution-Share Alike 2.0"
+        license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
+        project_name: "OpenStreetMap project"
+        project_url: "http://openstreetmap.org"
     edit:
       not_public: "You haven't set your edits to be public."
       not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
@@ -502,6 +548,7 @@ en:
       search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>"
     key:
       map_key: "Map key"
+      map_key_tooltip: "Map key for the mapnik rendering at this zoom level"
   trace:
     create:
       upload_trace: "Upload GPS Trace"
@@ -646,7 +693,7 @@ en:
       settings_link_text: settings
       your friends: Your friends
       no friends: You have not added any friends yet.
-      km away: "{{distance}}km away"
+      km away: "{{count}}km away"
       nearby users: "Nearby users: "
       no nearby users: "There are no users who admit to mapping nearby yet."
       change your settings: change your settings
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index e844d028c..a1c3c63aa 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -17,9 +17,9 @@ fr:
       no_bounding_box: "Aucune bounding box n'a été stockée pour ce changeset."
       show_area_box: "Montrer la boite"
       box: "boite"
-      has_nodes: "A les {{node_count}} points suivants :"
-      has_ways: "A les {{way_count}} ways suivants :"
-      has_relations: "A les {{relation_count}} relations suivantes :"
+      has_nodes: "A les {{count}} points suivants :"
+      has_ways: "A les {{count}} ways suivants :"
+      has_relations: "A les {{count}} relations suivantes :"
     common_details:
       edited_at: "Édité le :"
       edited_by: "Édité par :"
@@ -64,16 +64,16 @@ fr:
       zoom_or_select: "Zoomer ou sélectionner une zone de la carte pour la visualiser"
       drag_a_box: "Dessiner une boite sur la carte pour sélectionner une zone"
       manually_select: "Sélectionner manuellement une zone différente"
-      loaded_an_area_with_num_features: "Vous avez chargé une zone qui contient {{num_features}} un grand nombre d'éléments. En général, les navigateurs ne supportent pas bien l'affichage de tant de données, et travaillent mieux lorsqu'ils affichent moins de 100 éléments : accepter peut rendre votre navigateur lent ou non fonctionnel. Si vous etes sûr de vouloir afficher ces données, vous pouvez le faire en appuyant sur le bouton ci-dessous."
+      loaded_an_area_with_num_features: "Vous avez chargé une zone qui contient [[num_features]] un grand nombre d'éléments. En général, les navigateurs ne supportent pas bien l'affichage de tant de données, et travaillent mieux lorsqu'ils affichent moins de 100 éléments : accepter peut rendre votre navigateur lent ou non fonctionnel. Si vous etes sûr de vouloir afficher ces données, vous pouvez le faire en appuyant sur le bouton ci-dessous."
       load_data: "Charger les données"
-      unable_to_load_size: "Impossible de charger les données : la Bounding box d'une taille de {{bbox_size}} est trop grande (elle doit être plus petite que {{max_bbox_size}})"
+      unable_to_load_size: "Impossible de charger les données : la Bounding box d'une taille de [[bbox_size]] est trop grande (elle doit être plus petite que {{max_bbox_size}})"
       loading: "Chargement..."
       show_history: "Montrer l'historique"
       wait: "Patienter..."
-      history_for_feature: "Historique pour {{feature}}"
+      history_for_feature: "Historique pour [[feature]]"
       details: "Détails"
       private_user: "utilisateur privé"
-      edited_by_user_at_timestamp: "Édité par {{user}} le {{timestamp}}"
+      edited_by_user_at_timestamp: "Édité par [[user]] le [[timestamp]]"
   diary_entry:
     new:
       title: "Nouvelle entrée du journal"
@@ -111,7 +111,7 @@ fr:
       comment_from: "Commentaire de {{link_user}} le {{comment_created_at}}"
   layouts:
     welcome_user: "Bienvenue, {{user_link}}"
-    inbox: "Boite aux lettres ({{size}})"
+    inbox: "Boite aux lettres ({{count}})"
     logout: "Déconnexion"
     log_in: "Connexion"
     sign_up: "S'inscrire"
@@ -144,7 +144,10 @@ fr:
       js_2: "OpenStreetMap utilise Javascript pour ses cartes glissantes."
       js_3: "Si vous êtes dans l'incapacité d'utiliser Javascript, essayer d'utiliser le <a href='http://tah.openstreetmap.org/Browse/'>navigateur statique de Tiles@Home</a>."
       permalink: "Permalink"
-      license: "Sous license Creative Commons Attribution-Share Alike 2.0 par le projet OpenStreetMap et ses contributeurs."
+      license:
+        notice: "Sous license {{license_name}} par le {{project_name}} et ses contributeurs."
+        license_name: "Creative Commons Attribution-Share Alike 2.0"
+        project_name: "projet OpenStreetMap"
     edit:
       not_public: "Vous n'avez pas réglé vos éditions pour qu'elles soient publiques."
       not_public_description: "Vous ne pouvez plus éditer la carte a moins que vous ne rendiez vos éditions publiques. Vous pouvez rendre vos éditions publiques à partir de votre {{user_page}}."
@@ -218,7 +221,7 @@ fr:
       settings_link_text: "options"
       your friends: "Vos amis"
       no friends: "Vous n'avez pas encore ajouté d'ami"
-      km away: "{{distance}} km"
+      km away: "{{count}} km"
       nearby users: "Utilisateurs proches de vous : "
       no nearby users: "Il n'y a pas encore d'utilisateur à proximité."
       change your settings: "modifiez vos options"
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 886ed19ee..0626e4025 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1,631 +1,636 @@
-he:
-  activerecord:
-    # Translates all the model names, which is used in error handling on the web site
-    models:
-      acl: "Access Control List"
-      changeset: "Changeset"
-      changeset_tag: "Changeset Tag"
-      country: "ארץ"
-      diary_comment: "Diary Comment"
-      diary_entry: "Diary Entry"
-      friend: "Friend"
-      language: "שפה"
-      message: "Message"
-      node: "Node"
-      node_tag: "Node Tag"
-      notifier: "Notifier"
-      old_node: "Old Node"
-      old_node_tag: "Old Node Tag"
-      old_relation: "Old Relation"
-      old_relation_member: "Old Relation Member"
-      old_relation_tag: "Old Relation Tag"
-      old_way: "Old Way"
-      old_way_node: "Old Way Node"
-      old_way_tag: "Old Way Tag"
-      relation: "Relation"
-      relation_member: "Relation Member"
-      relation_tag: "Relation Tag"
-      session: "Session"
-      trace: "Trace"
-      tracepoint: "Trace Point"
-      tracetag: "Trace Tag"
-      user: "משתמש"
-      user_preference: "User Preference"
-      user_token: "User Token"
-      way: "Way"
-      way_node: "Way Node"
-      way_tag: "Way Tag"
-    # Translates all the model attributes, which is used in error handling on the web site
-    # Only the ones that are used on the web site are translated at the moment
-    attributes:
-      diary_comment:
-        body: "Body"
-      diary_entry:
-        user: "משתמש"
-        title: "כותרת"
-        latitude: "קו רוחב"
-        longitude: "קו אורך" 
-        language: "שפה"
-      friend:
-        user: "משתמש"
-        friend: "חבר"
-      trace:
-        user: "משתמש"
-        visible: "Visible"
-        name: "Name"
-        size: "Size"
-        latitude: "קו רוחב"
-        longitude: "קו אורך" 
-        public: "Public"
-        description: "תאור"
-      message:
-        sender: "שולחת"
-        title: "כותרת"
-        body: "גוף"
-        recipient: "נמען"
-      user:
-        email: "Email"
-        active: "פעיל"
-        display_name: "Display Name"
-        description: "תאור"
-        languages: "שפות"
-        pass_crypt: "סיסמה"
-  map:
-    view: "תצוגה"
-    edit: "עריכה"
-    coordinates: "Coordinates:"
-  browse:
-    changeset:
-      title: "Changeset"
-      changeset: "Changeset:"
-      download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}"
-      changesetxml: "Changeset XML"
-      osmchangexml: "osmChange XML"
-    changeset_details:
-      created_at: "Created at:"
-      closed_at: "Closed at:"
-      belongs_to: "Belongs to:"
-      bounding_box: "Bounding box:"
-      no_bounding_box: "No bounding box has been stored for this changeset."
-      show_area_box: "Show Area Box"
-      box: "box"
-      has_nodes: "Has the following {{node_count}} nodes:"
-      has_ways: "Has the following {{way_count}} ways:"
-      has_relations: "Has the following {{relation_count}} relations:"
-    common_details: 
-      edited_at: "Edited at:"
-      edited_by: "Edited by:"
-      version: "Version:"
-      in_changeset: "In changeset:"
-    containing_relation:
-      relation: "Relation {{relation_name}}"
-      relation_as: "(as {{relation_role}})"
-    map:
-      loading: "Loading..."
-      deleted: "Deleted"
-      view_larger_map: "View Larger Map"
-    node_details:
-      coordinates: "Coordinates: "
-      part_of: "Part of:"
-    node_history:
-      node_history: "Node History"
-      download: "{{download_xml_link}} or {{view_details_link}}"
-      download_xml: "Download XML"
-      view_details: "view details"
-    node:
-      node: "Node"
-      node_title: "Node: {{node_name}}"
-      download: "{{download_xml_link}} or {{view_history_link}}"
-      download_xml: "Download XML"
-      view_history: "view history"
-    not_found:
-      sorry: "Sorry, the {{type}} with the id {{id}}, could not be found."
-    paging_nav:
-      showing_page: "Showing page"
-      of: "of"
-    relation_details:
-      members: "Members:"
-      part_of: "Part of:"
-    relation_history:
-      relation_history: "Relation History"
-      relation_history_title: "Relation History: {{relation_name}}"
-    relation_member:
-      as: "as"
-    relation:
-      relation: "Relation"
-      relation_title: "Relation: {{relation_name}}"
-      download: "{{download_xml_link}} or {{view_history_link}}"
-      download_xml: "Download XML"
-      view_history: "view history"
-    start:
-      view_data: "View data for current map view"
-      manually_select: "Manually select a different area"
-    start_rjs:
-      data_frame_title: "Data"
-      zoom_or_select: "Zoom in or select an area of the map to view"
-      drag_a_box: "Drag a box on the map to select an area"
-      manually_select: "Manually select a different area"
-      loaded_an_area_with_num_features: "You have loaded an area which contains {{num_features}} features. In general, some browsers may not cope well with displaying this quanity of data. Generally, browsers work best at displaying less than 100 features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
-      load_data: "Load Data"
-      unable_to_load_size: "Unable to load: Bounding box size of {{bbox_size}} is too large (must be smaller than {{max_bbox_size}})"
-      loading: "Loading..."
-      show_history: "Show History"
-      wait: "Wait..."
-      history_for_feature: "History for {{feature}}"
-      details: "Details"
-      private_user: "private user"
-      edited_by_user_at_timestamp: "Edited by {{user}} at {{timestamp}}"
-    tag_details:
-      tags: "Tags:"
-    way_details:
-      nodes: "Nodes:"
-      part_of: "Part of:"
-      also_part_of:
-        one: "also part of way {{related_ways}}"
-        other: "also part of ways {{related_ways}}"
-    way_history:
-      way_history: "Way History"
-      way_history_title: "Way History: {{way_name}}"
-      download: "{{download_xml_link}} or {{view_details_link}}"
-      download_xml: "Download XML"
-      view_details: "view details"
-    way:
-      way: "Way"
-      way_title: "Way: {{way_name}}"
-      download: "{{download_xml_link}} or {{view_history_link}}"
-      download_xml: "Download XML"
-      view_history: "view history"
-  changeset:
-    changeset_paging_nav: 
-      showing_page: "Showing page"
-      of: "of"
-    changeset:
-      still_editing: "(still editing)"
-      anonymous: "Anonymous"
-      no_comment: "(none)"
-      no_edits: "(no edits)"
-      show_area_box: "show area box"
-      big_area: "(big)"
-      view_changeset_details: "View changeset details"
-      more: "more"
-    changesets:
-      id: "ID"
-      saved_at: "Saved at"
-      user: "משתמש"
-      comment: "Comment"
-      area: "Area"
-    list_bbox:
-      history: "History"
-      changesets_within_the_area: "Changesets within the area:"
-      show_area_box: "show area box"
-      no_changesets: "No changesets"
-      all_changes_everywhere: "For all changes everywhere see {{recent_changes_link}}"
-      recent_changes: "Recent Changes"
-      no_area_specified: "No area specified"
-      first_use_view: "First use the {{view_tab_link}} to pan and zoom to an area of interest, then click the history tab."
-      view_the_map: "view the map"
-      view_tab: "view tab"
-      alternatively_view: "Alternatively, view all {{recent_changes_link}}"
-    list:
-      recent_changes: "Recent Changes"
-      recently_edited_changesets: "Recently edited changesets:"
-      for_more_changesets: "For more changesets, select a user and view their edits, or see the editing 'history' of a specific area."
-    list_user:
-      edits_by_username: "Edits by {{username_link}}"
-      no_visible_edits_by: "No visible edits by {{name}}."
-      for_all_changes: "For changes by all users see {{recent_changes_link}}"
-      recent_changes: "Recent Changes"
-  diary_entry:
-    new:
-      title: New Diary Entry
-    list:
-      title: "Users' diaries"
-      user_title: "{{user}}'s diary"
-      new: New Diary Entry
-      new_title: Compose a new entry in your user diary
-      no_entries: No diary entries
-      recent_entries: "Recent diary entries: "
-      older_entries: Older Entries
-      newer_entries: Newer Entries
-    edit:
-      title: "Edit diary entry"
-      subject: "Subject: "
-      body: "Body: "
-      language: ":שפה"
-      location: "Location: "
-      latitude: ":קו רוחב"
-      longitude: ":קו אורך" 
-      use_map_link: "use map"
-      save_button: "Save"
-      marker_text: Diary entry location
-    view:
-      title: "Users' diaries | {{user}}"
-      user_title: "{{user}}'s diary"
-      leave_a_comment: "Leave a comment"
-      save_button: "Save"
-    no_such_entry:
-      heading: "No entry with the id: {{id}}"
-      body: "Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong."
-    no_such_user:
-      body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
-    diary_entry:
-      posted_by: "Posted by {{link_user}} at {{created}} in {{language}}"
-      comment_link: Comment on this entry
-      reply_link: Reply to this entry
-      comment_count:
-        one: 1 comment
-        other: "{{count}} comments"
-      edit_link: Edit this entry
-    diary_comment:
-      comment_from: "Comment from {{link_user}}  at {{comment_created_at}}"
-  export:
-    start:
-      area_to_export: "Area to Export"
-      manually_select: "Manually select a different area"
-      format_to_export: "Format to Export"
-      osm_xml_data: "OpenStreetMap XML Data"
-      mapnik_image: "Mapnik Image"
-      osmarender_image: "Osmarender Image"
-      embeddable_html: "Embeddable HTML"
-      licence: "Licence"
-      export_details: 'OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.'
-      options: "Options"
-      format: "Format"
-      scale: "Scale"
-      max: "max"
-      image_size: "Image Size"
-      zoom: "Zoom"
-      add_marker: "Add a marker to the map"
-      latitude: "Lat:"
-      longitude: "Lon:"
-      output: "Output"
-      paste_html: "Paste HTML to embed in website"
-      export_button: "Export"
-    start_rjs:
-      export: "Export"
-      drag_a_box: "Drag a box on the map to select an area"
-      manually_select: "Manually select a different area"
-      click_add_marker: "Click on the map to add a marker"
-      change_marker: "Change marker position"
-      add_marker: "Add a marker to the map"
-      view_larger_map: "View Larger Map"
-  geocoder:
-    results:
-      results: "Results"
-      type_from_source: "{{type}} from {{source_link}}"
-      no_results: "No results found"
-  layouts:
-    welcome_user: "Welcome, {{user_link}}"
-    inbox: "inbox ({{size}})"
-    logout: logout
-    log_in: log in
-    sign_up: sign up
-    view: "תצוגה"
-    edit: "עריכה"
-    history: "היסטוריה"
-    export: "יצוא"
-    gps_traces: GPS Traces
-    user_diaries: "יומני משתמשים"
-    tag_line: The Free Wiki World Map
-    intro_1: "OpenStreetMap is a free editable map of the whole world. It is made by people like you."
-    intro_2: "OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth."
-    intro_3: "OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}."
-    osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
-    osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
-    donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund."
-    donate_link_text: donating
-    help_wiki: "Help &amp; Wiki"
-    news_blog: "News blog"
-    shop: Shop
-    sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
-    alt_donation: Make a Donation
-  notifier:
-    diary_comment_notification:
-      banner1: "*                   Please do not reply to this email.                    *"
-      banner2: "*                Use the OpenStreetMap web site to reply.                 *"
-      hi: "Hi {{to_user}},"
-      header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
-      footer: "You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}"
-    friend_notification:
-      had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
-      see_their_profile: "You can see their profile at {{userurl}} and add them as a friend too if you wish."
-    signup_confirm_plain:
-      greeting: "Hi there!"
-      hopefully_you: "Someone (hopefully you) would like to create an account over at"
-      # next two translations run-on : please word wrap appropriately
-      click_the_link_1: "If this is you, welcome! Please click the link below to confirm your"
-      click_the_link_2: "account and read on for more information about OpenStreetMap."
-      introductory_video: "You can watch an introductory video to OpenStreetMap here:"
-      more_videos: "There are more videos here:"
-      the_wiki: "Get reading about OpenStreetMap on the wiki:"
-      opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:"
-      wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
-      # next four translations are in pairs : please word wrap appropriately
-      user_wiki_1: "It is recommended that you create a user wiki page, which includes"
-      user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]."
-      current_user_1: "A list of current users in categories, based on where in the world"
-      current_user_2: "they are, is available from:"
-    signup_confirm_html:
-      greeting: "Hi there!"
-      hopefully_you: "Someone (hopefully you) would like to create an account over at"
-      click_the_link: "If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap"
-      introductory_video: "You can watch an {{introductory_video_link}}."
-      video_to_openstreetmap: "introductory video to OpenStreetMap"
-      more_videos: "There are {{more_videos_link}}."
-      more_videos_here: "more videos here"
-      get_reading: 'Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</p> or  <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!'
-      wiki_signup: 'You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.'
-      user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
-      current_user: 'A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
-  message:
-    inbox:
-      title: "Inbox"
-      my_inbox: "My inbox"
-      outbox: "outbox"
-      you_have: "You have {{new_count}} new messages and {{old_count}} old messages"
-      from: "From"
-      subject: "Subject"
-      date: "Date"
-      no_messages_yet: "You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "people mapping nearby" 
-    message_summary:
-      unread_button: "Mark as unread"
-      read_button: "Mark as read"
-      reply_button: "Reply"
-    new:
-      title: "Send message"
-      send_message_to: "Send a new message to {{name}}"
-      subject: "Subject"
-      body: "Body"
-      send_button: "Send"
-      back_to_inbox: "Back to inbox"
-      message_sent: "Message sent"
-    no_such_user:
-      heading: "No such user or message"
-      body: "Sorry there is no user or message with that name or id"
-    outbox: 
-      title: "Outbox"
-      my_inbox: "My {{inbox_link}}"
-      inbox: "inbox"
-      outbox: "outbox"
-      you_have_sent_messages: "You have {{sent_count}} sent messages"
-      to: "To"
-      subject: "Subject"
-      date: "Date"
-      no_sent_messages: "You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "people mapping nearby"
-    read:
-      title: "Read message"
-      reading_your_messages: "Reading your messages"
-      from: "From"
-      subject: "Subject"
-      date: "Date"
-      reply_button: "Reply"
-      unread_button: "Mark as unread"
-      back_to_inbox: "Back to inbox"
-      reading_your_sent_messages: "Reading your sent messages"
-      to: "To"
-      back_to_outbox: "Back to outbox"
-    mark:
-      as_read: "Message marked as read"
-      as_unread: "Message marked as unread"
-  site:
-    index:
-      home: "home"
-      js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript."
-      js_2: "OpenStreetMap uses javascript for its slippy map."
-      js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.'
-      permalink: Permalink
-      license: "Licensed under the Creative Commons Attribution-Share Alike 2.0 license by the OpenStreetMap project and its contributors."
-    edit:
-      not_public: "You haven't set your edits to be public."
-      not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
-      user_page_link: user page
-      anon_edits: "({{link}})"
-      anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-      anon_edits_link_text: "Find out why this is the case."
-      flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
-      potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)"
-    sidebar:
-      search_results: Search Results
-      close: Close
-    search:
-      search: Search
-      where_am_i: "Where am I?"
-      submit_text: "Go"
-      searching: "Searching..."
-      search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>"
-    key:
-      map_key: "Map key"
-  trace:
-    create:
-      upload_trace: "Upload GPS Trace"
-      trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
-    edit:
-      filename: "Filename:"
-      uploaded_at: "Uploaded at:"
-      points: "Points:"
-      start_coord: "Start coordinate:"
-      edit: "עריכה"
-      owner: "Owner:"
-      description: ":תאור"
-      tags: "Tags:"
-      save_button: "Save Changes"
-    no_such_user:
-      body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
-    trace_form:
-      upload_gpx: "Upload GPX File"
-      description: "תאור"
-      tags: "Tags"
-      public: "Public?"
-      upload_button: "Upload"
-      help: "Help"
-    trace_header:
-      see_just_your_traces: "See just your traces, or upload a trace"
-      see_all_traces: "See all traces"
-      see_your_traces: "See all your traces"
-      traces_waiting: "You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
-    trace_optionals:
-      tags: "Tags"
-    view:
-      pending: "PENDING"
-      filename: "Filename:"
-      download: "download"
-      uploaded: "Uploaded at:"
-      points: "Points:"
-      start_coordinates: "Start coordinate:"
-      map: "map"
-      edit: "עריכה"
-      owner: "Owner:"
-      description: ":תאור"
-      tags: "Tags"
-      none: "None"
-      make_public: "Make this track public permanently"
-      edit_track: "Edit this track"
-      delete_track: "Delete this track"
-      viewing_trace: "Viewing trace {{name}}"
-      trace_not_found: "Trace not found!"
-    trace_paging_nav:
-      showing: "Showing page"
-      of: "of"
-    trace:
-      pending: "PENDING"
-      count_points: "{{count}} points"
-      ago: "{{time_in_words_ago}} ago"
-      more: "more"
-      trace_details: "View Trace Details"
-      view_map: "View Map"
-      edit: "עריכה"
-      edit_map: "Edit Map"
-      public: "PUBLIC"
-      private: "PRIVATE"
-      by: "by"
-      in: "in"
-      map: "map"
-    list:
-      public_traces: "Public GPS traces"
-      your_traces: "Your GPS traces"
-      public_traces_from: "Public GPS traces from {{user}}"
-      tagged_with: " tagged with {{tags}}"
-    delete:
-      scheduled_for_deletion: "Track scheduled for deletion"
-    make_public:
-      made_public: "Track made public"
-  user:
-    login:
-      title: "Login"
-      heading: "Login"
-      please login: "Please login or {{create_user_link}}."
-      create_account: "create an account"
-      email or username: "Email Address or Username: "
-      password: "Password: "
-      lost password link: "Lost your password?"
-      login_button: "Login"
-      account not active: "Sorry, your account is not active yet.<br>Please click on the link in the account confirmation email to activate your account."
-      auth failure: "Sorry, couldn't log in with those details."
-    lost_password:
-      title: "lost password"
-      heading: "Forgotten Password?"
-      email address: "Email Address:"
-      new password button: "Send me a new password"
-      notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
-      notice email cannot find: "Couldn't find that email address, sorry."
-    reset_password:
-      title: "reset password"
-      flash changed check mail: "Your password has been changed and is on its way to your mailbox :-)"
-      flash token bad: "Didn't find that token, check the URL maybe?"
-    new:
-      title: "Create account"
-      heading: "Create a User Account"
-      no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
-      contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible. '
-      fill_form: "Fill in the form and we'll send you a quick email to activate your account."
-      license_agreement: 'By creating an account, you agree that all work uploaded to openstreetmap.org and all data created by use of any tools which connect to openstreetmap.org is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.'
-      email address: "Email Address: "
-      confirm email address: "Confirm Email Address: "
-      not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
-      display name: "Display Name: "
-      password: "Password: "
-      confirm password: "Confirm Password: "
-      signup: Signup
-      flash create success message: "User was successfully created. Check your email for a confirmation note, and you'll be mapping in no time :-)<br /><br />Please note that you won't be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
-    no_such_user:
-      body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
-    view:
-      my diary: my diary
-      new diary entry: new diary entry
-      my edits: my edits
-      my traces: my traces
-      my settings: my settings
-      send message: send message
-      diary: diary
-      edits: edits
-      traces: traces
-      remove as friend: remove as friend
-      add as friend: add as friend
-      mapper since: "Mapper since: "
-      ago: "({{time_in_words_ago}} ago)"
-      user image heading: User image
-      delete image: Delete Image
-      upload an image: Upload an image
-      add image: Add Image
-      description: "תאור"
-      user location: User location
-      no home location: "No home location has been set."
-      if set location: "If you set your location, a pretty map and stuff will appear below. You can set your home location on your {{settings_link}} page."
-      settings_link_text: settings
-      your friends: Your friends
-      no friends: You have not added any friends yet.
-      km away: "{{distance}}km away"
-      nearby users: "Nearby users: "
-      no nearby users: "There are no users who admit to mapping nearby yet."
-      change your settings: change your settings
-    friend_map:
-      your location: Your location
-      nearby mapper: "Nearby mapper: "
-    account:
-      title: "Edit account"
-      my settings: My settings
-      email never displayed publicly: "(never displayed publicly)"
-      public editing:
-        heading: "Public editing: "
-        enabled: "Enabled. Not anonymous and can edit data."
-        enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-        enabled link text: "what's this?"
-        disabled: "Disabled and cannot edit data, all previous edits are anonymous."
-        disabled link text: "why can't I edit?"
-      profile description: "Profile Description: "
-      preferred languages: "Preferred Languages: "
-      home location: "Home Location: "
-      no home location: "You have not entered your home location."
-      latitude: ":קו רוחב"
-      longitude: ":קו אורך" 
-      update home location on click: "Update home location when I click on the map?"
-      save changes button: Save Changes
-      make edits public button: Make all my edits public
-      return to profile: Return to profile
-      flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
-      flash update success: "User information updated successfully."
-    confirm:
-      heading: Confirm a user account
-      press confirm button: "Press the confirm button below to activate your account."
-      button: Confirm
-      success: "Confirmed your account, thanks for signing up!"
-      failure: "A user account with this token has already been confirmed."
-    confirm_email:
-      heading: Confirm a change of email address
-      press confirm button: "Press the confirm button below to confirm your new email address."
-      button: Confirm
-      success: "Confirmed your email address, thanks for signing up!"
-      failure: "An email address has already been confirmed with this token."
-    set_home:
-      flash success: "Home location saved successfully"
-    go_public:
-      flash success: "All your edits are now public, and you are now allowed to edit."
-    make_friend:
-      success: "{{name}} is now your friend."
-      failed: "Sorry, failed to add {{name}} as a friend."
-      already_a_friend: "You are already friends with {{name}}."
-    remove_friend:
-      success: "{{name}} was removed from your friends."
-      not_a_friend: "{{name}} is not one of your friends."
+he:
+  activerecord:
+    # Translates all the model names, which is used in error handling on the web site
+    models:
+      acl: "Access Control List"
+      changeset: "Changeset"
+      changeset_tag: "Changeset Tag"
+      country: "ארץ"
+      diary_comment: "Diary Comment"
+      diary_entry: "Diary Entry"
+      friend: "Friend"
+      language: "שפה"
+      message: "Message"
+      node: "Node"
+      node_tag: "Node Tag"
+      notifier: "Notifier"
+      old_node: "Old Node"
+      old_node_tag: "Old Node Tag"
+      old_relation: "Old Relation"
+      old_relation_member: "Old Relation Member"
+      old_relation_tag: "Old Relation Tag"
+      old_way: "Old Way"
+      old_way_node: "Old Way Node"
+      old_way_tag: "Old Way Tag"
+      relation: "Relation"
+      relation_member: "Relation Member"
+      relation_tag: "Relation Tag"
+      session: "Session"
+      trace: "Trace"
+      tracepoint: "Trace Point"
+      tracetag: "Trace Tag"
+      user: "משתמש"
+      user_preference: "User Preference"
+      user_token: "User Token"
+      way: "Way"
+      way_node: "Way Node"
+      way_tag: "Way Tag"
+    # Translates all the model attributes, which is used in error handling on the web site
+    # Only the ones that are used on the web site are translated at the moment
+    attributes:
+      diary_comment:
+        body: "Body"
+      diary_entry:
+        user: "משתמש"
+        title: "כותרת"
+        latitude: "קו רוחב"
+        longitude: "קו אורך" 
+        language: "שפה"
+      friend:
+        user: "משתמש"
+        friend: "חבר"
+      trace:
+        user: "משתמש"
+        visible: "Visible"
+        name: "Name"
+        size: "Size"
+        latitude: "קו רוחב"
+        longitude: "קו אורך" 
+        public: "Public"
+        description: "תאור"
+      message:
+        sender: "שולחת"
+        title: "כותרת"
+        body: "גוף"
+        recipient: "נמען"
+      user:
+        email: "Email"
+        active: "פעיל"
+        display_name: "Display Name"
+        description: "תאור"
+        languages: "שפות"
+        pass_crypt: "סיסמה"
+  map:
+    view: "תצוגה"
+    edit: "עריכה"
+    coordinates: "Coordinates:"
+  browse:
+    changeset:
+      title: "Changeset"
+      changeset: "Changeset:"
+      download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}"
+      changesetxml: "Changeset XML"
+      osmchangexml: "osmChange XML"
+    changeset_details:
+      created_at: "Created at:"
+      closed_at: "Closed at:"
+      belongs_to: "Belongs to:"
+      bounding_box: "Bounding box:"
+      no_bounding_box: "No bounding box has been stored for this changeset."
+      show_area_box: "Show Area Box"
+      box: "box"
+      has_nodes: "Has the following {{count}} nodes:"
+      has_ways: "Has the following {{count}} ways:"
+      has_relations: "Has the following {{count}} relations:"
+    common_details: 
+      edited_at: "Edited at:"
+      edited_by: "Edited by:"
+      version: "Version:"
+      in_changeset: "In changeset:"
+    containing_relation:
+      relation: "Relation {{relation_name}}"
+      relation_as: "(as {{relation_role}})"
+    map:
+      loading: "Loading..."
+      deleted: "Deleted"
+      view_larger_map: "View Larger Map"
+    node_details:
+      coordinates: "Coordinates: "
+      part_of: "Part of:"
+    node_history:
+      node_history: "Node History"
+      download: "{{download_xml_link}} or {{view_details_link}}"
+      download_xml: "Download XML"
+      view_details: "view details"
+    node:
+      node: "Node"
+      node_title: "Node: {{node_name}}"
+      download: "{{download_xml_link}} or {{view_history_link}}"
+      download_xml: "Download XML"
+      view_history: "view history"
+    not_found:
+      sorry: "Sorry, the {{type}} with the id {{id}}, could not be found."
+    paging_nav:
+      showing_page: "Showing page"
+      of: "of"
+    relation_details:
+      members: "Members:"
+      part_of: "Part of:"
+    relation_history:
+      relation_history: "Relation History"
+      relation_history_title: "Relation History: {{relation_name}}"
+    relation_member:
+      as: "as"
+    relation:
+      relation: "Relation"
+      relation_title: "Relation: {{relation_name}}"
+      download: "{{download_xml_link}} or {{view_history_link}}"
+      download_xml: "Download XML"
+      view_history: "view history"
+    start:
+      view_data: "View data for current map view"
+      manually_select: "Manually select a different area"
+    start_rjs:
+      data_frame_title: "Data"
+      zoom_or_select: "Zoom in or select an area of the map to view"
+      drag_a_box: "Drag a box on the map to select an area"
+      manually_select: "Manually select a different area"
+      loaded_an_area_with_num_features: "You have loaded an area which contains [[num_features]] features. In general, some browsers may not cope well with displaying this quanity of data. Generally, browsers work best at displaying less than 100 features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
+      load_data: "Load Data"
+      unable_to_load_size: "Unable to load: Bounding box size of [[bbox_size]] is too large (must be smaller than {{max_bbox_size}})"
+      loading: "Loading..."
+      show_history: "Show History"
+      wait: "Wait..."
+      history_for_feature: "History for [[feature]]"
+      details: "Details"
+      private_user: "private user"
+      edited_by_user_at_timestamp: "Edited by [[user]] at [[timestamp]]"
+    tag_details:
+      tags: "Tags:"
+    way_details:
+      nodes: "Nodes:"
+      part_of: "Part of:"
+      also_part_of:
+        one: "also part of way {{related_ways}}"
+        other: "also part of ways {{related_ways}}"
+    way_history:
+      way_history: "Way History"
+      way_history_title: "Way History: {{way_name}}"
+      download: "{{download_xml_link}} or {{view_details_link}}"
+      download_xml: "Download XML"
+      view_details: "view details"
+    way:
+      way: "Way"
+      way_title: "Way: {{way_name}}"
+      download: "{{download_xml_link}} or {{view_history_link}}"
+      download_xml: "Download XML"
+      view_history: "view history"
+  changeset:
+    changeset_paging_nav: 
+      showing_page: "Showing page"
+      of: "of"
+    changeset:
+      still_editing: "(still editing)"
+      anonymous: "Anonymous"
+      no_comment: "(none)"
+      no_edits: "(no edits)"
+      show_area_box: "show area box"
+      big_area: "(big)"
+      view_changeset_details: "View changeset details"
+      more: "more"
+    changesets:
+      id: "ID"
+      saved_at: "Saved at"
+      user: "משתמש"
+      comment: "Comment"
+      area: "Area"
+    list_bbox:
+      history: "History"
+      changesets_within_the_area: "Changesets within the area:"
+      show_area_box: "show area box"
+      no_changesets: "No changesets"
+      all_changes_everywhere: "For all changes everywhere see {{recent_changes_link}}"
+      recent_changes: "Recent Changes"
+      no_area_specified: "No area specified"
+      first_use_view: "First use the {{view_tab_link}} to pan and zoom to an area of interest, then click the history tab."
+      view_the_map: "view the map"
+      view_tab: "view tab"
+      alternatively_view: "Alternatively, view all {{recent_changes_link}}"
+    list:
+      recent_changes: "Recent Changes"
+      recently_edited_changesets: "Recently edited changesets:"
+      for_more_changesets: "For more changesets, select a user and view their edits, or see the editing 'history' of a specific area."
+    list_user:
+      edits_by_username: "Edits by {{username_link}}"
+      no_visible_edits_by: "No visible edits by {{name}}."
+      for_all_changes: "For changes by all users see {{recent_changes_link}}"
+      recent_changes: "Recent Changes"
+  diary_entry:
+    new:
+      title: New Diary Entry
+    list:
+      title: "Users' diaries"
+      user_title: "{{user}}'s diary"
+      new: New Diary Entry
+      new_title: Compose a new entry in your user diary
+      no_entries: No diary entries
+      recent_entries: "Recent diary entries: "
+      older_entries: Older Entries
+      newer_entries: Newer Entries
+    edit:
+      title: "Edit diary entry"
+      subject: "Subject: "
+      body: "Body: "
+      language: ":שפה"
+      location: "Location: "
+      latitude: ":קו רוחב"
+      longitude: ":קו אורך" 
+      use_map_link: "use map"
+      save_button: "Save"
+      marker_text: Diary entry location
+    view:
+      title: "Users' diaries | {{user}}"
+      user_title: "{{user}}'s diary"
+      leave_a_comment: "Leave a comment"
+      save_button: "Save"
+    no_such_entry:
+      heading: "No entry with the id: {{id}}"
+      body: "Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong."
+    no_such_user:
+      body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
+    diary_entry:
+      posted_by: "Posted by {{link_user}} at {{created}} in {{language}}"
+      comment_link: Comment on this entry
+      reply_link: Reply to this entry
+      comment_count:
+        one: 1 comment
+        other: "{{count}} comments"
+      edit_link: Edit this entry
+    diary_comment:
+      comment_from: "Comment from {{link_user}}  at {{comment_created_at}}"
+  export:
+    start:
+      area_to_export: "Area to Export"
+      manually_select: "Manually select a different area"
+      format_to_export: "Format to Export"
+      osm_xml_data: "OpenStreetMap XML Data"
+      mapnik_image: "Mapnik Image"
+      osmarender_image: "Osmarender Image"
+      embeddable_html: "Embeddable HTML"
+      licence: "Licence"
+      export_details: 'OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.'
+      options: "Options"
+      format: "Format"
+      scale: "Scale"
+      max: "max"
+      image_size: "Image Size"
+      zoom: "Zoom"
+      add_marker: "Add a marker to the map"
+      latitude: "Lat:"
+      longitude: "Lon:"
+      output: "Output"
+      paste_html: "Paste HTML to embed in website"
+      export_button: "Export"
+    start_rjs:
+      export: "Export"
+      drag_a_box: "Drag a box on the map to select an area"
+      manually_select: "Manually select a different area"
+      click_add_marker: "Click on the map to add a marker"
+      change_marker: "Change marker position"
+      add_marker: "Add a marker to the map"
+      view_larger_map: "View Larger Map"
+  geocoder:
+    results:
+      results: "Results"
+      type_from_source: "{{type}} from {{source_link}}"
+      no_results: "No results found"
+  layouts:
+    welcome_user: "Welcome, {{user_link}}"
+    home: "home"
+    inbox: "inbox ({{count}})"
+    logout: logout
+    log_in: log in
+    sign_up: sign up
+    view: "תצוגה"
+    edit: "עריכה"
+    history: "היסטוריה"
+    export: "יצוא"
+    gps_traces: GPS Traces
+    user_diaries: "יומני משתמשים"
+    tag_line: The Free Wiki World Map
+    intro_1: ".היא מפה בחינם של כל העולם, וחופשית לעריכה. יוצרים אותה אנשים כמוך OpenStreetMap"
+    intro_2: ".מאפשרת  לך לראות, לערוך ולהשתמש בנתונים גיאוגרפיים בצורה שיתופית מכל מקום בעולם OpenStreetMap"
+    intro_3: "OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}."
+    osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
+    osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
+    donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund."
+    donate_link_text: donating
+    help_wiki: "Help &amp; Wiki"
+    news_blog: "News blog"
+    shop: Shop
+    sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
+    alt_donation: Make a Donation
+  notifier:
+    diary_comment_notification:
+      banner1: "*                   Please do not reply to this email.                    *"
+      banner2: "*                Use the OpenStreetMap web site to reply.                 *"
+      hi: "Hi {{to_user}},"
+      header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
+      footer: "You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}"
+    friend_notification:
+      had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
+      see_their_profile: "You can see their profile at {{userurl}} and add them as a friend too if you wish."
+    signup_confirm_plain:
+      greeting: "Hi there!"
+      hopefully_you: "Someone (hopefully you) would like to create an account over at"
+      # next two translations run-on : please word wrap appropriately
+      click_the_link_1: "If this is you, welcome! Please click the link below to confirm your"
+      click_the_link_2: "account and read on for more information about OpenStreetMap."
+      introductory_video: "You can watch an introductory video to OpenStreetMap here:"
+      more_videos: "There are more videos here:"
+      the_wiki: "Get reading about OpenStreetMap on the wiki:"
+      opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:"
+      wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
+      # next four translations are in pairs : please word wrap appropriately
+      user_wiki_1: "It is recommended that you create a user wiki page, which includes"
+      user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]."
+      current_user_1: "A list of current users in categories, based on where in the world"
+      current_user_2: "they are, is available from:"
+    signup_confirm_html:
+      greeting: "Hi there!"
+      hopefully_you: "Someone (hopefully you) would like to create an account over at"
+      click_the_link: "If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap"
+      introductory_video: "You can watch an {{introductory_video_link}}."
+      video_to_openstreetmap: "introductory video to OpenStreetMap"
+      more_videos: "There are {{more_videos_link}}."
+      more_videos_here: "more videos here"
+      get_reading: 'Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</p> or  <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!'
+      wiki_signup: 'You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.'
+      user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
+      current_user: 'A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
+  message:
+    inbox:
+      title: "Inbox"
+      my_inbox: "My inbox"
+      outbox: "outbox"
+      you_have: "You have {{new_count}} new messages and {{old_count}} old messages"
+      from: "From"
+      subject: "Subject"
+      date: "Date"
+      no_messages_yet: "You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
+      people_mapping_nearby: "people mapping nearby" 
+    message_summary:
+      unread_button: "Mark as unread"
+      read_button: "Mark as read"
+      reply_button: "Reply"
+    new:
+      title: "Send message"
+      send_message_to: "Send a new message to {{name}}"
+      subject: "Subject"
+      body: "Body"
+      send_button: "Send"
+      back_to_inbox: "Back to inbox"
+      message_sent: "Message sent"
+    no_such_user:
+      heading: "No such user or message"
+      body: "Sorry there is no user or message with that name or id"
+    outbox: 
+      title: "Outbox"
+      my_inbox: "My {{inbox_link}}"
+      inbox: "inbox"
+      outbox: "outbox"
+      you_have_sent_messages: "You have {{sent_count}} sent messages"
+      to: "To"
+      subject: "Subject"
+      date: "Date"
+      no_sent_messages: "You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
+      people_mapping_nearby: "people mapping nearby"
+    read:
+      title: "Read message"
+      reading_your_messages: "Reading your messages"
+      from: "From"
+      subject: "Subject"
+      date: "Date"
+      reply_button: "Reply"
+      unread_button: "Mark as unread"
+      back_to_inbox: "Back to inbox"
+      reading_your_sent_messages: "Reading your sent messages"
+      to: "To"
+      back_to_outbox: "Back to outbox"
+    mark:
+      as_read: "Message marked as read"
+      as_unread: "Message marked as unread"
+  site:
+    index:
+      js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript."
+      js_2: "OpenStreetMap uses javascript for its slippy map."
+      js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.'
+      permalink: Permalink
+      license:
+        notice: "Licensed under the {{license_name}} license by the {{project_name}} and its contributors."
+        license_name: "Creative Commons Attribution-Share Alike 2.0"
+        license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
+        project_name: "OpenStreetMap project"
+        project_url: "http://openstreetmap.org"
+    edit:
+      not_public: "You haven't set your edits to be public."
+      not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
+      user_page_link: user page
+      anon_edits: "({{link}})"
+      anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
+      anon_edits_link_text: "Find out why this is the case."
+      flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
+      potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)"
+    sidebar:
+      search_results: Search Results
+      close: Close
+    search:
+      search: Search
+      where_am_i: "Where am I?"
+      submit_text: "Go"
+      searching: "Searching..."
+      search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>"
+    key:
+      map_key: "Map key"
+  trace:
+    create:
+      upload_trace: "Upload GPS Trace"
+      trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
+    edit:
+      filename: "Filename:"
+      uploaded_at: "Uploaded at:"
+      points: "Points:"
+      start_coord: "Start coordinate:"
+      edit: "עריכה"
+      owner: "Owner:"
+      description: ":תאור"
+      tags: "Tags:"
+      save_button: "Save Changes"
+    no_such_user:
+      body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
+    trace_form:
+      upload_gpx: "Upload GPX File"
+      description: "תאור"
+      tags: "Tags"
+      public: "Public?"
+      upload_button: "Upload"
+      help: "Help"
+    trace_header:
+      see_just_your_traces: "See just your traces, or upload a trace"
+      see_all_traces: "See all traces"
+      see_your_traces: "See all your traces"
+      traces_waiting: "You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
+    trace_optionals:
+      tags: "Tags"
+    view:
+      pending: "PENDING"
+      filename: "Filename:"
+      download: "download"
+      uploaded: "Uploaded at:"
+      points: "Points:"
+      start_coordinates: "Start coordinate:"
+      map: "map"
+      edit: "עריכה"
+      owner: "Owner:"
+      description: ":תאור"
+      tags: "Tags"
+      none: "None"
+      make_public: "Make this track public permanently"
+      edit_track: "Edit this track"
+      delete_track: "Delete this track"
+      viewing_trace: "Viewing trace {{name}}"
+      trace_not_found: "Trace not found!"
+    trace_paging_nav:
+      showing: "Showing page"
+      of: "of"
+    trace:
+      pending: "PENDING"
+      count_points: "{{count}} points"
+      ago: "{{time_in_words_ago}} ago"
+      more: "more"
+      trace_details: "View Trace Details"
+      view_map: "View Map"
+      edit: "עריכה"
+      edit_map: "Edit Map"
+      public: "PUBLIC"
+      private: "PRIVATE"
+      by: "by"
+      in: "in"
+      map: "map"
+    list:
+      public_traces: "Public GPS traces"
+      your_traces: "Your GPS traces"
+      public_traces_from: "Public GPS traces from {{user}}"
+      tagged_with: " tagged with {{tags}}"
+    delete:
+      scheduled_for_deletion: "Track scheduled for deletion"
+    make_public:
+      made_public: "Track made public"
+  user:
+    login:
+      title: "Login"
+      heading: "Login"
+      please login: "Please login or {{create_user_link}}."
+      create_account: "create an account"
+      email or username: "Email Address or Username: "
+      password: "Password: "
+      lost password link: "Lost your password?"
+      login_button: "Login"
+      account not active: "Sorry, your account is not active yet.<br>Please click on the link in the account confirmation email to activate your account."
+      auth failure: "Sorry, couldn't log in with those details."
+    lost_password:
+      title: "lost password"
+      heading: "Forgotten Password?"
+      email address: "Email Address:"
+      new password button: "Send me a new password"
+      notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
+      notice email cannot find: "Couldn't find that email address, sorry."
+    reset_password:
+      title: "reset password"
+      flash changed check mail: "Your password has been changed and is on its way to your mailbox :-)"
+      flash token bad: "Didn't find that token, check the URL maybe?"
+    new:
+      title: "Create account"
+      heading: "Create a User Account"
+      no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
+      contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible. '
+      fill_form: "Fill in the form and we'll send you a quick email to activate your account."
+      license_agreement: 'By creating an account, you agree that all work uploaded to openstreetmap.org and all data created by use of any tools which connect to openstreetmap.org is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.'
+      email address: "Email Address: "
+      confirm email address: "Confirm Email Address: "
+      not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
+      display name: "Display Name: "
+      password: "Password: "
+      confirm password: "Confirm Password: "
+      signup: Signup
+      flash create success message: "User was successfully created. Check your email for a confirmation note, and you'll be mapping in no time :-)<br /><br />Please note that you won't be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
+    no_such_user:
+      body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
+    view:
+      my diary: my diary
+      new diary entry: new diary entry
+      my edits: my edits
+      my traces: my traces
+      my settings: my settings
+      send message: send message
+      diary: diary
+      edits: edits
+      traces: traces
+      remove as friend: remove as friend
+      add as friend: add as friend
+      mapper since: "Mapper since: "
+      ago: "({{time_in_words_ago}} ago)"
+      user image heading: User image
+      delete image: Delete Image
+      upload an image: Upload an image
+      add image: Add Image
+      description: "תאור"
+      user location: User location
+      no home location: "No home location has been set."
+      if set location: "If you set your location, a pretty map and stuff will appear below. You can set your home location on your {{settings_link}} page."
+      settings_link_text: settings
+      your friends: Your friends
+      no friends: You have not added any friends yet.
+      km away: "{{count}}km away"
+      nearby users: "Nearby users: "
+      no nearby users: "There are no users who admit to mapping nearby yet."
+      change your settings: change your settings
+    friend_map:
+      your location: Your location
+      nearby mapper: "Nearby mapper: "
+    account:
+      title: "Edit account"
+      my settings: My settings
+      email never displayed publicly: "(never displayed publicly)"
+      public editing:
+        heading: "Public editing: "
+        enabled: "Enabled. Not anonymous and can edit data."
+        enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
+        enabled link text: "what's this?"
+        disabled: "Disabled and cannot edit data, all previous edits are anonymous."
+        disabled link text: "why can't I edit?"
+      profile description: "Profile Description: "
+      preferred languages: "Preferred Languages: "
+      home location: "Home Location: "
+      no home location: "You have not entered your home location."
+      latitude: ":קו רוחב"
+      longitude: ":קו אורך" 
+      update home location on click: "Update home location when I click on the map?"
+      save changes button: Save Changes
+      make edits public button: Make all my edits public
+      return to profile: Return to profile
+      flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
+      flash update success: "User information updated successfully."
+    confirm:
+      heading: Confirm a user account
+      press confirm button: "Press the confirm button below to activate your account."
+      button: Confirm
+      success: "Confirmed your account, thanks for signing up!"
+      failure: "A user account with this token has already been confirmed."
+    confirm_email:
+      heading: Confirm a change of email address
+      press confirm button: "Press the confirm button below to confirm your new email address."
+      button: Confirm
+      success: "Confirmed your email address, thanks for signing up!"
+      failure: "An email address has already been confirmed with this token."
+    set_home:
+      flash success: "Home location saved successfully"
+    go_public:
+      flash success: "All your edits are now public, and you are now allowed to edit."
+    make_friend:
+      success: "{{name}} is now your friend."
+      failed: "Sorry, failed to add {{name}} as a friend."
+      already_a_friend: "You are already friends with {{name}}."
+    remove_friend:
+      success: "{{name}} was removed from your friends."
+      not_a_friend: "{{name}} is not one of your friends."
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
new file mode 100644
index 000000000..1d7bf6ea7
--- /dev/null
+++ b/config/locales/hi.yml
@@ -0,0 +1,682 @@
+hi:
+  activerecord:
+    # Translates all the model names, which is used in error handling on the web site
+    models:
+      acl: "Access Control List"
+      changeset: "Changeset"
+      changeset_tag: "Changeset Tag"
+      country: "देश"
+      diary_comment: "Diary Comment"
+      diary_entry: "Diary Entry"
+      friend: "दोस्त"
+      language: "भाशा"
+      message: "संदेश"
+      node: "आसंधि"
+      node_tag: "आसंधि का अंकितक"
+      notifier: "Notifier"
+      old_node: "पुराने आसंधि"
+      old_node_tag: "पुराने आसंधि का अंकितक"
+      old_relation: "पुराना संबंध"
+      old_relation_member: "पुराने संबंध का सदस्य"
+      old_relation_tag: "पुराने संबंध का अंकितक"
+      old_way: "पुराना रस्ता"
+      old_way_node: "Old Way Node"
+      old_way_tag: "Old Way Tag"
+      relation: "Relation"
+      relation_member: "Relation Member"
+      relation_tag: "Relation Tag"
+      session: "Session"
+      trace: "Trace"
+      tracepoint: "Trace Point"
+      tracetag: "Trace Tag"
+      user: "उपयोगकर्ता"
+      user_preference: "उपयोगकर्ता वरीयता"
+      user_token: "User Token"
+      way: "रस्ता"
+      way_node: "रस्ता का आसंधि"
+      way_tag: "रस्ता का अंकितक"
+    # Translates all the model attributes, which is used in error handling on the web site
+    # Only the ones that are used on the web site are translated at the moment
+    attributes:
+      diary_comment:
+        body: "शरीर"
+      diary_entry:
+        user: "उपयोगकर्ता"
+        title: "शीर्षक"
+        latitude: "अक्षांश"
+        longitude: "देशांतर"
+        language: "भाशा"
+      friend:
+        user: "उपयोगकर्ता"
+        friend: "दोस्त"
+      trace:
+        user: "उपयोगकर्ता"
+        visible: "दृश्य"
+        name: "नाम"
+        size: "आकार"
+        latitude: "अक्षांश"
+        longitude: "देशांतर"
+        public: "सार्वजनिक" 
+        description: "वर्णन"
+      message:
+        sender: "प्रेषक"
+        title: "शीर्षक"
+        body: "संदेश का शारीर"
+        recipient: "प्राप्तकर्ता"
+      user:
+        email: "ई-मेल"
+        active: "सक्रिय"
+        display_name: "प्रदर्शन नाम"
+        description: "वर्णन"
+        languages: "भाषाओं"
+        pass_crypt: "पासवर्ड"
+  map:
+    view: "दृश्य"
+    edit: "संपादित करें"
+    coordinates: "निर्देशांक:"
+  browse:
+    changeset:
+      title: "Changeset"
+      changeset: "Changeset:"
+      download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}"
+      changesetxml: "Changeset XML"
+      osmchangexml: "osmChange XML"
+    changeset_details:
+      created_at: "निर्माण के समय:"
+      closed_at: "समापन के समय:"
+      belongs_to: "Belongs to:"
+      bounding_box: "Bounding box:"
+      no_bounding_box: "No bounding box has been stored for this changeset."
+      show_area_box: "Show Area Box"
+      box: "box"
+      has_nodes: "निम्नलिखित {{count}}  आसंधि है:"
+      has_ways: "निम्नलिखित {{count}} रस्ते है:"
+      has_relations: "निम्नलिखित {{count}} संबंध है:"
+    common_details: 
+      edited_at: "समय, जिस पर संपादित:"
+      edited_by: "संपादक:"
+      version: "संस्करण:"
+      in_changeset: "In changeset:"
+    containing_relation:
+      relation: "संबंध {{relation_name}}"
+      relation_as: "(as {{relation_role}})"
+    map:
+      loading: "Loading..."
+      deleted: "मिटा दिया गया है"
+      view_larger_map: "नक्शे के व्यापक दृष्टिकोण"
+    node_details:
+      coordinates: "निर्देशांक:"
+      part_of: "इन रास्तो का हिस्सा:"
+    node_history:
+      node_history: "आसंधि का इतिहास"
+      download: "{{download_xml_link}} या {{view_details_link}}"
+      download_xml: "Download XML"
+      view_details: "विवरण देखें"
+    node:
+      node: "आसंधि"
+      node_title: "आसंधि: {{node_name}}"
+      download: "{{download_xml_link}} या {{view_history_link}}"
+      download_xml: "Download XML"
+      view_history: "इतिहास देखें"
+    not_found:
+      sorry: "क्षमा करें, ये {{type}} इस आईडी {{id }} के साथ, पाया नहीं जा सका"
+      type:
+        node: "आसंधि"
+        way: "रास्ता"
+        relation: "संबंध"
+    paging_nav:
+      showing_page: "Showing page:"
+      of: "of"
+    relation_details:
+      members: "सदस्य:"
+      part_of: "इन संबंधो का हिस्सा:"
+    relation_history:
+      relation_history: "संबंध का इतिहास"
+      relation_history_title: "इस संबंध का इतिहास: {{relation_name}}"
+    relation_member:
+      as: "as"
+    relation:
+      relation: "संबंध"
+      relation_title: "संबंध: {{relation_name}}"
+      download: "{{download_xml_link}} या {{view_history_link}}"
+      download_xml: "Download XML"
+      view_history: "इतिहास देखें"
+    start:
+      view_data: "इस मानचित्र के तथ्यों देखें"
+      manually_select: "कृपया, आप एक अलग क्षेत्र चुनें"
+    start_rjs:
+      data_frame_title: "तथ्य"
+      zoom_or_select: "कृपया ज़ूम करे या नक्शे के एक क्षेत्र देखने के लिए चुनें"
+      drag_a_box: "मानचित्र पर एक बॉक्स खींचें एक क्षेत्र का चयन करने के लिए"
+      manually_select: "कृपया, आप एक अलग क्षेत्र चुनें"
+      loaded_an_area: "मानचित्र के इस क्षेत्र भरा में है"
+      browsers: "features. सामान्य तौर पर, कुछ ब्राउज़रों इस मात्रा के तथ्यों प्रदर्शित करने में सक्षम नहीं हो सकता है| वे सबसे अच्छा काम करते है जब एक बार में १०० से कम सुविधाओं को प्रदर्शन करते है: कुछ और करने पर आपके ब्राउजर कम तेज़ हो सकती है| यदि आप इस तथ्यों को प्रदर्शित करना चाहते हैं, तो आप नीचे दिए गए बटन पर क्लिक करे|"
+      load_data: "Load Data"
+      unable_to_load: "Unable to load: Bounding box size of"
+      must_be_smaller: "is too large (must be smaller than 0.25)"
+      loading: "Loading..."
+      show_history: "Show History"
+      wait: "Wait..."
+      history_for: "History for"
+      details: "Details"
+      private_user: "private user"
+      edited_by: "Edited by"
+      at_timestamp: "at"
+    tag_details:
+      tags: "Tags:"
+    way_details:
+      nodes: "Nodes:"
+      part_of: "Part of:"
+      also_part_of:
+        one: "also part of way {{related_ways}}"
+        other: "also part of ways {{related_ways}}"
+    way_history:
+      way_history: "Way History"
+      way_history_title: "Way History: {{way_name}}"
+      download: "{{download_xml_link}} or {{view_details_link}}"
+      download_xml: "Download XML"
+      view_details: "view details"
+    way:
+      way: "Way"
+      way_title: "Way: {{way_name}}"
+      download: "{{download_xml_link}} or {{view_history_link}}"
+      download_xml: "Download XML"
+      view_history: "view history"
+  changeset:
+    changeset_paging_nav: 
+      showing_page: "Showing page"
+      of: "of"
+    changeset:
+      still_editing: "(still editing)"
+      anonymous: "Anonymous"
+      no_comment: "(none)"
+      no_edits: "(no edits)"
+      show_area_box: "show area box"
+      big_area: "(big)"
+      view_changeset_details: "View changeset details"
+      more: "more"
+    changesets:
+      id: "ID"
+      saved_at: "Saved at"
+      user: "User"
+      comment: "Comment"
+      area: "Area"
+    list_bbox:
+      history: "History"
+      changesets_within_the_area: "Changesets within the area:"
+      show_area_box: "show area box"
+      no_changesets: "No changesets"
+      all_changes_everywhere: "For all changes everywhere see {{recent_changes_link}}"
+      recent_changes: "Recent Changes"
+      no_area_specified: "No area specified"
+      first_use_view: "First use the {{view_tab_link}} to pan and zoom to an area of interest, then click the history tab."
+      view_the_map: "view the map"
+      view_tab: "view tab"
+      alternatively_view: "Alternatively, view all {{recent_changes_link}}"
+    list:
+      recent_changes: "Recent Changes"
+      recently_edited_changesets: "Recently edited changesets:"
+      for_more_changesets: "For more changesets, select a user and view their edits, or see the editing 'history' of a specific area."
+    list_user:
+      edits_by_username: "Edits by {{username_link}}"
+      no_visible_edits_by: "No visible edits by {{name}}."
+      for_all_changes: "For changes by all users see {{recent_changes_link}}"
+      recent_changes: "Recent Changes"
+  diary_entry:
+    new:
+      title: New Diary Entry
+    list:
+      title: "Users' diaries"
+      user_title: "{{user}}'s diary"
+      new: New Diary Entry
+      new_title: Compose a new entry in your user diary
+      no_entries: No diary entries
+      recent_entries: "Recent diary entries: "
+      older_entries: Older Entries
+      newer_entries: Newer Entries
+    edit:
+      title: "Edit diary entry"
+      subject: "Subject: "
+      body: "Body: "
+      language: "Language: "
+      location: "Location: "
+      latitude: "Latitude: "
+      longitude: "Longitude: "
+      use_map_link: "use map"
+      save_button: "Save"
+      marker_text: Diary entry location
+    view:
+      title: "Users' diaries | {{user}}"
+      user_title: "{{user}}'s diary"
+      leave_a_comment: "Leave a comment"
+      login_to_leave_a_comment: "{{login_link}} to leave a comment"
+      login: "Login"
+      save_button: "Save"
+    no_such_entry:
+      heading: "No entry with the id: {{id}}"
+      body: "Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong."
+    no_such_user:
+      body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
+    diary_entry:
+      posted_by: "Posted by {{link_user}} at {{created}} in {{language}}"
+      comment_link: Comment on this entry
+      reply_link: Reply to this entry
+      comment_count:
+        one: 1 comment
+        other: "{{count}} comments"
+      edit_link: Edit this entry
+    diary_comment:
+      comment_from: "Comment from {{link_user}}  at {{comment_created_at}}"
+  export:
+    start:
+      area_to_export: "Area to Export"
+      manually_select: "Manually select a different area"
+      format_to_export: "Format to Export"
+      osm_xml_data: "OpenStreetMap XML Data"
+      mapnik_image: "Mapnik Image"
+      osmarender_image: "Osmarender Image"
+      embeddable_html: "Embeddable HTML"
+      licence: "Licence"
+      export_details: 'OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.'
+      options: "Options"
+      format: "Format"
+      scale: "Scale"
+      max: "max"
+      image_size: "Image Size"
+      zoom: "Zoom"
+      add_marker: "Add a marker to the map"
+      latitude: "Lat:"
+      longitude: "Lon:"
+      output: "Output"
+      paste_html: "Paste HTML to embed in website"
+      export_button: "Export"
+    start_rjs:
+      export: "Export"
+      drag_a_box: "Drag a box on the map to select an area"
+      manually_select: "Manually select a different area"
+      click_add_marker: "Click on the map to add a marker"
+      change_marker: "Change marker position"
+      add_marker: "Add a marker to the map"
+      view_larger_map: "View Larger Map"
+  geocoder:
+    results:
+      results: "Results"
+      type_from_source: "{{type}} from {{source_link}}"
+      no_results: "No results found"
+  layouts:
+    welcome_user: "Welcome, {{user_link}}"
+    inbox: "inbox ({{count}})"
+    logout: logout
+    log_in: log in
+    sign_up: sign up
+    view: View
+    edit: Edit
+    history: History
+    export: Export
+    gps_traces: GPS Traces
+    user_diaries: User Diaries
+    tag_line: The Free Wiki World Map
+    intro_1: "OpenStreetMap is a free editable map of the whole world. It is made by people like you."
+    intro_2: "OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth."
+    intro_3: "OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}."
+    osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
+    osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
+    donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund."
+    donate_link_text: donating
+    help_wiki: "Help &amp; Wiki"
+    news_blog: "News blog"
+    shop: Shop
+    sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
+    alt_donation: Make a Donation
+  notifier:
+    diary_comment_notification:
+      subject: "[OpenStreetMap] {{user}} commented on your diary entry"
+      banner1: "*                   Please do not reply to this email.                    *"
+      banner2: "*                Use the OpenStreetMap web site to reply.                 *"
+      hi: "Hi {{to_user}},"
+      header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
+      footer: "You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}"
+    message_notification:
+      subject: "[OpenStreetMap] {{user}} sent you a new message"
+      banner1: "*                   Please do not reply to this email.                    *"
+      banner2: "*                Use the OpenStreetMap web site to reply.                 *"
+      hi: "Hi {{to_user}},"
+      header: "{{from_user}} has sent you a message through OpenStreetMap with the subject {{subject}}:"
+      footer1: "You can also read the message at {{readurl}}"
+      footer2: "and you can reply at {{replyurl}}"
+    friend_notification:
+      subject: "[OpenStreetMap] {{user}} added you as a friend"
+      had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
+      see_their_profile: "You can see their profile at {{userurl}} and add them as a friend too if you wish."
+    signup_confirm:
+      subject: "[OpenStreetMap] Confirm your email address"
+    signup_confirm_plain:
+      greeting: "Hi there!"
+      hopefully_you: "Someone (hopefully you) would like to create an account over at"
+      # next two translations run-on : please word wrap appropriately
+      click_the_link_1: "If this is you, welcome! Please click the link below to confirm your"
+      click_the_link_2: "account and read on for more information about OpenStreetMap."
+      introductory_video: "You can watch an introductory video to OpenStreetMap here:"
+      more_videos: "There are more videos here:"
+      the_wiki: "Get reading about OpenStreetMap on the wiki:"
+      opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:"
+      wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
+      # next four translations are in pairs : please word wrap appropriately
+      user_wiki_1: "It is recommended that you create a user wiki page, which includes"
+      user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]."
+      current_user_1: "A list of current users in categories, based on where in the world"
+      current_user_2: "they are, is available from:"
+    signup_confirm_html:
+      greeting: "Hi there!"
+      hopefully_you: "Someone (hopefully you) would like to create an account over at"
+      click_the_link: "If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap"
+      introductory_video: "You can watch an {{introductory_video_link}}."
+      video_to_openstreetmap: "introductory video to OpenStreetMap"
+      more_videos: "There are {{more_videos_link}}."
+      more_videos_here: "more videos here"
+      get_reading: 'Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</p> or  <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!'
+      wiki_signup: 'You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.'
+      user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
+      current_user: 'A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
+    email_confirm:
+      subject: "[OpenStreetMap] Confirm your email address"
+    email_confirm_plain:
+      greeting: "Hi,"
+      hopefully_you_1: "Someone (hopefully you) would like to change their email address over at"
+      hopefully_you_2: "{{server_url}} to {{new_address}}."
+      click_the_link: "If this is you, please click the link below to confirm the change."
+    email_confirm_html:
+      greeting: "Hi,"
+      hopefully_you: "Someone (hopefully you) would like to change their email address over at {{server_url}} to {{new_address}}."
+      click_the_link: "If this is you, please click the link below to confirm the change."
+    lost_password:
+      subject: "[OpenStreetMap] Password reset request"
+    lost_password_plain:
+      greeting: "Hi,"
+      hopefully_you_1: "Someone (possibly you) has asked for the password to be reset on this"
+      hopefully_you_2: "email addresses openstreetmap.org account."
+      click_the_link: "If this is you, please click the link below to reset your password."
+    lost_password_html:
+      greeting: "Hi,"
+      hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
+      click_the_link: "If this is you, please click the link below to reset your password."
+    reset_password:
+      subject: "[OpenStreetMap] Password reset"
+    reset_password_plain:
+      greeting: "Hi,"
+      reset: "Your password has been reset to {{new_password}}"
+    reset_password_html:
+      greeting: "Hi,"
+      reset: "Your password has been reset to {{new_password}}"
+  message:
+    inbox:
+      title: "Inbox"
+      my_inbox: "My inbox"
+      outbox: "outbox"
+      you_have: "You have {{new_count}} new messages and {{old_count}} old messages"
+      from: "From"
+      subject: "Subject"
+      date: "Date"
+      no_messages_yet: "You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
+      people_mapping_nearby: "people mapping nearby" 
+    message_summary:
+      unread_button: "Mark as unread"
+      read_button: "Mark as read"
+      reply_button: "Reply"
+    new:
+      title: "Send message"
+      send_message_to: "Send a new message to {{name}}"
+      subject: "Subject"
+      body: "Body"
+      send_button: "Send"
+      back_to_inbox: "Back to inbox"
+      message_sent: "Message sent"
+    no_such_user:
+      no_such_user: "No such user or message"
+      sorry: "Sorry there is no user or message with that name or id"
+    outbox: 
+      title: "Outbox"
+      my_inbox: "My {{inbox_link}}"
+      inbox: "inbox"
+      outbox: "outbox"
+      you_have_sent_messages: "You have {{sent_count}} sent messages"
+      to: "To"
+      subject: "Subject"
+      date: "Date"
+      no_sent_messages: "You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
+      people_mapping_nearby: "people mapping nearby"
+    read:
+      title: "Read message"
+      reading_your_messages: "Reading your messages"
+      from: "From"
+      subject: "Subject"
+      date: "Date"
+      reply_button: "Reply"
+      unread_button: "Mark as unread"
+      back_to_inbox: "Back to inbox"
+      reading_your_sent_messages: "Reading your sent messages"
+      to: "To"
+      back_to_outbox: "Back to outbox"
+    mark:
+      as_read: "Message marked as read"
+      as_unread: "Message marked as unread"
+  site:
+    index:
+      home: "home"
+      js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript."
+      js_2: "OpenStreetMap uses javascript for its slippy map."
+      js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.'
+      permalink: Permalink
+      license: "Licensed under the Creative Commons Attribution-Share Alike 2.0 license by the OpenStreetMap project and its contributors."
+    edit:
+      not_public: "You haven't set your edits to be public."
+      not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
+      user_page_link: user page
+      anon_edits: "({{link}})"
+      anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
+      anon_edits_link_text: "Find out why this is the case."
+      flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
+      potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)"
+    sidebar:
+      search_results: Search Results
+      close: Close
+    search:
+      search: Search
+      where_am_i: "Where am I?"
+      submit_text: "Go"
+      searching: "Searching..."
+      search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>"
+    key:
+      map_key: "Map key"
+  trace:
+    create:
+      upload_trace: "Upload GPS Trace"
+      trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
+    edit:
+      filename: "Filename:"
+      uploaded_at: "Uploaded at:"
+      points: "Points:"
+      start_coord: "Start coordinate:"
+      edit: "edit"
+      owner: "Owner:"
+      description: "Description:"
+      tags: "Tags:"
+      save_button: "Save Changes"
+    no_such_user:
+      no_such_user: "Sorry, there is no user with the name {{name}}. Please check your spelling, or maybe the link you clicked is wrong."
+    trace_form:
+      upload_gpx: "Upload GPX File"
+      description: "Description"
+      tags: "Tags"
+      public: "Public?"
+      upload_button: "Upload"
+      help: "Help"
+    trace_header:
+      see_just_your_traces: "See just your traces, or upload a trace"
+      see_all_traces: "See all traces"
+      see_your_traces: "See all your traces"
+      traces_waiting: "You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
+    trace_optionals:
+      tags: "Tags"
+    view:
+      pending: "PENDING"
+      filename: "Filename:"
+      download: "download"
+      uploaded: "Uploaded at:"
+      points: "Points:"
+      start_coordinates: "Start coordinate:"
+      map: "map"
+      edit: "edit"
+      owner: "Owner:"
+      description: "Description:"
+      tags: "Tags"
+      none: "None"
+      make_public: "Make this track public permanently"
+      edit_track: "Edit this track"
+      delete_track: "Delete this track"
+      viewing_trace: "Viewing trace {{name}}"
+      trace_not_found: "Trace not found!"
+    trace_paging_nav:
+      showing: "Showing page"
+      of: "of"
+    trace:
+      pending: "PENDING"
+      count_points: "{{count}} points"
+      ago: "{{time_in_words_ago}} ago"
+      more: "more"
+      trace_details: "View Trace Details"
+      view_map: "View Map"
+      edit: "edit"
+      edit_map: "Edit Map"
+      public: "PUBLIC"
+      private: "PRIVATE"
+      by: "by"
+      in: "in"
+      map: "map"
+    list:
+      public_traces: "Public GPS traces"
+      your_traces: "Your GPS traces"
+      public_traces_from: "Public GPS traces from {{user}}"
+      tagged_with: " tagged with {{tags}}"
+    delete:
+      scheduled_for_deletion: "Track scheduled for deletion"
+    make_public:
+      made_public: "Track made public"
+  user:
+    login:
+      title: "Login"
+      heading: "Login"
+      please login: "Please login or {{create_user_link}}."
+      create_account: "create an account"
+      email or username: "Email Address or Username: "
+      password: "Password: "
+      lost password link: "Lost your password?"
+      login_button: "Login"
+      account not active: "Sorry, your account is not active yet.<br>Please click on the link in the account confirmation email to activate your account."
+      auth failure: "Sorry, couldn't log in with those details."
+    lost_password:
+      title: "lost password"
+      heading: "Forgotten Password?"
+      email address: "Email Address:"
+      new password button: "Send me a new password"
+      notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
+      notice email cannot find: "Couldn't find that email address, sorry."
+    reset_password:
+      title: "reset password"
+      flash changed check mail: "Your password has been changed and is on its way to your mailbox :-)"
+      flash token bad: "Didn't find that token, check the URL maybe?"
+    new:
+      title: "Create account"
+      heading: "Create a User Account"
+      no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
+      contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible. '
+      fill_form: "Fill in the form and we'll send you a quick email to activate your account."
+      license_agreement: 'By creating an account, you agree that all work uploaded to openstreetmap.org and all data created by use of any tools which connect to openstreetmap.org is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.'
+      email address: "Email Address: "
+      confirm email address: "Confirm Email Address: "
+      not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
+      display name: "Display Name: "
+      password: "Password: "
+      confirm password: "Confirm Password: "
+      signup: Signup
+      flash create success message: "User was successfully created. Check your email for a confirmation note, and you'll be mapping in no time :-)<br /><br />Please note that you won't be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
+    no_such_user:
+      body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
+    view:
+      my diary: my diary
+      new diary entry: new diary entry
+      my edits: my edits
+      my traces: my traces
+      my settings: my settings
+      send message: send message
+      diary: diary
+      edits: edits
+      traces: traces
+      remove as friend: remove as friend
+      add as friend: add as friend
+      mapper since: "Mapper since: "
+      ago: "({{time_in_words_ago}} ago)"
+      user image heading: User image
+      delete image: Delete Image
+      upload an image: Upload an image
+      add image: Add Image
+      description: Description
+      user location: User location
+      no home location: "No home location has been set."
+      if set location: "If you set your location, a pretty map and stuff will appear below. You can set your home location on your {{settings_link}} page."
+      settings_link_text: settings
+      your friends: Your friends
+      no friends: You have not added any friends yet.
+      km away: "{{count}}km away"
+      nearby users: "Nearby users: "
+      no nearby users: "There are no users who admit to mapping nearby yet."
+      change your settings: change your settings
+    friend_map:
+      your location: Your location
+      nearby mapper: "Nearby mapper: "
+    account:
+      title: "Edit account"
+      my settings: My settings
+      email never displayed publicly: "(never displayed publicly)"
+      public editing:
+        heading: "Public editing: "
+        enabled: "Enabled. Not anonymous and can edit data."
+        enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
+        enabled link text: "what's this?"
+        disabled: "Disabled and cannot edit data, all previous edits are anonymous."
+        disabled link text: "why can't I edit?"
+      profile description: "Profile Description: "
+      preferred languages: "Preferred Languages: "
+      home location: "Home Location: "
+      no home location: "You have not entered your home location."
+      latitude: "Latitude: "
+      longitude: "Longitude: "
+      update home location on click: "Update home location when I click on the map?"
+      save changes button: Save Changes
+      make edits public button: Make all my edits public
+      return to profile: Return to profile
+      flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
+      flash update success: "User information updated successfully."
+    confirm:
+      heading: Confirm a user account
+      press confirm button: "Press the confirm button below to activate your account."
+      button: Confirm
+      success: "Confirmed your account, thanks for signing up!"
+      failure: "A user account with this token has already been confirmed."
+    confirm_email:
+      heading: Confirm a change of email address
+      press confirm button: "Press the confirm button below to confirm your new email address."
+      button: Confirm
+      success: "Confirmed your email address, thanks for signing up!"
+      failure: "An email address has already been confirmed with this token."
+    set_home:
+      flash success: "Home location saved successfully"
+    go_public:
+      flash success: "All your edits are now public, and you are now allowed to edit."
+    make_friend:
+      success: "{{name}} is now your friend."
+      failed: "Sorry, failed to add {{name}} as a friend."
+      already_a_friend: "You are already friends with {{name}}."
+    remove_friend:
+      success: "{{name}} was removed from your friends."
+      not_a_friend: "{{name}} is not one of your friends."
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 8ccd80f16..62f4ed8cd 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -89,9 +89,9 @@ is:
       no_bounding_box: "Engin svæðismörk voru vistuð ásamt þessu breytingarsetti."
       show_area_box: "Sýna svæðismörk á aðalkorti"
       box: "svæðismörk"
-      has_nodes: "Inniheldur {{node_count}} hnúta:"
-      has_ways: "Inniheldur {{way_count}} vegi:"
-      has_relations: "Inniheldur {{relation_count}} vensl:"
+      has_nodes: "Inniheldur {{count}} hnúta:"
+      has_ways: "Inniheldur {{count}} vegi:"
+      has_relations: "Inniheldur {{count}} vensl:"
     common_details: 
       edited_at: "Breytt:"
       edited_by: "Breytt af:"
@@ -145,20 +145,21 @@ is:
       view_data: "Sýna gögn fyrir núverandi kortasýn"
       manually_select: "Velja svæði á kortinu"
     start_rjs:
+      data_layer_name: "Gögn"
       data_frame_title: "Gögn"
       zoom_or_select: "Þú verður að þysja að eða velja svæði á kortinu"
       drag_a_box: "Teiknaðu kassa á kortið til að velja svæði"
       manually_select: "Velja annað svæði á kortinu"
-      loaded_an_area_with_num_features: "Þú hefur valið svæði sem á eru {{num_features}} hlutir. Sumir vafrar höndla illa fleiri en 100 hluti í einu, en þú getur hlaðið þeim inn þrátt fyrir það ef þú telur þig geta höndlað það."
+      loaded_an_area_with_num_features: "Þú hefur valið svæði sem á eru [[num_features]] hlutir. Sumir vafrar höndla illa fleiri en 100 hluti í einu, en þú getur hlaðið þeim inn þrátt fyrir það ef þú telur þig geta höndlað það."
       load_data: "Hlaða inn gögnum"
-      unable_to_load_size: "Gat ekki hlaðið gögnum: Svæði af stærðinni {{bbox_size}} er of stórt, svæðið verður að vera minna en {{max_bbox_size}}"
+      unable_to_load_size: "Gat ekki hlaðið gögnum: Svæði af stærðinni [[bbox_size]] er of stórt, svæðið verður að vera minna en {{max_bbox_size}}"
       loading: "Hleð inn gögnum..."
       show_history: "Sýna breytingarsögu"
       wait: "Augnablik..."
-      history_for_feature: "Breytingarskrá fyrir {{feature}}"
+      history_for_feature: "Breytingarskrá fyrir [[feature]]"
       details: "Nánar"
       private_user: "ónafngreindum"
-      edited_by_user_at_timestamp: "Breytt af {{user}} klukkan {{timestamp}}"
+      edited_by_user_at_timestamp: "Breytt af [[user]] klukkan [[timestamp]]"
       object_list:
         heading: "Hlutir"
         back: "Aftur á listann yfir hluti á þessu svæði"
@@ -169,13 +170,13 @@ is:
         details: "Nánar"
         selected:
           type:
-            node: "Hnútur {{id}}"
-            way: "Vegur {{id}}"
+            node: "Hnútur [[id]]"
+            way: "Vegur [[id]]"
             # There's no 'relation' type because it isn't represented in OpenLayers
         history:
           type:
-            node: "hnút {{id}}"
-            way: "veg {{id}}"
+            node: "hnút [[id]]"
+            way: "veg [[id]]"
             # There's no 'relation' type because it isn't represented in OpenLayers
     tag_details:
       tags: "Eigindi:"
@@ -322,7 +323,8 @@ is:
       no_results: "Ekkert fannst"
   layouts:
     welcome_user: "Hæ {{user_link}}"
-    inbox: "innhólf ({{size}})"
+    home: "heim"
+    inbox: "innhólf ({{count}})"
     logout: "útskrá"
     log_in: "innskrá"
     sign_up: "búa til aðgang"
@@ -486,12 +488,14 @@ is:
       as_unread: "Skilaboðin voru merkt sem ólesin"
   site:
     index:
-      home: "heim"
-      js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript."
-      js_2: "OpenStreetMap uses javascript for its slippy map."
-      js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.'
+      js_1: "Þú ert annaðhvort að nota vafra sem styður ekki JavaScript eða hefur slökkt á JavaScript stuðning."
+      js_2: "OpenStreetMap notar JavaScript til að útfæra gagnvirk kort."
+      js_3: 'Þú getur einnig notað <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home kortasýnina</a> sem krefst ekki JavaScript stuðnings.'
       permalink: "Varanlegur tengill"
-      license: "Licensed under the Creative Commons Attribution-Share Alike 2.0 license by the OpenStreetMap project and its contributors."
+      license:
+        notice: "Gefið út undir {{license_name}} leyfinu af þáttakendum í {{project_name}}."
+        license_name: "Creative Commons Attribution-Share Alike 2.0"
+        project_name: "OpenStreetMap verkefninu"
     edit:
       not_public: "You haven't set your edits to be public."
       not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
@@ -655,7 +659,7 @@ is:
       settings_link_text: "stillingarsíðunni"
       your friends: Vinir þínir
       no friends: Þú átt enga vini
-      km away: "í {{distance}} km fjarlægð"
+      km away: "í {{count}} km fjarlægð"
       nearby users: "Nálægir notendur:"
       no nearby users: "Engir notendur hafa stillt staðsetningu sína nálægt þér."
       change your settings: "breyttu stillingunum þínum"
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 2335a99fb..39400ccbc 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -89,9 +89,9 @@ it:
       no_bounding_box: "Per questo gruppo di modifiche non è stato memorizzato alcun riquadro di selezione."
       show_area_box: "Mostra il riquadro dell'area"
       box: "riquadro"
-      has_nodes: "Possiede i seguenti {{node_count}} nodi:"
-      has_ways: "Possiede i seguenti {{way_count}} percorsi:"
-      has_relations: "Possiede le seguenti {{relation_count}} relazioni:"
+      has_nodes: "Possiede i seguenti {{count}} nodi:"
+      has_ways: "Possiede i seguenti {{count}} percorsi:"
+      has_relations: "Possiede le seguenti {{count}} relazioni:"
     common_details:
       edited_at: "Modificato il:"
       edited_by: "Modificato da:"
@@ -145,16 +145,16 @@ it:
       zoom_or_select: "Ingrandire oppure selezionare l'area della mappa che si desidera visualizzare"
       drag_a_box: "Tracciare un riquadro sulla mappa per selezionare un'area"
       manually_select: "Seleziona manualmente un'area differente"
-      loaded_an_area_with_num_features: "E' stata caricata un'area che contiene {{num_features}} caratteristiche. In generale, alcuni browser potrebbero non visualizzare correttamente questa quantità di dati. Generalmente i browser lavorano al meglio  se si visualizzano meno di 100 caratteristiche alla volta: se si fa qualcos'altro il proprio browser potrebbe diventare lento o non rispondere più. Se si è sicuri di voler visualizzare questi dati, allora si può premere il pulsante sottostante."
+      loaded_an_area_with_num_features: "E' stata caricata un'area che contiene [[num_features]] caratteristiche. In generale, alcuni browser potrebbero non visualizzare correttamente questa quantità di dati. Generalmente i browser lavorano al meglio  se si visualizzano meno di 100 caratteristiche alla volta: se si fa qualcos'altro il proprio browser potrebbe diventare lento o non rispondere più. Se si è sicuri di voler visualizzare questi dati, allora si può premere il pulsante sottostante."
       load_data: "Carica dati"
-      unable_to_load_size: "Impossibile caricare: la dimensione del riquadro di selezione di {{bbox_size}} è troppo grande (deve essere minore di {{max_bbox_size}})"
+      unable_to_load_size: "Impossibile caricare: la dimensione del riquadro di selezione di [[bbox_size]] è troppo grande (deve essere minore di {{max_bbox_size}})"
       loading: "Caricamento in corso..."
       show_history: "Visualizza storico"
       wait: "Attendere..."
-      history_for_feature: "Storico per {{feature}}"
+      history_for_feature: "Storico per [[feature]]"
       details: "Dettagli"
       private_user: "utente privato"
-      edited_by_user_at_timestamp: "Modificato da {{user}} il {{timestamp}}"
+      edited_by_user_at_timestamp: "Modificato da [[user]] il [[timestamp]]"
     tag_details:
       tags: "Etichette:"
     way_details:
@@ -296,7 +296,8 @@ it:
       no_results: "Nessun risultato"
   layouts:
     welcome_user: "Benvenuto, {{user_link}}"
-    inbox: "in arrivo ({{size}})"
+    home: "posizione iniziale"
+    inbox: "in arrivo ({{count}})"
     logout: esci
     log_in: entra
     sign_up: iscriviti
@@ -411,12 +412,14 @@ it:
       as_unread: "Messaggio marcato come non letto"
   site:
     index:
-      home: "posizione iniziale"
       js_1: "Si sta utilizzando un browser che non supporta javascript, oppure è stato disabilitato javascript."
       js_2: "OpenStreetMap utilizza javascript per le sua mappa."
       js_3: 'Se non si riesce ad abilitare javascript si può provare il <a href="http://tah.openstreetmap.org/Browse/">browser statico Tiles@Home</a>.'
       permalink: Permalink
-      license: "Rilasciato sotto la licenza Creative Commons Attribution-Share Alike 2.0 dal progetto OpenStreetMap ed i suoi contributori."
+      license:
+        notice: "Rilasciato sotto la licenza {{license_name}} dal {{project_name}} ed i suoi contributori."
+        license_name: "Creative Commons Attribution-Share Alike 2.0"
+        project_name: "progetto OpenStreetMap"
     edit:
       not_public: "Non si sono impostate come pubbliche le proprie modifiche."
       not_public_description: "Non si può più modificare la mappa finché non lo si fa. Si possono impostare come pubbliche le proprie modifiche dalla propria {{user_page}}."
@@ -576,7 +579,7 @@ it:
       settings_link_text: impostazioni
       your friends: Amici personali
       no friends: Non ci sono ancora amici.
-      km away: "distante {{distance}} km"
+      km away: "distante {{count}} km"
       nearby users: "Utenti nelle vicinanze: "
       no nearby users: "Non c'è ancora alcun utente che ammette di mappare nelle vicinanze."
       change your settings: modifica le impostazioni personali
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index b9e9299c2..9a2008b1c 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -7,13 +7,13 @@ nl:
       changeset_tag: "Changeset-tag"
       country: "Land"
       diary_comment: "Dagboek-commentaar"
-      diary_entry: "Dagboek-invoer"
+      diary_entry: "Dagboek-artikel"
       friend: "Vriend"
       language: "Taal"
       message: "Bericht"
       node: "Node"
       node_tag: "Node-tag"
-      notifier: "Notifier" #to be translated
+      notifier: "Melding" #good translation?
       old_node: "Oude node"
       old_node_tag: "Oude node-tag"
       old_relation: "Oude relatie"
@@ -31,7 +31,7 @@ nl:
       tracetag: "Track-tag"
       user: "Gebruiker"
       user_preference: "Gebruikersvoorkeuren"
-      user_token: "User Token" #to be translated
+      user_token: "Gebruikers-id" #good translation?
       way: "Way"
       way_node: "Node op een way"
       way_tag: "Way-tag"
@@ -85,13 +85,13 @@ nl:
       created_at: "Aangemaakt op:"
       closed_at: "Gesloten op:"
       belongs_to: "Gemaakt door:"
-      bounding_box: "Coördinaten:" #good translation?
+      bounding_box: "Rechthoek:" #good translation?
       no_bounding_box: "Geen coördinaten opgeslagen voor deze changeset."
       show_area_box: "Laat gebied zien"
-      box: "box" #to be translated
-      has_nodes: "Bevat de volgende {{node_count}} nodes:"
-      has_ways: "Bevat de volgende {{way_count}} ways:"
-      has_relations: "Bevat de volgende {{relation_count}} relaties:"
+      box: "vak" #good translation?
+      has_nodes: "Bevat de volgende {{count}} nodes:"
+      has_ways: "Bevat de volgende {{count}} ways:"
+      has_relations: "Bevat de volgende {{count}} relaties:"
     common_details: 
       edited_at: "Bewerkt op:"
       edited_by: "Bewerkt door:"
@@ -121,8 +121,8 @@ nl:
     not_found:
       sorry: "Sorry, de {{type}} met id {{id}} kan niet worden gevonden."
     paging_nav:
-      showing_page: "Showing page" #to be translated
-      of: "van" #good translation?
+      showing_page: "Pagina"
+      of: "van"
     relation_details:
       members: "Leden:"
       part_of: "Deel van:" #good translation?
@@ -145,16 +145,16 @@ nl:
       zoom_or_select: "Zoom in of selecteer een gebied van de kaart om te zien"
       drag_a_box: "Sleep een rechthoek op de kaart om een gebied te selecteren"
       manually_select: "Selecteer handmatig een ander gebied"
-      loaded_an_area_with_num_features: "Je hebt een gebied geladen dat {{num_features}} objecten bevat. In het algemeen kunnen sommige browsers niet goed overweg met zoveel gegevens. Normaal gesproken werken browsers het best met minder dan 100 objecten: als je meer weergeeft kan de browser traag worden of niet meer reageren. Als je zeker weet dat je de gegevens wilt laten zien, kan dat met de knop hieronder."
+      loaded_an_area_with_num_features: "Je hebt een gebied geladen dat [[num_features]] objecten bevat. In het algemeen kunnen sommige browsers niet goed overweg met zoveel gegevens. Normaal gesproken werken browsers het best met minder dan 100 objecten: als je meer weergeeft kan de browser traag worden of niet meer reageren. Als je zeker weet dat je de gegevens wilt laten zien, kan dat met de knop hieronder."
       load_data: "Gegevens laden"
-      unable_to_load_size: "Niet mogelijk om te laden: grootte van de rechthoek ({{bbox_size}}) is te groot (moet kleiner zijn dan {{max_bbox_size}})"
+      unable_to_load_size: "Niet mogelijk om te laden: rechthoek ([[bbox_size]]) is te groot (moet kleiner zijn dan {{max_bbox_size}})"
       loading: "Laden..."
       show_history: "Geschiedenis weergeven"
       wait: "Een ogenblik geduld a.u.b..."
-      history_for_feature: "Geschiedenis voor {{feature}}"
+      history_for_feature: "Geschiedenis voor [[feature]]"
       details: "Details"
       private_user: "private user" #to be translated
-      edited_by_user_at_timestamp: "Bewerkt door {{user}} op {{timestamp}}"
+      edited_by_user_at_timestamp: "Bewerkt door [[user]] op [[timestamp]]"
     tag_details:
       tags: "Tags:"
     way_details:
@@ -177,7 +177,7 @@ nl:
       view_history: "geschiedenis weergeven"
   changeset:
     changeset_paging_nav: 
-      showing_page: "Showing page" #to be translated
+      showing_page: "Pagina"
       of: "van"
     changeset:
       still_editing: "(nog aan het bewerken)"
@@ -202,16 +202,16 @@ nl:
       all_changes_everywhere: "Voor alle aanpassingen over de hele wereld zie {{recent_changes_link}}"
       recent_changes: "Recente wijzigingen"
       no_area_specified: "Geen gebied opgegeven"
-      first_use_view: "Gebruik eerst de {{view_tab_link}} om te schuiven en te zoomen naar het gebied waarin je geïnteresseerd bent, klik dan op de Geschiedenis-tab.."
+      first_use_view: "Gebruik eerst de {{view_tab_link}} om te schuiven en te zoomen naar het gebied waarin je geïnteresseerd bent, klik dan op de Geschiedenis-tab."
       view_the_map: "Bekijk de kaart"
-      view_tab: "view tab" #to be translated
-      alternatively_view: "Alternatively, view all {{recent_changes_link}}" #to be translated
+      view_tab: "Bekijken-tab"
+      alternatively_view: "Of bekijk alle {{recent_changes_link}}"
     list:
-      recent_changes: "Recente wijzigingen"
+      recent_changes: "recente wijzigingen"
       recently_edited_changesets: "Recent gewijzigde changesets:"
       for_more_changesets: "Selecteer een gebruiker en bekijk de aanpassingen of zie de aanpas-geschiedenis van een specifiek gebied voor meer changesets."
     list_user:
-      edits_by_username: "Aanpassingen bij {{username_link}}"
+      edits_by_username: "Aanpassingen door {{username_link}}"
       no_visible_edits_by: "Geen zichtbare aanpassingen door {{name}}."
       for_all_changes: "Voor aanpassingen door alle gebruikers, zie {{recent_changes_link}}"
       recent_changes: "Recente wijzigingen"
@@ -245,19 +245,19 @@ nl:
       save_button: "Opslaan"
     no_such_entry:
       heading: "Geen invoer met id {{id}}"
-      body: "Sorry, er is geen dagboek-artikel of commentaar met {{id}}. Controleer de spelling, of mischien is de link waarop je geklikt hebt verkeerd."
+      body: "Sorry, er is geen dagboek-artikel of commentaar met {{id}}. Controleer de spelling, of misschien is de link waarop je geklikt hebt verkeerd."
     no_such_user:
-      body: "Sorry, er is geen gebruiker met de naam {{user}}. Controleer de spelling, of mischien is de link waarop je geklikt hebt verkeerd."
+      body: "Sorry, er is geen gebruiker met de naam {{user}}. Controleer de spelling, of misschien is de link waarop je geklikt hebt verkeerd."
     diary_entry:
-      posted_by: "Geplaats door {{link_user}} op {{created}} in het {{language}}"
-      comment_link: Geef commentaar op dit artikel
+      posted_by: "Geplaatst door {{link_user}} op {{created}} in het {{language}}"
+      comment_link: Opmerking over dit artikel plaatsen
       reply_link: Antwoorden op dit artikel
       comment_count:
-        one: 1 commentaar
-        other: "{{count}} commentaren"
+        one: 1 opmerking
+        other: "{{count}} opmerkingen"
       edit_link: Dit artikel bewerken
     diary_comment:
-      comment_from: "Commentaar van {{link_user}}  op {{comment_created_at}}"
+      comment_from: "Opmerking van {{link_user}}  op {{comment_created_at}}"
   export:
     start:
       area_to_export: "Gebied om te exporteren"
@@ -278,8 +278,8 @@ nl:
       add_marker: "Marker op de kaart zetten"
       latitude: "Lat:"
       longitude: "Lon:"
-      output: "Uitvooer"
-      paste_html: "Plak HTML om in de website te zetten"
+      output: "Uitvoer"
+      paste_html: "Kopieer de HTML-code en plak hem in je website."
       export_button: "Export"
     start_rjs:
       export: "Exporteren"
@@ -296,7 +296,8 @@ nl:
       no_results: "Geen resultaten gevonden"
   layouts:
     welcome_user: "Welkom, {{user_link}}"
-    inbox: "Postvak IN ({{size}})"
+    home: "home"
+    inbox: "Postvak IN ({{count}})"
     logout: uitloggen
     log_in: inloggen
     sign_up: registreren
@@ -308,13 +309,13 @@ nl:
     user_diaries: Gebruikersdagboeken
     tag_line: De vrije wiki-wereldkaart
     intro_1: "OpenStreetMap is een vrij bewerkbare kaart van de hele wereld. Hij wordt gemaakt door mensen zoals jij."
-    intro_2: "Met OpenStreetMap kun je geografische gegevens van de hele aarde zien, bewerken en gebruiken op een collaboratieve manier."
+    intro_2: "Met OpenStreetMap kun je geografische gegevens van de hele aarde zien, bewerken en gebruiken op een collaboratieve manier"
     intro_3: "De hosting van OpenStreetMap wordt ondersteund door het {{ucl}} en {{bytemark}}."
-    osm_offline: "De OpenStreetMap-database is momenteel offline terwijl onderhoudswerkzaamheden aan de database worden uitgevoerd."
-    osm_read_only: "De OpenStreetMap-database is momenteel alleen-lezen terwijl onderhoudswerkzaamheden aan de database worden uitgevoerd."
-    donate: "Ondersteun OpenStreetMap door {{link}} aan het Hardware Upgrade-fonds."
+    osm_offline: "De OpenStreetMap-database is momenteel offline terwijl noodzakelijke onderhoudswerkzaamheden aan de database worden uitgevoerd."
+    osm_read_only: "De OpenStreetMap-database is momenteel alleen-lezen terwijl noodzakelijke onderhoudswerkzaamheden aan de database worden uitgevoerd."
+    donate: "Ondersteun OpenStreetMap door te {{link}} aan het Hardware Upgrade-fonds."
     donate_link_text: doneren
-    help_wiki: "Help &amp; wiki"
+    help_wiki: "Help &amp; Wiki"
     news_blog: "Nieuwsblog"
     shop: Winkel
     sotm: 'Kom naar de OpenStreetMap-conferentie, de State of the Map, op 10-12 juli 2009 in Amsterdam!'
@@ -324,8 +325,8 @@ nl:
       banner1: "*                       Graag niet antwoorden op deze mail.                      *"
       banner2: "*                Gebruik de OpenStreetMap-site om te antwoorden.                 *"
       hi: "Hallo {{to_user}},"
-      header: "{{from_user}} heeft commentaar gepost over je recente OpenStreetMap dagboek-artikel met het onderwerp {{subject}}:"
-      footer: "Je kunt het commentaar ook lezen op {{readurl}} en je kunt commentaar geven op {{commenturl}} of antwoorden op {{replyurl}}"
+      header: "{{from_user}} heeft een opmerking gepost over je recente OpenStreetMap dagboek-artikel met het onderwerp {{subject}}:"
+      footer: "Je kunt de opmerking ook lezen op {{readurl}} en je kunt een opmerking terugschrijven op {{commenturl}} of antwoorden op {{replyurl}}"
     friend_notification:
       had_added_you: "{{user}} heeft je toegevoegd als vriend op OpenStreetMap."
       see_their_profile: "Je kunt zijn/haar profiel zien op {{userurl}} en deze ook als vriend toevoegen."
@@ -344,7 +345,7 @@ nl:
       user_wiki_1: "Het is aanbevolen dat je een gebruikerspagina maakt met onder andere"
       user_wiki_2: "categorieën die zeggen waar je bent, zoals [[Category:Users_in_Amsterdam]]."
       current_user_1: "Een lijst van gebruikers, gesorteerd op woonplaats"
-      current_user_2: "is beschikbaar van:" #good translation?
+      current_user_2: "is beschikbaar op:" #good translation?
     signup_confirm_html:
       greeting: "Hallo!"
       hopefully_you: "Iemand (waarschijnlijk jij) wil een account aanmaken op"
@@ -356,7 +357,7 @@ nl:
       get_reading: 'Lees over OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">op de wiki</p> of <a href="http://www.opengeodata.org/">de OpenGeoData-blog</a> die ook <a href="http://www.opengeodata.org/?cat=13">podcasts</a> aanbiedt!'
       wiki_signup: 'Je kunt je ook <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">registreren op de OpenStreetMap-wiki</a>.'
       user_wiki_page: 'Het is aanbevolen dat je een gebruikerspagina maakt met onder andere categorieën die zeggen waar je bent, zoals <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Amsterdam">[[Category:Users_in_Amsterdam]]</a>.'
-      current_user: 'Een lijst van gebruikers, gesorteerd op, is te zien op <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
+      current_user: 'Een lijst van gebruikers, gesorteerd op woonplaats, is te zien op <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
   message:
     inbox:
       title: "Postvak IN"
@@ -381,7 +382,7 @@ nl:
       back_to_inbox: "Terug naar Postvak IN"
       message_sent: "Bericht verzonden"
     no_such_user:
-      heading: "Deze gebruiker of bericht bestaat niet"
+      heading: "Deze gebruiker of dit bericht bestaat niet"
       body: "Sorry, er is geen gebruiker of bericht met die naam of id"
     outbox: 
       title: "Postvak UIT"
@@ -411,30 +412,32 @@ nl:
       as_unread: "Gemarkeerd als ongelezen"
   site:
     index:
-      home: "home"
-      js_1: "Of je gebruike een browser die JavaScript niet ondersteunt, of je hebt het uitstaan."
+      js_1: "Of je gebruikt een browser die JavaScript niet ondersteunt, of je hebt het uitstaan."
       js_2: "OpenStreetMap gebruikt JavaScript voor de slippy-kaart."
-      js_3: 'Je kunt de <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home statische tilebrowser</a> gebruiken als je JavaScript niet kunt aanzetten.'
+      js_3: 'Je kunt de <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home statische tilebrowser</a> gebruiken als je niet de mogelijkheid hebt om JavaScript aan te zetten.'
       permalink: Permalink
-      license: "Gelicenseerd onder de Creative Commons Attribution-Share Alike 2.0 licentie door het OpenStreetMap-project en zijn bijdragers."
+      license:
+        notice: "Gelicenseerd onder de {{license_name}} licentie door het {{project_name}} en zijn bijdragers."
+        license_name: "Creative Commons Attribution-Share Alike 2.0"
+        project_name: "OpenStreetMap-project"
     edit:
       not_public: "Je hebt ingesteld dat je bewerkingen niet openbaar zijn."
-      not_public_description: "Je kunt de kaart niet meer bewerken, behalve als je het anders instelt. Je kunt je bewerkingen als openbaar instellen op je {{user_page}}."
+      not_public_description: "Je kunt de kaart niet meer bewerken, behalve als je je bewerkingen openbaar maak. Je kunt dit instellen op je {{user_page}}."
       user_page_link: gebruikerspagina
       anon_edits: "({{link}})"
       anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
       anon_edits_link_text: "Lees waarom dit het geval is."
       flash_player_required: 'Je hebt Flash-player nodig om Potlatch, de OpenStreetMap Flash-editor. Je kunt <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">Flash-player van Adobe.com downloaden</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Er zijn ook andere opties</a> om OpenStreetMap te bewerken.'
-      potlatch_unsaved_changes: "Je hebt onopgeslagen wijzigingen. (Om op te slaan, moet je de huidige point of way delesecteren of, als je een save-knop hebt, hierop klikken.)"
+      potlatch_unsaved_changes: "Je hebt onopgeslagen wijzigingen. (Om op te slaan, moet je de huidige point of way deselecteren of, als je een save-knop hebt, hierop klikken.)"
     sidebar:
       search_results: Zoekresultaten
       close: Sluiten
     search:
       search: Zoeken
       where_am_i: "Waar ben ik?"
-      submit_text: "Zoek"
+      submit_text: "Ga"
       searching: "Zoeken..."
-      search_help: "voorbeelden: 'Alkmaar', 'Spui, Amsterdam', 'CB2 5AQ', of 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>meer voorbeelden...</a>"
+      search_help: "voorbeelden: 'Alkmaar', 'Spui, Amsterdam', 'CB2 5AQ', of 'post offices near Leiden' <a href='http://wiki.openstreetmap.org/wiki/Search'>meer voorbeelden...</a>"
     key:
       map_key: "Legenda"
   trace:
@@ -452,7 +455,7 @@ nl:
       tags: "Tags:"
       save_button: "Wijzigingen opslaan"
     no_such_user:
-      body: "Sorry, er is geen gebruiker {{user}}. Controleer de spelling, of misschien is de link waarop je klikte verkeerd."
+      body: "Sorry, er is geen gebruiker {{name}}. Controleer de spelling, of misschien is de link waarop je klikte verkeerd."
     trace_form:
       upload_gpx: "Upload GPX-bestand"
       description: "Beschrijving"
@@ -461,10 +464,10 @@ nl:
       upload_button: "Upload"
       help: "Help"
     trace_header:
-      see_just_your_traces: "Alleen je eigen tracks zien, of er een uploaden"
+      see_just_your_traces: "Alleen je eigen tracks zien, of een track uploaden"
       see_all_traces: "Alle tracks zien"
       see_your_traces: "Al jouw tracks zien"
-      traces_waiting: "Je hebt al {{count}} tracks die wachten om geüpload te worden. Overweeg om te wachten totdat die klaar zijn, om te voorkomen dat de wachtrij voor andere gebruikers geblokkeerd wordt."
+      traces_waiting: "Je hebt al {{count}} tracks die wachten om geüpload te worden. Overweeg om te wachten totdat die verwerkt zijn, om te voorkomen dat de wachtrij voor andere gebruikers geblokkeerd wordt."
     trace_optionals:
       tags: "Tags"
     view:
@@ -503,7 +506,7 @@ nl:
       in: "in"
       map: "kaart"
     list:
-      public_traces: "Openbare GPS-trakcs"
+      public_traces: "Openbare GPS-tracks"
       your_traces: "Jouw GPS-tracks"
       public_traces_from: "Openbare GPS-tracks van {{user}}"
       tagged_with: " getagd met {{tags}}"
@@ -515,8 +518,8 @@ nl:
     login:
       title: "Inloggen"
       heading: "Inloggen"
-      please login: "A.u.b. inloggen of {{create_user_link}}."
-      create_account: "een account aanmaken"
+      please login: "Log in of {{create_user_link}}."
+      create_account: "maak een account aan"
       email or username: "E-mailadres of gebruikersnaam: "
       password: "Wachtwoord: "
       lost password link: "Wachtwoord vergeten?"
@@ -528,12 +531,12 @@ nl:
       heading: "Wachtwoord vergeten?"
       email address: "E-mailadres:"
       new password button: "Zend een nieuw wachtwoord"
-      notice email on way: "Jammer dat je het kwijt bent :-( maar een e-mail is op weg om het te resetten."
+      notice email on way: "Jammer dat je het wachtwoord kwijt bent :-( maar een e-mail is op weg om het te resetten."
       notice email cannot find: "Kon dat e-mailadres niet vinden, sorry."
     reset_password:
       title: "reset wachtwoord"
       flash changed check mail: "Je wachtwoord is veranderd en het is onderweg naar je mailbox :-)"
-      flash token bad: "Didn't find that token, check the URL maybe?" #to translate
+      flash token bad: "Kon die token niet vinden, controleer de URL." #don't know the translation for token
     new:
       title: "Account aanmaken"
       heading: "Gebruikersaccount aanmaken"
@@ -543,14 +546,14 @@ nl:
       license_agreement: "Door een account aan te maken, ga je akkoord dat al het werk dat je uploadt naar openstreetmap.org en dat alle gegevens die zijn gemaakt met programma's die hierbij horen (niet-exclusief) gelicenseerd zijn <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">deze Creative Commons-licentie (by-sa)</a>." #good translation?
       email address: "E-mailadres: "
       confirm email address: "E-mailadres bevestigen: "
-      not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)' #to be translated
+      not displayed publicly: 'Niet openbaar gemaakt (zie <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacyovereenkomst met een sectie over e-mailadressen">Privacyovereenkomst (en)</a>)'
       display name: "Weergavenaam: "
       password: "Wachtwoord: "
       confirm password: "Wachtwoord bevestigen: "
       signup: Registreren
-      flash create success message: "User was successfully created. Check your email for a confirmation note, and you'll be mapping in no time :-)<br /><br />Please note that you won't be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
+      flash create success message: "Gebruiker succesvol gemaakt. Bekijk je e-mail voor een bevestigingsmail, en je bent zó aan het mappen :-)<br /><br />Denk eraan dat je niet kunt inloggen voordat je je bevestigingsmail hebt ontvangen en bevestigd.<br /><br />Als je een spamfilter gebruikt die bevestigingsmails stuurt, zorg er dan voor dat je webmaster@openstreetmap.org toestaat. Wij kunnen namelijk geen bevestigingsmails terugsturen."
     no_such_user:
-      body: "Sorry, er is geen gebruiker met de naam {{user}}. Controleer de spelling, of misschien is de link waarop je klikte onjuist.."
+      body: "Sorry, er is geen gebruiker met de naam {{user}}. Controleer de spelling, of misschien is de link waarop je klikte onjuist."
     view:
       my diary: mijn dagboek
       new diary entry: nieuw dagboek-artikel
@@ -572,11 +575,11 @@ nl:
       description: Beschrijving
       user location: Gebruikerslocatie
       no home location: "Geen thuislocatie ingesteld."
-      if set location: "Als je je locatie instelt, zal er een kaart beneden verschijnen. Je kunt de locatie instellen op je {{settings_link}}."
+      if set location: "Als je je locatie instelt, zal er beneden een kaart verschijnen. Je kunt de locatie instellen op je {{settings_link}}."
       settings_link_text: instellingen-pagina
       your friends: Je vrienden
       no friends: Je hebt nog geen vrienden toegevoegd.
-      km away: "{{distance}}km weg"
+      km away: "{{count}}km ver"
       nearby users: "Dichtbijzijnde mappers: "
       no nearby users: "Er zijn geen dichtbijzijnde mappers."
       change your settings: instellingen aanpassen
@@ -586,14 +589,14 @@ nl:
     account:
       title: "Account bewerken"
       my settings: Mijn instellingen
-      email never displayed publicly: "(wordt nooit openbaar gemaakt)"
+      email never displayed publicly: "(nooit openbaar gemaakt)"
       public editing:
-        heading: "Public editing: "
-        enabled: "Enabled. Not anonymous and can edit data."
+        heading: "Openbare aanpassingen "
+        enabled: "Staat aan. Je bent niet anoniem en je kunt bewerken."
         enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-        enabled link text: "what's this?"
-        disabled: "Disabled and cannot edit data, all previous edits are anonymous."
-        disabled link text: "why can't I edit?"
+        enabled link text: "wat is dit?"
+        disabled: "Staat uit. Je kunt niet bewerken en alle eerdere bewerkingen zijn anoniem."
+        disabled link text: "waarom kan ik niets bewerken?"
       profile description: "Profielbeschrijving: "
       preferred languages: "Voorkeurstaal: "
       home location: "Thuislocatie: "
@@ -627,5 +630,5 @@ nl:
       failed: "Sorry, toevoegen van {{name}} als vriend mislukt."
       already_a_friend: "Je bent al vrienden met {{name}}."
     remove_friend:
-      success: "{{name}} is verwijderd van je vrienden."
+      success: "{{name} is verwijderd van je vrienden."
       not_a_friend: "{{name}} is geen vriend van jou."
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 3903c6f0c..0766284a0 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -89,9 +89,9 @@ pl:
       no_bounding_box: "Ten changeset został zapisany bez prostokątu ograniczającego."
       show_area_box: "Pokaż obszar prostokątu"
       box: "prostokąt"
-      has_nodes: "Zawiera następujących {{node_count}} węzłów:"
-      has_ways: "Zawiera następujących {{way_count}} dróg:"
-      has_relations: "Zawiera następujących {{relation_count}} relacji:"
+      has_nodes: "Zawiera następujących {{count}} węzłów:"
+      has_ways: "Zawiera następujących {{count}} dróg:"
+      has_relations: "Zawiera następujących {{count}} relacji:"
     common_details: 
       edited_at: "Edytowano:"
       edited_by: "Edytował(a):"
@@ -145,16 +145,16 @@ pl:
       zoom_or_select: "Przybliż albo wybierz inny obszar mapy"
       drag_a_box: "Zaznacz prostokąt na mapie przeciągnięciem myszki aby wybrać obszar"
       manually_select: "Manualnie wybierz inny obszar"
-      loaded_an_area_with_num_features: "Załadowano obszar zawierający {{num_features}} obiektów.  Przeglądarki mogą nie radzić sobie z wyświetleniem tej ilości danych -- generalnie działają optymalnie przy wyświetlaniu mniej niż 100 obiektów jednocześnie, w przeciwnym wypadku przeglądarka może działac powoli lub przestać odpowiadać.  Jeśli jesteś pewien że chcesz wyświetlić dane, kliknij przycisk poniżej."
+      loaded_an_area_with_num_features: "Załadowano obszar zawierający [[num_features]] obiektów.  Przeglądarki mogą nie radzić sobie z wyświetleniem tej ilości danych -- generalnie działają optymalnie przy wyświetlaniu mniej niż 100 obiektów jednocześnie, w przeciwnym wypadku przeglądarka może działac powoli lub przestać odpowiadać.  Jeśli jesteś pewien że chcesz wyświetlić dane, kliknij przycisk poniżej."
       load_data: "Załaduj dane"
-      unable_to_load_size: "Nie można załadować: prostokąt ograniczający {{bbox_size}} jest zbyt duży (nie może przekraczać {{max_bbox_size}} stopnia)"
+      unable_to_load_size: "Nie można załadować: prostokąt ograniczający [[bbox_size]] jest zbyt duży (nie może przekraczać {{max_bbox_size}} stopnia)"
       loading: "Wczytywanie..."
       show_history: "Pokaż zmiany"
       wait: "Moment..."
-      history_for_feature: "Historia zmian dla {{feature}}"
+      history_for_feature: "Historia zmian dla [[feature]]"
       details: "Szczegóły"
       private_user: "prywatny użytkownika"
-      edited_by_user_at_timestamp: "Edytowany przez {{user}} ostatni raz {{timestamp}}"
+      edited_by_user_at_timestamp: "Edytowany przez [[user]] ostatni raz [[timestamp]]"
     tag_details:
       tags: "Tagi:"
     way_details:
@@ -299,7 +299,8 @@ pl:
       no_results: "Nie znaleziono"
   layouts:
     welcome_user: "Witaj, {{user_link}}"
-    inbox: "skrzynka ({{size}})"
+    home: "główna"
+    inbox: "skrzynka ({{count}})"
     logout: wyloguj
     log_in: zaloguj się
     sign_up: zarejestruj
@@ -414,12 +415,14 @@ pl:
       as_unread: "Wiadomość została oznaczona jako nieprzeczytana"
   site:
     index:
-      home: "główna"
       js_1: "Prawdopodobnie masz wyłączone javaskrypty lub przeglądarka której używasz ich nie obsługuje."
       js_2: "OpenStreetMap używa javaskryptów do wyświetlania mapki slippy map."
       js_3: 'Spróbuj <a href="http://tah.openstreetmap.org/Browse/">statycznej przeglądarki Tiles@Home</a> jeśli nie masz możliwości włączyć javaskryptu.'
       permalink: Permalink
-      license: "Dostęp na zasadach licencji Creative Commons Attribution-Share Alike 2.0, prawa autorskie projektu OpenStreetMap i jego uczestników."
+      license:
+        notice: "Dostęp na zasadach licencji {{license_name}}, prawa autorskie {{project_name}} i jego uczestników."
+        license_name: "Creative Commons Attribution-Share Alike 2.0"
+        project_name: "projektu OpenStreetMap"
     edit:
       not_public: "Nie wybrałeś(aś) by twoje edycje były publiczne."
       not_public_description: "W tym trybie nie można już zmieniać mapy.  Możesz ustawić je na publiczne na Twojej {{user_page}}."
@@ -579,7 +582,7 @@ pl:
       settings_link_text: stronie ustawień
       your friends: Twoi znajomi
       no friends: Nie dodałeś/aś jeszcze żadnych znajomych.
-      km away: "{{distance}}km z tąd"
+      km away: "{{count}}km z tąd"
       nearby users: "Najbliźsi użytkownicy: "
       no nearby users: "Nikt nie przyznał się jeszcze do mapowania w tej okolicy."
       change your settings: zmień swoje ustawienia
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 8e643997a..f25c8f47f 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -89,9 +89,9 @@ ru:
       no_bounding_box: "Для данного сеанса границы не установлены."
       box: "Показать"
       box: "граница"
-      has_nodes: "Содержит {{node_count}} узла(ов):"
-      has_ways: "Содержит {{way_count}} линий:"
-      has_relations: "Содержит {{relation_count}} отношений:"
+      has_nodes: "Содержит {{count}} узла(ов):"
+      has_ways: "Содержит {{count}} линий:"
+      has_relations: "Содержит {{count}} отношений:"
     common_details:
       edited_at: "Изменено:"
       edited_by: "Пользователь:"
@@ -145,16 +145,16 @@ ru:
       zoom_or_select: "Увеличьте или выберите область для просмотра"
       drag_a_box: "Для выбора области растяните рамку по карте"
       manually_select: "Выделить другую область"
-      loaded_an_area_with_num_features: "Вы загрузили область, которая содержит {{num_features}} объектов. Некоторые браузеры могут не справиться с отображением такого количества данных. Обычно браузеры лучшего всего обрабатывают до 100 объектов одновременно. Загрузка большего числа может замедлить ваш браузер или привести к зависанию. Если вы все равно хотите отобразить эти данные, нажмите на кнопку ниже."
+      loaded_an_area_with_num_features: "Вы загрузили область, которая содержит [[num_features]] объектов. Некоторые браузеры могут не справиться с отображением такого количества данных. Обычно браузеры лучшего всего обрабатывают до 100 объектов одновременно. Загрузка большего числа может замедлить ваш браузер или привести к зависанию. Если вы все равно хотите отобразить эти данные, нажмите на кнопку ниже."
       load_data: "Загрузить данные"
-      unable_to_load_size: "Загрузка невозможна: размер квадрата {{bbox_size}} — слишком большой (должен быть меньше {{max_bbox_size}})"
+      unable_to_load_size: "Загрузка невозможна: размер квадрата [[bbox_size]] — слишком большой (должен быть меньше {{max_bbox_size}})"
       loading: "Загрузка..."
       show_history: "Показать историю"
       wait: "Подождите..."
-      history_for_feature: "История {{feature}}"
+      history_for_feature: "История [[feature]]"
       details: "Детали"
       private_user: "частный пользователь"
-      edited_by_user_at_timestamp: "Изменен {{user}} в {{timestamp}}"
+      edited_by_user_at_timestamp: "Изменен [[user]] в [[timestamp]]"
     tag_details:
       tags: "Теги:"
     way_details:
@@ -296,7 +296,8 @@ ru:
       no_results: "Ничего не найдено"
   layouts:
     welcome_user: "Добро пожаловать, {{user_link}}"
-    inbox: "входящие ({{size}})"
+    home: "домой"
+    inbox: "входящие ({{count}})"
     logout: выйти
     log_in: войти
     sign_up: регистрация
@@ -411,12 +412,14 @@ ru:
       as_unread: "Сообщение отмечено как непрочитанное"
   site:
     index:
-      home: "домой"
       js_1: "Вы используете браузер, в котором не поддерживается или отключен JavaScript."
       js_2: "OpenStreetMap использует JavaScript для отображения карт."
       js_3: 'Вы можете попробовать <a href="http://tah.openstreetmap.org/Browse/">статичную карту от Tiles@Home</a>, если вы не можете включить JavaScript.'
       permalink: Постоянная ссылка
-      license: "Защищено лицензией Creative Commons Attribution-Share Alike 2.0 проектом OpenStreetMap и его пользователями."
+      license:
+        notice: "Защищено лицензией {{license_name}} проектом {{project_name}} и его пользователями."
+        license_name: "Creative Commons Attribution-Share Alike 2.0"
+        project_name: "OpenStreetMap"
     edit:
       not_public: "Вы не сделали свои правки публичными."
       not_public_description: "Вы не можете больше анонимно редактировать карту. Вы можете сделать ваши правки публичными здесь {{user_page}}."
@@ -576,7 +579,7 @@ ru:
       settings_link_text: настройки
       your friends: Ваши друзья
       no friends: Вы не добавили ещё ни одного друга.
-      km away: "{{distance}} км. от вас"
+      km away: "{{count}} км. от вас"
       nearby users: "Ближайшие пользователи: "
       no nearby users: "Поблизости пока нет пользователей, занимающихся составлением карты."
       change your settings: изменить настройки
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 3962cae21..95438cc1f 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1,4 +1,6 @@
 sl:
+  html:
+    dir: ltr
   activerecord:
     # Translates all the model names, which is used in error handling on the web site
     models:
@@ -89,9 +91,9 @@ sl:
       no_bounding_box: "Ta paket nima določenega pravokotnega področja."
       show_area_box: "Prikaži pravokotno področje"
       box: "področje"
-      has_nodes: "Vsebuje naslednjih {{node_count}} vozlišč:"
-      has_ways: "Vsebuje naslednjih {{way_count}} poti:"
-      has_relations: "Vsebuje naslednjih {{relation_count}} relacij:"
+      has_nodes: "Vsebuje naslednjih {{count}} vozlišč:"
+      has_ways: "Vsebuje naslednjih {{count}} poti:"
+      has_relations: "Vsebuje naslednjih {{count}} relacij:"
     common_details: 
       edited_at: "Urejeno ob:"
       edited_by: "Uredil:"
@@ -120,6 +122,10 @@ sl:
       view_history: "poglej zgodovino"
     not_found:
       sorry: "Oprostite, {{type}} z ID-jem {{id}} ni bilo mogoče najti."
+      type:
+        node: vozlišče
+        way: pot
+        relation: relacija
     paging_nav:
       showing_page: "Prikazana stran"
       of: "od"
@@ -145,16 +151,35 @@ sl:
       zoom_or_select: "Povečajte zemljevid ali izberite področje za prikaz"
       drag_a_box: "Za izbor področja povlecite pravokotnik na zemljevidu"
       manually_select: "Ročno izberite drugo področje"
-      loaded_an_area_with_num_features: "Naložili ste področje, ki vsebuje {{num_features}} elementov. Nekateri spletni brskalniki ne zmorejo prikaza takšne količine podatkov. Na splošno brskalniki najbolje prikazujejo 100 ali manj elementov hkrati: karkoli drugega lahko upočasni vaš brskalnik ali ga naredi neodzivnega. Če ste prepričani, da želite prikazati vse te podatke, pritisnite na spodnji gumb."
+      loaded_an_area_with_num_features: "Naložili ste področje, ki vsebuje [[num_features]] elementov. Nekateri spletni brskalniki ne zmorejo prikaza takšne količine podatkov. Na splošno brskalniki najbolje prikazujejo 100 ali manj elementov hkrati: karkoli drugega lahko upočasni vaš brskalnik ali ga naredi neodzivnega. Če ste prepričani, da želite prikazati vse te podatke, pritisnite na spodnji gumb."
       load_data: "Naloži podatke"
-      unable_to_load_size: "Ni mogoče naložiti: Pravokotno področje velikosti {{bbox_size}} je preveliko (mora biti manjše od {{max_bbox_size}})"
+      unable_to_load_size: "Ni mogoče naložiti: Pravokotno področje velikosti [[bbox_size]] je preveliko (mora biti manjše od {{max_bbox_size}})"
       loading: "Nalaganje..."
       show_history: "Prikaži zgodovino"
       wait: "Počakajte..."
-      history_for_feature: "Zgodovina {{feature}}"
+      history_for_feature: "Zgodovina [[feature]]"
       details: "Podrobnosti"
       private_user: "anonimni uporabnik"
-      edited_by_user_at_timestamp: "Uredil {{user}} ob {{timestamp}}"
+      edited_by_user_at_timestamp: "Uredil [[user]] ob [[timestamp]]"
+      object_list:
+        heading: "Seznam predmetov"
+        back: "Prikaži seznam predmetov"
+        type:
+          node: "Vozlišče"
+          way: "Pot"
+          # There's no 'relation' type because it isn't represented in OpenLayers
+        api: "Pridobi področje iz programskega vmesnika (API)"
+        details: "Podrobnosti"
+        selected:
+          type:
+            node: "Vozlišče [[id]]"
+            way: "Pot [[id]]"
+            # There's no 'relation' type because it isn't represented in OpenLayers
+        history:
+          type:
+            node: "Vozlišče [[id]]"
+            way: "Pot [[id]]"
+            # There's no 'relation' type because it isn't represented in OpenLayers
     tag_details:
       tags: "Oznake:"
     way_details:
@@ -242,11 +267,15 @@ sl:
       title: "Dnevnik uporabnika {{user}}" 
       user_title: "Dnavnik uporabnika {{user}}"
       leave_a_comment: "Napiši komentar" 
+      login_to_leave_a_comment: "{{login_link}} za vpis komentarja"
+      login: "Prijavite se"
       save_button: "Shrani"
     no_such_entry:
       heading: "No entry with the id: {{id}}"
-      body: "Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong."
+      body: "Oprostite, vnosa v dnevnik št. {{id}} ni. Prosimo, preverite črkovanje in povezavo, ki ste jo kliknili."
     no_such_user:
+      title: "Ni tega uporabnika"
+      heading: "Uporabnik {{user}} ne obstaja"
       body: "Oprostite, uporabnika z imenom {{user}} ni. Prosimo, preverite črkovanje in povezavo, ki ste jo kliknili."
     diary_entry:
       posted_by: "Objavil {{link_user}} ob {{created}} v jeziku {{language}}"
@@ -296,39 +325,79 @@ sl:
       no_results: "Ni zadetkov"
   layouts:
     welcome_user: "Dobrodošli, {{user_link}}"
-    inbox: "prejeta pošta ({{size}})"
+    home: "domov"
+    inbox: "prejeta pošta ({{count}})"
     logout: odjava
     log_in: prijava
     sign_up: vpis
     view: Zemljevid
+    view_tooltip: Prikaz zemljevida
     edit: Uredi
+    edit_tooltip: Uredite zemljevid
     history: Zgodovina
+    history_tooltip: Zgodovina sprememb
     export: Izvoz
+    export_tooltip: Izvozite podatke zemljevida
     gps_traces: GPS sledi
-    user_diaries: Dnevniki uporabnikov
+    gps_traces_tooltip: Upravljanje z GPS sledmi
+    user_diaries: Dnevnik
+    user_diaries_tooltip: Pregled dnevnikov uporabnikov
     tag_line: Prost wiki zemljevid sveta
     intro_1: "OpenStreetMap je prost zemljevid sveta, ki ga urejajo ljudje, kot ste Vi."
     intro_2: "OpenStreetMap vam omogoča ogled, urejanje in souporabo geografskih podatkov kjerkoli na Zemlji."
     intro_3: "Strežniki OpenStreetMap projekta prijazno gostujejo pri {{ucl}} in {{bytemark}}."
+    intro_3_ucl: "UCL VR Centru"
+    intro_3_bytemark: "bytemarku"
     osm_offline: "Baza OpenStreetMap zaradi izvajanja nujnih vzdrževalnih del trenutno ni dostopna."
     osm_read_only: "Baza OpenStreetMap je zaradi izvajanja nujnih vzdrževalnih del trenutno dostopna le za branje."
     donate: "Podprite OpenStreetMap z {{link}} v fond za nadgradnjo strojne opreme."
     donate_link_text: donacijo
     help_wiki: "Pomoč in Wiki"
+    help_wiki_url: "http://wiki.openstreetmap.org/wiki/Sl:Main_Page"
     news_blog: "Novice"
     shop: Trgovina
+    shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
     sotm: 'Udeležite se letošnje OpenStreetMap konference, The State of the Map, ki bo od 10 do 12 Julija v Amsterdamu!'
     alt_donation: Prispevajte finančna sredstva
   notifier:
     diary_comment_notification:
+      subject: "[OpenStreetMap] {{user}} je komentiral vaš vnos v dnevnik"
       banner1: "*                    Ne odgovarjajte na to sporočilo.                     *"
       banner2: "*           Za odgovor uporabite spletno stran OpenStreetMap.             *"
       hi: "Pozdravljen, {{to_user}}!"
       header: "{{from_user}} je komentiral vaš nedavni vnos v OpenStreetMap dnevnik z naslovom {{subject}}:"
       footer: "Komentar lahko preberete tudi na {{readurl}} komentirate lahko na {{commenturl}} ali odgovorite na {{replyurl}}"
+    message_notification:
+      subject: "[OpenStreetMap] {{user}} vam je poslal novo sporočilo"
+      banner1: "*                    Ne odgovarjajte na to sporočilo.                     *"
+      banner2: "*           Za odgovor uporabite spletno stran OpenStreetMap.             *"
+      hi: "Pozdravljeni, {{to_user}},"
+      header: "Uporabnik {{from_user}}  vam je prek OpenStreetMap poslal novo sporočilo glede {{subject}}:"
+      footer1: "Sporočilo lahko preberete tudi na {{readurl}}"
+      footer2: "in nanj odgovorite na naslovu {{replyurl}}"
     friend_notification:
+      subject: "[OpenStreetMap] {{user}} vas je dodal med prijatelje"
       had_added_you: "{{user}} vas je dodal med prijatelje na OpenStreetMap."
-      see_their_profile: "You can see their profile at {{userurl}} and add them as a friend too if you wish."
+      see_their_profile: "Uporabnikov profil lahko vidite na naslovu {{userurl}} in ga po želji lahko dodate med svoje prijatelje."
+    gpx_notification:
+      greeting: "Pozdravljeni,"
+      your_gpx_file: "Izgleda, da je vaša datoteka GPX"
+      with_description: "z opisom"
+      and_the_tags: "in naslednjimi oznakami:"
+      and_no_tags: "in brez oznak."
+      failure:
+        subject: "[OpenStreetMap] Neuspeh uvoza datoteke GPX"
+        failed_to_import: " vsebovala neko napako, zaradi katere je ni bilo mogoče uvoziti. Napaka:"
+        more_info_1: "Več informacij o možnih napakah v datotekah GPX in kako se jim izogniti"
+        more_info_2: "si lahko preberete na:"
+        import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
+      success:
+        subject: "[OpenStreetMap] Uspeh uvoza datoteke GPX"
+        loaded_successfully: |
+          bila uspešno uvožena z {{trace_points}} od vseh možnih 
+          {{possible_points}} točk.
+    signup_confirm:
+      subject: "[OpenStreetMap] Potrdite svoj elektronski naslov"
     signup_confirm_plain:
       greeting: "Pozdravljeni!"
       hopefully_you: "Nekdo (najverjetneje vi) bi rad naredil uporabniški račun na"
@@ -338,15 +407,17 @@ sl:
       introductory_video: "Uvodni video posnetek si lahko pogledate na naslovu:"
       more_videos: "Več video posnetkov je na naslovu:"
       the_wiki: "Get reading about OpenStreetMap on the wiki:"
+      the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"
       opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:"
       wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
+      wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"
       # next four translations are in pairs : please word wrap appropriately
       user_wiki_1: "It is recommended that you create a user wiki page, which includes"
-      user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]."
+      user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_Slovenia]]."
       current_user_1: "A list of current users in categories, based on where in the world"
       current_user_2: "they are, is available from:"
     signup_confirm_html:
-      greeting: "Hi there!"
+      greeting: "Pozdravljeni!"
       hopefully_you: "Someone (hopefully you) would like to create an account over at"
       click_the_link: "If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap"
       introductory_video: "You can watch an {{introductory_video_link}}."
@@ -355,32 +426,67 @@ sl:
       more_videos_here: "more videos here"
       get_reading: 'Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</p> or  <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!'
       wiki_signup: 'You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.'
-      user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
+      user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Slovenia">[[Category:Users_in_Slovenia]]</a>.'
       current_user: 'A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
+    email_confirm:
+      subject: "[OpenStreetMap] Potrdite svoj elektronski naslov"
+    email_confirm_plain:
+      greeting: "Pozdravljeni,"
+      hopefully_you_1: "Nekdo (upamo, da vi) je zahteval spremembo svojega e-poštnega naslova v"
+      hopefully_you_2: "{{server_url}} na {{new_address}}."
+      click_the_link: "Če ste to vi, vas prosimo, da kliknete na spodnjo povezavo za potrditev spremembe."
+    email_confirm_html:
+      greeting: "Pozdravljeni,"
+      hopefully_you: "Nekdo (upamo, da vi) je zahteval spremembo svojega e-poštnega naslova v {{server_url}} na {{new_address}}."
+      click_the_link: "Če ste to vi, vas prosimo, da kliknete na spodnjo povezavo za potrditev spremembe."
+    lost_password:
+      subject: "[OpenStreetMap] Zahteva za ponastavitev gesla"
+    lost_password_plain:
+      greeting: "Pozdravljeni,"
+      hopefully_you_1: "Nekdo (upamo, da vi) je zahteval ponastavitev gesla openstreetmap.org"
+      hopefully_you_2: "uporabniškega računa s tem naslovom e-pošte."
+      click_the_link: "Če ste to vi, vas prosimo, da kliknete na spodnjo povezavo za ponastavitev gesla."
+    lost_password_html:
+      greeting: "Pozdravljeni,"
+      hopefully_you: "Nekdo (upamo, da vi) je zahteval ponastavitev gesla openstreetmap.org uporabniškega računa s tem naslovom e-pošte."
+      click_the_link: "Če ste to vi, vas prosimo, da kliknete na spodnjo povezavo za ponastavitev gesla."
+    reset_password:
+      subject: "[OpenStreetMap] Ponastavitev gesla"
+    reset_password_plain:
+      greeting: "Pozdravljeni,"
+      reset: "Vaše geslo je bilo nastavljeno na {{new_password}}"
+    reset_password_html:
+      greeting: "Pozdravljeni,"
+      reset: "Vaše geslo je bilo nastavljeno na {{new_password}}"
   message:
     inbox:
+      title: "Prejeta pošta"
       my_inbox: "Moja prejeta"
       outbox: "poslana pošta"
       you_have: "Imate {{new_count}} novih, neprebranih in {{old_count}} starih, že prebranih sporočil"
       from: "Od"
       subject: "Zadeva"
       date: "Datum"
-      no_messages_yet: "You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "people mapping nearby" 
+      no_messages_yet: "Prejeli niste še nobenih sporočil. Zakaj ne bi stopili v stik z {{people_mapping_nearby_link}}?"
+      people_mapping_nearby: "ljudmi, ki kartirajo blizu vas" 
     message_summary:
       unread_button: "Označi kot neprebrano"
       read_button: "Označi kot prebrano"
       reply_button: "Odgovori"
     new:
+      title: "Pošiljanje sporočila"
       send_message_to: "Pošlji novo sporočilo uporabniku {{name}}"
       subject: "Zadeva"
       body: "Besedilo"
       send_button: "Pošlji"
       back_to_inbox: "Nazaj na prejeto pošto"
+      message_sent: "Sporočilo poslano"
     no_such_user:
-      heading: "No such user or message"
-      body: "Sorry there is no user or message with that name or id"
+      title: "Ni ustreznega uporabnika ali sporočila"
+      heading: "Ni ustreznega uporabnika ali sporočila"
+      body: "Oprostite, uporabnika s tem imenom ali sporočila s tem ID-jem ni"
     outbox: 
+      title: "Poslana pošta"
       my_inbox: "Moja {{inbox_link}}"
       inbox: "prejeta"
       outbox: "poslana pošta"
@@ -388,9 +494,10 @@ sl:
       to: "Za"
       subject: "Zadeva"
       date: "Datum"
-      no_sent_messages: "You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "people mapping nearby"
+      no_sent_messages: "Poslali niste še nobenih sporočil. Zakaj ne bi stopili v stik z {{people_mapping_nearby_link}}?"
+      people_mapping_nearby: "ljudmi, ki kartirajo blizu vas"
     read:
+      title: "Branje sporočila"
       reading_your_messages: "Prebiranje vaših sporočil"
       from: "Od"
       subject: "Zadeva"
@@ -401,14 +508,21 @@ sl:
       reading_your_sent_messages: "Prebiranje vaših poslanih sporočil"
       to: "Za"
       back_to_outbox: "Nazaj na poslano pošto"
+    mark:
+      as_read: "Sporočilo označeno kot prebrano"
+      as_unread: "Sporočilo označeno kot neprebrano"
   site:
     index:
-      home: "domov" 
       js_1: "Bodisi uporabljate brskalnik, ki ne podpira Javascript-a, ali pa je izvajanje Javascript-a onemogočeno."
       js_2: "OpenStreetMap za prikaz zemljevida uporablja Javascript."
       js_3: 'Če Javascripta ne morete omogočiti lahko poizkusite <a href="http://tah.openstreetmap.org/Browse/">statičen pregledovalnik zemljevida Tiles@Home</a>.'
       permalink: Trajna povezava
-      license: "Licensed under the Creative Commons Attribution-Share Alike 2.0 license by the OpenStreetMap project and its contributors."
+      license:
+        notice: "Licensed under the {{license_name}} license by the {{project_name}} and its contributors."
+        license_name: "Creative Commons Attribution-Share Alike 2.0"
+        license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
+        project_name: "OpenStreetMap project"
+        project_url: "http://openstreetmap.org"
     edit:
       not_public: "You haven't set your edits to be public."
       not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
@@ -426,7 +540,7 @@ sl:
       where_am_i: "Kje sem?"
       submit_text: "Išči"
       searching: "Iščem..."
-      search_help: "primeri: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>Več primerov...</a>"
+      search_help: "primeri: 'Bovec', 'Prešernova, Celje', 'Živalski vrt' ali 'vzpenjača' <a href='http://wiki.openstreetmap.org/wiki/Search'>Več primerov...</a>"
     key:
       map_key: "Legenda"
   trace:
@@ -444,6 +558,8 @@ sl:
       tags: "Oznake:"
       save_button: "Shrani spremembe"
     no_such_user:
+      title: "No such user"
+      heading: "Uporabnik {{user}} ne obstaja"
       body: "Oprostite, uporabnika z imenom {{user}} ni. Prosimo, preverite črkovanje in povezavo, ki ste jo kliknili."
     trace_form:
       upload_gpx: "Pošljite datoteko GPX"
@@ -452,11 +568,12 @@ sl:
       public: "Javna?"
       upload_button: "Pošlji"
       help: "Pomoč"
+      help_url: "http://wiki.openstreetmap.org/wiki/Upload"
     trace_header:
       see_just_your_traces: "Seznam le mojih in pošiljanje novih sledi"
       see_all_traces: "Seznam vseh sledi"
       see_your_traces: "Seznam vseh mojih sledi"
-      traces_waiting: "You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
+      traces_waiting: "V čakalni vrsti na uvoz čaka {{count}} sledi. Prosim, razmislite o tem, da bi počakali, da se te sledi uvozijo preden pošljete nove in s tem ne podaljšujete vrste drugim uporabnikom."
     trace_optionals:
       tags: "Oznake"
     view:
@@ -505,6 +622,7 @@ sl:
       made_public: "Sled je postala javno" 
   user:
     login:
+      title: "Prijava"
       heading: "Prijava"
       please login: "Prijavite se ali {{create_user_link}}."
       create_account: "ustvarite uporabniški račun"
@@ -512,6 +630,8 @@ sl:
       password: "Geslo: "
       lost password link: "Ste pozabili geslo?"
       login_button: "Prijava"
+      account not active: "Oprostite, vaš uporabniški račun še ni aktiven.<br>Za aktivacijo prosim kliknite na povezavo, ki ste jo prejeli v elektronskem sporočilu za potrditev uporabniškega računa."
+      auth failure: "Oprostite, prijava s temi podatki ni uspela."
     lost_password:
       title: "pozabljeno geslo"
       heading: "Ste pozabili geslo?"
@@ -524,6 +644,7 @@ sl:
       flash changed check mail: "Vaše geslo je bilo spremenjeno in je že na poti v vaš poštni predal :-)"
       flash token bad: "Tega žetona ni bilo mogoče najti.  Predlagamo, da preverite naslov URL."
     new:
+      title: "Nov uporabniški račun"
       heading: "Ustvarite si uporabniški račun"
       no_auto_account_create: "Na žalost vam trenutno ne moremo samodejno ustvariti uporabniškega računa."
       contact_webmaster: 'Prosimo, pišite <a href="mailto:webmaster@openstreetmap.org">webmastru</a> (v angleščini) in se dogovorite za ustvarjenje uporabniškega računa - potrudili se bomo za čimprejšnjo obravnavo vašega zahtevka. '
@@ -538,6 +659,8 @@ sl:
       signup: "Želim se vpisati"
       flash create success message: "Uporabniški račun narejen. Preverite vaš poštni predal s sporočilom za potrditev, and you\'ll be mapping in no time :-)<br /><br />Please note that you won't be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
     no_such_user:
+      title: "Ni tega uporabnika"
+      heading: "Uporabnik {{user}} ne obstaja"
       body: "Oprostite, uporabnika z imenom {{user}} ni. Prosimo, preverite črkovanje in povezavo, ki ste jo kliknili."
     view:
       my diary: moj dnevnik
@@ -564,7 +687,7 @@ sl:
       settings_link_text: vaših nastavitvah
       your friends: Vaši prijatelji
       no friends: Niste Å¡e dodali nobenih prijateljev.
-      km away: "Oddaljen {{distance}} km"
+      km away: "Oddaljen {{count}} km"
       nearby users: "Bližnji uporabniki: "
       no nearby users: "Ni uporabnikov, ki bi priznali, da kartirajo v vaši bližini."
       change your settings: uredite vaše nastavitve
@@ -572,6 +695,7 @@ sl:
       your location: Vaša lokacija
       nearby mapper: "Bližnji kartograf: "
     account:
+      title: "Urejanje uporabniškega računa"
       my settings: Moje nastavitve
       email never displayed publicly: "(nikoli javno objavljen)"
       public editing:
@@ -597,11 +721,22 @@ sl:
       heading: Potrdite uporabniški račun
       press confirm button: "Za aktivacijo vašega uporabniškega računa pritisnite na gumb Potrdi spodaj."
       button: Potrdi
+      success: "Vaš uporabniški račun je potrjen. Hvala, da ste se vpisali!"
+      failure: "Uporabnišli račun je že bil potrjen s tem žetonom."
     confirm_email:
       heading: Potrdite spremembo naslova e-pošte
       press confirm button: "Za potrditev spremembe vašega naslova elektronske pošte pritisnite na gumb Potrdi spodaj."
       button: Potrdi
+      success: "Vaš naslov elektronske pošte je potrjen. Hvala, da ste se vpisali!"
+      failure: "Naslov elektronske pošte je že bil potrjen s tem žetonom."
     set_home:
       flash success: "Domača lokacija uspešno shranjena"
     go_public:
       flash success: "Vsi vaši prispevki so sedaj javni in sedaj imate pravico do urejanja."
+    make_friend:
+      success: "Uporabnik {{name}} je sedaj vaš prijatelj."
+      failed: "Oprostite, uporabnika {{name}} ni bilo mogoče dodati med prijatelje."
+      already_a_friend: "Z uporabnikom {{name}} ste že prijatelja."
+    remove_friend:
+      success: "Uporabnika {{name}} ste odstranili izmed svojih prijateljev."
+      not_a_friend: "Uporabnika {{name}} ni med vašimi prijatelji."
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 1541e8d5e..d9a32c642 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1,10 +1,10 @@
-"zh-CN":
+zh-CN:
   activerecord:
     # Translates all the model names, which is used in error handling on the web site
     models:
       acl: "登陆控制表"
-      changeset: "Changeset"
-      changeset_tag: "Changeset Tag"
+      changeset: "修改集合"
+      changeset_tag: "修改集合标签"
       country: "国家"
       diary_comment: "日志评论"
       diary_entry: "进入日志"
@@ -39,7 +39,7 @@
     # Only the ones that are used on the web site are translated at the moment
     attributes:
       diary_comment:
-        body: "Body"
+        body: "内容"
       diary_entry:
         user: "用户"
         title: "标题"
@@ -76,9 +76,9 @@
     coordinates: "坐标:"
   browse:
     changeset:
-      title: "Changeset"
-      changeset: "Changeset:"
-      download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}"
+      title: "修改集合"
+      changeset: "修改集合:"
+      download: "下载 {{changeset_xml_link}} 或 {{osmchange_xml_link}}"
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
     changeset_details:
@@ -86,19 +86,19 @@
       closed_at: "关闭于:"
       belongs_to: "属于:"
       bounding_box: "限定窗口:"
-      no_bounding_box: "No bounding box has been stored for this changeset."
+      no_bounding_box: "没有为该修改集合所储存的限定窗口。"
       show_area_box: "显示区域窗口"
-      box: "box"
-      has_nodes: "有如下{{node_count}}个点:"
-      has_ways: "有如下路径 {{way_count}} :"
-      has_relations: "有如下{{relation_count}}种关系:"
+      box: "窗口"
+      has_nodes: "有如下{{count}}个点:"
+      has_ways: "有如下路径 {{count}} :"
+      has_relations: "有如下{{count}}种关系:"
     common_details: 
       edited_at: "Edited at:"
       edited_by: "Edited by:"
       version: "版本:"
-      in_changeset: "In changeset:"
+      in_changeset: "在修改集合中:"
     containing_relation:
-      relation: "Relation {{relation_name}}"
+      relation: "关系 {{relation_name}}"
       relation_as: "(as {{relation_role}})"
     map:
       loading: "读取中..."
@@ -109,7 +109,7 @@
       part_of: "部分:"
     node_history:
       node_history: "结点历史"
-      download: "{{download_xml_link}} or {{view_details_link}}"
+      download: "{{download_xml_link}} 或者 {{view_details_link}}"
       download_xml: "下载 XML"
       view_details: "浏览具体内容"
     node:
@@ -145,16 +145,16 @@
       zoom_or_select: "放大或选择查看一个地图区域"
       drag_a_box: "通过拖曳窗口来选择区域"
       manually_select: "手动选择一个不同区域"
-      loaded_an_area_with_num_features: "你已经选择了一个区域包括了{{num_features}} features. 通常，一些浏览器不能很好显示高精度的数据。一般来讲，当像素点在100一下浏览器的显示效果最好。如果再做别的任务，可能会导致您的浏览器变慢/不响应如果您确定您想要显示这些数据，您可能要点击下面的按钮。"
+      loaded_an_area_with_num_features: "你已经选择了一个区域包括了[[num_features]] features. 通常，一些浏览器不能很好显示高精度的数据。一般来讲，当像素点在100一下浏览器的显示效果最好。如果再做别的任务，可能会导致您的浏览器变慢/不响应如果您确定您想要显示这些数据，您可能要点击下面的按钮。"
       load_data: "读取数据"
-      unable_to_load_size: "无法读取：限制窗口的尺寸{{bbox_size}} 过大 (需小于 {{max_bbox_size}})"
+      unable_to_load_size: "无法读取：限制窗口的尺寸[[bbox_size]] 过大 (需小于 {{max_bbox_size}})"
       loading: "读取中"
       show_history: "显示历史"
       wait: "等待中..."
-      history_for_feature: "历史 {{feature}}"
+      history_for_feature: "历史 [[feature]]"
       details: "细节"
       private_user: "个人用户"
-      edited_by_user_at_timestamp: "Edited by {{user}} at {{timestamp}}"
+      edited_by_user_at_timestamp: "Edited by [[user]] at [[timestamp]]"
     tag_details:
       tags: "标签:"
     way_details:
@@ -178,7 +178,7 @@
       showing_page: "显示网页"
       of: "of"
     changeset:
-      still_editing: "(仍在变集中)"
+      still_editing: "(仍在编辑中)"
       anonymous: "匿名"
       no_comment: "(空)"
       no_edits: "(没有编辑)"
@@ -188,77 +188,77 @@
       more: "更多"
     changesets:
       id: "ID"
-      saved_at: "Saved at"
+      saved_at: "保存在"
       user: "用户"
       comment: "评论"
       area: "区域"
     list_bbox:
       history: "历史"
-      changesets_within_the_area: "Changesets within the area:"
+      changesets_within_the_area: "在一个区域内的修改集合:"
       show_area_box: "显示区域窗口"
-      no_changesets: "No changesets"
-      all_changes_everywhere: "For all changes everywhere see {{recent_changes_link}}"
+      no_changesets: "无更改集合"
+      all_changes_everywhere: "对于所有地方的修改请看 {{recent_changes_link}}"
       recent_changes: "最近的变更"
-      no_area_specified: "No area specified"
+      no_area_specified: "无指定区域"
       first_use_view: "首先使用{{查看标签链接}}确定感兴趣的区域，然后点击历史标签。"
       view_the_map: "view the map"
       view_tab: "view tab"
       alternatively_view: "或者，察看所有最近改变的链接{{最近改变的链接}}"
     list:
       recent_changes: "最近的更改"
-      recently_edited_changesets: "Recently edited changesets:"
+      recently_edited_changesets: "最近编辑过的修改集合:"
       for_more_changesets: "对于更多的修改，选择一个用户并查看他们的编辑, 或者查看一个选定区域的编辑‘历史’。"
     list_user:
       edits_by_username: "Edits by {{username_link}}"
-      no_visible_edits_by: "No visible edits by {{name}}."
-      for_all_changes: "For changes by all users see {{recent_changes_link}}"
-      recent_changes: "Recent Changes"
+      no_visible_edits_by: "没有关于{{name}}的可视编辑。"
+      for_all_changes: "关于所有用户的更改，察看{{recent_changes_link}}"
+      recent_changes: "最近的更改"
   diary_entry:
     new:
-      title: New Diary Entry
+      title: 新用户条目
     list:
-      title: "Users' diaries"
-      user_title: "{{user}}'s diary"
-      new: New Diary Entry
-      new_title: Compose a new entry in your user diary
-      no_entries: No diary entries
-      recent_entries: "Recent diary entries: "
-      older_entries: Older Entries
-      newer_entries: Newer Entries
+      title: "用户的日志"
+      user_title: "{{user}}的日志"
+      new: 新日志条目
+      new_title: 在您的用户日志中创建一个新条目
+      no_entries: 没有日记条目
+      recent_entries: "最近的日志条目: "
+      older_entries: 更早的条目
+      newer_entries: 更新的条目
     edit:
-      title: "Edit diary entry"
-      subject: "Subject: "
-      body: "Body: "
+      title: "编辑日志条目"
+      subject: "标题: "
+      body: "主体: "
       language: "语言: "
       location: "地区: "
       latitude: "纬度: "
       longitude: "经度: "
       use_map_link: "使用地图"
       save_button: "保存"
-      marker_text: Diary entry location
+      marker_text: 日记条目位置
     view:
-      title: "Users' diaries | {{user}}"
+      title: "用户日志| {{user}}"
       user_title: "{{user}}'s diary"
       leave_a_comment: "留下评论"
       save_button: "保存"
     no_such_entry:
-      heading: "No entry with the id: {{id}}"
+      heading: "关于此id: {{id}}没有条目"
       body: "抱歉， 没有关于此id {{id}}的日记条目或者评论。请检查拼写，或者您点击的链接有误。"
     no_such_user:
       body: "抱歉，没有名叫{{user}}的用户。请检查拼写，或者您点击的链接有误。"
     diary_entry:
       posted_by: "Posted by {{link_user}} at {{created}} in {{language}}"
-      comment_link: Comment on this entry
-      reply_link: Reply to this entry
+      comment_link: 关于此篇评论
+      reply_link: 对此篇进行回复
       comment_count:
-        one: 1 comment
-        other: "{{count}} comments"
-      edit_link: Edit this entry
+        one: 1回复
+        other: "{{count}} 回复"
+      edit_link: 编辑此篇
     diary_comment:
       comment_from: "Comment from {{link_user}}  at {{comment_created_at}}"
   export:
     start:
-      area_to_export: "要输出的地区"
+      area_to_export: "输出区域"
       manually_select: "手动选择一个不同区域"
       format_to_export: "输出格式"
       osm_xml_data: "OpenStreetMap XML 数据"
@@ -269,59 +269,60 @@
       export_details: 'OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.'
       options: "选项"
       format: "格式"
-      scale: "Scale"
+      scale: "比率"
       max: "最大"
       image_size: "图像尺寸"
-      zoom: "Zoom"
-      add_marker: "Add a marker to the map"
-      latitude: "Lat:"
-      longitude: "Lon:"
-      output: "Output"
-      paste_html: "Paste HTML to embed in website"
-      export_button: "Export"
+      zoom: "变焦"
+      add_marker: "对地图添加一个标记"
+      latitude: "纬度:"
+      longitude: "经度:"
+      output: "输出"
+      paste_html: "在网页上粘贴 HTML"
+      export_button: "输出"
     start_rjs:
-      export: "Export"
+      export: "输出"
       drag_a_box: "通过拖曳窗口来选择区域"
       manually_select: "手动选择一个不同区域"
-      click_add_marker: "Click on the map to add a marker"
-      change_marker: "Change marker position"
-      add_marker: "Add a marker to the map"
-      view_larger_map: "View Larger Map"
+      click_add_marker: "点击地图来添加一个标记"
+      change_marker: "更改标记位置"
+      add_marker: "标记地图"
+      view_larger_map: "查看放大地图"
   geocoder:
     results:
-      results: "Results"
-      type_from_source: "{{type}} from {{source_link}}"
-      no_results: "No results found"
+      results: "结果"
+      type_from_source: "{{type}} 从 {{source_link}}"
+      no_results: "没有发现结果"
   layouts:
-    welcome_user: "Welcome, {{user_link}}"
-    inbox: "inbox ({{size}})"
-    logout: logout
-    log_in: log in
-    sign_up: sign up
-    view: View
-    edit: Edit
-    history: History
-    export: Export
-    gps_traces: GPS Traces
-    user_diaries: User Diaries
-    tag_line: The Free Wiki World Map
+    welcome_user: "欢迎, {{user_link}}"
+    home: "home"
+    inbox: "inbox ({{count}})"
+    logout: 退出
+    log_in: 登陆
+    sign_up: 注册
+    view: 查看
+    edit: 编辑
+    history: 历史
+    export: 输出
+    gps_traces: GPS 追踪
+    user_diaries: 用户日志
+    tag_line: 免费维基世界地图
     intro_1: "OpenStreetMap是一个可供自由编辑的世界地图，它是由像您这样的用户创造的"
     intro_2: "OpenStreetMap允许您查看，编辑或者使用世界各地的地理数据来帮助您。"
     intro_3: "OpenStreetMap软件是由{{ucl}} 和{{bytemark}}共同开发维护的。"
     osm_offline: "OpenStreetMap的数据库目前没有连线，数据库的维护工作正在进行。"
     osm_read_only: "OpenStreetMap数据库目前处于只读模式中，数据库的维护工作正在进行中。"
     donate: "通过下面的link到Hardware Upgrade Fund来支持。"
-    donate_link_text: donating
-    help_wiki: "Help &amp; Wiki"
+    donate_link_text: 捐款
+    help_wiki: "帮助 &amp; Wiki"
     news_blog: "新闻博客"
     shop: Shop
     sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
-    alt_donation: Make a Donation
+    alt_donation: 捐款
   notifier:
     diary_comment_notification:
       banner1: "*                   请勿回复此邮件。                    *"
       banner2: "*                使用OpenStreetMap网站回复。		   *"
-      hi: "Hi {{to_user}},"
+      hi: "您好 {{to_user}},"
       header: "{{from_user}}通过标题{{subject}}对您最近的OpenStreetMap日志条目进行评论。"
       footer: "您也可以通过{{readurl}}来读取评论，并且在{{commenturl}}来撰写评论或者通过{{replyurl}}回复"
     friend_notification:
@@ -344,263 +345,267 @@
       current_user_1: "一个当前不同分类的用户列表，他们是基于所在地理位置来分类"
       current_user_2: "来自于:"
     signup_confirm_html:
-      greeting: "Hi there!"
-      hopefully_you: "Someone (hopefully you) would like to create an account over at"
-      click_the_link: "If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap"
-      introductory_video: "You can watch an {{introductory_video_link}}."
-      video_to_openstreetmap: "introductory video to OpenStreetMap"
-      more_videos: "There are {{more_videos_link}}."
-      more_videos_here: "more videos here"
-      get_reading: 'Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</p> or  <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!'
-      wiki_signup: 'You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.'
-      user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
-      current_user: 'A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
+      greeting: "您好!"
+      hopefully_you: "某人 (希望是您) 想要建立一个账户"
+      click_the_link: "如果是您本人，那么欢迎您！请点击一下链接确认帐户并阅读更多关于OpenStreetMap的信息"
+      introductory_video: "您可以观看一部{{introductory_video_link}}."
+      video_to_openstreetmap: "关于OpenStreetMap的介绍影片"
+      more_videos: "这里{{more_videos_link}}."
+      more_videos_here: "有更多的影片"
+      get_reading: '开始阅读在wiki上关于OpenStreetMap的信息 <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"></p> 或  <a href="http://www.opengeodata.org/">在 opengeodata blog</a> 上也有<a href="http://www.opengeodata.org/?cat=13">podcasts 可以倾听</a>!'
+      wiki_signup: '您可能也想要 <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">注册到 OpenStreetMap wiki</a>.'
+      user_wiki_page: '推荐您创立一个用户wiki网页，它包括分类标签，用来提醒您所在位置，例如 <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
+      current_user: '一个基于其所处位置的，当前用户分类列表可从这里获得<a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
   message:
     inbox:
-      my_inbox: "My inbox"
-      outbox: "outbox"
-      you_have: "You have {{new_count}} new messages and {{old_count}} old messages"
-      from: "From"
-      subject: "Subject"
-      date: "Date"
-      no_messages_yet: "You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "people mapping nearby" 
+      my_inbox: "我的收件箱"
+      outbox: "发件箱"
+      you_have: "您有 {{new_count}} 新消息和{{old_count}} 旧消息"
+      from: "来自"
+      subject: "标题"
+      date: "日期"
+      no_messages_yet: "您还没有消息，何不联系一些{{people_mapping_nearby_link}}?"
+      people_mapping_nearby: "在您附近的人" 
     message_summary:
-      unread_button: "Mark as unread"
-      read_button: "Mark as read"
-      reply_button: "Reply"
+      unread_button: "标记为未读"
+      read_button: "标记为已读"
+      reply_button: "回复"
     new:
-      send_message_to: "Send a new message to {{name}}"
-      subject: "Subject"
-      body: "Body"
-      send_button: "Send"
-      back_to_inbox: "Back to inbox"
+      send_message_to: "发新消息给{{name}}"
+      subject: "标题"
+      body: "主体"
+      send_button: "发送"
+      back_to_inbox: "返回收件箱"
     no_such_user:
-      heading: "No such user or message"
-      body: "Sorry there is no user or message with that name or id"
+      heading: "没有此用户或信息"
+      body: "对不起，没有关于此名字或id的用户或消息"
     outbox: 
-      my_inbox: "My {{inbox_link}}"
-      inbox: "inbox"
-      outbox: "outbox"
-      you_have_sent_messages: "You have {{sent_count}} sent messages"
-      to: "To"
-      subject: "Subject"
-      date: "Date"
-      no_sent_messages: "You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "people mapping nearby"
+      my_inbox: "我的 {{inbox_link}}"
+      inbox: "收件箱"
+      outbox: "发件箱"
+      you_have_sent_messages: "您有{{sent_count}} 已发送邮件"
+      to: "给"
+      subject: "主体"
+      date: "日期"
+      no_sent_messages: "您尚未发送信息。何不联系一些{{people_mapping_nearby_link}}?"
+      people_mapping_nearby: "在您附近的人"
     read:
-      reading_your_messages: "Reading your messages"
-      from: "From"
-      subject: "Subject"
-      date: "Date"
-      reply_button: "Reply"
-      unread_button: "Mark as unread"
-      back_to_inbox: "Back to inbox"
-      reading_your_sent_messages: "Reading your sent messages"
-      to: "To"
-      back_to_outbox: "Back to outbox"
+      reading_your_messages: "正在阅读您的信息"
+      from: "来自"
+      subject: "主题"
+      date: "日期"
+      reply_button: "回复"
+      unread_button: "标记为未读"
+      back_to_inbox: "返回收件箱"
+      reading_your_sent_messages: "正在阅读您所发送的信息"
+      to: "给"
+      back_to_outbox: "返回发件箱"
   site:
     index:
-      home: "home"
-      js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript."
+      js_1: "或许您正在使用的浏览器不支持javascript, 或许您禁用了javascript."
       js_2: "OpenStreetMap uses javascript for its slippy map."
-      js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.'
+      js_3: '您或许可以尝试 <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> 如果您无法启用javascript.'
       permalink: Permalink
-      license: "Licensed under the Creative Commons Attribution-Share Alike 2.0 license by the OpenStreetMap project and its contributors."
+      license:
+        notice: "Licensed under the {{license_name}} license by the {{project_name}} and its contributors."
+        license_name: "Creative Commons Attribution-Share Alike 2.0"
+        license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
+        project_name: "OpenStreetMap project"
+        project_url: "http://openstreetmap.org"
     edit:
-      not_public: "You haven't set your edits to be public."
-      not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
-      user_page_link: user page
+      not_public: "您尚未公开您的编辑。"
+      not_public_description: "您将无法再编辑此地图，直到您做到如上所述。您可以公开您的编辑，通过您的{{user_page}}。"
+      user_page_link: 用户页
       anon_edits: "({{link}})"
       anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
       anon_edits_link_text: "Find out why this is the case."
-      flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
-      potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)"
+      flash_player_required: '您需要一个Flash Player来使用OpenStreetMap的Flash编辑器Potlatch。您可以通过<a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">从Adobe.com下载 Flash Player </a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">一些其他选择</a> 也可以用来编辑OpenStreetMap.'
+      potlatch_unsaved_changes: "您有尚未保存的改动. (为保存到Potlatch, 如果在列表模式下编辑，您需要取消当前所选择的路径或结点，或者点击保存，如果您看到保存按钮。)"
     sidebar:
-      search_results: Search Results
-      close: Close
+      search_results: 搜索结果
+      close: 关闭
     search:
-      search: Search
-      where_am_i: "Where am I?"
-      submit_text: "Go"
-      searching: "Searching..."
-      search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near L??nen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>"
+      search: 搜索
+      where_am_i: "我在哪儿?"
+      submit_text: "开始"
+      searching: "搜索中..."
+      search_help: "例如: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', 或者 'post offices near L??nen' <a href='http://wiki.openstreetmap.org/wiki/Search'>更多例子...</a>"
     key:
-      map_key: "Map key"
+      map_key: "地图符号"
   trace:
     create:
-      upload_trace: "Upload GPS Trace"
-      trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
+      upload_trace: "上传 GPS 跟踪"
+      trace_uploaded: "您的 GPX 文件已经被上传，正等待被输入数据库。这通常要半小时，当上传结束后会发邮件通知您。"
     edit:
-      filename: "Filename:"
+      filename: "文件名:"
       uploaded_at: "Uploaded at:"
-      points: "Points:"
-      start_coord: "Start coordinate:"
-      edit: "edit"
+      points: "坐标点:"
+      start_coord: "开始坐标:"
+      edit: "编辑"
       owner: "Owner:"
-      description: "Description:"
-      tags: "Tags:"
-      save_button: "Save Changes"
+      description: "描述:"
+      tags: "标签:"
+      save_button: "保存修改"
     no_such_user:
-      body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
+      body: "对不起，没有此名{{user}}所对应的用户。请查看您的拼写，或者可能您点击有误。"
     trace_form:
-      upload_gpx: "Upload GPX File"
-      description: "Description"
-      tags: "Tags"
-      public: "Public?"
-      upload_button: "Upload"
-      help: "Help"
+      upload_gpx: "上传 GPX 文件"
+      description: "描述"
+      tags: "标签"
+      public: "公开?"
+      upload_button: "上传"
+      help: "帮助"
     trace_header:
-      see_just_your_traces: "See just your traces, or upload a trace"
-      see_all_traces: "See all traces"
-      see_your_traces: "See all your traces"
-      traces_waiting: "You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
+      see_just_your_traces: "查看您的追踪，或上传一条追踪路径"
+      see_all_traces: "查看所有的追踪路径"
+      see_your_traces: "查看您所有的追踪路径"
+      traces_waiting: "您有 {{count}} 条追踪路径正等待上传，请再您上传更多路径前等待这些传完，以确保不会给其他用户造成队列拥堵。"
     trace_optionals:
-      tags: "Tags"
+      tags: "标签"
     view:
       pending: "PENDING"
-      filename: "Filename:"
-      download: "download"
+      filename: "文件名:"
+      download: "下载"
       uploaded: "Uploaded at:"
-      points: "Points:"
-      start_coordinates: "Start coordinate:"
-      map: "map"
-      edit: "edit"
-      owner: "Owner:"
-      description: "Description:"
-      tags: "Tags"
-      none: "None"
-      make_public: "Make this track public permanently"
-      edit_track: "Edit this track"
-      delete_track: "Delete this track"
-      viewing_trace: "Viewing trace {{name}}"
-      trace_not_found: "Trace not found!"
+      points: "结点:"
+      start_coordinates: "开始坐标:"
+      map: "地图"
+      edit: "编辑"
+      owner: "所有者:"
+      description: "描述:"
+      tags: "标签"
+      none: "空"
+      make_public: "永久公开这条路径"
+      edit_track: "编辑这条路径"
+      delete_track: "删除这条路径"
+      viewing_trace: "查看路径 {{name}}"
+      trace_not_found: "路径为找到!"
     trace_paging_nav:
-      showing: "Showing page"
+      showing: "显示页"
       of: "of"
     trace:
       pending: "PENDING"
-      count_points: "{{count}} points"
-      ago: "{{time_in_words_ago}} ago"
-      more: "more"
-      trace_details: "View Trace Details"
-      view_map: "View Map"
-      edit: "edit"
-      edit_map: "Edit Map"
-      public: "PUBLIC"
-      private: "PRIVATE"
+      count_points: "{{count}} 个点"
+      ago: "{{time_in_words_ago}} 之前"
+      more: "更多"
+      trace_details: "查看路径详情"
+      view_map: "查看地图"
+      edit: "编辑"
+      edit_map: "编辑地图"
+      public: "公开"
+      private: "私有"
       by: "by"
       in: "in"
-      map: "map"
+      map: "地图"
     list:
-      public_traces: "Public GPS traces"
-      your_traces: "Your GPS traces"
-      public_traces_from: "Public GPS traces from {{user}}"
-      tagged_with: " tagged with {{tags}}"
+      public_traces: "公共GPS追踪路径"
+      your_traces: "您的GPS追踪路径"
+      public_traces_from: "公共 GPS 追踪路径来自 {{user}}"
+      tagged_with: " 标记为 {{tags}}"
     delete:
-      scheduled_for_deletion: "Track scheduled for deletion"
+      scheduled_for_deletion: "计划被删除的路径"
     make_public:
-      made_public: "Track made public"
+      made_public: "公开化路径"
   user:
     login:
-      heading: "Login"
-      please login: "Please login or {{create_user_link}}."
-      create_account: "create an account"
-      email or username: "Email Address or Username: "
-      password: "Password: "
-      lost password link: "Lost your password?"
-      login_button: "Login"
+      heading: "登陆"
+      please login: "请登陆或{{create_user_link}}."
+      create_account: "创建一个账户"
+      email or username: "邮箱或用户名: "
+      password: "密码: "
+      lost password link: "找回密码?"
+      login_button: "登陆"
     lost_password:
-      title: "lost password"
-      heading: "Forgotten Password?"
-      email address: "Email Address:"
-      new password button: "Send me a new password"
-      notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
-      notice email cannot find: "Couldn't find that email address, sorry."
+      title: "丢失密码"
+      heading: "忘记密码?"
+      email address: "邮箱:"
+      new password button: "发送新密码"
+      notice email on way: "抱歉您的密码丢失 :-( 但是您可以根据发送的邮件重设密码。"
+      notice email cannot find: "对不起，无法找到邮箱。"
     reset_password:
-      title: "reset password"
-      flash changed check mail: "Your password has been changed and is on its way to your mailbox :-)"
-      flash token bad: "Didn't find that token, check the URL maybe?"
+      title: "重设密码"
+      flash changed check mail: "您的密码以更改，正被发送到您的邮箱:-)"
+      flash token bad: "未找到代符, 建议查看URL?"
     new:
-      heading: "Create a User Account"
-      no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
-      contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible. '
-      fill_form: "Fill in the form and we'll send you a quick email to activate your account."
-      license_agreement: 'By creating an account, you agree that all work uploaded to openstreetmap.org and all data created by use of any tools which connect to openstreetmap.org is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.'
-      email address: "Email Address: "
-      confirm email address: "Confirm Email Address: "
-      not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
-      display name: "Display Name: "
-      password: "Password: "
-      confirm password: "Confirm Password: "
-      signup: Signup
-      flash create success message: "User was successfully created. Check your email for a confirmation note, and you\'ll be mapping in no time :-)<br /><br />Please note that you won't be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
+      heading: "创建用户帐号"
+      no_auto_account_create: "很遗憾我们现在不能为您自动创立一个账户。"
+      contact_webmaster: '请联系 <a href="mailto:webmaster@openstreetmap.org">webmaster</a> 来安排一个账户创立 - 我们将尽快尝试处理您的请求。'
+      fill_form: "填写表格，我们将尽快向您发送一封邮件来激活您的帐户。"
+      license_agreement: '创立此账户，意味您同意所有上传到openstreetmap.org的工作以及所有利用与openstreetmap.org相关的工具所创建的任何数据都将（非独家）授权于<a href="http://creativecommons.org/licenses/by-sa/2.0/">这种创作共用协议 (by-sa)</a>.'
+      email address: "邮箱: "
+      confirm email address: "确认邮箱: "
+      not displayed publicly: '不公开显示(查看 <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">隐私政策</a>)'
+      display name: "显示姓名: "
+      password: "密码: "
+      confirm password: "密码确认: "
+      signup: 注册
+      flash create success message: "成功创建用户。查看确认邮件，Check your email for a confirmation note, and you\'ll be mapping in no time :-)<br /><br />请注意您尚不能登陆直到您收到并确认您的邮箱地址。<br /><br />如果您使用反垃圾系统发送确认请求，请保证将webmaster@openstreetmap.org列入友好名单，因为我们不能回复任何确认请求。"
     no_such_user:
-      body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
+      body: "对不起，没有此名{{user}}所对应的用户。请检查您的拼写，或者可能您点击了错误链接。"
     view:
-      my diary: my diary
-      new diary entry: new diary entry
-      my edits: my edits
-      my traces: my traces
-      my settings: my settings
-      send message: send message
-      diary: diary
-      edits: edits
+      my diary: 我的日志
+      new diary entry: 新日志入口
+      my edits: 我的编辑
+      my traces: 我的追踪路径
+      my settings: 我的设置
+      send message: 发送信息
+      diary: 日志
+      edits: 编辑
       traces: traces
-      remove as friend: remove as friend
-      add as friend: add as friend
+      remove as friend: 删除好友
+      add as friend: 添加为好友
       mapper since: "Mapper since: "
-      ago: "({{time_in_words_ago}} ago)"
-      user image heading: User image
-      delete image: Delete Image
-      upload an image: Upload an image
-      add image: Add Image
-      description: Description
-      user location: User location
-      no home location: "No home location has been set."
-      if set location: "If you set your location, a pretty map and stuff will appear below. You can set your home location on your {{settings_link}} page."
-      settings_link_text: settings
-      your friends: Your friends
-      no friends: You have not added any friends yet.
-      km away: "{{distance}}km away"
-      nearby users: "Nearby users: "
-      no nearby users: "There are no users who admit to mapping nearby yet."
-      change your settings: change your settings
+      ago: "({{time_in_words_ago}} 以前)"
+      user image heading: 用户头像
+      delete image: 删除头像
+      upload an image: 上传图片
+      add image: 添加图片
+      description: 描述
+      user location: 用户位置
+      no home location: "未设定所在位置。"
+      if set location: "如果您设定您的位置，一张精美的地图及其他相关信息将出现在下方。您可以通过您的{{settings_link}}页面来设置您的位置。" 
+      settings_link_text: 设定
+      your friends: 您的朋友
+      no friends: 您还没有添加任何好友。
+      km away: "{{count}}公里之外"
+      nearby users: "附近用户: "
+      no nearby users: "这里没有在您附近的用户。"
+      change your settings: 更改您的设置
     friend_map:
-      your location: Your location
-      nearby mapper: "Nearby mapper: "
+      your location: 您的位置
+      nearby mapper: "附近用户: "
     account:
-      my settings: My settings
-      email never displayed publicly: "(never displayed publicly)"
+      my settings: 我的设置
+      email never displayed publicly: "(从不公开显示)"
       public editing:
-        heading: "Public editing: "
-        enabled: "Enabled. Not anonymous and can edit data."
+        heading: "公开编辑: "
+        enabled: "启动。非匿名并可编辑数据。"
         enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-        enabled link text: "what's this?"
-        disabled: "Disabled and cannot edit data, all previous edits are anonymous."
-        disabled link text: "why can't I edit?"
-      profile description: "Profile Description: "
-      preferred languages: "Preferred Languages: "
-      home location: "Home Location: "
-      no home location: "You have not entered your home location."
-      latitude: "Latitude: "
-      longitude: "Longitude: "
-      update home location on click: "Update home location when I click on the map?"
-      save changes button: Save Changes
-      make edits public button: Make all my edits public
-      return to profile: Return to profile
-      flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
-      flash update success: "User information updated successfully."
+        enabled link text: "这是什么?"
+        disabled: "禁用且无法编辑数据，所有过去的编辑均为匿名。"
+        disabled link text: "为什么无法编辑?"
+      profile description: "基本信息描述: "
+      preferred languages: "选择语言: "
+      home location: "所在位置: "
+      no home location: "您尚未输入所在位置。"
+      latitude: "纬度: "
+      longitude: "经度: "
+      update home location on click: "点击地图时更新所在位置?"
+      save changes button: 保存更改
+      make edits public button: 公开我所有的编辑
+      return to profile: 返回基本信息
+      flash update success confirm needed: "成功更新用户信息。 查看您的邮箱以确认您的新邮箱地址。"
+      flash update success: "成功更新用户信息。"
     confirm:
-      heading: Confirm a user account
-      press confirm button: "Press the confirm button below to activate your account."
-      button: Confirm
+      heading: 确认用户帐户
+      press confirm button: "按下面的确认键激活您的帐户。"
+      button: 确认
     confirm email:
-      heading: Confirm a change of email address
-      press confirm button: "Press the confirm button below to confirm your new email address."
-      button: Confirm
+      heading: 确认邮箱地址的变更
+      press confirm button: "按下面确认键确认您的新邮箱地址。"
+      button: 确认
     set_home:
-      flash success: "Home location saved successfully"
+      flash success: "成功保存您所在位置"
     go_public:
-      flash success: "All your edits are now public, and you are now allowed to edit."
+      flash success: "您的所有编辑现在均已公开，现在允许您开始编辑。"
 
diff --git a/config/routes.rb b/config/routes.rb
index 721cb5e11..6656d0cd5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -73,7 +73,7 @@ ActionController::Routing::Routes.draw do |map|
   map.connect "api/#{API_VERSION}/swf/trackpoints", :controller =>'swf', :action =>'trackpoints'
   
   # Data browsing
-  map.connect '/browse', :controller => 'changeset', :action => 'list', :format => 'rhtml'
+  map.connect '/browse', :controller => 'changeset', :action => 'list'
   map.connect '/browse/start', :controller => 'browse', :action => 'start'
   map.connect '/browse/way/:id', :controller => 'browse', :action => 'way', :id => /\d+/
   map.connect '/browse/way/:id/history', :controller => 'browse', :action => 'way_history', :id => /\d+/
@@ -82,15 +82,15 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '/browse/relation/:id', :controller => 'browse', :action => 'relation', :id => /\d+/
   map.connect '/browse/relation/:id/history', :controller => 'browse', :action => 'relation_history', :id => /\d+/
   map.connect '/browse/changeset/:id', :controller => 'browse', :action => 'changeset', :id => /\d+/
-  map.connect '/browse/changesets', :controller => 'changeset', :action => 'list', :format => 'rhtml'
-  map.connect '/browse/changesets/rss', :controller => 'changeset', :action => 'list', :format => 'rxml'
+  map.connect '/browse/changesets', :controller => 'changeset', :action => 'list'
+  map.connect '/browse/changesets/rss', :controller => 'changeset', :action => 'list', :format => :rss
   
   # web site
-  map.root :controller => 'site', :action => 'index', :format => 'rhtml'
+  map.root :controller => 'site', :action => 'index'
   map.connect '/', :controller => 'site', :action => 'index'
   map.connect '/edit', :controller => 'site', :action => 'edit'
-  map.connect '/history', :controller => 'changeset', :action => 'list', :format => 'rhtml'
-  map.connect '/history/rss', :controller => 'changeset', :action => 'list', :format => 'rxml'
+  map.connect '/history', :controller => 'changeset', :action => 'list'
+  map.connect '/history/rss', :controller => 'changeset', :action => 'list', :format => :rss
   map.connect '/export', :controller => 'site', :action => 'export'
   map.connect '/login', :controller => 'user', :action => 'login'
   map.connect '/logout', :controller => 'user', :action => 'logout'
@@ -144,8 +144,8 @@ ActionController::Routing::Routes.draw do |map|
 
   # user pages
   map.connect '/user/:display_name', :controller => 'user', :action => 'view'
-  map.connect '/user/:display_name/edits', :controller => 'changeset', :action => 'list', :format => 'rhtml'
-  map.connect '/user/:display_name/edits/rss', :controller => 'changeset', :action => 'list', :format => 'rxml'
+  map.connect '/user/:display_name/edits', :controller => 'changeset', :action => 'list'
+  map.connect '/user/:display_name/edits/rss', :controller => 'changeset', :action => 'list', :format =>:rss
   map.connect '/user/:display_name/make_friend', :controller => 'user', :action => 'make_friend'
   map.connect '/user/:display_name/remove_friend', :controller => 'user', :action => 'remove_friend'
   map.connect '/user/:display_name/diary', :controller => 'diary_entry', :action => 'list'
diff --git a/db/migrate/033_change_diary_entries_language.rb b/db/migrate/033_change_diary_entries_language.rb
index 2ca844884..674ae3d49 100644
--- a/db/migrate/033_change_diary_entries_language.rb
+++ b/db/migrate/033_change_diary_entries_language.rb
@@ -1,7 +1,7 @@
 class ChangeDiaryEntriesLanguage < ActiveRecord::Migration
   def self.up
     remove_column "diary_entries", "language"
-    add_column "diary_entries", "language_code", :string
+    add_column "diary_entries", "language_code", :string, :null => false, :default => "en"
   end
 
   def self.down
diff --git a/public/javascripts/site.js b/public/javascripts/site.js
index 8f9d3a035..e0c18a27b 100644
--- a/public/javascripts/site.js
+++ b/public/javascripts/site.js
@@ -1,5 +1,7 @@
-//Called as the user scrolls/zooms around.
-//Maniplate hrefs of the view tab and various other links
+/*
+ * Called as the user scrolls/zooms around to aniplate hrefs of the
+ * view tab and various other links
+ */
 function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat) {
   var decimals = Math.pow(10, Math.floor(zoom/3));
   var node;
@@ -104,6 +106,9 @@ function getArgs(url) {
   return args;
 }
 
+/*
+ * Called to set the arguments on a URL from the given hash.
+ */
 function setArgs(url, args) {
    var queryitems = new Array();
 
@@ -119,6 +124,9 @@ function setArgs(url, args) {
    return url.replace(/\?.*$/, "") + "?" + queryitems.join("&");
 }
 
+/*
+ * Called to get the arguments from a URL as a hash.
+ */
 function getStyle(el, property) {
   var style;
 
@@ -132,3 +140,21 @@ function getStyle(el, property) {
 
   return style;
 }
+
+/*
+ * Called to interpolate JavaScript variables in strings using a
+ * similar syntax to rails I18n string interpolation - the only
+ * difference is that [[foo]] is the placeholder syntax instead
+ * of {{foo}} which allows the same string to be processed by both
+ * rails and then later by javascript.
+ */
+function i18n(string, keys) {
+  for (var key in keys) {
+    var re_key = '\\[\\[' + key + '\\]\\]';
+    var re = new RegExp(re_key, "g");
+      
+    string = string.replace(re, keys[key]);
+  }
+   
+  return string;
+} 
diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf
index 581828f12..73b7a8f17 100755
Binary files a/public/potlatch/potlatch.swf and b/public/potlatch/potlatch.swf differ
diff --git a/public/stylesheets/site.css b/public/stylesheets/site.css
index 54a70a611..c8b1c5441 100644
--- a/public/stylesheets/site.css
+++ b/public/stylesheets/site.css
@@ -63,6 +63,11 @@ body {
   background: url('/images/tab_bottom.gif') repeat-x bottom;
 }
 
+/* An unread message (e.g. "inbox(1)") */
+.greeting-bar-unread {
+  font-weight: bold;
+}
+
 #intro {
   width: 170px;
   margin: 10px;
diff --git a/test/functional/diary_entry_controller_test.rb b/test/functional/diary_entry_controller_test.rb
index 709404045..d060af416 100644
--- a/test/functional/diary_entry_controller_test.rb
+++ b/test/functional/diary_entry_controller_test.rb
@@ -146,13 +146,9 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
   
   def test_edit_diary_entry_i18n
-    I18n.available_locales.each do |locale|
-      set_locale locale
-      
-      get(:edit, {:id => diary_entries(:normal_user_entry_1).id}, {'user' => users(:normal_user).id})
-      assert_response :success
-      assert_select "span[class=translation_missing]", false, "Missing translation in edit diary entry"
-    end
+    get(:edit, {:id => diary_entries(:normal_user_entry_1).id}, {'user' => users(:normal_user).id})
+    assert_response :success
+    assert_select "span[class=translation_missing]", false, "Missing translation in edit diary entry"
   end
   
   def test_create_diary_entry
@@ -166,20 +162,16 @@ class DiaryEntryControllerTest < ActionController::TestCase
   # Check that you can get the expected response and template for all available languages
   # Should test that there are no <span class="translation_missing">
   def test_listing_diary_entries
-    I18n.available_locales.each do |locale|
-      set_locale locale
-      
       get :list
-      assert_response :success, "Should be able to list the diary entries in #{locale}"
-      assert_template 'list', "Should use the list template in #{locale}"
+      assert_response :success, "Should be able to list the diary entries in locale"
+      assert_template 'list', "Should use the list template in locale"
       assert_select "span[class=translation_missing]", false, "Missing translation in list of diary entries"
     
       # Now try to find a specific user's diary entry
       get :list, {:display_name => users(:normal_user).display_name}
-      assert_response :success, "Should be able to list the diary entries for a user in #{locale}"
-      assert_template 'list', "Should use the list template for a user in #{locale}"
-      assert_select "span[class=translation_missing]", false, "Missing translation in list of diary entries for user"
-    end
+      assert_response :success, "Should be able to list the diary entries for a user in locale"
+      assert_template 'list', "Should use the list template for a user in locale"
+      assert_no_missing_translations
   end
   
   def test_rss
diff --git a/test/functional/site_controller_test.rb b/test/functional/site_controller_test.rb
index 63f88f350..c388870ad 100644
--- a/test/functional/site_controller_test.rb
+++ b/test/functional/site_controller_test.rb
@@ -8,15 +8,14 @@ class SiteControllerTest < ActionController::TestCase
     get :index
     assert_response :success
     assert_template 'index'
-    # Seems that we need to wait for Rails 2.3 for this one
-    # assert_template :partial => '_search', :count => 1
+    assert_site_partials
   end
   
   # Get the edit page
   def test_edit
     get :edit
     # Should be redirected
-    assert_response :redirect
+    assert_redirected_to :controller => :user, :action => 'login', :referer => "/edit"
   end
   
   # Get the export page
@@ -24,6 +23,7 @@ class SiteControllerTest < ActionController::TestCase
     get :export
     assert_response :success
     assert_template 'index'
+    assert_site_partials
   end
   
   # Offline page
@@ -31,5 +31,12 @@ class SiteControllerTest < ActionController::TestCase
     get :offline
     assert_response :success
     assert_template 'offline'
+    assert_site_partials 0
+  end
+  
+  def assert_site_partials(count = 1)
+    assert_template :partial => '_search', :count => count
+    assert_template :partial => '_key', :count => count
+    assert_template :partial => '_sidebar', :count => count
   end
 end
diff --git a/test/functional/user_controller_test.rb b/test/functional/user_controller_test.rb
index 8d90b2bcf..5c1d6f47e 100644
--- a/test/functional/user_controller_test.rb
+++ b/test/functional/user_controller_test.rb
@@ -4,7 +4,7 @@ class UserControllerTest < ActionController::TestCase
   fixtures :users
   
   # The user creation page loads
-  def test_user_create
+  def test_user_create_view
     get :new
     assert_response :success
     
@@ -27,6 +27,41 @@ class UserControllerTest < ActionController::TestCase
     end
   end
   
+  def test_user_create_success
+    new_email = "newtester@osm.org"
+    display_name = "new_tester"
+    assert_difference('User.count') do
+      assert_difference('ActionMailer::Base.deliveries.size') do
+        post :save, {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}}
+      end
+    end
+      
+    # Check the e-mail
+    register_email = ActionMailer::Base.deliveries.first
+  
+    assert_equal register_email.to[0], new_email
+    assert_match /#{@url}/, register_email.body
+
+    # Check the page
+    assert_redirected_to :action => 'login'
+      
+    ActionMailer::Base.deliveries.clear
+  end
+  
+  def test_user_create_submit_duplicate_email
+    dup_email = users(:public_user).email
+    display_name = "new_tester"
+    assert_difference('User.count', 0) do
+      assert_difference('ActionMailer::Base.deliveries.size', 0) do
+        post :save, :user => { :email => dup_email, :email_confirmation => dup_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}
+      end
+    end
+    assert_response :success                                                                       
+    assert_template 'new'
+    assert_select "div#errorExplanation"
+    assert_select "table#loginForm > tr > td > div[class=fieldWithErrors] > input#user_email"
+  end
+  
   # Check that the user account page will display and contains some relevant
   # information for the user
   def test_view_user_account
diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb
index 5f664b5c8..e6ac49e8d 100644
--- a/test/integration/user_creation_test.rb
+++ b/test/integration/user_creation_test.rb
@@ -1,10 +1,88 @@
-require 'test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 
 class UserCreationTest < ActionController::IntegrationTest
   fixtures :users
 
-  def test_create_user_duplicate
-    get '/user/new'
-    assert_response :success
+  def test_create_user_form
+    I18n.available_locales.each do |locale|
+      get '/user/new', {}, {"accept_language" => locale.to_s}
+      assert_response :success
+      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', 
+            {: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_template 'user/new'
+      assert_equal response.headers['Content-Language'][0..1], localer.to_s[0..1] unless localer == :root
+      assert_select "div#errorExplanation"
+      assert_select "table#loginForm > tr > td > div[class=fieldWithErrors] > input#user_email"
+      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
+      email = "#{locale.to_s}_new_tester"
+      assert_difference('User.count', 0) do
+        assert_difference('ActionMailer::Base.deliveries.size', 0) do
+          post '/user/save',
+          {:user => {:email => email, :email_confirmation => email, :display_name => dup_display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}},
+          {"accept_language" => locale.to_s}
+        end
+      end
+      assert_response :success
+      assert_template 'user/new'
+      assert_select "div#errorExplanation"
+      assert_select "table#loginForm > tr > td > div[class=fieldWithErrors] > input#user_display_name"
+      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", 
+            {: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
+    # Submit the lost password form
+    # Check the e-mail
+    # Submit the reset password token
+    # Check that the password has changed, and the user can login
   end
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index c210315a9..97c749000 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -123,10 +123,6 @@ class ActiveSupport::TestCase
     @request.env["RAW_POST_DATA"] = c.to_s
   end
   
-  def set_locale(l)
-    @request.env["HTTP_ACCEPT_LANGUAGE"] = l.to_s
-  end
-  
   # Used to check that the error header and the forbidden responses are given
   # when the owner of the changset has their data not marked as public
   def assert_require_public_data(msg = "Shouldn't be able to use API when the user's data is not public")
@@ -140,5 +136,9 @@ class ActiveSupport::TestCase
     #assert_equal @response.headers['Error'], ""
   end
   
+  def assert_no_missing_translations(msg="")
+    assert_select "span[class=translation_missing]", false, "Missing translation #{msg}"
+  end
+  
   # Add more helper methods to be used by all tests here...
 end
diff --git a/test/unit/node_test.rb b/test/unit/node_test.rb
index acad7218c..21a62cc5f 100644
--- a/test/unit/node_test.rb
+++ b/test/unit/node_test.rb
@@ -167,4 +167,92 @@ class NodeTest < ActiveSupport::TestCase
     #assert_equal node_template.tags, old_node.tags
     assert_equal node_template.timestamp.to_i, old_node.timestamp.to_i
   end
+  
+  def test_from_xml_no_id
+    lat = 56.7
+    lon = -2.3
+    changeset = 2
+    version = 1
+    noid = "<osm><node lat='#{lat}' lon='#{lon}' changeset='#{changeset}' version='#{version}' /></osm>"
+    # First try a create which doesn't need the id
+    assert_nothing_raised(OSM::APIBadXMLError) {
+      Node.from_xml(noid, true)
+    }
+    # Now try an update with no id, and make sure that it gives the appropriate exception
+    message = assert_raise(OSM::APIBadXMLError) {
+      Node.from_xml(noid, false)
+    }
+    assert_match /ID is required when updating./, message.message
+  end
+  
+  def test_from_xml_no_lat
+    nolat = "<osm><node id='1' lon='23.3' changeset='2' version='23' /></osm>"
+    message_create = assert_raise(OSM::APIBadXMLError) {
+      Node.from_xml(nolat, true)
+    }
+    assert_match /lat missing/, message_create.message
+    message_update = assert_raise(OSM::APIBadXMLError) {
+      Node.from_xml(nolat, false)
+    }
+    assert_match /lat missing/, message_update.message
+  end
+  
+  def test_from_xml_no_lon
+    nolon = "<osm><node id='1' lat='23.1' changeset='2' version='23' /></osm>"
+    message_create = assert_raise(OSM::APIBadXMLError) {
+      Node.from_xml(nolon, true)
+    }
+    assert_match /lon missing/, message_create.message
+    message_update = assert_raise(OSM::APIBadXMLError) {
+      Node.from_xml(nolon, false)
+    }
+    assert_match /lon missing/, message_update.message
+  end
+
+  def test_from_xml_no_changeset_id
+    nocs = "<osm><node id='123' lon='23.23' lat='23.1' version='23' /></osm>"
+    message_create = assert_raise(OSM::APIBadXMLError) {
+      Node.from_xml(nocs, true)
+    }
+    assert_match /changeset id missing/, message_create.message
+    message_update = assert_raise(OSM::APIBadXMLError) {
+      Node.from_xml(nocs, false)
+    }
+    assert_match /changeset id missing/, message_update.message
+  end
+  
+  def test_from_xml_no_version
+    no_version = "<osm><node id='123' lat='23' lon='23' changeset='23' /></osm>"
+    assert_nothing_raised(OSM::APIBadXMLError) {
+      Node.from_xml(no_version, true)
+    }
+    message_update = assert_raise(OSM::APIBadXMLError) {
+      Node.from_xml(no_version, false)
+    }
+    assert_match /Version is required when updating/, message_update.message
+  end
+  
+  def test_from_xml_double_lat
+    nocs = "<osm><node id='123' lon='23.23' lat='23.1' lat='12' changeset='23' version='23' /></osm>"
+    message_create = assert_raise(OSM::APIBadXMLError) {
+      Node.from_xml(nocs, true)
+    } 
+    assert_match /Fatal error: Attribute lat redefined at/, message_create.message
+    message_update = assert_raise(OSM::APIBadXMLError) {
+      Node.from_xml(nocs, false)
+    }
+    assert_match /Fatal error: Attribute lat redefined at/, message_update.message
+  end
+  
+  def test_from_xml_no_text
+    no_text = ""
+    message_create = assert_raise(OSM::APIBadXMLError) {
+      Node.from_xml(no_text, true)
+    }
+    assert_match /Must specify a string with one or more characters/, message_create.message
+    message_update = assert_raise(OSM::APIBadXMLError) {
+      Node.from_xml(no_text, false)
+    }
+    assert_match /Must specify a string with one or more characters/, message_create.message
+  end
 end
diff --git a/vendor/plugins/rails-i18n/locale/de.yml b/vendor/plugins/rails-i18n/locale/de.yml
index a76e113a6..b087b0765 100644
--- a/vendor/plugins/rails-i18n/locale/de.yml
+++ b/vendor/plugins/rails-i18n/locale/de.yml
@@ -2,6 +2,15 @@
 # by Clemens Kofler (clemens@railway.at)
 
 de:
+  # Support for word connectors, added for OpenStreetMap, needs upstream merge
+  support:
+    array:
+      sentence_connector: "und"
+      skip_last_comma: true
+      words_connector: ", "
+      two_words_connector: " und "
+      last_word_connector: " und "
+
   date:
     formats:
       default: "%d.%m.%Y"