From c55c6ae48c3f90ce9d2eb075c6e417ea025ad809 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <siebrand@kitano.nl>
Date: Tue, 17 Jun 2014 11:55:45 +0000
Subject: [PATCH] Localisation updates from https://translatewiki.net.

---
 config/locales/be.yml    | 587 +++++++++++++++++++++++++++++++++------
 config/locales/de.yml    |   5 +-
 config/locales/diq.yml   |  22 +-
 config/locales/el.yml    |  12 +-
 config/locales/fi.yml    |   2 +-
 config/locales/fur.yml   |  26 +-
 config/locales/hr.yml    |   2 +
 config/locales/hu.yml    |   3 +
 config/locales/id.yml    | 170 ++++++++++--
 config/locales/it.yml    |   3 +-
 config/locales/ja.yml    |  12 +-
 config/locales/lb.yml    |  16 +-
 config/locales/mk.yml    |  14 +-
 config/locales/ms.yml    |   3 +-
 config/locales/nb.yml    |  41 ++-
 config/locales/pl.yml    |   4 +-
 config/locales/pt.yml    |  19 +-
 config/locales/sl.yml    |  24 ++
 config/locales/sq.yml    |  36 ++-
 config/locales/te.yml    |   7 +
 config/locales/tl.yml    |   2 +-
 config/locales/tr.yml    |   8 +
 config/locales/vi.yml    |   2 +-
 config/locales/zh-CN.yml | 179 ++++++------
 24 files changed, 944 insertions(+), 255 deletions(-)
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 999444e18..4977359e9 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -8,10 +8,17 @@
 # Author: Ð§Ð°ÑÐ¾Ð²ÑÑ Ð£Ð»Ð°Ð´Ð·ÑÑÐ»Ð°Ñ
 be: 
   about_page: 
+    community_driven_html: "Ð¡ÑÐ¿Ð¾Ð»ÑÐ½Ð°ÑÑÑ OpenStreetMap - ÑÐ°Ð·Ð½Ð°ÑÑÐ°Ð¹Ð½Ð°Ñ, Ð·Ð°ÑÑÑÐ°Ñ Ñ ÑÑÐ¾Ð´Ð½Ñ ÑÐ°ÑÑÐµ. Ð¡ÑÑÐ¾Ð´ Ð½Ð°ÑÑÑ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÐ°Ñ ÑÑÑÑ ÐºÐ°ÑÑÐ¾Ð³ÑÐ°ÑÑ ÑÐ½ÑÑÐ·ÑÑÑÑÑ Ñ Ð¿ÑÐ°ÑÐµÑÑÑÐ½Ð°Ð»Ñ, ÑÐ½Ð¶ÑÐ½ÐµÑÑ ÑÐºÑÑ Ð¿Ð°Ð´ÑÑÑÐ¼Ð»ÑÐ²Ð°ÑÑÑ ÑÐµÑÐ²ÐµÑÑ OSM, ÑÐ¿ÐµÑÑÑÐ»ÑÑÑÑ, ÑÐºÑÑ Ð· Ð³ÑÐ¼Ð°Ð½ÑÑÑÑÑÐ½ÑÑ Ð¿ÑÑÑÑÐ½, Ð´Ð°Ð¿Ð°Ð¼Ð°Ð³Ð°ÑÑÑ Ñ ÐºÐ°ÑÑÐ°Ð³ÑÐ°ÑÐ°Ð²Ð°Ð½Ð½Ñ ÑÐ°ÑÐ½Ð°Ñ, Ð¿Ð°ÑÑÑÐ¿ÐµÐ»ÑÑ Ð°Ð´ ÑÑÑÑÑÐ¹Ð½Ð°Ð³Ð° Ð±ÐµÐ´ÑÑÐ²Ð°, Ñ Ð¼Ð½Ð¾Ð³ÑÑ ÑÐ½ÑÑÑ.\nÐÐ°Ð± Ð´Ð°Ð²ÐµÐ´Ð°ÑÑÐ° Ð±Ð¾Ð»ÑÑ Ð¿ÑÐ° ÑÑÐ¿Ð¾Ð»ÑÐ½Ð°ÑÑÑ, Ð¿Ð°Ð³Ð»ÑÐ´Ð·ÑÑÐµ <a href='%{diary_path}'>Ð´Ð·ÑÐ½Ð½ÑÐºÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ</a>,\n<a href='http://blogs.openstreetmap.org/'>Ð±Ð»Ð¾Ð³Ñ ÑÑÐ¿Ð¾Ð»ÑÐ½Ð°ÑÑÑ</a> Ñ ÑÐ°Ð¹Ñ <a href='http://www.osmfoundation.org/'>ÑÐ¾Ð½Ð´Ñ OSM</a>."
+    community_driven_title: Ð Ð°Ð·Ð²ÑÐ²ÑÐ°ÐµÑÑÐ° ÑÑÐ¿Ð¾Ð»ÑÐ½Ð°ÑÑÑ
     copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
+    lede_text: OpenStreetMap ÑÑÐ²Ð¾ÑÐ°Ð½Ñ ÑÑÐ¿Ð¾Ð»ÑÐ½Ð°ÑÑÑ ÐºÐ°ÑÑÐ¾Ð³ÑÐ°ÑÐ°Ñ, ÑÐºÑÑ Ð´Ð°Ð´Ð°ÑÑÑ Ñ Ð¿Ð°Ð´ÑÑÑÐ¼Ð»ÑÐ²Ð°ÑÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ Ð°Ð± Ð´Ð°ÑÐ¾Ð³Ð°Ñ, ÑÑÐµÐ¶ÐºÐ°Ñ, ÐºÐ°ÑÑ, Ð²Ð°ÐºÐ·Ð°Ð»Ð°Ñ Ñ Ð¼Ð½Ð¾Ð³ÑÑ ÑÐ½ÑÑÑ Ð°Ð±'ÐµÐºÑÐ°Ñ Ð¿Ð° ÑÑÑÐ¼ ÑÐ²ÐµÑÐµ.
+    local_knowledge_html: OpenStreetMap Ð½Ð°Ð´Ð°Ðµ Ð°ÑÐ°Ð±Ð»ÑÐ²Ð°Ðµ Ð·Ð½Ð°ÑÑÐ½Ð½Ðµ Ð²ÐµÐ´Ð°Ð½Ð½Ñ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ. Ð£Ð´Ð·ÐµÐ»ÑÐ½ÑÐºÑ Ð²ÑÐºÐ°ÑÑÑÑÐ¾ÑÐ²Ð°ÑÑÑ Ð°ÑÑÐ°ÑÐ¾ÑÐ°Ð·Ð´ÑÐ¼ÐºÑ, GPS-Ð¿ÑÑÐ»Ð°Ð´Ñ Ñ Ð½ÑÐ·ÐºÐ°ÑÑÑÐ½Ð°Ð»Ð°Ð³ÑÑÐ½ÑÑ Ð¿Ð°Ð»ÑÐ²ÑÑ ÐºÐ°ÑÑÑ Ð´Ð»Ñ Ð¿ÑÐ°Ð²ÐµÑÐºÑ ÑÐ°Ð³Ð¾, ÑÑÐ¾ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ OSM Ð·'ÑÑÐ»ÑÑÑÑÐ° Ð´Ð°ÐºÐ»Ð°Ð´Ð½ÑÐ¼Ñ Ñ Ð°ÐºÑÑÐ°Ð»ÑÐ½ÑÐ¼Ñ.
+    local_knowledge_title: ÐÐµÐ´Ð°Ð½Ð½Ðµ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ
     next: ÐÐ°Ð»ÐµÐ¹
+    open_data_html: "OpenStreetMap - Ð³ÑÑÐ° <i>Ð°Ð´ÐºÑÑÑÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ</i>: Ð²Ñ Ð¼Ð¾Ð¶Ð°ÑÐµ ÑÐ²Ð°Ð±Ð¾Ð´Ð½Ð° Ð²ÑÐºÐ°ÑÑÑÑÐ¾ÑÐ²Ð°ÑÑ ÑÑ Ð´Ð»Ñ Ð»ÑÐ±ÑÑ Ð¼ÑÑÐ°Ñ Ð´Ð° ÑÑÑ ÑÐ°ÑÐ¾Ñ, Ð¿Ð°ÐºÑÐ»Ñ Ð²Ñ ÑÐ¿Ð°ÑÑÐ»Ð°ÐµÑÐµÑÑ Ð½Ð° OpenStreetMap Ñ ÑÐ³Ð¾ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÐ°Ñ. ÐÑÑ Ð·Ð¼ÐµÐ½Ðµ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ Ð°Ð±Ð¾ Ð²ÑÐºÐ°ÑÑÑÑÐ°Ð½Ð½Ñ Ñ  ÑÐºÐ°ÑÑÑ Ð°ÑÐ½Ð¾Ð²Ñ Ð´Ð»Ñ Ð½Ð¾Ð²ÑÑ Ð¿ÑÐ°Ð´ÑÐºÑÐ°Ñ, Ð²Ñ Ð¼Ð¾Ð¶Ð°ÑÐµ ÑÐ°ÑÐ¿Ð°ÑÑÑÐ´Ð¶Ð²Ð°ÑÑ Ð²ÑÐ½ÑÐº ÑÐ¾Ð»ÑÐºÑ Ð¿Ð° ÑÐ¾Ð¹ Ð¶Ð° Ð»ÑÑÑÐ½Ð·ÑÑ. ÐÐ»ÑÐ´Ð·ÑÑÐµ ÑÑÐ°ÑÐ¾Ð½ÐºÑ <a href='%{copyright_path}'>Ð°ÑÑÐ°ÑÑÐºÑÑ Ð¿ÑÐ°Ð²Ñ Ñ \nÐ»ÑÑÑÐ½Ð·ÑÑ</a>, ÐºÐ°Ð± Ð°ÑÑÑÐ¼Ð°ÑÑ Ð¿Ð°Ð´ÑÐ°Ð±ÑÐ·Ð½ÑÑ ÑÐ½ÑÐ°ÑÐ¼Ð°ÑÑÑ."
     open_data_title: ÐÐ´ÐºÑÑÑÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ
     partners_title: ÐÐ°ÑÑÐ½ÑÑÑ
+    used_by: "%{name} Ð·Ð°Ð±ÑÑÐ¿ÐµÑÐ²Ð°Ðµ ÐºÐ°ÑÑÐ°Ð³ÑÐ°ÑÑÑÐ½ÑÐ¼Ñ Ð´Ð°Ð´Ð·ÐµÐ½ÑÐ¼Ñ ÑÐ¾ÑÐ½Ñ ÑÐ°Ð¹ÑÐ°Ñ, Ð¼Ð°Ð±ÑÐ»ÑÐ½ÑÑ Ð¿ÑÐ°Ð³ÑÐ°Ð¼ Ñ Ð¿ÑÑÑÑÐ°ÑÐ°Ð²Ð°Ð½Ð½ÑÑ"
   activerecord: 
     attributes: 
       diary_comment: 
@@ -37,7 +44,7 @@ be:
         name: ÐÐ°Ð·Ð²Ð°
         public: ÐÑÐ±Ð»ÑÑÐ½Ñ
         size: ÐÐ°Ð¼ÐµÑ
-        user: Ð¡ÑÐ±Ð°Ñ
+        user: ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº
         visible: ÐÐ°ÑÐ½Ñ
       user: 
         active: ÐÐºÑÑÑÐ½Ñ
@@ -49,7 +56,7 @@ be:
     models: 
       acl: Ð¡Ð¿ÑÑ Ð¿ÑÐ°Ð²Ð¾Ñ Ð´Ð¾ÑÑÑÐ¿Ñ
       changeset: ÐÐ°Ð±Ð¾Ñ Ð·Ð¼ÐµÐ½
-      changeset_tag: Ð¦ÑÑÐ»ÑÐº Ð½Ð°Ð±Ð¾ÑÑ Ð·Ð¼ÐµÐ½
+      changeset_tag: Ð¢ÑÐ³ Ð½Ð°Ð±Ð¾ÑÑ Ð·Ð¼ÐµÐ½
       country: ÐÑÐ°ÑÐ½Ð°
       diary_comment: ÐÐ°Ð¼ÐµÐ½ÑÐ°Ñ Ð´Ð·ÑÐ½Ð½ÑÐºÐ°
       diary_entry: ÐÐ°Ð¿ÑÑ Ð´Ð·ÑÐ½Ð½ÑÐºÐ°
@@ -57,32 +64,37 @@ be:
       language: ÐÐ¾Ð²Ð°
       message: ÐÐ°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ
       node: ÐÑÐ·ÐµÐ»
-      node_tag: Ð¦ÑÑÐ»ÑÐº Ð²ÑÐ·Ð»Ð°
+      node_tag: Ð¢ÑÐ³ Ð²ÑÐ·Ð»Ð°
       notifier: ÐÐ±Ð²ÑÑÑÑÐ½Ð½Ðµ
       old_node: Ð¡ÑÐ°ÑÑ Ð²ÑÐ·ÐµÐ»
-      old_node_tag: Ð¡ÑÐ°ÑÑ ÑÑÑÐ»ÑÐº Ð²ÑÐ·Ð»Ð°
+      old_node_tag: Ð¡ÑÐ°ÑÑ ÑÑÐ³ Ð²ÑÐ·Ð»Ð°
       old_relation: Ð¡ÑÐ°ÑÐ°Ñ ÑÑÐ²ÑÐ·Ñ
       old_relation_member: Ð¡ÑÐ°ÑÑ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐº ÑÑÐ²ÑÐ·Ñ
-      old_relation_tag: Ð¡ÑÐ°ÑÑ ÑÑÑÐ»ÑÐº ÑÑÐ²ÑÐ·Ñ
+      old_relation_tag: Ð¡ÑÐ°ÑÑ ÑÑÐ³ ÑÑÐ²ÑÐ·Ñ
       old_way: Ð¡ÑÐ°ÑÐ°Ñ ÐºÑÑÐ²Ð°Ñ
       old_way_node: Ð¡ÑÐ°ÑÑ Ð²ÑÐ·ÐµÐ» ÑÐ»ÑÑÑ
-      old_way_tag: Ð¦ÑÑÐ»ÑÐº ÑÑÐ°ÑÐ¾Ð¹ ÐºÑÑÐ²Ð¾Ð¹
+      old_way_tag: Ð¡ÑÐ°ÑÑ ÑÑÐ³ ÐºÑÑÐ²Ð¾Ð¹
       relation: Ð¡ÑÐ²ÑÐ·Ñ
       relation_member: Ð£Ð´Ð·ÐµÐ»ÑÐ½ÑÐº ÑÑÐ²ÑÐ·Ñ
-      relation_tag: Ð¦ÑÑÐ»ÑÐº ÑÑÐ²ÑÐ·Ñ
+      relation_tag: Ð¢ÑÐ³ ÑÑÐ²ÑÐ·Ñ
       session: Ð¡ÐµÐ°Ð½Ñ
-      trace: Ð¢ÑÑÐº
-      tracepoint: ÐÑÐ½ÐºÑ ÑÑÑÐºÑ
-      tracetag: Ð¦ÑÑÐ»ÑÐº ÑÑÑÐºÑ
+      trace: Ð¡Ð»ÐµÐ´
+      tracepoint: ÐÑÐ¾Ð¿ÐºÐ° ÑÐ»ÐµÐ´Ñ
+      tracetag: Ð¢ÑÐ³ ÑÐ»ÐµÐ´Ñ
       user: ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº
-      user_preference: ÐÐ°ÑÑÐ°ÑÐ»ÐµÐ½Ð½Ðµ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°
-      user_token: ÐÐ´Ð¼ÐµÑÐºÐ° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°
+      user_preference: ÐÐ°Ð»Ð°Ð´Ñ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°
+      user_token: Ð¢Ð¾ÐºÐµÐ½ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°
       way: ÐÑÑÐ²Ð°Ñ
       way_node: ÐÑÐ·ÐµÐ» ÑÐ»ÑÑÑ
-      way_tag: Ð¦ÑÑÐ»ÑÐº ÐºÑÑÐ²Ð¾Ð¹
+      way_tag: Ð¢ÑÐ³ ÐºÑÑÐ²Ð¾Ð¹
   application: 
+    require_cookies: 
+      cookies_needed: ÐÐ´Ð°ÐµÑÑÐ°, ÑÑÐ¾ Ñ ÐÐ° Ð·Ð°Ð±Ð°ÑÐ¾Ð½ÐµÐ½ÑÑ cookies. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð´Ð°Ð·Ð²Ð¾Ð»ÑÑÐµ ÑÑ Ñ ÐÐ°ÑÑÐ¼ Ð±ÑÐ°ÑÐ·ÐµÑÑ Ð¿ÐµÑÐ°Ð´ ÑÑÐ¼, ÑÐº Ð¿ÑÐ°ÑÑÐ³Ð²Ð°ÑÑ.
     require_moderator: 
       not_a_moderator: ÐÐ°Ð¼ Ð½ÐµÐ°Ð±ÑÐ¾Ð´Ð½Ð° Ð±ÑÑÑ Ð¼Ð°Ð´ÑÑÐ°ÑÐ°ÑÐ°Ð¼ Ð´Ð»Ñ Ð²ÑÐºÐ°Ð½Ð°Ð½Ð½Ñ Ð³ÑÑÐ°Ð³Ð° Ð´Ð·ÐµÑÐ½Ð½Ñ.
+    setup_user_auth: 
+      blocked: ÐÐ°Ñ Ð´Ð¾ÑÑÑÐ¿ Ð´Ð° API Ð±ÑÑ Ð·Ð°Ð±Ð»Ð°ÐºÐ°Ð²Ð°Ð½Ñ. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, ÑÐ²Ð°Ð¹Ð´Ð·ÑÑÐµ Ñ Ð²ÑÐ±-ÑÐ½ÑÑÑÑÐµÐ¹Ñ, ÐºÐ°Ð± Ð´Ð°Ð²ÐµÐ´Ð°ÑÑÐ° Ð±Ð¾Ð»ÑÑ.
+      need_to_see_terms: ÐÐ°Ñ Ð´Ð¾ÑÑÑÐ¿ Ð´Ð° API ÑÐ°ÑÐ¾Ð²Ð° Ð¿ÑÑÐ¿ÑÐ½ÐµÐ½Ñ. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, ÑÐ²Ð°Ð¹Ð´Ð·ÑÑÐµ Ñ Ð²ÑÐ±-ÑÐ½ÑÑÑÑÐµÐ¹Ñ Ð´Ð»Ñ Ð¿ÑÐ°Ð³Ð»ÑÐ´Ñ ÑÐ¼Ð¾Ñ ÑÐ´Ð·ÐµÐ»Ñ. ÐÑ Ð½Ðµ Ð°Ð±Ð°Ð²ÑÐ·Ð°Ð½Ñ Ð¿Ð°Ð³Ð°Ð´Ð¶Ð°ÑÑÐ°, Ð°Ð»Ðµ Ð²Ð°Ð¼ Ð²Ð°ÑÑÐ° Ð¿ÑÐ°Ð³Ð»ÑÐ´Ð·ÐµÑÑ ÑÑ.
   browse: 
     anonymous: Ð°Ð½Ð°Ð½ÑÐ¼Ð½Ñ
     changeset: 
@@ -126,6 +138,7 @@ be:
         way: ÐºÑÑÐ²Ð°Ñ
     note: 
       closed_by: ÐÑÑÐ°ÑÐ°Ð½Ð° %{user} <abbr title='%{exact_time}'>%{when} ÑÐ°Ð¼Ñ</abbr>
+      closed_by_anonymous: ÐÑÑÐ°ÑÐ°Ð½Ð° Ð°Ð½Ð°Ð½ÑÐ¼Ð½ÑÐ¼ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ð¼ <abbr title='%{exact_time}'>%{when} ÑÐ°Ð¼Ñ</abbr>
       closed_title: "ÐÑÑÐ°ÑÐ°Ð½Ð°Ñ Ð·Ð°ÑÐ²Ð°Ð³Ð° #%{note_name}"
       commented_by: ÐÐ°Ð¼ÐµÐ½ÑÐ°Ñ Ð°Ð´ %{user} <abbr title='%{exact_time}'>%{when} ÑÐ°Ð¼Ñ</abbr>
       commented_by_anonymous: ÐÐ½Ð°Ð½ÑÐ½Ð¼Ñ ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ñ <abbr title='%{exact_time}'>%{when} ÑÐ°Ð¼Ñ</abbr>
@@ -133,11 +146,15 @@ be:
       hidden_by: Ð¡ÑÐ°Ð²Ð°Ð½Ð° %{user} <abbr title='%{exact_time}'>%{when} ÑÐ°Ð¼Ñ</abbr>
       hidden_title: "Ð¡ÑÐ°Ð²Ð°Ð½Ð°Ñ Ð·Ð°ÑÐ²Ð°Ð³Ð° #%{note_name}"
       new_note: ÐÐ¾Ð²Ð°Ñ Ð·Ð°ÑÐ²Ð°Ð³Ð°
+      open_by: Ð¡ÑÐ²Ð¾ÑÐ°Ð½Ð° %{user} <abbr title='%{exact_time}'>%{when} ÑÐ°Ð¼Ñ</abbr>
+      open_by_anonymous: Ð¡ÑÐ²Ð¾ÑÐ°Ð½Ð° Ð°Ð½Ð°Ð½ÑÐ¼Ð½ÑÐ¼ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ð¼ <abbr title='%{exact_time}'>%{when} ÑÐ°Ð¼Ñ</abbr>
       open_title: "ÐÑÐ²ÑÑÐ°ÑÐ°Ð½Ð°Ñ Ð·Ð°ÑÐ²Ð°Ð³Ð° #%{note_name}"
       reopened_by: ÐÐ°ÑÑÐ¾ÑÐ½Ð° Ð°ÐºÑÑÐ²Ð°Ð²Ð°Ð½Ð° %{user} <abbr title='%{exact_time}'>%{when} ÑÐ°Ð¼Ñ</abbr>
+      reopened_by_anonymous: ÐÐµÑÐ°Ð°Ð´ÐºÑÑÑÐ° Ð°Ð½Ð°Ð½ÑÐ¼Ð½ÑÐ¼ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ð¼ <abbr title='%{exact_time}'>%{when} ÑÐ°Ð¼Ñ</abbr>
       title: "ÐÐ°ÑÐ²Ð°Ð³Ð°: %{id}"
     part_of: Ð§Ð°ÑÑÐºÐ°
     redacted: 
+      message_html: ÐÐµÑÑÑÑ %{version} Ð³ÑÑÐ°Ð³Ð° %{type} Ð½Ðµ Ð¼Ð¾Ð¶Ð° Ð±ÑÑÑ Ð¿Ð°ÐºÐ°Ð·Ð°Ð½Ð°Ñ, Ð±Ð¾ ÑÐ½Ð° Ð±ÑÐ»Ð° Ð°Ð´ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð°Ñ. ÐÐ»ÑÐ´Ð·ÑÑÐµ %{redaction_link} Ð´Ð»Ñ Ð¿Ð°Ð´ÑÐ°Ð±ÑÐ·Ð½Ð°ÑÑÑÑ.
       redaction: Ð ÑÐ´Ð°ÐºÑÑÑ %{id}
       type: 
         node: Ð²ÑÐ·ÐµÐ»
@@ -154,15 +171,17 @@ be:
         relation: Ð¡ÑÐ²ÑÐ·Ñ
         way: ÐÑÑÐ²Ð°Ñ
     start_rjs: 
-      load_data: ÐÐ°Ð³ÑÑÐ·ÑÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ
+      feature_warning: ÐÐµÐ°Ð±ÑÐ¾Ð´Ð½Ð° Ð·Ð°Ð³ÑÑÐ·ÑÑÑ %{num_features} Ð°Ð±'ÐµÐºÑÐ°Ñ, ÑÑÐ¾ Ð¼Ð¾Ð¶Ð° Ð·Ð°Ð¿Ð°Ð²Ð¾Ð»ÑÑÑ Ð²Ð°Ñ Ð±ÑÐ°ÑÐ·ÑÑ. ÐÑ ÑÐ¿ÑÑÐ½ÐµÐ½Ñ, ÑÑÐ¾ Ð¶Ð°Ð´Ð°ÐµÑÐµ Ð¿ÑÐ°Ð³Ð»ÑÐ´Ð·ÐµÑÑ Ð³ÑÑÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ?
+      load_data: Ð¡ÑÑÐ³Ð½ÑÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ
       loading: ÐÐ°Ð³ÑÑÐ·ÐºÐ°...
     tag_details: 
-      tags: Ð¦ÑÑÐ»ÑÐºÑ
+      tags: Ð¢ÑÐ³Ñ
       wiki_link: 
         key: ÐÑÐºÑ-ÑÑÐ°ÑÐ¾Ð½ÐºÐ° Ð°Ð¿ÑÑÐ°Ð½Ð½Ñ ÑÑÐ³Ñ %{key}
         tag: ÐÑÐºÑ-ÑÑÐ°ÑÐ¾Ð½ÐºÐ° Ð°Ð¿ÑÑÐ°Ð½Ð½Ñ ÑÑÐ³Ñ %{key}=%{value}
       wikipedia_link: ÐÑÑÑÐºÑÐ» %{page} Ð½Ð° ÐÑÐºÑÐ¿ÐµÐ´ÑÑ
     timeout: 
+      sorry: ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ Ð´Ð»Ñ %{type} Ð· ÑÐ´ÑÐ½ÑÑÑÑÐºÐ°ÑÐ°ÑÐ°Ð¼ %{id} Ð·Ð°Ð½Ð°Ð´ÑÐ° Ð´Ð¾ÑÐ³ÑÑ Ð´Ð»Ñ Ð°ÑÑÑÐ¼Ð°Ð½Ð½Ñ.
       type: 
         changeset: Ð½Ð°Ð±Ð¾Ñ Ð·Ð¼ÐµÐ½
         node: Ð²ÑÐ·ÐµÐ»
@@ -172,6 +191,9 @@ be:
     view_details: ÐÑÐ°Ð³Ð»ÑÐ´ Ð·Ð²ÐµÑÑÐ°Ðº
     view_history: ÐÑÐ°Ð³Ð»ÑÐ´ Ð³ÑÑÑÐ¾ÑÑÑ
     way: 
+      also_part_of: 
+        one: Ð·'ÑÑÐ»ÑÐµÑÑÐ° ÑÐ°ÑÑÐºÐ°Ð¹ ÐºÑÑÐ²Ð¾Ð¹ %{related_ways}
+        other: Ð·'ÑÑÐ»ÑÐµÑÑÐ° ÑÐ°ÑÑÐºÐ°Ð¹ ÐºÑÑÐ²ÑÑ % {related_ways}
       history_title: "ÐÑÑÑÐ¾ÑÑÑ ÑÐ»ÑÑÑ: %{name}"
       nodes: ÐÑÐ·Ð»Ñ
       title: "ÐÑÑÐ²Ð°Ñ: %{name}"
@@ -192,12 +214,18 @@ be:
       user: ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº
     list: 
       empty: ÐÐ¼ÐµÐ½Ñ Ð½Ðµ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ.
+      empty_area: ÐÑÐ¼Ð° Ð·Ð¼ÐµÐ½Ð°Ñ Ñ Ð³ÑÑÑÐ¼ ÑÑÐ³ÑÑÐ½Ðµ.
+      empty_user: ÐÑÐ¼Ð° Ð·Ð¼ÐµÐ½Ð°Ñ Ð°Ð´ Ð³ÑÑÐ°Ð³Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°.
       load_more: ÐÐ°Ð³ÑÑÐ·ÑÑÑ Ð±Ð¾Ð»ÑÑ
       no_more: ÐÐ¾Ð»ÑÑ Ð½ÑÑÐºÑÑ Ð·Ð¼ÐµÐ½Ð°Ñ Ð½Ðµ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ð°.
+      no_more_area: ÐÐ¾Ð»ÑÑ Ð½ÑÐ¼Ð° Ð·Ð¼ÐµÐ½Ð°Ñ Ñ Ð³ÑÑÑÐ¼ ÑÑÐ³ÑÑÐ½Ðµ.
+      no_more_user: ÐÐ¾Ð»ÑÑ Ð½ÑÐ¼Ð° Ð·Ð¼ÐµÐ½Ð°Ñ Ð°Ð´ Ð³ÑÑÐ°Ð³Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°.
       title: ÐÐ°Ð±Ð¾ÑÑ Ð·Ð¼ÐµÐ½Ð°Ñ
       title_friend: ÐÐ°Ð±Ð¾ÑÑ Ð·Ð¼ÐµÐ½Ð°Ñ Ð°Ð´ Ð²Ð°ÑÑÑ ÑÑÐ±ÑÐ¾Ñ
       title_nearby: ÐÐ°Ð±Ð¾ÑÑ Ð·Ð¼ÐµÐ½Ð°Ñ Ð°Ð´ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ Ð¿Ð°Ð±Ð»ÑÐ·Ñ
       title_user: ÐÐ°Ð±Ð¾Ñ Ð·Ð¼ÐµÐ½Ð°Ñ Ð°Ð´ %{user}
+    timeout: 
+      sorry: ÐÑÐ°Ð±Ð°ÑÑÐµ, ÑÐ¿ÑÑ Ð½Ð°Ð±Ð¾ÑÐ°Ñ Ð·Ð¼ÐµÐ½Ð°Ñ, ÑÐºÑ ÐÑ Ð·Ð°Ð¿ÑÑÐ°Ð»Ñ, Ð·Ð°Ð½Ð°Ð´ÑÐ° Ð²ÑÐ»ÑÐºÑ Ð´Ð»Ñ Ð°ÑÑÑÐ¼Ð°Ð½Ð½Ñ.
   diary_entry: 
     comments: 
       ago: "%{ago} ÑÐ°Ð¼Ñ"
@@ -218,9 +246,9 @@ be:
         zero: ÐÐ°Ð¼ÐµÐ½ÑÐ°ÑÐ¾Ñ Ð½ÑÐ¼Ð°
       comment_link: ÐÐ°Ð¼ÐµÐ½ÑÐ°Ð²Ð°ÑÑ Ð³ÑÑÑ Ð·Ð°Ð¿ÑÑ
       confirm: ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ
-      edit_link: ÐÐ¼ÑÐ½ÑÑÑ Ð³ÑÑÑ Ð·Ð°Ð¿ÑÑ
+      edit_link: ÐÑÐ°Ð²ÑÑÑ Ð³ÑÑÑ Ð·Ð°Ð¿ÑÑ
       hide_link: Ð¡ÑÐ°Ð²Ð°ÑÑ Ð³ÑÑÑ Ð·Ð°Ð¿ÑÑ
-      posted_by: ÐÐ°Ð¿ÑÑÐ°Ð½Ð° %{link_user} Ñ %{created} Ð½Ð° %{language_link}
+      posted_by: ÐÐ°Ð¿ÑÑÐ°Ð½Ð° %{link_user}, %{created}, %{language_link}
       reply_link: ÐÐ´ÐºÐ°Ð·Ð°ÑÑ Ð½Ð° Ð³ÑÑÑ Ð·Ð°Ð¿ÑÑ
     edit: 
       body: "Ð¦ÐµÐ»Ð°:"
@@ -231,11 +259,18 @@ be:
       marker_text: ÐÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ Ð·Ð°Ð¿ÑÑÑ Ð´Ð·ÑÐ½Ð½ÑÐºÑ
       save_button: ÐÐ°Ð¿ÑÑÐ°ÑÑ
       subject: "Ð¢ÑÐ¼Ð°:"
-      title: ÐÐ¼ÑÐ½ÑÑÑ Ð·Ð°Ð¿ÑÑ Ð´Ð·ÑÐ½Ð½ÑÐºÑ
+      title: ÐÑÐ°Ð²ÑÑÑ Ð·Ð°Ð¿ÑÑ Ñ Ð´Ð·ÑÐ½Ð½ÑÐºÑ
       use_map_link: ÐºÐ°ÑÑÑÑÐ°ÑÑÐ° ÐºÐ°ÑÑÐ°Ð¹
     feed: 
       all: 
         description: ÐÐ¿Ð¾ÑÐ½ÑÑ Ð´Ð·ÐµÐ½Ð½ÑÐºÐ°Ð²ÑÑ Ð·Ð°Ð¿ÑÑÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ OpenStreetMap
+        title: ÐÐ·ÐµÐ½Ð½ÑÐºÐ°Ð²ÑÑ Ð·Ð°Ð¿ÑÑÑ OpenStreetMap
+      language: 
+        description: ÐÐ¿Ð¾ÑÐ½ÑÑ Ð·Ð°Ð¿ÑÑÑ Ñ Ð´Ð·ÑÐ½Ð½ÑÐºÐ°Ñ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ OpenStreetMap Ð½Ð° %{language_name}
+        title: ÐÐ°Ð¿ÑÑÑ Ñ Ð´Ð·ÑÐ½Ð½ÑÐºÑ OpenStreetMap Ð½Ð° %{language_name}
+      user: 
+        description: ÐÐ¿Ð¾ÑÐ½ÑÑ Ð·Ð°Ð¿ÑÑÑ Ñ Ð´Ð·ÑÐ½Ð½ÑÐºÑ OpenStreetMap ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° %{user}
+        title: ÐÐ°Ð¿ÑÑÑ Ñ Ð´Ð·ÑÐ½Ð½ÑÐºÑ OpenStreetMap ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° %{user}
     list: 
       in_language_title: ÐÐ·ÑÐ½Ð½ÑÐº Ð·Ð°Ð¿ÑÑÐ°Ñ Ñ %{language}
       new: ÐÐ¾Ð²Ñ Ð·Ð°Ð¿ÑÑ Ð´Ð·ÑÐ½Ð½ÑÐºÑ
@@ -266,6 +301,7 @@ be:
       title: ÐÐ·ÑÐ½Ð½ÑÐº ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° | %{user}
       user_title: ÐÐ·ÑÐ½Ð½ÑÐº %{user}
   editor: 
+    default: Ð¢ÑÐ¿Ð¾Ð²Ñ (Ð·Ð°ÑÐ°Ð· %{name})
     id: 
       description: iD (Ð±ÑÐ°ÑÐ·ÑÑÐ½Ñ ÑÑÐ´Ð°ÐºÑÐ°Ñ)
       name: iD
@@ -276,6 +312,7 @@ be:
       description: Potlatch 2 (Ð±ÑÐ°ÑÐ·ÑÑÐ½Ñ ÑÑÐ´Ð°ÐºÑÐ°Ñ)
       name: Potlatch 2
     remote: 
+      description: ÐÑÑÑÐ°Ð½ÑÑÐ¹Ð½Ð°Ðµ ÐºÑÑÐ°Ð²Ð°Ð½Ð½Ðµ (JOSM Ð°Ð±Ð¾ Merkaartor)
       name: ÐÑÑÑÐ°Ð½ÑÑÐ¹Ð½Ð°Ðµ ÐºÑÑÐ°Ð²Ð°Ð½Ð½Ðµ
   export: 
     start: 
@@ -291,6 +328,7 @@ be:
       licence: ÐÑÑÑÐ½Ð·ÑÑ
       longitude: "ÐÐ°Ñ:"
       manually_select: ÐÑÐ±ÑÐ°ÑÑ ÑÐ½ÑÑÑ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ
+      map_image: ÐÑÑÐ²Ð° ÐºÐ°ÑÑÑ (Ð¿Ð°ÐºÐ°Ð·Ð²Ð°Ðµ ÑÑÐ°Ð½Ð´Ð°ÑÑÐ½Ñ ÑÐ»Ð¾Ð¹)
       max: Ð¼Ð°ÐºÑ
       options: ÐÐ°ÑÑÑÐ¾Ð¹ÐºÑ
       osm_xml_data: OpenStreetMap XML
@@ -298,13 +336,20 @@ be:
       paste_html: Ð£ÑÑÐ°Ð²ÑÑÑ HTML Ð´Ð»Ñ ÑÐ±ÑÐ´Ð¾Ð²Ñ Ñ Ð²ÑÐ±-ÑÐ°Ð¹Ñ
       scale: ÐÐ°ÑÑÐ°Ð±
       too_large: 
+        advice: "ÐÐ°Ð»Ñ ÑÐºÑÐ¿Ð°ÑÑ Ð²ÑÑÑÐ¹ Ð½Ðµ Ð°ÑÑÑÐ¼Ð°ÑÑÑ, ÑÐ¾ ÑÐ°Ð·Ð³Ð»ÐµÐ´Ð·ÑÑÐµ Ð¼Ð°Ð³ÑÑÐ¼Ð°ÑÑÑ Ð²ÑÐºÐ°ÑÑÑÑÐ°Ð½Ð½Ñ Ð°Ð´Ð½Ð¾Ð¹ Ð· Ð½Ð°ÑÑÑÐ¿Ð½ÑÑ ÐºÑÑÐ½ÑÑ:"
+        body: ÐÑÑÐ°Ñ Ð²Ð¾Ð±Ð»Ð°ÑÑÑ Ð·Ð°Ð½Ð°Ð´ÑÐ° Ð²ÑÐ»ÑÐºÐ°Ñ, ÐºÐ°Ð± Ð±ÑÑÑ ÑÐºÑÐ¿Ð°ÑÑÐ°Ð²Ð°Ð½Ð°Ñ ÑÐº OpenStreetMap XML-Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿Ð°Ð²ÑÐ»ÑÑÑÐµ Ð°Ð±Ð¾ Ð°Ð±ÑÑÑÑÐµ Ð¼ÐµÐ½ÑÑÑ Ð²Ð¾Ð±Ð»Ð°ÑÑÑ, Ð°Ð»ÑÐ±Ð¾ ÑÐºÐ°ÑÑÑÑÐ°Ð¹ÑÐµÑÑ Ð°Ð´Ð½Ð¾Ð¹ Ð· ÐºÑÑÐ½ÑÑ, Ð¿ÐµÑÐ°Ð»ÑÑÐ°Ð½ÑÑ Ð½ÑÐ¶ÑÐ¹, Ð´Ð»Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÑ Ð²ÑÐ»ÑÐºÐ°Ð³Ð° Ð°Ð±'ÐµÐ¼Ñ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ.
         geofabrik: 
-          description: ÐÐ°ÑÑÐ°ÑÐ½Ð½Ð° Ð°Ð±Ð½Ð°ÑÐ»ÑÐµÐ¼ÑÑ Ð²ÑÐ½ÑÑÐºÑ ÐºÐ°Ð½ÑÑÐ½ÐµÐ½ÑÐ°Ñ, ÐºÑÐ°ÑÐ½Ð°Ñ Ñ Ð°ÑÐ¾Ð±Ð½ÑÑ Ð³Ð°ÑÐ°Ð´Ð¾Ñ
+          description: Ð ÑÐ³ÑÐ»ÑÑÐ½Ð° Ð°Ð±Ð½Ð°ÑÐ»ÑÐµÐ¼ÑÑ Ð²ÑÐ±Ð°ÑÐºÑ ÐºÐ°Ð½ÑÑÐ½ÐµÐ½ÑÐ°Ñ, ÐºÑÐ°ÑÐ½ Ñ Ð°ÑÐ¾Ð±Ð½ÑÑ Ð³Ð°ÑÐ°Ð´Ð¾Ñ
+          title: ÐÐ°Ð³ÑÑÐ·ÐºÑ Geofabrik
         metro: 
-          title: ÐÑÐ½ÑÑÐºÑ Ð¼ÐµÑÑÐ¾
+          description: ÐÑÐ±Ð°ÑÐºÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ Ð´Ð»Ñ Ð±ÑÐ¹Ð½ÑÑ Ð³Ð°ÑÐ°Ð´Ð¾Ñ ÑÐ²ÐµÑÑ Ñ Ð¿ÑÑÐ»ÐµÐ³Ð»ÑÑ Ð´Ð° ÑÑ ÑÑÑÑÑÐ¾ÑÑÐ¹
+          title: ÐÑÐ±Ð°ÑÐºÑ Metro
         other: 
           description: ÐÐ°Ð´Ð°ÑÐºÐ¾Ð²ÑÑ ÐºÑÑÐ½ÑÑÑ, Ð¿ÐµÑÐ°Ð»ÑÑÐ°Ð½ÑÑ Ð½Ð° ÐÑÐºÑ OpenStreetMap
           title: ÐÐ½ÑÑÑ ÐºÑÑÐ½ÑÑÑ
+        overpass: 
+          description: Ð¡Ð¿Ð°Ð¼Ð¿Ð°Ð²Ð°ÑÑ Ð°Ð±Ð¼ÐµÐ¶Ð°Ð²Ð°Ð½ÑÑ Ð³ÑÑÑÐ¼ Ð¿ÑÐ°ÑÑÐ°ÐºÑÑÐ½ÑÐºÐ°Ð¼ Ð²Ð¾Ð±Ð»Ð°ÑÑÑ Ð· Ð»ÑÑÑÑÑÐºÐ° Ð±Ð°Ð·Ñ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ OpenStreetMap
+          title: Overpass API
         planet: 
           description: Ð ÑÐ³ÑÐ»ÑÑÐ½Ð° Ð°Ð±Ð½Ð°ÑÐ»ÑÐµÐ¼ÑÑ ÐºÐ¾Ð¿ÑÑ Ð¿Ð¾ÑÐ½Ð°Ð¹ Ð±Ð°Ð·Ñ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ OpenStreetMap
           title: ÐÐ»Ð°Ð½ÐµÑÐ° OSM
@@ -312,11 +357,16 @@ be:
     title: Ð­ÐºÑÐ¿Ð°ÑÑ
   fixthemap: 
     how_to_help: 
+      add_a_note: 
+        instructions_html: "ÐÑÐ¾ÑÑÐ° Ð½Ð°ÑÑÑÐ½ÑÑÐµ <a class='icon note'></a> Ð°Ð±Ð¾ Ð¿Ð°Ð´Ð¾Ð±Ð½Ñ Ð·Ð½Ð°ÑÐ¾Ðº Ð½Ð° ÐºÐ°ÑÑÐµ. \nÐ£ Ð²ÑÐ½ÑÐºÑ Ð½Ð° ÐºÐ°ÑÑÐµ Ð·'ÑÐ²ÑÑÑÐ° Ð¼Ð°ÑÐºÐµÑ, ÑÐºÑ Ð²Ñ Ð·Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿ÐµÑÐ°Ð¼ÑÑÑÐ°ÑÑ ÑÐ»ÑÑÐ°Ð¼ Ð¿ÐµÑÐ°ÑÑÐ³Ð²Ð°Ð½Ð½Ñ. ÐÐ°Ð´Ð°Ð¹ÑÐµ Ð²Ð°ÑÐ° Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ, Ð½Ð°ÑÑÑÐ½ÑÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ ÐÐ°ÑÐ°Ð²Ð°ÑÑ Ñ ÑÐ½ÑÑÑ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÑ Ð·Ð¼Ð¾Ð³ÑÑÑ Ð³ÑÑÐ° ÑÐ±Ð°ÑÑÑÑ."
       join_the_community: 
+        explanation_html: ÐÐ°Ð»Ñ Ð²Ñ Ð·Ð°ÑÐ²Ð°Ð¶ÑÐ»Ñ, Ð½ÐµÐ´Ð°ÐºÐ»Ð°Ð´Ð½Ð°ÑÑÑ Ñ Ð½Ð°ÑÑÑ ÐºÐ°ÑÑÐ°Ð³ÑÐ°ÑÑÑÐ½ÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ, Ð½Ð°Ð¿ÑÑÐºÐ»Ð°Ð´ Ð´Ð°ÑÐ¾Ð³Ð° Ð½Ðµ Ð¿Ð°Ð·Ð½Ð°ÑÐ°Ð½Ð° ÑÑ Ð²Ð°Ñ Ð°Ð´ÑÐ°Ñ, Ð»ÐµÐ¿ÑÑ ÑÐ¿Ð¾ÑÐ°Ð± Ð³ÑÑÐ° Ð²ÑÐ¿ÑÐ°Ð²ÑÑÑ - Ð´Ð°Ð»ÑÑÑÑÑÐ° Ð´Ð° ÑÑÐ¿Ð¾Ð»ÑÐ½Ð°ÑÑÑ OpenStreetMap Ñ Ð´Ð°Ð´Ð°ÑÑ Ð°Ð±Ð¾ Ð²ÑÐ¿ÑÐ°Ð²ÑÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ ÑÐ°Ð¼Ð°ÑÑÐ¾Ð¹Ð½Ð°.
         title: ÐÐ°Ð»ÑÑÑÑÑÐ° Ð´Ð° ÑÑÐ¿Ð¾Ð»ÑÐ½Ð°ÑÑÑ
       title: Ð¯Ðº Ð´Ð°Ð¿Ð°Ð¼Ð°Ð³ÑÑ
     other_concerns: 
+      explanation_html: "ÐÐ°Ð»Ñ Ð²Ñ Ð·Ð°Ð½ÐµÐ¿Ð°ÐºÐ¾ÐµÐ½ÑÑ ÑÑÐ¼, ÑÐº Ð½Ð°ÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ Ð²ÑÐºÐ°ÑÑÑÑÐ¾ÑÐ²Ð°ÑÑÑÐ° Ð°Ð±Ð¾ ÑÑ Ð·Ð¼ÐµÑÑÐ°Ð¼, Ð·Ð²ÑÑÐ½ÑÑÐµÑÑ Ð´Ð° Ð½Ð°ÑÐ°Ð¹ \n<a href='/copyright'>ÑÑÐ°ÑÐ¾Ð½ÐºÑ Ð°ÑÑÐ°ÑÑÐºÑÑ Ð¿ÑÐ°Ð²Ð¾Ñ</a> Ð´Ð»Ñ Ð°ÑÑÑÐ¼Ð°Ð½Ð½Ñ Ð¿ÑÐ°Ð²Ð°Ð²Ð¾Ð¹ ÑÐ½ÑÐ°ÑÐ¼Ð°ÑÑÑ, Ð°Ð±Ð¾ Ð·Ð²ÑÐ¶ÑÑÐµÑÑ Ð· Ð°Ð´Ð¿Ð°Ð²ÐµÐ´Ð½Ð°Ð¹ \n<a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>ÑÐ°Ð±Ð¾ÑÐ°Ð¹ Ð³ÑÑÐ¿Ð°Ð¹ OSMF</a>."
       title: ÐÐ½ÑÑÑ Ð¿ÐµÑÐ°ÑÑÑÑÐ¾Ð³Ñ
+    title: ÐÐ°Ð²ÐµÐ´Ð°Ð¼ÑÑÑ Ð°Ð± Ð¿ÑÐ°Ð±Ð»ÐµÐ¼Ðµ / ÐÑÐ¿ÑÐ°Ð²ÑÑÑ ÐºÐ°ÑÑÑ
   geocoder: 
     description: 
       title: 
@@ -347,6 +397,7 @@ be:
         ca_postcode: ÐÑÐ½ÑÐºÑ Ð· <a href="http://geocoder.ca/">Geocoder.CA</a>
         geonames: ÐÑÐ½ÑÐºÑ Ð· <a href="http://www.geonames.org/">GeoNames</a>
         geonames_reverse: ÐÑÐ½ÑÐºÑ Ð· <a href="http://www.geonames.org/">GeoNames</a>
+        latlon: ÐÑÐ½ÑÐºÑ Ð· <a href="http://openstreetmap.org/">Internal</a>
         osm_nominatim: ÐÑÐ½ÑÐºÑ Ð· <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
         osm_nominatim_reverse: ÐÑÐ½ÑÐºÑ Ð· <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
         uk_postcode: ÐÑÐ½ÑÐ½ÐºÑ Ð· <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
@@ -356,6 +407,8 @@ be:
         level10: ÐÑÐ¶Ð° Ð¿ÑÑÐ³Ð°ÑÐ°Ð´Ñ
         level2: ÐÑÐ¶Ð° ÐºÑÐ°ÑÐ½Ñ
         level4: ÐÐ·ÑÑÐ¶Ð°ÑÐ½Ð°Ñ Ð¼ÑÐ¶Ð°
+        level5: ÐÑÐ¶Ð° ÑÑÐ³ÑÑÐ½Ð°
+        level6: ÐÑÐ¶Ð° Ð°ÐºÑÑÐ³Ñ
         level8: ÐÑÐ¶Ð° Ð³Ð¾ÑÐ°Ð´Ð°
         level9: ÐÑÐ¶Ð° Ð²ÑÑÐºÑ
       prefix: 
@@ -390,6 +443,7 @@ be:
           bus_station: ÐÑÑÐ¾Ð±ÑÑÐ½Ñ Ð²Ð°ÐºÐ·Ð°Ð»
           cafe: ÐÐ°ÑÑ
           car_rental: ÐÑÐ°ÐºÐ°Ñ Ð°ÑÑÐ°Ð¼Ð°Ð±ÑÐ»ÑÑ
+          car_sharing: Ð¡ÑÐ¼ÐµÑÐ½Ð°Ðµ Ð²ÑÐºÐ°ÑÑÑÑÐ°Ð½Ð½Ðµ Ð°ÑÑÐ°Ð¼Ð°Ð±ÑÐ»ÑÑ
           car_wash: ÐÑÑÐ°Ð¼ÑÐ¹ÐºÐ°
           casino: ÐÐ°Ð·ÑÐ½Ð¾
           charging_station: ÐÐ°ÑÐ°Ð´Ð½Ð°Ñ ÑÑÐ°Ð½ÑÑÑ
@@ -401,14 +455,17 @@ be:
           courthouse: Ð¡ÑÐ´
           crematorium: ÐÑÑÐ¼Ð°ÑÐ¾ÑÑÐ¹
           dentist: Ð¡ÑÐ°Ð¼Ð°ÑÐ¾Ð»Ð°Ð³ÑÑ
+          doctors: ÐÐµÐºÐ°ÑÑ
           dormitory: ÐÐ½ÑÑÑÐ½Ð°Ñ
           drinking_water: ÐÑÑÐ½Ð°Ñ Ð²Ð°Ð´Ð°
           driving_school: ÐÑÑÐ°ÑÐºÐ¾Ð»Ð°
           embassy: ÐÐ¼Ð±Ð°ÑÐ°Ð´Ð°
+          emergency_phone: Ð¢ÑÐ»ÐµÑÐ¾Ð½ ÑÐºÑÑÑÐ°Ð½Ð°Ð¹ ÑÑÐ²ÑÐ·Ñ
           fast_food: Ð¤Ð°ÑÑ-Ð¤ÑÐ´
           ferry_terminal: ÐÐ°ÑÐ¾Ð¼Ð½Ñ ÑÑÑÐ¼ÑÐ½Ð°Ð»
           fire_hydrant: ÐÐ°Ð¶Ð°ÑÐ½Ñ Ð³ÑÐ´ÑÐ°Ð½Ñ
           fire_station: ÐÐ°Ð¶Ð°ÑÐ½Ð°Ñ ÑÑÐ°Ð½ÑÑÑ
+          food_court: Ð¤ÑÐ´-ÐÐ¾ÑÑ
           fountain: Ð¤Ð°Ð½ÑÐ°Ð½
           fuel: ÐÐÐ¡
           grave_yard: ÐÐ¾Ð³ÑÐ»ÐºÑ
@@ -417,10 +474,12 @@ be:
           health_centre: ÐÐµÐ´ÑÑÑÐ½ÑÐºÑ ÑÑÐ½ÑÑ
           hospital: ÐÐ°Ð»ÑÐ½ÑÑÐ°
           hotel: ÐÐ°ÑÑÐ»Ñ
+          hunting_stand: ÐÐ°Ð»ÑÑÐ½ÑÑÐ°Ñ Ð²ÐµÐ¶Ð°
           ice_cream: ÐÐ°ÑÐ¾Ð·ÑÐ²Ð°
           kindergarten: ÐÐ·ÑÑÑÑÑ ÑÐ°Ð´
           library: ÐÑÐ±Ð»ÑÑÑÑÐºÐ°
           market: Ð ÑÐ½Ð°Ðº
+          marketplace: Ð ÑÐ½Ð°ÑÐ½Ð°Ñ Ð¿Ð»Ð¾ÑÑÐ°
           mountain_rescue: ÐÑÑÐ°ÑÐ°Ð²Ð°Ð»ÑÐ½Ð°Ñ ÑÐ»ÑÐ¶Ð±Ð° Ñ Ð³Ð°ÑÐ°Ñ
           nightclub: ÐÐ°ÑÐ½Ñ ÐºÐ»ÑÐ±
           nursery: Ð¯ÑÐ»Ñ
@@ -483,15 +542,21 @@ be:
           fire_hydrant: ÐÐ°Ð¶Ð°ÑÐ½Ñ Ð³ÑÐ´ÑÐ°Ð½Ñ
           phone: Ð¢ÑÐ»ÐµÑÐ¾Ð½ ÑÐºÑÑÑÐ°Ð½Ð°Ð¹ ÑÑÐ²ÑÐ·Ñ
         highway: 
+          bridleway: ÐÐ°ÑÐ¾Ð³Ð° Ð´Ð»Ñ ÐºÐ¾Ð½ÐµÐ¹
+          bus_guideway: Ð ÑÐ¹ÐºÐ°Ð²Ñ Ð°ÑÑÐ¾Ð±ÑÑ
           bus_stop: ÐÑÑÐ¾Ð±ÑÑÐ½Ñ Ð¿ÑÑÐ¿ÑÐ½Ð°Ðº
+          byway: Ð¡ÑÐµÐ¶ÐºÐ°
+          construction: ÐÑÐ´Ð°ÑÐ½ÑÑÑÐ²Ð° Ð´Ð°ÑÐ¾Ð³Ñ
           cycleway: ÐÐµÐ»Ð°ÑÑÐ¿ÐµÐ´Ð½Ð°Ñ Ð´Ð°ÑÐ¾Ð¶ÐºÐ°
+          emergency_access_point: ÐÑÐ½ÐºÑ ÑÑÑÐºÐ°Ð¹ Ð´Ð°Ð¿Ð°Ð¼Ð¾Ð³Ñ
           footway: Ð¡ÑÑÐ¶ÑÐ½ÐºÐ°
+          ford: ÐÑÐ¾Ð´
           living_street: ÐÑÐ»Ð°Ñ Ð²ÑÐ»ÑÑÐ°
           milestone: ÐÐµÑÐ°
           minor: ÐÑÐ¾Ð±Ð½Ð°Ñ Ð´Ð°ÑÐ¾Ð³Ð°
-          motorway: ÐÑÑÐ°Ð¼Ð°Ð±ÑÐ»ÑÐ½Ð°Ñ Ð´Ð°ÑÐ¾Ð³Ð°
+          motorway: ÐÑÑÐ°Ð¼Ð°Ð³ÑÑÑÑÐ°Ð»Ñ
           motorway_junction: ÐÑÑÐ°Ð¼Ð°Ð±ÑÐ»ÑÐ½Ð°Ñ ÑÐ°Ð·Ð²ÑÐ·ÐºÐ°
-          motorway_link: ÐÑÑÐ°Ð¼Ð°Ð±ÑÐ»ÑÐ½Ð°Ñ Ð´Ð°ÑÐ¾Ð³Ð°
+          motorway_link: ÐÑÑÐ°Ð¼Ð°Ð³ÑÑÑÑÐ°Ð»Ñ
           path: Ð¡ÑÐµÐ¶ÐºÐ°
           pedestrian: ÐÐµÑÐ°ÑÐ¾Ð´Ð½Ð°Ñ Ð´Ð°ÑÐ¾Ð¶ÐºÐ°
           platform: ÐÐ»Ð°ÑÑÐ¾ÑÐ¼Ð°
@@ -514,7 +579,7 @@ be:
           tertiary_link: Ð¢ÑÑÑÑÑÐ½Ð°Ñ Ð´Ð°ÑÐ¾Ð³Ð°
           track: ÐÐ°Ð»ÑÑ
           trail: Ð¡Ð»ÐµÐ´
-          trunk: ÐÐ°Ð³ÑÑÑÑÐ°Ð»Ñ
+          trunk: Ð¨Ð°ÑÐ°
           trunk_link: ÐÐ°Ð³ÑÑÑÑÐ°Ð»Ñ
           unclassified: ÐÐµÐºÐ»Ð°ÑÑÑÑÐºÐ°Ð²Ð°Ð½Ð°Ñ Ð´Ð°ÑÐ¾Ð³Ð°
           unsurfaced: ÐÐ°ÑÐ¾Ð³Ð° Ð±ÐµÐ· Ð¿Ð°ÐºÑÑÑÑÑ
@@ -541,7 +606,7 @@ be:
           wayside_shrine: ÐÑÑÐ´Ð°ÑÐ¾Ð¶Ð½Ð°Ñ ÐºÐ°Ð¿Ð»ÑÑÐºÐ°
           wreck: ÐÐµÑÑÐ° Ð°Ð²Ð°ÑÑÑ
         landuse: 
-          allotments: ÐÐ°Ð´Ð·ÐµÐ»Ñ
+          allotments: Ð¡Ð°Ð´Ñ-Ð°Ð³Ð°ÑÐ¾Ð´Ñ
           basin: ÐÐ°Ð´Ð°ÑÐ¼
           brownfield: ÐÑÑÑÑÐ°Ð½Ð°Ðµ Ð¼ÐµÑÑÐ° Ð´Ð»Ñ Ð·Ð°Ð±ÑÐ´Ð¾Ð²Ñ
           cemetery: ÐÐ¾Ð³ÑÐ»ÐºÑ
@@ -568,13 +633,18 @@ be:
           railway: Ð§ÑÐ³ÑÐ½ÐºÐ°
           recreation_ground: ÐÐ»ÑÑÐ¾ÑÐºÐ° Ð´Ð»Ñ Ð³ÑÐ»ÑÐ½ÑÑ
           reservoir: ÐÐ°Ð´Ð°ÑÑÐ¾Ð²ÑÑÑÐ°
+          reservoir_watershed: ÐÐ¾Ð´Ð°Ð¿Ð°Ð´Ð·ÐµÐ» Ð²Ð°Ð´Ð°ÑÑÐ¾Ð²ÑÑÑÐ°
           residential: ÐÑÐ»Ñ ÑÐ°ÐµÐ½
           retail: Ð Ð¾Ð·Ð½ÑÑÐ½Ñ Ð³Ð°Ð½Ð´Ð°Ð»Ñ
           road: ÐÑÑÐ´Ð°ÑÐ¾Ð¶Ð½Ð°Ñ Ð¿Ð°Ð»Ð°ÑÐ°
+          village_green: ÐÑÑÐºÐ¾Ð²Ð°Ñ Ð¿Ð°Ð»ÑÐ½Ð°
           vineyard: ÐÑÐ½Ð°Ð³ÑÐ°Ð´Ð½ÑÐº
-          wood: ÐÐ·ÑÐºÑ Ð»ÐµÑ
+          wetland: ÐÐ°Ð±Ð°Ð»Ð¾ÑÐ°Ð½Ñ ÑÑÐ°ÑÑÐ°Ðº
+          wood: ÐÑÑÑÐ°
         leisure: 
           beach_resort: ÐÐ»ÑÐ¶Ð½Ñ ÐºÑÑÐ¾ÑÑ
+          bird_hide: ÐÐ°ÑÐ°Ð´Ð°
+          common: ÐÐ³ÑÐ»ÑÐ½Ð°Ñ Ð·ÑÐ¼Ð»Ñ
           fishing: Ð Ð°ÑÐ½ ÑÑÐ±Ð°Ð»Ð¾ÑÑÑÐ²Ð°
           fitness_station: Ð¡Ð¿Ð°ÑÑÑÑÐ½Ð°Ñ Ð¿Ð»ÑÑÐ¾ÑÐºÐ°
           garden: Ð¡Ð°Ð´
@@ -609,6 +679,7 @@ be:
           cliff: ÐÑÐ¶Ð° ÑÐºÐ°Ð»Ñ
           crater: ÐÑÐ°ÑÑÑ
           dune: ÐÐ·ÑÐ½Ð°
+          feature: ÐÑÑÑÐ¾Ð´Ð½Ñ Ð°Ð±'ÐµÐºÑ
           fell: ÐÐµÐ°Ð¿ÑÐ°ÑÐ°Ð²Ð°Ð½Ð°Ñ Ð·ÑÐ¼Ð»Ñ
           fjord: Ð¤ÑÑÑÐ´
           forest: ÐÐµÑ
@@ -639,7 +710,7 @@ be:
           water: ÐÐ°Ð´Ð°
           wetland: ÐÐ°Ð±Ð°Ð»Ð¾ÑÐ°Ð½Ñ ÑÑÐ°ÑÑÐ°Ðº
           wetlands: ÐÐ¾Ð´Ð½Ð°-Ð±Ð°Ð»Ð¾ÑÐ½ÑÑ ÑÐ³Ð¾Ð´Ð´Ð·Ñ
-          wood: ÐÐ·ÑÐºÑ Ð»ÐµÑ
+          wood: ÐÑÑÑÐ°
         office: 
           accountant: ÐÑÑÐ³Ð°Ð»ÑÐ°Ñ
           architect: ÐÑÑÑÑÑÐºÑÐ°Ñ
@@ -676,6 +747,7 @@ be:
           subdivision: ÐÐ°Ð´ÑÐ°Ð·Ð´Ð·ÑÐ»ÐµÐ½Ð½Ðµ
           suburb: ÐÑÑÐ³Ð°ÑÐ°Ð´
           town: ÐÐ¾ÑÐ°Ð´
+          unincorporated_area: ÐÐ°Ð³Ð°ÑÐ°Ð´Ð½Ð°Ñ Ð·Ð¾Ð½Ð°
           village: ÐÑÑÐºÐ°
         railway: 
           abandoned: ÐÐ°ÐºÑÐ½ÑÑÐ°Ñ ÑÑÐ³ÑÐ½ÐºÐ°
@@ -686,17 +758,25 @@ be:
           halt: Ð§ÑÐ³ÑÐ½Ð°ÑÐ½Ñ Ð¿ÑÑÐ¿ÑÐ½Ð°Ðº
           historic_station: ÐÑÑÑÐ°ÑÑÑÐ½Ñ ÑÑÐ³ÑÐ½Ð°ÑÐ½Ñ Ð²Ð°ÐºÐ·Ð°Ð»
           junction: Ð§ÑÐ³ÑÐ½Ð°ÑÐ½Ñ Ð²ÑÐ·ÐµÐ»
+          level_crossing: Ð§ÑÐ³ÑÐ½Ð°ÑÐ½Ñ Ð¿ÐµÑÐ°ÐµÐ·Ð´
+          light_rail: Ð¥ÑÑÐºÐ°ÑÐ½Ñ ÑÑÐ°Ð¼Ð²Ð°Ð¹
+          miniature: ÐÑÐ½ÑÑÑÑÑÐ½Ð°Ñ ÑÑÐ³ÑÐ½ÐºÐ°
           monorail: ÐÐ°Ð½Ð°ÑÑÐ¹ÐºÐ°
           narrow_gauge: ÐÑÐ·ÐºÐ°ÐºÐ°Ð»ÐµÐ¹Ð½Ð°Ñ ÑÑÐ³ÑÐ½ÐºÐ°
           platform: Ð§ÑÐ³ÑÐ½Ð°ÑÐ½Ð°Ñ Ð¿Ð»Ð°ÑÑÐ¾ÑÐ¼Ð°
+          preserved: ÐÐ°ÐºÐ°Ð½ÑÐµÑÐ²Ð°Ð²Ð°Ð½Ð°Ñ ÑÑÐ³ÑÐ½ÐºÐ°
+          proposed: ÐÑÐ°ÐµÐºÑÑÐµÐ¼Ð°Ñ ÑÑÐ³ÑÐ½ÐºÐ°
+          spur: Ð§ÑÐ³ÑÐ½Ð°ÑÐ½Ð°Ðµ ÑÐ°Ð·Ð³Ð°Ð»ÑÐ½Ð°Ð²Ð°Ð½Ð½Ðµ
           station: Ð§ÑÐ³ÑÐ½Ð°ÑÐ½Ñ Ð²Ð°ÐºÐ·Ð°Ð»
           stop: Ð§ÑÐ³ÑÐ½Ð°ÑÐ½Ñ Ð¿ÑÑÐ¿ÑÐ½Ð°Ðº
           subway: Ð¡ÑÐ°Ð½ÑÑÑ Ð¼ÐµÑÑÐ¾
           subway_entrance: Ð£Ð²Ð°ÑÐ¾Ð´ Ñ Ð¼ÐµÑÑÐ¾
+          switch: Ð§ÑÐ³ÑÐ½Ð°ÑÐ½Ð°Ñ ÑÑÑÑÐ»ÐºÐ°
           tram: Ð¢ÑÐ°Ð¼Ð²Ð°Ð¹
           tram_stop: Ð¢ÑÐ°Ð¼Ð²Ð°Ð¹Ð½Ñ Ð¿ÑÑÐ¿ÑÐ½Ð°Ðº
           yard: Ð¡Ð°ÑÑÐ°Ð²Ð°Ð»ÑÐ½Ð°Ñ ÑÑÐ°Ð½ÑÑÑ
         shop: 
+          alcohol: ÐÐ»ÐºÐ°Ð³Ð¾Ð»ÑÐ½Ð°Ñ ÐºÑÐ°Ð¼Ð°
           antiques: ÐÐ½ÑÑÐºÐ²Ð°ÑÑÑÑ
           art: ÐÑÑ-ÐÑÐ°Ð¼Ð°
           bakery: ÐÑÐºÐ°ÑÐ½Ñ
@@ -710,6 +790,7 @@ be:
           car_parts: ÐÑÑÐ°Ð·Ð°Ð¿ÑÐ°ÑÑÐºÑ
           car_repair: Ð Ð°Ð¼Ð¾Ð½Ñ Ð°ÑÑÐ°Ð¼Ð°Ð±ÑÐ»ÑÑ
           carpet: ÐÑÐ°Ð¼Ð° Ð´ÑÐ²Ð°Ð½Ð¾Ñ
+          charity: ÐÐ°Ð±ÑÐ°ÑÑÐ½Ð½Ð°Ñ ÐºÑÐ°Ð¼Ð°
           chemist: ÐÐ¿ÑÑÐºÐ°Ñ
           clothes: ÐÑÐ°Ð¼Ð° Ð²Ð¾Ð¿ÑÐ°ÑÐºÑ
           computer: ÐÑÐ°Ð¼Ð° ÐºÐ°Ð¼Ð¿ÑÑÐ°ÑÐ½Ð°Ð¹ ÑÑÑÐ½ÑÐºÑ
@@ -724,82 +805,124 @@ be:
           dry_cleaning: Ð¥ÑÐ¼ÑÑÑÑÐºÐ°
           electronics: ÐÑÐ°Ð¼Ð° ÑÐ»ÐµÐºÑÑÐ¾Ð½ÑÐºÑ
           estate_agent: ÐÐ³ÐµÐ½Ñ Ð¿Ð° Ð½ÐµÑÑÑÐ¾Ð¼Ð°ÑÑÑ
+          farm: Ð¤ÐµÑÐ¼ÐµÑÑÐºÐ°Ñ ÐºÑÐ°Ð¼Ð°
+          fashion: ÐÑÐ°Ð¼Ð° Ð¼Ð¾Ð´Ð½Ð°Ð¹ Ð²Ð¾Ð¿ÑÐ°ÑÐºÑ
           fish: Ð ÑÐ±Ð½Ð°Ñ ÐºÑÐ°Ð¼Ð°
           florist: Ð¤Ð»Ð°ÑÑÑÑ
           food: ÐÑÐ°Ð´ÑÐºÑÐ¾Ð²Ð°Ñ ÐºÑÐ°Ð¼Ð°
+          funeral_directors: Ð ÑÑÑÐ°Ð»ÑÐ½ÑÑ Ð¿Ð°ÑÐ»ÑÐ³Ñ
           furniture: ÐÑÐ±Ð»Ñ
           gallery: ÐÐ°Ð»ÐµÑÑÑ
           garden_centre: Ð¡Ð°Ð´Ð¾Ð²Ñ ÑÑÐ½ÑÑ
+          general: Ð£Ð½ÑÐ²ÐµÑÑÐ°Ð¼
           gift: ÐÑÐ°Ð¼Ð° Ð¿Ð°Ð´Ð°ÑÑÐ½ÐºÐ°Ñ
+          greengrocer: Ð¡Ð°Ð´Ð°Ð²ÑÐ½Ð°, Ð³Ð°ÑÐ¾Ð´Ð½ÑÐ½Ð°
+          grocery: ÐÐ°ÐºÐ°Ð»ÐµÑ
           hairdresser: Ð¦ÑÑÑÐ»ÑÐ½ÑÐº
           hardware: ÐÐ°ÑÐ¿Ð°Ð´Ð°ÑÑÐ°Ñ ÐºÑÐ°Ð¼Ð°
           hifi: ÐÑÐ´ÑÑÑÑÑÐ½ÑÐºÐ°
           insurance: Ð¡ÑÑÐ°ÑÐ°Ð²Ð°Ð½Ð½Ðµ
           jewelry: Ð®Ð²ÐµÐ»ÑÑÐ½Ð°Ñ ÐºÑÐ°Ð¼Ð°
+          kiosk: ÐÑÑÑÐº
           laundry: ÐÑÐ°Ð»ÑÐ½Ñ
           mall: ÐÐ°Ð½Ð´Ð»ÐµÐ²Ñ ÑÑÐ½ÑÑ
           market: Ð ÑÐ½Ð°Ðº
           mobile_phone: Ð¡Ð°Ð»Ð¾Ð½ Ð¼Ð°Ð±ÑÐ»ÑÐ½Ð°Ð¹ ÑÑÐ²ÑÐ·Ñ
           motorcycle: ÐÑÐ°Ð¼Ð° Ð¼Ð°ÑÐ°ÑÑÐºÐ»Ð°Ñ
           music: ÐÑÐ·ÑÑÐ½Ð°Ñ ÐºÑÐ°Ð¼Ð°
+          newsagent: ÐÐ°Ð·ÐµÑÐ½Ñ ÐºÑÑÑÐº
           optician: ÐÐ¿ÑÑÐºÐ°
+          organic: ÐÑÐ³Ð°Ð½ÑÑÐ½ÑÑ Ð¿ÑÐ°Ð´ÑÐºÑÑ
+          outdoor: Ð¢ÑÑÑÑÑÑÑÐ½Ð°Ñ ÐºÑÐ°Ð¼Ð°
+          pet: ÐÐ°Ð°Ð»Ð°Ð³ÑÑÐ½Ð°Ñ ÐºÑÐ°Ð¼Ð°
           pharmacy: ÐÐ¿ÑÑÐºÐ°
           photo: Ð¤Ð¾ÑÐ° Ð¼Ð°Ð¹ÑÑÑÑÐ½Ñ
+          salon: Ð¡Ð°Ð»Ð¾Ð½
+          second_hand: ÐÑÐ°Ð¼Ð° Ð¿Ð°ÑÑÑÐ¼Ð°Ð½ÑÑ ÑÑÑÐ°Ñ
           shoes: ÐÐ±ÑÑÐºÐ¾Ð²Ð°Ñ ÐºÑÐ°Ð¼Ð°
           shopping_centre: ÐÐ°Ð½Ð´Ð»ÑÐ²Ñ ÑÑÐ½ÑÑ
           sports: Ð¡Ð¿Ð°ÑÑÑÑÐ½Ð°Ñ ÐºÑÐ°Ð¼Ð°
+          stationery: ÐÑÐ°Ð¼Ð° ÐºÐ°Ð½ÑÑÐ»ÑÑÑÐºÑÑ ÑÐ°Ð²Ð°ÑÐ°Ñ
           supermarket: Ð¡ÑÐ¿ÐµÑÐ¼Ð°ÑÐºÐµÑ
+          tailor: ÐÑÐ°Ð²ÐµÑ
           toys: ÐÑÐ°Ð¼Ð° ÑÐ°ÑÐ°Ðº
           travel_agency: Ð¢ÑÑÑÑÑÑÑÐ½Ð°Ðµ Ð°Ð³ÐµÐ½ÑÑÐ²Ð°
           video: ÐÑÐ´ÑÐ° ÐºÑÐ°Ð¼Ð°
+          wine: ÐÐ»ÐºÐ°Ð³Ð¾Ð»ÑÐ½Ð°Ñ ÐºÑÐ°Ð¼Ð°
           "yes": ÐÑÐ°Ð¼Ð°
         tourism: 
           alpine_hut: ÐÐ»ÑÐ¿ÑÐ¹ÑÐºÐ°Ñ ÑÐ°ÑÐºÐ°
+          artwork: ÐÐ½ÑÑÐ°Ð»ÑÑÑÑ
+          attraction: Ð¦ÑÐºÐ°Ð²Ð¾ÑÑÑ
           bed_and_breakfast: ÐÐ¾Ð¶Ð°Ðº Ñ ÑÐ½ÑÐ´Ð°Ð½Ð°Ðº
+          cabin: Ð¥Ð°ÑÑÐ½Ð°
           camp_site: Ð¢ÑÑÐ±Ð°Ð·Ð°
+          caravan_site: ÐÐ»ÑÑÐ¾ÑÐºÐ° Ð´Ð»Ñ Ð°ÑÑÐ°Ð´Ð°Ð¼Ð¾Ñ
           chalet: Ð¨Ð°Ð»Ðµ
           guest_house: ÐÐ°ÑÑÑÐ²Ñ Ð´Ð¾Ð¼
           hostel: Ð¥Ð¾ÑÑÑÐ»
           hotel: ÐÐ°ÑÑÐ»Ñ
           information: ÐÐ½ÑÐ°ÑÐ¼Ð°ÑÑÑ
+          lean_to: ÐÐ°Ð²ÐµÑ
           motel: ÐÐ°ÑÑÐ»Ñ
           museum: ÐÑÐ·ÐµÐ¹
           picnic_site: ÐÐµÑÑÐ° Ð´Ð»Ñ Ð¿ÑÐºÐ½ÑÐºÐ°
           theme_park: Ð¢ÑÐ¼Ð°ÑÑÑÐ½Ñ Ð¿Ð°ÑÐº
           valley: ÐÐ°Ð»ÑÐ½Ð°
+          viewpoint: ÐÐ³Ð»ÑÐ´Ð°Ð»ÑÐ½Ð°Ñ Ð¿Ð»ÑÑÐ¾ÑÐºÐ°
           zoo: ÐÐ°Ð°Ð¿Ð°ÑÐº
         tunnel: 
+          culvert: ÐÑÐ»ÑÐ²ÐµÑÑ
           "yes": Ð¢ÑÐ½ÑÐ»Ñ
         waterway: 
+          artificial: Ð¨ÑÑÑÐ½Ñ Ð²Ð°Ð´Ð°ÑÑÐº
+          boatyard: ÐÐµÑÑÑ
           canal: ÐÐ°Ð½Ð°Ð»
+          connector: ÐÐ»ÑÑÑÐ½ÑÐ½Ðµ Ð²Ð°Ð´Ð°ÑÑÐºÐ°Ñ
           dam: ÐÐ»Ð°ÑÑÐ½Ð°
+          derelict_canal: ÐÐµÑÐ°ÑÐ¾ÑÐ»Ñ ÐºÐ°Ð½Ð°Ð»
+          ditch: Ð Ð¾Ñ
           dock: ÐÐ¾Ðº
+          drain: ÐÑÑÐ½Ð°Ð¶Ð½Ñ ÐºÐ°Ð½Ð°Ð»
+          lock: Ð¨Ð»ÑÐ·
+          lock_gate: ÐÐ°ÑÐ¾ÑÑ ÑÐ»ÑÐ·Ð°
           mineral_spring: ÐÑÐ½ÐµÑÐ°Ð»ÑÐ½Ð°Ñ ÐºÑÑÐ½ÑÑÐ°
+          mooring: Ð¯ÐºÐ°ÑÐ½Ð°Ñ ÑÑÐ°ÑÐ½ÐºÐ°
+          rapids: ÐÐ°ÑÐ¾Ð³Ñ
           river: Ð Ð°ÐºÐ°
+          riverbank: ÐÐµÑÐ°Ð³ ÑÐ°ÐºÑ
+          stream: Ð¡ÑÑÑÐ¼ÐµÐ½Ñ
+          wadi: Ð¡ÑÑÐ¾Ðµ ÑÑÑÑÑÑÐ°
+          water_point: ÐÑÐ½ÐºÑ Ð²Ð¾Ð´Ð°Ð·Ð°Ð±ÐµÑÐ¿ÑÑÑÐ½Ð½Ñ
           waterfall: ÐÐ°Ð´Ð°ÑÐ¿Ð°Ð´
+          weir: ÐÐ»Ð°ÑÑÐ½Ð°
   help_page: 
     help: 
+      description: ÐÐ°Ð´Ð°ÑÑ Ð¿ÑÑÐ°Ð½Ð½Ðµ Ð°Ð±Ð¾ Ð·Ð½Ð°Ð¹ÑÑÑ Ð°Ð´ÐºÐ°Ð·Ñ Ð½Ð° ÑÐ°Ð¹ÑÐµ Ð¿ÑÑÐ°Ð½Ð½ÑÑ Ñ Ð°Ð´ÐºÐ°Ð·Ð°Ñ OSM.
       title: help.openstreetmap.org
       url: https://help.openstreetmap.org/
+    introduction: OpenStreetMap Ð¼Ð°Ðµ ÑÐ¾Ð·Ð½ÑÑ ÑÑÑÑÑÑÑ Ð´Ð»Ñ Ð°ÑÑÑÐ¼Ð°Ð½Ð½Ñ ÑÐ½ÑÐ°ÑÐ¼Ð°ÑÑÑ Ð°Ð± Ð¿ÑÐ°ÐµÐºÑÐµ, Ð´Ð»Ñ Ð·Ð°Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð¿ÑÑÐ°Ð½Ð½ÑÑ Ñ Ð°ÑÑÑÐ¼Ð°Ð½Ð½Ñ Ð°Ð´ÐºÐ°Ð·Ð°Ñ, Ð´Ð»Ñ ÑÑÐ¼ÐµÑÐ½Ð°Ð³Ð° Ð°Ð±Ð¼ÐµÑÐºÐ°Ð²Ð°Ð½Ð½Ñ Ñ ÑÑÐ²Ð°ÑÑÐ½Ð½Ñ Ð´Ð°ÐºÑÐ¼ÐµÐ½ÑÐ°ÑÑÑ Ð¿Ð° ÐºÐ°ÑÑÐ°Ð³ÑÐ°ÑÐ°Ð²Ð°Ð½Ð½Ñ.
     title: ÐÑÑÑÐ¼Ð°Ð½Ð½Ðµ Ð´Ð°Ð¿Ð°Ð¼Ð¾Ð³Ñ
     welcome: 
+      description: ÐÐ°ÑÐ½ÑÑÐµ Ð· Ð³ÑÑÐ°Ð³Ð° ÐºÐ°ÑÐ¾ÑÐºÐ°Ð³Ð° ÐºÑÑÐ°ÑÐ½ÑÑÑÐ²Ð°, ÑÑÐ¾ Ð°ÑÐ¾Ð¿Ð»ÑÐ²Ð°Ðµ Ð°ÑÐ½Ð¾Ð²Ñ OpenStreetMap.
       title: ÐÑÑÐ°ÐµÐ¼ Ñ OSM
       url: /welcome
     wiki: 
+      description: ÐÐ°Ð³Ð»ÑÐ´Ð·ÐµÑÑ Ð²ÑÐºÑ Ð· Ð¿Ð°Ð´ÑÐ°Ð±ÑÐ·Ð½Ð°Ð¹ Ð´Ð°ÐºÑÐ¼ÐµÐ½ÑÐ°ÑÑÑÐ¹ Ð¿Ð° OSM
       title: wiki.openstreetmap.org
       url: http://wiki.openstreetmap.org/
   javascripts: 
     close: ÐÐ°ÑÑÐ½ÑÑÑ
     edit_help: ÐÐµÑÐ°Ð¼ÑÑÑÑÑÐµ ÐºÐ°ÑÑÑ Ñ Ð½Ð°Ð±Ð»ÑÐ·ÑÐµ Ð¼ÐµÑÑÐ°, ÑÐºÐ¾Ðµ Ð²Ñ ÑÐ¾ÑÐ°ÑÐµ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°ÑÑ, Ð·Ð°ÑÑÐ¼ Ð½Ð°ÑÑÑÐ½ÑÑÐµ ÑÑÑ.
     key: 
-      title: ÐÐµÐ³ÐµÐ½Ð´Ð° ÐºÐ°ÑÑÑ
-      tooltip: ÐÐµÐ³ÐµÐ½Ð´Ð° ÐºÐ°ÑÑÑ
-      tooltip_disabled: ÐÐµÐ³ÐµÐ½Ð´Ð° ÐºÐ°ÑÑÑ Ð´Ð°ÑÑÑÐ¿Ð½Ð°Ñ ÑÐ¾Ð»ÑÐºÑ Ð´Ð»Ñ ÑÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð°Ð³Ð° ÑÐ»Ð¾Ñ
+      title: Ð£Ð¼Ð¾ÑÐ½ÑÑ Ð°Ð±Ð°Ð·Ð½Ð°ÑÑÐ½Ð½Ñ
+      tooltip: Ð£Ð¼Ð¾ÑÐ½ÑÑ Ð°Ð±Ð°Ð·Ð½Ð°ÑÑÐ½Ð½Ñ
+      tooltip_disabled: Ð£Ð¼Ð¾ÑÐ½ÑÑ Ð°Ð±Ð°Ð·Ð½Ð°ÑÑÐ½Ð½Ñ Ð´Ð°ÑÑÑÐ¿Ð½ÑÑ ÑÐ¾Ð»ÑÐºÑ Ð´Ð»Ñ Ð·Ð²ÑÑÐ°Ð¹Ð½Ð°Ð¹ ÐºÐ°ÑÑÑ
     map: 
       base: 
         cycle_map: ÐÐµÐ»Ð°ÑÑÐ¿ÐµÐ´Ð½Ð°Ñ ÐºÐ°ÑÑÐ°
-        hot: ÐÑÐ¼Ð°Ð½ÑÑÐ°ÑÐ½Ð°Ñ
-        standard: Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½Ñ
+        hot: ÐÑÐ¼Ð°Ð½ÑÑÐ°ÑÐ½Ð°Ñ ÐºÐ°ÑÑÐ°
+        standard: ÐÐ²ÑÑÐ°Ð¹Ð½Ð°Ñ ÐºÐ°ÑÑÐ°
         transport_map: Ð¢ÑÐ°Ð½ÑÐ¿Ð°ÑÑÐ½Ð°Ñ ÐºÐ°ÑÑÐ°
       copyright: Â© <a href='%{copyright_url}'>OpenStreetMap contributors</a>
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>ÐÑÐ°Ð±ÑÑÑ Ð°ÑÐ²ÑÑÐ°Ð²Ð°Ð½Ð½Ðµ</a>
@@ -807,7 +930,7 @@ be:
         data: ÐÐ°ÑÑÐ°Ð³ÑÐ°ÑÑÑÐ½ÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ
         header: Ð¡Ð»Ð°Ñ ÐºÐ°ÑÑÑ
         notes: ÐÐ°ÑÐ²Ð°Ð³Ñ Ð½Ð° ÐºÐ°ÑÑÐµ
-        overlays: Ð£ÐºÐ»ÑÑÑÑÑ Ð½Ð°ÐºÐ»Ð°Ð´ÐºÑ Ð´Ð»Ñ Ð»ÑÐºÐ²ÑÐ´Ð°ÑÑÑ Ð½ÑÑÐ¿ÑÐ°ÑÐ½Ð°ÑÑÑÑ ÐºÐ°ÑÑÑ
+        overlays: Ð£ÐºÐ»ÑÑÑÑÑ Ð½Ð°ÐºÐ»Ð°Ð´ÐºÑ Ð´Ð»Ñ Ð»ÑÐºÐ²ÑÐ´Ð°ÑÑÑ Ð¿Ð°Ð¼ÑÐ»Ð°Ðº ÐºÐ°ÑÑÑ
         title: Ð¡Ð»Ð°Ñ
       locate: 
         popup: ÐÑ Ð·Ð½Ð°ÑÐ¾Ð´Ð·ÑÑÐµÑÑ Ñ Ð¼ÐµÐ¶Ð°Ñ {distance} {unit} Ð°Ð´ Ð³ÑÑÐ°Ð¹ ÐºÑÐ¾Ð¿ÐºÑ
@@ -818,6 +941,7 @@ be:
     notes: 
       new: 
         add: ÐÐ°Ð´Ð°ÑÑ Ð·Ð°ÑÐ²Ð°Ð³Ñ
+        intro: ÐÐ°ÑÐ²Ð°Ð¶ÑÐ»Ñ Ð¿Ð°Ð¼ÑÐ»ÐºÑ Ð°Ð±Ð¾ ÑÐ°Ð³Ð¾ÑÑÑÑ Ð½Ðµ ÑÐ°Ð¿Ð°Ðµ? ÐÐ°Ð¹ÑÐµ ÑÐ½ÑÑÐ¼ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÐ°Ð¼ Ð´Ð°Ð²ÐµÐ´Ð°ÑÑÐ° Ð¿ÑÐ° Ð³ÑÑÐ° Ñ  ÑÐ°ÐºÑÐ¼ ÑÑÐ½Ð°Ð¼ Ð¼Ñ Ð²ÑÐ¿ÑÐ°Ð²ÑÐ¼ Ð³ÑÑÐ°. ÐÐµÑÐ°Ð¼ÑÑÑÑÑÐµ Ð¼Ð°ÑÐºÐµÑ Ñ Ð¿Ð°ÑÑÑÐ±Ð½ÑÑ Ð¿Ð°Ð·ÑÑÑÑ Ñ Ð½Ð°Ð¿ÑÑÑÑÐµ Ð·Ð°ÑÐ²Ð°Ð³Ñ Ð· ÑÐ»ÑÐ¼Ð°ÑÑÐ½Ð½ÐµÐ¼ Ð¿ÑÐ°Ð±Ð»ÐµÐ¼Ñ. (ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð½Ñ ÑÐ²Ð¾Ð´Ð·ÑÑÐµ Ð°ÑÐ°Ð±ÑÑÑÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ.)
       show: 
         anonymous_warning: ÐÑÑÐ°Ñ Ð½Ð°ÑÐ°ÑÐºÐ° Ð·Ð¼ÑÑÑÐ°Ðµ ÐºÐ°Ð¼ÐµÐ½ÑÐ°ÑÑ Ð°Ð´ Ð°Ð½Ð°Ð½ÑÐ¼Ð½ÑÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ, ÑÑÐ¾ Ð¿Ð°Ð²ÑÐ½Ð½Ñ Ð±ÑÑÑ Ð½ÐµÐ·Ð°Ð»ÐµÐ¶Ð½Ð° Ð¿ÑÐ°Ð²ÐµÑÐ°Ð½Ñ.
         comment: ÐÐ°Ð¼ÐµÐ½ÑÐ°Ð²Ð°ÑÑ
@@ -828,10 +952,12 @@ be:
     share: 
       cancel: Ð¡ÐºÐ°ÑÐ°Ð²Ð°ÑÑ
       center_marker: Ð¦ÑÐ½ÑÑÐ°Ð²Ð°ÑÑ ÐºÐ°ÑÑÑ Ð¿Ð° Ð¼Ð°ÑÐºÐµÑÑ
-      download: ÐÐ°Ð³ÑÑÐ·ÑÑÑ
+      custom_dimensions: ÐÑÐ±ÑÐ°ÑÑ Ð¿Ð°Ð¼ÐµÑ ÑÑÑÑÐ½ÑÑ
+      download: Ð¡ÑÑÐ³Ð½ÑÑÑ
       embed: HTML
       format: "Ð¤Ð°ÑÐ¼Ð°Ñ:"
       image: ÐÑÑÐ²Ð°
+      image_size: ÐÐ° Ð²ÑÑÐ²Ðµ Ð±ÑÐ´Ð·Ðµ Ð·Ð²ÑÑÐ°Ð¹Ð½Ð°Ñ ÐºÐ°ÑÑÐ° Ð¿Ð°Ð¼ÐµÑÐ°Ð¼
       include_marker: ÐÐ°Ð´Ð°ÑÑ Ð¼Ð°ÑÐºÐµÑ
       link: Ð¡Ð¿Ð°ÑÑÐ»ÐºÐ° ÑÑ HTML
       long_link: Ð¡Ð¿Ð°ÑÑÐ»ÐºÐ°
@@ -839,29 +965,31 @@ be:
       scale: "ÐÐ°ÑÑÐ°Ð±:"
       short_link: ÐÐ°ÑÐ¾ÑÐºÐ°Ñ ÑÐ¿Ð°ÑÑÐ»ÐºÐ°
       short_url: ÐÐ°ÑÐ¾ÑÐºÑ URL-Ð°Ð´ÑÐ°Ñ
+      title: ÐÐ°Ð´Ð·ÑÐ»ÑÑÑÐ°
       view_larger_map: ÐÑÐ°Ð³Ð»ÑÐ´Ð·ÐµÑÑ Ð±Ð¾Ð»ÑÑÑÑ ÐºÐ°ÑÑÑ
     site: 
       createnote_disabled_tooltip: ÐÐ°Ð±Ð»ÑÐ·ÑÐµ, ÐºÐ°Ð± Ð´Ð°Ð´Ð°ÑÑ Ð·Ð°ÑÐ²Ð°Ð³Ñ Ð½Ð° ÐºÐ°ÑÑÑ
       createnote_tooltip: ÐÐ°Ð´Ð°ÑÑ Ð·Ð°ÑÐ²Ð°Ð³Ñ Ð½Ð° ÐºÐ°ÑÑÑ
       edit_disabled_tooltip: ÐÐ°Ð±Ð»ÑÐ·ÑÐµ, ÐºÐ°Ð± ÑÑÐ´Ð°Ð³Ð°Ð²Ð°ÑÑ ÐºÐ°ÑÑÑ
       edit_tooltip: Ð ÑÐ´Ð°Ð³Ð°Ð²Ð°ÑÑ ÐºÐ°ÑÑÑ
+      map_data_zoom_in_tooltip: ÐÐ°Ð²ÑÐ»ÑÑÑÐµ, ÐºÐ°Ð± ÑÐ±Ð°ÑÑÑÑ ÐºÐ°ÑÑÐ°Ð³ÑÐ°ÑÑÑÐ½ÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ
       map_notes_zoom_in_tooltip: ÐÐ°Ð±Ð»ÑÐ·ÑÐµ, ÐºÐ°Ð± ÑÐ±Ð°ÑÑÑÑ Ð·Ð°ÑÐ²Ð°Ð³Ñ Ð½Ð° ÐºÐ°ÑÑÐµ
   layouts: 
-    about: ÐÑÐ° Ð½Ð°Ñ
+    about: ÐÑÐ° Ð¿ÑÐ°ÐµÐºÑ
     community: Ð¡ÑÐ¿Ð¾Ð»ÑÐ½Ð°ÑÑÑÑ
     community_blogs: ÐÐ»Ð¾Ð³Ñ ÑÑÐ¿Ð¾Ð»ÑÐ½Ð°ÑÑÑ
     community_blogs_title: ÐÐ»Ð¾Ð³Ñ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÐ°Ñ ÑÑÐ¿Ð¾Ð»ÑÐ½Ð°ÑÑÑ OpenStreetMap
     copyright: ÐÑÑÐ°ÑÑÐºÐ°Ðµ Ð¿ÑÐ°Ð²Ð°
     data: ÐÐ°Ð´Ð·ÐµÐ½ÑÑ
     donate: ÐÐ°Ð´ÑÑÑÐ¼Ð°Ð¹ÑÐµ OpenStreetMap %{link} Ñ ÑÐ¾Ð½Ð´ Ð°Ð±Ð½Ð°ÑÐ»ÐµÐ½Ð½Ñ ÑÑÑÐ½ÑÐºÑ.
-    edit: ÐÐ¼ÑÐ½ÑÑÑ
+    edit: ÐÑÐ°Ð²ÑÑÑ
     edit_with: ÐÑÐ°Ð²ÑÑÑ Ð· Ð´Ð°Ð¿Ð°Ð¼Ð¾Ð³Ð°Ñ %{editor}
     export: Ð­ÐºÑÐ¿Ð°ÑÑ
     export_data: Ð­ÐºÑÐ¿Ð°ÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ
     foundation: Ð¤Ð¾Ð½Ð´
     foundation_title: Ð¤Ð¾Ð½Ð´ OpenStreetMap
-    gps_traces: GPS Ð¢ÑÑÐºÑ
-    gps_traces_tooltip: ÐÑÑÐ°Ð²Ð°ÑÑ GPS-ÑÑÑÐºÐ°Ð¼Ñ
+    gps_traces: GPS-ÑÐ»ÑÐ´Ñ
+    gps_traces_tooltip: ÐÑÑÐ°Ð²Ð°ÑÑ GPS-ÑÐ»ÑÐ´Ð°Ð¼Ñ
     help: ÐÐ°Ð²ÐµÐ´ÐºÐ°
     history: ÐÑÑÑÐ¾ÑÑÑ
     home: ÐÐ°Ð¼Ð¾Ñ
@@ -881,6 +1009,7 @@ be:
     osm_offline: ÐÐ°Ð·Ð° Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ OpenStreetMap Ð·Ð°ÑÐ°Ð· Ð¿Ð°-Ð·Ð° ÑÐµÑÑÐ²Ð°Ð¼, ÑÐ°Ð¼Ñ ÑÑÐ¾ Ð¿ÑÐ°ÑÐ¾Ð´Ð·ÑÑÑ Ð½ÐµÐ°Ð±ÑÐ¾Ð´Ð½Ð°Ñ ÑÑÑÐ½ÑÑÐ½Ð°Ñ Ð¿ÑÐ°ÑÐ°.
     osm_read_only: ÐÐ°Ð·Ð° Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ OpenStreetMap Ð·Ð°ÑÐ°Ð· Ð´Ð°ÑÑÑÐ¿Ð½Ð°Ñ ÑÐ¾Ð»ÑÐºÑ Ð´Ð»Ñ ÑÑÑÐ°Ð½Ð½Ñ, ÑÐ°Ð¼Ñ ÑÑÐ¾ Ð¿ÑÐ°ÑÐ¾Ð´Ð·ÑÑÑ Ð½ÐµÐ°Ð±ÑÐ¾Ð´Ð½Ð°Ñ ÑÑÑÐ½ÑÑÐ½Ð°Ñ Ð¿ÑÐ°ÑÐ°.
     partners_bytemark: Bytemark Hosting
+    partners_html: Ð¥Ð¾ÑÑÑÐ½Ð³ Ð¿Ð°Ð´ÑÑÑÐ¼Ð»ÑÐ²Ð°ÐµÑÑÐ° %{ucl}, %{ic} Ñ %{bytemark}, Ñ ÑÐ½ÑÑÐ¼Ñ %{partners}.
     partners_ic: Imperial College London
     partners_partners: Ð¿Ð°ÑÑÐ½ÑÑÑ
     partners_ucl: UCL VR-ÑÑÐ½ÑÑ
@@ -892,20 +1021,43 @@ be:
     user_diaries_tooltip: ÐÐ·ÑÐ½Ð½ÑÐºÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ
   license_page: 
     foreign: 
-      english_link: ÐÐ½Ð³ÐµÐ»ÑÑÐºÑ Ð°ÑÑÐ³ÑÐ½Ð°Ð»
+      english_link: Ð°Ð½Ð³ÐµÐ»ÑÑÐºÑÐ¼ Ð°ÑÑÐ³ÑÐ½Ð°Ð»Ð°Ð¼
       text: Ð£ Ð²ÑÐ¿Ð°Ð´ÐºÑ ÑÑÐ¿ÑÑÑÑÐ½Ð°ÑÑÑ Ð¿Ð°Ð¼ÑÐ¶ Ð³ÑÑÐ°Ð¹ Ð¿ÐµÑÐ°ÐºÐ»Ð°Ð´Ð·ÐµÐ½Ð°Ð¹ ÑÑÐ°ÑÐ¾Ð½ÐºÐ°Ð¹ Ñ %{english_original_link}, Ð°Ð½Ð³ÐµÐ»ÑÑÐºÐ°Ñ ÑÑÐ°ÑÐ¾Ð½ÐºÐ° Ð¿Ð°Ð²ÑÐ½Ð½Ð° Ð¼ÐµÑÑ Ð¿ÑÑÑÑÑÑÑÑ
       title: ÐÑÐ° Ð³ÑÑÑ Ð¿ÐµÑÐ°ÐºÐ»Ð°Ð´
     legal_babble: 
       attribution_example: 
+        alt: ÐÑÑÐºÐ»Ð°Ð´ ÑÐ°Ð³Ð¾, ÑÐº ÑÑÑÐ±Ð° ÑÐ¿Ð°ÑÑÐ»Ð°ÑÑÐ° Ð½Ð° OpenStreetMap Ð½Ð° ÑÑÐ°ÑÐ¾Ð½ÑÑ
         title: ÐÑÑÐºÐ»Ð°Ð´ ÑÐ¿Ð°ÑÑÐ»ÐºÑ
+      contributors_at_html: "<strong>ÐÑÑÑÑÑÑ</strong>: Ð£ÑÑÑÐ¼Ð»ÑÐ²Ð°Ðµ Ð·Ð²ÐµÑÑÐºÑ\n<a href=\"http://data.wien.gv.at/\">Ð³Ð¾ÑÐ°Ð´Ð° ÐÐµÐ½Ñ</a> Ð½Ð° ÑÐ¼Ð¾Ð²Ð°Ñ\n<a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>, <a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/Ð¿ÑÐ°Ð²ÑÐ»Ñ Ð²ÑÐºÐ°ÑÑÑÑÐ°Ð½Ð½Ñ API/weitereinformationen/Ð¿Ð°ÑÐ»ÑÐ³Ñ/wmsdienste.htm\">Ð·ÑÐ¼Ð»Ñ Ð¤Ð¾ÑÐ°ÑÐ»ÑÐ±ÐµÑÐ³</a>\nÐ·ÑÐ¼Ð»Ð¸ Ð¢ÑÑÐ¾Ð»Ñ (Ð½Ð° ÑÐ¼Ð¾Ð²Ð°Ñ <a href=\"http://www.tirol.gv.at/applikationen/e-Government/data/nutzungsbedingungen/\">CC BY AT Ð· Ð´Ð°Ð´Ð°ÑÐºÐ°Ð¼Ñ</a>)."
+      contributors_ca_html: "<strong>ÐÐ°Ð½Ð°Ð´Ð°</strong>: Ð£ÑÑÑÐ¼Ð»ÑÐ²Ð°Ðµ Ð·Ð²ÐµÑÑÐºÑ\nGeoBase&reg;, GeoGratis (&copy; ÐÑÐ¿Ð°ÑÑÐ°Ð¼ÐµÐ½ÑÐ° Ð¿ÑÑÑÐ¾Ð´Ð½ÑÑ ÑÑÑÑÑÑÐ°Ñ\nÐÐ°Ð½Ð°Ð´Ñ), CanVec (&copy; ÐÑÐ¿Ð°ÑÑÐ°Ð¼ÐµÐ½ÑÐ° Ð¿ÑÑÑÐ¾Ð´Ð½ÑÑ ÑÑÑÑÑÑÐ°Ñ\nÐÐ°Ð½Ð°Ð´Ñ), Ñ StatCan (Ð¡ÑÐ°ÑÑÑÑÑÑÐ½Ð°Ð³Ð° Ð¿Ð°Ð´ÑÐ°Ð·Ð´Ð·ÑÐ»ÐµÐ½Ð½Ñ ÐÐ°Ð½Ð°Ð´Ñ)."
+      contributors_fi_html: "<strong> Ð¤ÑÐ½Ð»ÑÐ½Ð´ÑÑ </ strong>: Ð·Ð¼ÑÑÑÐ°Ðµ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ Ð· ÑÐ°Ð¿Ð°Ð³ÑÐ°ÑÑÑÐ½Ð°Ð¹ Ð±Ð°Ð·Ñ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ ÐÐ°ÑÑÑÐ½Ð°Ð»ÑÐ½Ð°Ð¹ Ð·ÑÐ¼ÐµÐ»ÑÐ½Ð°Ð¹ ÑÐ»ÑÐ¶Ð±Ñ Ð¤ÑÐ½Ð»ÑÐ½Ð´ÑÑ Ñ ÑÐ½ÑÑÑ Ð½Ð°Ð±Ð¾ÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ Ð½Ð° ÑÐ¼Ð¾Ð²Ð°Ñ Ð»ÑÑÑÐ½Ð·ÑÑ \n<a href=\"http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501\">NLSFI</a>."
+      contributors_footer_1_html: ÐÐ°Ð´Ð°ÑÐºÐ¾Ð²ÑÑ ÑÐ½ÑÐ°ÑÐ¼Ð°ÑÑÑ Ð°Ð± Ð³ÑÑÑÑ Ñ ÑÐ½ÑÑÑ ÐºÑÑÐ½ÑÑÐ°Ñ, ÑÐºÑÑ Ð±ÑÐ»Ñ Ð²ÑÐºÐ°ÑÑÑÑÐ°Ð½ÑÑ Ð´Ð»Ñ Ð¿Ð°Ð»ÑÐ¿ÑÑÐ½Ð½Ñ ÐºÐ°ÑÑÑ OpenStreetMap, Ð¼Ð¾Ð¶Ð½Ð° Ð°ÑÑÑÐ¼Ð°ÑÑ Ð½Ð° ÑÑÐ°ÑÐ¾Ð½ÑÑ <a href="http://wiki.openstreetmap.org/wiki/Contributors">Ð£Ð´Ð·ÐµÐ»ÑÐ½ÑÐºÑ </a> Ð½Ð° ÐÑÐºÑ OpenStreetMap.
+      contributors_footer_2_html: "Ð£ÐºÐ»ÑÑÑÐ½Ð½Ðµ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ Ñ OpenStreetMap Ð½Ðµ Ð°Ð·Ð½Ð°ÑÐ°Ðµ, ÑÑÐ¾ Ð¿Ð°ÑÑÐ°ÑÑÑÑÐºÑ Ð¿Ð°ÑÐ°ÑÐºÐ¾Ð²ÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ\nÑÐºÑÐ¼-Ð½ÐµÐ±ÑÐ´Ð·Ñ ÑÑÐ½Ð°Ð¼ Ð¿Ð°Ð´ÑÑÑÐ¼Ð»ÑÐ²Ð°ÑÑÑ OpenStreetMap, Ð¿ÑÐ°Ð´ÑÑÐ°ÑÐ»ÑÑÑÑ Ð³Ð°ÑÐ°Ð½ÑÑÑ, ÑÑ\nÐ¿ÑÑÐ¼Ð°ÑÑÑ Ð½Ð° ÑÑÐ±Ðµ ÑÐºÑÑ-Ð½ÐµÐ±ÑÐ´Ð·Ñ Ð°Ð´ÐºÐ°Ð·Ð½Ð°ÑÑÑ."
+      contributors_fr_html: "<strong>Ð¤ÑÐ°Ð½ÑÑÑ</strong>: ÐÐ¼ÑÑÑÐ°Ðµ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ Ð°ÑÑÑÐ¼Ð°Ð½ÑÑ Ð°Ð´\nDirection GÃ©nÃ©rale des ImpÃ´ts."
+      contributors_gb_html: "<strong>ÐÑÐ»ÑÐºÐ°Ð±ÑÑÑÐ°Ð½ÑÑ</strong>: Ð£ÑÑÑÐ¼Ð»ÑÐ²Ð°Ðµ Ð·Ð²ÐµÑÑÐºÑ Ordnance\nSurvey &copy; Crown copyright and database right\n2010-12."
+      contributors_intro_html: "ÐÐ°ÑÑÐ¼Ñ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÐ°Ð¼Ñ Ð·'ÑÑÐ»ÑÑÑÑÐ° ÑÑÑÑÑÑ Ð»ÑÐ´Ð·ÐµÐ¹. ÐÑ ÑÐ°ÐºÑÐ°Ð¼Ð° ÑÐºÐ»ÑÑÐ°ÐµÐ¼ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ Ð°Ð´ Ð½Ð°ÑÑÑÐ½Ð°Ð»ÑÐ½ÑÑ ÐºÐ°ÑÑÐ°Ð³ÑÐ°ÑÑÑÐ½ÑÑ Ð°Ð³ÐµÐ½ÑÑÐ²Ð°Ñ, ÑÐºÑÑ ÑÐ°ÑÐ¿Ð°ÑÑÑÐ´Ð¶Ð²Ð°ÑÑÑÐ° Ð½Ð° ÑÐ¼Ð¾Ð²Ð°Ñ Ð°Ð´ÐºÑÑÑÑÑ Ð»ÑÑÑÐ½Ð·ÑÐ¹, ÑÑÑÐ¾Ð´ ÑÑ:"
+      contributors_nl_html: "<strong>ÐÑÐ´ÑÑÐ»Ð°Ð½Ð´Ñ</strong>: ÐÐ¼ÑÑÑÐ°Ðµ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ &copy; AND, 2007\n(<a href=\"http://www.and.com\">www.and.com</a>)"
+      contributors_nz_html: "<strong>ÐÐ¾Ð²Ð°Ñ ÐÐµÐ»Ð°Ð½Ð´ÑÑ</strong>: Ð£ÑÑÑÐ¼Ð»ÑÐ²Ð°Ðµ Ð·Ð²ÐµÑÑÐºÑ Ð¿ÑÐ°\nÐ·ÑÐ¼ÐµÐ»ÑÐ½ÑÑ ÑÑÑÑÑÑÑ ÐÐ¾Ð²Ð°Ð¹ ÐÑÐ»ÑÐ½Ð´ÑÑ. Crown Copyright reserved."
+      contributors_title_html: ÐÐ°ÑÑ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÑ
+      contributors_za_html: "<strong>ÐÐ°ÑÐ´Ð½ÑÐ²Ð°Ñ ÐÑÑÑÐºÐ°</strong>: ÐÐ¼ÑÑÑÐ°Ðµ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ Ð·\n<a href=\"http://www.ngi.gov.za/\">Chief Directorate: National Geo-Spatial Information</a>, State copyright reserved."
       credit_1_html: "ÐÑ Ð¿Ð°ÑÑÐ°Ð±ÑÐµÐ¼, ÐºÐ°Ð± Ð²ÑÐºÐ°ÑÑÑÑÐ¾ÑÐ²Ð°Ð»Ð°ÑÑ ÑÐ¿Ð°ÑÑÐ»ÐºÐ° &ldquo;&copy; OpenStreetMap\ncontributors&rdquo;."
+      credit_2_html: ÐÑ Ð¿Ð°Ð²ÑÐ½Ð½Ñ ÑÐ°ÐºÑÐ°Ð¼Ð° Ð´Ð°Ð²Ð°ÑÑ Ð´Ð°ÐºÐ»Ð°Ð´Ð½Ð° ÑÐ°Ð·ÑÐ¼ÐµÑÑ, ÑÑÐ¾ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ Ð´Ð°ÑÑÑÐ¿Ð½ÑÑ Ð½Ð° ÑÐ¼Ð¾Ð²Ð°Ñ Open Database License, Ð° Ñ Ð²ÑÐ¿Ð°Ð´ÐºÑ, ÐºÐ°Ð»Ñ Ð²Ñ ÐºÐ°ÑÑÑÑÐ°ÐµÑÐµÑÑ Ð³ÑÐ°ÑÑÑÐ½ÑÐ¼Ñ ÐºÐ°ÑÑÐ°Ð¼Ñ Ð· Ð½Ð°ÑÐ°Ð³Ð° ÑÐµÑÐ²ÐµÑÐ°, Ð½Ð° ÑÑ ÑÐ°ÑÐ¿Ð°ÑÑÑÐ´Ð¶Ð²Ð°ÑÑÑÐ° ÑÐ¼Ð¾Ð²Ñ CC-BY-SA. ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð·ÑÐ°Ð±ÑÑÑ Ð³ÑÑÐ° Ð¿Ð°Ð´Ð°ÑÑÑ ÑÐ¿Ð°ÑÑÐ»ÐºÑ Ð½Ð° <a href="http://www.openstreetmap.org/copyright">Ð³ÑÑÑÑ ÑÑÐ°ÑÐ¾Ð½ÐºÑ Ð· ÑÐ»ÑÐ¼Ð°ÑÑÐ½Ð½ÐµÐ¼ Ð»iÑÑÐ½Ð·iÐ¹Ð½ÑÑ Ð¿Ð°ÑÑÐ°Ð±Ð°Ð²Ð°Ð½Ð½ÑÑ</a>. Ð¦Ñ  Ð´Ð»Ñ Ð²ÑÐºÐ°Ð½Ð°Ð½Ð½Ñ Ð½Ð°ÑÑÑ Ð¿Ð°ÑÑÐ°Ð±Ð°Ð²Ð°Ð½Ð½ÑÑ Ð¿ÑÑ ÑÐ°ÑÐ¿Ð°ÑÑÑÐ´Ð·Ðµ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ OSM Ð²Ñ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð½ÐµÐ¿Ð°ÑÑÑÐ´Ð½Ð° ÑÐºÐ°Ð·Ð²Ð°ÑÑ Ð½Ð°Ð·Ð²Ñ Ð»ÑÑÑÐ½Ð·ÑÑ(Ð¹) Ñ ÑÐ¿Ð°ÑÑÐ»ÐºÑ Ð½Ð° ÑÐµ(ÑÑ) ÑÑÐºÑÑ. ÐÑÑ Ð²ÑÐºÐ°ÑÑÑÑÐ°Ð½Ð½Ñ Ð½Ð¾ÑÑÐ±ÑÑÐ°Ð¼Ñ, Ð´Ð·Ðµ Ð²ÑÐºÐ°ÑÑÑÑÐ°Ð½Ð½Ðµ Ð³ÑÐ¿ÐµÑÑÑÐºÑÑÐ°Ð²ÑÑ ÑÐ¿Ð°ÑÑÐ»Ð°Ðº Ð½ÐµÐ¼Ð°Ð³ÑÑÐ¼Ð° (Ð½Ð°Ð¿ÑÑÐºÐ»Ð°Ð´ Ð´ÑÑÐºÐ°Ð²Ð°Ð½ÑÑ Ð¼Ð°ÑÑÑÑÑÐ»Ñ), Ð¼Ñ Ð¿ÑÐ°Ð¿Ð°Ð½ÑÐµÐ¼ ÑÐ¿Ð°ÑÑÐ»Ð°ÑÑÐ° Ð½ÐµÐ¿Ð°ÑÑÑÐ´Ð½Ð° Ð½Ð° openstreetmap.org (Ð°Ð±Ð¾ Ð¿Ð°ÑÑÑÐ°ÑÑÑ "OpenStreetMap" Ð´Ð° Ð³ÑÑÐ°Ð³Ð° Ð¿Ð¾ÑÐ½Ð°Ð³Ð° Ð°Ð´ÑÐ°ÑÐ°), opendatacommons.org, Ð° ÐºÐ°Ð»Ñ ÑÑÑÐ±Ð°, Ñ Ð½Ð° creativecommons.org.
+      credit_3_html: "ÐÐ»Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÑ ÐºÐ°ÑÑ, Ð·Ð³Ð°Ð´ÐºÐ° Ð¿ÑÐ° ÐºÑÑÐ½ÑÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ Ð¿Ð°Ð²ÑÐ½Ð½Ð° Ð·Ð½Ð°ÑÐ¾Ð´Ð·ÑÑÑÐ° Ñ ÐºÑÑÐµ ÐºÐ°ÑÑÑ. \nÐÐ°Ð¿ÑÑÐºÐ»Ð°Ð´:"
       credit_title_html: Ð¯Ðº ÑÐ¿Ð°ÑÑÐ»Ð°ÑÑÐ° Ð½Ð° OpenStreetMap
+      infringement_1_html: Ð£Ð´Ð·ÐµÐ»ÑÐ½ÑÐºÑ ÑÑÐ¿Ð¾Ð»ÑÐ½Ð°ÑÑÑ OSM Ð¿Ð°Ð²ÑÐ½Ð½Ñ Ð·Ð°ÑÑÑÐ´Ñ Ð¿Ð°Ð¼ÑÑÐ°ÑÑ Ð¿ÑÐ° ÑÐ¾Ðµ, ÑÑÐ¾ Ð·Ð°Ð±Ð°ÑÐ°Ð½ÑÐµÑÑÐ° Ð´Ð°Ð´Ð°Ð²Ð°ÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ Ð· Ð»ÑÐ±ÑÑ Ð°Ð±Ð°ÑÐ¾Ð½ÐµÐ½ÑÑ Ð°ÑÑÐ°ÑÑÐºÑÐ¼ Ð¿ÑÐ°Ð²Ð°Ð¼ ÐºÑÑÐ½ÑÑ (Ð½Ð°Ð¿ÑÑÐºÐ»Ð°Ð´, Ð· Google Maps Ð°Ð±Ð¾ Ð· Ð´ÑÑÐºÐ°Ð²Ð°Ð½ÑÑ ÐºÐ°ÑÑ) Ð±ÐµÐ· Ð´Ð°Ð·Ð²Ð¾Ð»Ñ Ð¿ÑÐ°Ð²Ð°ÑÐ»Ð°Ð´Ð°Ð»ÑÐ½ÑÐºÐ°Ñ.
+      infringement_2_html: ÐÐ°Ð»Ñ Ð²Ñ Ð»ÑÑÑÑÐµ, ÑÑÐ¾ Ð°Ð±Ð°ÑÐ¾Ð½ÐµÐ½Ñ Ð°ÑÑÐ°ÑÑÐºÑÐ¼ Ð¿ÑÐ°Ð²Ð°Ð¼ Ð¼Ð°ÑÑÑÑÑÐ» Ð±ÑÑ Ð½ÐµÐ´Ð°ÑÑÑÐ½Ð° Ð´Ð°Ð´Ð°Ð´Ð·ÐµÐ½Ñ Ñ Ð±Ð°Ð·Ñ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ OpenStreetMap Ð°Ð±Ð¾ Ð´Ð° Ð³ÑÑÐ°Ð³Ð° ÑÐ°Ð¹ÑÑ, Ð°Ð·Ð½Ð°ÑÐ¼ÑÑÑÑ Ð· Ð½Ð°ÑÑÐ¼ <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">Ð¿Ð°ÑÐ°Ð´ÐºÐ°Ð¼ Ð²ÑÐ´Ð°Ð»ÐµÐ½Ð½Ñ ÑÐ°ÐºÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ</a> Ð°Ð±Ð¾ ÑÐºÐ°ÑÑÑÑÐ°Ð¹ÑÐµÑÑ Ð½ÐµÐ¿Ð°ÑÑÑÐ´Ð½Ð° Ð½Ð°ÑÐ°Ð¹ <a href="http://dmca.openstreetmap.org/">ÑÑÐ°ÑÐ¾Ð½ÐºÐ°Ð¹ Ð´Ð»Ñ Ð¾Ð½Ð»Ð°Ð¹Ð½ Ð·Ð²Ð°ÑÐ¾ÑÐ°Ñ</a>.
+      infringement_title_html: ÐÐ°ÑÑÑÑÐ½Ð½Ðµ Ð°ÑÑÐ°ÑÑÐºÑÑ Ð¿ÑÐ°Ð²Ð¾Ñ
       intro_1_html: ÐÐ°Ð´Ð·ÐµÐ½ÑÑ Ð¿ÑÐ°ÐµÐºÑÑ OpenStreetMap ÑÐ°ÑÐ¿Ð°ÑÑÑÐ´Ð¶Ð²Ð°ÑÑÑÐ° Ð¿Ð° Ð»ÑÑÑÐ½Ð·ÑÑ <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL).
+      intro_2_html: "ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ ÐºÐ°Ð¿ÑÑÐ²Ð°ÑÑ, ÑÐ°ÑÐ¿Ð°ÑÑÑÐ´Ð¶Ð²Ð°ÑÑ, Ð¿ÐµÑÐ°Ð´Ð°Ð²Ð°ÑÑ Ñ Ð·Ð¼ÑÐ½ÑÑÑ Ð½Ð°ÑÑÑ  Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ Ð´Ð° ÑÐ¾Ð¹ Ð¿Ð°ÑÑ Ð¿Ð°ÐºÑÐ»Ñ ÐÑ ÑÐ¿Ð°ÑÑÐ»Ð°ÐµÑÐµÑÑ Ð½Ð° OpenStreetMap Ñ ÑÐµ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÐ°Ñ. ÐÐ°Ð»Ñ ÐÑ Ð·Ð¼ÑÐ½ÑÐµÑÐµ ÑÑ Ð²ÑÐºÐ°ÑÑÑÑÐ¾ÑÐ²Ð°ÐµÑÐµ Ð½Ð°ÑÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ, ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ ÑÐ°ÑÐ¿Ð°ÑÑÑÐ´Ð¶Ð²Ð°ÑÑ Ð²ÑÐ½ÑÐºÑ ÑÐ¾Ð»ÑÐºÑ Ð½Ð° ÑÐ¼Ð¾Ð²Ð°Ñ ÑÐ°ÐºÐ¾Ð¹ Ð¶Ð° Ð»ÑÑÑÐ½Ð·ÑÑ. ÐÐ¾ÑÐ½Ñ \n<a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">ÑÑÐºÑÑ Ð»ÑÑÑÐ½Ð·ÑÑ</a> ÑÐ°ÑÑÐ»ÑÐ¼Ð°ÑÑÑÑ ÐÐ°Ð¼ Ð¿ÑÐ°Ð²Ñ Ñ Ð°Ð´ÐºÐ°Ð·Ð½Ð°ÑÑÑ."
+      intro_3_html: "ÐÐ°ÑÑÑ Ñ Ð³ÑÐ°ÑÑÑÐ½ÑÐ¼ Ð²ÑÐ³Ð»ÑÐ´Ð·Ðµ, Ð° ÑÐ°ÐºÑÐ°Ð¼Ð° Ð´Ð°ÐºÑÐ¼ÐµÐ½ÑÐ°ÑÑÑ ÑÐ°ÑÐ¿Ð°ÑÑÑÐ´Ð¶Ð²Ð°ÑÑÑÐ° Ð½Ð° ÑÐ¼Ð¾Ð²Ð°Ñ <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">ÐÑÑÐµÐ½Ð·ÑÑ Creative \nCommons Attribution-ShareAlike 2.0</a> (CC-BY-SA)."
+      more_1_html: ÐÐ°Ð²ÐµÐ´Ð°Ð¹ÑÐµÑÑ Ð±Ð¾Ð»ÑÑ Ð°Ð± Ð²ÑÐºÐ°ÑÑÑÑÐ°Ð½Ð½Ñ Ð½Ð°ÑÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ Ñ Ð°Ð± ÑÑÐ¼, ÑÐº Ð¿Ð°ÐºÐ°Ð·Ð²Ð°ÑÑ Ð½Ð°Ñ ÑÐº ÐºÑÑÐ½ÑÑÑ Ð¿Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ñ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ Ñ <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Ð°Ð´ÐºÐ°Ð·Ð°Ñ Ð¿Ð° Ð¿ÑÐ°Ð²Ð°Ð²ÑÑ Ð¿ÑÑÐ°Ð½Ð½Ñ</a>.
+      more_2_html: Ð¥Ð¾ÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ OpenStreetMap Ð·'ÑÑÐ»ÑÐµÑÑÐ° Ð°Ð´ÐºÑÑÑÑÐ¼Ñ Ð´Ð°Ð´Ð·ÐµÐ½ÑÐ¼Ñ, Ð¼Ñ Ð½Ðµ Ñ ÑÑÐ°Ð½Ðµ Ð¿ÑÐ°Ð´Ð°ÑÑÐ°ÑÐ»ÑÑÑ Ð±ÑÑÐ¿Ð»Ð°ÑÐ½Ñ ÐºÐ°ÑÑÐ°Ð³ÑÐ°ÑÑÑÐ½Ñ API Ð´Ð»Ñ ÑÐ½ÑÑÑ ÑÐ°ÑÐ¿ÑÐ°ÑÐ¾ÑÐ½ÑÐºÐ°Ñ. ÐÐ·Ð½Ð°ÑÐ¼ÑÑÑÑ Ð· Ð½Ð°ÑÑÐ¼Ñ <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">ÐÑÐ°Ð²ÑÐ»Ð°Ð¼Ñ Ð²ÑÐºÐ°ÑÑÑÑÐ°Ð½Ð½Ñ API</a>, <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">ÐÑÐ°Ð²ÑÐ»Ð°Ð¼Ñ Ð²ÑÐºÐ°ÑÑÑÑÐ°Ð½Ð½Ñ Ð³ÑÐ°ÑÑÑÐ½ÑÑ ÐºÐ°ÑÑ</a> Ñ <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">ÐÑÐ°Ð²ÑÐ»Ð°Ð¼Ñ Ð²ÑÐºÐ°ÑÑÑÑÐ°Ð½Ð½Ñ ÑÑÑÐ²ÑÑÑ Nominatim</a>.
       more_title_html: ÐÐ°Ð²ÐµÐ´Ð°ÑÑÐ° Ð±Ð¾Ð»ÑÑ
       title_html: ÐÑÑÐ°ÑÑÐºÑÑ Ð¿ÑÐ°Ð²Ñ Ñ Ð»ÑÑÑÐ½Ð·ÑÑ
     native: 
       mapping_link: Ð¿Ð°ÑÐ°ÑÑ Ð¼Ð°Ð»ÑÐ²Ð°ÑÑ ÐºÐ°ÑÑÑ
       native_link: Ð±ÐµÐ»Ð°ÑÑÑÐºÐ°Ñ Ð²ÐµÑÑÑÑ
+      text: ÐÑ Ð¿ÑÐ°Ð³Ð»ÑÐ´Ð°ÐµÑÐµ Ð°Ð½Ð³ÐµÐ»ÑÑÐºÑÑ Ð²ÑÑÑÑÑ ÑÑÐ°ÑÐ¾Ð½ÐºÑ Ð°ÑÑÐ°ÑÑÐºÑÑ Ð¿ÑÐ°Ð²Ð¾Ñ. ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð²ÑÑÐ½ÑÑÑÐ° Ð´Ð° %{native_link} Ð³ÑÑÐ°Ð¹ ÑÑÐ°ÑÐ¾Ð½ÐºÑ ÑÑ ÑÐ¿ÑÐ½ÑÑÑ ÑÑÑÐ°Ð½Ð½Ðµ Ð¿ÑÐ° Ð°ÑÑÐ°ÑÑÐºÑÑ Ð¿ÑÐ°Ð²Ñ Ñ %{mapping_link}.
       title: ÐÑÐ° Ð³ÑÑÑÑ ÑÑÐ°ÑÐ¾Ð½ÐºÑ
   message: 
     delete: 
@@ -913,11 +1065,12 @@ be:
     inbox: 
       date: ÐÐ°ÑÐ°
       from: ÐÐ´
+      messages: Ð£ Ð²Ð°Ñ %{new_messages} Ñ %{old_messages}
       my_inbox: ÐÐ°Ðµ ÑÐ²Ð°ÑÐ¾Ð´Ð½ÑÑ
       new_messages: 
         one: "%{count} Ð½Ð¾Ð²Ð°Ðµ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ"
         other: "%{count} Ð½Ð¾Ð²ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ"
-      no_messages_yet: Ð£ Ð²Ð°Ñ Ð¿Ð°ÐºÑÐ»Ñ Ð½ÑÐ¼Ð° Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ. Ð§Ð°Ð¼Ñ Ð± Ð½Ðµ Ð·ÐºÐ°Ð°ÑÐ´ÑÐ½Ð°Ð²Ð°ÑÑÐ° Ð·  %{people_mapping_nearby_link}?
+      no_messages_yet: Ð£ Ð²Ð°Ñ Ð¿Ð°ÐºÑÐ»Ñ Ð½ÑÐ¼Ð° Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ. Ð§Ð°Ð¼Ñ Ð± Ð½Ðµ Ð·ÐºÐ°Ð°ÑÐ´ÑÐ½Ð°Ð²Ð°ÑÑÐ° Ð·  %{people_mapping_nearby_link}?
       old_messages: 
         one: "%{count} ÑÑÐ°ÑÐ¾Ðµ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ"
         other: "%{count} ÑÑÐ°ÑÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ"
@@ -953,7 +1106,7 @@ be:
         one: ÐÑ Ð°Ð´Ð°ÑÐ»Ð°Ð»Ñ %{count} Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ
         other: ÐÑ Ð°Ð´Ð°ÑÐ»Ð°Ð»Ñ %{count} Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ
       my_inbox: ÐÐ°Ðµ %{inbox_link}
-      no_sent_messages: Ð£ Ð²Ð°Ñ Ð¿Ð°ÐºÑÐ»Ñ Ð½ÑÐ¼Ð° Ð´Ð°ÑÐ»Ð°Ð½ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ. Ð§Ð°Ð¼Ñ Ð± Ð½Ðµ Ð·ÐºÐ°Ð°ÑÐ´ÑÐ½Ð°Ð²Ð°ÑÑÐ° Ð· %{people_mapping_nearby_link}?
+      no_sent_messages: Ð£ Ð²Ð°Ñ Ð¿Ð°ÐºÑÐ»Ñ Ð½ÑÐ¼Ð° Ð´Ð°ÑÐ»Ð°Ð½ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ. Ð§Ð°Ð¼Ñ Ð± Ð½Ðµ Ð·ÐºÐ°Ð°ÑÐ´ÑÐ½Ð°Ð²Ð°ÑÑÐ° Ð· %{people_mapping_nearby_link}?
       outbox: Ð·ÑÑÐ¾Ð´Ð½ÑÑ
       people_mapping_nearby: Ð»ÑÐ´Ð·ÑÐ¼Ñ, ÑÑÐ¾ Ð¶ÑÐ²ÑÑÑ Ð½ÐµÐ¿Ð°Ð´Ð°Ð»ÑÐºÑ
       subject: Ð¢ÑÐ¼Ð°
@@ -968,6 +1121,9 @@ be:
       title: ÐÑÐ°ÑÑÑÐ°ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ
       to: ÐÐ°Ð¼Ñ
       unread_button: ÐÐ´Ð·Ð½Ð°ÑÑÑÑ, ÑÐº Ð½ÐµÐ¿ÑÐ°ÑÑÑÐ°Ð½Ð°Ðµ
+      wrong_user: ÐÑ ÑÐ²Ð°Ð¹ÑÐ»Ñ Ñ ÑÑÑÑÑÐ¼Ñ ÑÐº `%{user}', Ð°Ð»Ðµ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ, ÑÐºÐ¾Ðµ ÐÑ Ð¶Ð°Ð´Ð°ÐµÑÐµ Ð¿ÑÐ°ÑÑÑÐ°ÑÑ, Ð±ÑÐ»Ð¾ Ð´Ð°ÑÐ»Ð°Ð½Ð°Ðµ Ð½Ðµ Ð³ÑÑÑÐ¼ ÑÑ Ð³ÑÑÐ°Ð¼Ñ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÑ. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, ÑÐ²Ð°Ð¹Ð´Ð·ÑÑÐµ ÑÐº ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº, Ð°Ð´Ð¿Ð°Ð²ÐµÐ´Ð½Ð° Ð·Ð°Ð¿ÑÑÑ, ÐºÐ°Ð± Ð¿ÑÐ°ÑÑÑÐ°ÑÑ.
+    reply: 
+      wrong_user: ÐÑ ÑÐ²Ð°Ð¹ÑÐ»Ñ Ñ ÑÑÑÑÑÐ¼Ñ ÑÐº `%{user}', Ð°Ð»Ðµ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ, Ð½Ð° ÑÐºÐ¾Ðµ ÐÑ Ð¶Ð°Ð´Ð°ÐµÑÐµ Ð°Ð´ÐºÐ°Ð·Ð°ÑÑ, Ð½Ðµ Ð±ÑÐ»Ð¾ Ð´Ð°ÑÐ»Ð°Ð½Ð°Ðµ Ð³ÑÑÐ°Ð¼Ñ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÑ. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, ÑÐ²Ð°Ð¹Ð´Ð·ÑÑÐµ ÑÐº ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº, Ð°Ð´Ð¿Ð°Ð²ÐµÐ´Ð½Ð° Ð·Ð°Ð¿ÑÑÑ, ÐºÐ°Ð± Ð°Ð´ÐºÐ°Ð·Ð°ÑÑ.
     sent_message_summary: 
       delete_button: ÐÑÐ´Ð°Ð»ÑÑÑ
   note: 
@@ -991,9 +1147,12 @@ be:
       heading: ÐÐ°ÑÐ²Ð°Ð³Ñ %{user}'Ð°
       id: Id
       last_changed: ÐÐ¿Ð¾ÑÐ½ÑÑ Ð·Ð¼ÐµÐ½Ñ
+      subheading: ÐÐ°ÑÐ²Ð°Ð³Ñ, ÑÑÐ²Ð¾ÑÐ°Ð½ÑÑ ÑÑ Ð¿ÑÐ°ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ð²Ð°Ð½ÑÑ %{user}
+      title: ÐÐ°ÑÐ²Ð°Ð³Ñ, ÑÑÐ²Ð¾ÑÐ°Ð½ÑÑ ÑÑ Ð¿ÑÐ°ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ð²Ð°Ð½ÑÑ %{user}
     rss: 
       closed: Ð·Ð°ÐºÑÑÑÐ°Ñ Ð·Ð°ÑÐ²Ð°Ð³Ð° (ÐºÐ°Ð»Ñ %{place})
       commented: Ð½Ð¾Ð²Ñ ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ñ (ÐºÐ°Ð»Ñ %{place})
+      description_area: Ð¡Ð¿ÑÑ Ð·Ð°ÑÐ²Ð°Ð³ ÑÑÐ²Ð¾ÑÐ°Ð½ÑÑ, Ð¿ÑÐ°ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ð²Ð°Ð½ÑÑ ÑÑ Ð²ÑÑÐ°ÑÐ°Ð½ÑÑ Ñ Ð²Ð°ÑÑÐ¼ ÑÑÐ³ÑÑÐ½Ðµ [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
       description_item: RSS-ÑÑÑÐ¶ÐºÐ° Ð·Ð°ÑÐ²Ð°Ð³ %{id}
       opened: Ð½Ð¾Ð²Ð°Ñ Ð·Ð°ÑÐ²Ð°Ð³Ð° (ÐºÐ°Ð»Ñ %{place})
       reopened: Ð¿ÐµÑÐ°Ð°Ð´ÐºÑÑÑÐ°Ñ Ð·Ð°ÑÐ²Ð°Ð³Ð° (ÐºÐ°Ð»Ñ %{place})
@@ -1013,8 +1172,10 @@ be:
     email_confirm_plain: 
       click_the_link: ÐÐ°Ð»Ñ Ð³ÑÑÐ° Ð²Ñ, ÑÐ¾ Ð¿ÐµÑÐ°Ð¹Ð´Ð·ÑÑÐµ Ð¿Ð° ÑÐ¿Ð°ÑÑÐ»ÑÑ, ÑÐ°Ð·Ð¼ÐµÑÑÐ°Ð½Ð°Ð¹ Ð½ÑÐ¶ÑÐ¹, ÐºÐ°Ð± Ð¿Ð°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ Ð·Ð¼ÐµÐ½Ñ.
       greeting: ÐÐ¾Ð±ÑÑ Ð´Ð·ÐµÐ½Ñ,
+      hopefully_you: "Ð¥ÑÐ¾ÑÑÑÑ (ÑÐ¿Ð°Ð´Ð·ÑÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) Ð¶Ð°Ð´Ð°Ðµ Ð·Ð¼ÑÐ½ÑÑÑ ÑÐ²Ð¾Ð¹ Ð°Ð´ÑÐ°Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ Ñ %{server_url} Ð½Ð° Ð°Ð´ÑÐ°Ñ: %{new_address}."
     friend_notification: 
-      had_added_you: "%{user} Ð´Ð°Ð´Ð°Ñ Ð²Ð°Ñ, ÑÐº ÑÑÐ±ÑÐ°, Ð½Ð° OpenStreetMap."
+      befriend_them: ÐÑ ÑÐ°ÐºÑÐ°Ð¼Ð° Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿Ð°ÑÑÐ±ÑÐ°Ð²Ð°ÑÑ Ð· ÑÐ¼Ñ Ð½Ð° %{befriendurl}.
+      had_added_you: "%{user} Ð¿Ð°ÑÑÐ±ÑÐ°Ð²Ð°Ñ Ð· ÐÐ°Ð¼Ñ Ð½Ð° OpenStreetMap."
       see_their_profile: ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ Ð¿ÑÐ¾ÑÑÐ»Ñ Ð½Ð° %{userurl} Ñ Ð´Ð°Ð´Ð°ÑÑ, ÑÐº ÑÑÐ±ÑÐ°, Ñ Ð°Ð´ÐºÐ°Ð·, ÐºÐ°Ð»Ñ ÑÐ¾ÑÐ°ÑÐµ.
       subject: "[OpenStreetMap] %{user} Ð´Ð°Ð´Ð°Ñ Ð²Ð°Ñ Ñ ÑÐ¿ÑÑ ÑÐ²Ð°ÑÑ ÑÑÐ±ÑÐ¾Ñ"
     gpx_notification: 
@@ -1028,7 +1189,7 @@ be:
       greeting: ÐÑÑÐ²ÑÑÐ°Ð½Ð½Ðµ,
       success: 
         loaded_successfully: Ð¿Ð°ÑÐ¿ÑÑÐ¾Ð²Ð° Ð·Ð°Ð³ÑÑÐ¶Ð°Ð½Ñ %{trace_points} Ð· Ð¼Ð°Ð³ÑÑÐ¼ÑÑ %{possible_points} ÐºÑÐ¾Ð¿Ð°Ðº.
-        subject: "[OpenStreetMap] ÐÐ¼Ð¿Ð°ÑÑ GPX Ð¼ÑÐ½ÑÑ Ð¿Ð°ÑÐ¿ÑÑÐ¾Ð²Ð°"
+        subject: "[OpenStreetMap] ÐÐ°ÑÐ¿ÑÑÐ¾Ð²Ñ ÑÐ¼Ð¿Ð°ÑÑ GPX"
       with_description: Ð· Ð°Ð¿ÑÑÐ°Ð½Ð½ÐµÐ¼
       your_gpx_file: ÐÑÑÐ° Ð²ÑÐ³Ð»ÑÐ´Ð°Ðµ ÑÐº Ð²Ð°Ñ ÑÐ°Ð¹Ð» GPX
     lost_password: 
@@ -1036,52 +1197,128 @@ be:
     lost_password_html: 
       click_the_link: ÐÐ°Ð»Ñ Ð³ÑÑÐ° Ð²Ñ, ÐºÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿ÐµÑÐ°Ð¹Ð´Ð·ÑÑÐµ Ð¿Ð° ÑÐ¿Ð°ÑÑÐ»ÑÑ, Ð¿Ð°ÐºÐ°Ð·Ð°Ð½Ð°Ð¹ Ð½ÑÐ¶ÑÐ¹, ÐºÐ°Ð± Ð·Ð¼ÑÐ½ÑÑÑ Ð²Ð°Ñ Ð¿Ð°ÑÐ¾Ð»Ñ.
       greeting: ÐÑÑÐ²ÑÑÐ°Ð½Ð½Ðµ,
-      hopefully_you: Ð¥ÑÐ¾ÑÑÑÑ (ÑÐ¿Ð°Ð´Ð·ÑÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) Ð·Ð°Ð¿ÑÑÐ°Ñ Ð·Ð¼ÐµÐ½Ñ Ð¿Ð°ÑÐ¾Ð»Ñ Ð´Ð»Ñ Ð³ÑÑÐ°Ð³Ð° Ð°Ð´ÑÐ°ÑÑ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ, Ð·Ð°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°Ð½Ð°Ð³Ð° Ð½Ð° openstreetmap.org.
+      hopefully_you: Ð¥ÑÐ¾ÑÑÑÑ (ÑÐ¿Ð°Ð´Ð·ÑÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) Ð·Ð°Ð¿ÑÑÐ°Ñ Ð·Ð¼ÐµÐ½Ñ Ð¿Ð°ÑÐ¾Ð»Ñ Ð´Ð»Ñ ÑÐ°ÑÑÐ½ÐºÑ Ð½Ð° openstreetmap.org, ÑÐºÑ Ð²ÑÐºÐ°ÑÑÑÑÐ¾ÑÐ²Ð°Ðµ Ð³ÑÑÑ Ð°Ð´ÑÐ°Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ.
     lost_password_plain: 
       click_the_link: ÐÐ°Ð»Ñ Ð³ÑÑÐ° Ð²Ñ, ÐºÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿ÐµÑÐ°Ð¹Ð´Ð·ÑÑÐµ Ð¿Ð° ÑÐ¿Ð°ÑÑÐ»ÑÑ, Ð¿Ð°ÐºÐ°Ð·Ð°Ð½Ð°Ð¹ Ð½ÑÐ¶ÑÐ¹, ÐºÐ°Ð± Ð·Ð¼ÑÐ½ÑÑÑ Ð²Ð°Ñ Ð¿Ð°ÑÐ¾Ð»Ñ.
       greeting: ÐÑÑÐ²ÑÑÐ°Ð½Ð½Ðµ,
+      hopefully_you: Ð¥ÑÐ¾ÑÑÑÑ (ÑÐ¿Ð°Ð´Ð·ÑÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) Ð·Ð°Ð¿ÑÑÐ°Ñ Ð·Ð¼ÐµÐ½Ñ Ð¿Ð°ÑÐ¾Ð»Ñ Ð´Ð»Ñ ÑÐ°ÑÑÐ½ÐºÑ Ð½Ð° openstreetmap.org, ÑÐºÑ Ð²ÑÐºÐ°ÑÑÑÑÐ¾ÑÐ²Ð°Ðµ Ð³ÑÑÑ Ð°Ð´ÑÐ°Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ.
     message_notification: 
+      footer_html: ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ ÑÐ°ÐºÑÐ°Ð¼Ð° Ð¿ÑÐ°ÑÑÑÐ°ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ Ð½Ð° %{readurl}, Ñ Ð²Ñ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð°Ð´ÐºÐ°Ð·Ð°ÑÑ Ð½Ð° %{replyurl}
       header: "%{from_user} Ð°Ð´Ð¿ÑÐ°Ð²ÑÑ Ð²Ð°Ð¼ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ Ð· ÑÑÐ¼Ð°Ð¹ %{subject} Ð¿ÑÐ°Ð· OpenStreetMap:"
       hi: ÐÑÑÐ²ÑÑÐ°Ð½Ð½Ðµ, %{to_user},
     note_comment_notification: 
       anonymous: ÐÐ½Ð°Ð½ÑÐ¼Ð½Ñ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº
+      closed: 
+        commented_note: "%{commenter} Ð²ÑÑÐ°ÑÑÑ Ð·Ð°ÑÐ²Ð°Ð³Ñ Ð½Ð° ÐºÐ°ÑÑÐµ, ÑÑÐ¾ Ð²Ñ ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ð²Ð°Ð»Ñ. ÐÐ°ÑÐ²Ð°Ð³Ð° ÐºÐ°Ð»Ñ %{place}."
+        subject_other: "[OpenStreetMap] %{commenter} Ð²ÑÑÐ°ÑÑÑ Ð·Ð°ÑÐ²Ð°Ð³Ñ, ÑÑÐ¾ Ð¼Ð¾Ð¶Ð° Ð±ÑÑÑ Ð²Ð°Ð¼ ÑÑÐºÐ°Ð²Ð°"
+        subject_own: "[OpenStreetMap] %{commenter} Ð²ÑÑÐ°ÑÑÑ Ð°Ð´Ð½Ñ Ð· Ð²Ð°ÑÑÑ Ð·Ð°ÑÐ²Ð°Ð³"
+        your_note: "%{commenter} Ð²ÑÑÐ°ÑÑÑ Ð°Ð´Ð½Ñ Ð· Ð²Ð°ÑÑÑ Ð·Ð°ÑÐ²Ð°Ð³ Ð½Ð° ÐºÐ°ÑÑÐµ, ÐºÐ°Ð»Ñ %{place}."
+      commented: 
+        commented_note: "%{commenter} Ð¿ÑÐ°ÐºÐ°Ð¼ÐµÐ½Ð°Ð²Ð°Ñ Ð·Ð°ÑÐ²Ð°Ð³Ñ Ð½Ð° ÐºÐ°ÑÑÐµ, ÑÐºÑÑ Ð²Ñ ÑÐ°ÐºÑÐ°Ð¼Ð° ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ð²Ð°Ð»Ñ. ÐÐ°ÑÐ²Ð°Ð³Ð° ÐºÐ°Ð»Ñ %{place}."
+        subject_other: "[OpenStreetMap] %{commenter} Ð¿ÑÐ°ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ð²Ð°Ñ Ð·Ð°ÑÐ²Ð°Ð³Ñ, ÑÑÐ¾ Ð¼Ð¾Ð¶Ð° Ð±ÑÑÑ Ð²Ð°Ð¼ ÑÑÐºÐ°Ð²Ð°"
+        subject_own: "[OpenStreetMap] %{commenter} Ð¿ÑÐ°ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ð²Ð°Ñ Ð°Ð´Ð½Ñ Ð· Ð²Ð°ÑÑÑ Ð·Ð°ÑÐ²Ð°Ð³"
+        your_note: "%{commenter} Ð¿ÑÐ°ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ð²Ð°Ñ Ð°Ð´Ð½Ñ Ð· Ð²Ð°ÑÑÑ Ð·Ð°ÑÐ²Ð°Ð³ Ð½Ð° ÐºÐ°ÑÑÐµ, ÐºÐ°Ð»Ñ %{place}."
+      details: ÐÐ¾Ð»ÑÑ Ð¿Ð°Ð´ÑÐ°Ð±ÑÐ·Ð½Ð° Ð¿ÑÐ° ÑÐ²Ð°Ð³Ñ Ð¼Ð¾Ð¶Ð½Ð° Ð¿ÑÐ°ÑÑÑÐ°ÑÑ Ð½Ð° %{url}.
       greeting: ÐÑÑÐ²ÑÑÐ°Ð½Ð½Ðµ,
+      reopened: 
+        commented_note: "%{commenter} Ð¿ÐµÑÐ°Ð°Ð´ÑÑÐ½ÑÑ Ð·Ð°ÑÐ²Ð°Ð³Ñ Ð½Ð° ÐºÐ°ÑÑÐµ, ÑÐºÑÑ Ð²Ñ ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ð²Ð°Ð»Ñ. ÐÐ°ÑÐ²Ð°Ð³Ð° ÐºÐ°Ð»Ñ %{place}."
+        subject_other: "[OpenStreetMap] %{commenter} Ð¿ÐµÑÐ°Ð°Ð´ÑÑÐ½ÑÑ Ð·Ð°ÑÐ²Ð°Ð³Ñ, ÑÑÐ¾ Ð¼Ð¾Ð¶Ð° Ð±ÑÑÑ Ð²Ð°Ð¼ ÑÑÐºÐ°Ð²Ð°"
+        subject_own: "[OpenStreetMap] %{commenter} Ð¿ÐµÑÐ°Ð°Ð´ÑÑÐ½ÑÑ Ð°Ð´Ð½Ñ Ð· Ð²Ð°ÑÑÑ Ð·Ð°ÑÐ²Ð°Ð³"
+        your_note: "%{commenter} Ð¿ÐµÑÐ°Ð°Ð´ÑÑÐ½ÑÑ Ð°Ð´Ð½Ñ Ð· Ð²Ð°ÑÑÑ Ð·Ð°ÑÐ²Ð°Ð³ Ð½Ð° ÐºÐ°ÑÑÐµ, ÐºÐ°Ð»Ñ %{place}."
     signup_confirm: 
+      confirm: "ÐÐµÑÑ ÑÑÐ¼ Ð¼Ñ Ð·ÑÐ¾Ð±ÑÐ¼ ÑÑÐ¾-Ð½ÐµÐ±ÑÐ´Ð· ÑÑÑÑ, Ð¼Ñ Ð¿Ð°Ð²ÑÐ½Ð½Ñ Ð¿ÐµÑÐ°ÐºÐ°Ð½Ð°ÑÑÐ°, ÑÑÐ¾ Ð·Ð°Ð¿ÑÑ Ð¿Ð°ÑÑÑÐ¿ÑÑ Ð°Ð´ ÐÐ°Ñ; Ñ ÐºÐ°Ð»Ñ Ð³ÑÑÐ° Ð±ÑÐ»Ñ ÐÑ, ÐºÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð½Ð°ÑÑÑÐ½ÑÑÐµ Ð½Ð° ÑÐ¿Ð°ÑÑÐ»ÐºÑ Ð½ÑÐ¶ÑÐ¹, ÐºÐ°Ð± Ð¿Ð°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ ÐÐ°Ñ ÑÐ°ÑÑÐ½Ð°Ðº:"
+      created: Ð¥ÑÐ¾ÑÑÑÑ (ÑÐ¿Ð°Ð´Ð·ÑÐµÐ¼ÑÑ ÑÑÐ¾ ÐÑ) ÑÐ¾Ð»ÑÐºÑ ÑÑÐ¾ ÑÑÐ²Ð°ÑÑÑ ÑÐ°ÑÑÐ½Ð°Ðº Ð½Ð° %{site_url}.
       greeting: ÐÑÑÐ²ÑÑÐ°Ð½Ð½Ðµ!
       subject: "[OpenStreetMap] Ð¡Ð°ÑÐ´ÑÑÐ½Ð° Ð·Ð°Ð¿ÑÐ°ÑÐ°ÐµÐ¼ Ñ OpenStreetMap"
+      welcome: ÐÐ°ÑÐ»Ñ ÑÐ°Ð³Ð¾, ÑÐº Ð²Ñ Ð¿Ð°ÑÐ²ÐµÑÐ´Ð·ÑÑÐµ ÑÐ²Ð¾Ð¹ ÑÐ°ÑÑÐ½Ð°Ðº, Ð¼Ñ Ð´Ð°Ð¼Ð¾ ÐÐ°Ð¼ Ð¿Ð°ÑÑÑÐ°ÑÑ Ð´Ð°Ð´Ð°ÑÐºÐ¾Ð²ÑÑ ÑÐ½ÑÐ°ÑÐ¼Ð°ÑÑÑ.
   oauth: 
     oauthorize: 
       allow_read_gpx: ÑÑÑÐ°ÑÑ ÑÐ»Ð°ÑÐ½ÑÑ GPS-ÑÐ»ÑÐ´Ñ.
+      allow_read_prefs: ÑÑÑÐ°ÑÑ ÐÐ°ÑÑÑ Ð½Ð°Ð»Ð°Ð´Ñ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°.
+      allow_to: "ÐÐ°Ð·Ð²Ð¾Ð»ÑÑÑ ÐºÐ»ÑÐµÐ½ÑÐºÐ°Ð¼Ñ Ð´Ð°ÑÑÐ°ÑÐ°Ð²Ð°Ð½Ð½Ñ:"
       allow_write_api: Ð·Ð¼ÑÐ½ÑÑÑ ÐºÐ°ÑÑÑ.
+      allow_write_diary: ÑÑÐ²Ð°ÑÐ°ÑÑ Ð·Ð°Ð¿ÑÑÑ Ñ Ð´Ð·ÑÐ½Ð½ÑÐºÑ, ÐºÐ°Ð¼ÐµÐ½ÑÐ°ÑÑ Ñ Ð·Ð½Ð°ÑÐ¼ÑÑÑÐ°.
       allow_write_gpx: Ð°Ð´Ð°ÑÐ»Ð°ÑÑ GPS-ÑÐ»ÑÐ´Ñ.
       allow_write_notes: Ð·Ð¼ÑÐ½ÑÑÑ Ð·Ð°ÑÐ²Ð°Ð³Ñ.
+      allow_write_prefs: Ð·Ð¼ÑÐ½ÑÑÑ ÐÐ°ÑÑÑ Ð½Ð°Ð»Ð°Ð´Ñ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÐ°.
+      request_access: ÐÐ°ÑÑÐ°ÑÐ°Ð²Ð°Ð½Ð½Ðµ %{app_name} Ð¿Ð°ÑÑÐ°Ð±ÑÐµ Ð´Ð¾ÑÑÑÐ¿ Ð´Ð° ÐÐ°ÑÐ°Ð³Ð° ÑÐ°ÑÑÐ½ÐºÑ, %{user}. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿ÑÐ°Ð²ÐµÑÑÐµ, ÑÑ ÐÑ Ð¶Ð°Ð´Ð°ÐµÑÐµ, ÐºÐ°Ð± Ð´Ð°ÑÑÐ°ÑÐ°Ð²Ð°Ð½Ð½Ðµ Ð¼ÐµÐ»Ð° Ð½Ð°ÑÑÑÐ¿Ð½ÑÑ Ð¼Ð°Ð³ÑÑÐ¼Ð°ÑÑÑ. ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð²ÑÐ±ÑÐ°ÑÑ Ð»ÑÐ±ÑÑ ÐºÐ¾Ð»ÑÐºÐ°ÑÑÑ.
+      title: ÐÑÐ°Ð´Ð°ÑÑÐ°ÑÐ»ÐµÐ½Ð½Ðµ Ð´Ð¾ÑÑÑÐ¿Ñ Ð´Ð° ÐÐ°ÑÐ°Ð³Ð° ÑÐ°ÑÑÐ½ÐºÐ°
     oauthorize_failure: 
+      denied: ÐÑ ÑÐºÐ°ÑÐ°Ð²Ð°Ð»Ñ Ð´Ð°ÑÑÐ°ÑÐ°Ð²Ð°Ð½Ð½Ñ %{app_name} Ð´Ð¾ÑÑÑÐ¿ Ð´Ð° Ð²Ð°ÑÐ°Ð³Ð° ÑÐ°ÑÑÐ½ÐºÐ°.
+      invalid: Ð¢Ð¾ÐºÐµÐ½ Ð°ÑÑÐ°ÑÑÐ·Ð°ÑÑÑ Ð½Ðµ ÑÐ°Ð¿ÑÐ°ÑÐ´Ð½Ñ.
       title: ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð²ÑÐºÐ°Ð½Ð°ÑÑ Ð·Ð°Ð¿ÑÑ Ð°ÑÑÐ°ÑÑÐ·Ð°ÑÑÑ
     oauthorize_success: 
+      allowed: ÐÑ Ð½Ð°Ð´Ð°Ð»Ñ Ð´Ð°ÑÑÐ°ÑÐ°Ð²Ð°Ð½Ð½Ñ %{app_name} Ð´Ð¾ÑÑÑÐ¿ Ð´Ð° Ð²Ð°ÑÐ°Ð³Ð° ÑÐ°ÑÑÐ½ÐºÐ°.
+      title: ÐÐ°Ð¿ÑÑ Ð½Ð° Ð°ÑÑÐ°ÑÑÐ·Ð°ÑÑÑ Ð´Ð°Ð·Ð²Ð¾Ð»ÐµÐ½Ñ
       verification: "ÐÑÐ°Ð²ÐµÑÐ°ÑÐ½Ñ ÐºÐ¾Ð´: %{code}."
+    revoke: 
+      flash: ÐÑ Ð°Ð´ÐºÐ»ÑÐºÐ°Ð»Ñ ÑÐ¾ÐºÐµÐ½ Ð´Ð»Ñ Ð´Ð°ÑÑÐ°ÑÐ°Ð²Ð°Ð½Ð½Ñ %{application}
   oauth_clients: 
+    create: 
+      flash: ÐÐ½ÑÐ°ÑÐ¼Ð°ÑÑÑ Ð¿Ð°ÑÐ¿ÑÑÐ¾Ð²Ð° Ð·Ð°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°Ð½Ð°Ñ
+    destroy: 
+      flash: ÐÐ½ÑÑÑÐ°Ð½Ð°Ñ ÑÑÐ³ÑÑÑÑÐ°ÑÑÑ ÐºÐ»ÑÐµÐ½ÑÐºÐ°Ð³Ð° Ð´Ð°ÑÑÐ°ÑÐ°Ð²Ð°Ð½Ð½Ñ
     edit: 
       submit: Ð ÑÐ´Ð°Ð³Ð°Ð²Ð°ÑÑ
+      title: Ð ÑÐ´Ð°Ð³Ð°Ð²Ð°ÑÑ ÐÐ°ÑÐ°Ðµ Ð´Ð°ÑÑÐ°ÑÐ°Ð²Ð°Ð½Ð½Ðµ
     form: 
+      allow_read_gpx: ÑÑÑÐ°ÑÑ ÑÑ Ð¿ÑÑÐ²Ð°ÑÐ½ÑÑ GPS-ÑÐ»ÑÐ´Ñ.
+      allow_read_prefs: ÑÑÑÐ°ÑÑ ÑÑ Ð½Ð°Ð»Ð°Ð´Ñ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÐ°.
+      allow_write_api: Ð·Ð¼ÑÐ½ÑÑÑ ÐºÐ°ÑÑÑ.
+      allow_write_diary: ÑÑÐ²Ð°ÑÐ°ÑÑ Ð·Ð°Ð¿ÑÑÑ Ñ Ð´Ð·ÑÐ½Ð½ÑÐºÑ, ÐºÐ°Ð¼ÐµÐ½ÑÐ°ÑÑ Ñ Ð·Ð½Ð°ÑÐ¼ÑÑÑÐ°.
       allow_write_gpx: Ð°Ð´ÑÑÐ»Ð°ÑÑ GPS-ÑÐ»ÑÐ´Ñ.
       allow_write_notes: Ð·Ð¼ÑÐ½ÑÑÑ Ð·Ð°ÑÐ²Ð°Ð³Ñ.
+      allow_write_prefs: Ð·Ð¼ÑÐ½ÑÑÑ ÑÑ Ð½Ð°Ð»Ð°Ð´Ñ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÐ°.
+      callback_url: URL-Ð°Ð´ÑÐ°Ñ Ð·Ð²Ð°ÑÐ¾ÑÐ½Ð°Ð³Ð° Ð²ÑÐºÐ»ÑÐºÑ
       name: ÐÐ¼Ñ
+      requests: "ÐÐ°Ð¿ÑÑÐ°ÑÑ Ð½Ð°ÑÑÑÐ¿Ð½ÑÑ Ð´Ð°Ð·Ð²Ð¾Ð»Ñ Ð°Ð´ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÐ°:"
+      required: ÐÐ°ÑÑÐ°Ð±ÑÐµÑÑÐ°
+      support_url: URL-Ð°Ð´ÑÐ°Ñ Ð¿Ð°Ð´ÑÑÑÐ¼ÐºÑ
+      url: ÐÐ°Ð»Ð¾ÑÐ½Ñ URL-Ð°Ð´ÑÐ°Ñ Ð´Ð°ÑÑÐ°ÑÐ°Ð²Ð°Ð½Ð½Ñ
     index: 
+      application: ÐÐ°Ð·Ð²Ð° Ð´Ð°ÑÑÐ°ÑÐ°Ð²Ð°Ð½ÑÐ½Ñ
       issued_at: "ÐÑÐ¿ÑÑÐ°Ð½Ñ:"
+      list_tokens: "ÐÐ°ÑÑÑÐ¿Ð½ÑÑ ÑÐ¾ÐºÐµÐ½Ñ Ð±ÑÐ»Ñ ÑÑÐ²Ð¾ÑÐ°Ð½ÑÑ Ð´Ð»Ñ Ð´Ð°ÑÑÐ°ÑÐ°Ð²Ð°Ð½Ð½ÑÑ Ð½Ð° ÐÐ°ÑÐ°Ðµ ÑÐ¼Ñ:"
+      my_apps: ÐÐ°Ðµ ÐºÐ»ÑÐµÐ½ÑÐºÑÑ Ð´Ð°ÑÑÐ°ÑÐ°Ð²Ð°Ð½Ð½Ñ
+      my_tokens: ÐÐ°Ðµ Ð°ÑÑÐ°ÑÑÐ·Ð°Ð²Ð°Ð½ÑÑ Ð´Ð°ÑÑÐ°ÑÐ°Ð²Ð°Ð½Ð½Ñ
+      no_apps: ÐÑ Ð¼Ð°ÐµÑÐµ Ð´Ð°ÑÑÐ°ÑÐ°Ð²Ð°Ð½Ð½Ðµ, ÑÐºÐ¾Ðµ Ð¶Ð°Ð´Ð°ÐµÑÐµ Ð·Ð°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°ÑÑ Ð´Ð»Ñ ÑÐ·Ð°ÐµÐ¼Ð°Ð´Ð·ÐµÑÐ½Ð½Ñ Ð· Ð½Ð°Ð¼Ñ Ð¿ÑÐ°Ð· ÑÑÐ°Ð½Ð´Ð°ÑÑ %{oauth}? ÐÐ°Ð¼ Ð½ÐµÐ°Ð±ÑÐ¾Ð´Ð½Ð° Ð·Ð°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°ÑÑ ÐÐ°ÑÐ°Ðµ Ð²ÑÐ±-Ð´Ð°ÑÑÐ°ÑÐ°Ð²Ð°Ð½Ð½Ðµ Ð¿ÐµÑÐ°Ð´ ÑÑÐ¼, ÑÐº ÑÐ½Ð¾ Ð·Ð¼Ð¾Ð¶Ð° Ð·ÑÐ°Ð±ÑÑÑ OAuth-Ð·Ð°Ð¿ÑÑÑ Ð½Ð° Ð³ÑÑÑ ÑÐµÑÐ²ÑÑ.
+      register_new: ÐÐ°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°ÑÑ ÐÐ°ÑÐ°Ðµ Ð´Ð°ÑÑÐ°ÑÐ°Ð²Ð°Ð½Ð½Ðµ
+      registered_apps: "ÐÑ Ð¼Ð°ÐµÑÐµ Ð·Ð°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°Ð½ÑÐ¼Ñ Ð½Ð°ÑÑÑÐ¿Ð½ÑÑ ÐºÐ»ÑÐµÐ½ÑÐºÑÑ Ð´Ð°ÑÑÐ°ÑÐ°Ð²Ð°Ð½Ð½Ñ:"
       revoke: ÐÐ´Ð°Ð·Ð²Ð°Ð½Ñ!
+      title: ÐÐ°Ðµ Ð¿Ð°Ð´ÑÐ°Ð±ÑÐ·Ð½Ð°ÑÑÑ OAuth
     new: 
       submit: ÐÐ°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°ÑÑÐ°
+      title: ÐÐ°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°ÑÑ Ð½Ð¾Ð²Ð°Ðµ Ð´Ð°ÑÑÐ°ÑÐ°Ð²Ð°Ð½Ð½Ðµ
+    not_found: 
+      sorry: ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð½ÐµÐ¼Ð°Ð³ÑÑÐ¼Ð° Ð·Ð½Ð°Ð¹ÑÑÑ Ð³ÑÑÑ %{type}.
     show: 
-      allow_write_gpx: Ð°Ð´Ð°ÑÐ»Ð°ÑÑ GPS-ÑÐ»ÑÐ´Ñ.
+      access_url: "URL-Ð°Ð´ÑÐ°Ñ ÐºÐ»ÑÑÐ° Ð´Ð¾ÑÑÑÐ¿Ñ:"
+      allow_read_gpx: ÑÑÑÐ°ÑÑ ÑÑ Ð¿ÑÑÐ²Ð°ÑÐ½ÑÑ GPS-ÑÐ»ÑÐ´Ñ.
+      allow_read_prefs: ÑÑÑÐ°ÑÑ ÑÑ Ð½Ð°Ð»Ð°Ð´Ñ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°.
+      allow_write_api: Ð·Ð¼ÑÐ½ÑÑÑ ÐºÐ°ÑÑÑ.
+      allow_write_diary: ÑÑÐ²Ð°ÑÐ°ÑÑ Ð·Ð°Ð¿ÑÑÑ Ñ Ð´Ð·ÑÐ½Ð½ÑÐºÑ, ÐºÐ°Ð¼ÐµÐ½ÑÐ°ÑÑ Ñ Ð·Ð½Ð°ÑÐ¼ÑÑÑÐ°.
+      allow_write_gpx: Ð°Ð´ÑÑÐ»Ð°ÑÑ GPS-ÑÐ»ÑÐ´Ñ.
       allow_write_notes: Ð·Ð¼ÑÐ½ÑÑÑ Ð·Ð°ÑÐ²Ð°Ð³Ñ.
+      allow_write_prefs: Ð·Ð¼ÑÐ½ÑÑÑ ÑÑ Ð½Ð°Ð»Ð°Ð´Ñ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÐ°.
+      authorize_url: "URL-Ð°Ð´ÑÐ°Ñ Ð°ÑÑÐ°ÑÑÐ·Ð°ÑÑÑ:"
       confirm: ÐÑ ÑÐ¿ÑÑÐ½ÐµÐ½ÑÑ?
+      delete: ÐÑÐ´Ð°Ð»ÑÑÑ ÐºÐ»ÑÐµÐ½ÑÐ°
+      edit: Ð ÑÐ´Ð°Ð³Ð°Ð²Ð°ÑÑ Ð¿Ð°Ð´ÑÐ°Ð±ÑÐ·Ð½Ð°ÑÑÑ
+      key: "ÐÐ»ÑÑ ÑÐ¿Ð°Ð¶ÑÑÑÐ°:"
+      requests: "ÐÐ°Ð¿ÑÑ Ð½Ð°ÑÑÑÐ¿Ð½ÑÑ Ð´Ð°Ð·Ð²Ð¾Ð»Ð°Ñ Ð°Ð´ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÐ°:"
+      secret: "Ð¡Ð°ÐºÑÑÑ ÑÐ¿Ð°Ð¶ÑÑÑÐ°:"
+      support_notice: ÐÑ Ð¿Ð°Ð´ÑÑÑÐ¼Ð»ÑÐ²Ð°ÐµÐ¼ HMAC-SHA1 (ÑÑÐºÐ°Ð¼ÐµÐ½Ð´ÑÐµÑÑÐ°) Ñ Ð¿Ð¾Ð´Ð¿ÑÑÑ RSA-SHA1.
       title: ÐÐ°Ð´ÑÐ°Ð±ÑÐ·Ð½Ð°ÑÑÑÑ OAuth Ð´Ð»Ñ %{app_name}
+      url: "URL-Ð°Ð´ÑÐ°Ñ ÑÐ¾ÐºÐµÐ½Ð° Ð·Ð°Ð¿ÑÑÐ°:"
+    update: 
+      flash: ÐÐ»ÑÐµÐ½ÑÐºÐ°Ñ ÑÐ½ÑÐ°ÑÐ¼Ð°ÑÑÑ Ð±ÑÐ»Ð° Ð°Ð±Ð½Ð¾ÑÐ»ÐµÐ½Ð°Ñ Ð¿Ð°ÑÐ¿ÑÑÐ¾Ð²Ð°
   redaction: 
     create: 
       flash: Ð ÑÐ´Ð°ÐºÑÑÑ ÑÑÐ²Ð¾ÑÐ°Ð½Ð°.
     destroy: 
       error: ÐÐ´Ð±ÑÐ»Ð°ÑÑ Ð¿Ð°Ð¼ÑÐ»ÐºÐ° Ð¿ÑÑ Ð·Ð½ÑÑÑÑÐ½Ð½Ñ Ð³ÑÑÐ°Ð¹ ÑÑÐ´Ð°ÐºÑÑÑ.
       flash: Ð ÑÐ´Ð°ÐºÑÑÑ Ð·Ð½ÑÑÑÐ°Ð½Ð°.
+      not_empty: Ð ÑÐ´Ð°ÐºÑÑÑ Ð½Ðµ Ð¿ÑÑÑÐ°Ñ. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð°Ð´Ð¼ÑÐ½ÑÑÐµ ÑÑÐµ Ð²ÐµÑÑÑÑ, ÑÐºÑÑ Ð°Ð´Ð½Ð¾ÑÑÑÑÐ° Ð´Ð° Ð³ÑÑÐ°Ð¹ ÑÑÐ´Ð°ÐºÑÑÑ Ð¿ÐµÑÐ°Ð´ ÑÑÐ¼ ÑÐº ÑÐµ Ð·Ð½ÑÑÑÑÑÑ.
     edit: 
       description: ÐÐ¿ÑÑÐ°Ð½Ð½Ðµ
       heading: ÐÑÐ°ÑÐºÐ° ÑÑÐ´Ð°ÐºÑÑÑ
@@ -1108,31 +1345,50 @@ be:
       flash: ÐÐ¼ÐµÐ½Ñ Ð±ÑÐ»Ñ Ð·Ð°ÑÐ°Ð²Ð°Ð½ÑÑ.
   site: 
     edit: 
+      anon_edits_link_text: ÐÐ°Ð²ÐµÐ´Ð°ÑÑÐ° Ñ ÑÑÐ¼ ÑÐ¿ÑÐ°Ð²Ð°.
+      flash_player_required: ÐÐ°Ð± Ð²ÑÐºÐ°ÑÑÑÑÐ¾ÑÐ²Ð°ÑÑ ÑÑÐ´Ð°ÐºÑÐ°Ñ Potlatch Ð½ÐµÐ°Ð±ÑÐ¾Ð´Ð½Ñ Flash-Ð¿Ð»ÑÐµÑ. ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">Ð·Ð°Ð³ÑÑÐ·ÑÑÑ Flash-Ð¿Ð»ÑÐµÑ Ð· Adobe.com</a>. ÐÑÐ½ÑÑÑÑ Ñ <a href="http://wiki.openstreetmap.org/wiki/Editing">ÑÐ½ÑÑÑ Ð¼Ð°Ð³ÑÑÐ¼Ð°ÑÑÑ</a> Ð´Ð»Ñ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ñ OpenStreetMap.
+      id_not_configured: iD Ð½Ðµ Ð±ÑÑ Ð½Ð°ÑÑÑÐ¾ÐµÐ½Ñ
+      no_iframe_support: ÐÐ°Ñ Ð±ÑÐ°ÑÐ·ÑÑ Ð½Ðµ Ð¿Ð°Ð´ÑÑÑÐ¼Ð»ÑÐ²Ð°Ðµ HTML iframe, ÑÐºÑÑ Ð½ÐµÐ°Ð±ÑÐ¾Ð´Ð½ÑÑ Ð´Ð»Ñ Ð³ÑÑÐ°Ð¹ ÑÑÐ½ÐºÑÑÑ.
       not_public: ÐÑ Ð½Ðµ Ð´Ð°Ð·Ð²Ð¾Ð»ÑÐ»Ñ Ð·ÑÐ°Ð±ÑÑÑ ÑÑÐµ Ð²Ð°ÑÑÑ Ð·Ð¼ÐµÐ½Ñ Ð¿ÑÐ±Ð»ÑÑÐ½ÑÐ¼Ñ.
+      not_public_description: ÐÑ Ð±Ð¾Ð»ÑÑ Ð½Ðµ Ð¼Ð¾Ð¶Ð°ÑÐµ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°ÑÑ ÐºÐ°ÑÑÑ Ñ ÑÐ°ÐºÑÐ¼ ÑÑÐ¶ÑÐ¼Ðµ. ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð·ÑÐ°Ð±ÑÑÑ ÐÐ°ÑÑÑ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½ÑÐ½Ñ Ð¿ÑÐ±Ð»ÑÑÐ½ÑÐ¼Ñ Ð½Ð° ÐÐ°ÑÐ°Ð¹ %{user_page}.
+      potlatch2_not_configured: Potlatch 2 Ð½Ðµ Ð±ÑÑ Ð½Ð°Ð»Ð°Ð´Ð¶Ð°Ð½Ñ. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿Ð°Ð³Ð»ÑÐ´Ð·ÑÑÐµ http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 Ð´Ð»Ñ Ð´Ð°Ð´Ð°ÑÐºÐ¾Ð²Ð°Ð¹ ÑÐ½ÑÐ°ÑÐ¼Ð°ÑÑÑ
+      potlatch2_unsaved_changes: ÐÑ Ð¼Ð°ÐµÑÐµ Ð½ÐµÐ·Ð°ÑÐ°Ð²Ð°Ð½ÑÑ Ð·Ð¼ÐµÐ½Ñ. (ÐÐ°Ð± Ð·Ð°ÑÐ°Ð²Ð°ÑÑ Ñ Potlatch 2, ÐÐ°Ð¼ Ð½ÐµÐ°Ð±ÑÐ¾Ð´Ð½Ð° Ð½Ð°ÑÑÑÐ½ÑÑÑ ÐºÐ½Ð¾Ð¿ÐºÑ Â«Ð·Ð°ÑÐ°Ð²Ð°ÑÑÂ».)
       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.)
       user_page_link: ÑÑÐ°ÑÐ¾Ð½ÐºÐ° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°
     index: 
       createnote: ÐÐ°Ð´Ð°ÑÑ Ð·Ð°ÑÐ²Ð°Ð³Ñ
       js_1: ÐÑ ÐºÐ°ÑÑÑÑÐ°ÐµÑÐµÑÑ Ð²Ð°Ð½Ð´ÑÐ¾ÑÐ½ÑÐºÐ°Ð¼ Ð±ÐµÐ· Ð¿Ð°Ð´ÑÑÑÐ¼ÐºÑ JavaScript.
       js_2: OpenStreetMap Ð²ÑÐºÐ°ÑÑÑÑÐ¾ÑÐ²Ð°Ðµ JavaScript Ð´Ð»Ñ Ð°Ð´Ð»ÑÑÑÑÐ°Ð²Ð°Ð½Ð½Ñ ÐºÐ°ÑÑÑ Ð½Ð° ÑÐ°Ð¹ÑÐµ.
+      license: 
+        copyright: ÐÑÑÐ°ÑÑÐºÑÑ Ð¿ÑÐ°Ð²Ñ Ð½Ð°Ð»ÐµÐ¶Ð°ÑÑ OpenStreetMap Ñ ÑÐ³Ð¾ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÐ°Ð¼ Ð½Ð° ÑÐ¼Ð¾Ð²Ð°Ñ Ð°Ð´ÐºÑÑÑÐ°Ð¹ Ð»ÑÑÑÐ½Ð·ÑÑ.
       permalink: Ð¡Ð¿Ð°ÑÑÐ»ÐºÐ° ÑÑÐ´Ñ
-      shortlink: ÐÐ°ÑÐ¾ÑÐºÐ°Ñ ÑÐ¿Ð°ÑÑÐ»ÐºÐ°
+      remote_failed: ÐÐ°Ð¼ÑÐ»ÐºÐ° ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ñ. Ð£Ð¿ÑÑÐ½ÑÑÐµÑÑ, ÑÑÐ¾ JOSM ÑÑ Merkaartor Ð·Ð°Ð³ÑÑÐ¶Ð°Ð½ÑÑ Ñ Ð´Ð°Ð·Ð²Ð¾Ð»ÐµÐ½Ð°Ñ Ð¼Ð°Ð³ÑÑÐ¼Ð°ÑÑÑ Ð°Ð´Ð´Ð°Ð»ÐµÐ½Ð°Ð³Ð° ÐºÑÑÐ°Ð²Ð°Ð½Ð½Ñ
+      shortlink: ÐÐ°ÑÐ¾ÑÐºÐ°Ñ
     key: 
       table: 
         entry: 
           admin: ÐÐ´Ð¼ÑÐ½ÑÑÑÑÐ°ÑÑÐ¹Ð½Ð°Ñ Ð¼ÑÐ¶Ð°
-          allotments: ÐÐ°Ð´Ð·ÐµÐ»Ñ
+          allotments: Ð¡Ð°Ð´Ñ-Ð°Ð³Ð°ÑÐ¾Ð´Ñ
           apron: 
             - ÐÐµÑÐ¾Ð½ Ð°ÑÑÐ°Ð¿Ð¾ÑÑÐ°
             - ÑÑÑÐ¼ÑÐ½Ð°Ð»
+          bridge: ÐÐ¾ÑÑ (ÑÑÑÑÐ»ÑÐ½Ð°Ñ Ð»ÑÐ½ÑÑ)
+          bridleway: ÐÐ°ÑÐ¾Ð³Ð° Ð´Ð»Ñ ÐºÐ¾Ð½ÐµÐ¹
           brownfield: ÐÑÑÑÑÐ°Ð½Ð°Ñ Ð¿Ð»ÑÑÐ¾ÑÐºÐ° Ð´Ð»Ñ Ð·Ð°Ð±ÑÐ´Ð¾Ð²Ñ
           building: ÐÐ½Ð°ÑÐ½Ñ Ð±ÑÐ´ÑÐ½Ð°Ðº
+          byway: Ð¡ÑÐµÐ¶ÐºÐ°
+          cable: 
+            - ÐÐ°Ð½Ð°ÑÐ½Ð°Ñ Ð´Ð°ÑÐ¾Ð³Ð°
+            - ÐÑÑÑÐµÐ»ÑÐ½Ñ Ð¿Ð°Ð´'ÑÐ¼Ð½ÑÐº
           cemetery: ÐÐ¾Ð³ÑÐ»ÐºÑ
           centre: Ð¡Ð¿Ð°ÑÑÑÑÐ½Ñ ÑÑÐ½ÑÑ
           commercial: ÐÐ°Ð¼ÐµÑÑÑÐ¹Ð½Ð°Ñ Ð·Ð¾Ð½Ð°
           common: 
-            1: Ð»ÑÐ³
+            - ÐÐ³ÑÐ»ÑÐ½ÑÑ
+            - Ð»ÑÐ³
           construction: ÐÐ°ÑÐ¾Ð³Ñ Ñ ÑÑÐ°Ð´ÑÑ Ð±ÑÐ´Ð°ÑÐ½ÑÑÑÐ²Ð°
+          cycleway: ÐÐµÐ»Ð°ÑÑÐ¿ÐµÐ´Ð½Ð°Ñ Ð´Ð°ÑÐ¾Ð¶ÐºÐ°
+          destination: ÐÑÑÐ°Ð²Ñ Ð´Ð¾ÑÑÑÐ¿
           farm: Ð¤ÐµÑÐ¼Ð°
           footway: ÐÐµÑÐ°ÑÐ¾Ð´Ð½Ð°Ñ Ð´Ð°ÑÐ¾Ð¶ÐºÐ°
           forest: ÐÐµÑ
@@ -1143,7 +1399,7 @@ be:
             - ÐÐ¾Ð·ÐµÑÐ°
             - Ð²Ð°Ð´Ð°ÑÑÐ¾Ð²ÑÑÑÐ°
           military: ÐÐ°ÐµÐ½Ð½Ð°Ñ Ð·Ð¾Ð½Ð°
-          motorway: ÐÑÑÐ°Ð¼Ð°Ð±ÑÐ»ÑÐ½Ð°Ñ Ð´Ð°ÑÐ¾Ð³Ð°
+          motorway: ÐÑÑÐ°Ð¼Ð°Ð³ÑÑÑÑÐ°Ð»Ñ
           park: ÐÐ°ÑÐº
           permissive: ÐÐ¾ÑÑÑÐ¿ Ð· Ð´Ð°Ð·Ð²Ð¾Ð»Ñ
           pitch: Ð¡Ð¿Ð°ÑÑÑÑÐ½Ð°Ñ Ð¿Ð»ÑÑÐ¾ÑÐºÐ°
@@ -1152,6 +1408,7 @@ be:
           rail: Ð§ÑÐ³ÑÐ½ÐºÐ°
           reserve: ÐÐ°Ð¿Ð°Ð²ÐµÐ´Ð½ÑÐº
           resident: ÐÑÐ»Ñ ÑÐ°ÑÐ½
+          retail: ÐÐ°Ð½Ð´Ð»ÐµÐ²Ð°Ñ Ð¿Ð»Ð¾ÑÑÐ°
           runway: 
             - Ð£Ð·Ð»ÐµÑÐ½Ð°-Ð¿Ð°ÑÐ°Ð´Ð°ÑÐ½Ð°Ñ Ð¿Ð°Ð»Ð°ÑÐ°
             - ÑÑÐ»ÑÐ¶Ð½Ð°Ñ Ð´Ð°ÑÐ¾Ð¶ÐºÐ°
@@ -1162,16 +1419,18 @@ be:
           station: Ð§ÑÐ³ÑÐ½Ð°ÑÐ½Ñ Ð²Ð°ÐºÐ·Ð°Ð»
           subway: ÐÐµÑÑÐ¾
           summit: 
-            - Ð¡Ð°Ð¼ÑÑ
+            - ÐÑÑÑÑÐ½Ñ
             - Ð¿ÑÐº
           tourist: Ð¢ÑÑÑÑÑÑÑÐ½Ð°Ñ ÑÐ»Ð°Ð²ÑÑÐ°ÑÑÑ
-          track: Ð¢ÑÑÐº
+          track: ÐÐ°Ð»ÑÐ²Ð°Ñ Ð´Ð°ÑÐ¾Ð³Ð°
           tram: 
-            1: ÑÑÐ°Ð¼Ð²Ð°Ð¹
-          trunk: ÐÐ°Ð³ÑÑÑÑÐ°Ð»Ñ
+            - Ð¥ÑÑÐºÐ°ÑÐ½Ñ ÑÑÐ°Ð¼Ð²Ð°Ð¹
+            - ÑÑÐ°Ð¼Ð²Ð°Ð¹
+          trunk: Ð¨Ð°ÑÐ°
+          tunnel: Ð¢ÑÐ½ÑÐ»Ñ (Ð¿ÑÐ½ÐºÑÑÑÐ°Ð¼)
           unclassified: ÐÐµÐºÐ»Ð°ÑÑÑÑÐºÐ°Ð²Ð°Ð½Ð°Ñ Ð´Ð°ÑÐ¾Ð³Ð°
           unsurfaced: ÐÐ°ÑÐ¾Ð³Ð° Ð±ÐµÐ· Ð¿Ð°ÐºÑÑÑÑÑ
-          wood: ÐÐ·ÑÐºÑ Ð»ÐµÑ
+          wood: ÐÑÑÑÐ°
     markdown_help: 
       alt: ÐÐ»ÑÑÑÑÐ½Ð°ÑÑÑÐ½Ñ ÑÑÐºÑÑ
       first: ÐÐµÑÑÑ ÑÐ»ÐµÐ¼ÐµÐ½Ñ
@@ -1183,6 +1442,7 @@ be:
       second: ÐÑÑÐ³Ñ ÑÐ»ÐµÐ¼ÐµÐ½Ñ
       subheading: ÐÐ°Ð´Ð·Ð°Ð³Ð°Ð»Ð¾Ð²Ð°Ðº
       text: Ð¢ÑÐºÑÑ
+      title_html: ÐÐ¿ÑÐ°ÑÐ°Ð²Ð°Ð½Ð° Ð· Ð´Ð°Ð¿Ð°Ð¼Ð¾Ð³Ð°Ð¹ <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
       unordered: ÐÐµÑÐ¿Ð°ÑÐ°Ð´ÐºÐ°Ð²Ð°Ð½Ñ ÑÐ¿ÑÑ
       url: URL-Ð°Ð´ÑÐ°Ñ
     richtext_area: 
@@ -1201,10 +1461,10 @@ be:
       friendly: "%e %B %Y Ñ %H:%M"
   trace: 
     create: 
-      trace_uploaded: ÐÐ°Ñ GPX-ÑÐ°Ð¹Ð» Ð±ÑÑ Ð·Ð°ÑÑÐ³Ð½ÑÑÑ Ñ ÑÐ°ÐºÐ°Ðµ ÑÑÑÐ°ÑÐºÑ Ñ Ð±Ð°Ð·Ñ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ. ÐÑÑÐ° Ð·Ð²ÑÑÐ°Ð¹Ð½Ð° ÑÐ¾Ð±ÑÑÑÐ° Ð½Ðµ Ð±Ð¾Ð»ÑÑ Ð·Ð° Ð¿Ð°ÑÐ³Ð°Ð´Ð·ÑÐ½Ñ. ÐÑ Ð°ÑÑÑÐ¼Ð°ÐµÑÐµ Ð¿ÑÐ°ÑÐ²ÑÐ´Ð¶Ð°Ð½Ð½Ðµ Ð°Ð± Ð·Ð°ÐºÐ°Ð½ÑÑÐ½Ð½Ñ Ð¿ÑÐ°ÑÑÑÑ Ð¿Ð° ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÐµ
+      trace_uploaded: ÐÐ°Ñ GPX-ÑÐ°Ð¹Ð» Ð±ÑÑ Ð°Ð´Ð°ÑÐ»Ð°Ð½Ñ Ñ ÑÐ°ÐºÐ°Ðµ ÑÑÑÐ°ÑÐºÑ Ñ Ð±Ð°Ð·Ñ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ. ÐÑÑÐ° Ð·Ð²ÑÑÐ°Ð¹Ð½Ð° ÑÐ¾Ð±ÑÑÑÐ° Ð½Ðµ Ð±Ð¾Ð»ÑÑ Ð·Ð° Ð¿Ð°ÑÐ³Ð°Ð´Ð·ÑÐ½Ñ. ÐÑ Ð°ÑÑÑÐ¼Ð°ÐµÑÐµ Ð¿ÑÐ°ÑÐ²ÑÐ´Ð¶Ð°Ð½Ð½Ðµ Ð°Ð± Ð·Ð°ÐºÐ°Ð½ÑÑÐ½Ð½Ñ Ð¿ÑÐ°ÑÑÑÑ Ð¿Ð° ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÐµ
       upload_trace: ÐÐ°ÑÑÐ³Ð½ÑÑÑ GPS-ÑÑÑÐº
     delete: 
-      scheduled_for_deletion: Ð¢ÑÑÐº Ð·Ð°Ð¿Ð»Ð°Ð½Ð°Ð²Ð°Ð½Ñ Ð½Ð° Ð²ÑÐ´Ð°Ð»ÐµÐ½Ð½Ðµ
+      scheduled_for_deletion: Ð¡Ð»ÐµÐ´ Ð·Ð°Ð¿Ð»Ð°Ð½Ð°Ð²Ð°Ð½Ñ Ð½Ð° Ð²ÑÐ´Ð°Ð»ÐµÐ½Ð½Ðµ
     description: 
       description_with_count: 
         one: GPX-ÑÐ°Ð¹Ð» Ð· %{count} ÐºÑÐ¾Ð¿ÐºÐ°Ð¹ Ð°Ð´ %{user}
@@ -1213,7 +1473,7 @@ be:
     edit: 
       description: "ÐÐ¿ÑÑÐ°Ð½Ð½Ðµ:"
       download: ÑÑÑÐ³Ð½ÑÑÑ
-      edit: Ð·Ð¼ÑÐ½ÑÑÑ
+      edit: Ð¿ÑÐ°Ð²ÑÑÑ
       filename: "ÐÐ°Ð·Ð²Ð° ÑÐ°Ð¹Ð»Ð°:"
       heading: Ð ÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ðµ ÑÐ»ÐµÐ´Ñ %{name}
       map: ÐºÐ°ÑÑÐ°
@@ -1221,21 +1481,23 @@ be:
       points: "ÐÑÐ½ÐºÑÐ°Ñ:"
       save_button: ÐÐ°Ð¿ÑÑÐ°ÑÑ Ð·Ð¼ÐµÐ½Ñ
       start_coord: "ÐÐ°Ð°ÑÐ´ÑÐ½Ð°ÑÑ Ð¿Ð°ÑÐ°ÑÐºÑ:"
-      tags: "Ð¦ÑÑÐ»ÑÐºÑ:"
+      tags: "Ð¢ÑÐ³Ñ:"
+      tags_help: Ð¿Ð°Ð´Ð·ÐµÐ»ÐµÐ½ÑÑ ÐºÐ¾ÑÐºÐ°Ð¼Ñ
       title: Ð ÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ðµ ÑÐ»ÐµÐ´Ñ %{name}
-      uploaded_at: "ÐÐ°ÑÑÐ³Ð½ÑÑÑ:"
+      uploaded_at: "ÐÑÑÑÐ»Ð°Ð½Ñ:"
       visibility: "ÐÐ°ÑÐ½Ð°ÑÑÑ:"
       visibility_help: ÑÑÐ¾ Ð³ÑÑÐ° Ð·Ð½Ð°ÑÑÑÑ?
     georss: 
       title: GPS-ÑÐ»ÑÐ´Ñ OpenStreetMap
     list: 
       description: ÐÐ³Ð»ÑÐ´ Ð½ÑÐ´Ð°ÑÐ½Ð° Ð´Ð°Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ GPS-ÑÐ»ÑÐ´Ð¾Ñ
-      public_traces: ÐÑÐ±Ð»ÑÑÐ½ÑÑ GPS-ÑÑÑÐºÑ
-      public_traces_from: ÐÑÐ±Ð»ÑÑÐ½ÑÑ GPS-ÑÑÑÐºÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° %{user}
+      empty_html: ÐÐ°ÐºÑÐ»Ñ ÑÑÑ Ð½ÑÑÐ¾Ð³Ð° Ð½ÑÐ¼Ð°. <a href='%{upload_link}'>ÐÐ°Ð³ÑÑÐ·ÑÑÐµ Ð½Ð¾Ð²Ñ ÑÐ»ÐµÐ´</a> Ð°Ð±Ð¾ Ð¿Ð°ÑÑÑÐ°Ð¹ÑÐµ Ð¿ÑÐ° GPS-ÑÐ»ÑÐ´Ñ Ð½Ð° <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>Ð²ÑÐºÑ-ÑÑÐ°ÑÐ¾Ð½ÑÑ</ a>.
+      public_traces: ÐÐ³ÑÐ»ÑÐ½ÑÑ GPS-ÑÐ»ÑÐ´Ñ
+      public_traces_from: ÐÐ³ÑÐ»ÑÐ½ÑÑ GPS-ÑÐ»ÑÐ´Ñ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° %{user}
       tagged_with: " Ð°Ð´Ð¼ÐµÑÐ°Ð½Ð° ÑÐº %{tags}"
       your_traces: ÐÐ°ÑÑÑ GPS-ÑÑÑÐºÑ
     make_public: 
-      made_public: Ð¢ÑÑÐº Ð·ÑÐ¾Ð±Ð»ÐµÐ½Ñ Ð¿ÑÐ±Ð»ÑÑÐ½ÑÐ¼
+      made_public: Ð¡Ð»ÐµÐ´ Ð°Ð¿ÑÐ±Ð»ÑÐºÐ°Ð²Ð°Ð½Ñ
     offline: 
       heading: Ð¡ÑÐ¾Ð²ÑÑÑÐ° GPX-ÑÐ°Ð¹Ð»Ð°Ñ Ð°Ð´ÐºÐ»ÑÑÐ°Ð½Ð°
       message: Ð¡ÑÐ¾Ð²ÑÑÑÐ° Ñ ÑÑÑÑÑÐ¼Ð° Ð·Ð°Ð³ÑÑÐ·ÐºÑ GPX-ÑÐ°Ð¹Ð»Ð°Ñ Ñ Ð±ÑÐ³ÑÑÑ Ð¼Ð¾Ð¼Ð°Ð½Ñ Ð½ÐµÐ´Ð°ÑÑÑÐ¿Ð½ÑÑ
@@ -1243,18 +1505,18 @@ be:
       message: Ð¡ÑÑÑÑÐ¼Ð° Ð·Ð°Ð³ÑÑÐ·ÐºÑ GPX-ÑÐ°Ð¹Ð»Ð°Ñ Ñ Ð±ÑÐ³ÑÑÑ Ð¼Ð¾Ð¼Ð°Ð½Ñ Ð½ÐµÐ´Ð°ÑÑÑÐ¿Ð½Ð°Ñ
     trace: 
       ago: "%{time_in_words_ago} ÑÐ°Ð¼Ñ"
-      by: Ð· Ð´Ð°Ð¿Ð°Ð¼Ð¾Ð³Ð°Ð¹
+      by: ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ð¼
       count_points: "%{count} Ð¿ÑÐ½ÐºÑÐ°Ñ"
-      edit: Ð·Ð¼ÑÐ½ÑÑÑ
-      edit_map: ÐÐ¼ÑÐ½ÑÑÑ ÐºÐ°ÑÑÑ
-      identifiable: IDENTIFIABLE
+      edit: Ð¿ÑÐ°Ð²ÑÑÑ
+      edit_map: ÐÑÐ°Ð²ÑÑÑ ÐºÐ°ÑÑÑ
+      identifiable: ÐÐÐ­ÐÐ¢Ð«Ð¤ÐÐÐ£ÐÐÐ«
       in: Ñ
       map: ÐºÐ°ÑÑÐ°
       more: ÑÑÑÑ
       pending: Ð£ Ð§ÐÐ ÐÐ
       private: ÐÐ Ð«ÐÐÐ¢ÐÐ«
       public: ÐÐ£ÐÐÐÐ§ÐÐ«
-      trace_details: ÐÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ ÑÐ»Ð°ÑÑÑÐ²Ð°ÑÑÑ ÑÑÑÐºÑ
+      trace_details: ÐÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ ÑÐ»Ð°ÑÑÑÐ²Ð°ÑÑÑ ÑÐ»ÐµÐ´Ñ
       trackable: TRACKABLE
       view_map: ÐÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ ÐºÐ°ÑÑÑ
     trace_form: 
@@ -1262,27 +1524,28 @@ be:
       help: ÐÐ°Ð²ÐµÐ´ÐºÐ°
       help_url: http://wiki.openstreetmap.org/wiki/RU:Upload
       tags: "Ð¢ÑÐ³Ñ:"
+      tags_help: Ð¿Ð°Ð´Ð·ÐµÐ»ÐµÐ½ÑÑ ÐºÐ¾ÑÐºÐ°Ð¼Ñ
       upload_button: ÐÐ°ÑÑÐ³Ð½ÑÑÑ
       upload_gpx: "ÐÐ´Ð°ÑÐ»Ð°ÑÑ GPX-ÑÐ°Ð¹Ð»:"
       visibility: "ÐÐ°ÑÐ½Ð°ÑÑÑ:"
       visibility_help: ÑÑÐ¾ Ð³ÑÑÐ° Ð·Ð½Ð°ÑÑÑÑ?
     trace_header: 
-      see_all_traces: ÐÐ°ÑÑÑÑ ÑÑÐµ ÑÑÑÐºÑ
-      see_your_traces: ÐÐ°ÑÑÑÑ ÑÑÐµ ÑÐ²Ð°Ðµ ÑÑÑÐºÑ
-      traces_waiting: Ð£ Ð²Ð°Ñ %{count} ÑÑÑÐºÐ°Ñ Ñ ÑÐ°ÑÐ·Ðµ. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿Ð°ÑÐ°ÐºÐ°Ð¹ÑÐµ, Ð¿Ð°ÐºÑÐ»Ñ ÑÐ½Ñ Ð±ÑÐ´ÑÑÑ Ð°Ð¿ÑÐ°ÑÐ°Ð²Ð°Ð½ÑÑ, ÐºÐ°Ð± Ð½Ðµ Ð±Ð»Ð°ÐºÑÑÐ²Ð°ÑÑ ÑÐ°ÑÐ³Ñ Ð´Ð»Ñ Ð°ÑÑÐ°ÑÐ½ÑÑ ÐºÐ°ÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ.
+      see_all_traces: ÐÐ°Ð³Ð»ÑÐ´Ð·ÐµÑÑ ÑÑÐµ ÑÐ»ÑÐ´Ñ
+      see_your_traces: ÐÐ»ÑÐ½ÑÑÑ ÑÑÐµ ÑÐ²Ð°Ðµ ÑÐ»ÑÐ´Ñ
+      traces_waiting: Ð£ Ð²Ð°Ñ %{count} ÑÐ»ÐµÐ´ Ñ ÑÐ°ÑÐ·Ðµ. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿Ð°ÑÐ°ÐºÐ°Ð¹ÑÐµ, Ð¿Ð°ÐºÑÐ»Ñ ÑÐ½Ñ Ð±ÑÐ´ÑÑÑ Ð°Ð¿ÑÐ°ÑÐ°Ð²Ð°Ð½ÑÑ, ÐºÐ°Ð± Ð½Ðµ Ð±Ð»Ð°ÐºÑÑÐ²Ð°ÑÑ ÑÐ°ÑÐ³Ñ Ð´Ð»Ñ Ð°ÑÑÐ°ÑÐ½ÑÑ ÐºÐ°ÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ.
       upload_trace: ÐÐ´Ð°ÑÐ»Ð°ÑÑ GPS-ÑÐ»ÐµÐ´
     trace_optionals: 
-      tags: Ð¦ÑÑÐ»ÑÐºÑ
+      tags: Ð¢ÑÐ³Ñ
     trace_paging_nav: 
       newer: ÐÐ°Ð²ÐµÐ¹ÑÑÑ ÑÐ»ÑÐ´Ñ
       older: Ð¡ÑÐ°ÑÑÐ¹ÑÑÑ ÑÐ»ÑÐ´Ñ
       showing_page: Ð¡ÑÐ°ÑÐ¾Ð½ÐºÐ° %{page}
     view: 
-      delete_track: ÐÑÐ´Ð°Ð»ÑÑÑ Ð³ÑÑÑ ÑÑÑÐº
+      delete_track: ÐÑÐ´Ð°Ð»ÑÑÑ Ð³ÑÑÑ ÑÐ»ÐµÐ´
       description: "ÐÐ¿ÑÑÐ°Ð½Ð½Ðµ:"
       download: ÑÑÑÐ³Ð½ÑÑÑ
-      edit: Ð·Ð¼ÑÐ½ÑÑÑ
-      edit_track: ÐÐ¼ÑÐ½ÑÑÑ Ð±ÑÐ³ÑÑÑ ÑÑÑÐº
+      edit: Ð¿ÑÐ°Ð²ÑÑÑ
+      edit_track: Ð ÑÐ´Ð°Ð³Ð°Ð²Ð°ÑÑ Ð³ÑÑÑ ÑÐ»ÐµÐ´
       filename: "ÐÐ°Ð·Ð²Ð° ÑÐ°Ð¹Ð»Ð°:"
       heading: ÐÑÐ°Ð³Ð»ÑÐ´ ÑÐ»ÐµÐ´Ñ %{name}
       map: ÐºÐ°ÑÑÐ°
@@ -1291,10 +1554,10 @@ be:
       pending: Ð£ Ð§ÐÐ ÐÐ
       points: "ÐÑÐ½ÐºÑÑ:"
       start_coordinates: "ÐÐ°Ð°ÑÐ´ÑÐ½Ð°ÑÑ Ð¿Ð°ÑÐ°ÑÐºÑ:"
-      tags: Ð¦ÑÑÐ»ÑÐºÑ
+      tags: "Ð¢ÑÐ³Ñ:"
       title: ÐÑÐ°Ð³Ð»ÑÐ´ ÑÐ»ÐµÐ´Ñ %{name}
-      trace_not_found: Ð¢ÑÑÐº Ð½Ðµ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ!
-      uploaded: "ÐÐ°ÑÑÐ³Ð½ÑÑÑ:"
+      trace_not_found: Ð¡Ð»ÐµÐ´ Ð½Ðµ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ!
+      uploaded: "ÐÑÑÑÐ»Ð°Ð½Ñ:"
       visibility: "ÐÐ°ÑÐ½Ð°ÑÑÑ:"
     visibility: 
       identifiable: ÐÐ´ÑÐ½ÑÑÑÑÐºÑÐµÐ¼Ñ (Ð¿Ð°ÐºÐ°Ð·Ð²Ð°ÐµÑÑÐ° Ñ ÑÑÐ¿ÑÑÐµ ÑÐ»ÑÐ´Ð¾Ñ ÑÐº ÑÐ´ÑÐ½ÑÑÑÑÐºÑÐµÐ¼Ñ ÑÐ° ÑÐ¿Ð°ÑÐ°Ð´ÐºÐ°Ð²Ð°Ð½ÑÐ¼Ñ ÐºÑÐ¾Ð¿ÐºÐ°Ð¼Ñ Ñ Ð¼ÐµÑÐºÐ°Ð¼Ñ ÑÐ°ÑÑ)
@@ -1320,6 +1583,7 @@ be:
         link text: ÑÑÐ¾ Ð³ÑÑÐ°?
       home location: "ÐÐ°ÑÐ° Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ:"
       image: "ÐÑÑÐ²Ð°:"
+      image size hint: (Ð½Ð°Ð¹Ð»ÐµÐ¿ÐµÐ¹ Ð¿Ð°ÑÑÑÑÑ ÐºÐ²Ð°Ð´ÑÐ°ÑÐ½ÑÑ Ð²ÑÑÐ²Ñ Ð¿Ð°Ð¼ÐµÑÐ°Ð¼ 100Ã100)
       keep image: ÐÐ°ÑÐ°Ð²Ð°ÑÑ Ð±ÑÐ³ÑÑÑÑ Ð²ÑÑÐ²Ñ
       latitude: "Ð¨ÑÑÐ°ÑÐ°:"
       longitude: "ÐÐ°ÑÐ³Ð°ÑÐ°:"
@@ -1344,10 +1608,11 @@ be:
         heading: "ÐÑÐ±Ð»ÑÑÐ½Ð°Ðµ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ðµ:"
       public editing note: 
         heading: ÐÐ³ÑÐ»ÑÐ½Ð°Ðµ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ðµ
+        text: Ð£ ÑÑÐ¿ÐµÑÐ°ÑÐ½Ñ Ð¼Ð¾Ð¼Ð°Ð½Ñ ÐÐ°ÑÑÑ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ñ Ð·'ÑÑÐ»ÑÑÑÑÐ° Ð°Ð½Ð°Ð½ÑÐ¼Ð½ÑÐ¼Ñ Ñ Ð»ÑÐ´Ð·Ñ Ð½Ðµ Ð¼Ð¾Ð³ÑÑÑ Ð´Ð°ÑÑÐ»Ð°ÑÑ ÐÐ°Ð¼ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ñ, ÑÑ Ð±Ð°ÑÑÑÑ ÐÐ°ÑÐ°Ðµ Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ. ÐÐ°Ð± Ð±ÑÑ Ð±Ð°ÑÐ½Ñ ÐÐ°Ñ ÑÐ½ÑÑÐ°Ðº Ñ Ð»ÑÐ´Ð·Ñ Ð¼Ð°Ð³Ð»Ñ ÐºÐ°Ð½ÑÐ°ÐºÑÐ°Ð²Ð°ÑÑ Ð· ÐÐ°Ð¼Ñ Ð¿ÑÐ°Ð· Ð²ÑÐ±-ÑÐ°Ð¹Ñ, Ð½Ð°ÑÑÑÐ½ÑÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ Ð½ÑÐ¶ÑÐ¹. <b>ÐÐ°ÑÐ»Ñ Ð·Ð¼ÐµÐ½Ð°Ñ API Ð²ÑÑÑÑÑ 0.6, ÑÐ¾Ð»ÑÐºÑ Ð´Ð°ÑÑÑÐ¿Ð½ÑÑ Ð´Ð»Ñ ÑÑÐ²ÑÐ·Ñ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÑ Ð¼Ð¾Ð³ÑÑÑ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°ÑÑ Ð·Ð²ÐµÑÑÐºÑ Ð½Ð° ÐºÐ°ÑÑÐµ</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">Ð´Ð°Ð²ÐµÐ´Ð°ÑÑÐ° ÑÐ°Ð¼ÑÐµ Ð¼Ð¾Ð¶Ð° Ð±ÑÑÑ Ð°Ð´Ð¼ÐµÐ½ÐµÐ½Ð° Ñ ÑÑÐµ Ð½Ð¾Ð²ÑÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÑ ÑÑÐ¿ÐµÑ Ð´Ð°ÑÑÑÐ¿Ð½ÑÑ Ð´Ð»Ñ ÑÑÐ²ÑÐ·Ñ Ð¿Ð° Ð·Ð¼Ð¾ÑÑÐ²Ð°Ð½Ð½Ñ.</li></ul>
       replace image: ÐÐ°Ð¼ÑÐ½ÑÑÑ Ð±ÑÐ³ÑÑÑÑ Ð²ÑÑÐ²Ñ
       return to profile: ÐÑÑÐ½ÑÑÑÐ° Ð´Ð° Ð¿ÑÐ¾ÑÑÐ»Ñ
       save changes button: ÐÐ°Ð¿ÑÑÐ°ÑÑ Ð·Ð¼ÐµÐ½Ñ
-      title: ÐÐ¼ÑÐ½ÑÑÑ ÑÐ°ÑÑÐ½Ð°Ðº
+      title: ÐÑÐ°Ð²ÑÑÑ ÑÐ°ÑÑÐ½Ð°Ðº
       update home location on click: ÐÐ±Ð½Ð°Ð²ÑÑÑ ÐºÐ°Ð°ÑÐ´ÑÐ½Ð°ÑÑ, ÐºÐ°Ð»Ñ Ñ Ð¿ÑÑÑÑÐºÐ½Ñ Ð¿Ð° ÐºÐ°ÑÑÐµ?
     confirm: 
       already active: ÐÑÑÑ ÑÐ»ÑÐºÐ¾Ð²Ñ ÑÐ°ÑÑÐ½Ð°Ðº ÑÐ¶Ð¾ Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ñ.
@@ -1357,20 +1622,25 @@ be:
       introduction_2: ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ ÐÐ°Ñ ÑÐ°ÑÑÐ½Ð°Ðº, Ð½Ð°ÑÑÑÐ½ÑÑÑÑ Ð½Ð° Ð°Ð´Ð¿Ð°Ð²ÐµÐ´Ð½ÑÑ ÑÐ¿Ð°ÑÑÐ»ÐºÑ Ñ Ð»ÑÑÑÐµ Ñ Ð²Ñ Ð·Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿Ð°ÑÐ°ÑÑ Ð¼Ð°Ð»ÑÐ²Ð°ÑÑ ÐºÐ°ÑÑÑ.
       press confirm button: ÐÐ°ÑÑÑÐ½ÑÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ, ÐºÐ°Ð± Ð°ÐºÑÑÐ²ÑÐ·Ð°Ð²Ð°ÑÑ ÑÐ°ÑÑÐ½Ð°Ðº.
       reconfirm_html: ÐÐ°Ð»Ñ Ð²Ð°Ð¼ ÑÑÑÐ±Ð° Ð·Ð½Ð¾Ñ Ð´Ð°ÑÐ»Ð°ÑÑ Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½Ðµ Ð¿Ð° ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÐµ, <a href="%{reconfirm}"><a href="%{Ð¿Ð°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ}">Ð½Ð°ÑÑÑÐ½ÑÑÐµ ÑÑÑ</a>.
+      unknown token: Ð¢ÑÑÐ¼ÑÐ½ Ð´Ð·ÐµÑÐ½Ð½Ñ ÐºÐ¾Ð´Ð° Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½Ñ ÑÐ¶Ð¾ Ð¿ÑÐ°Ð¹ÑÐ¾Ñ ÑÑ ÑÐ½ Ð½Ðµ ÑÑÐ½ÑÐµ.
     confirm_email: 
       button: ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ
-      failure: ÐÐ°ÑÑÐ¾Ð²Ñ Ð°Ð´ÑÐ°Ñ ÑÐ¶Ð¾ Ð±ÑÑ Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ñ Ð³ÑÑÑÐ¼ ÐºÐ»ÑÑÐ¾Ð¼.
+      failure: ÐÐ°ÑÑÐ¾Ð²Ñ Ð°Ð´ÑÐ°Ñ ÑÐ¶Ð¾ Ð±ÑÑ Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ñ Ð³ÑÑÑÐ¼ ÑÐ¾ÐºÐµÐ½Ð°Ð¼.
       heading: ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ Ð·Ð¼ÐµÐ½Ñ Ð¿Ð°ÑÑÐ¾Ð²Ð°Ð³Ð° Ð°Ð´ÑÐ°ÑÑ
       press confirm button: ÐÐ°ÑÑÑÐ½ÑÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ, ÐºÐ°Ð± Ð¿Ð°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ Ð²Ð°Ñ Ð½Ð¾Ð²Ñ Ð¿Ð°ÑÑÐ¾Ð²Ñ Ð°Ð´ÑÐ°Ñ.
       success: ÐÐ°Ñ Ð°Ð´ÑÐ°Ñ Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ñ, Ð´Ð·ÑÐºÑÐ¹ Ð·Ð° ÑÑÐ³ÑÑÑÑÐ°ÑÑÑ!
     confirm_resend: 
       failure: ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº %{name} Ð½Ðµ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ.
+      success: ÐÑ Ð´Ð°ÑÐ»Ð°Ð»Ñ Ð½Ð¾Ð²Ñ Ð»ÑÑÑ Ð· Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½ÐµÐ¼ Ð½Ð° Ð°Ð´ÑÐ°Ñ %{email} Ñ, ÑÐº ÑÐ¾Ð»ÑÐºÑ ÐÑ Ð¿Ð°ÑÐ²ÐµÑÐ´Ð·ÑÑÐµ ÐÐ°Ñ ÑÐ°ÑÑÐ½Ð°Ðº, ÐÑ Ð·Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿Ð°ÑÐ°ÑÑ Ð¿ÑÐ°ÑÐ°Ð²Ð°ÑÑ Ð· ÐºÐ°ÑÑÐ°Ð¹.<br /><br />ÐÐ°Ð»Ñ ÐÑ ÐºÐ°ÑÑÑÑÐ°ÐµÑÐµÑÑ ÑÑÑÑÑÐ¼Ð°Ð¹ Ð°Ð±Ð°ÑÐ¾Ð½Ñ Ð°Ð´ ÑÐ¿Ð°Ð¼Ñ, ÑÐºÐ°Ñ Ð´Ð°ÑÑÐ»Ð°Ðµ Ð·Ð°Ð¿ÑÑÑ Ð½Ð° Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½Ðµ, ÐºÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, ÑÐ¿ÑÑÐ½ÑÑÐµÑÑ, ÑÑÐ¾ Ð°Ð´ÑÐ°Ñ  webmaster@openstreetmap.org Ð·Ð½Ð°ÑÐ¾Ð´Ð·ÑÑÑÐ° Ñ ÐÐ°ÑÑÐ¼ Ð´Ð°Ð²ÐµÑÐ°Ð½ÑÐ¼ ÑÐ¿ÑÑÐµ, ÑÐ°Ð¼Ñ ÑÑÐ¾ Ð¼Ñ Ð½Ðµ Ð¼Ð°ÐµÐ¼ Ð¼Ð°Ð³ÑÑÐ¼Ð°ÑÑÑ Ð°Ð´ÐºÐ°Ð·Ð²Ð°ÑÑ Ð½Ð° Ð»ÑÐ±ÑÑ Ð·Ð°Ð¿ÑÑÑ.
     filter: 
       not_an_administrator: ÐÐ°Ð¼ Ð½ÐµÐ°Ð±ÑÐ¾Ð´Ð½Ð° Ð¼ÐµÑÑ Ð¿ÑÐ°Ð²Ñ Ð°Ð´Ð¼ÑÐ½ÑÑÑÑÐ°ÑÐ°ÑÐ° Ð´Ð»Ñ Ð²ÑÐºÐ°Ð½Ð°Ð½Ð½Ñ Ð³ÑÑÐ°Ð³Ð° Ð´Ð·ÐµÑÐ½Ð½Ñ.
     go_public: 
       flash success: Ð£ÑÐµ Ð²Ð°ÑÑÑ Ð·Ð¼ÐµÐ½Ñ ÑÑÐ¿ÐµÑ Ð¿ÑÐ±Ð»ÑÑÐ½ÑÑ, Ñ Ð²Ð°Ð¼ ÑÑÐ¿ÐµÑ Ð´Ð°Ð·Ð²Ð¾Ð»ÐµÐ½Ð° ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ðµ
     list: 
+      confirm: ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ Ð²ÑÐ±ÑÐ°Ð½ÑÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ
+      empty: ÐÐ´Ð¿Ð°Ð²ÐµÐ´Ð½ÑÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÑ Ð½Ðµ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½ÑÑ
       heading: Ð£Ð´Ð·ÐµÐ»ÑÐ½ÑÐºÑ
+      hide: Ð¡ÑÐ°Ð²Ð°ÑÑ Ð²ÑÐ±ÑÐ°Ð½ÑÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ
       showing: 
         one: Ð¡ÑÐ°ÑÐ¾Ð½ÐºÐ° %{page} (%{first_item} Ð· %{items})
         other: Ð¡ÑÐ°ÑÐ¾Ð½ÐºÐ° %{page} (%{first_item}-%{last_item} Ð· %{items})
@@ -1378,6 +1648,7 @@ be:
       summary_no_ip: "%{name} ÑÑÐ²Ð¾ÑÐ°Ð½Ñ %{date}"
       title: Ð£Ð´Ð·ÐµÐ»ÑÐ½ÑÐºÑ
     login: 
+      account is suspended: ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð°Ð»Ðµ ÐÐ°Ñ ÑÐ°ÑÑÐ½Ð°Ðº Ð±ÑÑ Ð·Ð°Ð±Ð»Ð°ÐºÐ°Ð²Ð°Ð½Ñ Ð·-Ð·Ð° Ð¿Ð°Ð´Ð°Ð·ÑÐ¾Ð½Ð°Ð¹ Ð°ÐºÑÑÑÐ½Ð°ÑÑÑ.<br />ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð·Ð²ÑÐ¶ÑÑÐµÑÑ Ð· <a href="%{webmaster}">Ð²ÑÐ±Ð¼Ð°Ð¹ÑÑÑÐ°Ð¼</a> ÐºÐ°Ð»Ñ ÐÑ Ð¶Ð°Ð´Ð°ÐµÑÐµ Ð³ÑÑÐ° Ð°ÑÐ¿ÑÑÑÑÑÑ.
       account not active: ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð²Ð°Ñ ÑÐ°ÑÑÐ½Ð°Ðº Ð¿Ð°ÐºÑÐ»Ñ Ð½Ðµ Ð°ÐºÑÑÐ²ÑÐ·Ð°Ð²Ð°Ð½Ñ.<br />ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð½Ð°ÑÑÑÐ½ÑÑÐµ Ð½Ð° Ð°Ð´Ð¿Ð°Ð²ÐµÐ´Ð½ÑÑ ÑÐ¿Ð°ÑÑÐ»ÐºÑ Ñ Ð»ÑÑÑÐµ Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½Ñ ÑÐ°ÑÑÐ½ÐºÑ, ÐºÐ°Ð± Ð°ÐºÑÑÐ²ÑÐ·Ð°Ð²Ð°ÑÑ ÑÐ³Ð¾, ÑÑ <a href="%{reconfirm}">Ð·Ð°Ð¿ÑÑÐ°ÑÑ Ð½Ð¾Ð²Ñ Ð»ÑÑÑ-Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½Ðµ Ð½Ð° ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÑ Ð¿Ð¾ÑÑÑ</a>.
       auth failure: ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð½ÐµÐ¼Ð°Ð³ÑÑÐ¼Ð° ÑÐ²Ð°Ð¹ÑÑÑ Ð· ÑÐ°ÐºÑÐ¼ Ð°Ð´ÑÐ°ÑÐ°Ð¼ Ñ Ð¿Ð°ÑÐ¾Ð»ÐµÐ¼.
       create account minute: Ð¡ÑÐ²Ð°ÑÑÑÐµ ÑÐ°ÑÑÐ½Ð°Ðº. ÐÑÑÐ° Ð·Ð¾Ð¹Ð¼Ðµ ÑÑÑÐ³Ð¾ Ð°Ð´Ð½Ñ ÑÐ²ÑÐ»ÑÐ½Ñ.
@@ -1387,6 +1658,9 @@ be:
       lost password link: ÐÐ³ÑÐ±Ð»ÑÐ» Ð¿Ð°ÑÐ¾Ð»Ñ?
       new to osm: Ð£Ð¿ÐµÑÑÑÐ½Ñ Ð½Ð° OpenStreetMap?
       no account: ÐÐµ Ð¼Ð°ÐµÑÐµ Ð°ÑÐ°Ð±ÑÑÑÐ°Ð³Ð° ÑÐ°ÑÑÐ½ÐºÑ?
+      openid: "%{logo} OpenID:"
+      openid invalid: ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð·Ð´Ð°ÐµÑÑÐ° ÐÐ°Ñ OpenID ÑÐ²ÐµÐ´Ð·ÐµÐ½Ñ Ð½ÑÑÐ»ÑÑÐ½Ð°
+      openid missing provider: ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð½ÐµÐ¼Ð°Ð³ÑÑÐ¼Ð° Ð·Ð²ÑÐ·Ð°ÑÑÐ° Ð· ÐÐ°ÑÑÐ¼ Ð¿ÑÐ°Ð²Ð°Ð¹Ð´ÑÑÐ°Ð¼ OpenID
       openid_logo_alt: Ð£Ð²Ð°Ð¹ÑÑÑ Ð· Ð´Ð°Ð¿Ð°Ð¼Ð¾Ð³Ð°Ð¹ OpenID
       openid_providers: 
         aol: 
@@ -1405,11 +1679,15 @@ be:
           alt: Ð£Ð²Ð°ÑÐ¾Ð´ Ð¿ÑÐ°Ð· Wordpress OpenID
           title: Ð£Ð²Ð°ÑÐ¾Ð´ Ð¿ÑÐ°Ð· Wordpress
         yahoo: 
+          alt: Ð£Ð²Ð°Ð¹ÑÑÑ Ð· Ð´Ð°Ð¿Ð°Ð¼Ð¾Ð³Ð°Ð¹ Yahoo OpenID
           title: Ð£Ð²Ð°ÑÐ¾Ð´ Ð¿ÑÐ°Ð· Yahoo
       password: "ÐÐ°ÑÐ¾Ð»Ñ:"
+      register now: ÐÐ°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°ÑÑÐ° Ð·Ð°ÑÐ°Ð·
       remember: ÐÐ°Ð¼ÑÑÐ°ÑÑ Ð¼ÑÐ½Ðµ
       title: Ð£Ð²Ð°ÑÐ¾Ð´
       to make changes: ÐÐ°Ð± Ð·Ð¼ÑÐ½ÑÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ OpenStreetMap, Ð²Ñ Ð¿Ð°Ð²ÑÐ½Ð½Ñ Ð¼ÐµÑÑ Ð°ÑÐ°Ð±ÑÑÑÑ ÑÐ°ÑÑÐ½Ð°Ðº.
+      with openid: "ÐÐ»Ñ ÑÐ²Ð°ÑÐ¾Ð´Ñ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð²ÑÐºÐ°ÑÑÑÑÐ°ÑÑ ÐÐ°Ñ OpenID:"
+      with username: "Ð£Ð¶Ð¾ Ð¼Ð°ÐµÑÐµ ÑÐ°ÑÑÐ½Ð°Ðº OpenStreetMap? ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, ÑÐ²Ð°Ð¹Ð´Ð·ÑÑÐµ Ñ ÑÑÑÑÑÐ¼Ñ Ð· ÐÐ°ÑÑÐ¼ ÑÐ¼ÐµÐ½ÐµÐ¼ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÐ° Ñ Ð¿Ð°ÑÐ¾Ð»ÐµÐ¼:"
     logout: 
       heading: ÐÑÐ¹ÑÑÑ Ð· OpenStreetMap
       logout_button: ÐÑÐ¹ÑÑÑ
@@ -1417,6 +1695,7 @@ be:
     lost_password: 
       email address: "ÐÐ°ÑÑÐ¾Ð²Ñ Ð°Ð´ÑÐ°Ñ:"
       heading: ÐÐ°Ð±ÑÐ»Ñ Ð¿Ð°ÑÐ¾Ð»Ñ?
+      help_text: Ð£Ð²ÑÐ´Ð·ÑÑÐµ Ð°Ð´ÑÐ°Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ, ÑÐºÑ ÐÑ Ð²ÑÐºÐ°ÑÑÑÑÐ¾ÑÐ²Ð°Ð»Ñ Ð¿ÑÑ ÑÑÐ³ÑÑÑÑÐ°ÑÑÑ, Ñ Ð¼Ñ Ð²ÑÑÐ»ÐµÐ¼ ÐÐ°Ð¼ ÑÐ¿Ð°ÑÑÐ»ÐºÑ, ÑÐºÑÑ ÐÑ Ð·Ð¼Ð¾Ð¶Ð°ÑÐµ Ð²ÑÐºÐ°ÑÑÑÑÐ°ÑÑ Ð´Ð»Ñ Ð·Ð¼ÐµÐ½Ñ Ð¿Ð°ÑÐ¾Ð»Ñ.
       new password button: ÐÑÑÐ»Ð°ÑÑ Ð¼Ð½Ðµ Ð½Ð¾Ð²Ñ Ð¿Ð°ÑÐ¾Ð»Ñ
       notice email cannot find: ÐÐµÐ¼Ð°Ð³ÑÑÐ¼Ð° Ð·Ð½Ð°Ð¹ÑÑÑ Ð³ÑÑÐ°ÐºÑ Ð¿Ð°ÑÑÐ¾Ð²Ñ Ð°Ð´ÑÐ°Ñ, Ð¿ÑÐ°Ð±Ð°ÑÑÐµ.
       notice email on way: ÐÐ°Ð»Ñ, ÑÑÐ¾ Ð²Ñ ÑÐ³Ð¾ Ð·Ð³ÑÐ±ÑÐ»Ñ :-( Ð°Ð»Ðµ Ð»ÑÑÑ ÑÐ¶Ð¾ Ð°Ð´Ð¿ÑÐ°ÑÐ»ÐµÐ½Ñ, Ñ Ð²Ñ ÑÑÑÐºÐ° Ð·Ð¼Ð¾Ð¶Ð°ÑÐµ ÑÐ³Ð¾ ÑÐºÑÐ½ÑÑÑ.
@@ -1424,23 +1703,31 @@ be:
     make_friend: 
       already_a_friend: ÐÑ ÑÐ¶Ð¾ ÑÑÐ±ÑÑÐµÑÐµ Ð· %{name}.
       button: ÐÐ°ÑÑÐ±ÑÐ°Ð²Ð°ÑÑ
-      failed: ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð½ÐµÐ¼Ð°Ð³ÑÑÐ¼Ð° Ð´Ð°Ð´Ð°ÑÑ %{name} Ñ ÑÐºÐ°ÑÑÑ ÑÑÐ±ÑÐ°.
+      failed: ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð½ÐµÐ¼Ð°Ð³ÑÑÐ¼Ð° Ð¿Ð°ÑÑÐ±ÑÐ°Ð²Ð°ÑÑ Ð· %{name}.
       heading: ÐÐ°ÑÑÐ±ÑÐ°Ð²Ð°ÑÑ Ð· %{user}?
       success: "%{name} Ð¿Ð°ÑÑÐ±ÑÐ°Ð²Ð°Ñ Ð· Ð²Ð°Ð¼Ñ."
     new: 
+      about: 
+        header: Ð¡Ð²Ð°Ð±Ð¾Ð´Ð½Ð°Ñ Ñ Ð´Ð°ÑÑÑÐ¿Ð½Ð°Ñ Ð´Ð»Ñ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ñ
+        html: "<p>Ð£ Ð°Ð´ÑÐ¾Ð·Ð½ÐµÐ½Ð½Ðµ Ð°Ð´ ÑÐ½ÑÑÑ ÐºÐ°ÑÑ, ÐºÐ°ÑÑÑ OpenStreetMap ÑÐ°Ð»ÐºÐ°Ð¼ ÑÑÐ²Ð°ÑÐ°ÑÑÑÐ° ÑÐ°ÐºÑÐ¼Ñ Ð¶ Ð»ÑÐ´Ð·ÑÐ¼Ñ ÑÐº Ð²Ñ, ÑÐ½Ñ Ð´Ð°ÑÑÑÐ¿Ð½ÑÑ ÑÑÑÐ¼ Ð´Ð»Ñ Ð¿ÑÐ°ÑÐºÑ, Ð°Ð±Ð½Ð°ÑÐ»ÐµÐ½Ð½Ñ, ÑÑÑÐ³Ð²Ð°Ð½Ð½Ñ Ñ Ð²ÑÐºÐ°ÑÑÑÑÐ°Ð½Ð½Ñ.</p> \n<p>ÐÐ°ÑÑÐ³ÑÑÑÑÑÐ¹ÑÐµÑÑ, ÐºÐ°Ð± Ð·ÑÐ°Ð±ÑÑÑ ÑÐ²Ð¾Ð¹ ââÑÐºÐ»Ð°Ð´. ÐÑ Ð²ÑÑÐ»ÐµÐ¼ Ð²Ð°Ð¼ Ð»ÑÑÑ Ð´Ð»Ñ Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½Ñ ÑÐ°ÑÑÐ½ÐºÐ°.</p>"
       confirm email address: "ÐÐ°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½Ðµ Ð¿Ð°ÑÑÐ¾Ð²Ð°Ð³Ð° Ð°Ð´ÑÐ°ÑÑ:"
       confirm password: "ÐÐ°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½Ðµ Ð¿Ð°ÑÐ¾Ð»Ñ:"
       contact_webmaster: ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, ÑÐ¿ÑÑÑÑÐµÑÑ Ð· <a href="mailto:webmaster@openstreetmap.org">Ð²ÑÐ¼-Ð¼Ð°Ð¹ÑÑÑÐ°Ð¼</a> ÐºÐ°Ð± ÑÑÐ²Ð°ÑÑÑÑ Ð²Ð°Ð¼ ÑÐ°ÑÑÐ½Ð°Ðº - Ð¼Ñ Ð¿Ð°ÑÐ¿ÑÐ°Ð±ÑÐµÐ¼ Ð²ÑÐ´Ð°ÑÑ Ð²Ð°Ð¼ ÑÐ°ÑÑÐ½Ð°Ðº ÑÐº Ð¼Ð°Ð³Ð° ÑÑÑÑÑÐ¹.
       continue: ÐÐ°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°ÑÑÐ°
       display name: "ÐÐ°ÑÐ½Ð°Ðµ ÑÐ¼Ñ:"
+      display name description: ÐÐ°ÑÐ° ÑÐ¼Ñ, ÑÐºÐ¾Ðµ Ð±ÑÐ´Ð·Ðµ Ð±Ð°ÑÐ½Ð°Ðµ ÑÑÑÐ¼. ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð·Ð¼ÑÐ½ÑÑÑ ÑÐ³Ð¾ Ð¿Ð¾ÑÑÐ¼ Ñ ÐÐ°ÑÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ°Ñ.
       email address: "ÐÐ°ÑÑÐ¾Ð²Ñ Ð°Ð´ÑÐ°Ñ:"
       license_agreement: Ð¡ÑÐ²Ð°ÑÐ°ÑÑÑ ÑÐ°ÑÑÐ½Ð°Ðº, Ð²Ñ Ð·Ð³Ð°Ð´Ð¶Ð°ÐµÑÐµÑÑ Ð· <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">ÑÐ¼Ð¾Ð²Ð°Ð¼Ñ ÑÐ´Ð·ÐµÐ»Ñ</a>.
       no_auto_account_create: ÐÐ° Ð¶Ð°Ð»Ñ, Ð¼Ñ Ð½Ðµ Ð¼Ð¾Ð¶Ð°Ð¼ ÑÑÐ²Ð°ÑÑÑÑ Ð´Ð»Ñ Ð²Ð°Ñ ÑÐ°ÑÑÐ½Ð°Ðº Ð°ÑÑÐ°Ð¼Ð°ÑÑÑÐ½Ð°.
       not displayed publicly: ÐÐµ Ð¿Ð°ÐºÐ°Ð·Ð²Ð°ÐµÑÑÐ° Ð°ÑÑÐ°ÑÐ½ÑÐ¼ (Ð³Ð»ÑÐ´Ð·ÑÑÐµ <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="Ð¿Ð°Ð»ÑÑÑÐºÐ° Ð½ÐµÑÐ°Ð·Ð³Ð»Ð°ÑÑÐ½Ð½Ñ Ð½Ð° wiki, Ñ ÑÑÐ¼ Ð»ÑÐºÑ ÑÐµÐºÑÑÑ Ð¿ÑÐ° Ð¿Ð°ÑÑÐ¾Ð²ÑÑ Ð°Ð´ÑÐ°ÑÑ">Ð¿Ð°Ð»ÑÑÑÐºÑ Ð½ÐµÑÐ°Ð·Ð³Ð»Ð°ÑÑÐ½Ð½Ñ</a>)
       openid: "%{logo} OpenID:"
+      openid association: "<p>ÐÐ°Ñ OpenID Ð¿Ð°ÐºÑÐ»Ñ Ð½Ñ Ð·Ð²ÑÐ·Ð°Ð½Ñ Ð· ÑÐ°ÑÑÐ½ÐºÐ°Ð¼ OpenStreetMap.</p>\n<ul>\n  <li>ÐÐ°Ð»Ñ ÐÑ ÑÐ¿ÐµÑÑÑÐ½Ñ Ð½Ð° OpenStreetMap, ÐºÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, ÑÑÐ²Ð°ÑÑÑÐµ Ð½Ð¾Ð²Ñ ÑÐ°ÑÑÐ½Ð°Ðº Ð· Ð´Ð°Ð¿Ð°Ð¼Ð¾Ð³Ð°Ð¹ ÑÐ¾ÑÐ¼Ñ Ð¿Ð°Ð´Ð°Ð´Ð·ÐµÐ½Ð°Ð¹ Ð½ÑÐ¶ÑÐ¹.</li>\n  <li>\n   ÐÐ°Ð»Ñ ÐÑ ÑÐ¶Ð¾ Ð¼Ð°ÐµÑÐµ ÑÐ°ÑÑÐ½Ð°Ðº, ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ ÑÐ²Ð°Ð¹ÑÑÑ Ñ ÑÑÑÑÑÐ¼Ñ\n   Ð· ÐÐ°ÑÑÐ¼ ÑÐ¼ÐµÐ½ÐµÐ¼ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÐ° Ñ Ð¿Ð°ÑÐ¾Ð»ÐµÐ¼, Ð° Ð¿Ð¾ÑÑÐ¼ Ð·Ð²ÑÐ·Ð°ÑÑ ÑÐ³Ð¾ Ð· ÐÐ°ÑÑÐ¼ ÑÐ°ÑÑÐ½ÐºÐ°Ð¼\n   OpenID Ð½Ð° ÑÑÐ°ÑÐ¾Ð½ÑÑ Ð½Ð°Ð»Ð°Ð´Ð°Ñ ÐÐ°ÑÐ°Ð³Ð° Ð¿ÑÐ¾ÑÑÐ»Ñ.\n  </li>\n</ul>"
+      openid no password: ÐÐ°Ð´ÑÐ°Ñ Ð²ÑÐºÐ°ÑÑÑÑÐ°Ð½Ð½Ñ OpenID Ð¿Ð°ÑÐ¾Ð»Ñ Ð½Ðµ Ð¿Ð°ÑÑÑÐ±Ð½Ñ, Ð°Ð»Ðµ Ð½ÐµÐºÐ°ÑÐ¾ÑÑÑ Ð´Ð°Ð´Ð°ÑÐºÐ¾Ð²ÑÑ ÑÐ½ÑÑÑÑÐ¼ÐµÐ½ÑÑ ÑÑ ÑÐµÑÐ²ÑÑ Ð¼Ð¾Ð³ÑÑÑ ÑÐ³Ð¾ ÑÐ¿ÑÑÐ°ÑÑ.
       password: "ÐÐ°ÑÐ¾Ð»Ñ:"
       terms accepted: ÐÐ·ÑÐºÑÐ¹ Ð·Ð° Ð¿ÑÑÐ½ÑÑÑÐµ Ð½Ð¾Ð²ÑÑ ÑÐ¼Ð¾Ñ ÑÐ´Ð·ÐµÐ»Ñ!
+      terms declined: ÐÐ°Ð¼ ÑÐºÐ°Ð´Ð°, ÑÑÐ¾ ÐÑ Ð²ÑÑÐ°ÑÑÐ»Ñ Ð½Ðµ Ð¿ÑÑÐ½ÑÑÑ Ð½Ð¾Ð²ÑÑ ÑÐ¼Ð¾Ð²Ñ ÑÑÐ¿ÑÐ°ÑÐ¾ÑÐ½ÑÑÑÐ²Ð°. ÐÐ»Ñ Ð°ÑÑÑÐ¼Ð°Ð½ÑÐ½Ñ Ð´Ð°Ð´Ð°ÑÐºÐ¾Ð²Ð°Ð¹ ÑÐ½ÑÐ°ÑÐ¼Ð°ÑÑÑ, ÐºÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð³Ð»ÑÐ´Ð·ÑÑÐµ <a href="%{url}">Ð³ÑÑÑÑ Ð²ÑÐºÑ-ÑÑÐ°ÑÐ¾Ð½ÐºÑ</a>.
       title: Ð¡ÑÐ²Ð°ÑÑÑÑ ÑÐ°ÑÑÐ½Ð°Ðº
+      use openid: ÐÐ»Ñ ÑÐ²Ð°ÑÐ¾Ð´Ñ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð²ÑÐºÐ°ÑÑÑÑÐ°ÑÑ %{logo} OpenID
     no_such_user: 
       body: ÐÑÐ°Ð±Ð°ÑÑÐµ, ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº %{user} Ð½Ðµ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ. Please check your spelling, ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿ÑÐ°Ð²ÐµÑÑÐµ ÑÐ²Ð¾Ð¹ Ð¿ÑÐ°Ð²Ð°Ð¿ÑÑ, ÑÑ, Ð¼Ð°Ð³ÑÑÐ¼Ð°, Ð²Ð°Ð¼ Ð´Ð°Ð»Ñ Ð½ÑÐ¿ÑÐ°Ð²ÑÐ»ÑÐ½ÑÑ ÑÐ¿Ð°ÑÑÐ»ÐºÑ.
       heading: ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº %{user} Ð½Ðµ ÑÑÐ½ÑÐµ
@@ -1451,100 +1738,232 @@ be:
       your location: ÐÐ°ÑÐ° Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ
     remove_friend: 
       button: ÐÑÐ´Ð°Ð»ÑÑÑ Ð· ÑÑÐ±ÑÐ¾Ñ
+      heading: ÐÐµÑÐ°ÑÑÐ°ÑÑ ÑÑÐ±ÑÐ°Ð²Ð°ÑÑ Ð· %{user}?
       not_a_friend: "%{name} Ð½Ðµ Ð·'ÑÑÐ»ÑÐµÑÑÐ° Ð²Ð°ÑÑÐ¼ ÑÑÐ±ÑÐ°Ð¼."
       success: "%{name} Ð²ÑÐ´Ð°Ð»ÐµÐ½Ñ ÑÐ° ÑÐ¿ÑÑÐ° ÑÑÐ±ÑÐ¾Ñ."
     reset_password: 
       confirm password: "ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÐµ Ð¿Ð°ÑÐ¾Ð»Ñ:"
       flash changed: ÐÐ°Ñ Ð¿Ð°ÑÐ¾Ð»Ñ Ð±ÑÑ Ð·Ð¼ÐµÐ½ÐµÐ½Ñ.
-      flash token bad: ÐÐµ Ð·Ð½Ð°Ð¹ÑÐ¾Ñ ÑÐ°ÐºÑ ÐºÐ»ÑÑ, Ð¼Ð¾Ð¶Ð°, Ð¿ÑÐ°Ð²ÐµÑÑÐµ URL?
+      flash token bad: ÐÐµ Ð·Ð½Ð°Ð¹ÑÐ¾Ñ ÑÐ°ÐºÑ ÑÐ¾ÐºÐµÐ½, Ð¼Ð¾Ð¶Ð°, Ð¿ÑÐ°Ð²ÐµÑÑÐµ URL?
+      heading: Ð¡ÐºÑÐ½ÑÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ Ð´Ð»Ñ %{user}
       password: "ÐÐ°ÑÐ¾Ð»Ñ:"
       reset: "Ð¡ÐºÑÐ½ÑÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ:"
       title: ÑÐºÑÐ½ÑÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ
     set_home: 
       flash success: ÐÐ°Ð¼Ð°ÑÐ½ÑÐµ Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ Ð¿Ð°ÑÐ¿ÑÑÐ¾Ð²Ð° Ð·Ð°Ð¿ÑÑÐ°Ð½Ð°
     suspended: 
+      body: "<p>\n  ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð°Ð»Ðµ ÐÐ°Ñ ÑÐ°ÑÑÐ½Ð°Ðº Ð±ÑÑ Ð°ÑÑÐ°Ð¼Ð°ÑÑÑÐ½Ð° Ð·Ð°Ð±Ð»Ð°ÐºÑÑÐ°Ð²Ð°Ð½Ñ, Ð·-Ð·Ð° Ð¿Ð°Ð´Ð°Ð·ÑÐ¾Ð½Ð°Ð¹ Ð°ÐºÑÑÑÐ½Ð°ÑÑÑÑ.\n</p>\n<p>\n  ÐÑÑÐ°Ðµ ÑÐ°ÑÑÐ½Ð½Ðµ Ð¼Ð¾Ð¶Ð° Ð±ÑÑÑ ÑÑÑÐºÐ° Ð¿ÐµÑÐ°Ð³Ð»ÐµÐ´Ð¶Ð°Ð½Ð° Ð°Ð´Ð¼ÑÐ½ÑÑÑÑÐ°ÑÐ°ÑÐ°Ð¼, ÑÑ ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð·Ð²ÑÐ·Ð°ÑÑÐ° Ð· %{webmaster}, ÐºÐ°Ð»Ñ Ð¶Ð°Ð´Ð°ÐµÑÐµ Ð³ÑÑÐ° Ð°Ð±Ð¼ÐµÑÐºÐ°Ð²Ð°ÑÑ.\n</p>"
       heading: Ð Ð°ÑÑÐ½Ð°Ðº Ð·Ð°Ð¼Ð°ÑÐ¾Ð¶Ð°Ð½Ñ
       title: Ð Ð°ÑÑÐ½Ð°Ðº Ð·Ð°Ð¼Ð°ÑÐ¾Ð¶Ð°Ð½Ñ
       webmaster: Ð²ÑÐ±Ð¼Ð°Ð¹ÑÑÐ°Ñ
     terms: 
       agree: ÐÐ³Ð¾Ð´Ð½Ñ
+      consider_pd: Ð£ Ð´Ð°Ð´Ð°ÑÐ°Ðº Ð´Ð° Ð¿ÑÑÐ²ÐµÐ´Ð·ÐµÐ½Ð°Ð³Ð° Ð¿Ð°Ð³Ð°Ð´Ð½ÐµÐ½Ð½Ñ, Ñ Ð¿Ð°ÑÐ²ÑÑÐ´Ð¶Ð°Ñ, ÑÑÐ¾ Ð¼Ð¾Ð¹ ÑÐ½ÑÑÐ°Ðº Ð·Ð½Ð°ÑÐ¾Ð´Ð·ÑÑÑÐ° Ñ Ð³ÑÐ°Ð¼Ð°Ð´Ð·ÐºÑÐ¼ Ð½Ð°Ð±ÑÑÐºÑ
+      consider_pd_why: ÑÑÐ¾ Ð³ÑÑÐ°?
+      decline: ÐÐ´ÑÑÐ»ÑÑÑ
+      guidance: "ÐÐ½ÑÐ°ÑÐ¼Ð°ÑÑÑ, ÑÐºÐ°Ñ Ð´Ð°Ð¿Ð°Ð¼Ð¾Ð¶Ð° Ð·ÑÐ°Ð·ÑÐ¼ÐµÑÑ Ð³ÑÑÑÑ ÑÐ¼Ð¾Ð²Ñ: <a href=\"%{summary}\">ÐºÐ°ÑÐ¾ÑÐºÐ°Ðµ Ð°Ð¿ÑÑÐ°Ð½Ð½Ðµ</a> Ñ Ð½ÐµÐºÐ°Ð»ÑÐºÑ <a href=\"%{translations}\">Ð½ÐµÐ°ÑÑÑÑÐ¹Ð½ÑÑ Ð¿ÐµÑÐ°ÐºÐ»Ð°Ð´Ð°Ñ</a>"
       heading: Ð£Ð¼Ð¾Ð²Ñ ÑÐ´Ð·ÐµÐ»Ñ
       legale_names: 
         france: Ð¤ÑÐ°Ð½ÑÑÑ
         italy: ÐÑÐ°Ð»ÑÑ
         rest_of_world: ÐÑÑÐ°ÑÐ½Ñ ÑÐ²ÐµÑ
+      legale_select: "ÐÑÐ°ÑÐ½Ð° Ð¿ÑÐ°Ð¶ÑÐ²Ð°Ð½Ð½Ñ:"
+      read and accept: ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿Ð°ÑÑÑÐ°Ð¹ÑÐµ Ð¿Ð°Ð³Ð°Ð´Ð½ÐµÐ½Ð½Ðµ Ð½ÑÐ¶ÑÐ¹ Ñ Ð½Ð°ÑÑÑÐ½ÑÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ Â«ÐÐ³Ð¾Ð´Ð½ÑÂ», ÐºÐ°Ð± Ð¿Ð°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ ÑÑÐ¾ ÐÑ Ð¿Ð°Ð³Ð°Ð´Ð¶Ð°ÐµÑÐµÑÑ Ð· ÑÐ¼Ð¾Ð²Ð°Ð¼Ñ Ð³ÑÑÐ°Ð³Ð° Ð¿Ð°Ð³Ð°Ð´Ð½ÐµÐ½Ð½Ñ Ð°Ð´Ð½Ð¾ÑÐ½Ð° ÐÐ°ÑÐ°Ð³Ð° ÑÑÐ½ÑÑÑÐ°Ð³Ð° Ñ Ð±ÑÐ´ÑÑÑÑ ÑÐ½ÑÑÐºÐ°Ñ.
       title: Ð£Ð¼Ð¾Ð²Ñ ÑÐ´Ð·ÐµÐ»Ñ
+      you need to accept or decline: ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿ÑÐ°ÑÑÑÐ°Ð¹ÑÐµ, Ð° Ð¿Ð¾ÑÑÐ¼ Ð·Ð³Ð°Ð´Ð·ÑÑÐµÑÑ ÑÑ Ð°Ð´ÑÑÐ»ÑÑÐµ Ð½Ð¾Ð²ÑÑ ÑÐ¼Ð¾Ð²Ñ ÑÑÐ¿ÑÐ°ÑÐ¾ÑÐ½ÑÑÑÐ²Ð° Ð´Ð»Ñ Ð¿ÑÐ°ÑÑÐ³Ñ.
     view: 
       activate_user: Ð°ÐºÑÑÐ²Ð°ÑÑÑ Ð³ÑÑÐ°Ð³Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°
       add as friend: ÐÐ°ÑÑÐ±ÑÐ°Ð²Ð°ÑÑ
       ago: (%{time_in_words_ago} ÑÐ°Ð¼Ñ)
+      block_history: Ð°ÑÑÑÐ¼Ð°Ð½ÑÑ Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÑ
+      blocks by me: ÐÐ°Ð±Ð»Ð°ÐºÐ°Ð²Ð°Ð½Ð° Ð¼Ð½Ð¾Ñ
+      blocks on me: ÐÐ°Ðµ Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÑ
       comments: ÐÐ°Ð¼ÐµÐ½ÑÐ°ÑÑ
       confirm: ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ
+      confirm_user: Ð¿Ð°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ Ð³ÑÑÐ°Ð³Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°
       create_block: Ð·Ð°Ð±Ð»ÑÐºÐ°Ð²Ð°ÑÑ Ð³ÑÑÐ°Ð³Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°
+      created from: "Ð¡ÑÐ²Ð¾ÑÐ°Ð½Ð° Ð·:"
+      ct accepted: ÐÑÑÐ½ÑÑÐ° %{ago} ÑÐ°Ð¼Ñ
+      ct declined: ÐÐ´ÑÑÐ»ÐµÐ½ÑÑ
       ct status: "Ð£Ð¼Ð¾Ð²Ñ ÑÐ´Ð·ÐµÐ»Ñ:"
+      ct undecided: ÐÑÐ²ÑÑÐ°ÑÐ°Ð½Ð°
       deactivate_user: Ð°Ð´ÐºÐ»ÑÑÑÑÑ Ð³ÑÑÐ°Ð³Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°
       delete_user: Ð²ÑÐ´Ð°Ð»ÑÑÑ Ð³ÑÑÐ°Ð³Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°
       description: ÐÐ¿ÑÑÐ°Ð½Ð½Ðµ
       diary: ÐÐ·ÑÐ½Ð½ÑÐº
       edits: ÐÐ¼ÐµÐ½Ñ
       email address: "ÐÐ´ÑÐ°Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ:"
+      friends_changesets: Ð½Ð°Ð±Ð¾ÑÑ Ð·Ð¼ÐµÐ½Ð°Ñ ÑÑÐ±ÑÐ¾Ñ
+      friends_diaries: Ð·Ð°Ð¿ÑÑÑ Ð´Ð·ÑÐ½ÑÐ½ÑÐºÐ°Ñ ÑÑÐ±ÑÐ¾Ñ
       hide_user: ÑÑÐ°Ð²Ð°ÑÑ Ð³ÑÑÐ°Ð³Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°
       if set location: ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð°Ð´Ð·Ð½Ð°ÑÑÑÑ ÑÐ²Ð°Ñ Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ Ð½Ð° ÑÑÐ°ÑÐ¾Ð½ÑÑ %{settings_link}, ÐºÐ°Ð± Ð±Ð°ÑÑÑÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ Ð¿Ð°Ð±Ð»ÑÐ·Ñ.
       km away: "%{count} ÐºÐ¼ Ð°Ð´ Ð²Ð°Ñ"
-      latest edit: "ÐÐ¿Ð¾ÑÐ½ÑÐµ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½ÑÐ½Ðµ %{ago}:"
+      latest edit: "ÐÐ¿Ð¾ÑÐ½ÑÐµ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ðµ %{ago}:"
+      m away: "%{count} Ð¼ Ð°Ð´ ÐÐ°Ñ"
       mapper since: "ÐÐ°Ð»ÑÐµ ÐºÐ°ÑÑÑ Ð·:"
+      moderator_history: ÑÑÐ²Ð¾ÑÐ°Ð½ÑÑ Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÑ
       my comments: ÐÐ°Ðµ ÐºÐ°Ð¼ÐµÐ½ÑÐ°ÑÑ
       my diary: ÐÐ¾Ð¹ Ð´Ð·ÑÐ½Ð½ÑÐº
       my edits: ÐÐ°Ðµ Ð·Ð¼ÐµÐ½Ñ
-      my messages: ÐÐ°Ðµ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ñ
+      my messages: ÐÐ°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ñ
       my notes: ÐÐ°Ðµ Ð·Ð°ÑÐ²Ð°Ð³Ñ
       my profile: ÐÐ¾Ð¹ Ð¿ÑÐ¾ÑÑÐ»Ñ
       my settings: ÐÐ°Ðµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÑ
-      my traces: ÐÐ°Ðµ ÑÑÑÐºÑ
+      my traces: ÐÐ°Ðµ ÑÐ»ÑÐ´Ñ
       nearby users: "ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÑ Ð¿Ð°Ð±Ð»ÑÐ·Ñ:"
+      nearby_changesets: Ð½Ð°Ð±Ð¾ÑÑ Ð·Ð¼ÐµÐ½Ð°Ñ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÐ°Ñ Ð¿Ð°Ð±Ð»ÑÐ·Ñ
+      nearby_diaries: Ð·Ð°Ð¿ÑÑÑ Ð´Ð·ÑÐ½Ð½ÑÐºÐ°Ñ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ Ð¿Ð°Ð±Ð»ÑÐ·Ñ
       new diary entry: Ð½Ð¾Ð²Ñ Ð·Ð°Ð¿ÑÑ Ñ Ð´Ð·ÑÐ½Ð½ÑÐºÑ
       no friends: ÐÑ Ð¿Ð°ÐºÑÐ»Ñ Ð½Ðµ Ð´Ð°Ð´Ð°Ð»Ñ Ð½ÑÐºÐ¾Ð³Ð° Ñ ÑÑÐ±ÑÑ.
       no nearby users: ÐÐ°ÐºÑÐ»Ñ ÑÑÐ¾ Ð½ÑÐ¼Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ, ÑÐºÑÑ Ð¿Ð°Ð·Ð½Ð°ÑÑÐ»Ñ ÑÐ²Ð°Ñ Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ Ð¿Ð°Ð±Ð»ÑÐ·Ñ.
+      notes: ÐÐ°ÑÐ²Ð°Ð³Ñ Ð½Ð° ÐºÐ°ÑÑÐµ
+      oauth settings: Ð½Ð°Ð»Ð°Ð´Ñ OAuth
       remove as friend: ÐÑÐ´Ð°Ð»ÑÑÑ Ð· ÑÑÐ±ÑÐ¾Ñ
       role: 
         administrator: ÐÑÑÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº Ð·'ÑÑÐ»ÑÐµÑÑÐ° Ð°Ð´Ð¼ÑÐ½ÑÑÑÑÐ°ÑÐ°ÑÐ°Ð¼
+        grant: 
+          administrator: ÐÐ°Ð´Ð°ÑÑ Ð¿ÑÐ°Ð²Ñ Ð°Ð´Ð¼ÑÐ½ÑÑÑÑÐ°ÑÐ°ÑÐ°
+          moderator: ÐÐ°Ð´Ð°ÑÑ Ð¿ÑÐ°Ð²Ñ Ð¼Ð°Ð´ÑÑÐ°ÑÐ°ÑÐ°
         moderator: ÐÑÑÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº Ð·'ÑÑÐ»ÑÐµÑÑÐ° Ð¼Ð°Ð´ÑÑÐ°ÑÐ°ÑÐ°Ð¼
         revoke: 
           administrator: ÐÐ´ÐºÐ»ÑÐºÐ°ÑÑ Ð´Ð¾ÑÑÑÐ¿ Ð· Ð¿ÑÐ°Ð²Ð°Ð¼Ñ Ð°Ð´Ð¼ÑÐ½ÑÑÑÑÐ°ÑÐ°ÑÐ°
+          moderator: Ð¡ÐºÐ°ÑÐ°Ð²Ð°ÑÑ Ð´Ð¾ÑÑÑÐ¿ Ð¼Ð°Ð´ÑÑÐ°ÑÐ°ÑÐ°
       send message: ÐÐ´Ð°ÑÐ»Ð°ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ
       settings_link_text: Ð½Ð°ÑÑÐ°ÑÐ»ÐµÐ½Ð½ÑÑ
-      traces: Ð¢ÑÑÐºÑ
+      spam score: "ÐÐ´Ð·Ð½Ð°ÐºÐ° ÑÐ¿Ð°Ð¼Ñ:"
+      status: "Ð¡ÑÐ°ÑÑÑ:"
+      traces: Ð¡Ð»ÑÐ´Ñ
+      unhide_user: Ð¿Ð°ÐºÐ°Ð·Ð°ÑÑ Ð³ÑÑÐ°Ð³Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°
       user location: ÐÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ
       your friends: ÐÐ°ÑÑÑ ÑÑÐ±ÑÑ
   user_block: 
+    blocks_by: 
+      empty: "%{name} ÑÑÑÑ Ð½Ðµ ÑÑÐ²Ð°ÑÑÑ Ð±Ð»Ð°ÐºÑÑÐ¾Ð²Ð°Ðº."
+      heading: Ð¡Ð¿ÑÑ Ð±Ð»Ð°ÐºÑÑÐ¾Ð²Ð°Ðº, ÑÐºÑÑ ÑÑÐ²Ð°ÑÑÑ %{name}
+      title: ÐÐ»Ð°ÐºÑÑÐ¾ÑÐºÑ ÑÑÐ²Ð¾ÑÐ°Ð½ÑÑ %{name}
+    blocks_on: 
+      empty: "%{name} Ð½Ðµ Ð±ÑÑ ÑÑÑÑ Ð·Ð°Ð±Ð»Ð°ÐºÑÑÐ°Ð²Ð°Ð½Ñ."
+      heading: Ð¡Ð¿ÑÑ Ð±Ð»Ð°ÐºÑÑÐ¾Ð²Ð°Ðº %{name}
+      title: ÐÐ»Ð°ÐºÑÑÐ¾ÑÐºÑ Ð´Ð»Ñ %{name}
+    create: 
+      flash: ÐÐ°Ð±Ð»Ð°ÐºÑÑÐ°Ð²Ð°ÑÑ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÐ° %{name}.
+      try_contacting: ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿ÐµÑÐ°Ð´ Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÐ°Ð¹ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÐ° Ð·Ð²ÑÐ¶ÑÑÐµÑÑ Ð· ÑÐ¼ Ñ Ð´Ð°Ð¹ÑÐµ ÑÐ¼Ñ Ð´Ð°ÑÑÐ°ÑÐºÐ¾Ð²Ð° ÑÐ°ÑÑ Ð´Ð»Ñ Ð°Ð´ÐºÐ°Ð·Ñ.
+      try_waiting: ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð´Ð°Ð¹ÑÐµ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÑ Ð´Ð°ÑÑÐ°ÑÐºÐ¾Ð²Ð° ÑÐ°ÑÑ Ð´Ð»Ñ Ð°Ð´ÐºÐ°Ð·Ñ, Ð¿ÐµÑÐ°Ð´ ÑÐ³Ð¾ Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÐ°Ð¹.
+    edit: 
+      back: ÐÐ°ÐºÐ°Ð·Ð°ÑÑ ÑÑÐµ Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÑ
+      heading: Ð ÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ðµ Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÑ Ð´Ð»Ñ %{name}
+      needs_view: Ð¦Ñ ÑÑÑÐ±Ð° ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÑ ÑÐ²Ð°Ð¹ÑÑÑ Ñ ÑÑÑÑÑÐ¼Ñ, Ð¿ÐµÑÐ°Ð´ ÑÑÐ¼ ÑÐº Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÐ° Ð±ÑÐ´Ð·Ðµ Ð·Ð½ÑÑÐ°?
+      period: Ð¯Ðº Ð´Ð¾ÑÐ³Ð°, Ð¿Ð°ÑÑÐ½Ð°ÑÑÑ Ð· Ð³ÑÑÐ°Ð³Ð° Ð¼Ð¾Ð¼Ð°Ð½ÑÑ, ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÑ Ð±ÑÐ´Ð·Ðµ Ð·Ð°Ð±Ð»Ð°ÐºÑÑÐ°Ð²Ð°Ð½Ñ Ð´Ð¾ÑÑÑÐ¿ Ð´Ð° API.
+      reason: ÐÐ°Ð´Ð°Ð¹ÑÐµ Ð¿ÑÑÑÑÐ½Ñ, Ð¿Ð° ÑÐºÐ¾Ð¹ %{name} Ð±Ð»Ð°ÐºÑÐµÑÑÐ°. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð±ÑÐ´Ð·ÑÑÐµ ÑÑÑÐ¿Ð»ÑÐ²Ñ Ñ Ð´Ð·ÐµÐ¹Ð½ÑÑÐ°Ð¹ÑÐµ ÑÐ°Ð·ÑÐ¼Ð½Ð°, Ð¿ÑÐ°Ð´ÑÑÐ°ÑÐ»ÑÑÑÑ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÑ Ð¿Ð°Ð´ÑÐ°Ð±ÑÐ·Ð½ÑÑ ÑÐ½ÑÐ°ÑÐ¼Ð°ÑÑÑ Ð¿ÑÐ° Ð¿ÑÑÑÑÐ½Ñ Ð±Ð»Ð°ÐºÐ°Ð²Ð°Ð½Ð½Ñ. ÐÐ¾Ð¼Ð½ÑÑÐµ, ÑÑÐ¾ Ð½Ðµ ÑÑÐµ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÑ ÑÐ°Ð·ÑÐ¼ÐµÑÑÑ Ð¶Ð°ÑÐ³Ð¾Ð½ ÑÑÐ¿Ð¾Ð»ÑÐ½Ð°ÑÑÑÑ, ÑÐ°Ð¼Ñ Ð²ÑÐºÐ°ÑÑÑÑÐ¾ÑÐ²Ð°Ð¹ÑÐµ Ð·ÑÐ°Ð·ÑÐ¼ÐµÐ»ÑÑ Ð¿Ð°Ð½ÑÑÑÑ.
+      show: ÐÐ°ÐºÐ°Ð·Ð°ÑÑ Ð³ÑÑÑÑ Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÑ
+      submit: ÐÐ±Ð½Ð°Ð²ÑÑÑ Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÑ
+      title: Ð ÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ðµ Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÑ Ð´Ð»Ñ %{name}
+    filter: 
+      block_expired: ÐÐ»Ð°ÐºÑÑÐ¾ÑÐºÐ° ÑÐ¶Ð¾ ÑÐºÐ¾Ð½ÑÑÐ»Ð°ÑÑ Ñ Ð½Ðµ Ð¼Ð¾Ð¶Ð° ÑÑÐ´Ð°Ð³Ð°Ð²Ð°ÑÑÐ°.
+      block_period: Ð§Ð°Ñ Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÑ Ð¿Ð°Ð²ÑÐ½ÐµÐ½ Ð±ÑÑÑ Ð²ÑÐ±ÑÐ°Ð½Ñ ÑÐ° Ð·Ð½Ð°ÑÑÐ½Ð½ÑÑ Ð· ÑÐ°Ð·Ð³Ð¾ÑÑÐ²Ð°ÐµÐ¼Ð°Ð³Ð° ÑÐ¿ÑÑÑ.
     helper: 
       time_future: ÐÐ°ÐºÐ°Ð½ÑÐ²Ð°ÐµÑÑÐ° Ð¿ÑÐ°Ð· %{time}.
+      time_past: Ð¡ÐºÐ¾Ð½ÑÑÐ»Ð°ÑÑ %{time} ÑÐ°Ð¼Ñ.
+      until_login: ÐÐºÑÑÑÐ½Ð°Ñ Ð´Ð° Ð¼Ð¾Ð¼Ð°Ð½ÑÑ ÑÐ²Ð°ÑÐ¾Ð´Ñ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÐ° Ñ ÑÑÑÑÑÐ¼Ñ.
+    index: 
+      empty: ÐÐ»Ð°ÐºÑÑÐ¾Ð²Ð°Ðº ÑÑÑÑ Ð½Ðµ Ð±ÑÐ»Ð¾.
+      heading: Ð¡Ð¿ÑÑ Ð±Ð»Ð°ÐºÑÑÐ¾Ð²Ð°Ðº ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°
+      title: ÐÐ»Ð°ÐºÑÑÐ¾ÑÐºÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°
+    model: 
+      non_moderator_revoke: Ð¢ÑÑÐ±Ð° Ð±ÑÑÑ Ð¼Ð°Ð´ÑÑÐ°ÑÐ°ÑÐ°Ð¼, ÐºÐ°Ð± Ð°Ð´ÐºÐ»ÑÐºÐ°ÑÑ Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÑ.
+      non_moderator_update: Ð¢ÑÑÐ±Ð° Ð±ÑÑÑ Ð¼Ð°Ð´ÑÑÐ°ÑÐ°ÑÐ°Ð¼, ÐºÐ°Ð± ÑÑÐ²Ð°ÑÑÑÑ ÑÑ Ð·Ð½ÑÑÑ Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÑ.
+    new: 
+      back: ÐÐ°ÐºÐ°Ð·Ð°ÑÑ ÑÑÐµ Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÑ
+      heading: Ð¡ÑÐ²Ð°ÑÑÐ½Ð½Ðµ Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÑ Ð´Ð»Ñ %{name}
+      needs_view: Ð£Ð´Ð·ÐµÐ»ÑÐ½ÑÐºÑ ÑÑÑÐ±Ð° ÑÐ²Ð°Ð¹ÑÑÑ Ñ ÑÑÑÑÑÐ¼Ñ, Ð¿ÐµÑÐ°Ð´ ÑÑÐ¼ ÑÐº Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÐ° Ð±ÑÐ´Ð·Ðµ Ð·Ð½ÑÑÐ°Ñ
+      period: Ð¯Ðº Ð´Ð¾ÑÐ³Ð°, Ð¿Ð°ÑÑÐ½Ð°ÑÑÑ Ð· Ð³ÑÑÐ°Ð³Ð° Ð¼Ð¾Ð¼Ð°Ð½ÑÑ, ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÑ Ð±ÑÐ´Ð·Ðµ Ð·Ð°Ð±Ð»Ð°ÐºÑÑÐ°Ð²Ð°Ð½Ñ Ð´Ð¾ÑÑÑÐ¿ Ð´Ð° API.
+      reason: ÐÐ°Ð´Ð°Ð¹ÑÐµ Ð¿ÑÑÑÑÐ½Ñ Ð¿Ð° ÑÐºÐ¾Ð¹ %{name} Ð±Ð»Ð°ÐºÑÐµÑÑÐ°. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð±ÑÐ´Ð·ÑÑÐµ ÑÑÑÐ¿Ð»ÑÐ²Ñ Ñ Ð´Ð·ÐµÐ¹Ð½ÑÑÐ°Ð¹ÑÐµ ÑÐ°Ð·ÑÐ¼Ð½Ð°, Ð¿ÑÐ°Ð´ÑÑÐ°ÑÐ»ÑÑÑÑ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÑ Ð¿Ð°Ð´ÑÐ°Ð±ÑÐ·Ð½ÑÑ ÑÐ½ÑÐ°ÑÐ¼Ð°ÑÑÑ Ð¿ÑÐ° Ð¿ÑÑÑÑÐ½Ñ Ð±Ð»Ð°ÐºÐ°Ð²Ð°Ð½Ð½Ñ, Ð¿Ð¾Ð¼Ð½ÑÑÐµ, ÑÑÐ¾ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ Ð±ÑÐ´Ð·Ðµ Ð±Ð°ÑÐ½Ð°Ðµ Ð´Ð»Ñ ÑÑÑÑ. ÐÐ¾Ð¼Ð½ÑÑÐµ, ÑÑÐ¾ Ð½Ñ ÑÑÐµ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÑ ÑÐ°Ð·ÑÐ¼ÐµÑÑÑ Ð¶Ð°ÑÐ³Ð¾Ð½ ÑÑÐ¿Ð¾Ð»ÑÐ½Ð°ÑÑÑÑ, ÑÐ°Ð¼Ñ Ð²ÑÐºÐ°ÑÑÑÑÐ¾ÑÐ²Ð°Ð¹ÑÐµ Ð·ÑÐ°Ð·ÑÐ¼ÐµÐ»ÑÑ Ð¿Ð°Ð½ÑÑÑÑ.
+      submit: Ð¡ÑÐ²Ð°ÑÑÑÑ Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÑ
+      title: Ð¡ÑÐ²Ð°ÑÑÐ½Ð½Ðµ Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÑ Ð´Ð»Ñ %{name}
+      tried_contacting: Ð¯ Ð·Ð²ÑÑÐ½ÑÑÑÑ Ð´Ð° ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÐ° Ñ Ð¿Ð°Ð¿ÑÐ°ÑÑÑ ÑÐ³Ð¾ ÑÐ¿ÑÐ½ÑÑÑÐ°.
+      tried_waiting: Ð¯ Ð´Ð°Ñ Ð´Ð°ÑÑÐ°ÑÐºÐ¾Ð²Ð° ÑÐ°ÑÑ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÑ, ÐºÐ°Ð± Ð°Ð´ÐºÐ°Ð·Ð°ÑÑ Ð½Ð° ÑÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ñ.
     not_found: 
       back: ÐÑÑÐ½ÑÑÑÐ° Ð´Ð° Ð¿ÐµÑÐ°Ð»ÑÐºÑ
+      sorry: ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð½ÐµÐ¼Ð°Ð³ÑÑÐ¼Ð° Ð·Ð½Ð°Ð¹ÑÑÑ Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÑ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÐ° Ð· ÑÐ´ÑÐ½ÑÑÑÑÐºÐ°ÑÐ°ÑÐ°Ð¼ %{id}.
     partial: 
+      confirm: ÐÑ ÑÐ¿ÑÑÐ½ÐµÐ½ÑÑ?
+      creator_name: Ð¡ÑÐ²Ð°ÑÐ°Ð»ÑÐ½ÑÐº
+      display_name: ÐÐ°Ð±Ð»Ð°ÐºÐ°Ð²Ð°Ð½Ñ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº
+      edit: Ð ÑÐ´Ð°Ð³Ð°Ð²Ð°ÑÑ
       next: ÐÐ°Ð»ÐµÐ¹ Â»
       not_revoked: (Ð½Ðµ Ð°Ð´ÐºÐ»ÑÐºÐ°Ð½Ñ)
       previous: Â« ÐÐ°Ð·Ð°Ð´
+      reason: ÐÑÑÑÑÐ½Ð° Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÑ
+      revoke: ÐÐ´Ð°Ð·Ð²Ð°ÑÑ!
       revoker_name: ÐÐ´ÐºÐ»ÑÐºÐ°Ð½Ñ
+      show: ÐÐ°ÐºÐ°Ð·Ð°ÑÑ
       showing_page: Ð¡ÑÐ°ÑÐ¾Ð½ÐºÐ° %{page}
       status: Ð¡ÑÐ°ÑÑÑ
+    period: 
+      one: 1 Ð³Ð°Ð´Ð·ÑÐ½Ð°
+      other: "%{count} Ð³Ð°Ð´Ð·ÑÐ½"
+    revoke: 
+      confirm: ÐÑ ÑÐ¿ÑÑÐ½ÐµÐ½Ñ, ÑÑÐ¾ Ð¶Ð°Ð´Ð°ÐµÑÐµ Ð°Ð´ÐºÐ»ÑÐºÐ°ÑÑ Ð³ÑÑÑÑ Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÑ?
+      flash: ÐÑÑÐ°Ñ Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÐ° Ð±ÑÐ»Ð° Ð°Ð´ÐºÐ»ÑÐºÐ°Ð½Ð°.
+      heading: ÐÐ½ÑÑÑ Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÑ Ð· %{block_on}, ÑÑÐ²Ð¾ÑÐ°Ð½ÑÑ %{block_by}
+      past: ÐÑÑÐ°Ñ Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÐ° ÑÐºÐ¾Ð½ÑÑÐ»Ð°ÑÑ %{time} ÑÐ°Ð¼Ñ Ñ Ð½Ðµ Ð¼Ð¾Ð¶Ð° Ð±ÑÑÑ ÑÑÐ¿ÐµÑ Ð°Ð´ÐºÐ»ÑÐºÐ°Ð½Ð°.
+      revoke: ÐÐ´Ð°Ð·Ð²Ð°ÑÑ!
+      time_future: ÐÑÑÐ°Ñ Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÐ° ÑÐºÐ¾Ð½ÑÑÑÑÐ° Ñ %{time}.
+      title: ÐÐ½ÑÑÑ Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÑ Ð· %{block_on}
     show: 
       back: ÐÑÐ°Ð³Ð»ÑÐ´Ð·ÐµÑÑ ÑÑÐµ Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÑ
       confirm: ÐÑ ÑÐ¿ÑÑÐ½ÐµÐ½ÑÑ?
       edit: Ð ÑÐ´Ð°Ð³Ð°Ð²Ð°ÑÑ
+      heading: "%{block_on} Ð·Ð°Ð±Ð»Ð°ÐºÑÑÐ°Ð²Ð°Ð½Ñ %{block_by}"
+      needs_view: Ð£Ð´Ð·ÐµÐ»ÑÐ½ÑÐºÑ ÑÑÑÐ±Ð° ÑÐ²Ð°Ð¹ÑÑÑ Ñ ÑÑÑÑÑÐ¼Ñ, Ð¿ÐµÑÐ°Ð´ ÑÑÐ¼ ÑÐº Ð³ÑÑÐ°Ñ Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÐ° Ð±ÑÐ´Ð·Ðµ Ð·Ð½ÑÑÐ°.
       reason: "ÐÑÑÑÑÐ½Ð° Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÑ:"
       revoke: ÐÐ´Ð°Ð·Ð²Ð°ÑÑ!
+      revoker: "ÐÐ´ÐºÐ»ÑÐºÐ°ÑÑÑ:"
       show: ÐÐ°ÐºÐ°Ð·Ð°ÑÑ
       status: Ð¡ÑÐ°ÑÑÑ
       time_future: ÐÐ°ÐºÐ°Ð½ÑÐ²Ð°ÐµÑÑÐ° Ð¿ÑÐ°Ð· %{time}
       time_past: Ð¡ÐºÐ¾Ð½ÑÑÐ»Ð°ÑÑ %{time} ÑÐ°Ð¼Ñ
+      title: "%{block_on} Ð·Ð°Ð±Ð»Ð°ÐºÑÑÐ°Ð²Ð°Ð½Ñ %{block_by}"
+    update: 
+      only_creator_can_edit: Ð¢Ð¾Ð»ÑÐºÑ Ð¼Ð°Ð´ÑÑÐ°ÑÐ°Ñ, ÑÐºÑ ÑÑÐ²Ð°ÑÑÑ Ð±Ð»Ð°ÐºÑÑÐ¾ÑÐºÑ, Ð¼Ð¾Ð¶Ð° ÑÐ³Ð¾ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°ÑÑ.
+      success: ÐÐ»Ð°ÐºÑÑÐ¾ÑÐºÐ° Ð°Ð±Ð½Ð¾ÑÐ»ÐµÐ½Ð°.
   user_role: 
+    filter: 
+      already_has_role: ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº ÑÐ¶Ð¾ Ð¼Ð°Ðµ ÑÐ¾Ð»Ñ %{role}.
+      doesnt_have_role: ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº Ð½Ðµ Ð¼Ð°Ðµ ÑÐ¾Ð»Ñ %{role}.
+      not_a_role: Ð Ð°Ð´Ð¾Ðº Â«%{role}Â» Ð½Ðµ Ð·'ÑÑÐ»ÑÐµÑÑÐ° ÑÐ»ÑÑÐ½Ð°Ð¹ ÑÐ¾Ð»ÑÐ¹.
+      not_an_administrator: Ð¢Ð¾Ð»ÑÐºÑ Ð°Ð´Ð¼ÑÐ½ÑÑÑÑÐ°ÑÐ°ÑÑ Ð¼Ð¾Ð³ÑÑÑ ÐºÑÑÐ°Ð²Ð°ÑÑ ÑÐ¾Ð»ÑÐ¼Ñ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ, Ð° ÐÑ Ð½Ðµ Ð·'ÑÑÐ»ÑÐµÑÐµÑÑ Ð°Ð´Ð¼ÑÐ½ÑÑÑÑÐ°ÑÐ°ÑÐ°Ð¼.
     grant: 
+      are_you_sure: ÐÑ ÑÐ¿ÑÑÐ½ÐµÐ½Ñ, ÑÑÐ¾ Ð¶Ð°Ð´Ð°ÐµÑÐµ Ð½Ð°Ð´Ð°ÑÑ ÑÐ¾Ð»Ñ `%{role}' ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÑ `%{name}'?
       confirm: ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ
+      fail: ÐÐµÐ¼Ð°Ð³ÑÑÐ¼Ð° Ð½Ð°Ð´Ð°ÑÑ ÑÐ¾Ð»Ñ `%{role}' ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÑ `%{name}'. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿ÑÐ°Ð²ÐµÑÑÐµ ÐºÐ°Ð± ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐº Ñ ÑÐ¾Ð»Ñ Ð±ÑÐ»Ñ ÑÐ»ÑÑÐ½ÑÐ¼Ñ.
+      heading: ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ Ð½Ð°Ð´Ð°Ð½Ð½Ðµ ÑÐ¾Ð»Ñ
+      title: ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ Ð½Ð°Ð´Ð°Ð½Ð½Ðµ ÑÐ¾Ð»Ñ
     revoke: 
+      are_you_sure: ÐÑ ÑÐ¿ÑÑÐ½ÐµÐ½Ñ, ÑÑÐ¾ Ð¶Ð°Ð´Ð°ÐµÑÐµ Ð°Ð´Ð¼ÑÐ½ÑÑÑ ÑÐ¾Ð»Ñ `%{role}' ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÐ° `%{name}'?
       confirm: ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ
+      fail: ÐÐµÐ¼Ð°Ð³ÑÑÐ¼Ð° Ð°Ð´Ð¼ÑÐ½ÑÑÑ ÑÐ¾Ð»Ñ `%{role}' ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÐ° `%{name}'. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿ÑÐ°Ð²ÐµÑÑÐµ ÐºÐ°Ð± ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐº Ñ ÑÐ¾Ð»Ñ Ð±ÑÐ»Ñ ÑÐ»ÑÑÐ½ÑÐ¼Ñ.
+      heading: ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ Ð°Ð´Ð¼ÐµÐ½Ñ ÑÐ¾Ð»Ñ
+      title: ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ Ð°Ð´Ð¼ÐµÐ½Ñ ÑÐ¾Ð»Ñ
   welcome_page: 
+    add_a_note: 
+      paragraph_1_html: ÐÐ°Ð»Ñ ÑÑÑÐ±Ð° ÑÐ½ÐµÑÑÑ Ð´ÑÐ¾Ð±Ð½Ð°Ðµ ÑÐ´Ð°ÐºÐ»Ð°Ð´Ð½ÐµÐ½Ð½Ðµ, Ð´Ð·ÐµÐ»Ñ ÑÐºÐ¾Ð³Ð° Ð½Ðµ Ð²Ð°ÑÑÐ° Ð¼Ð°ÑÐ½Ð°Ð²Ð°ÑÑ ÑÐ°Ñ Ð½Ð° ÑÑÐ³ÑÑÑÑÐ°ÑÑÑ Ñ Ð²ÑÐ²ÑÑÑÐ½Ð½Ðµ Ð¿ÑÐ°Ð²ÑÐ»Ð°Ñ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ñ, ÑÐ°ÑÐ¼ Ð¿ÑÐ¾ÑÑÐ° Ð´Ð°Ð´Ð°ÑÑ Ð·Ð°ÑÐ²Ð°Ð³Ñ Ð½Ð° ÐºÐ°ÑÑÑ.
+      paragraph_2_html: "ÐÐµÑÐ°Ð¹Ð´Ð·ÑÑÐµ <a href='%{map_url}'>Ð½Ð° Ð¿ÑÐ°Ð³Ð»ÑÐ´ ÐºÐ°ÑÑÑ</ a> Ñ Ð¿ÑÑÑÑÐºÐ½ÑÑÐµ Ð·Ð½Ð°ÑÐ¾Ðº Ð·Ð°ÑÐ²Ð°Ð³Ñ: \n<span class='icon note'></span>. ÐÑÑÐ° Ð´Ð°Ð·Ð²Ð¾Ð»ÑÑÑ Ð´Ð°Ð´Ð°ÑÑ Ð¼Ð°ÑÐºÐµÑ Ð½Ð° ÐºÐ°ÑÑÑ, ÑÐºÑ Ð²Ñ Ð·Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿ÐµÑÐ°ÑÑÐ³Ð½ÑÑÑ Ð¼ÑÑÑÑ. ÐÐ°Ð´Ð°Ð¹ÑÐµ Ð²Ð°ÑÐ° Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ, Ð½Ð°ÑÑÑÐ½ÑÑÐµ \"Ð·Ð°ÑÐ°Ð²Ð°ÑÑ\", Ñ ÑÐ½ÑÑÑ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÑ ÑÐ±Ð°ÑÐ°ÑÑ ÑÐ³Ð¾ Ñ, Ñ Ð²ÑÐ¿Ð°Ð´ÐºÑ Ð½ÐµÐ°Ð±ÑÐ¾Ð´Ð½Ð°ÑÑÑ, Ð±ÑÐ´ÑÑÑ ÑÐ½ÐµÑÐµÐ½Ñ Ð·Ð¼ÐµÐ½Ñ Ñ ÐºÐ°ÑÑÑ."
+      title: ÐÑÐ¼Ð° ÑÐ°ÑÑ Ð½Ð° ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ðµ? ÐÐ°Ð´Ð°Ð¹ÑÐµ Ð·Ð°ÑÐ²Ð°Ð³Ñ!
+    basic_terms: 
+      editor_html: <Strong>Ð ÑÐ´Ð°ÐºÑÐ°Ñ</strong> - Ð³ÑÑÐ° Ð¿ÑÐ°Ð³ÑÐ°Ð¼Ð° Ð°Ð±Ð¾ Ð²ÑÐ±-ÑÐ°Ð¹Ñ, ÑÐºÑ Ð²Ñ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð²ÑÐºÐ°ÑÑÑÑÐ¾ÑÐ²Ð°ÑÑ Ð´Ð»Ñ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ñ ÐºÐ°ÑÑÑ.
+      node_html: <Strong>ÐÑÐ·ÐµÐ» (node)</strong> - Ð³ÑÑÐ° ÐºÑÐ¾Ð¿ÐºÐ° Ð½Ð° ÐºÐ°ÑÑÐµ, Ð½Ð°Ð¿ÑÑÐºÐ»Ð°Ð´, ÑÑÑÑÐ°ÑÐ°Ð½ ÑÑ Ð´ÑÑÐ²Ð°.
+      paragraph_1_html: OpenStreetMap Ð¼Ð°Ðµ ÑÐ²Ð¾Ð¹ ââÑÐ»Ð°ÑÐ½Ñ Ð¶Ð°ÑÐ³Ð¾Ð½. ÐÐ¾ÑÑ Ð½ÐµÐºÐ°Ð»ÑÐºÑ ÐºÐ»ÑÑÐ°Ð²ÑÑ ÑÐ»Ð¾Ñ, ÑÐºÑÑ Ð¼Ð¾Ð³ÑÑÑ Ð±ÑÑÑ ÐºÐ°ÑÑÑÐ½ÑÐ¼Ñ.
+      tag_html: "<strong>Ð¦ÑÑÐ»ÑÐº (tag)</strong> - Ð³ÑÑÐ° ÑÐ»ÐµÐ¼ÐµÐ½Ñ Ð°Ð¿ÑÑÐ°Ð½Ð½Ñ Ð²ÑÐ·Ð»Ð° Ð°Ð±Ð¾ ÐºÑÑÐ²Ð¾Ð¹, Ð½Ð°Ð¿ÑÑÐºÐ»Ð°Ð´,\nÐ½Ð°Ð·Ð²Ð° ÑÑÑÑÐ°ÑÐ°Ð½Ð° Ð°Ð±Ð¾ Ð°Ð±Ð¼ÐµÐ¶Ð°Ð²Ð°Ð½Ð½Ðµ ÑÑÑÐºÐ°ÑÑÑ Ð½Ð° Ð´Ð°ÑÐ¾Ð·Ðµ."
+      title: ÐÐµÐ²ÑÐ»ÑÐºÑ ÑÐ»Ð¾ÑÐ½ÑÐº ÐºÐ°ÑÑÐ¾Ð³ÑÐ°ÑÐ°
+      way_html: <Strong>ÐÑÑÐ²Ð°Ñ (way)</strong> - Ð³ÑÑÐ° Ð»ÑÐ½ÑÑ Ð°Ð±Ð¾ Ð¼Ð½Ð¾Ð³Ð°Ð²ÑÐ³Ð¾Ð»ÑÐ½ÑÐº, Ð½Ð°Ð¿ÑÑÐºÐ»Ð°Ð´, Ð´Ð°ÑÐ¾Ð³Ñ, ÑÑÐºÑ, Ð°Ð·ÑÑÑ Ð°Ð±Ð¾ Ð±ÑÐ´ÑÐ½ÐºÑ.
+    introduction_html: ÐÑÑÐ°ÐµÐ¼ Ñ OpenStreetMap, ÑÐ²Ð°Ð±Ð¾Ð´Ð½Ð°Ð¹ Ñ Ð´Ð°ÑÑÑÐ¿Ð½Ð°Ð¹ Ð´Ð»Ñ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ñ ÐºÐ°ÑÑÐµ ÑÐ²ÐµÑÑ. ÐÐ°ÑÐ°Ð·, ÐºÐ°Ð»Ñ Ð²Ñ ÑÐ²Ð°Ð¹ÑÐ»Ñ, ÑÑÑ Ð³Ð°ÑÐ¾Ð²Ð° Ð´Ð»Ñ Ð¿Ð°ÑÐ°ÑÐºÑ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ñ. ÐÐ¾ÑÑ ÐºÐ°ÑÐ¾ÑÐºÐ°Ðµ ÐºÑÑÐ°ÑÐ½ÑÑÑÐ²Ð° Ð¿Ð° Ð½Ð°Ð¹Ð²Ð°Ð¶Ð½ÐµÐ¹ÑÑÐ¼ ÑÑÑÐ°Ð¼, ÑÐºÑÑ Ð²Ñ Ð¿Ð°Ð²ÑÐ½Ð½Ñ Ð²ÐµÐ´Ð°ÑÑ.
     questions: 
+      paragraph_1_html: "OpenStreetMap Ð¼Ð°Ðµ ÑÐ¾Ð·Ð½ÑÑ ÑÑÑÑÑÑÑ Ð´Ð»Ñ Ð°ÑÑÑÐ¼Ð°Ð½Ð½Ñ ÑÐ½ÑÐ°ÑÐ¼Ð°ÑÑÑ Ð°Ð± Ð¿ÑÐ°ÐµÐºÑÐµ, Ð´Ð»Ñ Ð·Ð°Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð¿ÑÑÐ°Ð½Ð½ÑÑ Ñ Ð°ÑÑÑÐ¼Ð°Ð½Ð½Ñ Ð°Ð´ÐºÐ°Ð·Ð°Ñ, Ð´Ð»Ñ ÑÑÐ¼ÐµÑÐ½Ð°Ð³Ð° Ð°Ð±Ð¼ÐµÑÐºÐ°Ð²Ð°Ð½Ð½Ñ Ñ ÑÑÐ²Ð°ÑÑÐ½Ð½Ñ Ð´Ð°ÐºÑÐ¼ÐµÐ½ÑÐ°ÑÑÑ Ð¿Ð° ÐºÐ°ÑÑÐ°Ð³ÑÐ°ÑÐ°Ð²Ð°Ð½Ð½Ñ. \n<a href='%{help_url}'>ÐÑÑÑÐ¼Ð°ÐµÑÐµ Ð´Ð°Ð¿Ð°Ð¼Ð¾Ð³Ñ ÑÑÑ</a>."
       title: ÐÑÑÑ Ð¿ÑÑÐ°Ð½Ð½Ñ?
     start_mapping: ÐÐ°ÑÐ°ÑÑ Ð¼Ð°Ð»ÑÐ²Ð°ÑÑ ÐºÐ°ÑÑÑ
     title: ÐÑÑÐ°ÐµÐ¼!
+    whats_on_the_map: 
+      off_html: ÐÐ°ÑÑÐ° <em>ÐÐ</ em> ÑÐºÐ»ÑÑÐ°Ðµ ÑÑÐ±'ÐµÐºÑÑÑÐ½ÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ Ð½Ð°ÐºÑÑÐ°Ð»Ñ Ð°ÑÑÐ½Ð°Ðº, Ð³ÑÑÑÐ°ÑÑÑÐ½ÑÑ Ð°Ð±Ð¾ Ð³ÑÐ¿Ð°ÑÑÑÑÑÐ½ÑÑ ÑÐ°ÑÐ°ÐºÑÐ°ÑÑÑÑÑÐº Ñ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ Ð· ÐºÑÑÐ½ÑÑ, ÑÐºÑÑ Ð°Ð±Ð°ÑÐ¾Ð½ÐµÐ½Ñ Ð°ÑÑÐ°ÑÑÐºÑÐ¼ Ð¿ÑÐ°Ð²Ð°Ð¼. ÐÐ°Ð»Ñ Ð²Ñ Ð½Ðµ Ð¼Ð°ÐµÑÐµ ÑÐ¿ÐµÑÑÑÐ»ÑÐ½Ð°Ð³Ð° Ð´Ð°Ð·Ð²Ð¾Ð»Ñ, Ð½Ðµ ÐºÐ°Ð¿ÑÑÐ¹ÑÐµ Ð· Ð¿Ð°Ð¿ÑÑÐ¾Ð²ÑÑ ÐºÐ°ÑÑ Ð°Ð±Ð¾ ÐºÐ°ÑÑ Ñ ÐÐ½ÑÑÑÐ½ÑÑÐµ.
+      on_html: ÐÐ°ÑÑÐ° OpenStreetMap Ð·Ð¼ÑÑÑÐ°Ðµ Ð°Ð±'ÐµÐºÑÑ, ÑÐºÑÑ <em>ÑÑÐ½ÑÑÑÑ Ñ ÑÑÐ¿ÐµÑÐ°ÑÐ½Ñ Ð¼Ð¾Ð¼Ð°Ð½Ñ</em>, ÑÐºÐ»ÑÑÐ°ÑÑÑ Ð¼ÑÐ»ÑÑÐ½Ñ Ð´Ð°Ð¼Ð¾Ñ, Ð´Ð°ÑÐ¾Ð³ Ñ ÑÐ½ÑÑÑ ÑÐ»ÐµÐ¼ÐµÐ½ÑÐ°Ñ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ. ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð½Ð°Ð½Ð¾ÑÑÑÑ Ð½Ð° ÐºÐ°ÑÑÑ Ð»ÑÐ±ÑÑ Ð°Ð±'ÐµÐºÑÑ Ð½Ð°Ð²Ð°ÐºÐ¾Ð»ÑÐ½Ð°Ð³Ð° ÑÐ²ÐµÑÑ, ÑÐºÑÑ ÑÑÐºÐ°Ð²ÑÑÑ Ð²Ð°Ñ.
+      title: Ð¨ÑÐ¾ Ð·Ð¼ÑÑÑÐ°Ðµ ÐºÐ°ÑÑÐ°
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 74a8be050..f4e2717f5 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -207,6 +207,7 @@ de:
       loading: Lade â¦
     tag_details: 
       tags: Tags
+      telephone_link: "%{phone_number} anrufen"
       wiki_link: 
         key: ErlÃ¤uterungsseite fÃ¼r das %{key}-Tag
         tag: ErlÃ¤uterungsseite fÃ¼r das %{key}=%{value}-Tag
@@ -393,7 +394,7 @@ de:
       join_the_community: 
         explanation_html: "Falls du bei unseren Kartendaten ein Problem bemerkt hast wie das Fehlen einer StraÃe oder deiner Adresse,\nist der beste Weg zum Weitermachen der Beitritt zur OpenStreetMap-Gemeinschaft und das Beheben der Daten durch dich selbst."
         title: Der Gemeinschaft beitreten
-      title: Wie man helfen kann
+      title: So kannst du helfen
     other_concerns: 
       explanation_html: "Falls du Bedenken Ã¼ber die Verwendung unserer Daten oder Ã¼ber die Inhalte hast, lies bitte unsere\n<a href=\"/copyright\">Copyright-Seite</a> fÃ¼r mehr rechtliche Informationen oder kontaktiere die entsprechende\n<a href=\"http://wiki.osmfoundation.org/wiki/Working_Groups\">OSMF-Arbeitsgruppe</a>."
       title: Andere Anliegen
@@ -1988,7 +1989,7 @@ de:
     add_a_note: 
       paragraph_1_html: Falls du nur eine Kleinigkeit korrigieren mÃ¶chtest und dir die Zeit fehlt, dich einzuarbeiten, wie man in OSM Daten editiert, so gib einfach einen Hinweis/melde einen Fehler, dann kann sich ein anderer Mapper darum kÃ¼mmern.
       paragraph_2_html: "Gehe einfach auf <a href='%{map_url}'>die Karte</a> und klicke auf das Sprechblasen-Symbol:\n<span class='icon note'></span>. Dies fÃ¼gt einen Marker auf der Karte hinzu, diesen verschiebe bitte mÃ¶glichst genau auf die Problemstelle und schreibe einen Hinweis. Der Hinweis sollte den Sachverhalt mÃ¶glichst genau beschreiben, damit ein anderer Mapper die ErklÃ¤rung dann verwenden kann, um den Fehler zu beheben."
-      title: Keine Zeit zum editieren? Dann fÃ¼ge einen Hinweis ein/melde einen Fehler!
+      title: Keine Zeit? Dann fÃ¼ge einen Hinweis ein!
     basic_terms: 
       editor_html: Ein <strong>Editor</strong> ist ein Programm oder eine Webseite, mit der man die Karte bearbeiten kann.
       node_html: Ein <strong>Node</strong> (Knoten) in OSM ist ein Punkt auf der Karte, z.B. ein Restaurant oder ein Baum.
diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 12a06533b..eba77d0e2 100644
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -12,8 +12,8 @@ diq:
         body: VÃªrey mesaci
       diary_entry: 
         language: ZÄ±wan
-        latitude: Heralem
-        longitude: Lemen
+        latitude: VerÄ±niye
+        longitude: Derganiye
         title: Mewzu
         user: Karber
       friend: 
@@ -26,8 +26,8 @@ diq:
         title: Mewzu
       trace: 
         description: ÅÄ±nasnayÄ±Å
-        latitude: Heralem
-        longitude: Lemen
+        latitude: VerÄ±niye
+        longitude: Derganiye
         name: Name
         public: Åar
         size: GÄ±rdiye
@@ -146,9 +146,9 @@ diq:
     edit: 
       body: "VÃªrey mesaci:"
       language: "ZÄ±wan:"
-      latitude: "Heralem:"
+      latitude: "VerÄ±niye:"
       location: Lokasyon
-      longitude: "Lemen:"
+      longitude: "Derganiye:"
       save_button: Qeyd ke
       subject: "Mewzu:"
     location: 
@@ -171,9 +171,9 @@ diq:
       export_button: Teber de
       format: Format
       image_size: GÄ±rdiya Resimi
-      latitude: "Heralem:"
+      latitude: "VerÄ±niye:"
       licence: Lisans
-      longitude: "Lemen:"
+      longitude: "Derganiye:"
       max: maks
       options: WeÃ§inegi
       output: VÄ±cyaen
@@ -647,11 +647,11 @@ diq:
       current email address: "E-postay ÅÄ±maya newki:"
       home location: "Herun:"
       image: "Resim:"
-      latitude: "Heralem:"
-      longitude: "Lemen:"
+      latitude: "VerÄ±niye:"
+      longitude: "Derganiye:"
       my settings: EyarÃª mÄ±
       new email address: "E-postay adresiyo newe:"
-      new image: Resim deke
+      new image: Yew resÄ±m cÄ± ke
       openid: 
         link: http://wiki.openstreetmap.org/wiki/OpenID
         link text: no Ã§Ä±ko?
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 06cf0763e..0b21ec94b 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -860,7 +860,7 @@ el:
           motel: ÎÎ¿ÏÎ­Î»
           museum: ÎÎ¿ÏÏÎµÎ¯Î¿
           picnic_site: Î¤Î¿ÏÎ¿Î¸ÎµÏÎ¯Î± Î³Î¹Î± Î Î¹Îº-ÎÎ¹Îº
-          theme_park: ÎÎµÎ¼Î±ÏÎ¹ÎºÏ Î Î¬ÏÎºÎ¿
+          theme_park: Î Î¬ÏÎºÎ¿ Î¨ÏÏÎ±Î³ÏÎ³Î¯Î±Ï
           valley: ÎÎ¿Î¹Î»Î¬Î´Î±
           viewpoint: ÎÏÎ¿ÏÎ·
           zoo: ÎÏÎ¿Î»Î¿Î³Î¹ÎºÏÏ ÎÎ®ÏÎ¿Ï
@@ -894,7 +894,7 @@ el:
       description: ÎÎ¬Î½ÎµÏÎµ Î­Î½Î± ÎµÏÏÏÎ·Î¼Î± Î® Î±Î½Î±Î¶Î·ÏÎ®ÏÎµÏÎµ Î±ÏÎ±Î½ÏÎ®ÏÎµÎ¹Ï ÏÏÎ·Î½ Î¹ÏÏÎ¿ÏÎµÎ»Î¯Î´Î± ÎµÏÏÏÎ®ÏÎµÏÎ½ ÎºÎ±Î¹ Î±ÏÎ±Î½ÏÎ®ÏÎµÏÎ½ ÏÎ¿Ï OSM.
       title: help.openstreetmap.org
       url: https://help.openstreetmap.org/
-    introduction: "OpenStreetMap Î­ÏÎµÎ¹ ÏÎ¿Î»Î»Î±ÏÎ»Î¿ÏÏ ÏÏÏÎ¿ÏÏ Î³Î¹Î± Î½Î± Î¼Î¬Î¸ÎµÏÎµ ÏÏÎµÏÎ¹ÎºÎ¬ Î¼Îµ ÏÎ¿ Î­ÏÎ³Î¿, Î½Î± ÎºÎ¬Î½ÎµÏÎµ\nÎµÏÏÏÎ®Î¼Î±ÏÎ±, ÎºÎ±Î¹ Î½Î± Î»Î¬Î²ÎµÏÎµ Î¼Î­ÏÎ¿Ï ÏÎµ ÏÏÎ»Î»Î¿Î³Î¹ÎºÎ­Ï ÏÏÎ¶Î·ÏÎ®ÏÎµÎ¹Ï ÎºÎ±Î¹ Î½Î± Î²ÏÎµÎ¯ÏÎµ ÏÎµÎºÎ¼Î·ÏÎ¯ÏÏÎ· Î³Î¹Î± Î¸Î­Î¼Î±ÏÎ± ÏÎ±ÏÏÎ¿Î³ÏÎ¬ÏÎ·ÏÎ·Ï."
+    introduction: "Î¤Î¿ OpenStreetMap Î­ÏÎµÎ¹ ÏÎ¿Î»Î»Î±ÏÎ»Î¿ÏÏ ÏÏÏÎ¿ÏÏ Î³Î¹Î± Î½Î± Î¼Î¬Î¸ÎµÏÎµ ÏÏÎµÏÎ¹ÎºÎ¬ Î¼Îµ ÏÎ¿ Î­ÏÎ³Î¿, Î½Î± ÎºÎ¬Î½ÎµÏÎµ\nÎµÏÏÏÎ®Î¼Î±ÏÎ±, ÎºÎ±Î¹ Î½Î± Î»Î¬Î²ÎµÏÎµ Î¼Î­ÏÎ¿Ï ÏÎµ ÏÏÎ»Î»Î¿Î³Î¹ÎºÎ­Ï ÏÏÎ¶Î·ÏÎ®ÏÎµÎ¹Ï ÎºÎ±Î¹ Î½Î± Î²ÏÎµÎ¯ÏÎµ ÏÎµÎºÎ¼Î·ÏÎ¯ÏÏÎ· Î³Î¹Î± Î¸Î­Î¼Î±ÏÎ± ÏÎ±ÏÏÎ¿Î³ÏÎ¬ÏÎ·ÏÎ·Ï."
     title: ÎÏÎ¯ÏÎºÎ¿Î½ÏÎ±Ï ÎÎ¿Î®Î¸ÎµÎ¹Î±
     welcome: 
       description: ÎÎµÎºÎ¹Î½Î®ÏÏÎµ Î¼Îµ Î±ÏÏÎ­Ï ÏÎ¹Ï Î³ÏÎ®Î³Î¿ÏÎµÏ Î¿Î´Î·Î³Î¯ÎµÏ ÏÎ¿Ï ÎºÎ±Î»ÏÏÏÎ¿ÏÎ½ ÏÎ± Î²Î±ÏÎ¹ÎºÎ¬ OpenStreetMap.
@@ -1470,7 +1470,7 @@ el:
       private: ÎÎÎÎ©Î¤ÎÎÎ
       public: ÎÎÎÎÎ£ÎÎ
       trace_details: Î ÏÎ¿Î²Î¿Î»Î® ÎÎµÏÏÎ¿Î¼ÎµÏÎµÎ¹ÏÎ½ ÎÏÎ½Î¿ÏÏ
-      trackable: ÎÎÎÎ§ÎÎÎ¥ÎÎ¤ÎÎ
+      trackable: ÎÎÎÎ§ÎÎÎ¥Î£ÎÎÎ
       view_map: Î ÏÎ¿Î²Î¿Î»Î® Î§Î¬ÏÏÎ·
     trace_form: 
       description: "Î ÎµÏÎ¹Î³ÏÎ±ÏÎ®:"
@@ -1512,8 +1512,8 @@ el:
       visibility: "ÎÏÎ±ÏÏÏÎ·ÏÎ±:"
     visibility: 
       private: Î ÏÎ¿ÏÏÏÎ¹ÎºÏ (Î´Î¹Î±Î¼Î¿Î¹ÏÎ±ÏÎ¼ÏÏ Î¼ÏÎ½Î¿ ÏÎ±Î½ Î±Î½ÏÎ½ÏÎ¼Î¿Ï)
-      public: ÎÎ·Î¼ÏÏÎ¹Î¿ (ÎÎ¼ÏÎ¬Î½Î¹ÏÎ· ÏÏÎ· Î»Î¯ÏÏÎ± Î¹ÏÎ½ÏÎ½ ÏÎ±Î½ Î±Î½ÏÎ½ÏÎ¼Î¿Ï)
-      trackable: ÎÎ½Î¹ÏÎ½ÎµÏÎµÏÎ±Î¹ (ÎºÎ¿Î¹Î½Î¿ÏÎ¿Î¹ÎµÎ¯ÏÎ±Î¹ Î±Î½ÏÎ½ÏÎ¼Î±, Î´Î¹Î­ÏÎ±Î¾Îµ ÏÎ·Î¼ÎµÎ¯Î± Î¼Îµ ÏÏÎ¿Î½Î¿ÏÎ·Î¼Î¬Î½ÏÎµÎ¹Ï)
+      public: ÎÎ·Î¼ÏÏÎ¹Î¿ (ÎµÎ¼ÏÎ±Î½Î¯Î¶ÎµÏÏÎµ ÏÏÎ· Î»Î¯ÏÏÎ± Î¹ÏÎ½ÏÎ½ ÏÎ±Î½ Î±Î½ÏÎ½ÏÎ¼Î¿Ï, Î¼Î· ÏÏÎ¿Î½Î¿ÏÎ·Î¼Î±ÏÎ¼Î­Î½Î± ÏÎ·Î¼ÎµÎ¯Î±)
+      trackable: ÎÎ½Î¹ÏÎ½Î­ÏÏÎ¹Î¼Î¿(ÎºÎ¿Î¹Î½Î¿ÏÎ¿Î¹ÎµÎ¯ÏÎ±Î¹ Î±Î½ÏÎ½ÏÎ¼Î±, Î´Î¹Î±ÏÎ¬ÏÏÎ¿Î½ÏÎ±Î¹ ÏÎ± ÏÎ·Î¼ÎµÎ¯Î± Î¼Îµ ÏÏÎ¿Î½Î¿ÏÎ·Î¼Î¬Î½ÏÎµÎ¹Ï)
   user: 
     account: 
       contributor terms: 
@@ -1877,7 +1877,7 @@ el:
       way_html: ÎÎ¹ <strong>Î´Î¹Î±Î´ÏÎ¿Î¼Î­Ï</strong> ÎµÎ¯Î½Î±Î¹ Î³ÏÎ±Î¼Î¼Î­Ï Î® ÏÎµÏÎ¹Î¿ÏÎ­Ï, ÏÏÏÏ Î´ÏÏÎ¼Î¿Î¹, ÏÎ­Î¼Î±ÏÎ±, Î»Î¯Î¼Î½ÎµÏ Î® ÎºÏÎ®ÏÎ¹Î±.
     introduction_html: Î£Î±Ï ÎºÎ±Î»ÏÏÎ¿ÏÎ¯Î¶Î¿ÏÎ¼Îµ ÏÏÎ¿ OpenStreetMap, ÏÎ¿Î½ ÎµÎ»ÎµÏÎ¸ÎµÏÎ¿ ÎºÎ±Î¹ ÎµÏÎµÎ¾ÎµÏÎ³Î¬ÏÎ¹Î¼Î¿ ÏÎ¬ÏÏÎ· ÏÎ¿Ï ÎºÏÏÎ¼Î¿Ï. Î¤ÏÏÎ± ÏÎ¿Ï Î­ÏÎµÏÎµ ÎµÎ³Î³ÏÎ±ÏÎµÎ¯, ÎµÎ¯ÏÏÎµ ÏÎ±Î½Î­ÏÎ¿Î¹Î¼Î¿Î¹ Î½Î± Î±ÏÏÎ¯ÏÎµÏÎµ ÏÎ· ÏÎ±ÏÏÎ¿Î³ÏÎ¬ÏÎ·ÏÎ·. ÎÎ´Ï ÎµÎ¯Î½Î±Î¹ Î­Î½Î±Ï Î³ÏÎ®Î³Î¿ÏÎ¿Ï Î¿Î´Î·Î³ÏÏ Î¼Îµ ÏÎ± ÏÎ¹Î¿ ÏÎ·Î¼Î±Î½ÏÎ¹ÎºÎ¬ ÏÏÎ¬Î³Î¼Î±ÏÎ± ÏÎ¿Ï ÏÏÎ­ÏÎµÎ¹ Î½Î± Î¾Î­ÏÎµÏÎµ.
     questions: 
-      paragraph_1_html: "OpenStreetMap Î­ÏÎµÎ¹ ÏÎ¿Î»Î»Î±ÏÎ»Î¿ÏÏ ÏÏÏÎ¿ÏÏ Î³Î¹Î± Î½Î± Î¼Î¬Î¸ÎµÏÎµ ÏÏÎµÏÎ¹ÎºÎ¬ Î¼Îµ ÏÎ¿ Î­ÏÎ³Î¿, Î½Î± ÎºÎ¬Î½ÎµÏÎµ\nÎµÏÏÏÎ®Î¼Î±ÏÎ±, ÎºÎ±Î¹ Î½Î± Î»Î¬Î²ÎµÏÎµ Î¼Î­ÏÎ¿Ï ÏÎµ ÏÏÎ»Î»Î¿Î³Î¹ÎºÎ­Ï ÏÏÎ¶Î·ÏÎ®ÏÎµÎ¹Ï ÎºÎ±Î¹ Î½Î± Î²ÏÎµÎ¯ÏÎµ ÏÎµÎºÎ¼Î·ÏÎ¯ÏÏÎ· Î³Î¹Î± Î¸Î­Î¼Î±ÏÎ± ÏÎ±ÏÏÎ¿Î³ÏÎ¬ÏÎ·ÏÎ·Ï.\n<a href='%{help_url}'>ÎÎ¬Î²ÎµÏÎµ Î²Î¿Î®Î¸ÎµÎ¹Î± ÎµÎ´Ï</a>."
+      paragraph_1_html: "Î¤Î¿ OpenStreetMap Î­ÏÎµÎ¹ ÏÎ¿Î»Î»Î±ÏÎ»Î¿ÏÏ ÏÏÏÎ¿ÏÏ Î³Î¹Î± Î½Î± Î¼Î¬Î¸ÎµÏÎµ ÏÏÎµÏÎ¹ÎºÎ¬ Î¼Îµ ÏÎ¿ Î­ÏÎ³Î¿, Î½Î± ÎºÎ¬Î½ÎµÏÎµ\nÎµÏÏÏÎ®Î¼Î±ÏÎ±, ÎºÎ±Î¹ Î½Î± Î»Î¬Î²ÎµÏÎµ Î¼Î­ÏÎ¿Ï ÏÎµ ÏÏÎ»Î»Î¿Î³Î¹ÎºÎ­Ï ÏÏÎ¶Î·ÏÎ®ÏÎµÎ¹Ï ÎºÎ±Î¹ Î½Î± Î²ÏÎµÎ¯ÏÎµ ÏÎµÎºÎ¼Î·ÏÎ¯ÏÏÎ· Î³Î¹Î± Î¸Î­Î¼Î±ÏÎ± ÏÎ±ÏÏÎ¿Î³ÏÎ¬ÏÎ·ÏÎ·Ï.\n<a href='%{help_url}'>ÎÎ¬Î²ÎµÏÎµ Î²Î¿Î®Î¸ÎµÎ¹Î± ÎµÎ´Ï</a>."
       title: ÎÏÏÏÎ®ÏÎµÎ¹Ï;
     start_mapping: ÎÎµÎºÎ¹Î½Î®ÏÏÎµ ÏÎ· Î§Î±ÏÏÎ¿Î³ÏÎ¬ÏÎ·ÏÎ·
     title: ÎÎ±Î»ÏÏ Î®ÏÎ¸Î±ÏÎµ!
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 942ca95c8..ecf20f982 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -151,7 +151,7 @@ fi:
       closed_title: "Ratkaistu karttailmoitus #%{note_name}"
       commented_by: Kommentti kÃ¤yttÃ¤jÃ¤ltÃ¤ %{user} <abbr title='%{exact_time}'>%{when} sitten</abbr>
       commented_by_anonymous: Kommentti tuntemattomalta kÃ¤yttÃ¤jÃ¤ltÃ¤ <abbr title='%{exact_time}'>%{when} sitten</abbr>
-      description: "Kuvaus:"
+      description: Kuvaus
       hidden_by: Piilottanut kÃ¤yttÃ¤jÃ¤ %{user} <abbr title='%{exact_time}'>%{when} sitten</abbr>
       hidden_title: "Piilotettu karttailmoitus #%{note_name}"
       new_note: Uusi karttailmoitus
diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 80a724700..7583aad20 100644
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -18,7 +18,7 @@ fur:
         language: Lenghe
         latitude: Latitudin
         longitude: Longjitudin
-        title: Titul
+        title: Sogjet
         user: Utent
       friend: 
         friend: AmÃ¬
@@ -27,7 +27,7 @@ fur:
         body: Cuarp
         recipient: Destinatari
         sender: Mitent
-        title: Titul
+        title: Sogjet
       trace: 
         description: Descrizion
         latitude: Latitudin
@@ -125,7 +125,7 @@ fur:
       closed_title: "Note risolte #%{note_name}"
       commented_by: Coment di %{user} <abbr title='%{exact_time}'>%{when} indaÃ»r</abbr>
       commented_by_anonymous: Coment di un anonim <abbr title='%{exact_time}'>%{when} indaÃ»r</abbr>
-      description: "Descrizion:"
+      description: Descrizion
       hidden_by: Platade di %{user} <abbr title='%{exact_time}'>%{when} indaÃ»r</abbr>
       hidden_title: "Note platade #%{note_name}"
       new_note: Gnove note
@@ -316,6 +316,14 @@ fur:
           title: Altris sorzints
       zoom: Ingrandiment
     title: Espuarte
+  fixthemap: 
+    how_to_help: 
+      join_the_community: 
+        title: Jentre te comunitÃ¢t
+      title: CemÃ»t contribuÃ®
+    other_concerns: 
+      title: Altris aspiets
+    title: Segnale un probleme / Comede la mape
   geocoder: 
     description: 
       title: 
@@ -636,6 +644,10 @@ fur:
     title: CemÃ»t vÃª un jutori
     welcome: 
       title: BenvignÃ»ts in OSM
+      url: /welcome
+    wiki: 
+      title: wiki.openstreetmap.org
+      url: http://wiki.openstreetmap.org/
   javascripts: 
     close: Siere
     edit_help: MÃ´f la mape e aumente il zoom tal lÃ»c che tu vuelis cambiÃ¢, po frache culÃ¬
@@ -666,7 +678,7 @@ fur:
     notes: 
       new: 
         add: Zonte une note
-        intro: Par vÃª une mape simpri miÃ´r, lis informazions che tu inserissis a son mostradis a chei altris che a mapin, par cui cÃ®r di jessi plui descritÃ®f pussibil e di spostÃ¢ il segnalut te posizion precise prime di inserÃ® ca sot la tÃ´ note.
+        intro: Ãstu cjatÃ¢t un erÃ´r o alc ch'al mancje? Informe i altris mapadÃ´rs cussÃ¬ che al podedi jessi corezÃ»t. Sposte il segnalut te posizion juste e inserÃ¬s une note par spiegÃ¢ il probleme. (Par plasÃª no stÃ¢ zontÃ¢ informazions personÃ¢ls).
       show: 
         anonymous_warning: Cheste note e inclÃ»t coments di utents anonims che a varessin di jessi verificÃ¢ts in mÃ»t indipendent.
         comment: Coment
@@ -889,6 +901,8 @@ fur:
       allow_write_notes: cambiÃ¢ lis notis.
       allow_write_prefs: modificÃ¢ lis tÃ´s preferencis dal utent.
       request_access: La aplicazion %{app_name} e je daÃ»r a domandÃ¢ di vÃª acÃ¨s al to profÃ®l, %{user}. Controle se tu sÃªs dacuardi che la aplicazion e podedi fÃ¢ chestis robis. Tu puedis sielzi ogni opzion in mÃ»t indipendent.
+    oauthorize_success: 
+      verification: Il codiÃ§ di verifiche al Ã¨ %{code}.
   oauth_clients: 
     edit: 
       submit: Cambie
@@ -900,6 +914,7 @@ fur:
       allow_write_notes: cambiÃ¢ lis notis.
       allow_write_prefs: modificÃ¢ lis sÃ´s preferencis dal utent.
       name: Non
+      requests: "Domande i permÃ¨s ca sot al utent:"
       url: URL principÃ¢l de aplicazion
     index: 
       application: Non de aplicazion
@@ -991,6 +1006,7 @@ fur:
             - universitÃ¢t
           secondary: Strade secondarie
           station: stazion de ferade
+          subway: Metropolitane
           tourist: Atrazion turistiche
           tram: 
             - Metropolitana leggera
@@ -1240,6 +1256,8 @@ fur:
       heading: ZontÃ¢ %{user} ai amÃ®s?
       success: "%{name} al Ã¨ cumÃ² to amÃ¬!"
     new: 
+      about: 
+        header: Libare e modificabile
       confirm email address: "Conferme direzion pueste:"
       confirm password: "Conferme la password:"
       continue: Regjistriti
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 613e160d1..4346d5371 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -919,6 +919,7 @@ hr:
     home: PokaÅ¾i moj dom
     intro_2_create_account: Stvori korisniÄki raÄun
     intro_header: DobrodoÅ¡ao/la na OpenStreetMap!
+    intro_text: OpenStreetMap je karta svijeta, stvorena od strane ljudi (volontera/doprinositelja) i moÅ¾e se slobodno koristiti pod licencijom otvorenog koda (ODbL).
     learn_more: Saznaj viÅ¡e
     log_in: Prijavi se
     log_in_tooltip: Prijavi se sa postojeÄim korisniÄkim raÄunom
@@ -933,6 +934,7 @@ hr:
     osm_read_only: Zbog radova na odrÅ¾avanju baze podataka OpenStreetMapa, istu trenutaÄno nije moguÄe mijenjati.
     sign_up: Otvori raÄun
     sign_up_tooltip: Otvori korisniÄki raÄun za ureÄivanje
+    start_mapping: PoÄni kartirati
     tag_line: Slobodna wiki karta Svijeta
     user_diaries: Dnevnik
     user_diaries_tooltip: PrikaÅ¾i korisniÄke dnevnike
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 2a2073dd2..9637df770 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -3,6 +3,7 @@
 # Export driver: syck-pecl
 # Author: BÃ¡thoryPÃ©ter
 # Author: City-busz
+# Author: Csega
 # Author: Dani
 # Author: Dj
 # Author: Glanthor Reviol
@@ -735,6 +736,7 @@ hu:
           locality: Hely
           moor: MocsÃ¡r
           municipality: TelepÃ¼lÃ©s
+          neighbourhood: SzomszÃ©dsÃ¡g
           postcode: IrÃ¡nyÃ­tÃ³szÃ¡m
           region: RÃ©giÃ³
           sea: Tenger
@@ -895,6 +897,7 @@ hu:
     help: 
       title: help.openstreetmap.org
       url: https://help.openstreetmap.org/
+    title: SegÃ­tsÃ©gkÃ©rÃ©s
     welcome: 
       title: ÃdvÃ¶zlÃ¼nk az OSM-en
       url: /welcome
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 91fabaaaf..f59a44554 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -8,12 +8,15 @@
 # Author: HarryMahar
 # Author: Irwangatot
 # Author: Iwan Novirion
+# Author: Relly Komaruzaman
 # Author: Vasanthi
 # Author: Wulankhairunisa
 # Author: ìë¼
 id: 
   about_page: 
+    next: Berikutnya
     open_data_html: "OpenStreetMap adalah <i>data terbuka</i>: Anda bebas untuk menggunakannya untuk tujuan apapun selama Anda memberi penghargaan pada OpenStreetMap dan kontributornya. Jika Anda mengubah atau membangun dari data dengan cara tertentu, Anda dapat menyebarkan hasilnya hanya di bawah lisensi yang sama. Lihat <a href='%{copyright_path}'>halaman Hak Cipta dan Lisensi</a> untuk perinciannya."
+    open_data_title: Buka Data
     partners_title: Rekan
   activerecord: 
     attributes: 
@@ -23,7 +26,7 @@ id:
         language: Bahasa
         latitude: Garis Lintang
         longitude: Garis Bujur
-        title: Judul
+        title: Subjek
         user: Pengguna
       friend: 
         friend: Teman
@@ -92,17 +95,38 @@ id:
       blocked: Akses Anda ke API telah diblokir. Silahkan log-in ke antarmuka web untuk mengetahui lebih lanjut.
       need_to_see_terms: Akses Anda ke API untuk sementara ditangguhkan. Silahkan log-in ke antarmuka web untuk melihat persyaratan kontributor. Anda tidak perlu untuk setuju, tapi Anda harus melihat mereka.
   browse: 
+    anonymous: Anonimitas
     changeset: 
+      belongs_to: Pembuat
       changesetxml: Set Perubahan XML
       feed: 
         title: Set Perubahan %{id}
         title_comment: Set Perubahan %{id} - %{comment}
+      node: Node (% {count})
+      node_paginated: Node ( %{x}-% {y} % {count})
       osmchangexml: osmChange XML
+      relation: Hubungan (% {count})
+      relation_paginated: Hubungan ( %{x}-% {y} % {count})
       title: "Set Perubahan: %{id}"
+      way: Cara (% {count})
+      way_paginated: Cara ( %{x}-% {y} % {count})
+    closed: Ditutup
+    closed_by_html: Ditutup <abbr title='<span class="notranslate" translate="no">%{title}'>% {waktu} yang lalu</abbr> oleh % {pengguna}
+    closed_html: Ditutup <abbr title='<span class="notranslate" translate="no">%{title}'>% {waktu} yang lalu</abbr>
     containing_relation: 
       entry: Relasi %{relation_name}
       entry_role: Relasi %{relation_name} (as %{relation_role})
+    created: Dibuat
+    created_by_html: Dibuat <abbr title='<span class="notranslate" translate="no">%{title}'>% {waktu} yang lalu</abbr> oleh % {pengguna}
+    created_html: Dibuat <abbr title='<span class="notranslate" translate="no">%{title}'>% {waktu} yang lalu</abbr>
+    deleted_by_html: Dihapus <abbr title='<span class="notranslate" translate="no">%{title}'>% {waktu} yang lalu</abbr> oleh % {pengguna}
     download_xml: Unduh XML
+    edited_by_html: Disunting <abbr title='<span class="notranslate" translate="no">%{title}'>% {waktu} yang lalu</abbr> oleh % {pengguna}
+    in_changeset: Ubahset
+    location: "Lokasi:"
+    no_comment: (tidak ada komentar)
+    node: 
+      title: "Node: % {name}"
     not_found: 
       sorry: "Maaf, %{type} #%{id} tidak dapat ditemukan."
       type: 
@@ -111,13 +135,17 @@ id:
         relation: relasi
         way: way/garis
     note: 
-      closed_title: "Catatan diselesaikan: %{note_name}"
+      closed_title: "Catatan tuntas: %{note_name}"
       commented_by: Komentar dari %{user} <abbr title='%{exact_time}'>%{when} yang lalu</abbr>
       commented_by_anonymous: Komentar dari anonim <abbr title='%{exact_time}'>%{when} yang lalu</abbr>
       description: Deskripsi
+      hidden_title: "Catatan tersembunyi #% {note_name}"
+      new_note: Catatan Baru
       open_by: Dibuat oleh %{user} <abbr title='%{exact_time}'>%{when} yang lalu</abbr>
-      open_title: "Catatan belum terselesaikan: %{note_name}"
+      open_by_anonymous: Dibuat oleh anonim <abbr title='%{exact_time}'>%{when} yang lalu</abbr>
+      open_title: "Catatan belum tuntas: %{note_name}"
       title: "Catatan: %{id}"
+    part_of: Bagian dari
     redacted: 
       message_html: Versi %{version} %{type} ini tidak dapat ditampilkan karena telah diedit. Silahkan lihat %{redaction_link} untuk rincian.
       redaction: Redaksi %{id}
@@ -125,6 +153,8 @@ id:
         node: node/titik
         relation: relasi
         way: way/garis
+    relation: 
+      members: Anggota
     relation_member: 
       entry_role: "%{type} %{name} sebagai %{role}"
       type: 
@@ -148,6 +178,9 @@ id:
         node: node/titik
         relation: relasi
         way: way/garis
+    version: Versi
+    view_details: Lihat Rincian
+    view_history: Versi terdahulu
   changeset: 
     changeset: 
       anonymous: Anonim
@@ -165,6 +198,7 @@ id:
       user: Pengguna
     list: 
       empty: Tidak ada set perubahan yang ditemukan.
+      load_more: Baca lebih lanjut
       title: Set perubahan
       title_friend: Set perubahan oleh teman Anda
       title_nearby: Set perubahan oleh pengguna terdekat
@@ -282,8 +316,18 @@ id:
       scale: Skala
       too_large: 
         advice: "Jika ekspor di atas gagal, silakan pertimbangkan untuk menggunakan satu dari sumber yang tercantum di bawah ini:"
-        body: Wilayah ini terlalu besar untuk diekspor sebagai data XML OpenStreetMap. Silahkan perbesar atau pilih wilayah yang lebih kecil.
+        body: Wilayah ini terlalu besar untuk diekspor sebagai data XML OpenStreetMap. Silakan perbesar atau pilih wilayah yang lebih kecil, atau gunakan salah satu sumber di bawah ini untuk mengunduh data massal.
+        planet: 
+          description: Salinan lengkap basis data OpenStreetMap yang dimutakhiran secara rutin
+          title: Planet OSM
       zoom: Perbesar
+    title: Ekspor
+  fixthemap: 
+    how_to_help: 
+      join_the_community: 
+        title: Bergabung dengan komunitas
+      title: Cara Membantu
+    title: Laporkan kesalahan / Perbaiki peta
   geocoder: 
     description: 
       title: 
@@ -420,6 +464,7 @@ id:
           shower: Tempat Pemandian Umum
           social_centre: Pusat Sosial
           social_club: Klub Sosial
+          social_facility: Fasilitas Sosial
           studio: Studio
           supermarket: Supermarket
           swimming_pool: Kolam Renang
@@ -448,6 +493,9 @@ id:
           "yes": Jembatan
         building: 
           "yes": Bangunan
+        emergency: 
+          fire_hydrant: Hidran Kebakaran
+          phone: Telepon Darurat
         highway: 
           bridleway: Jalan Tanah
           bus_guideway: Jalur Bus Terpandu
@@ -480,6 +528,7 @@ id:
           speed_camera: Kamera Pendeteksi Kecepatan
           steps: Langkah-langkah
           stile: Pijakan kaki pada pagar
+          street_lamp: Lampu Jalan
           tertiary: Jalan Tersier
           tertiary_link: Jalan Tersier
           track: Trek
@@ -684,6 +733,7 @@ id:
           beverages: Toko Minuman
           bicycle: Toko Sepeda
           books: Toko Buku
+          boutique: Butik
           butcher: Toko Daging
           car: Showroom Mobil
           car_parts: Toko Onderdil Mobil
@@ -697,6 +747,7 @@ id:
           convenience: Toko Serba Ada (Kecil)
           copyshop: Fotokopi
           cosmetics: Toko Kosmetik
+          deli: Siap saji
           department_store: Toko serba ada
           discount: Toko Barang Obral
           doityourself: Toko Perkakas
@@ -733,17 +784,21 @@ id:
           organic: Toko Makanan Organik
           outdoor: Toko Barang-Barang Outdoor
           pet: Toko Hewan
+          pharmacy: Apotek
           photo: Studio Foto
           salon: Salon
+          second_hand: Toko loak
           shoes: Toko Sepatu
           shopping_centre: Pusat Perbelanjaan
           sports: Toko Olahraga
           stationery: Toko Alat Tulis
           supermarket: Supermarket
+          tailor: Penjahit
           toys: Toko Mainan
           travel_agency: Agen Perjalanan
           video: Toko Video
           wine: Lisensi Toko Minuman Beralkohol
+          "yes": Toko
         tourism: 
           alpine_hut: Gubuk Pegunungan
           artwork: Karya Seni
@@ -766,6 +821,7 @@ id:
           viewpoint: Sudut Pandang
           zoo: Kebun Binatang
         tunnel: 
+          culvert: Gorong-gorong
           "yes": Terowongan
         waterway: 
           artificial: Jalur Air Buatan
@@ -789,28 +845,40 @@ id:
           water_point: Titik Air
           waterfall: Air Terjun
           weir: Tanggul Sungai
+  help_page: 
+    welcome: 
+      title: Selamat datang di OSM
   javascripts: 
     close: Tutup
+    edit_help: Memindahkan peta dan memperbesar lokasi yang ingin Anda sunting, kemudian klik di sini.
     key: 
-      title: Tombol Kunci
-      tooltip: Tombol Kunci
+      title: Kunci Peta
+      tooltip: Kunci Peta
+      tooltip_disabled: Kunci Peta tersedia hanya untuk lapisan standar
     map: 
       base: 
         cycle_map: Peta Sepeda
+        hot: Kemanusiaan
         standard: Standar
         transport_map: Peta Transportasi
+      copyright: Â© <a href='%{copyright_url}'>Kontributor OpenStreetMap</a>
+      donate_link_text: <a class='donate-attr' href='%{donate_url}'>Beri Sumbangan</a>
       layers: 
         data: Data Peta
         header: Layer Peta
         notes: Catatan Peta
         overlays: Mengaktifkan overlay untuk penyelesaian masalah peta
+        title: Lapisan
+      locate: 
+        popup: Anda dalam {distance} {unit} dari sini
+        title: Tampilkan Lokasiku
       zoom: 
         in: Perbesar
         out: Perkecil
     notes: 
       new: 
         add: Tambah Catatan
-        intro: Dalam rangka meningkatkan informasi peta yang Anda masukkan untuk pemeta lainnya, jadi harap mendeskripsikan sedetail dan setepat mungkin ketika memindahkan penanda ke posisi yang benar dan masukan catatan Anda di bawah ini.
+        intro: Untuk meningkatkan informasi peta yang Anda masukkan untuk pemeta lainnya, jadi harap mendeskripsikan serinci dan setepat mungkin ketika memindahkan penanda ke posisi yang benar dan masukan catatan Anda di bawah ini.
       show: 
         anonymous_warning: Catatan ini termasuk komentar dari pengguna anonim yang harus diverifikasi secara independen.
         comment: Komentar
@@ -820,33 +888,52 @@ id:
         resolve: Selesaikan
     share: 
       cancel: Batal
-      link: Tautan
-      long_link: Tautan Panjang
+      center_marker: Tengahkan peta pada penanda
+      custom_dimensions: Pengaturan dimensi
+      download: Unduh
+      embed: HTML
+      format: "Format:"
+      image: Gambar
+      image_size: Gambar akan menampilkan lapisan standar di
+      include_marker: Termasuk penanda
+      link: Pranala atau HTML
+      long_link: Pranala
+      paste_html: Tempel HTML untuk menyimpan di situs web
+      scale: "Skala:"
       short_link: Tautan Pendek
+      short_url: URL Singkat
       title: Bagikan
+      view_larger_map: Lihat peta lebih besar
     site: 
       createnote_disabled_tooltip: Perbesar untuk menambahkan catatan pada peta
       createnote_tooltip: Tambahkan catatan pada peta
       edit_disabled_tooltip: Perbesar untuk mengedit peta
       edit_tooltip: Edit peta
+      map_data_zoom_in_tooltip: Perbesar untuk melihat data peta
+      map_notes_zoom_in_tooltip: Perbesar untuk melihat catatan peta
   layouts: 
+    about: Tentang
     community: Komunitas
     community_blogs: Blog Komunitas
     community_blogs_title: Blog dari anggota komunitas OpenStreetMap
     copyright: Hak cipta
+    data: Data
     donate: Dukung OpenStreetMap %{link} untuk biaya upgrade Hardware.
     edit: Edit
     edit_with: Edit menggunakan %{editor}
     export: Ekspor
+    export_data: Ekspor Data
     foundation: Foundation (Yayasan)
     foundation_title: Yayasan OpenStreetMap
     gps_traces: Trek GPS
     gps_traces_tooltip: Mengatur trek GPS
     help: Bantuan
     history: Riwayat
-    home: Halaman Utama
+    home: Menuju ke Halaman Utama
     intro_2_create_account: Buat Akun
+    intro_header: Selamat datang di OpenStreetMap!
     intro_text: OpenStreetMap adalah peta dunia, diciptakan oleh orang-orang seperti Anda dan bebas untuk digunakan di bawah lisensi terbuka.
+    learn_more: Pelajari Lagi
     log_in: Masuk Log
     log_in_tooltip: Masuk dengan akun yang sudah ada
     logo: 
@@ -855,6 +942,7 @@ id:
     make_a_donation: 
       text: Menyumbang
       title: Dukung OpenStreetMap dengan donasi finansial
+    more: Selanjutnya
     osm_offline: Database OpenStreetMap saat ini sedang dimatikan karena sedang dilakukan pekerjaan pemeliharaan database penting.
     osm_read_only: OpenStreetMap database saat ini adalah pada mode read-only (hanya dapat dilihat) sementara pekerjaan pemeliharaan database penting sedang dilakukan.
     partners_bytemark: Hosting Bytemark
@@ -864,6 +952,7 @@ id:
     partners_ucl: Pusat UCL VR
     sign_up: Mendaftar
     sign_up_tooltip: Buat akun untuk mengedit
+    start_mapping: Mulai Pemetaan
     tag_line: Peta Dunia Wiki Gratis
     user_diaries: Catatan Harian Pengguna
     user_diaries_tooltip: Lihat catatan harian pengguna
@@ -878,6 +967,7 @@ id:
         title: Contoh atribusi
       contributors_at_html: "<strong>Austria</strong>: Berisi data dari\n<a href=\"http://data.wien.gv.at/\">Stadt Wien</a> (lisensi\n<a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>),\n<a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg</a> dan\nLand Tirol (lisensi <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT dengan perubahan</a>)."
       contributors_ca_html: "<strong>Kanada</strong>: Berisi data dari\nGeoBase&reg;, GeoGratis (&copy; Department of Natural\nResources Canada), CanVec (&copy; Department of Natural\nResources Canada), dan StatCan (Geography Division,\nStatistics Canada)."
+      contributors_fi_html: "<strong>Finlandia</strong>: Berisi data dari basis data topografi\nSurvei Pertanahan Nasional Finlandia \n dan dataset lainnya, di bawah\n<a href=\"http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501\">Lisensi NLSFI</a>."
       contributors_footer_1_html: "Untuk rincian lebih lanjut, dan sumber-sumber lainnya yang telah digunakan untuk meningkatkan OpenStreetMap, silahkan lihat <a\nhref=\"http://wiki.openstreetmap.org/wiki/Contributors\">Kontributor halaman</a> pada Wiki OpenStreetMap."
       contributors_footer_2_html: Dimasukkannya data dalam OpenStreetMap tidak berarti bahwa penyedia data yang asli mendukung OpenStreetMap, menyediakan jaminan, atau menerima tanggung jawab apapun.
       contributors_fr_html: "<strong>Perancis</strong>: Berisi data yang bersumber dari\nDirection GÃ©nÃ©rale des ImpÃ´ts."
@@ -960,6 +1050,7 @@ id:
       title: Kotak keluar
       to: Kepada
     read: 
+      back: Kembali
       date: Tanggal
       from: Dari
       reply_button: Balas
@@ -1049,6 +1140,7 @@ id:
       greeting: Halo,
       hopefully_you: Seseorang (kemungkinan Anda) telah meminta untuk mengatur ulang password pada alamat email dari akun openstreetmap.org ini.
     message_notification: 
+      footer_html: Anda juga dapat membaca pesan di  %{readurl} dan membalasnya di %{replyurl}
       header: "%{from_user} telah mengirim sebuah pesan kepada Anda melalui OpenStreetMap dengan subjek %{subject}:"
       hi: Halo %{to_user},
     note_comment_notification: 
@@ -1087,8 +1179,14 @@ id:
       allow_write_notes: memodifikasi catatan.
       allow_write_prefs: modifikasi pengaturan pengguna anda.
       request_access: Aplikasi %{app_name} akan meminta akses ke akun, %{user}. Periksa apakah Anda ingin aplikasi untuk memiliki kemampuan berikut. Anda dapat memilih sebanyak atau sesedikit yang Anda inginkan.
+      title: Otorisasi akses ke akun Anda
+    oauthorize_failure: 
+      denied: Anda telah menolak aplikasi %{app_name} mengakses akun Anda.
+      invalid: Otorisasi token ini tidak berlaku.
+      title: Permintaan otorisasi gagal
     oauthorize_success: 
       allowed: Anda telah memberikan aplikasi %{app_name} akses ke akun Anda.
+      title: Permintaan otorisasi diperbolehkan
       verification: Kode verifikasi adalah %{code}.
     revoke: 
       flash: Anda telah menolak token untuk %(application}
@@ -1321,6 +1419,8 @@ id:
       uploaded_at: "Diupload:"
       visibility: Visibilitas
       visibility_help: apa artinya ini?
+    georss: 
+      title: Jejak SPG (sistem pemosisi global) OpenStreetMap
     list: 
       description: Telusuri hasil upload trek GPS terbaru
       empty_html: Belum ada apapun di sini. <a href='%{upload_link}'>Meng-upload trek GPS baru</a> atau belajar lebih banyak tentang trek GPS pada <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>halaman wiki</a>.
@@ -1450,10 +1550,12 @@ id:
     confirm: 
       already active: Akun ini telah dikonfirmasi.
       button: Konfirmasi
-      heading: Konfirmasi akun pengguna
+      heading: Periksa surel Anda!
+      introduction_1: Kami telah mengirim konfirmasi ke surel Anda.
+      introduction_2: Konfirmasi akun Anda dengan mengklik pranala dalam surel dan Anda akan dapat memulai pemetaan.
       press confirm button: Tekan tombol konfirmasi di bawah ini untuk mengaktifkan akun Anda.
       reconfirm_html: Jika Anda membutuhkan kami mengirimkan ulang surel konfirmasi, <a href="%{reconfirm}">klik di sini</a>.
-      unknown token: Token tersebut tampaknya tidak ada.
+      unknown token: Kode konfirmasi telah kedaluwarsa atau tidak ada.
     confirm_email: 
       button: Konfirmasi
       failure: Sebuah alamat email telah dikonfirmasikan dengan token ini.
@@ -1538,10 +1640,13 @@ id:
       heading: Tambahkan %{user} sebagai teman?
       success: "%{name} sekarang adalah teman Anda!"
     new: 
+      about: 
+        header: Gratis dan dapat disunting
+        html: "<p>Tidak seperti peta lainnya, OpenStreetMap benar-benar dibuat oleh orang-orang seperti Anda\n dan gratis bagi siapa saja untuk memperbaiki, memutakhirkan, mengunduh, dan menggunakan.</p>\n<p>Mendaftar untuk mulai memberikan kontribusi. Kami akan mengirimkan surel konfirmasi akun Anda.</p>"
       confirm email address: "Konfirmasi Alamat Email:"
       confirm password: "Konfirmasi Kata Sandi:"
       contact_webmaster: Silahkan kontak <a href="mailto:webmaster@openstreetmap.org">webmaster</a> untuk mengatur sebuah akun untuk dibuat - kami akan mencoba menangani permintaan ini secepat mungkin.
-      continue: Lanjut
+      continue: Mendaftar
       display name: "Tampilan Nama:"
       display name description: Username Anda yang ditampilkan pada publik. Anda dapat mengubahnya dalam pengaturan.
       email address: "Alamat Email:"
@@ -1554,7 +1659,7 @@ id:
       password: "Kata Sandi:"
       terms accepted: Terima kasih telah menerima persyaratan kontributor yang baru!
       terms declined: Kami mohon maaf Anda tidak menerima Persyaratan Kontributor baru. Untuk informasi lebih lanjut, silahkan lihat <a href="%{url}">this wiki page</a>.
-      title: Buat akun
+      title: Mendaftar
       use openid: Atau gunakan %{logo} OpenID untuk login
     no_such_user: 
       body: Maaf, tidak ada pengguna dengan nama %{user}. Silahkan cek kembali ejaan, atau mungkin link yang Anda klik salah.
@@ -1601,12 +1706,12 @@ id:
       you need to accept or decline: Silahkan baca dan setujui atau tolak Persyaratan Kontributor yang baru untuk melanjutkan.
     view: 
       activate_user: aktifkan pengguna ini
-      add as friend: tambahkan sebagai teman
+      add as friend: Jadikan Teman
       ago: (%{time_in_words_ago} yang lalu)
       block_history: blok diterima
-      blocks by me: blokir oleh saya
-      blocks on me: blokir pada saya
-      comments: komentar
+      blocks by me: Blok oleh saya
+      blocks on me: Blok kepada saya
+      comments: Komentar
       confirm: Konfirmasi
       confirm_user: konfirmasi pengguna ini
       create_block: Blokir pengguna ini
@@ -1619,7 +1724,7 @@ id:
       delete_user: hapus pengguna ini
       description: Deskripsi
       diary: Catatan Harian
-      edits: hasil edit
+      edits: Suntingan
       email address: "Alamat email:"
       friends_changesets: Telusuri semua set perubahan yang dibuat oleh teman-teman
       friends_diaries: Telusuri seluruh entri catatan harian oleh teman-teman
@@ -1630,11 +1735,13 @@ id:
       m away: sejauh %{count} meter
       mapper since: "Melakukan pemetaan sejak:"
       moderator_history: blok yang diberikan
-      my comments: komentar saya
-      my diary: catatan harian saya
+      my comments: Komentarku
+      my diary: Diariku
       my edits: Suntingan Saya
-      my notes: Catatan peta saya
-      my settings: pengaturan saya
+      my messages: Pesanku
+      my notes: Catatanku
+      my profile: Profilku
+      my settings: Pengaturanku
       my traces: Pelacakan Saya
       nearby users: Pengguna lain terdekat
       nearby_changesets: Telusuri seluruh set perubahan oleh pengguna terdekat
@@ -1642,9 +1749,9 @@ id:
       new diary entry: Entri baru catatan harian
       no friends: Anda belum menambahkan teman.
       no nearby users: Tidak ada pengguna lain yang mengaku untuk melakukan pemetaan terdekat.
-      notes: catatan peta
+      notes: Catatan Peta
       oauth settings: Pengaturan oauth
-      remove as friend: hapus sebagai teman
+      remove as friend: Hapus pertemanan
       role: 
         administrator: Pengguna ini merupakan administrator
         grant: 
@@ -1654,11 +1761,11 @@ id:
         revoke: 
           administrator: Mencabut akses administrator
           moderator: Mencabut akses moderator
-      send message: kirim pesan
+      send message: Kirim Pesan
       settings_link_text: pengaturan
       spam score: "Jumlah Spam:"
       status: "Status:"
-      traces: trek
+      traces: Jejak
       unhide_user: munculkan kembali pengguna ini
       user location: Lokasi pengguna
       your friends: Teman Anda
@@ -1772,13 +1879,22 @@ id:
       heading: Konfirmasi pencabutan peran
       title: Konfirmasi pencabutan peran
   welcome_page: 
+    add_a_note: 
+      paragraph_1_html: Jika Anda ingin memberi perbaikan kecil dan tidak mau mendaftar ataupun mempelajari cara penyuntingan, Anda cukup memberi catatan.
+      paragraph_2_html: "Langsung ke <a href='%{map_url}'>peta</a> dan klik ikon catatan:\n<span class='icon note'></span>. Ini akan menambahkan sebuah penanda ke peta yang dapat bergerak\n dengan menyeretnya. Tambahkan pesan, lalu klik simpan, dan pemeta lainnya akan menyelidiki."
+      title: Keberatan menyunting? Tambahkan catatan!
     basic_terms: 
+      editor_html: <strong>Editor</strong> adalah sebuah program atau situs web yang dapat Anda gunakan untuk menyunting peta.
       node_html: Sebuah <strong>node</strong> adalah sebuah titik pada peta, seperti sebuah restoran tunggal atau sebuah pohon.
+      paragraph_1_html: OpenStreetMap memiliki beberapa istilah tersendiri. Berikut ini beberapa kata kunci yang dapat digunakan.
       title: Istilah-Istilah Dasar untuk Pemetaan
+      way_html: Sebuah <strong>jalur</strong> berupa garis merupakan wilayah seperti jalan, sungai, danau, atau bangunan.
     introduction_html: Selamat datang di OpenStreetMap, peta dunia gratis dan dapat disunting. Kini setelah Anda mendaftar, Anda sudah siap untuk memulai pemetaan. Berikut ini adalah panduan cepat dengan hal-hal terpenting yang perlu Anda ketahui.
     questions: 
       title: Ada pertanyaan?
+    start_mapping: Mulai pemetaan
     title: Selamat datang!
     whats_on_the_map: 
       off_html: Apa yang <em>tidak</em> termasuk adalah data pendapat seperti peringkat, fitur sejarah atau hipotesis, dan data dari sumber berhak cipta. Kecuali Anda mempunyai izin khusus, jangan menyalin dari peta online atau kertas.
       on_html: OpenStreetMap adalah tempat untuk memetakan hal-hal, baik <em>nyata dan saat ini</em> - ini mencakup jutaan bangunan, jalan, dan rincian lainnya tentang tempat-tempat. Anda dapat memetakan fitur dunia-nyata apapun yang menarik untuk Anda.
+      title: Apa yang ada di Peta
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 8c08bff8c..edeeb836e 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -23,6 +23,7 @@
 # Author: Ontsed
 # Author: Paolopoz
 # Author: Raoli
+# Author: Ricordisamoa
 # Author: Rippitippi
 # Author: Shirayuki
 # Author: Simone
@@ -1060,7 +1061,7 @@ it:
       contributors_fr_html: "<strong>Francia</strong>: contiene dati provenienti dalla\nDirection GÃ©nÃ©rale des ImpÃ´ts."
       contributors_gb_html: "<strong>Regno Unito</strong>: contiene i dati della\nOrdnance Survey &copy; Crown copyright and database right\n2010-12."
       contributors_intro_html: "I nostri contributori sono migliaia di individui. Includiamo anche dati distribuiti sotto licenze aperte provenienti da agenzie cartografiche nazionali o di altra fonte, tra cui:"
-      contributors_nl_html: "strong>Olanda</strong>: contiene dati &copy; AND, 2007\n(<a href=\"http://www.and.com\">www.and.com</a>)"
+      contributors_nl_html: "<strong>Olanda</strong>: contiene dati &copy; AND, 2007\n(<a href=\"http://www.and.com\">www.and.com</a>)"
       contributors_nz_html: "<strong>Nuova Zelanda</strong>: contiene i dati provenienti dalla\nLand Information New Zealand. Crown Copyright reserved."
       contributors_title_html: Nostri collaboratori
       contributors_za_html: "<strong>Sud Africa</strong>: contiene i dati provenienti dalla\n<a href=\"http://www.ngi.gov.za/\">Chief Directorate:\nNational Geo-Spatial Information</a>, State copyright reserved."
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 79db22cd1..d599e24ed 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -268,7 +268,7 @@ ja:
       body: "æ¬æ:"
       language: "è¨èª:"
       latitude: "ç·¯åº¦:"
-      location: "å°å:"
+      location: "ä½ç½®:"
       longitude: "çµåº¦:"
       marker_text: æ¥è¨ã®ã­ã±ã¼ã·ã§ã³
       save_button: ä¿å­
@@ -299,7 +299,7 @@ ja:
       user_title: "%{user} ã®æ¥è¨"
     location: 
       edit: ç·¨é
-      location: "å ´æ:"
+      location: "ä½ç½®:"
       view: è¡¨ç¤º
     new: 
       title: æ¥è¨ã¨ã³ããªã®æ°è¦ä½æ
@@ -1595,7 +1595,7 @@ ja:
         gravatar: Gravatar ãä½¿ç¨
         link: http://wiki.openstreetmap.org/wiki/Gravatar
         link text: ããã¯ä½ã§ãã?
-      home location: "æ´»åå°å:"
+      home location: "ãã¼ã å°ç¹:"
       image: "ç»å:"
       image size hint: (100x100 ä»¥ä¸ã®æ­£æ¹å½¢ã®ç»åãæé©)
       keep image: ç¾å¨ã®ç»åãä¿æ
@@ -1750,7 +1750,7 @@ ja:
     popup: 
       friend: åé
       nearby mapper: å¨è¾ºã®ãããã¼
-      your location: èªåã®å ´æ
+      your location: èªåã®ä½ç½®
     remove_friend: 
       button: åéãè§£é¤
       heading: "%{user} ã¨ã®åéãè§£é¤ãã¾ãã?"
@@ -1765,7 +1765,7 @@ ja:
       reset: ãã¹ã¯ã¼ããåæå
       title: ãã¹ã¯ã¼ãã®åè¨­å®
     set_home: 
-      flash success: æ´»åå°åãä¿å­ãã¾ããã
+      flash success: ãã¼ã å°ç¹ãä¿å­ãã¾ããã
     suspended: 
       body: "<p>\n  ç³ãè¨³ããã¾ããããä¸å¯©ãªæ´»åã®ãããããªãã®ã¢ã«ã¦ã³ãã¯èªåçã«ä¸æåæ­¢ããã¦ããã¾ãã\n</p>\n<p>\n ãã®å¦ç½®ã«ã¤ãã¦ã¯è¿ãç®¡çèãç¢ºèªããããã¾ããããç¸è«ãããå ´åã¯%{webmaster} ã«ãé£çµ¡ããã ãã¦ããã¾ãã¾ããã\n</p>"
       heading: ã¢ã«ã¦ã³ãåæ­¢
@@ -1850,7 +1850,7 @@ ja:
       status: "ç¶æ:"
       traces: ãã¬ã¼ã¹
       unhide_user: ãã®ã¦ã¼ã¶ã¼ãåè¡¨ç¤º
-      user location: ã¦ã¼ã¶ã¼ã®å ´æ
+      user location: ã¦ã¼ã¶ã¼ã®ä½ç½®
       your friends: ããªãã®åé
   user_block: 
     blocks_by: 
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index d068d497d..b2cd5eca8 100644
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -62,6 +62,7 @@ lb:
       relation: Relatiounen (%{count})
       relation_paginated: Relatiounen (%{x}-%{y} vu(n) %{count})
       way: WeeÃ«r (%{count})
+      way_paginated: WeeÃ«r (%{x}â%{y} vu(n) %{count})
     closed: Zou
     containing_relation: 
       entry: Relatioun %{relation_name}
@@ -79,6 +80,8 @@ lb:
         way: Wee
     note: 
       description: Beschreiwung
+      hidden_by: Verstoppt vum %{user} <abbr title='%{exact_time}'>viru(n) %{when}</abbr>
+      hidden_title: Verstoppt Notiz NÂ° %{note_name}
       new_note: Nei Notiz
       title: "Notiz: %{id}"
     part_of: Deel vu(n)
@@ -99,6 +102,7 @@ lb:
       load_data: DonnÃ©eÃ« lueden
       loading: Lueden...
     tag_details: 
+      tags: MarkÃ©ierungen
       wiki_link: 
         key: D'Wiki-BeschreiwungssÃ¤it fir den %{key}-Tag
         tag: D'Wiki-BeschreiwungssÃ¤it fir den %{key}=%{value}-Tag
@@ -169,6 +173,7 @@ lb:
       licence: Lizenz
       max: max
       options: Optiounen
+      osm_xml_data: OpenStreetMap-XML-Daten
       scale: Maassstab
       too_large: 
         other: 
@@ -216,6 +221,7 @@ lb:
       prefix: 
         aeroway: 
           aerodrome: Fluchhafen
+          gate: Paart
         amenity: 
           airport: Fluchhafen
           artwork: Konschtwierk
@@ -224,12 +230,15 @@ lb:
           bank: Bank
           bar: Bar
           bench: BÃ¤nk
+          biergarten: BÃ©iergaard
+          brothel: Bordell
           bureau_de_change: WiesselbÃ¼ro
           bus_station: BusarrÃªt
           cafe: CafÃ©
           casino: Casino
           cinema: Kino
           clinic: Klinik
+          club: Club
           crematorium: Crematoire
           dentist: ZÃ¤nndokter
           doctors: Dokteren
@@ -263,6 +272,7 @@ lb:
           social_facility: Sozial Ariichtung
           studio: Studio
           supermarket: SupermarchÃ©
+          swimming_pool: SchwÃ¤mm
           taxi: Taxi
           telephone: Telefonscabine
           theatre: Theater
@@ -328,7 +338,7 @@ lb:
           playground: Spillplaz
           sauna: Sauna
           stadium: Stadion
-          swimming_pool: SchwÃ«mm
+          swimming_pool: SchwÃ¤mm
         natural: 
           beach: Plage
           channel: Kanal
@@ -476,6 +486,7 @@ lb:
     export_data: DonnÃ©eÃ«n exportÃ©ieren
     foundation: Fondatioun
     help: HÃ«llef
+    history: Versiounen
     home: Op dÃ©i Plaz zrÃ©ckgoen dÃ©i als Doheem definÃ©iert ass
     learn_more: MÃ©i wÃ«ssen
     log_in: Aloggen
@@ -648,6 +659,7 @@ lb:
       points: "Punkten:"
       save_button: Ãnnerunge spÃ¤icheren
       start_coord: "Ufankskoordinaten:"
+      tags: "MarkÃ©ierungen:"
       tags_help: Mat Komma getrennt
       uploaded_at: "Eropgelueden:"
       visibility: "VisibilitÃ©it:"
@@ -667,6 +679,7 @@ lb:
     trace_form: 
       description: "Beschreiwung:"
       help: HÃ«llef
+      tags: "MarkÃ©ierungen:"
       tags_help: Mat Komma getrennt
       upload_button: Eroplueden
       upload_gpx: "GPX-Fichier eroplueden:"
@@ -685,6 +698,7 @@ lb:
       pending: AM SUSPENS
       points: "Punkten:"
       start_coordinates: "Ufankskoordinaten:"
+      tags: "MarkÃ©ierungen:"
       uploaded: "Eropgelueden:"
       visibility: "VisibilitÃ©it:"
   user: 
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index d1dfdc373..d242d3733 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -127,7 +127,7 @@ mk:
       history_title: "ÐÑÑÐ¾ÑÐ¸ÑÐ° Ð½Ð° ÑÐ°Ð·Ð¾Ð»Ð¾Ñ: %{name}"
       title: "ÐÐ°Ð·Ð¾Ð»: %{name}"
     not_found: 
-      sorry: ÐÐ°Ð¶Ð°Ð»Ð¾ÑÑ, Ð½Ðµ Ð´Ð° Ð½Ð°ÑÐ´Ð°Ð¼ %{type} ÑÐ¾ Ð±Ñ. %{id}.
+      sorry: ÐÐ° Ð¶Ð°Ð», Ð½Ðµ Ð´Ð° Ð½Ð°ÑÐ´Ð°Ð¼ %{type} ÑÐ¾ Ð±Ñ. %{id}.
       type: 
         changeset: Ð¸Ð·Ð¼ÐµÐ½Ð¸
         node: ÑÐ°Ð·Ð¾Ð»
@@ -1097,7 +1097,7 @@ mk:
       subject: ÐÐ°ÑÐ»Ð¾Ð²
       title: ÐÑÐ¿ÑÐ°ÑÐ¸ ÑÐ° Ð¿Ð¾ÑÐ°ÐºÐ°ÑÐ°
     no_such_message: 
-      body: ÐÐ°Ð¶Ð°Ð»Ð¾ÑÑ Ð½ÐµÐ¼Ð° Ð¿Ð¾ÑÐ°ÐºÐ° ÑÐ¾ ÑÐ¾Ñ id.
+      body: ÐÐ° Ð¶Ð°Ð», Ð½ÐµÐ¼Ð° Ð¿Ð¾ÑÐ°ÐºÐ° ÑÐ¾ ÑÐ¾Ñ id.
       heading: ÐÐµÐ¼Ð° ÑÐ°ÐºÐ²Ð° Ð¿Ð¾ÑÐ°ÐºÐ°
       title: ÐÐµÐ¼Ð° ÑÐ°ÐºÐ²Ð° Ð¿Ð¾ÑÐ°ÐºÐ°
     outbox: 
@@ -1293,7 +1293,7 @@ mk:
       submit: Ð ÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ°ÑÐµ
       title: Ð ÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ°ÑÑÐµ Ð½Ð¾Ð²Ð° Ð°Ð¿Ð»Ð¸ÐºÐ°ÑÐ¸ÑÐ°
     not_found: 
-      sorry: ÐÐ°Ð¶Ð°Ð»Ð¾ÑÑ, ÑÐ¾Ñ %{type} Ð½Ðµ Ðµ Ð¿ÑÐ¾Ð½Ð°ÑÐ´ÐµÐ½.
+      sorry: ÐÐ° Ð¶Ð°Ð», ÑÐ¾Ñ %{type} Ð½Ðµ Ðµ Ð¿ÑÐ¾Ð½Ð°ÑÐ´ÐµÐ½.
     show: 
       access_url: "URL-Ð°Ð´ÑÐµÑÐ° Ð½Ð° Ð¿ÑÐ¸ÑÑÐ°Ð¿Ð°ÑÐ° ÑÐ¸ÑÑÐ°:"
       allow_read_gpx: Ð¸Ð¼ Ð³Ð¸ ÑÐ¸ÑÐ° Ð»Ð¸ÑÐ½Ð¸ÑÐµ GPS-ÑÑÐ°Ð³Ð¸.
@@ -1671,8 +1671,8 @@ mk:
       new to osm: ÐÐ° Ð½Ð¾Ð²Ð¾Ð´Ð¾ÑÐ´ÐµÐ½ÑÐ¸ Ð½Ð° OpenStreetMap
       no account: ÐÐµÐ¼Ð°ÑÐµ ÑÐ¼ÐµÑÐºÐ°?
       openid: "%{logo} OpenID:"
-      openid invalid: ÐÐ°Ð¶Ð°Ð»Ð¾ÑÑ, Ð²Ð°ÑÐ¸Ð¾Ñ OpenID Ðµ Ð¿Ð¾Ð³ÑÐµÑÐ½Ð¾ Ð¾Ð±Ð»Ð¸ÐºÑÐ²Ð°Ð½
-      openid missing provider: ÐÐ°Ð¶Ð°Ð»Ð¾ÑÑ, Ð½Ðµ Ð¼Ð¾Ð¶ÐµÐ² Ð´Ð° ÑÐµ Ð¿Ð¾Ð²ÑÐ·Ð°Ð¼ ÑÐ¾ Ð²Ð°ÑÐ¸Ð¾Ñ Ð´Ð¾Ð±Ð°Ð²ÑÐ²Ð°Ñ Ð½Ð° OpenID
+      openid invalid: ÐÐ° Ð¶Ð°Ð», Ð²Ð°ÑÐ¸Ð¾Ñ OpenID Ðµ Ð¿Ð¾Ð³ÑÐµÑÐ½Ð¾ Ð¾Ð±Ð»Ð¸ÐºÑÐ²Ð°Ð½
+      openid missing provider: ÐÐ° Ð¶Ð°Ð», Ð½Ðµ Ð¼Ð¾Ð¶ÐµÐ² Ð´Ð° ÑÐµ Ð¿Ð¾Ð²ÑÐ·Ð°Ð¼ ÑÐ¾ Ð²Ð°ÑÐ¸Ð¾Ñ Ð´Ð¾Ð±Ð°Ð²ÑÐ²Ð°Ñ Ð½Ð° OpenID
       openid_logo_alt: ÐÐ°ÑÐ°Ð²Ð° ÑÐ¾ OpenID
       openid_providers: 
         aol: 
@@ -1730,7 +1730,7 @@ mk:
       display name description: ÐÐ°ÑÐµÑÐ¾ ÑÐ°Ð²Ð½Ð¾ Ð¿ÑÐ¸ÐºÐ°Ð¶Ð°Ð½Ð¾ Ð¸Ð¼Ðµ. ÐÐ¾Ð¶ÐµÑÐµ Ð´Ð° Ð³Ð¾ ÑÐ¼ÐµÐ½Ð¸ÑÐµ Ð¿Ð¾Ð´Ð¾ÑÐ½Ð° Ð²Ð¾ Ð¿ÑÐ¸Ð»Ð°Ð³Ð¾Ð´ÑÐ²Ð°ÑÐ°ÑÐ°.
       email address: "Ð-Ð¿Ð¾ÑÑÐ°:"
       license_agreement: ÐÐ¾Ð³Ð° ÑÐµ ÑÐ° Ð¿Ð¾ÑÐ²ÑÐ´Ð¸ÑÐµ Ð²Ð°ÑÐ°ÑÐ° ÑÐ¼ÐµÑÐºÐ°, ÑÐµ ÑÑÐµÐ±Ð° Ð´Ð° ÑÐµ ÑÐ¾Ð³Ð»Ð°ÑÐ¸ÑÐµ ÑÐ¾ <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">ÑÑÐ»Ð¾Ð²Ð¸ÑÐµ Ð·Ð° ÑÑÐµÑÐ½Ð¸ÑÐ¸</a>.
-      no_auto_account_create: ÐÐ°Ð¶Ð°Ð»Ð¾ÑÑ Ð¼Ð¾Ð¼ÐµÐ½ÑÐ°Ð»Ð½Ð¾ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÐ¼Ðµ Ð°Ð²ÑÐ¾Ð¼Ð°ÑÑÐºÐ¸ Ð´Ð° Ð²Ð¸ ÑÐ¾Ð·Ð´Ð°Ð´ÐµÐ¼Ðµ ÑÐ¼ÐµÑÐºÐ°.
+      no_auto_account_create: ÐÐ° Ð¶Ð°Ð», Ð¼Ð¾Ð¼ÐµÐ½ÑÐ°Ð»Ð½Ð¾ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÐ¼Ðµ Ð°Ð²ÑÐ¾Ð¼Ð°ÑÑÐºÐ¸ Ð´Ð° Ð²Ð¸ ÑÐ¾Ð·Ð´Ð°Ð´ÐµÐ¼Ðµ ÑÐ¼ÐµÑÐºÐ°.
       not displayed publicly: ÐÐµ ÑÐµ Ð¿ÑÐ¸ÐºÐ°Ð¶ÑÐ²Ð° ÑÐ°Ð²Ð½Ð¾ (Ð²Ð¸Ð´ÐµÑÐµ <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">Ð¿ÑÐ°Ð²Ð¸Ð»Ð½Ð¸ÐºÐ¾Ñ Ð·Ð° Ð¿ÑÐ¸Ð²Ð°ÑÐ½Ð¾ÑÑ</a>)
       openid: "%{logo} OpenID:"
       openid association: "<p>ÐÐ°ÑÐ¸Ð¾Ñ OpenID ÑÃ¨ ÑÑÑÐµ Ð½Ðµ Ðµ Ð·Ð´ÑÑÐ¶ÐµÐ½ ÑÐ¾ ÑÐ¼ÐµÑÐºÐ° Ð½Ð° OpenStreetMap.</p>\n<ul>\n  <li>ÐÐºÐ¾ ÑÑÐµ Ð½Ð¾Ð²Ð¸ Ð½Ð° OpenStreetMap, ÑÐ¾Ð³Ð°Ñ Ð½Ð°Ð¿ÑÐ°Ð²ÐµÑÐµ ÑÐ¼ÐµÑÐºÐ° ÑÐ¾ Ð´Ð¾Ð»ÑÐ½Ð°Ð²ÐµÐ´ÐµÐ½Ð¸Ð¾Ñ Ð¾Ð±ÑÐ°Ð·ÐµÑ.</li>\n  <li>\n    ÐÐºÐ¾ Ð²ÐµÑÐµ Ð¸Ð¼Ð°ÑÐµ ÑÐ¼ÐµÑÐºÐ°, Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° ÑÐµ Ð½Ð°ÑÐ°Ð²Ð¸ÑÐµ ÑÐ¾\n    ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÑÐºÐ¾ÑÐ¾ Ð¸Ð¼Ðµ Ð¸ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ°ÑÐ°, Ð° Ð¿Ð¾ÑÐ¾Ð° Ð²Ð¾ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÑÐºÐ¸ÑÐµ\n    Ð½Ð°Ð³Ð´ÑÐ²Ð°ÑÐ° Ð´Ð° ÑÐ° Ð·Ð´ÑÑÐ¶Ð¸ÑÐµ ÑÐ¾ Ð²Ð°ÑÐ¸Ð¾Ñ OpenID.\n  </li>\n</ul>"
@@ -1765,7 +1765,7 @@ mk:
     set_home: 
       flash success: ÐÐ°ÑÐ¸ÑÐ½Ð°ÑÐ° Ð¼ÐµÑÑÐ¾Ð¿Ð¾Ð»Ð¾Ð¶Ð±Ð° Ðµ ÑÑÐ¿ÐµÑÐ½Ð¾ Ð·Ð°ÑÑÐ²Ð°Ð½Ð°
     suspended: 
-      body: "<p>\n  ÐÐ°Ð¶Ð°Ð»Ð¾ÑÑ, Ð²Ð°ÑÐ°ÑÐ° ÑÐ¼ÐµÑÐºÐ° Ð±ÐµÑÐµ Ð°Ð²ÑÐ¾Ð¼Ð°ÑÑÐºÐ¸ Ð·Ð°ÐºÐ¾ÑÐµÐ½Ð° Ð¿Ð¾ÑÐ°Ð´Ð¸\n  ÑÐ¾Ð¼Ð½Ð¸ÑÐµÐ»Ð½Ð¸ Ð°ÐºÑÐ¸Ð²Ð½Ð¾ÑÑÐ¸.\n</p>\n<p>\n  ÐÐ¾Ð½ÐµÑÐµÐ½Ð°ÑÐ° Ð¾Ð´Ð»ÑÐºÐ°ÑÐ° Ð½Ð°Ð±ÑÐ³Ñ ÑÐµ ÑÐ° Ð¿ÑÐµÐ³Ð»ÐµÐ´Ð° Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾Ñ, Ð½Ð¾\n  Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° ÑÐµ Ð¾Ð±ÑÐ°ÑÐ¸ÑÐµ ÐºÐ°Ñ %{webmaster} Ð°ÐºÐ¾ ÑÐ°ÐºÐ°ÑÐµ Ð´Ð° Ð¿ÑÐ¾Ð´Ð¸ÑÐºÑÑÐ¸ÑÐ°ÑÐµ Ð·Ð° Ð¾Ð²Ð¾Ñ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼.\n</p>"
+      body: "<p>\n  ÐÐ° Ð¶Ð°Ð», Ð²Ð°ÑÐ°ÑÐ° ÑÐ¼ÐµÑÐºÐ° Ð±ÐµÑÐµ Ð°Ð²ÑÐ¾Ð¼Ð°ÑÑÐºÐ¸ Ð·Ð°ÐºÐ¾ÑÐµÐ½Ð° Ð¿Ð¾ÑÐ°Ð´Ð¸\n  ÑÐ¾Ð¼Ð½Ð¸ÑÐµÐ»Ð½Ð¸ Ð°ÐºÑÐ¸Ð²Ð½Ð¾ÑÑÐ¸.\n</p>\n<p>\n  ÐÐ¾Ð½ÐµÑÐµÐ½Ð°ÑÐ° Ð¾Ð´Ð»ÑÐºÐ°ÑÐ° Ð½Ð°Ð±ÑÐ³Ñ ÑÐµ ÑÐ° Ð¿ÑÐµÐ³Ð»ÐµÐ´Ð° Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾Ñ, Ð½Ð¾\n  Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° ÑÐµ Ð¾Ð±ÑÐ°ÑÐ¸ÑÐµ ÐºÐ°Ñ %{webmaster} Ð°ÐºÐ¾ ÑÐ°ÐºÐ°ÑÐµ Ð´Ð° Ð¿ÑÐ¾Ð´Ð¸ÑÐºÑÑÐ¸ÑÐ°ÑÐµ Ð·Ð° Ð¾Ð²Ð¾Ñ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼.\n</p>"
       heading: Ð¡Ð¼ÐµÑÐºÐ°ÑÐ° Ðµ Ð·Ð°ÐºÐ¾ÑÐµÐ½Ð°
       title: Ð¡Ð¼ÐµÑÐºÐ°ÑÐ° Ðµ Ð·Ð°ÐºÐ¾ÑÐµÐ½Ð°
       webmaster: Ð¼ÑÐµÐ¶. ÑÐ¿ÑÐ°Ð²Ð½Ð¸Ðº
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 51391e017..1e73a4ae2 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -3,6 +3,7 @@
 # Export driver: syck-pecl
 # Author: Anakmalaysia
 # Author: Nemo bis
+# Author: Pizza1016
 ms: 
   about_page: 
     community_driven_html: "Komuniti OpenStreetMap pelbagai latar belakang, ghairah, dan makin hari makin berkembang. Antara para penyumbang kami termasuklah pemeta yang sekadar penggemar, profesional GIS, jurutera yang mengelola pelayan OSM, pegawai kemanusiaan yang memetakan kawasan terjejas bencana,\ndan ramai lagi.\nUntuk mengetahui lebih lanjut tentang komuniti ini, rujuk <a href='%{diary_path}'>diari pengguna</a>,\n<a href='http://blogs.openstreetmap.org/'>blog komuniti</a>, dan laman web\nthe <a href='http://www.osmfoundation.org/'>OSM Foundation</a>."
@@ -1038,7 +1039,7 @@ ms:
       infringement_title_html: Pencabulan hak cipta
       intro_1_html: "OpenStreetMap ialah <i>data terbuka</i> yang dilesenkan di bawah <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
       intro_2_html: Anda bebas menyalin, mengedarkan, menyebarkan dan mengubah suai data kami, asalkan anda memperakui OpenStreetMap dan para penyumbangnya. Jika anda mengubah suai atau menokok tambah data kami, anda boleh mengedarkannya di bawah lesen yang sama sahaja. <a href="http://opendatacommons.org/licenses/odbl/1.0/">Kanun undang-undang</a> yang lengkap ini menerangkan hak-hak dan tanggungjawab anda.
-      intro_3_html: Kartografi jubin peta kami serta dokumentasi kami dilesenkan di bawah lesen <a href="http://creativecommons.org/licenses/by-sa/2.0/">Pengiktirafan-PerkongsianSerupa 2.0</a> (CC-BY-SA).
+      intro_3_html: Kartografi jubin peta kami serta pendokumenan kami dilesenkan di bawah lesen <a href="http://creativecommons.org/licenses/by-sa/2.0/">Pengiktirafan-PerkongsianSerupa 2.0</a> (CC-BY-SA).
       more_1_html: Baca lebih lanjut tentang penggunaan data kami serta memperakui kami di <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Soalan Lazim Undang-Undang</a>.
       more_2_html: Sungguhpun OpenStreetMap merupakan data terbuka, namun kami tidak boleh menyediakan API peta yang percuma kepada pembangun pihak ketiga. Sila rujuk <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">Dasar Penggunaan API</a>, <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Dasar Penggunaan Jubin</a> dan <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Dasar Penggunaan Nominatim</a>.
       more_title_html: Mengetahui lebih lanjut
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 7c338ea2a..4ca52fdfa 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -22,6 +22,8 @@ nb:
     local_knowledge_html: OpenStreetMap understreker viktigheten av lokalkunnskap. Bidragsytere bruker flyfotografier, GPS-enheter og enkle feltkart for Ã¥ gÃ¥ god for at OSM er nÃ¸yaktig og oppdatert.
     local_knowledge_title: Lokalkunnskap
     next: Neste
+    open_data_title: Ãpne data
+    partners_title: Partnere
     used_by: "%{name} fordeler kartdata til hundrevis av nettsteder, mobilapper og maskinvareenheter"
   activerecord: 
     attributes: 
@@ -932,13 +934,16 @@ nb:
         header: Kartlag
         notes: Kartmerknader
         overlays: Aktiver overlag for Ã¥ feilsÃ¸ke kartet
+        title: Lag
+      locate: 
+        title: Vis min posisjon
       zoom: 
         in: Zoom inn
         out: Zoom ut
     notes: 
       new: 
         add: Legg til merknad
-        intro: For Ã¥ forbedre kartet vil de opplysningene du oppgir bli vist til andre kartleggere. VÃ¦r derfor sÃ¥ beskrivende og presis som mulig, nÃ¥r du plasserer markÃ¸ren og fyller inn din merknad nedenfor.
+        intro: Oppdaget en feil eller noe som mangler? La andre kartleggere fÃ¥ vite det sÃ¥ vi kan fikse det. Flytt markÃ¸ren to korrekt posisjon og skriv merknad som forklarer problemet. (Ikke oppgi personlig informasjon her.)
       show: 
         anonymous_warning: Denne merknaden inneholder kommentarer fra anonyme brukere som bÃ¸r bekreftes uavhengig.
         comment: Kommenter
@@ -948,15 +953,23 @@ nb:
         resolve: LÃ¸s
     share: 
       cancel: Avbryt
+      download: Last ned
+      embed: HTML
+      format: "Format:"
+      image: Bilde
       link: Lenke eller HTML
       long_link: Lenke
       short_link: Kort lenke
+      short_url: Kort-URL
       title: Del
+      view_larger_map: Vis stÃ¸rre kart
     site: 
       createnote_disabled_tooltip: Zoom inn for Ã¥ legge til en merknad pÃ¥ kartet
       createnote_tooltip: Legg til en merknad pÃ¥ kartet
       edit_disabled_tooltip: Zoom inn for Ã¥ redigere kartet
       edit_tooltip: Rediger kartet
+      map_data_zoom_in_tooltip: Zoom inn for Ã¥ se kartdata
+      map_notes_zoom_in_tooltip: Zoom inn for Ã¥ se kartmerknader
   layouts: 
     about: Om
     community: Samfunnet
@@ -1229,6 +1242,15 @@ nb:
       allow_write_notes: endre merknader.
       allow_write_prefs: endre innstillingene dine.
       request_access: Applikasjonen %{app_name} ber om tilgang til din konto, %{user}. Sjekk om du vil at applikasjonen skal ha fÃ¸lgende muligheter. Du kan velge sÃ¥ mange eller fÃ¥ du vil.
+      title: Autoriser tilgang til din konto
+    oauthorize_failure: 
+      denied: Du har nektet programmet %{app_name} tilgang til din konto.
+      invalid: Autoriseringstoken er ikke gyldig.
+      title: Mislykket forespÃ¸rsel om autorisering
+    oauthorize_success: 
+      allowed: Du har gitt programmet %{app_name} tilgang til din konto.
+      title: AutoriseringsforespÃ¸rsel tillatt
+      verification: Verifikasjonskoden er %{code}.
     revoke: 
       flash: Du slettet nÃ¸kkelen for %{application}
   oauth_clients: 
@@ -1443,6 +1465,11 @@ nb:
       upload_trace: Last opp GPS-spor
     delete: 
       scheduled_for_deletion: Spor planlagt slettet
+    description: 
+      description_with_count: 
+        one: GPX-fil med %{count} punkt fra %{user}
+        other: GPX-fil med %{count} punkter fra %{user}
+      description_without_count: GPX-fil fra %{user}
     edit: 
       description: "Beskrivelse:"
       download: last ned
@@ -1460,6 +1487,8 @@ nb:
       uploaded_at: "Lastet opp:"
       visibility: "Synlighet:"
       visibility_help: hva betyr dette?
+    georss: 
+      title: OpenStreetMap GPS-spor
     list: 
       description: Bla gjennom nylig opplastede GPS-spor
       empty_html: Ingenting her ennÃ¥. <a href='%{upload_link}'>Last opp et nytt spor</a> eller lÃ¦r Ã¥ lage GPS-spor pÃ¥ <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki-siden</a>.
@@ -1563,7 +1592,7 @@ nb:
       my settings: Mine innstillinger
       new email address: "Ny e-postadresse:"
       new image: Legg til et bilde
-      no home location: Du har ikke skrevet inn din hjemmelokasjon.
+      no home location: Du har ikke skrevet inn din hjemmeposisjon.
       openid: 
         link: http://wiki.openstreetmap.org/wiki/OpenID
         link text: hva er dette?
@@ -1585,7 +1614,7 @@ nb:
       return to profile: Returner til profil
       save changes button: Lagre endringer
       title: Rediger konto
-      update home location on click: Oppdater hjemmelokasjon nÃ¥r jeg klikker pÃ¥ kartet?
+      update home location on click: Oppdater hjemmeposisjon nÃ¥r jeg klikker pÃ¥ kartet?
     confirm: 
       already active: Denne kontoen har allerede blitt bekreftet.
       button: Bekreft
@@ -1676,6 +1705,8 @@ nb:
       heading: Legg til %{user} som en venn?
       success: "%{name} er nÃ¥ din venn!"
     new: 
+      about: 
+        header: Gratis og redigerbar
       confirm email address: "Bekreft e-postadresse:"
       confirm password: "Bekreft passord:"
       contact_webmaster: Kontakt <a href="mailto:webmaster@openstreetmap.org">webmaster</a> for Ã¥ opprette en konto. Vi vil prÃ¸ve Ã¥ behandle forespÃ¸rselen sÃ¥ fort som mulig.
@@ -1716,7 +1747,7 @@ nb:
       reset: Nullstill passord
       title: Nullstill passord
     set_home: 
-      flash success: Hjemmelokasjon lagret
+      flash success: Hjemmeposisjon lagret
     suspended: 
       body: "<p>\nBeklager, kontoen din har blitt automatisk deaktivert pÃ¥ grunn av mistenkelig aktivitet.\n</p>\n<p>\nDenne avgjÃ¸relsen vil bli gjennomgÃ¥tt av en administrator snart, eller du kan kontakte %{webmaster} hvis du Ã¸nsker Ã¥ diskutere dette."
       heading: Konto stengt
@@ -1771,7 +1802,9 @@ nb:
       my comments: Mine kommentarer
       my diary: Min dagbok
       my edits: Mine redigeringer
+      my messages: Mine meldinger
       my notes: Mine merknader
+      my profile: Min profil
       my settings: Mine innstillinger
       my traces: Mine spor
       nearby users: Andre nÃ¦rliggende brukere
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index c2247f60d..81bd08ab7 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: syck-pecl
 # Author: Ajank
+# Author: Andrzej aa
 # Author: BdgwksxD
 # Author: BeginaFelicysym
 # Author: Chrumps
@@ -917,6 +918,7 @@ pl:
           weir: Jaz
   help_page: 
     help: 
+      description: Zadaj pytanie lub odszukaj odpowiedzi na stronie pytaÅ i odpowiedzi OSM.
       title: Strona Pomocy OpenStreetMap
       url: https://help.openstreetmap.org/
     title: Uzyskiwanie pomocy
@@ -958,7 +960,7 @@ pl:
     notes: 
       new: 
         add: Dodaj uwagÄ
-        intro: W celu poprawy jakoÅci mapy informacja, ktÃ³rÄ wprowadzisz bÄdzie widoczna dla pozostaÅych maperÃ³w. Podaj wiÄc jak najwiÄcej szczegÃ³ÅÃ³w oraz umieÅÄ znacznik w moÅ¼liwie najdokÅadniejszej pozycji.
+        intro: ZauwaÅ¼yÅeÅ bÅÄd lub brak czegoÅ? Daj znaÄ innym maperom, aby mogli to poprawiÄ. PrzesuÅ znacznik na wÅaÅciwÄ pozycjÄ i wprowadÅº notatkÄ opisujÄcÄ problem. (Prosimy nie podawaÄ tutaj informacji personalnych).
       show: 
         anonymous_warning: Uwaga zawiera komentarze anonimowych uÅ¼ytkownikÃ³w, ktÃ³re powinny byÄ niezaleÅ¼nie zweryfikowane.
         comment: Dodaj komentarz
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index bf32b6e2b..e6b829ff2 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -19,6 +19,7 @@
 # Author: Rsbarbosa
 # Author: Ruben
 # Author: SandroHc
+# Author: ViriatoLusitano
 # Author: Waldir
 pt: 
   about_page: 
@@ -363,6 +364,7 @@ pt:
           title: Outras Fontes
         overpass: 
           description: Fazer o download desta caixa delimitadora atravÃ©s de um espelho do banco de dados do OpenStreetMap
+          title: Overpass API
         planet: 
           description: CÃ³pias atualizadas regularmente da base de dados completa do OpenStreetMap
           title: Planeta OSM
@@ -559,7 +561,7 @@ pt:
           bus_guideway: Faixa de Autocarros de Guia
           bus_stop: Paragem de Autocarro
           byway: Byway (atalho proibido a veÃ­culos motorizados)
-          construction: Auto-Estrada em ConstruÃ§Ã£o
+          construction: Autoestrada em ConstruÃ§Ã£o
           cycleway: Ciclovia
           emergency_access_point: Ponto de acesso de emergÃªncia
           footway: Caminho pedestre
@@ -592,7 +594,7 @@ pt:
           tertiary_link: LigaÃ§Ã£o a Estrada Municipal (TerciÃ¡ria)
           track: Carreiro florestal ou agrÃ­cola
           trail: Trilho
-          trunk: Via RÃ¡pida / IP / IC
+          trunk: Via RÃ¡pida
           trunk_link: Via RÃ¡pida / IP / IC
           unclassified: Estrada sem classificaÃ§Ã£o oficial
           unsurfaced: Estrada nÃ£o pavimentada
@@ -928,8 +930,8 @@ pt:
     close: Fechar
     edit_help: Mova o mapa e amplie a localizaÃ§Ã£o que pretende editar e depois clique aqui.
     key: 
-      title: Legenda
-      tooltip: Legenda
+      title: Legenda do mapa
+      tooltip: Legenda do mapa
       tooltip_disabled: Legenda do Mapa disponÃ­vel apenas no Mapa PadrÃ£o
     map: 
       base: 
@@ -954,7 +956,7 @@ pt:
     notes: 
       new: 
         add: Reportar Erro
-        intro: Para melhorar a informaÃ§Ã£o no mapa, o erro que vai reportar Ã© mostrado a outros editores, por isso descreva por favor de forma clara e precisa o problema no mapa. Caso seja necessÃ¡rio mude a posiÃ§Ã£o do marco azul no centro do mapa (clicar e arrastar) para o sÃ­tio correto do mapa onde se encontra o erro. Obrigado.
+        intro: Encontrou um erro ou existe algo em falta? Avise os outros mapeadores para que possam consertar a anomalia. Basta posicionar o marcador na a posiÃ§Ã£o desejada, escrevendo depois uma pequena descriÃ§Ã£o que explique o problema. (Por favor, nÃ£o insira informaÃ§Ãµes pessoais.)
       show: 
         anonymous_warning: Este erro reportado inclui comentÃ¡rios de utilizadores anÃ³nimos que devem ser confirmados por fonte independente.
         comment: Gravar
@@ -1043,6 +1045,7 @@ pt:
         title: Exemplo de atribuiÃ§Ã£o
       contributors_at_html: "<strong>Ãustria</strong>: ContÃ©m dados de <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> (sob a licenÃ§a <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>), <a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">Land Vorarlberg</a> e Land Tirol (sob a licenÃ§a <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT com emendas</a>)."
       contributors_ca_html: "<strong>CanadÃ¡</strong>: ContÃ©m dados de GeoBase&reg;, GeoGratis (&copy; Department of Natural Resources Canada), CanVec (&copy; Department of Natural Resources Canada), e StatCan (Geography Division, Statistics Canada)."
+      contributors_fi_html: "<strong>FinlÃ¢ndia</strong>: Contem dados do \nNational Land Survey da FinlandÂ´s Topographic Database \nassim como de outras bases de dados, sob a licenÃ§a <a href=\"http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501\">NLSFI</a>."
       contributors_footer_1_html: Para mais informaÃ§Ãµes sobre estas e outras fontes utilizadas para melhorar o OpenStreetMap, consulte a <a href="http://wiki.openstreetmap.org/wiki/Contributors">pÃ¡gina de contribuidores</a> (em inglÃªs) na wiki do OpenStreetMap.
       contributors_footer_2_html: "  A inclusÃ£o de dados no OpenStreetMap nÃ£o implica que o fornecedor de dados originais apoie o OpenStreetMap, forneÃ§a qualquer garantia, ou aceite algum tipo de responsabilidade."
       contributors_fr_html: "<strong>FranÃ§a</strong>: ContÃ©m dados provenientes da Direction GÃ©nÃ©rale des ImpÃ´ts."
@@ -1415,7 +1418,7 @@ pt:
           park: Parque
           permissive: Acesso permitido
           pitch: Campo desportivo
-          primary: Estrada PrimÃ¡ria (Nacional)
+          primary: Estrada Nacional (PrimÃ¡ria)
           private: Acesso restrito (propriedade privada)
           rail: Ferrovia
           reserve: Reserva natural
@@ -1427,7 +1430,7 @@ pt:
           school: 
             - Escola
             - universidade
-          secondary: Estrada SecundÃ¡ria (Regional)
+          secondary: Estrada Regional (SecundÃ¡ria)
           station: EstaÃ§Ã£o ferroviÃ¡ria
           subway: Metropolitano
           summit: 
@@ -1438,7 +1441,7 @@ pt:
           tram: 
             - Metropolitano de SuperfÃ­cie
             - elÃ©trico
-          trunk: Via RÃ¡pida / ItinerÃ¡rio Principal ou Complementar
+          trunk: Via RÃ¡pida
           tunnel: Linha tracejada = tÃºnel
           unclassified: Estrada sem classificaÃ§Ã£o oficial
           unsurfaced: Estrada nÃ£o pavimentada
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index c09fb475c..58af5893e 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -9,6 +9,9 @@
 # Author: Stefanb
 sl: 
   about_page: 
+    copyright_html: <span>&copy;</span>OpenStreetMap<br> sodelavci
+    local_knowledge_title: Lokalno znanje
+    next: Naslednji
     partners_title: Partnerji
   activerecord: 
     attributes: 
@@ -181,6 +184,9 @@ sl:
     view_details: Poglej podrobnosti
     view_history: Poglej zgodovino
     way: 
+      also_part_of: 
+        one: del poti %{related_ways}
+        other: del poti %{related_ways}
       history_title: "Zgodovina poti: %{name}"
       nodes: VozliÅ¡Äa
       title: "Pot: %{name}"
@@ -333,6 +339,12 @@ sl:
           title: Planet OSM
       zoom: PoveÄava
     title: Izvozi
+  fixthemap: 
+    how_to_help: 
+      join_the_community: 
+        title: PridruÅ¾ite se skupnosti
+      title: Kako pomagati
+    title: Prijavi napako / Popravi zemljevid
   geocoder: 
     description: 
       title: 
@@ -876,6 +888,7 @@ sl:
         standard: Privzeta karta
         transport_map: Transportna karta
       copyright: Â© <a href='%{copyright_url}'>OpenStreetMap sodelavci</a>
+      donate_link_text: <a class='donate-attr' href='%{donate_url}'>Denarni prispevki</a>
       layers: 
         data: Podatki zemljevida
         header: Plasti zemljevida
@@ -921,6 +934,8 @@ sl:
       createnote_tooltip: Dodaj opombo na zemljevid
       edit_disabled_tooltip: PoveÄajte za urejanje zemljevida
       edit_tooltip: Urejanje zemljevida
+      map_data_zoom_in_tooltip: PoveÄaj za prikaz podatkov zemljevida
+      map_notes_zoom_in_tooltip: PoveÄaj za prikaz opomb zemljevida
   layouts: 
     about: O projektu
     community: Skupnost
@@ -952,6 +967,7 @@ sl:
     make_a_donation: 
       text: Prispevajte finanÄna sredstva
       title: Podprite OpenStreetMap z denarnim prispevkom
+    more: VeÄ
     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.
     partners_bytemark: Bytemark Hosting
@@ -971,6 +987,7 @@ sl:
       text: V primeru neskladja med tem prevodom in %{english_original_link} se bo uporabila angleÅ¡ka stran
       title: O tem prevodu
     legal_babble: 
+      contributors_title_html: NaÅ¡i sodelavci
       infringement_title_html: KrÅ¡itev avtorskih pravic
       intro_1_html: OpenStreetMap so <i>prosti podatki</i> z <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL) licenco.
       title_html: Avtorske pravice in licenca
@@ -1169,6 +1186,12 @@ sl:
       allow_write_prefs: spreminjanje uporabniÅ¡kih nastavitev.
       request_access: Aplikacija %{app_name} zahteva dostop do vaÅ¡ega raÄuna %{user}. Prosimo, preverite, ali Å¾elite aplikaciji omogoÄiti naslednje zmoÅ¾nosti. Izbirate lahko med poljubnim Å¡tevilom.
       title: Dovoli dostop do vaÅ¡ega raÄuna
+    oauthorize_failure: 
+      denied: Aplikaciji %{app_name} ste zavrnili zahtevek za dostop do vaÅ¡ega raÄuna.
+      title: Zahteva za overovitev ni uspela
+    oauthorize_success: 
+      title: Zahteva za overovitev uspeÅ¡na
+      verification: Koda za preverjanje je %{code}.
     revoke: 
       flash: Preklicali ste Å¾eton za %{application}
   oauth_clients: 
@@ -1726,6 +1749,7 @@ sl:
       my comments: Moje pripombe
       my diary: Moj dnevnik
       my edits: Moji prispevki
+      my messages: SporoÄila
       my notes: Moje beleÅ¾ke
       my profile: Moj profil
       my settings: Moje nastavitve
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 7fb717093..4f6196a75 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: syck-pecl
 # Author: Euriditi
+# Author: GretaDoci
 # Author: Mdupont
 # Author: MicroBoy
 # Author: Mikullovci11
@@ -79,16 +80,39 @@ sq:
       way_node: Nyja e rrugÃ«s
       way_tag: Etiketa e rrugÃ«s
   browse: 
+    anonymous: Anonim
     changeset: 
+      belongs_to: Autori
       changesetxml: Ndryshim en XML
       feed: 
         title: Ndryshim %{id}
         title_comment: Ndryshimi %{id} - %{comment}
+      node: Nyjet (%{count})
+      node_paginated: Nyjet (<span class="notranslate" translate="asnjÃ«">%{x}-%</span>{y} nga %{count})
       osmchangexml: Ndrsyhim i OSM-s en XML
-      title: Ndryshim
+      relation: MarrÃ«dhÃ«niet (%{count})
+      relation_paginated: MarrÃ«dhÃ«niet (<span class="notranslate" translate="asnjÃ«">%{x}-%</span>{y} nga %{count})
+      title: Ndryshim%{id}
+      way: MÃ«nyra (%{count})
+      way_paginated: MÃ«nyra (<span class="notranslate" translate="asnjÃ«">%{x}-%</span>{y} nga %{count})
+    closed: I Mbyllur
+    closed_by_html: TÃ« mbyllura <abbr title='<span class="notranslate" translate="asnjÃ«">%{titull}'>%</span>{kohÃ«} mÃ« parÃ«</abbr> nga %{user}
+    closed_html: TÃ« mbyllura <abbr title='<span class="notranslate" translate="asnjÃ«">%{titull}'>%</span>{kohÃ«} mÃ« parÃ«</abbr>
     containing_relation: 
       entry: Lidhja %{relation_name}
       entry_role: Lidhja %{relation_name} (sikur %{relation_role})
+    created: Krijuar
+    created_by_html: TÃ« Krijuar <abbr title='<span class="notranslate" translate="asnjÃ«">%{titull}'>%</span>{kohÃ«} mÃ« parÃ«</abbr> nga %{user}
+    created_html: Krijuar <abbr title='<span class="notranslate" translate="asnjÃ«">%{titull}'>%</span>{kohÃ«} mÃ« parÃ«</abbr>
+    deleted_by_html: TÃ« Fshira <abbr title='<span class="notranslate" translate="asnjÃ«">%{titull}'>%</span>{kohÃ«} mÃ« parÃ«</abbr> nga %{user}
+    download_xml: Shkarko nÃ« XML
+    edited_by_html: tÃ« Redaktuara <abbr title='<span class="notranslate" translate="asnjÃ«">%{titull}'>%</span>{kohÃ«} mÃ« parÃ«</abbr> nga %{user}
+    in_changeset: Grupi i ndryshimeve
+    location: Vendndodhja
+    no_comment: pa koment
+    node: 
+      history_title: "Nyja e HistorisÃ«: %{name}"
+      title: "Nyje: %{name}"
     not_found: 
       sorry: Na fal, %{type} me %{id}, nuk mujtem mi gjet
       type: 
@@ -96,6 +120,7 @@ sq:
         node: pikÃ«
         relation: lidhje
         way: udhÃ«
+    part_of: "PjesÃ« e:"
     redacted: 
       message_html: Versioni %{version} i kÃ«tij/kÃ«saj %{type} nuk mund tÃ« shfaqet pasi Ã«shtÃ« redaktuar. Ju lutem shiko %{redaction_link} pÃ«r detaje.
       redaction: Redaktim %{id}
@@ -126,6 +151,12 @@ sq:
         node: pikÃ«
         relation: lidhje
         way: rrugÃ«
+    version: Versioni
+    view_details: Shiko detajet
+    view_history: Shiko historikun
+    way: 
+      history_title: "RrugÃ«n e HistorisÃ«: %{name}"
+      title: "Rruga: %{name}"
   changeset: 
     changeset: 
       anonymous: Anonim
@@ -196,6 +227,9 @@ sq:
       user_title: Ditari i %{user}
   editor: 
     default: Default (momentalisht %{name})
+    id: 
+      description: iD (nÃ« shfletuesin editor)
+      name: iD
     potlatch: 
       description: Potlatch 1 (editor nÃ« shfletues)
       name: Potlatch 1
diff --git a/config/locales/te.yml b/config/locales/te.yml
index 70e6d5db7..97f0764e3 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -3,6 +3,7 @@
 # Export driver: syck-pecl
 # Author: Arjunaraoc
 # Author: Chaduvari
+# Author: Kiranmayee
 # Author: Ravichandra
 # Author: Veeven
 # Author: à°°à°¹à±à°®à°¾à°¨à±à°¦à±à°¦à±à°¨à±
@@ -37,6 +38,7 @@ te:
         public: à°¬à°¹à°¿à°°à°à°à°
         size: à°ªà°°à°¿à°®à°¾à°£à°
         user: à°µà°¾à°¡à±à°à°°à°¿
+        visible: à°à±à°¡à°¦à°à°¿à°¨
       user: 
         active: à°à±à°°à°¿à°¯à°¾à°¶à±à°²à°
         description: à°µà°¿à°µà°°à°£
@@ -61,15 +63,19 @@ te:
       relation: à°¸à°à°¬à°à°§à°
       session: à°¸à±à°·à°¨à±
       user: à°µà°¾à°¡à±à°à°°à°¿
+      way: à°¦à°¾à°°à°¿
   browse: 
     anonymous: à°à°à±à°à°¾à°¤
     changeset: 
       belongs_to: à°°à°à°¯à°¿à°¤
       relation: à°¸à°à°¬à°à°§à°¾à°²à± (%{count})
+      relation_paginated: "%{count} à°²à± %{x}-%{y} à°¯à±à°à±à° à°¸à°à°¬à°à°§à°¾à°²à±"
       way: à°®à°¾à°°à±à°à°¾à°²à± (%{count})
     closed: "à°®à±à°¸à°¿à°µà±à°¯à°¬à°¡à°¿à°à°¦à°¿:"
     closed_by_html: <abbr title='%{title}'>%{time} à°à°¿à°à°¦à°</abbr>, %{user} à°à± à°®à±à°¸à°¿à°µà±à°¯à°¬à°¡à°¿à°à°¦à°¿
     closed_html: <abbr title='%{title}'>%{time} à°à°¿à°à°¦à°</abbr> à°®à±à°¸à°¿à°µà±à°¯à°¬à°¡à°¿à°à°¦à°¿
+    containing_relation: 
+      entry: "%{relation_name} à°¸à°à°¬à°à°§à°"
     created: "à°¸à±à°·à±à°à°¿à°à°à°¬à°¡à°¿à°¨à°¦à°¿:"
     created_by_html: <abbr title='%{title}'>%{time} à°à°¿à°à°¦à°</abbr>, %{user} à°à± à°¸à±à°·à±à°à°¿à°à°à°¬à°¡à°¿à°à°¦à°¿
     created_html: <abbr title='%{title}'>%{time} à°à°¿à°à°¦à°</abbr> à°¸à±à°·à±à°à°¿à°à°à°¬à°¡à°¿à°à°¦à°¿
@@ -96,6 +102,7 @@ te:
     relation_member: 
       type: 
         relation: à°¸à°à°¬à°à°§à°
+        way: à°¦à°¾à°°à°¿
     start_rjs: 
       loading: à°²à±à°¡à°µà±à°¤à±à°à°¦à°¿...
     tag_details: 
diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index b19dfe7bf..9c80abe22 100644
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -233,7 +233,7 @@ tl:
       title: Walang ganyang pagpapasok sa talaarawan
     view: 
       leave_a_comment: Mag-iwan ng puna
-      login: Lumagda
+      login: Mag-login
       login_to_leave_a_comment: "%{login_link} upang makapag-iwan ng isang pagpuna"
       save_button: Sagipin
       title: Talaarawan ni %{user} | %{title}
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index afa70d1f4..8490473b4 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -351,6 +351,7 @@ tr:
         geonames: <a href="http://www.geonames.org/">GeoNames.org</a>'un sonuÃ§larÄ±
         latlon: <a href="http://openstreetmap.org/">OSM</a>'un sonuÃ§larÄ±
         osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OSM Nominatim</a> sonuÃ§larÄ±
+        osm_nominatim_reverse: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'in sonuÃ§larÄ±
         uk_postcode: <a href="http://www.npemap.org.uk/">FreeThe Postcode</a> sonuÃ§larÄ± (Ä°ngiltere)
         us_postcode: <a href="http://geocoder.us/">Geocoder.us</a>'dan sonuÃ§larÄ±
     search_osm_nominatim: 
@@ -840,6 +841,7 @@ tr:
   javascripts: 
     key: 
       title: Lejant
+      tooltip: Lejant
       tooltip_disabled: Lejant sadece standart katmanÄ± iÃ§in kullanÄ±lmakta
     map: 
       base: 
@@ -1229,6 +1231,7 @@ tr:
       private: ÃZEL
       public: KAMU
       trace_details: Ä°z AyrÄ±ntÄ±larÄ±nÄ± GÃ¶rÃ¼ntÃ¼le
+      trackable: Ä°ZLENEBÄ°LÄ°R
       view_map: Harita GÃ¶rÃ¼ntÃ¼le
     trace_form: 
       description: TanÄ±tÄ±m
@@ -1266,6 +1269,11 @@ tr:
       trace_not_found: Ä°z bulunmadÄ±!
       uploaded: "YÃ¼klendi:"
       visibility: "GÃ¶rÃ¼nÃ¼rlÃ¼k:"
+    visibility: 
+      identifiable: TanÄ±mlanabilir (izleme listesinde ve tanÄ±mlanabilir zaman damgalarÄ± ile iÅaretlenmiÅ gÃ¶sterilir)
+      private: KiÅiye Ã¶zel (sadece anonim ve sÄ±ralanmamÄ±Å noktalar olarak paylaÅÄ±lÄ±r)
+      public: Kamu malÄ± (izleme listesinde ve anonim, sÄ±ralanmamÄ±Å noktalar ile gÃ¶sterilir)
+      trackable: Ä°zlenebilir (anonim olarak paylaÅÄ±lmÄ±Å ve sÄ±ralanmÄ±Å zaman damgalarÄ± ile iÅaretlenmiÅ)
   user: 
     account: 
       contributor terms: 
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index e8b79abc8..3942b7b35 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -908,7 +908,7 @@ vi:
     wiki: 
       description: Äá»c tÃ i liá»u Äáº§y Äá»§ vá» OSM trÃªn wiki.
       title: wiki.openstreetmap.org
-      url: http://wiki.openstreetmap.org/?setlang=vi
+      url: http://wiki.openstreetmap.org/wiki/Vi:Main_Page?uselang=vi
   javascripts: 
     close: ÄÃ³ng
     edit_help: Di chuyá»n báº£n Äá» vÃ  phÃ³ng to má»t vá» trÃ­ mÃ  báº¡n muá»n sá»­a Äá»i, rá»i nháº¥n chuá»t vÃ o ÄÃ¢y.
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 4e4698557..d015e6e30 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -10,6 +10,7 @@
 # Author: Liangent
 # Author: Liuxinyu970226
 # Author: Mmyangfl
+# Author: Mywood
 # Author: Nemo bis
 # Author: NigelSoft
 # Author: PhiLiP
@@ -27,7 +28,7 @@ zh-CN:
     lede_text: OpenStreetMapæ¯ä¸ä¸ªç±å°å¾å¶ä½ç±å¥½èç»æçç¤¾åºãè¿äºç±å¥½èæä¾å¹¶ç»´æ¤ä¸çåå°å³äºéè·¯ï¼å°éï¼åå¡é¦ï¼éè·¯è½¦ç«ï¼ç­ç­åç§åæ ·çæ°æ®ã
     local_knowledge_html: OpenStreetMapå¼ºè°ä½¿ç¨æ¬å°ç¥è¯ãè´¡ç®èä»¬ä½¿ç¨èªç©ºå¾åï¼GBSè®¾å¤ä¸ä½ç§æå°åºå°å¾æ¥ç¡®ä¿OSMçç²¾ç¡®æ§åæ¶ææ§ã
     local_knowledge_title: æ¬å°ç¥è¯åº
-    next: ç»§ç»­
+    next: ä¸ä¸é¡µ
     open_data_html: OpenStreetMapæ¯<i>å¼æºæ°æ®</i>:åªè¦ä½ è¡¨æä½¿ç¨äºOpenStreetMapå¹¶æ¿è®¤å¶è´¡ç®èçå·¥ä½ï¼ä½ å°±å¯ä»¥ä½¿ç¨OpenStreetMapãå¦æä½ æ¹åæèä½¿ç¨è¿äºæ°æ®ï¼ä½ å¿é¡»æç§ç¸åççæåè®®åå¸ç»æãè¯¦æè¯·åè§<a href='%{copyright_path}'>çæåè®®</a>ã
     open_data_title: å¼æ¾æ°æ®
     partners_title: åä½ä¼ä¼´
@@ -75,7 +76,7 @@ zh-CN:
       diary_entry: æ¥è®°æç« 
       friend: æå
       language: è¯­è¨
-      message: æ¶æ¯
+      message: ä¿¡æ¯
       node: èç¹
       node_tag: èç¹æ ç­¾
       notifier: éç¥è
@@ -96,7 +97,7 @@ zh-CN:
       tracetag: è½¨è¿¹æ ç­¾
       user: ç¨æ·
       user_preference: ç¨æ·è®¾ç½®
-      user_token: ç¨æ·ä»¤ç
+      user_token: ç¨æ·å¯é¥
       way: è·¯å¾
       way_node: è·¯å¾èç¹
       way_tag: è·¯å¾æ ç­¾
@@ -117,33 +118,33 @@ zh-CN:
         title: åæ´é%{id}
         title_comment: åæ´é%{id} - %{comment}
       node: èç¹ï¼%{count}ï¼
-      node_paginated: èç¹ï¼%{x}-%{y}ï¼æ»è®¡%{count}ï¼
+      node_paginated: èç¹ï¼%{x}-%{y}ï¼å±%{count}ï¼
       osmchangexml: osmåæ´XML
       relation: å³ç³»ï¼%{count}ï¼
-      relation_paginated: å³ç³»ï¼%{count}ç%{x}-%{y}ï¼
+      relation_paginated: å³ç³»ï¼%{x}-%{y}ï¼å±%{count}ï¼
       title: åæ´éï¼%{id}
       way: è·¯å¾ (%{count})
-      way_paginated: è·¯å¾ï¼%{count}ç%{x}-%{y}ï¼
+      way_paginated: è·¯å¾ï¼%{x}-%{y}ï¼å±%{count}ï¼
     closed: å³é­äº
-    closed_by_html: ç±%{user}äº<abbr title='%{title}'>%{time}å</abbr>å³é­
-    closed_html: äº<abbr title='%{title}'>%{time}å</abbr>å³é­
+    closed_by_html: "%{user}å³é­äº<abbr title='%{title}'>%{time}å</abbr>"
+    closed_html: å³é­äº<abbr title='%{title}'>%{time}å</abbr>
     containing_relation: 
       entry: å³ç³»%{relation_name}
       entry_role: å³ç³»%{relation_name}ï¼ä½ä¸º%{relation_role}ï¼
     created: åå»ºäº
-    created_by_html: ç±%{user}äº<abbr title='%{title}'>%{time}å</abbr>åå»º
-    created_html: äº<abbr title='%{title}'>%{time}å</abbr>åå»º
-    deleted_by_html: ç±%{user}äº<abbr title='%{title}'>%{time}å</abbr>å é¤
+    created_by_html: "%{user}åå»ºäº<abbr title='%{title}'>%{time}å</abbr>"
+    created_html: åå»ºäº<abbr title='%{title}'>%{time}å</abbr>
+    deleted_by_html: "%{user}å é¤äº<abbr title='%{title}'>%{time}å</abbr>"
     download_xml: ä¸è½½XML
-    edited_by_html: ç±%{user}äº<abbr title='%{title}'>%{time}å</abbr>ç¼è¾
+    edited_by_html: "%{user}ç¼è¾äº<abbr title='%{title}'>%{time}å</abbr>"
     in_changeset: åæ´é
     location: ä½ç½®ï¼
-    no_comment: ï¼æ è¯è®ºï¼
+    no_comment: ï¼æ²¡æè¯è®ºï¼
     node: 
       history_title: èç¹åå²ï¼%{name}
       title: èç¹ï¼%{name}
     not_found: 
-      sorry: "å¯¹ä¸èµ·ï¼æ æ³æ¾å° %{type} #%{id}ã"
+      sorry: å¯¹ä¸èµ·ï¼æ æ³æ¾å°%{type}#%{id}ã
       type: 
         changeset: åæ´é
         node: èç¹
@@ -152,22 +153,22 @@ zh-CN:
     note: 
       closed_by: "%{user}è§£å³äº<abbr title='%{exact_time}'>%{when}å</abbr>"
       closed_by_anonymous: å¿åç¨æ·è§£å³äº<abbr title='%{exact_time}'>%{when}å</abbr>
-      closed_title: "å·²è§£å³çæ³¨é #%{note_name}"
+      closed_title: å·²è§£å³æ³¨é#%{note_name}
       commented_by: "%{user}äº<abbr title='%{exact_time}'>%{when}å</abbr>åè¡¨çè¯è®º"
       commented_by_anonymous: å¿åç¨æ·äº<abbr title='%{exact_time}'>%{when}å</abbr>åè¡¨çè¯è®º
       description: è¯´æ
       hidden_by: "%{user}éèäº<abbr title='%{exact_time}'>%{when}å</abbr>"
       hidden_title: éèæ³¨é#%{note_name}
-      new_note: æ°å»ºæ³¨é
+      new_note: æ°æ³¨é
       open_by: "%{user}åå»ºäº<abbr title='%{exact_time}'>%{when}å</abbr>"
       open_by_anonymous: å¿åç¨æ·åå»ºäº<abbr title='%{exact_time}'>%{when}å</abbr>
-      open_title: "æªè§£å³çæ³¨é #%{note_name}"
-      reopened_by: "%{user}äº<abbr title='%{exact_time}'>%{when}å</abbr>éæ°å¯ç¨"
-      reopened_by_anonymous: å¿åç¨æ·äº<abbr title='%{exact_time}'>%{when}å</abbr>éæ°å¯ç¨
+      open_title: æªè§£å³æ³¨é#%{note_name}
+      reopened_by: "%{user}éå¯äº<abbr title='%{exact_time}'>%{when}å</abbr>"
+      reopened_by_anonymous: å¿åç¨æ·éå¯äº<abbr title='%{exact_time}'>%{when}å</abbr>
       title: æ³¨éï¼%{id}
     part_of: å±äº
     redacted: 
-      message_html: è¯¥%{type}ççæ¬%{version}æ æ³æ¾ç¤ºï¼å ä¸ºå¶å·²è¢«ç¼è¾ãè¯¦æè¯·è§%{redaction_link}ã
+      message_html: è¯¥%{type}ççæ¬%{version}æ æ³æ¾ç¤ºï¼å ä¸ºå®å·²ç»è¢«ç¼è¾ãè¯¦æè¯·è§%{redaction_link}ã
       redaction: ç¼è¾%{id}
       type: 
         node: èç¹
@@ -185,7 +186,7 @@ zh-CN:
         relation: å³ç³»
         way: è·¯å¾
     start_rjs: 
-      feature_warning: æ­£å¨å è½½ %{num_features} ä¸ªåè½ï¼è¿å¯è½è´ä½¿ä½ çæµè§å¨ç¼æ¢æå¤±å»ååºãä½ ç¡®å®è¦æ¾ç¤ºæ­¤æ°æ®åï¼
+      feature_warning: æ­£å¨è½½å¥%{num_features}ä¸ªç¹å¾ï¼è¿å¯è½ä½¿ä½ çæµè§å¨åæ¢æå¤±å»ååºãä½ ç¡®å®æ³è¦æ¾ç¤ºè¯¥æ°æ®åï¼
       load_data: è½½å¥æ°æ®
       loading: æ­£å¨è½½å¥...
     tag_details: 
@@ -195,7 +196,7 @@ zh-CN:
         tag: "%{key}=%{value}æ ç­¾çwikiè¯´æé¡µé¢"
       wikipedia_link: ç»´åºç¾ç§ä¸ç%{page}æ¡ç®
     timeout: 
-      sorry: å¯¹ä¸èµ·ï¼æ£ç´¢idä¸º%{id}ç%{type}çæ°æ®èè´¹æ¶é´è¿é¿ã
+      sorry: å¯¹ä¸èµ·ï¼æ£ç´¢idä¸º%{id}ç%{type}çæ°æ®æ¶é´è¿é¿ã
       type: 
         changeset: åæ´é
         node: èç¹
@@ -205,15 +206,17 @@ zh-CN:
     view_details: æ¥çè¯¦æ
     view_history: æ¥çåå²
     way: 
-      also_part_of: è·¯å¾%{related_ways}çä¸é¨å
+      also_part_of: 
+        one: å±äºè·¯å¾%{related_ways}
+        other: å±äºè·¯å¾%{related_ways}
       history_title: è·¯å¾åå²ï¼%{name}
       nodes: èç¹
       title: è·¯å¾ï¼%{name}
   changeset: 
     changeset: 
-      anonymous: å¿å
+      anonymous: å¿åç¨æ·
       no_edits: ï¼æ²¡æç¼è¾ï¼
-      view_changeset_details: æ¥çåæ´éè¯¦ç»ä¿¡æ¯
+      view_changeset_details: æ¥çåæ´éè¯¦æ
     changeset_paging_nav: 
       next: ä¸ä¸é¡µ Â»
       previous: Â« ä¸ä¸é¡µ
@@ -226,25 +229,25 @@ zh-CN:
       user: ç¨æ·
     list: 
       empty: æ²¡ææ¾å°åæ´éã
-      empty_area: å¨æ­¤åºåæ²¡æåæ´éã
-      empty_user: æ²¡ææ­¤ç¨æ·çåæ´éã
-      load_more: å è½½æ´å¤
-      no_more: æ²¡ææ´å¤åæ´éã
-      no_more_area: å¨æ­¤åºåæ²¡ææ´å¤åæ´éã
-      no_more_user: æ²¡ææ´å¤æ­¤ç¨æ·çåæ´éã
+      empty_area: è¯¥åºååæ²¡æåæ´éã
+      empty_user: æ²¡æè¯¥ç¨æ·çåæ´éã
+      load_more: è½½å¥æ´å¤
+      no_more: æ²¡ææ¾å°æ´å¤åæ´éã
+      no_more_area: è¯¥åºååæ²¡ææ´å¤åæ´éã
+      no_more_user: æ²¡æè¯¥ç¨æ·çæ´å¤åæ´éã
       title: åæ´é
       title_friend: ä½ çæåçåæ´é
       title_nearby: éè¿ç¨æ·çåæ´é
       title_user: "%{user}çåæ´é"
     timeout: 
-      sorry: å¯¹ä¸èµ·ï¼æ£ç´¢ä½ è¯·æ±çåæ´éçåè¡¨èè´¹æ¶é´è¿é¿ã
+      sorry: å¯¹ä¸èµ·ï¼æ£ç´¢ä½ è¯·æ±çåæ´éçåè¡¨æ¶é´è¿é¿ã
   diary_entry: 
     comments: 
       ago: "%{ago}å"
       comment: è¯è®º
       has_commented_on: "%{display_name}å·²ç»è¯è®ºä»¥ä¸æ¥è®°æç« "
-      newer_comments: æ°è¯è®º
-      older_comments: æ§è¯è®º
+      newer_comments: è¾æ°è¯è®º
+      older_comments: è¾èè¯è®º
       post: åè¡¨
       when: æ¶é´
     diary_comment: 
@@ -256,7 +259,7 @@ zh-CN:
         one: "%{count}ä¸ªè¯è®º"
         other: "%{count}ä¸ªè¯è®º"
         zero: æ²¡æè¯è®º
-      comment_link: å³äºè¯¥æç« çè¯è®º
+      comment_link: è¯¥æç« çè¯è®º
       confirm: ç¡®è®¤
       edit_link: ç¼è¾è¯¥æç« 
       hide_link: éèè¯¥æç« 
@@ -266,11 +269,11 @@ zh-CN:
       body: æ­£æï¼
       language: è¯­è¨ï¼
       latitude: çº¬åº¦ï¼
-      location: å°ç¹ï¼
+      location: ä½ç½®ï¼
       longitude: ç»åº¦ï¼
-      marker_text: æ¥è®°æç« å°ç¹
+      marker_text: æ¥è®°æç« ä½ç½®
       save_button: ä¿å­
-      subject: æ é¢ï¼
+      subject: ä¸»é¢ï¼
       title: ç¼è¾æ¥è®°æç« 
       use_map_link: ä½¿ç¨å°å¾
     feed: 
@@ -297,7 +300,7 @@ zh-CN:
       user_title: "%{user}çæ¥è®°"
     location: 
       edit: ç¼è¾
-      location: å°ç¹ï¼
+      location: ä½ç½®ï¼
       view: æ¥ç
     new: 
       title: æ°æ¥è®°æç« 
@@ -318,11 +321,11 @@ zh-CN:
       description: iDï¼æµè§å¨åç¼è¾å¨ï¼
       name: iD
     potlatch: 
-      description: å¬å­£è1ï¼æµè§å¨åç¼è¾å¨ï¼
-      name: å¬å­£è1
+      description: Potlatch 1ï¼æµè§å¨åç¼è¾å¨ï¼
+      name: Potlatch 1
     potlatch2: 
-      description: å¬å­£è2ï¼æµè§å¨åç¼è¾å¨ï¼
-      name: å¬å­£è2
+      description: Potlatch 2ï¼æµè§å¨åç¼è¾å¨ï¼
+      name: Potlatch 2
     remote: 
       description: è¿ç¨æ§å¶ï¼JOSMæMerkaartorï¼
       name: è¿ç¨æ§å¶
@@ -335,7 +338,7 @@ zh-CN:
       export_details: OpenStreetMapæ°æ®éç¨<a href="http://opendatacommons.org/licenses/odbl/1.0/">å¼æ¾æ°æ®å±äº«å¼æ¾æ°æ®åºè®¸å¯åè®®</a>ï¼ODbLï¼ææã
       format: æ ¼å¼
       format_to_export: è¦å¯¼åºçæ ¼å¼
-      image_size: å¾åå¤§å°
+      image_size: å¾åå°ºå¯¸
       latitude: çº¬åº¦ï¼
       licence: è®¸å¯åè®®
       longitude: ç»åº¦ï¼
@@ -344,7 +347,7 @@ zh-CN:
       max: æå¤§
       options: éé¡¹
       osm_xml_data: OpenStreetMap XMLæ°æ®
-      output: å¯¼åº
+      output: è¾åº
       paste_html: ç²è´´å¯åµå¥ç½ç«çHTML
       scale: æ¯ä¾
       too_large: 
@@ -378,7 +381,7 @@ zh-CN:
     other_concerns: 
       explanation_html: å¦ææ¨æå³äºå¦ä½ä½¿ç¨æä»¬çæ°æ®æåå®¹çå³å¿è¯·æ¥éæä»¬å¨<a href='/copyright'>çæé¡µé¢</a>çæ´å¤æ³å¾ä¿¡æ¯ï¼æèç³»<a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>OSMFå·¥ä½ç»</a>ã
       title: å¶ä»é®é¢
-    title: æ¥åé®é¢/ä¿®å¤å°å¾
+    title: æ¥åé®é¢/ä¿®æ­£å°å¾
   geocoder: 
     description: 
       title: 
@@ -403,13 +406,13 @@ zh-CN:
       zero: å°äº1åç±³
     results: 
       more_results: æ´å¤ç»æ
-      no_results: æ ç»æ
+      no_results: æ²¡ææ¾å°ç»æ
     search: 
       title: 
         ca_postcode: æ¥èª<a href="http://geocoder.ca/">Geocoder.CA</a>çç»æ
         geonames: æ¥èª<a href="http://www.geonames.org/">GeoNames</a>çç»æ
         geonames_reverse: æ¥èª<a href="http://www.geonames.org/">GeoNames</a>çç»æ
-        latlon: æ¥èª <a href="http://openstreetmap.org/">åé¨</a> çç»æ
+        latlon: æ¥èª<a href="http://openstreetmap.org/">åé¨</a>çç»æ
         osm_nominatim: æ¥èª<a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>çç»æ
         osm_nominatim_reverse: æ¥èª<a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>çç»æ
         uk_postcode: æ¥èª<a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>çç»æ
@@ -441,7 +444,7 @@ zh-CN:
           airport: æºåº
           arts_centre: èºæ¯ä¸­å¿
           artwork: èºæ¯å
-          atm: èªå¨ææ¬¾æºï¼ATMï¼
+          atm: èªå¨ææ¬¾æº
           auditorium: ç¤¼å 
           bank: é¶è¡
           bar: éå§
@@ -918,7 +921,7 @@ zh-CN:
     title: è·å¾å¸®å©
     welcome: 
       description: æ¬å¿«éæåæ¶µçäºå¿«éå¥é¨ OpenStreetMap çåºæ¬ç¥è¯ã
-      title: æ¬¢è¿ä½¿ç¨ OSM
+      title: æ¬¢è¿è®¿é®OSM
       url: /welcome
     wiki: 
       description: æµè§ wiki æ·±å¥äºè§£ OSM ææ¡£ã
@@ -995,12 +998,12 @@ zh-CN:
     community: ç¤¾åº
     community_blogs: ç¤¾åºåå®¢
     community_blogs_title: OpenStreetMapç¤¾åºæåçåå®¢
-    copyright: çæ
+    copyright: èä½æ
     data: æ°æ®
     donate: éè¿ç»ç¡¬ä»¶åçº§åºé%{link}æ¯æOpenStreetMapã
     edit: ç¼è¾
     edit_with: ä½¿ç¨%{editor}ç¼è¾
-    export: è¾åº
+    export: å¯¼åº
     export_data: å¯¼åºæ°æ®
     foundation: åºéä¼
     foundation_title: OpenStreetMapåºéä¼
@@ -1010,14 +1013,14 @@ zh-CN:
     history: åå²
     home: è¿åå®¶ä½ç½®
     intro_2_create_account: åå»ºç¨æ·è´¦æ·
-    intro_header: æ¬¢è¿æ¥å° OpenStreetMap!
+    intro_header: æ¬¢è¿è®¿é®OpenStreetMapï¼
     intro_text: OpenStreetMapæ¯ä¸ä¸ªä¸çå°å¾ï¼ç±åä½ ä¸æ ·çäººä»¬ææç­ï¼å¯ä¾æ®å¼æ¾è®¸å¯åè®®èªç±ä½¿ç¨ã
-    learn_more: è¯¦ç»äºè§£
+    learn_more: äºè§£æ´å¤
     log_in: ç»å½
     log_in_tooltip: ä½¿ç¨å·²æè´¦æ·ç»å½
     logo: 
       alt_text: OpenStreetMapæ å¿
-    logout: æ³¨é
+    logout: éåº
     make_a_donation: 
       text: ææ¬¾
       title: éè¿ææ¬¾æ¯æOpenStreetMap
@@ -1042,7 +1045,7 @@ zh-CN:
     foreign: 
       english_link: è±è¯­åæ
       text: å½è¯¥ç¿»è¯é¡µé¢ä¸%{english_original_link}å²çªæ¶ï¼è±è¯­é¡µé¢ä¼è¢«ä¼åéç¨
-      title: å³äºè¯¥ç¿»è¯
+      title: å³äºæ¬è¯æ
     legal_babble: 
       attribution_example: 
         alt: å¦ä½å¨ç½é¡µä¸ç½²åOpenStreetMapçç¤ºä¾
@@ -1209,7 +1212,7 @@ zh-CN:
       with_description: æè¯´æ
       your_gpx_file: çèµ·æ¥åæ¯ä½ ç GPX æä»¶
     lost_password: 
-      subject: "[OpenStreetMap] å¯ç éç½®è¯·æ±"
+      subject: "[OpenStreetMap]å¯ç éç½®è¯·æ±"
     lost_password_html: 
       click_the_link: å¦æè¿æ¯ä½ ï¼è¯·ç¹å»ä¸é¢çé¾æ¥éç½®ä½ çå¯ç ã
       greeting: ä½ å¥½ï¼
@@ -1470,7 +1473,7 @@ zh-CN:
       preview: é¢è§
     search: 
       search: æç´¢
-      submit_text: å¼å§
+      submit_text: æäº¤
       where_am_i: æå¨åªéï¼
       where_am_i_title: ä½¿ç¨æç´¢å¼æè¯´æå½åä½ç½®
     sidebar: 
@@ -1478,8 +1481,8 @@ zh-CN:
       search_results: æç´¢ç»æ
   time: 
     formats: 
-      blog: "%Yå¹´%Bæ%eæ¥"
-      friendly: "%Yå¹´%Bæ%eæ¥ %H:%M"
+      blog: "%Yå¹´%B%eæ¥"
+      friendly: "%Yå¹´%B%eæ¥ %H:%M"
   trace: 
     create: 
       trace_uploaded: ä½ ç GPX æä»¶å·²ç»è¢«ä¸ä¼ ï¼æ­£ç­å¾è¢«è¾å¥æ°æ®åºãè¿éå¸¸å¨åå°æ¶ä¹åï¼å½ä¸ä¼ ç»æåä¼åé®ä»¶éç¥ä½ ã
@@ -1496,7 +1499,7 @@ zh-CN:
       download: ä¸è½½
       edit: ç¼è¾
       filename: æä»¶åï¼
-      heading: ç¼è¾è½¨è¿¹ %{name}
+      heading: ç¼è¾è½¨è¿¹%{name}
       map: å°å¾
       owner: ææäººï¼
       points: ç¹ï¼
@@ -1510,7 +1513,7 @@ zh-CN:
       visibility_help: è¿æ¯ä»ä¹ææï¼
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
     georss: 
-      title: OpenStreetMap GPSè·è¸ª
+      title: OpenStreetMap GPSè½¨è¿¹
     list: 
       description: æµè§æè¿ä¸ä¼ çGPSè½¨è¿¹
       empty_html: å°æ è½¨è¿¹ã<a href='%{upload_link}'>ä¸ä¼ æ°è½¨è¿¹</a>æå¨<a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>ç»´åºé¡µé¢</a>ä¸äºè§£ GPS è½¨è¿¹ã
@@ -1538,7 +1541,7 @@ zh-CN:
       pending: æèµ·
       private: ç§æ
       public: å¬å¼
-      trace_details: æ¥çè½¨è¿¹è¯¦ç»ä¿¡æ¯
+      trace_details: æ¥çè½¨è¿¹è¯¦æ
       trackable: å¯è¿½è¸ª
       view_map: æ¥çå°å¾
     trace_form: 
@@ -1605,9 +1608,9 @@ zh-CN:
       gravatar: 
         gravatar: ä½¿ç¨Gravatar
         link text: è¿æ¯ä»ä¹ï¼
-      home location: æå¨ä½ç½®ï¼
+      home location: ä½æä½ç½®ï¼
       image: å¾åï¼
-      image size hint: (æ¹å½¢å¾ççå¤§å°è³å°ä¸º 100x100 æ¶æææå¥½)
+      image size hint: ï¼æ­£æ¹å½¢å¾åï¼å°ºå¯¸è³å°ä¸º100x100ï¼
       keep image: ä¿æå½åå¾å
       latitude: çº¬åº¦ï¼
       longitude: ç»åº¦ï¼
@@ -1615,7 +1618,7 @@ zh-CN:
       my settings: æçè®¾ç½®
       new email address: æ°çµå­é®ä»¶å°åï¼
       new image: æ·»å å¾å
-      no home location: ä½ å°æªè¾å¥æå¨ä½ç½®ã
+      no home location: ä½ è¿æ²¡æè¾å¥ä½ çä½æä½ç½®ã
       openid: 
         link: http://wiki.openstreetmap.org/wiki/OpenID
         link text: è¿æ¯ä»ä¹ï¼
@@ -1625,7 +1628,7 @@ zh-CN:
       profile description: åºæ¬ä¿¡æ¯è¯´æï¼
       public editing: 
         disabled: ç¦ç¨ä¸æ æ³ç¼è¾æ°æ®ï¼ææè¿å»çç¼è¾åä¸ºå¿åã
-        disabled link text: ä¸ºä»ä¹æä¸è½ç¼è¾ï¼
+        disabled link text: æä¸ºä»ä¹ä¸è½ç¼è¾ï¼
         enabled: å¯ç¨ãéå¿åç¨æ·ï¼å¯ä»¥ç¼è¾æ°æ®ã
         enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: è¿æ¯ä»ä¹ï¼
@@ -1675,13 +1678,13 @@ zh-CN:
       account is suspended: å¯¹ä¸èµ·ï¼ä½ çå¸æ·å å¯çæ´»å¨å·²è¢«æåã<br />å¦æä½ æ³è®¨è®ºè¿ä¸ªï¼è¯·èç³»<a href="%{webmaster}">ç½ç«ç®¡çå</a>ã
       account not active: å¯¹ä¸èµ·ï¼ä½ çè´¦æ·å°æªæ¿æ´»ã<br />è¯·ç¹å»å¨è´¦æ·ç¡®è®¤é®ä»¶ä¸­çé¾æ¥æ¥æ¿æ´»ä½ çè´¦æ·ï¼æ<a href="%{reconfirm}">è¯·æ±æ°çç¡®è®¤çµå­é®ä»¶</a>ã
       auth failure: å¯¹ä¸èµ·ï¼å­è¿äºä¿¡æ¯ä½ æ æ³ç»å½ã
-      create account minute: åå»ºè´¦æ·ãåªéè¦ä¸åéã
+      create account minute: åå»ºè´¦æ·ãåªéè±è´¹ä¸åéã
       email or username: çµå­é®ä»¶å°åæç¨æ·åï¼
       heading: ç»å½
       login_button: ç»å½
       lost password link: å¿è®°å¯ç ï¼
       new to osm: ç¬¬ä¸æ¬¡æ¥å° OpenStreetMapï¼
-      no account: è¿æ²¡æå¸æ·ï¼
+      no account: æ²¡æè´¦æ·ï¼
       openid: "%{logo}OpenIDï¼"
       openid invalid: å¯¹ä¸èµ·ï¼ä½ ç OpenID æ ¼å¼ä¼¼ä¹ä¸æ­£ç¡®
       openid missing provider: å¯¹ä¸èµ·ï¼æ æ³èç³»ä½ ç OpenID æä¾è
@@ -1689,22 +1692,22 @@ zh-CN:
       openid_providers: 
         aol: 
           alt: ä½¿ç¨AOL OpenIDç»å½
-          title: ä½¿ç¨ AOL ç»å½
+          title: AOLç»å½
         google: 
           alt: ä½¿ç¨Google OpenIDç»å½
-          title: ä½¿ç¨ Google ç»å½
+          title: Googleç»å½
         myopenid: 
           alt: ä½¿ç¨myOpenID OpenIDç»å½
-          title: ä½¿ç¨ myOpenID ç»å½
+          title: myOpenIDç»å½
         openid: 
           alt: ä½¿ç¨OpenID URLç»å½
-          title: ä½¿ç¨OpenIDç»å½
+          title: OpenIDç»å½
         wordpress: 
           alt: ä½¿ç¨Wordpress OpenIDç»å½
-          title: ä½¿ç¨ Wordpress ç»å½
+          title: Wordpressç»å½
         yahoo: 
           alt: ä½¿ç¨Yahoo OpenIDç»å½
-          title: ä½¿ç¨ Yahoo ç»å½
+          title: Yahooç»å½
       password: å¯ç ï¼
       register now: ç°å¨å°±æ³¨å
       remember: è®°ä½æ
@@ -1713,22 +1716,22 @@ zh-CN:
       with openid: æä½¿ç¨OpenIDç»å½ï¼
       with username: å·²ç»æOpenStreetMapè´¦æ·ï¼è¯·ä½¿ç¨ä½ çç¨æ·ååå¯ç ç»å½ï¼
     logout: 
-      heading: ä» OpenStreetMap æ³¨é
-      logout_button: æ³¨é
-      title: ç»åº
+      heading: éåºOpenStreetMap
+      logout_button: éåº
+      title: éåº
     lost_password: 
       email address: çµå­é®ä»¶å°åï¼
       heading: å¿è®°å¯ç ï¼
       help_text: è¾å¥ä½ ççµå­é®ä»¶å°åæ¥æ³¨åï¼æä»¬ä¼å¯åºé¾æ¥ç»å®ï¼è¿æ ·ä½ å°±å¯ä»¥ç¨å®æ¥éç½®å¯ç ã
       new password button: éç½®å¯ç 
       notice email cannot find: å¯¹ä¸èµ·ï¼æ æ³æ¾å°é®ç®±ã
-      notice email on way: å¯¹ä¸èµ·ï¼ä½ å¿è®°äºå¯ç  :-( ä½æ¯é®ä»¶æ­£å¨åéï¼ä¸ä¼ä½ å°±å¯ä»¥éç½®å®ã
+      notice email on way: å¾éæ¾ä½ éå¤±äºå¯ç :-(ä¸è¿ä¸å°çµå­é®ä»¶å·²ç»åå¾ä½ çé®ç®±ï¼ä½ å¾å¿«å°±å¯ä»¥éç½®å¯ç äºã
       title: å¿è®°å¯ç 
     make_friend: 
       already_a_friend: ä½ å·²ç»å %{name} æ¯æåäºã
-      button: æ·»å ä¸ºå¥½å
+      button: æ·»å ä¸ºæå
       failed: å¯¹ä¸èµ·ï¼æªè½æ·»å  %{name} ä¸ºæåã
-      heading: å° %{user} å ä¸ºå¥½åï¼
+      heading: æ·»å %{user}ä¸ºæåï¼
       success: "%{name}ç°å¨æ¯ä½ çå¥½åï¼"
     new: 
       about: 
@@ -1737,7 +1740,7 @@ zh-CN:
       confirm email address: ç¡®è®¤çµå­é®ä»¶å°åï¼
       confirm password: ç¡®è®¤å¯ç ï¼
       contact_webmaster: è¯·èç³»<a href="mailto:webmaster@openstreetmap.org">ç½ç«ç®¡çå</a>æ¥å®æåå»ºä¸ä¸ªè´¦æ· - æä»¬å°å°½å¿«å°è¯å¤çä½ çè¯·æ±ã
-      continue: ç»å½
+      continue: æ³¨å
       display name: æ¾ç¤ºåç§°ï¼
       display name description: ä½ å¬å¼æ¾ç¤ºçç¨æ·åãä½ å¯ä»¥ç¨åå¨è®¾ç½®ä¸­è¿è¡åæ´ã
       email address: çµå­é®ä»¶å°åï¼
@@ -1751,7 +1754,7 @@ zh-CN:
       terms accepted: æè°¢ä½ æ¥åæ°çè´¡ç®æ¡æ¬¾ï¼
       terms declined: æä»¬å¾éæ¾ä½ å·²å³å®ä¸æ¥åæ°çè´¡ç®èæ¡æ¬¾ãæå³è¯¦ç»ä¿¡æ¯ï¼è¯·åé<a href="%{url}">æ­¤ç»´åºé¡µé¢</a>.
       terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
-      title: ç»å½
+      title: æ³¨å
       use openid: æèï¼ä½¿ç¨ %{logo} OpenID ç»å½
     no_such_user: 
       body: å¯¹ä¸èµ·ï¼æ²¡æåä¸º %{user} çç¨æ·ãè¯·æ£æ¥ä½ çæ¼åï¼æèå¯è½æ¯ç¹å»äºéè¯¯çé¾æ¥ã
@@ -1759,7 +1762,7 @@ zh-CN:
       title: æ²¡ææ­¤ç¨æ·
     popup: 
       friend: æå
-      nearby mapper: éè¿ç¨æ·
+      nearby mapper: éè¿ç»å¾è
       your location: ä½ çä½ç½®
     remove_friend: 
       button: å é¤æå
@@ -1770,7 +1773,7 @@ zh-CN:
       confirm password: ç¡®è®¤å¯ç ï¼
       flash changed: ä½ çå¯ç å·²ç»åæ´ã
       flash token bad: æªæ¾å°æ è®°ï¼å»ºè®®æ£æ¥ URL?
-      heading: éç½® %{user} çå¯ç 
+      heading: éç½®%{user}çå¯ç 
       password: å¯ç ï¼
       reset: éç½®å¯ç 
       title: éç½®å¯ç 
@@ -1801,7 +1804,7 @@ zh-CN:
     view: 
       activate_user: å¯ç¨è¯¥ç¨æ·
       add as friend: æ·»å æå
-      ago: (%{time_in_words_ago}ä¹å)
+      ago: ï¼%{time_in_words_ago}åï¼
       block_history: æ¥åçå°ç¦
       blocks by me: è¢«æå°ç¦
       blocks on me: æçå°ç¦
@@ -1827,12 +1830,12 @@ zh-CN:
       km away: "%{count}åç±³è¿"
       latest edit: "%{ago}çæåç¼è¾ï¼"
       m away: "%{count}ç±³è¿"
-      mapper since: ç»å¶å°å¾å§äºï¼
+      mapper since: ç»å¾å§äºï¼
       moderator_history: æ§è¡å°ç¦è
       my comments: æçè¯è®º
       my diary: æçæ¥è®°
       my edits: æçç¼è¾
-      my messages: æçæ¶æ¯
+      my messages: æçä¿¡æ¯
       my notes: æçæ³¨é
       my profile: æçèµæ
       my settings: æçè®¾ç½®
-- 
2.43.2

