X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/261a93fbbc974400d40b74bca9923887d939ab79..6de8c2e6b30485683a9d3aa3e21c4b256fe399bd:/config/locales/be.yml

diff --git a/config/locales/be.yml b/config/locales/be.yml
index fdcaf66f0..3b08524c0 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1,6 +1,8 @@
 # Messages for Belarusian (ÐÐµÐ»Ð°ÑÑÑÐºÐ°Ñ)
 # Exported from translatewiki.net
-# Export driver: syck
+# Export driver: syck-pecl
+# Author: Jim-by
+# Author: Ð¢ÐµÑÑ
 be: 
   activerecord: 
     attributes: 
@@ -72,7 +74,7 @@ be:
   browse: 
     changeset: 
       changeset: "ÐÐ°Ð±Ð¾Ñ Ð·Ð¼ÐµÐ½Ð°Ñ:"
-      download: Ð¡ÑÑÐ³Ð½ÑÑÑ {{changeset_xml_link}} ÑÑ {{osmchange_xml_link}}
+      download: Ð¡ÑÑÐ³Ð½ÑÑÑ %{changeset_xml_link} ÑÑ %{osmchange_xml_link}
       title: ÐÐ°Ð±Ð¾Ñ Ð·Ð¼ÐµÐ½Ð°Ñ
     changeset_details: 
       belongs_to: "ÐÐ°Ð»ÐµÐ¶ÑÑÑ:"
@@ -80,9 +82,9 @@ be:
       box: Ð¼ÑÐ¶Ð°
       closed_at: "ÐÐ°ÐºÑÑÑÑ:"
       created_at: "Ð¡ÑÐ²Ð¾ÑÐ°Ð½Ñ:"
-      has_nodes: "Ð¡ÐºÐ»Ð°Ð´Ð°ÐµÑÑÐ° Ð· {{count}} Ð²ÑÐ·Ð»Ð¾Ñ:"
-      has_relations: "Ð¡ÐºÐ»Ð°Ð´Ð°ÐµÑÑÐ° Ð· {{count}} ÑÑÐ²ÑÐ·ÐµÐ¹:"
-      has_ways: "Ð¡ÐºÐ»Ð°Ð´Ð°ÐµÑÑÐ° Ð· {{count}} ÑÐ»ÑÑÐ¾Ñ:"
+      has_nodes: "Ð¡ÐºÐ»Ð°Ð´Ð°ÐµÑÑÐ° Ð· %{count} Ð²ÑÐ·Ð»Ð¾Ñ:"
+      has_relations: "Ð¡ÐºÐ»Ð°Ð´Ð°ÐµÑÑÐ° Ð· %{count} ÑÑÐ²ÑÐ·ÐµÐ¹:"
+      has_ways: "Ð¡ÐºÐ»Ð°Ð´Ð°ÐµÑÑÐ° Ð· %{count} ÑÐ»ÑÑÐ¾Ñ:"
       no_bounding_box: ÐÐµÐ¶Ñ Ð³ÑÑÐ°Ð³Ð° Ð½Ð°Ð±Ð¾ÑÐ° Ð·Ð¼ÐµÐ½Ð°Ñ Ð½Ðµ Ð²ÑÐ·Ð½Ð°ÑÐ°Ð½Ñ.
       show_area_box: ÐÐ°ÐºÐ°Ð·Ð°ÑÑ Ð¼ÑÐ¶Ñ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ
     common_details: 
@@ -94,21 +96,21 @@ be:
       deleted: ÐÑÐ´Ð°Ð»ÐµÐ½Ñ
       loading: ÐÐ°Ð³ÑÑÐ·ÐºÐ°...
     node: 
-      download: "{{download_xml_link}} ÑÑ {{view_history_link}}"
+      download: "%{download_xml_link} ÑÑ %{view_history_link}"
       download_xml: Ð¡ÑÑÐ³Ð½ÑÑÑ XML
       node: ÐÑÐ·ÐµÐ»
-      node_title: "ÐÑÐ·ÐµÐ»: {{node_name}}"
+      node_title: "ÐÑÐ·ÐµÐ»: %{node_name}"
       view_history: Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÑÑÑ Ð³ÑÑÑÐ¾ÑÑÑ
     node_details: 
       coordinates: "ÐÐ°Ð°ÑÐ´ÑÐ½Ð°ÑÑ:"
       part_of: "Ð§Ð°ÑÑÐºÐ°:"
     node_history: 
-      download: "{{download_xml_link}} ÑÑ {{view_details_link}}"
+      download: "%{download_xml_link} ÑÑ %{view_details_link}"
       download_xml: Ð¡ÑÑÐ³Ð½ÑÑÑ XML
       node_history: ÐÑÑÑÐ¾ÑÑÑ Ð²ÑÐ·Ð»Ð°
       view_details: Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÑÑÑ Ð´ÑÑÐ°Ð»Ñ
     not_found: 
-      sorry: ÐÑÐ°Ð±Ð°ÑÑÐµ, {{type}} Ð· Ð½ÑÐ¼Ð°ÑÐ°Ð¼ {{id}} Ð½Ðµ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ.
+      sorry: ÐÑÐ°Ð±Ð°ÑÑÐµ, %{type} Ð· Ð½ÑÐ¼Ð°ÑÐ°Ð¼ %{id} Ð½Ðµ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ.
       type: 
         node: Ð²ÑÐ·ÐµÐ»
         relation: Ð°Ð´Ð½Ð¾ÑÑÐ½Ñ
@@ -117,17 +119,17 @@ be:
       of: Ð·
       showing_page: ÐÐ°ÐºÐ°Ð· ÑÑÐ°ÑÐ¾Ð½ÐºÑ
     relation: 
-      download: "{{download_xml_link}} ÑÑ {{view_history_link}}"
+      download: "%{download_xml_link} ÑÑ %{view_history_link}"
       download_xml: Ð¡ÑÑÐ³Ð½ÑÑÑ XML
       relation: Ð¡ÑÐ²ÑÐ·Ñ
-      relation_title: "Ð¡ÑÐ²ÑÐ·Ñ: {{relation_name}}"
+      relation_title: "Ð¡ÑÐ²ÑÐ·Ñ: %{relation_name}"
       view_history: Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ Ð³ÑÑÑÐ¾ÑÑÑ
     relation_details: 
       members: "Ð£Ð´Ð·ÐµÐ»ÑÐ½ÑÐºÑ:"
       part_of: "Ð§Ð°ÑÑÐºÐ°:"
     relation_history: 
       relation_history: ÐÑÑÑÐ¾ÑÑÑ ÑÑÐ²ÑÐ·Ñ
-      relation_history_title: "ÐÑÑÑÐ¾ÑÑÑ ÑÑÐ²ÑÐ·Ñ: {{relation_name}}"
+      relation_history_title: "ÐÑÑÑÐ¾ÑÑÑ ÑÑÐ²ÑÐ·Ñ: %{relation_name}"
     start: 
       manually_select: ÐÑÐ±ÑÐ°ÑÑ ÑÐ½ÑÑÑ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ
       view_data: ÐÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ Ð¿Ð° Ð±ÑÐ³ÑÑÑÐ¼ Ð°Ð³Ð»ÑÐ´Ð·Ðµ
@@ -156,29 +158,29 @@ be:
           way: ÐÑÐ½ÑÑ
       private_user: ÑÐ°ÐµÐ¼Ð½Ñ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº
       show_history: ÐÐ°ÐºÐ°Ð·Ð°ÑÑ Ð³ÑÑÑÐ¾ÑÑÑ
-      unable_to_load_size: "ÐÐµÐ»ÑÐ³Ð° Ð·Ð°Ð³ÑÑÐ·ÑÑÑ: Ð¿Ð°ÑÐµÐ¼ Ð¼ÑÐ¶Ñ [[bbox_size]] Ð·Ð°Ð½Ð°Ð´ÑÐ° Ð²ÑÐ»ÑÐºÑ (Ð¿Ð°Ð²ÑÐ½ÐµÐ½ Ð±ÑÑÑ Ð½Ðµ Ð±Ð¾Ð»ÑÑ ÑÐº {{max_bbox_size}})"
+      unable_to_load_size: "ÐÐµÐ»ÑÐ³Ð° Ð·Ð°Ð³ÑÑÐ·ÑÑÑ: Ð¿Ð°ÑÐµÐ¼ Ð¼ÑÐ¶Ñ [[bbox_size]] Ð·Ð°Ð½Ð°Ð´ÑÐ° Ð²ÑÐ»ÑÐºÑ (Ð¿Ð°Ð²ÑÐ½ÐµÐ½ Ð±ÑÑÑ Ð½Ðµ Ð±Ð¾Ð»ÑÑ ÑÐº %{max_bbox_size})"
       wait: ÐÐ°ÑÐ°ÐºÐ°Ð¹ÑÐµ...
       zoom_or_select: ÐÐ°Ð±Ð»ÑÐ·ÑÑÐµÑÑ ÑÑ Ð²ÑÐ±ÐµÑÑÑÐµ ÑÐ½ÑÑÑ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ Ð´Ð»Ñ Ð°Ð³Ð»ÑÐ´Ñ
     tag_details: 
       tags: "Ð¦ÑÑÐ»ÑÐºÑ:"
     way: 
-      download: "{{download_xml_link}} ÑÑ {{view_history_link}}"
+      download: "%{download_xml_link} ÑÑ %{view_history_link}"
       download_xml: Ð¡ÑÑÐ³Ð½ÑÑÑ XML
       view_history: Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ Ð³ÑÑÑÐ¾ÑÑÑ
       way: Ð¨Ð»ÑÑ
-      way_title: "Ð¨Ð»ÑÑ: {{way_name}}"
+      way_title: "Ð¨Ð»ÑÑ: %{way_name}"
     way_details: 
       also_part_of: 
-        one: ÑÐ°ÐºÑÐ°Ð¼Ð° ÑÐ°ÑÑÐºÐ° ÑÐ»ÑÑÑ {{related_ways}}
-        other: ÑÐ°ÐºÑÐ°Ð¼Ð° ÑÐ°ÑÑÐºÐ° ÑÐ»ÑÑÐ¾Ñ {{related_ways}}
+        one: ÑÐ°ÐºÑÐ°Ð¼Ð° ÑÐ°ÑÑÐºÐ° ÑÐ»ÑÑÑ %{related_ways}
+        other: ÑÐ°ÐºÑÐ°Ð¼Ð° ÑÐ°ÑÑÐºÐ° ÑÐ»ÑÑÐ¾Ñ %{related_ways}
       nodes: "ÐÑÐ·Ð»Ñ:"
       part_of: "Ð§Ð°ÑÑÐºÐ°:"
     way_history: 
-      download: "{{download_xml_link}} ÑÑ {{view_details_link}}"
+      download: "%{download_xml_link} ÑÑ %{view_details_link}"
       download_xml: Ð¡ÑÑÐ³Ð½ÑÑÑ XML
       view_details: Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÑÑ Ð¿Ð°Ð´ÑÐ°Ð±ÑÐ·Ð½ÐµÐ¹
       way_history: ÐÑÑÑÐ¾ÑÑÑ ÑÐ»ÑÑÑ
-      way_history_title: "ÐÑÑÑÐ¾ÑÑÑ ÑÐ»ÑÑÑ: {{way_name}}"
+      way_history_title: "ÐÑÑÑÐ¾ÑÑÑ ÑÐ»ÑÑÑ: %{way_name}"
   changeset: 
     changeset: 
       anonymous: ÐÐ½Ð°Ð½ÑÐ¼Ð½Ð°
@@ -188,6 +190,8 @@ be:
       show_area_box: Ð¿Ð°ÐºÐ°Ð·Ð°ÑÑ Ð¼ÑÐ¶Ñ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ
       still_editing: (Ñ Ð¿ÑÐ°ÑÑÑÐµ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ñ)
       view_changeset_details: ÐÐ°Ð´ÑÐ°Ð±ÑÐ·Ð½ÐµÐ¹ Ð¿ÑÐ° Ð½Ð°Ð±Ð¾Ñ Ð·Ð¼ÐµÐ½Ð°Ñ
+    changeset_paging_nav: 
+      showing_page: ÐÐ°ÐºÐ°Ð·Ð²Ð°ÐµÑÑÐ° ÑÑÐ°ÑÐ¾Ð½ÐºÐ°
     changesets: 
       area: ÐÑÑÑÐ¾Ð²Ð°ÑÑÑ
       comment: ÐÐ°Ð¼ÐµÐ½ÑÐ°Ñ
@@ -196,14 +200,14 @@ be:
       user: ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº
   diary_entry: 
     diary_comment: 
-      comment_from: ÐÐ°Ð¼ÐµÐ½ÑÐ°Ñ {{link_user}} Ñ {{comment_created_at}}
+      comment_from: ÐÐ°Ð¼ÐµÐ½ÑÐ°Ñ %{link_user} Ñ %{comment_created_at}
     diary_entry: 
       comment_count: 
         one: 1 ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ñ
-        other: "ÐÐ°Ð¼ÐµÐ½ÑÐ°ÑÐ°Ñ: {{count}}"
+        other: "ÐÐ°Ð¼ÐµÐ½ÑÐ°ÑÐ°Ñ: %{count}"
       comment_link: ÐÐ°Ð¼ÐµÐ½ÑÐ°Ð²Ð°ÑÑ Ð³ÑÑÑ Ð·Ð°Ð¿ÑÑ
       edit_link: ÐÐ¼ÑÐ½ÑÑÑ Ð³ÑÑÑ Ð·Ð°Ð¿ÑÑ
-      posted_by: ÐÐ°Ð¿ÑÑÐ°Ð½Ð° {{link_user}} Ñ {{created}} Ð½Ð° {{language_link}}
+      posted_by: ÐÐ°Ð¿ÑÑÐ°Ð½Ð° %{link_user} Ñ %{created} Ð½Ð° %{language_link}
       reply_link: ÐÐ´ÐºÐ°Ð·Ð°ÑÑ Ð½Ð° Ð³ÑÑÑ Ð·Ð°Ð¿ÑÑ
     edit: 
       body: "Ð¦ÐµÐ»Ð°:"
@@ -217,7 +221,7 @@ be:
       title: ÐÐ¼ÑÐ½ÑÑÑ Ð·Ð°Ð¿ÑÑ Ð´Ð·ÑÐ½Ð½ÑÐºÑ
       use_map_link: ÐºÐ°ÑÑÑÑÐ°ÑÑÐ° ÐºÐ°ÑÑÐ°Ð¹
     list: 
-      in_language_title: ÐÐ·ÑÐ½Ð½ÑÐº Ð·Ð°Ð¿ÑÑÐ°Ñ Ñ {{language}}
+      in_language_title: ÐÐ·ÑÐ½Ð½ÑÐº Ð·Ð°Ð¿ÑÑÐ°Ñ Ñ %{language}
       new: ÐÐ¾Ð²Ñ Ð·Ð°Ð¿ÑÑ Ð´Ð·ÑÐ½Ð½ÑÐºÑ
       new_title: ÐÐ¾Ð²Ñ Ð·Ð°Ð¿ÑÑ Ð´Ð»Ñ Ð²Ð°ÑÐ°Ð³Ð° Ð´Ð·ÑÐ½Ð½ÑÐºÑ
       newer_entries: ÐÐ°Ð²ÐµÐ¹ÑÑÑ Ð·Ð°Ð¿ÑÑÑ
@@ -225,23 +229,23 @@ be:
       older_entries: Ð¡ÑÐ°ÑÑÐ¹ÑÑÑ Ð·Ð°Ð¿ÑÑÑ
       recent_entries: "ÐÑÐ´Ð°ÑÐ½ÑÑ Ð·Ð°Ð¿ÑÑÑ Ñ Ð´Ð·ÑÐ½Ð½ÑÐºÑ:"
       title: ÐÐ·ÑÐ½Ð½ÑÐºÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ
-      user_title: ÐÐ·ÑÐ½Ð½ÑÐº {{user}}
+      user_title: ÐÐ·ÑÐ½Ð½ÑÐº %{user}
     new: 
       title: ÐÐ¾Ð²Ñ Ð·Ð°Ð¿ÑÑ Ð´Ð·ÑÐ½Ð½ÑÐºÑ
     no_such_entry: 
-      body: ÐÑÐ°Ð±Ð°ÑÐµ, Ð½Ðµ ÑÑÐ½ÑÐµ Ð·Ð°Ð¿ÑÑÑ Ñ Ð´Ð·ÑÐ½Ð½ÑÐºÑ ÑÑ ÐºÐ°Ð¼ÐµÐ½ÑÐ°ÑÐ° Ð· Ð½ÑÐ¼Ð°ÑÐ°Ð¼ {{id}}. ÐÑÐ°Ð²ÐµÑÑÐµ ÑÐ²Ð¾Ð¹ Ð¿ÑÐ°Ð²Ð°Ð¿ÑÑ, ÑÑ, Ð¼Ð°Ð³ÑÑÐ¼Ð°, Ð²Ð°Ð¼ Ð´Ð°Ð»Ñ Ð½ÑÐ¿ÑÐ°Ð²ÑÐ»ÑÐ½ÑÑ ÑÐ¿Ð°ÑÑÐ»ÐºÑ.
-      heading: "ÐÑÐ¼Ð° Ð·Ð°Ð¿ÑÑÑ Ð· Ð½ÑÐ¼Ð°ÑÐ°Ð¼: {{id}}"
+      body: ÐÑÐ°Ð±Ð°ÑÐµ, Ð½Ðµ ÑÑÐ½ÑÐµ Ð·Ð°Ð¿ÑÑÑ Ñ Ð´Ð·ÑÐ½Ð½ÑÐºÑ ÑÑ ÐºÐ°Ð¼ÐµÐ½ÑÐ°ÑÐ° Ð· Ð½ÑÐ¼Ð°ÑÐ°Ð¼ %{id}. ÐÑÐ°Ð²ÐµÑÑÐµ ÑÐ²Ð¾Ð¹ Ð¿ÑÐ°Ð²Ð°Ð¿ÑÑ, ÑÑ, Ð¼Ð°Ð³ÑÑÐ¼Ð°, Ð²Ð°Ð¼ Ð´Ð°Ð»Ñ Ð½ÑÐ¿ÑÐ°Ð²ÑÐ»ÑÐ½ÑÑ ÑÐ¿Ð°ÑÑÐ»ÐºÑ.
+      heading: "ÐÑÐ¼Ð° Ð·Ð°Ð¿ÑÑÑ Ð· Ð½ÑÐ¼Ð°ÑÐ°Ð¼: %{id}"
     no_such_user: 
-      body: ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð½Ðµ ÑÑÐ½ÑÐµ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° {{user}}. ÐÑÐ°Ð²ÐµÑÑÐµ ÑÐ²Ð¾Ð¹ Ð¿ÑÐ°Ð²Ð°Ð¿ÑÑ, ÑÑ, Ð¼Ð°Ð³ÑÑÐ¼Ð°, Ð²Ð°Ð¼ Ð´Ð°Ð»Ñ Ð½ÑÐ¿ÑÐ°Ð²ÑÐ»ÑÐ½ÑÑ ÑÐ¿Ð°ÑÑÐ»ÐºÑ.
-      heading: ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº {{user}} Ð½Ðµ ÑÑÐ½ÑÐµ
+      body: ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð½Ðµ ÑÑÐ½ÑÐµ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° %{user}. ÐÑÐ°Ð²ÐµÑÑÐµ ÑÐ²Ð¾Ð¹ Ð¿ÑÐ°Ð²Ð°Ð¿ÑÑ, ÑÑ, Ð¼Ð°Ð³ÑÑÐ¼Ð°, Ð²Ð°Ð¼ Ð´Ð°Ð»Ñ Ð½ÑÐ¿ÑÐ°Ð²ÑÐ»ÑÐ½ÑÑ ÑÐ¿Ð°ÑÑÐ»ÐºÑ.
+      heading: ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº %{user} Ð½Ðµ ÑÑÐ½ÑÐµ
       title: ÐÑÐ¼Ð° ÑÐ°ÐºÐ¾Ð³Ð° ÐºÐ°ÑÑÑÑÐ°ÑÐ°
     view: 
       leave_a_comment: ÐÐ°ÐºÑÐ½ÑÑÑ ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ñ
       login: ÐÐ¾Ð³ÑÐ½
-      login_to_leave_a_comment: "{{login_link}} ÐºÐ°Ð± Ð¿Ð°ÐºÑÐ½ÑÑÑ ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ñ"
+      login_to_leave_a_comment: "%{login_link} ÐºÐ°Ð± Ð¿Ð°ÐºÑÐ½ÑÑÑ ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ñ"
       save_button: ÐÐ°Ð¿ÑÑÐ°ÑÑ
-      title: ÐÐ·ÑÐ½Ð½ÑÐº ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° | {{user}}
-      user_title: ÐÐ·ÑÐ½Ð½ÑÐº {{user}}
+      title: ÐÐ·ÑÐ½Ð½ÑÐº ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° | %{user}
+      user_title: ÐÐ·ÑÐ½Ð½ÑÐº %{user}
   export: 
     start: 
       add_marker: ÐÐ°Ð´Ð°ÑÑ Ð¼Ð°ÑÐºÐµÑ Ð½Ð° ÐºÐ°ÑÑÑ
@@ -249,7 +253,7 @@ be:
       embeddable_html: HTML Ð´Ð»Ñ ÑÑÑÐ°ÑÐºÑ
       export_button: Ð­ÐºÑÐ¿Ð°ÑÑ
       export_details: ÐÐ°Ð´Ð·ÐµÐ½ÑÑ Ð¿ÑÐ°ÐµÐºÑÑ OpenStreetMap ÑÐ°ÑÐ¿Ð°ÑÑÑÐ´Ð¶Ð²Ð°ÑÑÑÐ° Ð¿Ð° Ð»ÑÑÑÐ½Ð·ÑÑ <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a>.
-      format: Ð¤Ð°ÑÐ¼Ð°Ñ
+      format: "Ð¤Ð°ÑÐ¼Ð°Ñ:"
       format_to_export: Ð¤Ð°ÑÐ¼Ð°Ñ Ð´Ð»Ñ ÑÐºÑÐ¿Ð°ÑÑÑ
       image_size: ÐÐ°Ð¼ÐµÑ Ð²ÑÑÐ²Ñ
       latitude: "Ð¨ÑÑ:"
@@ -262,7 +266,7 @@ be:
       osm_xml_data: OpenStreetMap XML
       osmarender_image: Ð²ÑÑÐ²Ð° Osmarender
       output: ÐÑÐ²Ð°Ð´
-      paste_html: Ð£ÑÑÐ°Ð²ÑÑÑ HTML Ð´Ð»Ñ ÑÐ±ÑÐ´Ð¾Ð²Ñ Ñ Ð²ÑÐ±-ÑÐ°Ð¹Ñ
+      paste_html: Ð£ÑÑÐ°Ð²ÑÑÑ HTML Ð´Ð»Ñ ÑÐ±ÑÐ´Ð¾Ð²Ñ Ñ Ð²ÑÐ±-ÑÐ°Ð¹Ñ
       scale: ÐÐ°ÑÑÐ°Ð±
       zoom: Ð¼Ð°ÑÑÐ°Ð±
     start_rjs: 
@@ -277,29 +281,24 @@ be:
     results: 
       no_results: ÐÑÑÐ¾Ð³Ð° Ð½Ðµ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ð°
   layouts: 
-    donate: ÐÐ°Ð´ÑÑÑÐ¼Ð°Ð¹ÑÐµ OpenStreetMap {{link}} Ñ ÑÐ¾Ð½Ð´ Ð°Ð±Ð½Ð°ÑÐ»ÐµÐ½Ð½Ñ ÑÑÑÐ½ÑÐºÑ.
+    donate: ÐÐ°Ð´ÑÑÑÐ¼Ð°Ð¹ÑÐµ OpenStreetMap %{link} Ñ ÑÐ¾Ð½Ð´ Ð°Ð±Ð½Ð°ÑÐ»ÐµÐ½Ð½Ñ ÑÑÑÐ½ÑÐºÑ.
     donate_link_text: Ð°ÑÐ²ÑÑÐ°Ð²Ð°Ð½Ð½ÐµÐ¼
     edit: ÐÐ¼ÑÐ½ÑÑÑ
-    edit_tooltip: Ð ÑÐ´Ð°Ð³Ð°Ð²Ð°ÑÑ ÐºÐ°ÑÑÑ
     export: Ð­ÐºÑÐ¿Ð°ÑÑ
     export_tooltip: Ð­ÐºÑÐ¿Ð°ÑÑÐ°Ð²Ð°ÑÑ Ð´Ð°Ð½Ð½ÑÑ ÐºÐ°ÑÑÑ
     gps_traces: GPS Ð¢ÑÑÐºÑ
     gps_traces_tooltip: ÐÑÐ°ÑÐ°Ð²Ð°ÑÑ Ð· ÑÑÑÐºÐ°Ð¼Ñ
-    help_wiki: ÐÐ°Ð¿Ð°Ð¼Ð¾Ð³Ð° Ñ Wiki
-    help_wiki_tooltip: ÐÐ°Ð²ÐµÐ´ÐºÐ° Ñ ÑÐ°Ð¹Ñ ÐÑÐºÑ
-    help_wiki_url: http://wiki.openstreetmap.org/wiki/RU:Main_Page
     history: ÐÑÑÑÐ¾ÑÑÑ
-    history_tooltip: ÐÑÑÑÐ¾ÑÑÑ Ð·Ð¼ÐµÐ½
     home: Ð´Ð°Ð¼Ð¾Ñ
     home_tooltip: ÐÐ°ÐºÐ°Ð·Ð°ÑÑ Ð¼Ð°Ñ ÑÐ°ÑÑ
-    inbox: ÑÐ²Ð°ÑÐ¾Ð´Ð½ÑÑ ({{count}})
+    inbox: ÑÐ²Ð°ÑÐ¾Ð´Ð½ÑÑ (%{count})
     inbox_tooltip: 
       one: Ð£ Ð²Ð°ÑÐ°Ð¹ ÑÐºÑÑÐ½Ñ ÑÑÑÑ 1 Ð½Ð¾Ð²Ð°Ðµ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ
-      other: Ð£ Ð²Ð°ÑÐ°Ð¹ ÑÐºÑÑÐ½Ñ ÑÑÑÑ {{count}} Ð½Ð¾Ð²ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½ÑÐ¹
+      other: Ð£ Ð²Ð°ÑÐ°Ð¹ ÑÐºÑÑÐ½Ñ ÑÑÑÑ %{count} Ð½Ð¾Ð²ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½ÑÐ¹
       zero: Ð£ Ð²Ð°ÑÐ°Ð¹ ÑÐºÑÑÐ½Ñ Ð½ÑÐ¼Ð° Ð½ÐµÐ¿ÑÐ°ÑÑÑÐ°Ð½ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ
     intro_1: OpenStreetMap - ÑÐ²Ð°Ð±Ð¾Ð´Ð½Ð°Ñ Ð´Ð»Ñ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ñ ÐºÐ°ÑÑÐ° ÑÑÑÐ³Ð¾ ÑÐ²ÐµÑÑ. Ð¯Ðµ ÑÑÐ²Ð°ÑÐ°ÑÑÑ ÑÐ°ÐºÑÑ Ð¶ Ð»ÑÐ´Ð·Ñ, ÑÐº Ð²Ñ.
     intro_2: OpenStreetMap Ð´Ð°Ð·Ð²Ð°Ð»ÑÐµ Ð²Ð°Ð¼ Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ, ÑÑÐ´Ð°Ð³Ð°Ð²Ð°ÑÑ Ñ ÐºÐ°ÑÑÑÑÐ°ÑÑÐ° Ð³ÐµÐ°Ð³ÑÐ°ÑÑÑÐ½ÑÐ¼Ñ Ð·Ð²ÐµÑÑÐºÐ°Ð¼Ñ Ñ Ð»ÑÐ±ÑÐ¼ Ð¿ÑÐ½ÐºÑÐµ Ð¿Ð»Ð°Ð½ÐµÑÑ.
-    intro_3: "Ð¥Ð¾ÑÑÑÐ½Ð³ Ð´Ð»Ñ OpenStreetMap: {{ucl}} Ñ {{bytemark}}."
+    intro_3: "Ð¥Ð¾ÑÑÑÐ½Ð³ Ð´Ð»Ñ OpenStreetMap: %{ucl} Ñ %{bytemark}."
     intro_3_ucl: Ð¦ÑÐ½ÑÑ UCL VR
     log_in: ÑÐ²Ð°Ð¹ÑÑÑ
     log_in_tooltip: Ð£Ð²Ð°Ð¹ÑÑÑ Ð· Ð°ÐºÐ°ÑÐ½ÑÐ°Ð¼, ÑÐºÑ ÑÑÐ½ÑÐµ
@@ -309,37 +308,28 @@ be:
     logout_tooltip: Ð²ÑÐ¹ÑÑÑ
     make_a_donation: 
       text: ÐÑÐ°Ð±ÑÑÑ Ð°ÑÐ²ÑÑÐ°Ð²Ð°Ð½Ð½Ðµ
-    news_blog: ÐÐ»Ð¾Ð³ Ð½Ð°Ð²ÑÐ½Ð°Ñ
-    news_blog_tooltip: ÐÐ»Ð¾Ð³ Ð½Ð°Ð²ÑÐ½ OpenStreetMap, Ð´Ð°ÑÐ¼Ð¾Ð²ÑÑ Ð³ÐµÐ°Ð´Ð°Ð½ÑÑ, Ñ Ð³.Ð´.
     osm_offline: ÐÐ°Ð·Ð° Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ OpenStreetMap Ð·Ð°ÑÐ°Ð· Ð¿Ð°-Ð·Ð° ÑÐµÑÑÐ²Ð°Ð¼, ÑÐ°Ð¼Ñ ÑÑÐ¾ Ð¿ÑÐ°ÑÐ¾Ð´Ð·ÑÑÑ Ð½ÐµÐ°Ð±ÑÐ¾Ð´Ð½Ð°Ñ ÑÑÑÐ½ÑÑÐ½Ð°Ñ Ð¿ÑÐ°ÑÐ°.
     osm_read_only: ÐÐ°Ð·Ð° Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ OpenStreetMap Ð·Ð°ÑÐ°Ð· Ð´Ð°ÑÑÑÐ¿Ð½Ð°Ñ ÑÐ¾Ð»ÑÐºÑ Ð´Ð»Ñ ÑÑÑÐ°Ð½Ð½Ñ, ÑÐ°Ð¼Ñ ÑÑÐ¾ Ð¿ÑÐ°ÑÐ¾Ð´Ð·ÑÑÑ Ð½ÐµÐ°Ð±ÑÐ¾Ð´Ð½Ð°Ñ ÑÑÑÐ½ÑÑÐ½Ð°Ñ Ð¿ÑÐ°ÑÐ°.
-    shop: ÐÑÐ°Ð¼Ð°
-    shop_tooltip: ÐÑÐ°Ð¼Ð° Ð· ÑÑÑÐ¼Ð¾Ð²Ð°Ð¹ ÑÑÐ¼Ð²Ð¾Ð»ÑÐºÐ°Ð¹ OpenStreetMap
     sign_up: ÐÐ°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°ÑÑÐ°
     sign_up_tooltip: Ð¡ÑÐ²Ð°ÑÑÑÑ Ð°ÐºÐ°ÑÐ½Ñ Ð´Ð»Ñ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ñ
-    sotm: ÐÐ°Ð²ÐµÐ´Ð°Ð¹ÑÐµ ÐºÐ°Ð½ÑÐµÑÑÐ½ÑÑÑ OpenStreetMap, The State of the Map 2009, 10-12 Ð»ÑÐ¿ÐµÐ½Ñ Ñ ÐÐ¼ÑÑÑÑÐ´Ð°Ð¼Ðµ!
     tag_line: Ð¡Ð²Ð°Ð±Ð¾Ð´Ð½Ð°Ñ Wiki-ÐºÐ°ÑÑÐ° ÑÐ²ÐµÑÑ
     user_diaries: ÐÐ·ÑÐ½Ð½ÑÐºÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ
     user_diaries_tooltip: ÐÐ·ÑÐ½Ð½ÑÐºÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ
     view: ÐÐ°ÑÑÐ°
     view_tooltip: ÐÐ°Ð³Ð»ÑÐ´Ð·ÐµÑÑ ÐºÐ°ÑÑÑ
-    welcome_user: ÐÑÑÐ°ÐµÐ¼, {{user_link}}
+    welcome_user: ÐÑÑÐ°ÐµÐ¼, %{user_link}
     welcome_user_link_tooltip: ÐÐ°ÑÐ° ÑÑÐ°ÑÐ¾Ð½ÐºÐ° ÐºÐ°ÑÑÑÑÐ°ÑÐ°
-  map: 
-    coordinates: "ÐÐ°Ð°ÑÐ´ÑÐ½Ð°ÑÑ:"
-    edit: ÐÐ¼ÑÐ½ÑÑÑ
-    view: ÐÐ°ÑÑÐ°
   message: 
     inbox: 
       date: ÐÐ°ÑÐ°
       from: ÐÐ´
       my_inbox: ÐÐ°Ðµ ÑÐ²Ð°ÑÐ¾Ð´Ð½ÑÑ
-      no_messages_yet: Ð£ Ð²Ð°Ñ Ð¿Ð°ÐºÑÐ»Ñ Ð½ÑÐ¼Ð° Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ. Ð§Ð°Ð¼Ñ Ð± Ð½Ðµ Ð·ÐºÐ°Ð°ÑÐ´ÑÐ½Ð°Ð²Ð°ÑÑÐ° Ð·  {{people_mapping_nearby_link}}?
+      no_messages_yet: Ð£ Ð²Ð°Ñ Ð¿Ð°ÐºÑÐ»Ñ Ð½ÑÐ¼Ð° Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ. Ð§Ð°Ð¼Ñ Ð± Ð½Ðµ Ð·ÐºÐ°Ð°ÑÐ´ÑÐ½Ð°Ð²Ð°ÑÑÐ° Ð·  %{people_mapping_nearby_link}?
       outbox: Ð·ÑÑÐ¾Ð´Ð½ÑÑ
       people_mapping_nearby: Ð»ÑÐ´Ð·ÑÐ¼Ñ, ÑÑÐ¾ Ð¶ÑÐ²ÑÑÑ Ð½ÐµÐ¿Ð°Ð´Ð°Ð»ÑÐºÑ
       subject: Ð¢ÑÐ¼Ð°
       title: Ð£Ð²Ð°ÑÐ¾Ð´Ð½ÑÑ
-      you_have: Ð£ Ð²Ð°Ñ {{new_count}} Ð½Ð¾Ð²ÑÑ Ñ {{old_count}} ÑÑÐ°ÑÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ
+      you_have: Ð£ Ð²Ð°Ñ %{new_count} Ð½Ð¾Ð²ÑÑ Ñ %{old_count} ÑÑÐ°ÑÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ
     mark: 
       as_read: ÐÐ°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ Ð°Ð´Ð¼ÐµÑÐ°Ð½Ð° Ð¿ÑÐ°ÑÑÑÐ°Ð½ÑÐ¼
       as_unread: ÐÐ°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ Ð°Ð´Ð¼ÐµÑÐ°Ð½Ð° Ð½ÐµÑÑÑÐ°Ð½ÑÐ¼
@@ -352,7 +342,7 @@ be:
       body: Ð¢ÑÐºÑÑ
       message_sent: ÐÐ°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ Ð°Ð´Ð¿ÑÐ°ÑÐ»ÐµÐ½Ð°
       send_button: ÐÐ°ÑÐ»Ð°ÑÑ
-      send_message_to: ÐÐ°ÑÐ»Ð°ÑÑ Ð½Ð¾Ð²Ð°Ðµ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ {{name}}
+      send_message_to: ÐÐ°ÑÐ»Ð°ÑÑ Ð½Ð¾Ð²Ð°Ðµ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ %{name}
       subject: Ð¢ÑÐ¼Ð°
       title: ÐÐ°ÑÐ»Ð°ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ
     no_such_user: 
@@ -362,14 +352,14 @@ be:
     outbox: 
       date: ÐÐ°ÑÐ°
       inbox: ÑÐ²Ð°ÑÐ¾Ð´Ð½ÑÑ
-      my_inbox: ÐÐ°Ðµ {{inbox_link}}
-      no_sent_messages: Ð£ Ð²Ð°Ñ Ð¿Ð°ÐºÑÐ»Ñ Ð½ÑÐ¼Ð° Ð´Ð°ÑÐ»Ð°Ð½ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ. Ð§Ð°Ð¼Ñ Ð± Ð½Ðµ Ð·ÐºÐ°Ð°ÑÐ´ÑÐ½Ð°Ð²Ð°ÑÑÐ° Ð· {{people_mapping_nearby_link}}?
+      my_inbox: ÐÐ°Ðµ %{inbox_link}
+      no_sent_messages: Ð£ Ð²Ð°Ñ Ð¿Ð°ÐºÑÐ»Ñ Ð½ÑÐ¼Ð° Ð´Ð°ÑÐ»Ð°Ð½ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ. Ð§Ð°Ð¼Ñ Ð± Ð½Ðµ Ð·ÐºÐ°Ð°ÑÐ´ÑÐ½Ð°Ð²Ð°ÑÑÐ° Ð· %{people_mapping_nearby_link}?
       outbox: Ð·ÑÑÐ¾Ð´Ð½ÑÑ
       people_mapping_nearby: Ð»ÑÐ´Ð·ÑÐ¼Ñ, ÑÑÐ¾ Ð¶ÑÐ²ÑÑÑ Ð½ÐµÐ¿Ð°Ð´Ð°Ð»ÑÐºÑ
       subject: Ð¢ÑÐ¼Ð°
       title: ÐÑÑÐ¾Ð´Ð½ÑÑ
       to: ÐÐ°Ð¼Ñ
-      you_have_sent_messages: Ð£ Ð²Ð°Ñ {{count}} Ð´Ð°ÑÐ»Ð°Ð½ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ
+      you_have_sent_messages: Ð£ Ð²Ð°Ñ %{count} Ð´Ð°ÑÐ»Ð°Ð½ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ
     read: 
       back_to_inbox: ÐÑÑÐ½ÑÑÑÐ° Ð´Ð° ÑÐ²Ð°ÑÐ¾Ð´Ð½ÑÑ
       back_to_outbox: ÐÑÑÐ½ÑÑÑÐ° Ð´Ð° Ð·ÑÑÐ¾Ð´Ð½ÑÑ
@@ -384,25 +374,25 @@ be:
       unread_button: ÐÐ´Ð·Ð½Ð°ÑÑÑÑ, ÑÐº Ð½ÐµÐ¿ÑÐ°ÑÑÑÐ°Ð½Ð°Ðµ
   notifier: 
     diary_comment_notification: 
-      footer: ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ñ Ð½Ð° {{readurl}} Ñ Ð¿ÑÐ°ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ð²Ð°ÑÑ Ð½Ð° {{commenturl}} ÑÑ Ð°Ð´ÐºÐ°Ð·Ð°ÑÑ Ð½Ð° {{replyurl}}
-      header: "{{from_user}} Ð¿ÑÐ°ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ð²Ð°Ñ Ð²Ð°Ñ Ð·Ð°Ð¿ÑÑ Ñ Ð´Ð·ÑÐ½Ð½ÑÐºÑ Ð½Ð° OpenStreetMap Ð· ÑÑÐ¼Ð°Ð¹ {{subject}}:"
-      hi: ÐÑÑÐ°Ð½Ð½Ñ, {{to_user}},
-      subject: "[OpenStreetMap] {{user}} Ð¿Ð°ÐºÑÐ½ÑÑ ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ñ Ñ Ð²Ð°ÑÑÐ¼ Ð´Ð·ÑÐ½Ð½ÑÐºÑ"
+      footer: ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ñ Ð½Ð° %{readurl} Ñ Ð¿ÑÐ°ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ð²Ð°ÑÑ Ð½Ð° %{commenturl} ÑÑ Ð°Ð´ÐºÐ°Ð·Ð°ÑÑ Ð½Ð° %{replyurl}
+      header: "%{from_user} Ð¿ÑÐ°ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ð²Ð°Ñ Ð²Ð°Ñ Ð·Ð°Ð¿ÑÑ Ñ Ð´Ð·ÑÐ½Ð½ÑÐºÑ Ð½Ð° OpenStreetMap Ð· ÑÑÐ¼Ð°Ð¹ %{subject}:"
+      hi: ÐÑÑÐ°Ð½Ð½Ñ, %{to_user},
+      subject: "[OpenStreetMap] %{user} Ð¿Ð°ÐºÑÐ½ÑÑ ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ñ Ñ Ð²Ð°ÑÑÐ¼ Ð´Ð·ÑÐ½Ð½ÑÐºÑ"
     email_confirm: 
       subject: "[OpenStreetMap] ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÐµ Ð²Ð°Ñ Ð°Ð´ÑÐ°Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ"
     email_confirm_html: 
       click_the_link: ÐÐ°Ð»Ñ Ð³ÑÑÐ° Ð²Ñ, ÑÐ¾ Ð¿ÐµÑÐ°Ð¹Ð´Ð·ÑÑÐµ Ð¿Ð° ÑÐ¿Ð°ÑÑÐ»ÑÑ, ÑÐ°Ð·Ð¼ÐµÑÑÐ°Ð½Ð°Ð¹ Ð½ÑÐ¶ÑÐ¹, ÐºÐ°Ð± Ð¿Ð°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ Ð·Ð¼ÐµÐ½Ñ.
       greeting: ÐÐ¾Ð±ÑÑ Ð´Ð·ÐµÐ½Ñ,
-      hopefully_you: "Ð¥ÑÐ¾ÑÑÑÑ (ÑÐ¿Ð°Ð´Ð·ÑÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) Ð¶Ð°Ð´Ð°Ðµ Ð·Ð¼ÑÐ½ÑÑÑ ÑÐ²Ð¾Ð¹ Ð°Ð´ÑÐ°Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ Ñ {{server_url}} Ð½Ð° Ð°Ð´ÑÐ°Ñ: {{new_address}}."
+      hopefully_you: "Ð¥ÑÐ¾ÑÑÑÑ (ÑÐ¿Ð°Ð´Ð·ÑÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) Ð¶Ð°Ð´Ð°Ðµ Ð·Ð¼ÑÐ½ÑÑÑ ÑÐ²Ð¾Ð¹ Ð°Ð´ÑÐ°Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ Ñ %{server_url} Ð½Ð° Ð°Ð´ÑÐ°Ñ: %{new_address}."
     email_confirm_plain: 
       click_the_link: ÐÐ°Ð»Ñ Ð³ÑÑÐ° Ð²Ñ, ÑÐ¾ Ð¿ÐµÑÐ°Ð¹Ð´Ð·ÑÑÐµ Ð¿Ð° ÑÐ¿Ð°ÑÑÐ»ÑÑ, ÑÐ°Ð·Ð¼ÐµÑÑÐ°Ð½Ð°Ð¹ Ð½ÑÐ¶ÑÐ¹, ÐºÐ°Ð± Ð¿Ð°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ Ð·Ð¼ÐµÐ½Ñ.
       greeting: ÐÐ¾Ð±ÑÑ Ð´Ð·ÐµÐ½Ñ,
       hopefully_you_1: Ð¥ÑÐ¾ÑÑÑÑ (ÑÐ¿Ð°Ð´Ð·ÑÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) Ð¶Ð°Ð´Ð°Ðµ Ð·Ð¼ÑÐ½ÑÑÑ ÑÐ²Ð¾Ð¹ Ð°Ð´ÑÐ°Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ Ñ
-      hopefully_you_2: "{{server_url}} Ð½Ð° Ð°Ð´ÑÐ°Ñ: {{new_address}}."
+      hopefully_you_2: "%{server_url} Ð½Ð° Ð°Ð´ÑÐ°Ñ: %{new_address}."
     friend_notification: 
-      had_added_you: "{{user}} Ð´Ð°Ð´Ð°Ñ Ð²Ð°Ñ, ÑÐº ÑÑÐ±ÑÐ°, Ð½Ð° OpenStreetMap."
-      see_their_profile: ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ Ð¿ÑÐ¾ÑÑÐ»Ñ Ð½Ð° {{userurl}} Ñ Ð´Ð°Ð´Ð°ÑÑ, ÑÐº ÑÑÐ±ÑÐ°, Ñ Ð°Ð´ÐºÐ°Ð·, ÐºÐ°Ð»Ñ ÑÐ¾ÑÐ°ÑÐµ.
-      subject: "[OpenStreetMap] {{user}} Ð´Ð°Ð´Ð°Ñ Ð²Ð°Ñ Ñ ÑÐ¿ÑÑ ÑÐ²Ð°ÑÑ ÑÑÐ±ÑÐ¾Ñ"
+      had_added_you: "%{user} Ð´Ð°Ð´Ð°Ñ Ð²Ð°Ñ, ÑÐº ÑÑÐ±ÑÐ°, Ð½Ð° OpenStreetMap."
+      see_their_profile: ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ Ð¿ÑÐ¾ÑÑÐ»Ñ Ð½Ð° %{userurl} Ñ Ð´Ð°Ð´Ð°ÑÑ, ÑÐº ÑÑÐ±ÑÐ°, Ñ Ð°Ð´ÐºÐ°Ð·, ÐºÐ°Ð»Ñ ÑÐ¾ÑÐ°ÑÐµ.
+      subject: "[OpenStreetMap] %{user} Ð´Ð°Ð´Ð°Ñ Ð²Ð°Ñ Ñ ÑÐ¿ÑÑ ÑÐ²Ð°ÑÑ ÑÑÐ±ÑÐ¾Ñ"
     gpx_notification: 
       and_no_tags: Ñ Ð±ÐµÐ· ÑÑÐ³Ð°Ñ.
       and_the_tags: "Ñ Ð½Ð°ÑÑÑÐ¿Ð½ÑÐ¼Ñ ÑÑÐ³Ð°Ð¼Ñ:"
@@ -413,6 +403,7 @@ be:
         subject: "[OpenStreetMap] ÐÐ±Ð¾Ð¹ ÑÐ¼Ð¿Ð°ÑÑÑ GPX"
       greeting: ÐÑÑÐ²ÑÑÐ°Ð½Ð½Ðµ,
       success: 
+        loaded_successfully: " |"
         subject: "[OpenStreetMap] ÐÐ¼Ð¿Ð°ÑÑ GPX Ð¼ÑÐ½ÑÑ Ð¿Ð°ÑÐ¿ÑÑÐ¾Ð²Ð°"
       with_description: Ð· Ð°Ð¿ÑÑÐ°Ð½Ð½ÐµÐ¼
       your_gpx_file: ÐÑÑÐ° Ð²ÑÐ³Ð»ÑÐ´Ð°Ðµ ÑÐº Ð²Ð°Ñ ÑÐ°Ð¹Ð» GPX
@@ -428,11 +419,10 @@ be:
       hopefully_you_1: Ð¥ÑÐ¾ÑÑÑÑ (ÑÐ¿Ð°Ð´Ð·ÑÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) Ð·Ð°Ð¿ÑÑÐ°Ñ Ð·Ð¼ÐµÐ½Ñ Ð¿Ð°ÑÐ¾Ð»Ñ Ð´Ð»Ñ Ð³ÑÑÐ°Ð³Ð°
       hopefully_you_2: Ð°Ð´ÑÐ°ÑÐ° ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ, Ð·Ð°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°Ð½Ð°Ð³Ð° Ð½Ð° openstreetmap.org.
     message_notification: 
-      footer1: ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ ÑÐ°ÐºÑÐ°Ð¼Ð° Ð¿ÑÐ°ÑÑÑÐ°ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ - {{readurl}}
-      footer2: Ñ Ð²Ñ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð°Ð´ÐºÐ°Ð·Ð°ÑÑ Ð½Ð° {{replyurl}}
-      header: "{{from_user}} Ð°Ð´Ð¿ÑÐ°Ð²ÑÑ Ð²Ð°Ð¼ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ Ð· ÑÑÐ¼Ð°Ð¹ {{subject}} Ð¿ÑÐ°Ð· OpenStreetMap:"
-      hi: ÐÑÑÐ²ÑÑÐ°Ð½Ð½Ðµ, {{to_user}},
-      subject: "[OpenStreetMap] {{user}} Ð´Ð°ÑÐ»Ð°Ñ Ð²Ð°Ð¼ Ð½Ð¾Ð²Ð°Ðµ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ"
+      footer1: ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ ÑÐ°ÐºÑÐ°Ð¼Ð° Ð¿ÑÐ°ÑÑÑÐ°ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ - %{readurl}
+      footer2: Ñ Ð²Ñ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð°Ð´ÐºÐ°Ð·Ð°ÑÑ Ð½Ð° %{replyurl}
+      header: "%{from_user} Ð°Ð´Ð¿ÑÐ°Ð²ÑÑ Ð²Ð°Ð¼ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ Ð· ÑÑÐ¼Ð°Ð¹ %{subject} Ð¿ÑÐ°Ð· OpenStreetMap:"
+      hi: ÐÑÑÐ²ÑÑÐ°Ð½Ð½Ðµ, %{to_user},
     signup_confirm: 
       subject: "[OpenStreetMap] ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÐµ Ð²Ð°Ñ Ð°Ð´ÑÐ°Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ"
     signup_confirm_html: 
@@ -441,8 +431,8 @@ be:
       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>!
       greeting: ÐÑÑÐ°Ð½Ð½Ñ!
       hopefully_you: ÐÐµÑÑÐ° (ÑÐ¿Ð°Ð´Ð·ÑÐµÐ¼ÑÑ, Ð²Ñ) ÑÐ¾ÑÐ° ÑÑÐ²Ð°ÑÑÑ ÑÐ°ÑÑÐ½Ð°Ðº
-      introductory_video: ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ {{introductory_video_link}}.
-      more_videos: Ð¯ÑÑÑ Ð±Ð¾Ð»ÑÑ {{more_videos_link}}.
+      introductory_video: ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ %{introductory_video_link}.
+      more_videos: Ð¯ÑÑÑ Ð±Ð¾Ð»ÑÑ %{more_videos_link}.
       more_videos_here: Ð²ÑÐ´ÑÐ° ÑÑÑ
       user_wiki_page: Ð ÑÐºÐ°Ð¼ÐµÐ½Ð´ÑÐµÐ¼ ÑÑÐ²Ð°ÑÑÑÑ ÑÑÐ°ÑÐ¾Ð½ÐºÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° Ð½Ð° wiki, ÑÐºÐ°Ñ Ð±ÑÐ´Ð·Ðµ ÑÐºÐ»ÑÑÐ°ÑÑ ÑÑÑÐ»ÑÐºÑ ÐºÐ°ÑÑÐ³Ð¾ÑÑÐ¹, ÑÐºÑÑ Ð°Ð´Ð·Ð½Ð°ÑÐ°ÑÑÑ, Ð´Ð·Ðµ Ð²Ñ Ð·Ð½Ð°ÑÐ¾Ð´Ð·ÑÑÐµÑÑ, Ð½Ð°Ð¿ÑÑÐºÐ»Ð°Ð´ <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.
       video_to_openstreetmap: ÑÐ²Ð¾Ð´Ð½Ð°Ðµ Ð²ÑÐ´ÑÐ° Ð¿ÑÐ° OpenStreetMap
@@ -472,7 +462,7 @@ be:
       js_2: OpenStreetMap Ð²ÑÐºÐ°ÑÑÑÑÐ¾ÑÐ²Ð°Ðµ JavaScript Ð´Ð»Ñ Ð°Ð´Ð»ÑÑÑÑÐ°Ð²Ð°Ð½Ð½Ñ ÐºÐ°ÑÑÑ Ð½Ð° ÑÐ°Ð¹ÑÐµ.
       js_3: ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿Ð°ÑÐ¿ÑÐ°Ð±Ð°Ð²Ð°ÑÑ Ð²ÑÐºÐ°ÑÑÑÑÐ°ÑÑ <a href="http://tah.openstreetmap.org/Browse/">ÑÑÐ°ÑÑÑÐ½Ñ Ð°Ð³Ð»ÑÐ´ Tiles@Home</a> ÐºÐ°Ð»Ñ Ð½Ðµ Ð¼Ð¾Ð¶Ð°ÑÐµ ÑÐºÐ»ÑÑÑÑÑ JavaScript.
       license: 
-        notice: ÐÑÑÑÐ½Ð·ÑÑÑÐµÑÑÐ° Ð½Ð° ÑÐ¼Ð¾Ð²Ð°Ñ {{license_name}} Ð¿ÑÐ°ÐµÐºÑÐ°Ð¼ {{project_name}} Ñ ÑÐ³Ð¾ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ð¼Ñ.
+        notice: ÐÑÑÑÐ½Ð·ÑÑÑÐµÑÑÐ° Ð½Ð° ÑÐ¼Ð¾Ð²Ð°Ñ %{license_name} Ð¿ÑÐ°ÐµÐºÑÐ°Ð¼ %{project_name} Ñ ÑÐ³Ð¾ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ð¼Ñ.
         project_name: OpenStreetMap
       permalink: Ð¡Ð¿Ð°ÑÑÐ»ÐºÐ° ÑÑÐ´Ñ
     key: 
@@ -501,19 +491,19 @@ be:
       uploaded_at: "ÐÐ°ÑÑÐ³Ð½ÑÑÑ:"
     list: 
       public_traces: ÐÑÐ±Ð»ÑÑÐ½ÑÑ GPS-ÑÑÑÐºÑ
-      public_traces_from: ÐÑÐ±Ð»ÑÑÐ½ÑÑ GPS-ÑÑÑÐºÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° {{user}}
-      tagged_with: " Ð°Ð´Ð¼ÐµÑÐ°Ð½Ð° ÑÐº {{tags}}"
+      public_traces_from: ÐÑÐ±Ð»ÑÑÐ½ÑÑ GPS-ÑÑÑÐºÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° %{user}
+      tagged_with: " Ð°Ð´Ð¼ÐµÑÐ°Ð½Ð° ÑÐº %{tags}"
       your_traces: ÐÐ°ÑÑÑ GPS-ÑÑÑÐºÑ
     make_public: 
       made_public: Ð¢ÑÑÐº Ð·ÑÐ¾Ð±Ð»ÐµÐ½Ñ Ð¿ÑÐ±Ð»ÑÑÐ½ÑÐ¼
     no_such_user: 
-      body: ÐÑÐ±Ð°ÑÑÑÐµ, ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° Ð· ÑÐ¼ÐµÐ¼ {{user}} Ð½Ðµ ÑÑÐ½ÑÐµ. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿ÑÐ°Ð²ÐµÑÑÐµ Ð¿ÑÐ°Ð²ÑÐ»ÑÐ½Ð°ÑÑÑ Ð½Ð°Ð¿ÑÑÐ°Ð½Ð½Ñ. ÐÐ°Ð³ÑÑÐ¼Ð° ÑÐ¿Ð°ÑÑÐ»ÐºÐ°, Ð¿Ð° ÑÐºÐ¾Ð¹ Ð²Ñ Ð´Ð°ÑÐ»Ñ, Ð½ÑÑÐ»ÑÑÐ½Ð°Ñ.
-      heading: ÐÐ°ÑÑÑÑÐ°Ñ {{user}} Ð½Ðµ ÑÑÐ½ÑÐµ
+      body: ÐÑÐ±Ð°ÑÑÑÐµ, ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° Ð· ÑÐ¼ÐµÐ¼ %{user} Ð½Ðµ ÑÑÐ½ÑÐµ. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿ÑÐ°Ð²ÐµÑÑÐµ Ð¿ÑÐ°Ð²ÑÐ»ÑÐ½Ð°ÑÑÑ Ð½Ð°Ð¿ÑÑÐ°Ð½Ð½Ñ. ÐÐ°Ð³ÑÑÐ¼Ð° ÑÐ¿Ð°ÑÑÐ»ÐºÐ°, Ð¿Ð° ÑÐºÐ¾Ð¹ Ð²Ñ Ð´Ð°ÑÐ»Ñ, Ð½ÑÑÐ»ÑÑÐ½Ð°Ñ.
+      heading: ÐÐ°ÑÑÑÑÐ°Ñ %{user} Ð½Ðµ ÑÑÐ½ÑÐµ
       title: ÐÑÐ¼Ð° ÑÐ°ÐºÐ¾Ð³Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°
     trace: 
-      ago: "{{time_in_words_ago}} ÑÐ°Ð¼Ñ"
+      ago: "%{time_in_words_ago} ÑÐ°Ð¼Ñ"
       by: Ð· Ð´Ð°Ð¿Ð°Ð¼Ð¾Ð³Ð°Ð¹
-      count_points: "{{count}} Ð¿ÑÐ½ÐºÑÐ°Ñ"
+      count_points: "%{count} Ð¿ÑÐ½ÐºÑÐ°Ñ"
       edit: Ð·Ð¼ÑÐ½ÑÑÑ
       edit_map: ÐÐ¼ÑÐ½ÑÑÑ ÐºÐ°ÑÑÑ
       in: Ñ
@@ -533,14 +523,10 @@ be:
       upload_gpx: ÐÐ°ÑÑÐ³Ð½ÑÑÑ GPX-ÑÐ°Ð¹Ð»
     trace_header: 
       see_all_traces: ÐÐ°ÑÑÑÑ ÑÑÐµ ÑÑÑÐºÑ
-      see_just_your_traces: ÐÐ°ÑÑÑÑ ÑÐ¾Ð»ÑÐºÑ ÑÐ²Ð°Ðµ ÑÑÑÐºÑ, ÑÑ Ð´Ð°Ð´Ð°ÑÑ ÑÑÑÐº
       see_your_traces: ÐÐ°ÑÑÑÑ ÑÑÐµ ÑÐ²Ð°Ðµ ÑÑÑÐºÑ
-      traces_waiting: Ð£ Ð²Ð°Ñ {{count}} ÑÑÑÐºÐ°Ñ Ñ ÑÐ°ÑÐ·Ðµ. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿Ð°ÑÐ°ÐºÐ°Ð¹ÑÐµ, Ð¿Ð°ÐºÑÐ»Ñ ÑÐ½Ñ Ð±ÑÐ´ÑÑÑ Ð°Ð¿ÑÐ°ÑÐ°Ð²Ð°Ð½ÑÑ, ÐºÐ°Ð± Ð½Ðµ Ð±Ð»Ð°ÐºÑÑÐ²Ð°ÑÑ ÑÐ°ÑÐ³Ñ Ð´Ð»Ñ Ð°ÑÑÐ°ÑÐ½ÑÑ ÐºÐ°ÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ.
+      traces_waiting: Ð£ Ð²Ð°Ñ %{count} ÑÑÑÐºÐ°Ñ Ñ ÑÐ°ÑÐ·Ðµ. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿Ð°ÑÐ°ÐºÐ°Ð¹ÑÐµ, Ð¿Ð°ÐºÑÐ»Ñ ÑÐ½Ñ Ð±ÑÐ´ÑÑÑ Ð°Ð¿ÑÐ°ÑÐ°Ð²Ð°Ð½ÑÑ, ÐºÐ°Ð± Ð½Ðµ Ð±Ð»Ð°ÐºÑÑÐ²Ð°ÑÑ ÑÐ°ÑÐ³Ñ Ð´Ð»Ñ Ð°ÑÑÐ°ÑÐ½ÑÑ ÐºÐ°ÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ.
     trace_optionals: 
       tags: Ð¦ÑÑÐ»ÑÐºÑ
-    trace_paging_nav: 
-      of: Ð·
-      showing: ÐÑÐ°Ð³Ð»ÑÐ´ ÑÑÐ°ÑÐ¾Ð½ÐºÑ
     view: 
       delete_track: ÐÑÐ´Ð°Ð»ÑÑÑ Ð³ÑÑÑ ÑÑÑÐº
       description: "ÐÐ¿ÑÑÐ°Ð½Ð½Ðµ:"
@@ -583,31 +569,25 @@ be:
       update home location on click: ÐÐ±Ð½Ð°Ð²ÑÑÑ ÐºÐ°Ð°ÑÐ´ÑÐ½Ð°ÑÑ, ÐºÐ°Ð»Ñ Ñ Ð¿ÑÑÑÑÐºÐ½Ñ Ð¿Ð° ÐºÐ°ÑÑÐµ?
     confirm: 
       button: ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ
-      failure: Ð Ð°ÑÑÐ½Ð°Ðº ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° Ð· ÑÐ°ÐºÑÐ¼ ÐºÐ»ÑÑÐ¾Ð¼ ÑÐ¶Ð¾ Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ñ.
       heading: ÐÐ°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½Ðµ ÑÐ°ÑÑÐ½ÐºÑ
       press confirm button: ÐÐ°ÑÑÑÐ½ÑÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ, ÐºÐ°Ð± Ð°ÐºÑÑÐ²ÑÐ·Ð°Ð²Ð°ÑÑ ÑÐ°ÑÑÐ½Ð°Ðº.
       success: Ð Ð°ÑÑÐ½Ð°Ðº Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ñ, Ð´Ð·ÑÐºÑÐ¹ Ð·Ð° ÑÑÐ³ÑÑÑÑÐ°ÑÑÑ!
     confirm_email: 
       button: ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ
-      failure: ÐÐ°ÑÑÐ¾Ð²Ñ Ð°Ð´ÑÐ°Ñ ÑÐ¶Ð¾ Ð±ÑÑ Ð¿Ð°ÑÐ°ÐµÑÐ´Ð¶Ð°Ð½Ñ Ð³ÑÑÑÐ¼ ÐºÐ»ÑÑÐ¾Ð¼.
+      failure: ÐÐ°ÑÑÐ¾Ð²Ñ Ð°Ð´ÑÐ°Ñ ÑÐ¶Ð¾ Ð±ÑÑ Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ñ Ð³ÑÑÑÐ¼ ÐºÐ»ÑÑÐ¾Ð¼.
       heading: ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ Ð·Ð¼ÐµÐ½Ñ Ð¿Ð°ÑÑÐ¾Ð²Ð°Ð³Ð° Ð°Ð´ÑÐ°ÑÑ
       press confirm button: ÐÐ°ÑÑÑÐ½ÑÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ, ÐºÐ°Ð± Ð¿Ð°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ Ð²Ð°Ñ Ð½Ð¾Ð²Ñ Ð¿Ð°ÑÑÐ¾Ð²Ñ Ð°Ð´ÑÐ°Ñ.
       success: ÐÐ°Ñ Ð°Ð´ÑÐ°Ñ Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ñ, Ð´Ð·ÑÐºÑÐ¹ Ð·Ð° ÑÑÐ³ÑÑÑÑÐ°ÑÑÑ!
-    friend_map: 
-      nearby mapper: "ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº: [[nearby_user]]"
-      your location: ÐÐ°ÑÐ° Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ
     go_public: 
       flash success: Ð£ÑÐµ Ð²Ð°ÑÑÑ Ð·Ð¼ÐµÐ½Ñ ÑÑÐ¿ÐµÑ Ð¿ÑÐ±Ð»ÑÑÐ½ÑÑ, Ñ Ð²Ð°Ð¼ ÑÑÐ¿ÐµÑ Ð´Ð°Ð·Ð²Ð¾Ð»ÐµÐ½Ð° ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ðµ
     login: 
       account not active: ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð²Ð°Ñ ÑÐ°ÑÑÐ½Ð°Ðº Ð¿Ð°ÐºÑÐ»Ñ Ð½Ðµ Ð°ÐºÑÑÐ²ÑÐ·Ð°Ð²Ð°Ð½Ñ.<br />ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð½Ð°ÑÑÑÐ½ÑÑÐµ Ð½Ð° Ð°Ð´Ð¿Ð°Ð²ÐµÐ´Ð½ÑÑ ÑÐ¿Ð°ÑÑÐ»ÐºÑ Ñ Ð»ÑÑÑÐµ Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½Ñ ÑÐ°ÑÑÐ½ÐºÑ, ÐºÐ°Ð± Ð°ÐºÑÑÐ²ÑÐ·Ð°Ð²Ð°ÑÑ ÑÐ³Ð¾.
       auth failure: ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð½ÐµÐ¼Ð°Ð³ÑÑÐ¼Ð° ÑÐ²Ð°Ð¹ÑÑÑ Ð· ÑÐ°ÐºÑÐ¼ Ð°Ð´ÑÐ°ÑÐ°Ð¼ Ñ Ð¿Ð°ÑÐ¾Ð»ÐµÐ¼.
-      create_account: ÑÑÐ²Ð°ÑÑÑÐµ ÑÐ°ÑÑÐ½Ð°Ðº
       email or username: "ÐÐ¾ÑÑÐ° ÑÑ ÑÐ¼Ñ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°:"
       heading: Ð£Ð²Ð°ÑÐ¾Ð´
       login_button: Ð£Ð²Ð°Ð¹ÑÑÑ
       lost password link: ÐÐ³ÑÐ±Ð»ÑÐ» Ð¿Ð°ÑÐ¾Ð»Ñ?
       password: "ÐÐ°ÑÐ¾Ð»Ñ:"
-      please login: ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, ÑÐ²Ð°Ð¹Ð´Ð·ÑÑÐµ ÑÑ {{create_user_link}}.
       title: Ð£Ð²Ð°ÑÐ¾Ð´
     lost_password: 
       email address: "ÐÐ°ÑÑÐ¾Ð²Ñ Ð°Ð´ÑÐ°Ñ:"
@@ -617,9 +597,9 @@ be:
       notice email on way: ÐÐ°Ð»Ñ, ÑÑÐ¾ Ð²Ñ ÑÐ³Ð¾ Ð·Ð³ÑÐ±ÑÐ»Ñ :-( Ð°Ð»Ðµ Ð»ÑÑÑ ÑÐ¶Ð¾ Ð°Ð´Ð¿ÑÐ°ÑÐ»ÐµÐ½Ñ, Ñ Ð²Ñ ÑÑÑÐºÐ° Ð·Ð¼Ð¾Ð¶Ð°ÑÐµ ÑÐ³Ð¾ ÑÐºÑÐ½ÑÑÑ.
       title: Ð·Ð³ÑÐ±Ð»ÐµÐ½Ñ Ð¿Ð°ÑÐ¾Ð»Ñ
     make_friend: 
-      already_a_friend: ÐÑ ÑÐ¶Ð¾ ÑÑÐ±ÑÑÐµÑÐµ Ð· {{name}}.
-      failed: ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð½ÐµÐ¼Ð°Ð³ÑÑÐ¼Ð° Ð´Ð°Ð´Ð°ÑÑ {{name}} Ñ ÑÐºÐ°ÑÑÑ ÑÑÐ±ÑÐ°.
-      success: "{{name}} ÑÑÐ¿ÐµÑ Ð²Ð°Ñ ÑÑÐ±Ð°Ñ."
+      already_a_friend: ÐÑ ÑÐ¶Ð¾ ÑÑÐ±ÑÑÐµÑÐµ Ð· %{name}.
+      failed: ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð½ÐµÐ¼Ð°Ð³ÑÑÐ¼Ð° Ð´Ð°Ð´Ð°ÑÑ %{name} Ñ ÑÐºÐ°ÑÑÑ ÑÑÐ±ÑÐ°.
+      success: "%{name} ÑÑÐ¿ÐµÑ Ð²Ð°Ñ ÑÑÐ±Ð°Ñ."
     new: 
       confirm email address: "ÐÐ°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½Ðµ Ð¿Ð°ÑÑÐ¾Ð²Ð°Ð³Ð° Ð°Ð´ÑÐ°ÑÑ:"
       confirm password: "ÐÐ°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½Ðµ Ð¿Ð°ÑÐ¾Ð»Ñ:"
@@ -633,15 +613,17 @@ be:
       no_auto_account_create: ÐÐ° Ð¶Ð°Ð»Ñ, Ð¼Ñ Ð½Ðµ Ð¼Ð¾Ð¶Ð°Ð¼ ÑÑÐ²Ð°ÑÑÑÑ Ð´Ð»Ñ Ð²Ð°Ñ ÑÐ°ÑÑÐ½Ð°Ðº Ð°ÑÑÐ°Ð¼Ð°ÑÑÑÐ½Ð°.
       not displayed publicly: ÐÐµ Ð¿Ð°ÐºÐ°Ð·Ð²Ð°ÐµÑÑÐ° Ð°ÑÑÐ°ÑÐ½ÑÐ¼ (Ð³Ð»ÑÐ´Ð·ÑÑÐµ <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="Ð¿Ð°Ð»ÑÑÑÐºÐ° Ð½ÐµÑÐ°Ð·Ð³Ð»Ð°ÑÑÐ½Ð½Ñ Ð½Ð° wiki, Ñ ÑÑÐ¼ Ð»ÑÐºÑ ÑÐµÐºÑÑÑ Ð¿ÑÐ° Ð¿Ð°ÑÑÐ¾Ð²ÑÑ Ð°Ð´ÑÐ°ÑÑ">Ð¿Ð°Ð»ÑÑÑÐºÑ Ð½ÐµÑÐ°Ð·Ð³Ð»Ð°ÑÑÐ½Ð½Ñ</a>)
       password: "ÐÐ°ÑÐ¾Ð»Ñ:"
-      signup: ÐÐ°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°ÑÑÐ°
       title: Ð¡ÑÐ²Ð°ÑÑÑÑ ÑÐ°ÑÑÐ½Ð°Ðº
     no_such_user: 
-      body: ÐÑÐ°Ð±Ð°ÑÑÐµ, ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº {{user}} Ð½Ðµ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ. Please check your spelling, ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿ÑÐ°Ð²ÐµÑÑÐµ ÑÐ²Ð¾Ð¹ Ð¿ÑÐ°Ð²Ð°Ð¿ÑÑ, ÑÑ, Ð¼Ð°Ð³ÑÑÐ¼Ð°, Ð²Ð°Ð¼ Ð´Ð°Ð»Ñ Ð½ÑÐ¿ÑÐ°Ð²ÑÐ»ÑÐ½ÑÑ ÑÐ¿Ð°ÑÑÐ»ÐºÑ.
-      heading: ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº {{user}} Ð½Ðµ ÑÑÐ½ÑÐµ
+      body: ÐÑÐ°Ð±Ð°ÑÑÐµ, ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº %{user} Ð½Ðµ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ. Please check your spelling, ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿ÑÐ°Ð²ÐµÑÑÐµ ÑÐ²Ð¾Ð¹ Ð¿ÑÐ°Ð²Ð°Ð¿ÑÑ, ÑÑ, Ð¼Ð°Ð³ÑÑÐ¼Ð°, Ð²Ð°Ð¼ Ð´Ð°Ð»Ñ Ð½ÑÐ¿ÑÐ°Ð²ÑÐ»ÑÐ½ÑÑ ÑÐ¿Ð°ÑÑÐ»ÐºÑ.
+      heading: ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº %{user} Ð½Ðµ ÑÑÐ½ÑÐµ
       title: ÐÑÐ¼Ð° ÑÐ°ÐºÐ¾Ð³Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°
+    popup: 
+      nearby mapper: ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº
+      your location: ÐÐ°ÑÐ° Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ
     remove_friend: 
-      not_a_friend: "{{name}} Ð½Ðµ Ð·'ÑÑÐ»ÑÐµÑÑÐ° Ð²Ð°ÑÑÐ¼ ÑÑÐ±ÑÐ°Ð¼."
-      success: "{{name}} Ð²ÑÐ´Ð°Ð»ÐµÐ½Ñ ÑÐ° ÑÐ¿ÑÑÐ° ÑÑÐ±ÑÐ¾Ñ."
+      not_a_friend: "%{name} Ð½Ðµ Ð·'ÑÑÐ»ÑÐµÑÑÐ° Ð²Ð°ÑÑÐ¼ ÑÑÐ±ÑÐ°Ð¼."
+      success: "%{name} Ð²ÑÐ´Ð°Ð»ÐµÐ½Ñ ÑÐ° ÑÐ¿ÑÑÐ° ÑÑÐ±ÑÐ¾Ñ."
     reset_password: 
       flash token bad: ÐÐµ Ð·Ð½Ð°Ð¹ÑÐ¾Ñ ÑÐ°ÐºÑ ÐºÐ»ÑÑ, Ð¼Ð¾Ð¶Ð°, Ð¿ÑÐ°Ð²ÐµÑÑÐµ URL?
       title: ÑÐºÑÐ½ÑÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ
@@ -649,15 +631,12 @@ be:
       flash success: ÐÐ°Ð¼Ð°ÑÐ½ÑÐµ Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ Ð¿Ð°ÑÐ¿ÑÑÐ¾Ð²Ð° Ð·Ð°Ð¿ÑÑÐ°Ð½Ð°
     view: 
       add as friend: Ð´Ð°Ð´Ð°ÑÑ Ñ ÑÑÐ±ÑÑ
-      add image: ÐÐ°Ð´Ð°ÑÑ Ð²ÑÑÐ²Ñ
-      ago: ({{time_in_words_ago}} ÑÐ°Ð¼Ñ)
-      change your settings: Ð·Ð¼ÑÐ½ÑÑÑ Ð²Ð°ÑÑÑ Ð½Ð°ÑÑÐ°ÑÐ»ÐµÐ½Ð½Ñ
-      delete image: ÐÑÐ´Ð°Ð»ÑÑÑ Ð²ÑÑÐ²Ñ
+      ago: (%{time_in_words_ago} ÑÐ°Ð¼Ñ)
       description: ÐÐ¿ÑÑÐ°Ð½Ð½Ðµ
       diary: Ð´Ð·ÑÐ½Ð½ÑÐº
       edits: Ð·Ð¼ÐµÐ½Ñ
-      if set location: ÐÐ°Ð»Ñ Ð²Ñ Ð²ÑÐ·Ð½Ð°ÑÑÑÐµ ÑÐ²Ð°Ñ Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ, Ð½ÑÐ¶ÑÐ¹ Ð·'ÑÐ²ÑÑÑÐ° Ð¿ÑÑÐ³Ð¾Ð¶Ð°Ñ ÐºÐ°ÑÑÐ° Ñ ÑÑÑ ÑÐ°ÐºÐ¾Ðµ. ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð²ÑÐ·Ð½Ð°ÑÑÑÑ ÑÐ²Ð°Ñ Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ Ð½Ð° ÑÑÐ°ÑÐ¾Ð½ÑÑ {{settings_link}}.
-      km away: "{{count}} ÐºÐ¼ Ð°Ð´ Ð²Ð°Ñ"
+      if set location: ÐÐ°Ð»Ñ Ð²Ñ Ð²ÑÐ·Ð½Ð°ÑÑÑÐµ ÑÐ²Ð°Ñ Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ, Ð½ÑÐ¶ÑÐ¹ Ð·'ÑÐ²ÑÑÑÐ° Ð¿ÑÑÐ³Ð¾Ð¶Ð°Ñ ÐºÐ°ÑÑÐ° Ñ ÑÑÑ ÑÐ°ÐºÐ¾Ðµ. ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð²ÑÐ·Ð½Ð°ÑÑÑÑ ÑÐ²Ð°Ñ Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ Ð½Ð° ÑÑÐ°ÑÐ¾Ð½ÑÑ %{settings_link}.
+      km away: "%{count} ÐºÐ¼ Ð°Ð´ Ð²Ð°Ñ"
       mapper since: "ÐÐ°Ð»ÑÐµ ÐºÐ°ÑÑÑ Ð·:"
       my diary: Ð¼Ð¾Ð¹ Ð´Ð·ÑÐ½Ð½ÑÐº
       my edits: Ð¼Ð°Ðµ Ð·Ð¼ÐµÐ½Ñ
@@ -666,13 +645,10 @@ be:
       nearby users: "ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÑ Ð½ÐµÐ¿Ð°Ð´Ð°Ð»ÑÐºÑ:"
       new diary entry: Ð½Ð¾Ð²Ñ Ð·Ð°Ð¿ÑÑ Ñ Ð´Ð·ÑÐ½Ð½ÑÐºÑ
       no friends: ÐÑ Ð¿Ð°ÐºÑÐ»Ñ Ð½Ðµ Ð´Ð°Ð´Ð°Ð»Ñ Ð½ÑÐºÐ¾Ð³Ð° Ñ ÑÑÐ±ÑÑ.
-      no home location: ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº Ð½Ðµ Ð¿Ð°ÐºÐ°Ð·Ð°Ñ ÑÐ²Ð°Ñ Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ.
       no nearby users: ÐÐ°ÐºÑÐ»Ñ Ð½ÑÐ¼Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ, ÑÑÐ¾ Ð°Ð´Ð¼ÐµÑÑÐ»Ñ ÑÐ²Ð°Ñ Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ Ð½ÐµÐ¿Ð°Ð´Ð°Ð»ÑÐºÑ.
       remove as friend: Ð²ÑÐ´Ð°Ð»ÑÑÑ Ð· ÑÑÐ±ÑÐ¾Ñ
       send message: Ð´Ð°ÑÐ»Ð°ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ
       settings_link_text: Ð½Ð°ÑÑÐ°ÑÐ»ÐµÐ½Ð½ÑÑ
       traces: ÑÑÑÐºÑ
-      upload an image: ÐÐ°ÑÑÐ³Ð½ÑÑÑ Ð²ÑÑÐ²Ñ
-      user image heading: ÐÑÑÐ²Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°
       user location: ÐÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ
       your friends: ÐÐ°ÑÑÑ ÑÑÐ±ÑÑ