X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b653ace377aa47d2b0eba08e5c6f0dcd7622f00b..6ac776d733e065591d5683adad6f4c67e7b96df6:/config/locales/ru.yml?ds=sidebyside

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index a00b30291..81af04309 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -19,9 +19,9 @@ ru:
       old_relation: "Ð¡ÑÐ°ÑÐ¾Ðµ ÐÑÐ½Ð¾ÑÐµÐ½Ð¸Ðµ"
       old_relation_member: "Ð¡ÑÐ°ÑÑÐ¹ ÑÑÐ°ÑÑÐ½Ð¸Ðº Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ñ"
       old_relation_tag: "Ð¡ÑÐ°ÑÑÐ¹ ÑÐµÐ³ Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ñ"
-      old_way: "Ð¡ÑÐ°ÑÑÐ¹ Ð¿ÑÑÑ"
-      old_way_node: "Ð£Ð·ÐµÐ» ÑÑÐ°ÑÐ¾Ð³Ð¾ Ð¿ÑÑÐ¸"
-      old_way_tag: "Ð¢ÐµÐ³ ÑÑÐ°ÑÐ¾Ð³Ð¾ Ð¿ÑÑÐ¸"
+      old_way: "Ð¡ÑÐ°ÑÐ°Ñ Ð»Ð¸Ð½Ð¸Ñ"
+      old_way_node: "Ð£Ð·ÐµÐ» ÑÑÐ°ÑÐ¾Ð¹ Ð»Ð¸Ð½Ð¸Ð¸"
+      old_way_tag: "Ð¢ÐµÐ³ ÑÑÐ°ÑÐ¾Ð¹ Ð»Ð¸Ð½Ð¸Ð¸"
       relation: "ÐÑÐ½Ð¾ÑÐµÐ½Ð¸Ðµ"
       relation_member: "Ð£ÑÐ°ÑÑÐ½Ð¸Ðº Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ñ"
       relation_tag: "Ð¢ÐµÐ³ Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ñ"
@@ -77,7 +77,7 @@ ru:
   browse:
     changeset:
       title: "ÐÐ°ÐºÐµÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹"
-      changeset: "ÐÐ°ÐºÐµÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹:"
+      changeset: "ÐÐ°ÐºÐµÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹: {{id}}"
       download: "ÐÐ°Ð³ÑÑÐ·Ð¸ÑÑ {{changeset_xml_link}} Ð¸Ð»Ð¸ {{osmchange_xml_link}}"
       changesetxml: "XML Ð¿Ð°ÐºÐµÑÐ° Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹"
       osmchangexml: "osmChange XML"
@@ -89,21 +89,20 @@ 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: "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:"
       version: "ÐÐµÑÑÐ¸Ñ:"
       in_changeset: "Ð¡ÐµÐ°Ð½Ñ:"
     containing_relation:
-      relation: "ÐÑÐ½Ð¾ÑÐµÐ½Ð¸Ðµ {{relation_name}}"
-      relation_as: "(Ð² ÑÐ¾Ð»Ð¸ {{relation_role}})"
+      entry: "ÐÑÐ½Ð¾ÑÐµÐ½Ð¸Ðµ {{relation_name}}"
+      entry_role: "ÐÑÐ½Ð¾ÑÐµÐ½Ð¸Ðµ {{relation_name}} (Ð² ÑÐ¾Ð»Ð¸ {{relation_role}})"
     map:
       loading: "ÐÐ°Ð³ÑÑÐ·ÐºÐ°..."
       deleted: "Ð£Ð´Ð°Ð»ÐµÐ½Ð¾"
-      view_larger_map: "ÐÐ° Ð±Ð¾Ð»ÑÑÐ¾Ð¹ ÐºÐ°ÑÑÐµ"
     node_details:
       coordinates: "ÐÐ¾Ð¾ÑÐ´Ð¸Ð½Ð°ÑÑ: "
       part_of: "ÐÑÐ¸Ð½Ð°Ð´Ð»ÐµÐ¶Ð¸Ñ Ðº:"
@@ -129,8 +128,6 @@ ru:
     relation_history:
       relation_history: "ÐÑÑÐ¾ÑÐ¸Ñ Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ñ"
       relation_history_title: "ÐÑÑÐ¾ÑÐ¸Ñ Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ñ {{relation_name}}"
-    relation_member:
-      as: "Ð² ÑÐ¾Ð»Ð¸"
     relation:
       relation: "ÐÑÐ½Ð¾ÑÐµÐ½Ð¸Ðµ"
       relation_title: "ÐÑÐ½Ð¾ÑÐµÐ½Ð¸Ðµ: {{relation_name}}"
@@ -145,26 +142,24 @@ 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: "ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð°: ÑÐ°Ð·Ð¼ÐµÑ ÐºÐ²Ð°Ð´ÑÐ°ÑÐ°"
-      must_be_smaller: "â ÑÐ»Ð¸ÑÐºÐ¾Ð¼ Ð±Ð¾Ð»ÑÑÐ¾Ð¹ (Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±ÑÑÑ Ð¼ÐµÐ½ÑÑÐµ 0.25)"
+      unable_to_load_size: "ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð°: ÑÐ°Ð·Ð¼ÐµÑ ÐºÐ²Ð°Ð´ÑÐ°ÑÐ° [[bbox_size]] ÑÐ»Ð¸ÑÐºÐ¾Ð¼ Ð±Ð¾Ð»ÑÑÐ¾Ð¹ (Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±ÑÑÑ Ð¼ÐµÐ½ÑÑÐµ {{max_bbox_size}})"
       loading: "ÐÐ°Ð³ÑÑÐ·ÐºÐ°..."
       show_history: "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð¸ÑÑÐ¾ÑÐ¸Ñ"
       wait: "ÐÐ¾Ð´Ð¾Ð¶Ð´Ð¸ÑÐµ..."
-      history_for: "ÐÑÑÐ¾ÑÐ¸Ñ"
+      history_for_feature: "ÐÑÑÐ¾ÑÐ¸Ñ [[feature]]"
       details: "ÐÐµÑÐ°Ð»Ð¸"
       private_user: "ÑÐ°ÑÑÐ½ÑÐ¹ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ"
-      edited_by: "ÐÐ·Ð¼ÐµÐ½ÐµÐ½"
-      at_timestamp: "Ð²"
+      edited_by_user_at_timestamp: "ÐÐ·Ð¼ÐµÐ½ÐµÐ½ [[user]] Ð² [[timestamp]]"
     tag_details:
       tags: "Ð¢ÐµÐ³Ð¸:"
     way_details:
       nodes: "Ð£Ð·Ð»Ñ:"
       part_of: "Ð¯Ð²Ð»ÑÐµÑÑÑ ÑÐ°ÑÑÑÑ:"
       also_part_of:
-        one: "ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ°ÐºÐ¶Ðµ ÑÐ°ÑÑÑÑ Ð¿ÑÑÐ¸ {{related_ways}}"
-        other: "ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ°ÐºÐ¶Ðµ ÑÐ°ÑÑÑÑ Ð¿ÑÑÐµÐ¹ {{related_ways}}"
+        one: "ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ°ÐºÐ¶Ðµ ÑÐ°ÑÑÑÑ Ð»Ð¸Ð½Ð¸Ð¸ {{related_ways}}"
+        other: "ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ°ÐºÐ¶Ðµ ÑÐ°ÑÑÑÑ Ð»Ð¸Ð½ÐµÐ¹ {{related_ways}}"
     way_history:
       way_history: "ÐÑÑÐ¾ÑÐ¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ Ð»Ð¸Ð½Ð¸Ð¸"
       way_history_title: "ÐÑÑÐ¾ÑÐ¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ Ð»Ð¸Ð½Ð¸Ð¸: {{way_name}}"
@@ -189,7 +184,6 @@ ru:
       show_area_box: "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð³ÑÐ°Ð½Ð¸ÑÑ ÑÐµÐ°Ð½ÑÐ°"
       big_area: "(Ð±Ð¾Ð»ÑÑÐ°Ñ)"
       view_changeset_details: "ÐÑÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð´Ð°Ð½Ð½ÑÐµ ÑÐµÐ°Ð½ÑÐ°"
-      more: "Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½ÐµÐµ"
     changesets:
       id: "ID"
       saved_at: "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¾"
@@ -251,7 +245,7 @@ ru:
     no_such_user:
       body: "Ð ÑÐ¾Ð¶Ð°Ð»ÐµÐ½Ð¸Ñ, Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ {{user}} Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½. ÐÑÐ¾Ð²ÐµÑÑÑÐµ Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾ÑÑÑ Ð²Ð²Ð¾Ð´Ð°. ÐÐ¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÑÑÐ»ÐºÐ°, Ð¿Ð¾ ÐºÐ¾ÑÐ¾ÑÐ¾Ð¹ Ð²Ñ Ð¿ÐµÑÐµÑÐ»Ð¸, Ð½ÐµÐ²ÐµÑÐ½Ð°."
     diary_entry:
-      posted_by: "ÐÐ¿ÑÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°Ð½Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¼ {{link_user}} Ð² {{created}}, ÑÐ·ÑÐº Ð·Ð°Ð¿Ð¸ÑÐ¸ â {{language}}"
+      posted_by: "ÐÐ¿ÑÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°Ð½Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¼ {{link_user}} Ð² {{created}}, ÑÐ·ÑÐº Ð·Ð°Ð¿Ð¸ÑÐ¸ â {{language_link}}"
       comment_link: ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ¸ÑÐ¾Ð²Ð°ÑÑ
       reply_link: ÐÑÐ²ÐµÑÐ¸ÑÑ
       comment_count:
@@ -292,13 +286,20 @@ ru:
       add_marker: "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð¼Ð°ÑÐºÐµÑ Ð½Ð° ÐºÐ°ÑÑÑ"
       view_larger_map: "ÐÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð±Ð¾&#769;Ð»ÑÑÑÑ ÐºÐ°ÑÑÑ"
   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:
     welcome_user: "ÐÐ¾Ð±ÑÐ¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°ÑÑ, {{user_link}}"
-    inbox: "Ð²ÑÐ¾Ð´ÑÑÐ¸Ðµ ({{size}})"
+    home: "Ð´Ð¾Ð¼Ð¾Ð¹"
+    inbox: "Ð²ÑÐ¾Ð´ÑÑÐ¸Ðµ ({{count}})"
     logout: Ð²ÑÐ¹ÑÐ¸
     log_in: Ð²Ð¾Ð¹ÑÐ¸
     sign_up: ÑÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸Ñ
@@ -355,7 +356,7 @@ ru:
       video_to_openstreetmap: "Ð¾Ð·Ð½Ð°ÐºÐ¾Ð¼Ð¸ÑÐµÐ»ÑÐ½Ð¾Ðµ Ð²Ð¸Ð´ÐµÐ¾ Ð¾Ð± OpenStreetMap"
       more_videos: "ÐÐ¾ÑÐ¼Ð¾ÑÑÐ¸ÑÐµ {{more_videos_link}}."
       more_videos_here: "Ð±Ð¾Ð»ÑÑÐµ Ð²Ð¸Ð´ÐµÐ¾ Ð·Ð´ÐµÑÑ"
-      get_reading: 'Ð£Ð·Ð½Ð°Ð¹ÑÐµ Ð±Ð¾Ð»ÑÑÐµ Ð¾Ð± OpenStreetMap Ð² <a href="http://wiki.openstreetmap.org/wiki/Ru:Beginners_Guide">ÐÐ¸ÐºÐ¸</p> Ð¸Ð»Ð¸ Ð½Ð° <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/Ru:Beginners_Guide">ÐÐ¸ÐºÐ¸</a> Ð¸Ð»Ð¸ Ð½Ð° <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=Ru:Main_Page">Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑÑÑ Ð½Ð° ÐÐ¸ÐºÐ¸ OpenStreetMap</a>.'
       user_wiki_page: 'Ð ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑÐµÑÑÑ ÑÐ¾Ð·Ð´Ð°ÑÑ ÑÐ²Ð¾Ñ ÑÑÑÐ°Ð½Ð¸ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ, Ð²ÐºÐ»ÑÑÐ¸Ð² Ð² Ð½ÐµÑ ÑÐµÐ³ ÐºÐ°ÑÐµÐ³Ð¾ÑÐ¸Ð¸, Ð¾Ð¿Ð¸ÑÑÐ²Ð°ÑÑÐ¸Ð¹ Ð²Ð°ÑÐµ Ð¼ÐµÑÑÐ¾Ð½Ð°ÑÐ¾Ð¶Ð´ÐµÐ½Ð¸Ðµ, Ð½Ð°Ð¿ÑÐ¸Ð¼ÐµÑ: <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Moscow">[[Category:Users_in_Moscow]]</a>.'
       current_user: 'Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹, Ð¾ÑÐ½Ð¾Ð²Ð°Ð½Ð½ÑÐ¹ Ð½Ð° Ð¸Ñ Ð¼ÐµÑÑÐ¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¸, Ð´Ð¾ÑÑÑÐ¿ÐµÐ½ Ð·Ð´ÐµÑÑ: <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
@@ -413,12 +414,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}}."
@@ -435,7 +438,6 @@ ru:
       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: "ÐÐµÐ³ÐµÐ½Ð´Ð°"
@@ -485,7 +487,7 @@ ru:
       make_public: "Ð¡Ð´ÐµÐ»Ð°ÑÑ ÑÑÐ¾Ñ ÑÑÐµÐº Ð¿ÑÐ±Ð»Ð¸ÑÐ½ÑÐ¼ Ð±ÐµÑÑÑÐ¾ÑÐ½Ð¾"
       edit_track: "Ð ÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°ÑÑ ÑÐ²Ð¾Ð¹ÑÑÐ²Ð°"
       delete_track: "Ð£Ð´Ð°Ð»Ð¸ÑÑ ÑÑÐµÐº"
-      viewing_trace: "ÐÑÐ¾ÑÐ¼Ð¾ÑÑ ÑÑÐµÐºÐ° {{name}}"
+      heading: "ÐÑÐ¾ÑÐ¼Ð¾ÑÑ ÑÑÐµÐºÐ° {{name}}"
       trace_not_found: "Ð¢ÑÐµÐº Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½!"
     trace_paging_nav:
       showing: "Ð¡ÑÑÐ°Ð½Ð¸ÑÐ°"
@@ -578,7 +580,7 @@ ru:
       settings_link_text: Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸
       your friends: ÐÐ°ÑÐ¸ Ð´ÑÑÐ·ÑÑ
       no friends: ÐÑ Ð½Ðµ Ð´Ð¾Ð±Ð°Ð²Ð¸Ð»Ð¸ ÐµÑÑ Ð½Ð¸ Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð´ÑÑÐ³Ð°.
-      km away: "{{distance}} ÐºÐ¼. Ð¾Ñ Ð²Ð°Ñ"
+      km away: "{{count}} ÐºÐ¼. Ð¾Ñ Ð²Ð°Ñ"
       nearby users: "ÐÐ»Ð¸Ð¶Ð°Ð¹ÑÐ¸Ðµ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ð¸: "
       no nearby users: "ÐÐ¾Ð±Ð»Ð¸Ð·Ð¾ÑÑÐ¸ Ð¿Ð¾ÐºÐ° Ð½ÐµÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹, Ð·Ð°Ð½Ð¸Ð¼Ð°ÑÑÐ¸ÑÑÑ ÑÐ¾ÑÑÐ°Ð²Ð»ÐµÐ½Ð¸ÐµÐ¼ ÐºÐ°ÑÑÑ."
       change your settings: Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸