X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0d5be22cb517ebaaab5eb7af13150bf61e41df56..6fafe7f309800b9ae8144eb723a89b81fee1d757:/config/locales/be.yml?ds=sidebyside

diff --git a/config/locales/be.yml b/config/locales/be.yml
index 5cc277ef4..43c9aa095 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1,6 +1,5 @@
 be:
   activerecord:
-    # Translates all the model names, which is used in error handling on the web site
     models:
       acl: "Ð¡Ð¿ÑÑ Ð¿ÑÐ°Ð²Ð¾Ñ Ð´Ð¾ÑÑÑÐ¿Ñ"
       changeset: "ÐÐ°Ð±Ð¾Ñ Ð·Ð¼ÐµÐ½Ð°Ñ"
@@ -35,8 +34,6 @@ be:
       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: "Ð¢ÑÐºÑÑ"
@@ -77,7 +74,7 @@ be:
   browse:
     changeset:
       title: "ÐÐ°Ð±Ð¾Ñ Ð·Ð¼ÐµÐ½Ð°Ñ"
-      changeset: "ÐÐ°Ð±Ð¾Ñ Ð·Ð¼ÐµÐ½Ð°Ñ: {{id}}"
+      changeset: "ÐÐ°Ð±Ð¾Ñ Ð·Ð¼ÐµÐ½Ð°Ñ:"
       download: "Ð¡ÑÑÐ³Ð½ÑÑÑ {{changeset_xml_link}} ÑÑ {{osmchange_xml_link}}"
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
@@ -92,17 +89,18 @@ be:
       has_nodes: "Ð¡ÐºÐ»Ð°Ð´Ð°ÐµÑÑÐ° Ð· {{count}} Ð²ÑÐ·Ð»Ð¾Ñ:"
       has_ways: "Ð¡ÐºÐ»Ð°Ð´Ð°ÐµÑÑÐ° Ð· {{count}} ÑÐ»ÑÑÐ¾Ñ:"
       has_relations: "Ð¡ÐºÐ»Ð°Ð´Ð°ÐµÑÑÐ° Ð· {{count}} ÑÑÐ²ÑÐ·ÐµÐ¹:"
-    common_details: 
+    common_details:
       edited_at: "ÐÐ¼ÐµÐ½ÐµÐ½Ð°:"
       edited_by: "ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ð¼:"
       version: "ÐÐµÑÑÑÑ:"
       in_changeset: "Ð£ Ð½Ð°Ð±Ð¾ÑÑ Ð·Ð¼ÐµÐ½Ð°Ñ:"
     containing_relation:
-      entry: "Ð¡ÑÐ²ÑÐ·Ñ {{relation_name}}"
-      entry_role: "Ð¡ÑÐ²ÑÐ·Ñ {{relation_name}} (ÑÐº {{relation_role}})"
+      relation: "Ð¡ÑÐ²ÑÐ·Ñ {{relation_name}}"
+      relation_as: "(ÑÐº {{relation_role}})"
     map:
       loading: "ÐÐ°Ð³ÑÑÐ·ÐºÐ°..."
       deleted: "ÐÑÐ´Ð°Ð»ÐµÐ½Ñ"
+      view_larger_map: "ÐÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ Ð±Ð¾Ð»ÑÑÑÑ ÐºÐ°ÑÑÑ"
     node_details:
       coordinates: "ÐÐ°Ð°ÑÐ´ÑÐ½Ð°ÑÑ: "
       part_of: "Ð§Ð°ÑÑÐºÐ°:"
@@ -119,6 +117,10 @@ be:
       view_history: "Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÑÑÑ Ð³ÑÑÑÐ¾ÑÑÑ"
     not_found:
       sorry: "ÐÑÐ°Ð±Ð°ÑÑÐµ, {{type}} Ð· Ð½ÑÐ¼Ð°ÑÐ°Ð¼ {{id}} Ð½Ðµ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ."
+      type:
+        node: "Ð²ÑÐ·ÐµÐ»"
+        way: "Ð»ÑÐ½ÑÑ"
+        relation: "Ð°Ð´Ð½Ð¾ÑÑÐ½Ñ"
     paging_nav:
       showing_page: "ÐÐ°ÐºÐ°Ð· ÑÑÐ°ÑÐ¾Ð½ÐºÑ"
       of: "Ð·"
@@ -128,6 +130,8 @@ be:
     relation_history:
       relation_history: "ÐÑÑÑÐ¾ÑÑÑ ÑÑÐ²ÑÐ·Ñ"
       relation_history_title: "ÐÑÑÑÐ¾ÑÑÑ ÑÑÐ²ÑÐ·Ñ: {{relation_name}}"
+    relation_member:
+      as: "ÑÐº"
     relation:
       relation: "Ð¡ÑÐ²ÑÐ·Ñ"
       relation_title: "Ð¡ÑÐ²ÑÐ·Ñ: {{relation_name}}"
@@ -138,6 +142,7 @@ be:
       view_data: "ÐÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ Ð¿Ð° Ð±ÑÐ³ÑÑÑÐ¼ Ð°Ð³Ð»ÑÐ´Ð·Ðµ"
       manually_select: "ÐÑÐ±ÑÐ°ÑÑ ÑÐ½ÑÑÑ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ"
     start_rjs:
+      data_layer_name: "ÐÐ°Ð´Ð·ÐµÐ½ÑÑ"
       data_frame_title: "ÐÐ°Ð´Ð·ÐµÐ½ÑÑ"
       zoom_or_select: "ÐÐ°Ð±Ð»ÑÐ·ÑÑÐµÑÑ ÑÑ Ð²ÑÐ±ÐµÑÑÑÐµ ÑÐ½ÑÑÑ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ Ð´Ð»Ñ Ð°Ð³Ð»ÑÐ´Ñ"
       drag_a_box: "Ð Ð°ÑÑÑÐ³Ð½ÑÑÐµ ÑÐ°Ð¼ÐºÑ Ð½Ð° ÐºÐ°ÑÑÐµ Ð´Ð»Ñ Ð²ÑÐ±Ð°ÑÐ° ÑÐ½ÑÐ°Ð¹ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ"
@@ -148,10 +153,25 @@ be:
       loading: "ÐÐ°Ð³ÑÑÐ·ÐºÐ°..."
       show_history: "ÐÐ°ÐºÐ°Ð·Ð°ÑÑ Ð³ÑÑÑÐ¾ÑÑÑ"
       wait: "ÐÐ°ÑÐ°ÐºÐ°Ð¹ÑÐµ..."
-      history_for: "ÐÑÑÑÐ¾ÑÑÑ Ð´Ð»Ñ [[feature]]"
+      history_for_feature: "ÐÑÑÑÐ¾ÑÑÑ [[feature]]"
       details: "ÐÐ°Ð´ÑÐ°Ð±ÑÐ·Ð½ÐµÐ¹"
       private_user: "ÑÐ°ÐµÐ¼Ð½Ñ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº"
       edited_by_user_at_timestamp: "ÐÐ¼ÐµÐ½ÐµÐ½Ð° [[user]] Ñ [[timestamp]]"
+      object_list:
+        heading: "Ð¡Ð¿ÑÑ Ð°Ð±'ÐµÐºÑÐ°Ñ"
+        back: "ÐÐ´Ð»ÑÑÑÑÐ°Ð²Ð°ÑÑ ÑÐ¿ÑÑ Ð°Ð±'ÐµÐºÑÐ°Ñ"
+        type:
+          node: "ÐÑÐ·ÐµÐ»"
+          way: "ÐÑÐ½ÑÑ"
+        api: "ÐÑÑÑÐ¼Ð°ÑÑ Ð³ÑÑÑÑ Ð²Ð¾Ð±Ð»Ð°ÑÑÑ Ð· API"
+        details: "ÐÑÑÐ°Ð»Ñ"
+        selected:
+          type:
+            node: "ÐÑÐ·ÐµÐ» [[id]]"
+            way: "ÐÑÐ½ÑÑ [[id]]"
+        history:
+            node: "ÐÑÐ·ÐµÐ» [[id]]"
+            way: "ÐÑÐ½ÑÑ [[id]]"
     tag_details:
       tags: "Ð¦ÑÑÐ»ÑÐºÑ:"
     way_details:
@@ -173,7 +193,7 @@ be:
       download_xml: "Ð¡ÑÑÐ³Ð½ÑÑÑ XML"
       view_history: "Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ Ð³ÑÑÑÐ¾ÑÑÑ"
   changeset:
-    changeset_paging_nav: 
+    changeset_paging_nav:
       showing_page: "ÐÐ°ÐºÐ°Ð·Ð²Ð°ÐµÑÑÐ° ÑÑÐ°ÑÐ¾Ð½ÐºÐ°"
       of: "Ð·"
     changeset:
@@ -184,6 +204,7 @@ be:
       show_area_box: "Ð¿Ð°ÐºÐ°Ð·Ð°ÑÑ Ð¼ÑÐ¶Ñ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ"
       big_area: "(Ð²ÑÐ»ÑÐºÐ°Ñ)"
       view_changeset_details: "ÐÐ°Ð´ÑÐ°Ð±ÑÐ·Ð½ÐµÐ¹ Ð¿ÑÐ° Ð½Ð°Ð±Ð¾Ñ Ð·Ð¼ÐµÐ½Ð°Ñ"
+      more: "Ð±Ð¾Ð»ÑÑ"
     changesets:
       id: "ID"
       saved_at: "ÐÐ°Ð¿ÑÑÐ°Ð½Ñ"
@@ -217,6 +238,7 @@ be:
     list:
       title: "ÐÐ·ÑÐ½Ð½ÑÐºÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ"
       user_title: "ÐÐ·ÑÐ½Ð½ÑÐº {{user}}"
+      in_language_title: "ÐÐ·ÑÐ½Ð½ÑÐº Ð·Ð°Ð¿ÑÑÐ°Ñ Ñ {{language}}"
       new: ÐÐ¾Ð²Ñ Ð·Ð°Ð¿ÑÑ Ð´Ð·ÑÐ½Ð½ÑÐºÑ
       new_title: ÐÐ¾Ð²Ñ Ð·Ð°Ð¿ÑÑ Ð´Ð»Ñ Ð²Ð°ÑÐ°Ð³Ð° Ð´Ð·ÑÐ½Ð½ÑÐºÑ
       no_entries: ÐÑÐ¼Ð° Ð·Ð°Ð¿ÑÑÐ°Ñ
@@ -236,12 +258,17 @@ be:
       marker_text: ÐÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ Ð·Ð°Ð¿ÑÑÑ Ð´Ð·ÑÐ½Ð½ÑÐºÑ
     view:
       title: "ÐÐ·ÑÐ½Ð½ÑÐº ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° | {{user}}"
+      user_title: "ÐÐ·ÑÐ½Ð½ÑÐº {{user}}"
       leave_a_comment: "ÐÐ°ÐºÑÐ½ÑÑÑ ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ñ"
+      login_to_leave_a_comment: "{{login_link}} ÐºÐ°Ð± Ð¿Ð°ÐºÑÐ½ÑÑÑ ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ñ"
+      login: "ÐÐ¾Ð³ÑÐ½"
       save_button: "ÐÐ°Ð¿ÑÑÐ°ÑÑ"
     no_such_entry:
       heading: "ÐÑÐ¼Ð° Ð·Ð°Ð¿ÑÑÑ Ð· Ð½ÑÐ¼Ð°ÑÐ°Ð¼: {{id}}"
       body: "ÐÑÐ°Ð±Ð°ÑÐµ, Ð½Ðµ ÑÑÐ½ÑÐµ Ð·Ð°Ð¿ÑÑÑ Ñ Ð´Ð·ÑÐ½Ð½ÑÐºÑ ÑÑ ÐºÐ°Ð¼ÐµÐ½ÑÐ°ÑÐ° Ð· Ð½ÑÐ¼Ð°ÑÐ°Ð¼ {{id}}. ÐÑÐ°Ð²ÐµÑÑÐµ ÑÐ²Ð¾Ð¹ Ð¿ÑÐ°Ð²Ð°Ð¿ÑÑ, ÑÑ, Ð¼Ð°Ð³ÑÑÐ¼Ð°, Ð²Ð°Ð¼ Ð´Ð°Ð»Ñ Ð½ÑÐ¿ÑÐ°Ð²ÑÐ»ÑÐ½ÑÑ ÑÐ¿Ð°ÑÑÐ»ÐºÑ."
     no_such_user:
+      title: "ÐÑÐ¼Ð° ÑÐ°ÐºÐ¾Ð³Ð° ÐºÐ°ÑÑÑÑÐ°ÑÐ°"
+      heading: "ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº {{user}} Ð½Ðµ ÑÑÐ½ÑÐµ"
       body: "ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð½Ðµ ÑÑÐ½ÑÐµ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° {{user}}. ÐÑÐ°Ð²ÐµÑÑÐµ ÑÐ²Ð¾Ð¹ Ð¿ÑÐ°Ð²Ð°Ð¿ÑÑ, ÑÑ, Ð¼Ð°Ð³ÑÑÐ¼Ð°, Ð²Ð°Ð¼ Ð´Ð°Ð»Ñ Ð½ÑÐ¿ÑÐ°Ð²ÑÐ»ÑÐ½ÑÑ ÑÐ¿Ð°ÑÑÐ»ÐºÑ."
     diary_entry:
       posted_by: "ÐÐ°Ð¿ÑÑÐ°Ð½Ð° {{link_user}} Ñ {{created}} Ð½Ð° {{language_link}}"
@@ -285,64 +312,112 @@ be:
       add_marker: "ÐÐ°Ð´Ð°ÑÑ Ð¼Ð°ÑÐºÐµÑ Ð½Ð° ÐºÐ°ÑÑÑ"
       view_larger_map: "ÐÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ Ð±Ð¾Ð»ÑÑÑÑ ÐºÐ°ÑÑÑ"
   geocoder:
-    search:
-      title:
-        latlon: 'Ð ÑÐ·ÑÐ»ÑÑÐ°ÑÑ Ð· <a href="http://openstreetmap.org/">Internal</a>'
-        us_postcode: 'Ð ÑÐ·ÑÐ»ÑÑÐ°ÑÑ Ð· <a href="http://geocoder.us/">Geocoder.us</a>'
-        uk_postcode: 'Ð ÑÐ·ÑÐ»ÑÑÐ°ÑÑ Ð· <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
-        ca_postcode: 'Ð ÑÐ·ÑÐ»ÑÑÐ°ÑÑ Ð· <a href="http://geocoder.ca/">Geocoder.CA</a>'
-        osm_namefinder: 'Ð ÑÐ·ÑÐ»ÑÑÐ°ÑÑ Ð· <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
-        geonames: 'Ð ÑÐ·ÑÐ»ÑÑÐ°ÑÑ Ð· <a href="http://www.geonames.org/">GeoNames</a>'
     results:
+      results: "Ð ÑÐ·ÑÐ»ÑÑÐ°ÑÑ"
+      type_from_source: "{{type}} Ð· {{source_link}}"
       no_results: "ÐÑÑÐ¾Ð³Ð° Ð½Ðµ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ð°"
   layouts:
+    project_name:
+      title: "OpenStreetMap"
+      h1: "OpenStreetMap"
+    logo:
+      alt_text: "ÐÐ°Ð³Ð°ÑÑÐ¿ OpenStreetMap"
     welcome_user: "ÐÑÑÐ°ÐµÐ¼, {{user_link}}"
+    welcome_user_link_tooltip: "ÐÐ°ÑÐ° ÑÑÐ°ÑÐ¾Ð½ÐºÐ° ÐºÐ°ÑÑÑÑÐ°ÑÐ°"
     home: "Ð´Ð°Ð¼Ð¾Ñ"
+    home_tooltip: "ÐÐ°ÐºÐ°Ð·Ð°ÑÑ Ð¼Ð°Ñ ÑÐ°ÑÑ"
     inbox: "ÑÐ²Ð°ÑÐ¾Ð´Ð½ÑÑ ({{count}})"
-    logout: Ð²ÑÐ¹ÑÑÑ
-    log_in: ÑÐ²Ð°Ð¹ÑÑÑ
-    sign_up: Ð·Ð°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°ÑÑÐ°
-    view: ÐÐ°ÑÑÐ°
-    edit: ÐÐ¼ÑÐ½ÑÑÑ
-    history: ÐÑÑÑÐ¾ÑÑÑ
-    export: Ð­ÐºÑÐ¿Ð°ÑÑ
+    inbox_tooltip:
+      zero: "Ð£ Ð²Ð°ÑÐ°Ð¹ ÑÐºÑÑÐ½Ñ Ð½ÑÐ¼Ð° Ð½ÐµÐ¿ÑÐ°ÑÑÑÐ°Ð½ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ"
+      one: "Ð£ Ð²Ð°ÑÐ°Ð¹ ÑÐºÑÑÐ½Ñ ÑÑÑÑ 1 Ð½Ð¾Ð²Ð°Ðµ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ"
+      other: "Ð£ Ð²Ð°ÑÐ°Ð¹ ÑÐºÑÑÐ½Ñ ÑÑÑÑ {{count}} Ð½Ð¾Ð²ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½ÑÐ¹"
+    logout: "Ð²ÑÐ¹ÑÑÑ"
+    logout_tooltip: "Ð²ÑÐ¹ÑÑÑ"
+    log_in: "ÑÐ²Ð°Ð¹ÑÑÑ"
+    log_in_tooltip: "Ð£Ð²Ð°Ð¹ÑÑÑ Ð· Ð°ÐºÐ°ÑÐ½ÑÐ°Ð¼, ÑÐºÑ ÑÑÐ½ÑÐµ"
+    sign_up: "ÐÐ°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°ÑÑÐ°"
+    sign_up_tooltip: "Ð¡ÑÐ²Ð°ÑÑÑÑ Ð°ÐºÐ°ÑÐ½Ñ Ð´Ð»Ñ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ñ"
+    view: "ÐÐ°ÑÑÐ°"
+    view_tooltip: "ÐÐ°Ð³Ð»ÑÐ´Ð·ÐµÑÑ ÐºÐ°ÑÑÑ"
+    edit: "ÐÐ¼ÑÐ½ÑÑÑ"
+    edit_tooltip: "Ð ÑÐ´Ð°Ð³Ð°Ð²Ð°ÑÑ ÐºÐ°ÑÑÑ"
+    history: "ÐÑÑÑÐ¾ÑÑÑ"
+    history_tooltip: "ÐÑÑÑÐ¾ÑÑÑ Ð·Ð¼ÐµÐ½"
+    export: "Ð­ÐºÑÐ¿Ð°ÑÑ"
+    export_tooltip: "Ð­ÐºÑÐ¿Ð°ÑÑÐ°Ð²Ð°ÑÑ Ð´Ð°Ð½Ð½ÑÑ ÐºÐ°ÑÑÑ"
     gps_traces: GPS Ð¢ÑÑÐºÑ
-    user_diaries: ÐÐ·ÑÐ½Ð½ÑÐºÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ
+    gps_traces_tooltip: "ÐÑÐ°ÑÐ°Ð²Ð°ÑÑ Ð· ÑÑÑÐºÐ°Ð¼Ñ"
+    user_diaries: "ÐÐ·ÑÐ½Ð½ÑÐºÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ"
+    user_diaries_tooltip: "ÐÐ·ÑÐ½Ð½ÑÐºÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ"
     tag_line: Ð¡Ð²Ð°Ð±Ð¾Ð´Ð½Ð°Ñ Wiki-ÐºÐ°ÑÑÐ° ÑÐ²ÐµÑÑ
     intro_1: "OpenStreetMap - ÑÐ²Ð°Ð±Ð¾Ð´Ð½Ð°Ñ Ð´Ð»Ñ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ñ ÐºÐ°ÑÑÐ° ÑÑÑÐ³Ð¾ ÑÐ²ÐµÑÑ. Ð¯Ðµ ÑÑÐ²Ð°ÑÐ°ÑÑÑ ÑÐ°ÐºÑÑ Ð¶ Ð»ÑÐ´Ð·Ñ, ÑÐº Ð²Ñ."
     intro_2: "OpenStreetMap Ð´Ð°Ð·Ð²Ð°Ð»ÑÐµ Ð²Ð°Ð¼ Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ, ÑÑÐ´Ð°Ð³Ð°Ð²Ð°ÑÑ Ñ ÐºÐ°ÑÑÑÑÐ°ÑÑÐ° Ð³ÐµÐ°Ð³ÑÐ°ÑÑÑÐ½ÑÐ¼Ñ Ð·Ð²ÐµÑÑÐºÐ°Ð¼Ñ Ñ Ð»ÑÐ±ÑÐ¼ Ð¿ÑÐ½ÐºÑÐµ Ð¿Ð»Ð°Ð½ÐµÑÑ."
     intro_3: "Ð¥Ð¾ÑÑÑÐ½Ð³ Ð´Ð»Ñ OpenStreetMap: {{ucl}} Ñ {{bytemark}}."
+    intro_3_ucl: "Ð¦ÑÐ½ÑÑ UCL VR"
+    intro_3_bytemark: "bytemark"
     osm_offline: "ÐÐ°Ð·Ð° Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ OpenStreetMap Ð·Ð°ÑÐ°Ð· Ð¿Ð°-Ð·Ð° ÑÐµÑÑÐ²Ð°Ð¼, ÑÐ°Ð¼Ñ ÑÑÐ¾ Ð¿ÑÐ°ÑÐ¾Ð´Ð·ÑÑÑ Ð½ÐµÐ°Ð±ÑÐ¾Ð´Ð½Ð°Ñ ÑÑÑÐ½ÑÑÐ½Ð°Ñ Ð¿ÑÐ°ÑÐ°."
     osm_read_only: "ÐÐ°Ð·Ð° Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ OpenStreetMap Ð·Ð°ÑÐ°Ð· Ð´Ð°ÑÑÑÐ¿Ð½Ð°Ñ ÑÐ¾Ð»ÑÐºÑ Ð´Ð»Ñ ÑÑÑÐ°Ð½Ð½Ñ, ÑÐ°Ð¼Ñ ÑÑÐ¾ Ð¿ÑÐ°ÑÐ¾Ð´Ð·ÑÑÑ Ð½ÐµÐ°Ð±ÑÐ¾Ð´Ð½Ð°Ñ ÑÑÑÐ½ÑÑÐ½Ð°Ñ Ð¿ÑÐ°ÑÐ°."
     donate: "ÐÐ°Ð´ÑÑÑÐ¼Ð°Ð¹ÑÐµ OpenStreetMap {{link}} Ñ ÑÐ¾Ð½Ð´ Ð°Ð±Ð½Ð°ÑÐ»ÐµÐ½Ð½Ñ ÑÑÑÐ½ÑÐºÑ."
     donate_link_text: Ð°ÑÐ²ÑÑÐ°Ð²Ð°Ð½Ð½ÐµÐ¼
     help_wiki: "ÐÐ°Ð¿Ð°Ð¼Ð¾Ð³Ð° Ñ Wiki"
+    help_wiki_tooltip: "ÐÐ°Ð²ÐµÐ´ÐºÐ° Ñ ÑÐ°Ð¹Ñ ÐÑÐºÑ"
+    help_wiki_url: "http://wiki.openstreetmap.org/wiki/RU:Main_Page"
     news_blog: "ÐÐ»Ð¾Ð³ Ð½Ð°Ð²ÑÐ½Ð°Ñ"
+    news_blog_tooltip: "ÐÐ»Ð¾Ð³ Ð½Ð°Ð²ÑÐ½ OpenStreetMap, Ð´Ð°ÑÐ¼Ð¾Ð²ÑÑ Ð³ÐµÐ°Ð´Ð°Ð½ÑÑ, Ñ Ð³.Ð´."
     shop: ÐÑÐ°Ð¼Ð°
+    shop_tooltip: "ÐÑÐ°Ð¼Ð° Ð· ÑÑÑÐ¼Ð¾Ð²Ð°Ð¹ ÑÑÐ¼Ð²Ð¾Ð»ÑÐºÐ°Ð¹ OpenStreetMap"
+    shop_url: "http://wiki.openstreetmap.org/wiki/Merchandise"
     sotm: 'ÐÐ°Ð²ÐµÐ´Ð°Ð¹ÑÐµ ÐºÐ°Ð½ÑÐµÑÑÐ½ÑÑÑ OpenStreetMap, The State of the Map 2009, 10-12 Ð»ÑÐ¿ÐµÐ½Ñ Ñ ÐÐ¼ÑÑÑÑÐ´Ð°Ð¼Ðµ!'
     alt_donation: ÐÑÐ°Ð±ÑÑÑ Ð°ÑÐ²ÑÑÐ°Ð²Ð°Ð½Ð½Ðµ
   notifier:
     diary_comment_notification:
+      subject: "[OpenStreetMap] {{user}} Ð¿Ð°ÐºÑÐ½ÑÑ ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ñ Ñ Ð²Ð°ÑÑÐ¼ Ð´Ð·ÑÐ½Ð½ÑÐºÑ"
       banner1: "*            ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð½Ðµ Ð°Ð´ÐºÐ°Ð·Ð²Ð°Ð¹ÑÐµ Ð½Ð° Ð³ÑÑÐ°Ðµ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ.             *"
       banner2: "*             ÐÐ°ÑÑÑÑÐ°Ð¹ÑÐµÑÑ ÑÐ°Ð¹ÑÐ°Ð¼ OpenStreetMap Ð´Ð»Ñ Ð°Ð´ÐºÐ°Ð·Ñ.               *"
       hi: "ÐÑÑÐ°Ð½Ð½Ñ, {{to_user}},"
       header: "{{from_user}} Ð¿ÑÐ°ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ð²Ð°Ñ Ð²Ð°Ñ Ð·Ð°Ð¿ÑÑ Ñ Ð´Ð·ÑÐ½Ð½ÑÐºÑ Ð½Ð° OpenStreetMap Ð· ÑÑÐ¼Ð°Ð¹ {{subject}}:"
       footer: "ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ñ Ð½Ð° {{readurl}} Ñ Ð¿ÑÐ°ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ð²Ð°ÑÑ Ð½Ð° {{commenturl}} ÑÑ Ð°Ð´ÐºÐ°Ð·Ð°ÑÑ Ð½Ð° {{replyurl}}"
+    message_notification:
+      subject: "[OpenStreetMap] {{user}} Ð´Ð°ÑÐ»Ð°Ñ Ð²Ð°Ð¼ Ð½Ð¾Ð²Ð°Ðµ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ"
+      banner1: "* ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð½Ðµ Ð°Ð´ÐºÐ°Ð·Ð²Ð°Ð¹ÑÐµ Ð½Ð° Ð³ÑÑÐ°Ðµ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ. *"
+      banner2: "* ÐÐ»Ñ Ð°Ð´ÐºÐ°Ð·Ñ Ð²ÑÐºÐ°ÑÑÑÑÐ°Ð¹ÑÐµ ÑÐ°Ð¹Ñ OpenStreetMap. *"
+      hi: "ÐÑÑÐ²ÑÑÐ°Ð½Ð½Ðµ, {{to_user}},"
+      header: "{{from_user}} Ð°Ð´Ð¿ÑÐ°Ð²ÑÑ Ð²Ð°Ð¼ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ Ð· ÑÑÐ¼Ð°Ð¹ {{subject}} Ð¿ÑÐ°Ð· OpenStreetMap:"
+      footer1: "ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ ÑÐ°ÐºÑÐ°Ð¼Ð° Ð¿ÑÐ°ÑÑÑÐ°ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ - {{readurl}}"
+      footer2: "Ñ Ð²Ñ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð°Ð´ÐºÐ°Ð·Ð°ÑÑ Ð½Ð° {{replyurl}}"
     friend_notification:
+      subject: "[OpenStreetMap] {{user}} Ð´Ð°Ð´Ð°Ñ Ð²Ð°Ñ Ñ ÑÐ¿ÑÑ ÑÐ²Ð°ÑÑ ÑÑÐ±ÑÐ¾Ñ"
       had_added_you: "{{user}} Ð´Ð°Ð´Ð°Ñ Ð²Ð°Ñ, ÑÐº ÑÑÐ±ÑÐ°, Ð½Ð° OpenStreetMap."
       see_their_profile: "ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ Ð¿ÑÐ¾ÑÑÐ»Ñ Ð½Ð° {{userurl}} Ñ Ð´Ð°Ð´Ð°ÑÑ, ÑÐº ÑÑÐ±ÑÐ°, Ñ Ð°Ð´ÐºÐ°Ð·, ÐºÐ°Ð»Ñ ÑÐ¾ÑÐ°ÑÐµ."
+    gpx_notification:
+      greeting: "ÐÑÑÐ²ÑÑÐ°Ð½Ð½Ðµ,"
+      your_gpx_file: "ÐÑÑÐ° Ð²ÑÐ³Ð»ÑÐ´Ð°Ðµ ÑÐº Ð²Ð°Ñ ÑÐ°Ð¹Ð» GPX"
+      with_description: "Ð· Ð°Ð¿ÑÑÐ°Ð½Ð½ÐµÐ¼"
+      and_the_tags: "Ñ Ð½Ð°ÑÑÑÐ¿Ð½ÑÐ¼Ñ ÑÑÐ³Ð°Ð¼Ñ:"
+      and_no_tags: "Ñ Ð±ÐµÐ· ÑÑÐ³Ð°Ñ."
+      failure:
+        subject: "[OpenStreetMap] ÐÐ±Ð¾Ð¹ ÑÐ¼Ð¿Ð°ÑÑÑ GPX"
+        failed_to_import: "Ð·Ð±Ð¾Ð¹ ÑÐ¼Ð¿Ð°ÑÑÑ. ÐÐ´Ð±ÑÐ»Ð°ÑÑ Ð¿Ð°Ð¼ÑÐ»ÐºÐ°:"
+        more_info_1: "ÐÐ°Ð´Ð°ÑÐºÐ¾Ð²ÑÑ ÑÐ½ÑÐ°ÑÐ¼Ð°ÑÑÑ Ð°Ð± Ð·Ð±Ð¾Ñ ÑÐ¼Ð¿Ð°ÑÑÑ GPX Ñ Ð°Ð± ÑÑÐ¼, ÑÐº Ð¿Ð°Ð·Ð±ÐµÐ³Ð½ÑÑÑ"
+        more_info_2: "Ð·Ð±Ð¾Ð¹,  Ð¼Ð¾Ð¶Ð½Ð° Ð·Ð½Ð°Ð¹ÑÑÑ ÑÑÑ: "
+        import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
+      success:
+        subject: "[OpenStreetMap] ÐÐ¼Ð¿Ð°ÑÑ GPX Ð¼ÑÐ½ÑÑ Ð¿Ð°ÑÐ¿ÑÑÐ¾Ð²Ð°"
+        loaded_successfully: " |"
+    signup_confirm:
+      subject: "[OpenStreetMap] ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÐµ Ð²Ð°Ñ Ð°Ð´ÑÐ°Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ"
     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:"
+      the_wiki_url: "http://wiki.openstreetmap.org/wiki/RU:Beginners_Guide"
       opengeodata: "OpenGeoData.org - Ð°ÑÑÑÑÐ¹Ð½Ñ Ð±Ð»Ð¾Ð³ OpenStreetMap, Ñ ÑÐ°ÐºÑÐ°Ð¼Ð° Ð¼Ð°Ðµ Ð¿Ð¾Ð´ÐºÐ°ÑÑÑ:"
       wiki_signup: "ÐÑ ÑÐ°ÐºÑÐ°Ð¼Ð° Ð¼Ð¾Ð¶Ð°ÑÐµ Ð·Ð°ÑÐ°ÑÐµÑÑ Ð·Ð°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°ÑÑÐ° Ð½Ð°  OpenStreetMap wiki Ð½Ð°:"
-      # next four translations are in pairs : please word wrap appropriately
+      wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&type=signup&returnto=RU%3AMain_Page"
       user_wiki_1: "Ð ÑÐºÐ°Ð¼ÐµÐ½Ð´ÑÐµÐ¼ ÑÑÐ²Ð°ÑÑÑÑ ÑÑÐ°ÑÐ¾Ð½ÐºÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° Ð½Ð° wiki, ÑÐºÐ°Ñ Ð±ÑÐ´Ð·Ðµ ÑÐºÐ»ÑÑÐ°ÑÑ ÑÑÑÐ»ÑÐºÑ ÐºÐ°ÑÑÐ³Ð¾ÑÑÐ¹,"
       user_wiki_2: "ÑÐºÑÑ Ð°Ð´Ð·Ð½Ð°ÑÐ°ÑÑÑ, Ð´Ð·Ðµ Ð²Ñ Ð·Ð½Ð°ÑÐ¾Ð´Ð·ÑÑÐµÑÑ, Ð½Ð°Ð¿ÑÑÐºÐ»Ð°Ð´ [[Category:Users_in_London]]."
       current_user_1: "Ð¡Ð¿ÑÑ Ð±ÑÐ³ÑÑÑÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ Ð¿Ð° ÐºÐ°ÑÑÐ³Ð¾ÑÑÑÑ ÑÑ Ð³ÐµÐ°Ð³ÑÐ°ÑÑÑÐ½Ð°Ð³Ð° Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ñ"
@@ -355,10 +430,40 @@ be:
       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</a> ÑÑ <a href="http://www.opengeodata.org/">Ð±Ð»Ð¾Ð³Ñ opengeodata</a>, Ð½Ð° ÑÐºÑÐ¼ ÑÐ°ÐºÑÐ°Ð¼Ð° ÑÑÑÑ <a href="http://www.opengeodata.org/?cat=13">Ð¿Ð¾Ð´ÐºÐ°ÑÑÑ</a>!'
+      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>.'
+    email_confirm:
+      subject: "[OpenStreetMap] ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÐµ Ð²Ð°Ñ Ð°Ð´ÑÐ°Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ"
+    email_confirm_plain:
+      greeting: "ÐÐ¾Ð±ÑÑ Ð´Ð·ÐµÐ½Ñ,"
+      hopefully_you_1: "Ð¥ÑÐ¾ÑÑÑÑ (ÑÐ¿Ð°Ð´Ð·ÑÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) Ð¶Ð°Ð´Ð°Ðµ Ð·Ð¼ÑÐ½ÑÑÑ ÑÐ²Ð¾Ð¹ Ð°Ð´ÑÐ°Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ Ñ  "
+      hopefully_you_2: "{{server_url}} Ð½Ð° Ð°Ð´ÑÐ°Ñ: {{new_address}}."
+      click_the_link: "ÐÐ°Ð»Ñ Ð³ÑÑÐ° Ð²Ñ, ÑÐ¾ Ð¿ÐµÑÐ°Ð¹Ð´Ð·ÑÑÐµ Ð¿Ð° ÑÐ¿Ð°ÑÑÐ»ÑÑ, ÑÐ°Ð·Ð¼ÐµÑÑÐ°Ð½Ð°Ð¹ Ð½ÑÐ¶ÑÐ¹, ÐºÐ°Ð± Ð¿Ð°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ Ð·Ð¼ÐµÐ½Ñ."
+    email_confirm_html:
+      greeting: "ÐÐ¾Ð±ÑÑ Ð´Ð·ÐµÐ½Ñ,"
+      hopefully_you: "Ð¥ÑÐ¾ÑÑÑÑ (ÑÐ¿Ð°Ð´Ð·ÑÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) Ð¶Ð°Ð´Ð°Ðµ Ð·Ð¼ÑÐ½ÑÑÑ ÑÐ²Ð¾Ð¹ Ð°Ð´ÑÐ°Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ Ñ {{server_url}} Ð½Ð° Ð°Ð´ÑÐ°Ñ: {{new_address}}."
+      click_the_link: "ÐÐ°Ð»Ñ Ð³ÑÑÐ° Ð²Ñ, ÑÐ¾ Ð¿ÐµÑÐ°Ð¹Ð´Ð·ÑÑÐµ Ð¿Ð° ÑÐ¿Ð°ÑÑÐ»ÑÑ, ÑÐ°Ð·Ð¼ÐµÑÑÐ°Ð½Ð°Ð¹ Ð½ÑÐ¶ÑÐ¹, ÐºÐ°Ð± Ð¿Ð°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ Ð·Ð¼ÐµÐ½Ñ."
+    lost_password:
+      subject: "[OpenStreetMap] ÐÐ°Ð¿ÑÑ Ð½Ð° Ð·Ð¼ÐµÐ½Ñ Ð¿Ð°ÑÐ¾Ð»Ñ"
+    lost_password_plain:
+      greeting: "ÐÑÑÐ²ÑÑÐ°Ð½Ð½Ðµ,"
+      hopefully_you_1: "Ð¥ÑÐ¾ÑÑÑÑ (ÑÐ¿Ð°Ð´Ð·ÑÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) Ð·Ð°Ð¿ÑÑÐ°Ñ Ð·Ð¼ÐµÐ½Ñ Ð¿Ð°ÑÐ¾Ð»Ñ Ð´Ð»Ñ Ð³ÑÑÐ°Ð³Ð°"
+      hopefully_you_2: "Ð°Ð´ÑÐ°ÑÐ° ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ, Ð·Ð°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°Ð½Ð°Ð³Ð° Ð½Ð° openstreetmap.org."
+      click_the_link: "ÐÐ°Ð»Ñ Ð³ÑÑÐ° Ð²Ñ, ÐºÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿ÐµÑÐ°Ð¹Ð´Ð·ÑÑÐµ Ð¿Ð° ÑÐ¿Ð°ÑÑÐ»ÑÑ, Ð¿Ð°ÐºÐ°Ð·Ð°Ð½Ð°Ð¹ Ð½ÑÐ¶ÑÐ¹, ÐºÐ°Ð± Ð·Ð¼ÑÐ½ÑÑÑ Ð²Ð°Ñ Ð¿Ð°ÑÐ¾Ð»Ñ."
+    lost_password_html:
+      greeting: "ÐÑÑÐ²ÑÑÐ°Ð½Ð½Ðµ,"
+      hopefully_you: "Ð¥ÑÐ¾ÑÑÑÑ (ÑÐ¿Ð°Ð´Ð·ÑÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) Ð·Ð°Ð¿ÑÑÐ°Ñ Ð·Ð¼ÐµÐ½Ñ Ð¿Ð°ÑÐ¾Ð»Ñ Ð´Ð»Ñ Ð³ÑÑÐ°Ð³Ð° Ð°Ð´ÑÐ°ÑÑ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ, Ð·Ð°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°Ð½Ð°Ð³Ð° Ð½Ð° openstreetmap.org."
+      click_the_link: "ÐÐ°Ð»Ñ Ð³ÑÑÐ° Ð²Ñ, ÐºÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿ÐµÑÐ°Ð¹Ð´Ð·ÑÑÐµ Ð¿Ð° ÑÐ¿Ð°ÑÑÐ»ÑÑ, Ð¿Ð°ÐºÐ°Ð·Ð°Ð½Ð°Ð¹ Ð½ÑÐ¶ÑÐ¹, ÐºÐ°Ð± Ð·Ð¼ÑÐ½ÑÑÑ Ð²Ð°Ñ Ð¿Ð°ÑÐ¾Ð»Ñ."
+    reset_password:
+      subject: "[OpenStreetMap] ÐÐ¼ÐµÐ½Ð° Ð¿Ð°ÑÐ¾Ð»Ñ"
+    reset_password_plain:
+      greeting: "ÐÑÑÐ²ÑÑÐ°Ð½Ð½Ðµ,"
+      reset: "ÐÐ°Ñ Ð¿Ð°ÑÐ¾Ð»Ñ Ð±ÑÑ Ð·Ð°Ð¼ÐµÐ½ÐµÐ½Ñ Ð½Ð° {{new_password}}"
+    reset_password_html:
+      greeting: "ÐÑÑÐ²ÑÑÐ°Ð½Ð½Ðµ,"
+      reset: "ÐÐ°Ñ Ð¿Ð°ÑÐ¾Ð»Ñ Ð±ÑÑ Ð·Ð°Ð¼ÐµÐ½ÐµÐ½Ñ Ð½Ð° {{new_password}}"
   message:
     inbox:
       title: "Ð£Ð²Ð°ÑÐ¾Ð´Ð½ÑÑ"
@@ -369,7 +474,7 @@ be:
       subject: "Ð¢ÑÐ¼Ð°"
       date: "ÐÐ°ÑÐ°"
       no_messages_yet: "Ð£ Ð²Ð°Ñ Ð¿Ð°ÐºÑÐ»Ñ Ð½ÑÐ¼Ð° Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ. Ð§Ð°Ð¼Ñ Ð± Ð½Ðµ Ð·ÐºÐ°Ð°ÑÐ´ÑÐ½Ð°Ð²Ð°ÑÑÐ° Ð·  {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "Ð»ÑÐ´Ð·ÑÐ¼Ñ, ÑÑÐ¾ Ð¶ÑÐ²ÑÑÑ Ð½ÐµÐ¿Ð°Ð´Ð°Ð»ÑÐºÑ" 
+      people_mapping_nearby: "Ð»ÑÐ´Ð·ÑÐ¼Ñ, ÑÑÐ¾ Ð¶ÑÐ²ÑÑÑ Ð½ÐµÐ¿Ð°Ð´Ð°Ð»ÑÐºÑ"
     message_summary:
       unread_button: "ÐÐ´Ð·Ð½Ð°ÑÑÑÑ ÑÐº Ð½ÐµÑÑÑÐ°Ð½Ð°Ðµ"
       read_button: "ÐÐ´Ð·Ð½Ð°ÑÑÑÑ ÑÐº Ð¿ÑÐ°ÑÑÑÐ°Ð½Ð°Ðµ"
@@ -383,9 +488,10 @@ be:
       back_to_inbox: "ÐÑÑÐ½ÑÑÑÐ° Ð´Ð° ÑÐ²Ð°ÑÐ¾Ð´Ð½ÑÑ"
       message_sent: "ÐÐ°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ Ð°Ð´Ð¿ÑÐ°ÑÐ»ÐµÐ½Ð°"
     no_such_user:
-      no_such_user: "ÐÑÐ¼Ð° ÑÐ°ÐºÐ¾Ð³Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ñ"
-      sorry: "ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð½ÑÐ¼Ð° ÑÐ°ÐºÐ¾Ð³Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ñ Ð· ÑÐ°ÐºÑÐ¼ Ð½ÑÐ¼Ð°ÑÐ°Ð¼"
-    outbox: 
+      title: "ÐÑÐ¼Ð° ÑÐ°ÐºÐ¾Ð³Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°/Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ñ"
+      heading: "ÐÑÐ¼Ð° ÑÐ°ÐºÐ¾Ð³Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°/Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ñ"
+      body: "ÐÐ°Ð¶Ð°Ð»Ñ, Ð½Ðµ Ð°ÑÑÑÐ¼Ð°Ð»Ð°ÑÑ Ð·Ð½Ð°Ð¹ÑÑÑ ÐºÐ°ÑÑÑÑÐ°ÑÐ° Ð°Ð±Ð¾ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ Ð· ÑÐ°ÐºÑÐ¼ ÑÐ¼ÐµÐ¼ Ð°Ð±Ð¾ ÑÐ´ÑÐ½ÑÑÑÑÐºÐ°ÑÐ°ÑÐ°Ð¼"
+    outbox:
       title: "ÐÑÑÐ¾Ð´Ð½ÑÑ"
       my_inbox: "ÐÐ°Ðµ {{inbox_link}}"
       inbox: "ÑÐ²Ð°ÑÐ¾Ð´Ð½ÑÑ"
@@ -420,7 +526,9 @@ be:
       license:
         notice: "ÐÑÑÑÐ½Ð·ÑÑÑÐµÑÑÐ° Ð½Ð° ÑÐ¼Ð¾Ð²Ð°Ñ {{license_name}} Ð¿ÑÐ°ÐµÐºÑÐ°Ð¼ {{project_name}} Ñ ÑÐ³Ð¾ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ð¼Ñ."
         license_name: "Creative Commons Attribution-Share Alike 2.0"
+        license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
         project_name: "OpenStreetMap"
+        project_url: "http://openstreetmap.org"
     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}}."
@@ -437,9 +545,11 @@ be:
       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: "ÐÐ»ÑÑ ÐºÐ°ÑÑÑ"
+      map_key_tooltip: "ÐÐµÐ³ÐµÐ½Ð´Ð° Ð´Ð»Ñ ÑÑÐ½Ð´ÑÑÑÐ½Ð³Ñ mapnik Ð½Ð° Ð³ÑÑÑÐ¼ ÑÐ·ÑÐ¾ÑÐ½Ñ Ð¼Ð°ÑÑÐ°Ð±Ñ"
   trace:
     create:
       upload_trace: "ÐÐ°ÑÑÐ³Ð½ÑÑÑ GPS-ÑÑÑÐº"
@@ -455,7 +565,9 @@ be:
       tags: "Ð¦ÑÑÐ»ÑÐºÑ:"
       save_button: "ÐÐ°Ð¿ÑÑÐ°ÑÑ Ð·Ð¼ÐµÐ½Ñ"
     no_such_user:
-      no_such_user: "ÐÑÐ°Ð±Ð°ÑÑÐµ, ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº {{name}} Ð½Ðµ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿ÑÐ°Ð²ÐµÑÑÐµ ÑÐ²Ð¾Ð¹ Ð¿ÑÐ°Ð²Ð°Ð¿ÑÑ, ÑÑ, Ð¼Ð°Ð³ÑÑÐ¼Ð°, Ð²Ð°Ð¼ Ð´Ð°Ð»Ñ Ð½ÑÐ¿ÑÐ°Ð²ÑÐ»ÑÐ½ÑÑ ÑÐ¿Ð°ÑÑÐ»ÐºÑ."
+      title: "ÐÑÐ¼Ð° ÑÐ°ÐºÐ¾Ð³Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°"
+      heading: "ÐÐ°ÑÑÑÑÐ°Ñ {{user}} Ð½Ðµ ÑÑÐ½ÑÐµ"
+      body: "ÐÑÐ±Ð°ÑÑÑÐµ, ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° Ð· ÑÐ¼ÐµÐ¼ {{user}} Ð½Ðµ ÑÑÐ½ÑÐµ. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿ÑÐ°Ð²ÐµÑÑÐµ Ð¿ÑÐ°Ð²ÑÐ»ÑÐ½Ð°ÑÑÑ Ð½Ð°Ð¿ÑÑÐ°Ð½Ð½Ñ. ÐÐ°Ð³ÑÑÐ¼Ð° ÑÐ¿Ð°ÑÑÐ»ÐºÐ°, Ð¿Ð° ÑÐºÐ¾Ð¹ Ð²Ñ Ð´Ð°ÑÐ»Ñ, Ð½ÑÑÐ»ÑÑÐ½Ð°Ñ."
     trace_form:
       upload_gpx: "ÐÐ°ÑÑÐ³Ð½ÑÑÑ GPX-ÑÐ°Ð¹Ð»"
       description: "ÐÐ¿ÑÑÐ°Ð½Ð½Ðµ"
@@ -463,6 +575,7 @@ be:
       public: "ÐÑÐ±Ð»ÑÑÐ½Ñ?"
       upload_button: "ÐÐ°ÑÑÐ³Ð½ÑÑÑ"
       help: "ÐÐ°Ð¿Ð°Ð¼Ð¾Ð³Ð°"
+      help_url: "http://wiki.openstreetmap.org/wiki/RU:Upload"
     trace_header:
       see_just_your_traces: "ÐÐ°ÑÑÑÑ ÑÐ¾Ð»ÑÐºÑ ÑÐ²Ð°Ðµ ÑÑÑÐºÑ, ÑÑ Ð´Ð°Ð´Ð°ÑÑ ÑÑÑÐº"
       see_all_traces: "ÐÐ°ÑÑÑÑ ÑÑÐµ ÑÑÑÐºÑ"
@@ -486,7 +599,7 @@ be:
       make_public: "ÐÑÐ°Ð±ÑÑÑ Ð³ÑÑÑ ÑÑÑÐº Ð°Ð³ÑÐ»ÑÐ½Ð°Ð´Ð°ÑÑÑÐ¿Ð½ÑÐ¼ Ð½Ð°Ð·Ð°ÑÑÑÐ´Ñ"
       edit_track: "ÐÐ¼ÑÐ½ÑÑÑ Ð±ÑÐ³ÑÑÑ ÑÑÑÐº"
       delete_track: "ÐÑÐ´Ð°Ð»ÑÑÑ Ð³ÑÑÑ ÑÑÑÐº"
-      heading: "ÐÑÐ°Ð³Ð»ÑÐ´ ÑÑÑÐºÑ {{name}}"
+      viewing_trace: "ÐÑÐ°Ð³Ð»ÑÐ´ ÑÑÑÐºÑ {{name}}"
       trace_not_found: "Ð¢ÑÑÐº Ð½Ðµ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ!"
     trace_paging_nav:
       showing: "ÐÑÐ°Ð³Ð»ÑÐ´ ÑÑÐ°ÑÐ¾Ð½ÐºÑ"
@@ -502,7 +615,7 @@ be:
       edit_map: "ÐÐ¼ÑÐ½ÑÑÑ ÐºÐ°ÑÑÑ"
       public: "ÐÐ£ÐÐÐÐ§ÐÐ«"
       private: "ÐÐ Ð«ÐÐÐ¢ÐÐ«"
-      by: " "
+      by: "Ð· Ð´Ð°Ð¿Ð°Ð¼Ð¾Ð³Ð°Ð¹"
       in: "Ñ"
       map: "ÐºÐ°ÑÑÐ°"
     list:
@@ -553,6 +666,8 @@ be:
       signup: ÐÐ°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°ÑÑÐ°
       flash create success message: "ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº Ð¿Ð°ÑÐ¿ÑÑÐ¾Ð²Ð° ÑÑÐ²Ð¾ÑÐ°Ð½Ñ. ÐÑÐ°Ð²ÐµÑÑÐµ ÑÐ²Ð°Ñ Ð¿Ð°ÑÑÐ¾Ð²ÑÑ ÑÐºÑÑÐ½Ñ - Ñ ÑÐ¹ Ð¿Ð°Ð²ÑÑÐ½ÐµÐ½ Ð±ÑÑÑ ÐºÐ¾Ð´ Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½Ñ, Ñ Ð²Ñ Ð·Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿Ð°ÑÐ°ÑÑ Ð¼Ð°Ð»ÑÐ²Ð°ÑÑ Ð½Ð°Ð²Ð°Ñ Ð·Ð°ÑÐ°Ð·! :-)<br /><br />ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð·Ð°ÑÐ²Ð°Ð¶ÑÐµ, ÑÑÐ¾ Ð²Ñ Ð½Ðµ Ð¼Ð¾Ð¶Ð°ÑÐµ ÑÐ²Ð°Ð¹ÑÑÑ, Ð¿Ð°ÐºÑÐ»Ñ Ð²Ñ Ð½Ðµ Ð¿Ð°ÑÐ²ÐµÑÐ´Ð·ÑÐ»Ñ ÑÐ²Ð¾Ð¹ Ð¿Ð°ÑÑÐ¾Ð²Ñ Ð°Ð´ÑÐ°Ñ.<br /><br />ÐÐ°Ð»Ñ Ð²Ñ ÐºÐ°ÑÑÑÑÐ°ÐµÑÐµÑÑ ÑÑÐ¿ÑÐ°ÑÑÑÐ¿Ð°Ð¼Ð°Ð²Ð°Ð¹ ÑÑÑÑÑÐ¼Ð°Ð¹, ÑÐºÐ°Ñ ÑÐ°ÑÑÑÐ»Ð°Ðµ Ð·Ð°Ð¿ÑÑÑ Ð½Ð° Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½Ðµ, ÐºÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, ÑÐ½ÑÑÑÑÐµ Ñ Ð±ÐµÐ»Ñ ÑÐ¿ÑÑ webmaster@openstreetmap.org, Ð±Ð¾ Ð¼Ñ Ð½Ðµ Ð¼Ð¾Ð¶Ð°Ð¼ Ð°Ð´ÐºÐ°Ð·Ð²Ð°ÑÑ Ð½Ð° Ð·Ð°Ð¿ÑÑÑ Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½ÑÑ."
     no_such_user:
+      title: "ÐÑÐ¼Ð° ÑÐ°ÐºÐ¾Ð³Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°"
+      heading: "ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº {{user}} Ð½Ðµ ÑÑÐ½ÑÐµ"
       body: "ÐÑÐ°Ð±Ð°ÑÑÐµ, ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº {{user}} Ð½Ðµ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ. Please check your spelling, ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿ÑÐ°Ð²ÐµÑÑÐµ ÑÐ²Ð¾Ð¹ Ð¿ÑÐ°Ð²Ð°Ð¿ÑÑ, ÑÑ, Ð¼Ð°Ð³ÑÑÐ¼Ð°, Ð²Ð°Ð¼ Ð´Ð°Ð»Ñ Ð½ÑÐ¿ÑÐ°Ð²ÑÐ»ÑÐ½ÑÑ ÑÐ¿Ð°ÑÑÐ»ÐºÑ."
     view:
       my diary: Ð¼Ð¾Ð¹ Ð´Ð·ÑÐ½Ð½ÑÐº