X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/19d62168607b8a355156b2c2e089b615ab4c9381..84681ff8683bb7c8f410b2dc13ca5b8695e413a4:/config/locales/kk-cyrl.yml

diff --git a/config/locales/kk-cyrl.yml b/config/locales/kk-cyrl.yml
index 900fb3328..54c620e84 100644
--- a/config/locales/kk-cyrl.yml
+++ b/config/locales/kk-cyrl.yml
@@ -1,96 +1,178 @@
 # Messages for Kazakh (Cyrillic script) (ÒÐ°Ð·Ð°ÒÑÐ° (ÐºÐ¸ÑÐ¸Ð»))
 # Exported from translatewiki.net
 # Export driver: phpyaml
+# Author: Amankel'dy
 # Author: Fontan 030
 ---
 kk-cyrl:
+  time:
+    formats:
+      friendly: '%e %B %Y ÑÐ°ÒÐ°Ñ %H:%M'
   helpers:
     file:
       prompt: Ð¤Ð°Ð¹Ð»Ð´Ñ ÑÐ°Ò£Ð´Ð°Ò£ÑÐ·
     submit:
       diary_comment:
-        create: Ð¡Ð°ÒÑÐ°Ñ
+        create: ÐÑÐºÑÑ Ð¶Ð°Ð·Ñ
       diary_entry:
         create: ÐÐ°ÑÐ¸ÑÐ»Ð°Ñ
         update: ÐÐ°Ò£Ð°ÑÑÑ
       issue_comment:
-        create: ÐÑÐºÑÑ ÒÐ°Ð»Ð´ÑÑÑ
+        create: ÐÑÐºÑÑ ÒÐ¾ÑÑ
       message:
         create: ÐÑÐ±ÐµÑÑ
       client_application:
         create: Ð¢ÑÑÐºÐµÐ»Ñ
         update: ÐÐ°Ò£Ð°ÑÑÑ
-      doorkeeper_application:
+      oauth2_application:
         create: Ð¢ÑÑÐºÐµÐ»Ñ
         update: ÐÐ°Ò£Ð°ÑÑÑ
+      redaction:
+        create: Ð¢Ò¯Ð·ÐµÑÑÐ´Ñ Ð¶Ð°ÑÐ°Ñ
+        update: Ð¢Ò¯Ð·ÐµÑÑÐ´Ñ ÑÐ°ÒÑÐ°Ñ
       trace:
         create: ÐÒ¯ÐºÑÐµÑ
         update: Ó¨Ð·Ð³ÐµÑÑÑÑÐµÑÐ´Ñ ÑÐ°ÒÑÐ°Ñ
+      user_block:
+        create: ÐÒ±ÒÐ°ÑÑÐ°ÑÐ´Ñ Ð¶Ð°ÑÐ°Ñ
+        update: ÐÒ±ÒÐ°ÑÑÐ°ÑÐ´Ñ Ð¶Ð°Ò£Ð°ÑÑÑ
   activerecord:
-    errors:
-      messages:
-        invalid_email_address: Ð¶Ð°ÑÐ°Ð¼Ð´Ñ Ðµ-Ð¿Ð¾ÑÑÐ° Ð¼ÐµÐºÐµÐ½Ð¶Ð°Ð¹ÑÐ½Ð° Ò±ÒÑÐ°Ð¼Ð°Ð¹Ð´Ñ
     models:
+      acl: ÒÐ¾Ð»Ð¶ÐµÑÑÐ¼Ð´ÑÐ»ÑÐºÑÑ Ð±Ð°ÒÑÐ»Ð°Ñ ÑÑÐ·ÑÐ¼Ñ
+      changeset: Ó¨Ò£Ð´ÐµÐ¼Ðµ Ð´ÐµÑÑÐµÑÑ
+      changeset_tag: Ó¨Ò£Ð´ÐµÐ¼ÐµÐ»ÐµÑ Ð´ÐµÑÑÐµÑÑÐ½ÑÒ£ ÑÐµÐ³Ñ
       country: ÐÐ»
+      diary_comment: ÐÒ¯Ð½Ð´ÐµÐ»ÑÐºÑÐµÐ³Ñ Ð¿ÑÐºÑÑ
       diary_entry: ÐÒ¯Ð½Ð´ÐµÐ»ÑÐº Ð¶Ð°Ð·Ð±Ð°ÑÑ
       friend: ÐÐ¾Ñ
+      issue: ÐÓÑÐµÐ»Ðµ
       language: Ð¢ÑÐ»
       message: Ð¥Ð°Ð±Ð°ÑÐ»Ð°Ð¼Ð°
+      node: ÐÒ¯ÐºÑÐµ
+      node_tag: ÐÒ¯ÐºÑÐµ ÑÐµÐ³Ñ
+      old_node: ÐÑÐºÑ Ð½Ò¯ÐºÑÐµ
+      old_node_tag: ÐÒ¯ÐºÑÐµÐ½ÑÒ£ ÐµÑÐºÑ ÑÐµÐ³Ñ
+      old_relation: ÐÑÐºÑ ÒÐ°ÑÑÐ½Ð°Ñ
+      old_relation_member: ÐÑÐºÑ ÒÐ°ÑÑÐ½Ð°ÑÑÑÒ£ Ð½ÑÑÐ°Ð½Ñ
+      old_relation_tag: ÒÐ°ÑÑÐ½Ð°ÑÑÑÒ£ ÐµÑÐºÑ ÑÐµÐ³Ñ
+      old_way: ÐÑÐºÑ ÑÑÐ·ÑÒ
+      old_way_node: ÐÑÐºÑ ÑÑÐ·ÑÒÑÑÒ£ Ð½Ò¯ÐºÑÐµÑÑ
+      old_way_tag: ÐÐ¾Ð»Ð´ÑÒ£ ÐµÑÐºÑ ÑÐµÐ³Ñ
+      relation: ÒÐ°ÑÑÐ½Ð°Ñ
+      relation_member: ÒÐ°ÑÑÐ½Ð°ÑÑÑÒ£ Ð½ÑÑÐ°Ð½Ñ
+      relation_tag: ÒÐ°ÑÑÐ½Ð°Ñ ÑÐµÐ³Ñ
+      report: Ð¨Ð°ÒÑÐ½Ñ
+      session: Ð¡ÐµÑÑÐ¸Ñ
+      trace: ÐÐ°ÒÐ´Ð°Ñ
+      tracepoint: ÐÐ°ÒÐ´Ð°Ñ Ð½Ò¯ÐºÑÐµÑÑ
+      tracetag: ÐÐ°ÒÐ´Ð°Ñ ÑÐµÐ³Ñ
       user: ÒÐ¾Ð»Ð´Ð°Ð½ÑÑÑ
+      user_preference: ÒÐ¾Ð»Ð´Ð°Ð½ÑÑÑ ÑÐµÒ£ÑÐµÑÐ»ÐµÑÑ
+      user_token: ÒÐ¾Ð»Ð´Ð°Ð½ÑÑÑ ÑÐ¾ÐºÐµÐ½Ñ
+      way: Ð¡ÑÐ·ÑÒ
+      way_node: Ð¡ÑÐ·ÑÒÑÑÒ£ Ð½Ò¯ÐºÑÐµÑÑ
+      way_tag: Ð¡ÑÐ·ÑÒ ÑÐµÐ³Ñ
     attributes:
+      client_application:
+        name: ÐÑÑ (Ð¼ÑÐ½Ð´ÐµÑÑÑ)
+        url: ÐÐµÐ³ÑÐ·Ð³Ñ ÒÐ¾Ð»Ð´Ð°Ð½Ð±Ð° URL (Ð¼ÑÐ½Ð´ÐµÑÑÑ)
+        callback_url: ÐÐµÑÑ ÑÐ°Ð»Ñ URL
+        support_url: ÒÐ¾Ð»Ð´Ð°Ñ URL
+        allow_read_prefs: ÒÐ¾Ð»Ð´Ð°Ð½ÑÑÑ ÑÐµÒ£ÑÐµÑÐ»ÐµÑÑÐ½ Ð¾ÒÑ
+        allow_write_prefs: ÒÐ¾Ð»Ð´Ð°Ð½ÑÑÑ ÑÐµÒ£ÑÐµÑÐ»ÐµÑÑÐ½ Ó©Ð·Ð³ÐµÑÑÑ
+        allow_write_diary: ÐºÒ¯Ð½Ð´ÐµÐ»ÑÐº Ð¶Ð°Ð·Ð±Ð°Ð»Ð°ÑÑ Ð¼ÐµÐ½ Ð¿ÑÐºÑÑ Ð¶Ð°Ð·Ñ, Ð´Ð¾ÑÑÐ°ÑÑ
+        allow_write_api: ÐºÐ°ÑÑÐ°Ð½Ñ Ó©Ð·Ð³ÐµÑÑÑ
+        allow_read_gpx: Ð¶ÐµÐºÐµ GPS Ð±Ð°ÒÐ´Ð°ÑÐ»Ð°ÑÑÐ½ Ð¾ÒÑ
+        allow_write_gpx: GPS Ð±Ð°ÒÐ´Ð°Ñ Ð¶Ò¯ÐºÑÐµÐ¿ ÑÐ°Ð»Ñ
+        allow_write_notes: Ð¶Ð°Ð·Ð±Ð°Ð»Ð°ÑÐ´Ñ Ó©Ð·Ð³ÐµÑÑÑ
       diary_comment:
         body: ÐÓÑÑÐ½
       diary_entry:
         user: ÒÐ¾Ð»Ð´Ð°Ð½ÑÑÑ
         title: Ð¢Ð°ÒÑÑÑÐ¿
-        language: Ð¢ÑÐ»
+        body: ÐÓÑÑÐ½
+        latitude: ÐÐ½Ð´ÑÐº
+        longitude: ÐÐ¾Ð¹Ð»ÑÒ
+        language_code: Ð¢ÑÐ»
+      doorkeeper/application:
+        name: ÐÑÐ°Ñ
+        redirect_uri: Ó¨Ð·Ð³ÐµÑÑÑÐ»Ð³ÐµÐ½ URI
+        confidential: ÒÒ±Ð¿Ð¸Ñ ÒÐ¾Ð»Ð´Ð°Ð½Ð±Ð° Ð¼Ð°?
+        scopes: Ð Ò±ÒÑÐ°ÑÑÐ°Ñ
       friend:
         user: ÒÐ¾Ð»Ð´Ð°Ð½ÑÑÑ
         friend: ÐÐ¾Ñ
       trace:
         user: ÒÐ¾Ð»Ð´Ð°Ð½ÑÑÑ
+        visible: ÐÓ©ÑÑÐ½ÑÑÐ½
         name: Ð¤Ð°Ð¹Ð» Ð°ÑÐ°ÑÑ
+        size: Ó¨Ð»ÑÐµÐ¼
+        latitude: ÐÐ½Ð´ÑÐº
+        longitude: ÐÐ¾Ð¹Ð»ÑÒ
+        public: ÐÐ°ÑÐ¸Ñ
         description: Ð¡Ð¸Ð¿Ð°ÑÑÐ°Ð¼Ð°
+        gpx_file: GPX ÑÐ°Ð¹Ð» Ð¶Ò¯ÐºÑÐµÐ¿ ÑÐ°Ð»Ñ
+        visibility: ÐÓ©ÑÑÐ½ÑÑ
         tagstring: Ð¢ÐµÐ³ÑÐµÑ
       message:
         sender: ÐÑÐ±ÐµÑÑÑÑ
         title: Ð¢Ð°ÒÑÑÑÐ¿
         body: ÐÓÑÑÐ½
         recipient: ÐÐ»ÑÑÑ
+      redaction:
+        title: ÐÑÐ°Ñ
+        description: Ð¡Ð¸Ð¿Ð°ÑÑÐ°Ð¼Ð°
+      report:
+        category: ÐÐµ Ò¯ÑÑÐ½ ÑÐ°ÒÑÐ½ÑÐ¿ Ð¾ÑÑÑÑÑÐ·?
+        details: ÐÓÑÐµÐ»ÐµÐ½Ñ ÑÐ°ÑÒÐ°ÑÑÐ¿ ÑÒ¯ÑÑÐ½Ð´ÑÑÑÐ¿ Ð±ÐµÑÑÒ£ÑÐ·ÑÑ (Ð¼ÑÐ½Ð´ÐµÑÑÑ).
       user:
+        auth_provider: ÐÑÑÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¸Ñ Ð¿ÑÐ¾Ð²Ð°Ð¹Ð´ÐµÑÑ
+        auth_uid: ÐÑÑÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¸Ñ UID
         email: Ð-Ð¿Ð¾ÑÑÐ°
         new_email: ÐÐ°Ò£Ð° Ðµ-Ð¿Ð¾ÑÑÐ° Ð¼ÐµÐºÐµÐ½Ð¶Ð°Ð¹Ñ
         active: ÐÐµÐ»ÑÐµÐ½Ð´Ñ
+        display_name: ÐÓ©ÑÑÐµÑÑÐ»ÐµÑÑÐ½ Ð°Ñ
         description: ÐÐµÐ¹ÑÐ½ ÑÐ¸Ð¿Ð°ÑÑÐ°Ð¼Ð°ÑÑ
+        home_lat: ÐÐ½Ð´ÑÐº
+        home_lon: ÐÐ¾Ð¹Ð»ÑÒ
         languages: ÒÐ¾Ð»Ð°Ð¹Ð»Ñ ÑÑÐ»Ð´ÐµÑ
         preferred_editor: ÒÐ¾Ð»Ð°Ð¹Ð»Ñ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ
-        pass_crypt: ÒÒ±Ð¿Ð¸Ñ ÑÓ©Ð·
+        pass_crypt: ÒÒ±Ð¿Ð¸ÑÑÓ©Ð·
+        pass_crypt_confirmation: ÒÒ±Ð¿Ð¸ÑÑÓ©Ð·Ð´Ñ ÑÐ°ÑÑÐ°Ñ
+    help:
+      trace:
+        tagstring: Ò¯ÑÑÑÐ¼ÐµÐ½ Ð±Ó©Ð»ÑÐ½Ð³ÐµÐ½
+      user:
+        new_email: (ÐµÑ Ð¶ÐµÑÐ´Ðµ Ð¶Ð°ÑÐ¸ÑÐ»Ð°Ð½Ð±Ð°Ð¹Ð´Ñ)
   datetime:
     distance_in_words_ago:
       about_x_hours:
-        one: ÑÐ°Ð¼Ð°Ð¼ÐµÐ½ 1 ÑÐ°ÒÐ°Ñ Ð±Ò±ÑÑÐ½
+        one: ÑÐ°Ð¼Ð°Ð¼ÐµÐ½ %{count} ÑÐ°ÒÐ°Ñ Ð±Ò±ÑÑÐ½
         other: ÑÐ°Ð¼Ð°Ð¼ÐµÐ½ %{count} ÑÐ°ÒÐ°Ñ Ð±Ò±ÑÑÐ½
       about_x_months:
-        one: ÑÐ°Ð¼Ð°Ð¼ÐµÐ½ 1 Ð°Ð¹ Ð±Ò±ÑÑÐ½
+        one: ÑÐ°Ð¼Ð°Ð¼ÐµÐ½ %{count} Ð°Ð¹ Ð±Ò±ÑÑÐ½
         other: ÑÐ°Ð¼Ð°Ð¼ÐµÐ½ %{count} Ð°Ð¹ Ð±Ò±ÑÑÐ½
       about_x_years:
-        one: ÑÐ°Ð¼Ð°Ð¼ÐµÐ½ 1 Ð¶ÑÐ» Ð±Ò±ÑÑÐ½
+        one: ÑÐ°Ð¼Ð°Ð¼ÐµÐ½ %{count} Ð¶ÑÐ» Ð±Ò±ÑÑÐ½
         other: ÑÐ°Ð¼Ð°Ð¼ÐµÐ½ %{count} Ð¶ÑÐ» Ð±Ò±ÑÑÐ½
+      almost_x_years:
+        one: '%{count} Ð¶ÑÐ» Ð±Ò±ÑÑÐ½ Ð´ÐµÑÐ»ÑÐº'
+        other: '%{count} Ð¶ÑÐ» Ð±Ò±ÑÑÐ½ Ð´ÐµÑÐ»ÑÐº'
       half_a_minute: Ð¶Ð°ÑÑÑ Ð¼Ð¸Ð½ÑÑ Ð±Ò±ÑÑÐ½
       x_seconds:
-        one: 1 ÑÐµÐºÑÐ½Ð´ Ð±Ò±ÑÑÐ½
+        one: '%{count} ÑÐµÐºÑÐ½Ð´ Ð±Ò±ÑÑÐ½'
         other: '%{count} ÑÐµÐºÑÐ½Ð´ Ð±Ò±ÑÑÐ½'
       x_minutes:
-        one: 1 Ð¼Ð¸Ð½ÑÑ Ð±Ò±ÑÑÐ½
+        one: '%{count} Ð¼Ð¸Ð½ÑÑ Ð±Ò±ÑÑÐ½'
         other: '%{count} Ð¼Ð¸Ð½ÑÑ Ð±Ò±ÑÑÐ½'
       x_days:
-        one: 1 ÐºÒ¯Ð½ Ð±Ò±ÑÑÐ½
+        one: '%{count} ÐºÒ¯Ð½ Ð±Ò±ÑÑÐ½'
         other: '%{count} ÐºÒ¯Ð½ Ð±Ò±ÑÑÐ½'
       x_months:
-        one: 1 Ð°Ð¹ Ð±Ò±ÑÑÐ½
+        one: '%{count} Ð°Ð¹ Ð±Ò±ÑÑÐ½'
         other: '%{count} Ð°Ð¹ Ð±Ò±ÑÑÐ½'
       x_years:
-        one: 1 Ð¶ÑÐ» Ð±Ò±ÑÑÐ½
+        one: '%{count} Ð¶ÑÐ» Ð±Ò±ÑÑÐ½'
         other: '%{count} Ð¶ÑÐ» Ð±Ò±ÑÑÐ½'
   editor:
     default: ÓÐ´ÐµÐ¿ÐºÑ (ÒÐ°Ð·ÑÑÐ³Ñ ÑÐ°ÒÑÑÑÐ° %{name})
@@ -102,10 +184,9 @@ kk-cyrl:
       description: ÒÐ°ÑÑÒÑÐ°Ð½ Ð±Ð°ÑÒÐ°ÑÑ (JOSM, Potlatch, Merkaartor)
   auth:
     providers:
-      openid: OpenID
+      none: ÐÐ¾Ò
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Ð£Ð¸ÐºÐ¸Ð¿ÐµÐ´Ð¸Ñ
   api:
@@ -115,11 +196,16 @@ kk-cyrl:
         opened_at_by_html: '%{when} %{user} Ð¶Ð°ÑÐ°ÒÐ°Ð½'
         commented_at_html: '%{when} Ð¶Ð°Ò£Ð°ÑÑÑÐ»ÒÐ°Ð½'
         commented_at_by_html: '%{when} %{user} Ð¶Ð°Ò£Ð°ÑÑÒÐ°Ð½'
+      rss:
+        title: OpenStreetMap ÐµÑÐºÐµÑÑÐ¿ÐµÐ»ÐµÑÑ
       entry:
         comment: ÐÑÐºÑÑ
   account:
     deletions:
       show:
+        title: Ð¢ÑÑÐºÐµÐ»Ð³ÑÐ¼Ð´Ñ Ð¶Ð¾Ñ
+        delete_account: Ð¢ÑÑÐºÐµÐ»Ð³ÑÐ½Ñ Ð¶Ð¾Ñ
+        confirm_delete: Ð¡ÐµÐ½ÑÐ¼Ð´ÑÑÑÐ· Ð±Ðµ?
         cancel: ÐÐ¾Ð»Ð´ÑÑÐ¼Ð°Ñ
   accounts:
     edit:
@@ -128,70 +214,158 @@ kk-cyrl:
       openid:
         link text: Ð±Ò±Ð» Ð½Ðµ?
       public editing:
+        heading: ÐÐ°ÑÐ¸Ñ Ó©Ò£Ð´ÐµÑ
         enabled link text: Ð±Ò±Ð» Ð½Ðµ?
         disabled link text: ÐÐµÐ³Ðµ Ó©Ð·Ð³ÐµÑÑÑÑÐµÑ ÐµÐ½Ð³ÑÐ·Ðµ Ð°Ð»Ð¼Ð°Ð¹Ð¼ÑÐ½?
       contributor terms:
+        heading: ÐÐ¾Ð±Ð°ÒÐ° ÒÐ°ÑÑÑÑ ÑÐ°ÑÑÑÐ°ÑÑ
         link text: Ð±Ò±Ð» Ð½Ðµ?
       save changes button: Ó¨Ð·Ð³ÐµÑÑÑÑÐµÑÐ´Ñ ÑÐ°ÒÑÐ°Ñ
+      delete_account: Ð¢ÑÑÐºÐµÐ»Ð³ÑÐ½Ñ Ð¶Ð¾Ñ...
+    go_public:
+      heading: ÐÐ°ÑÐ¸Ñ Ó©Ò£Ð´ÐµÑ
+      only_public_can_edit: API 0.6 Ð½Ò±ÑÒÐ°ÑÑÐ½Ð° Ð¶Ð°Ò£Ð°ÑÒÐ°Ð½Ð½Ð°Ð½ Ð±ÐµÑÑ, Ð¶Ð°ÑÐ¸Ñ ÒÐ¾Ð»Ð´Ð°Ð½ÑÑÑÐ»Ð°Ñ
+        ÒÐ°Ð½Ð° ÐºÐ°ÑÑÐ° Ð´ÐµÑÐµÐ³ÑÐ½ Ó©Ð·Ð³ÐµÑÑÐµ Ð°Ð»Ð°Ð´Ñ.
+      find_out_why: Ð½ÐµÐ³Ðµ ÐµÐºÐµÐ½ÑÐ½ Ð±ÑÐ»Ñ
+      email_not_revealed: Ð¢ÑÑÐºÐµÐ»Ð³ÑÒ£ÑÐ· Ð¶Ð°ÑÐ¸Ñ Ð±Ð¾Ð¿ ÐºÐµÑÐºÐµÐ½Ð½ÐµÐ½ ÐºÐµÐ¹ÑÐ½, Ð±Ð°ÑÒÐ°Ð»Ð°Ñ Ð±Ò±ÑÑÐ½ÒÑÑÐ°
+        ÑÐ». Ð¿Ð¾ÑÑÐ°Ò£ÑÐ·Ð´Ñ ÐºÓ©ÑÐµ Ð°Ð»Ð¼Ð°Ð¹Ð´Ñ.
+      not_reversible: ÐÒ±Ð» ÒÐ°Ð¹ÑÑÐ¼ÑÑÐ· ÓÑÐµÐºÐµÑ. ÐÐ°ÑÐ»ÑÒ Ð¶Ð°Ò£Ð° ÒÐ¾Ð»Ð´Ð°Ð½ÑÑÑ Ð¶Ð°ÑÐ¸Ñ Ð±Ð¾Ð»ÑÐ¿ ÑÑÑÐºÐµÐ»ÐµÐ´Ñ.
+      make_edits_public_button: ÐÐ°ÑÐ»ÑÒ Ó©Ò£Ð´ÐµÐ¼ÐµÐ»ÐµÑÑÐ¼Ð´Ñ Ð¶Ð°ÑÐ¸Ñ ÐµÑÑ
+    destroy:
+      success: Ð¢ÑÑÐºÐµÐ»Ð³Ñ Ð¶Ð¾Ð¹ÑÐ»Ð´Ñ.
   browse:
-    created_html: <abbr title='%{title}'>%{time}</abbr> Ð¶Ð°ÑÐ°Ð»ÒÐ°Ð½
-    closed_html: <abbr title='%{title}'>%{time}</abbr> Ð¶Ð°Ð±ÑÐ»ÒÐ°Ð½
-    created_by_html: <abbr title='%{title}'>%{time}</abbr> %{user} Ð¶Ð°ÑÐ°ÒÐ°Ð½
-    edited_by_html: <abbr title='%{title}'>%{time}</abbr> %{user} Ó©Ò£Ð´ÐµÐ³ÐµÐ½
-    closed_by_html: <abbr title='%{title}'>%{time}</abbr> %{user} Ð¶Ð°Ð¿ÒÐ°Ð½
     version: ÐÒ±ÑÒÐ°
+    in_changeset: Ó¨Ò£Ð´ÐµÐ¼Ðµ Ð´ÐµÑÑÐµÑÑ
+    anonymous: Ð°Ð½Ð¾Ð½Ð¸Ð¼
+    no_comment: (Ð¿ÑÐºÑÑ Ð¶Ð¾Ò)
+    part_of_relations:
+      one: '%{count} ÒÐ°ÑÑÐ½Ð°Ñ'
+      other: '%{count} ÒÐ°ÑÑÐ½Ð°Ñ'
+    part_of_ways:
+      one: '%{count} ÑÑÐ·ÑÒ'
+      other: '%{count} ÑÑÐ·ÑÒ'
     download_xml: XML Ð¶Ò¯ÐºÑÐµÐ¿ Ð°Ð»Ñ
-    location: 'ÐÐµÐ¾Ð³ÑÐ°ÑÐ¸ÑÐ»ÑÒ Ð¾ÑÐ½Ñ:'
-    changeset:
-      comment: ÐÑÐºÑÑÐ»ÐµÑ (%{count})
-      osmchangexml: osmChange XML
-      discussion: Ð¢Ð°Ð»ÒÑÐ»Ð°Ñ
+    view_history: Ð¢Ð°ÑÐ¸ÑÑÐ½ ÐºÓ©ÑÑ
+    view_details: ÐÐ³Ð¶ÐµÐ¹-ÑÐµÐ³Ð¶ÐµÐ¹ÑÐ½ ÐºÓ©ÑÑ
+    location: 'ÐÑÐ½Ð°Ð»Ð°ÑÑÑ:'
+    node:
+      title_html: 'ÐÒ¯ÐºÑÐµ: %{name}'
+      history_title_html: 'ÐÒ¯ÐºÑÐµ ÑÐ°ÑÐ¸ÑÑ: %{name}'
+    way:
+      title_html: 'Ð¡ÑÐ·ÑÒ: %{name}'
+      history_title_html: 'Ð¡ÑÐ·ÑÒ ÑÐ°ÑÐ¸ÑÑ: %{name}'
+      nodes: ÐÒ¯ÐºÑÐµÐ»ÐµÑ
+      nodes_count:
+        one: '%{count} Ð½Ò¯ÐºÑÐµ'
+        other: '%{count} Ð½Ò¯ÐºÑÐµ'
+    relation:
+      title_html: 'ÒÐ°ÑÑÐ½Ð°Ñ: %{name}'
+      history_title_html: 'ÒÐ°ÑÑÐ½Ð°Ñ ÑÐ°ÑÐ¸ÑÑ: %{name}'
+    relation_member:
+      type:
+        node: ÐÒ¯ÐºÑÐµ
+        way: Ð¡ÑÐ·ÑÒ
+        relation: ÒÐ°ÑÑÐ½Ð°Ñ
+    containing_relation:
+      entry_html: ÒÐ°ÑÑÐ½Ð°Ñ %{relation_name}
     not_found:
       title: Ð¢Ð°Ð±ÑÐ»Ð¼Ð°Ð´Ñ
       type:
         node: Ð½Ò¯ÐºÑÐµ
+        way: ÑÑÐ·ÑÒ
+        relation: ÒÐ°ÑÑÐ½Ð°Ñ
+        changeset: Ó©Ò£Ð´ÐµÐ¼Ðµ Ð´ÐµÑÑÐµÑÑ
+        note: ÐµÑÐºÐµÑÑÐ¿Ðµ
+    timeout:
+      type:
+        node: Ð½Ò¯ÐºÑÐµ
+        way: ÑÑÐ·ÑÒ
+        relation: ÒÐ°ÑÑÐ½Ð°Ñ
+        changeset: Ó©Ò£Ð´ÐµÐ¼Ðµ Ð´ÐµÑÑÐµÑÑ
+        note: ÐµÑÐºÐµÑÑÐ¿Ðµ
+    redacted:
+      redaction: Ð¢Ò¯Ð·ÐµÑÑ %{id}
+      message_html: ÐÒ±Ð» Ð½ÑÑÐ°Ð½Ð½ÑÒ£ (%{type}) %{version} Ð½Ò±ÑÒÐ°ÑÑ Ð¶Ð°ÑÑÑÑÐ»Ð´Ñ, ÑÐ¾Ð½Ð´ÑÒÑÐ°Ð½
+        Ð¾Ð½Ñ ÐºÓ©ÑÐµ Ð°Ð»Ð¼Ð°Ð¹ÑÑÐ·. ÐÓ©Ð±ÑÑÐµÐº Ð±ÑÐ»Ñ Ò¯ÑÑÐ½ %{redaction_link} ÐºÓ©ÑÑÒ£ÑÐ·.
+      type:
+        node: Ð½Ò¯ÐºÑÐµ
+        way: ÑÑÐ·ÑÒ
+        relation: ÒÐ°ÑÑÐ½Ð°Ñ
     start_rjs:
+      feature_warning: '%{num_features} Ð½ÑÑÐ°Ð½Ð´Ñ Ð¶Ò¯ÐºÑÐµÐ¿ Ð°Ð»ÒÐ°Ð½Ð½Ð°Ð½ ÐºÐµÐ¹ÑÐ½, Ð±ÑÐ°ÑÐ·ÐµÑÑÒ£ÑÐ·
+        Ð±Ð°ÑÑÐ»Ð°Ð¿ ÐºÐµÑÑÑ Ð¼Ò¯Ð¼ÐºÑÐ½. ÐÑÑÐ½ÑÐ° ÐºÓ©Ð¿ Ð´ÐµÑÐµÐºÑÑ ÑÑÐ½ÑÐ¼ÐµÐ½ ÐºÓ©ÑÑÐµÑÑ ÐºÐµÑÐµÐº Ð¿Ðµ?'
+      load_data: ÐÐµÑÐµÐº Ð¶Ò¯ÐºÑÐµÑ
       loading: ÐÒ¯ÐºÑÐµÐ»ÑÐ´Ðµâ¦
     tag_details:
       tags: Ð¢ÐµÐ³ÑÐµÑ
       wikidata_link: Ð£Ð¸ÐºÐ¸Ð´ÐµÑÐµÐºÑÐµÐ³Ñ %{page} Ð´Ð°Ð½Ð°ÑÑ
       wikipedia_link: Ð£Ð¸ÐºÐ¸Ð¿ÐµÐ´Ð¸ÑÐ´Ð°ÒÑ %{page} Ð¼Ð°ÒÐ°Ð»Ð°ÑÑ
       wikimedia_commons_link: ÐÑÑÐ°ÒÒÐ¾ÑÐ´Ð°ÒÑ %{page} Ð´Ð°Ð½Ð°ÑÑ
-    note:
-      description: Ð¡Ð¸Ð¿Ð°ÑÑÐ°Ð¼Ð°
-      opened_by_html: <abbr title='%{exact_time}'>%{when}</abbr> %{user} Ð¶Ð°ÑÐ°ÒÐ°Ð½
+      telephone_link: '%{phone_number} ÒÐ¾Ò£ÑÑÐ°Ñ ÑÐ°Ð»Ñ'
+      colour_preview: '%{colour_value} ÑÒ¯ÑÑÐ½ ÐºÓ©ÑÑ'
+      email_link: '%{email} ÑÐ°Ñ Ð¶ÑÐ±ÐµÑÑ'
+    query:
+      title: ÐÐ°Ò£Ð°Ð¹Ð´Ð°ÒÑ Ð½ÑÑÐ°Ð½Ð´Ð°Ñ
+      nearby: ÐÐ°Ò£Ð°Ð¹Ð´Ð°ÒÑ Ð½ÑÑÐ°Ð½Ð´Ð°Ñ
+  changeset_comments:
+    feeds:
+      comment:
+        commented_at_by_html: '%{when} %{user} Ð¶Ð°Ò£Ð°ÑÑÒÐ°Ð½'
   changesets:
-    changeset_paging_nav:
-      showing_page: '%{page}-Ð±ÐµÑÑ'
-      next: ÐÐµÐ»ÐµÑÑ Â»
-      previous: Â« ÐÐ»Ð´ÑÒ£ÒÑ
     changeset:
-      anonymous: ÐÐ½Ð¾Ð½Ð¸Ð¼
       no_edits: (Ó©Ò£Ð´ÐµÐ¼ÐµÐ»ÐµÑ Ð¶Ð¾Ò)
-    changesets:
-      id: ID
-      user: ÒÐ¾Ð»Ð´Ð°Ð½ÑÑÑ
+      view_changeset_details: Ó¨Ò£Ð´ÐµÐ¼Ðµ Ð´ÐµÑÑÐµÑÑÐ½ÑÒ£ ÐµÐ³Ð¶ÐµÐ¹-ÑÐµÐ³Ð¶ÐµÐ¹ÑÐ½ ÐºÓ©ÑÑ
     index:
+      title: Ó¨Ò£Ð´ÐµÐ¼Ðµ Ð´ÐµÑÑÐµÐ»ÐµÑÑ
+      title_user: '%{user} Ð¶Ð°ÑÐ°ÒÐ°Ð½ Ó©Ò£Ð´ÐµÐ¼ÐµÐ»ÐµÑ Ð´ÐµÑÑÐµÐ»ÐµÑÑ'
+      title_user_link_html: '%{user_link} Ð¶Ð°ÑÐ°ÒÐ°Ð½ Ó©Ò£Ð´ÐµÐ¼Ðµ Ð´ÐµÑÑÐµÐ»ÐµÑÑ'
+      title_friend: ÐÐ¾ÑÑÐ°ÑÑÐ¼Ð½ÑÒ£ Ó©Ò£Ð´ÐµÐ¼ÐµÐ»ÐµÑ Ð´ÐµÑÑÐµÐ»ÐµÑÑ
       load_more: ÐÓ©Ð±ÑÑÐµÐº Ð¶Ò¯ÐºÑÐµÑ
+      feed:
+        title: Ó¨Ò£Ð´ÐµÐ¼Ðµ Ð´ÐµÑÑÐµÑÑ %{id}
+        closed: ÐÐ°Ð±ÑÒ
+        belongs_to: ÐÐ²ÑÐ¾Ñ
+    heading:
+      title: Ó¨Ò£Ð´ÐµÐ¼Ðµ Ð´ÐµÑÑÐµÑÑ %{id}
+    show:
+      title: 'Ó¨Ò£Ð´ÐµÐ¼Ðµ Ð´ÐµÑÑÐµÑÑ: %{id}'
+      discussion: Ð¢Ð°Ð»ÒÑÐ»Ð°Ñ
+      subscribe: ÐÐ°Ð·ÑÐ»Ñ
+      hide_comment: Ð¶Ð°ÑÑÑÑ
+      unhide_comment: ÐºÓ©ÑÑÐµÑÑ
+      changesetxml: Ó¨Ò£Ð´ÐµÐ¼Ðµ Ð´ÐµÑÑÐµÑÑÐ½ÑÒ£ XML-Ñ
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: ÐÒ¯ÐºÑÐµÐ»ÐµÑ (%{count})
+      ways: Ð¡ÑÐ·ÑÒÑÐ°Ñ (%{count})
+      relations: ÒÐ°ÑÑÐ½Ð°ÑÑÐ°Ñ (%{count})
   dashboards:
+    contact:
+      km away: ÐÒ±Ð´Ð°Ð½ %{count} ÐºÐ¼ Ð¶ÐµÑÐ´Ðµ
+      m away: ÐÒ±Ð´Ð°Ð½ %{count} Ð¼ Ð¶ÐµÑÐ´Ðµ
     popup:
+      your location: ÐÑÐ½Ð°Ð»Ð°ÑÒÐ°Ð½ Ð¶ÐµÑÑÒ£ÑÐ·
       friend: ÐÐ¾Ñ
     show:
+      title: ÐÒÐ¿Ð°ÑÐ°Ñ Ð¿Ð°Ð½ÐµÐ»ÑÐ¼
       my friends: ÐÐ¾ÑÑÐ°ÑÑÐ¼
+      friends_changesets: Ð´Ð¾ÑÑÐ°ÑÐ´ÑÒ£ Ó©Ò£Ð´ÐµÐ¼Ðµ Ð´ÐµÑÑÐµÐ»ÐµÑÑ
       friends_diaries: ÐÐ¾ÑÑÐ°ÑÐ´ÑÒ£ ÐºÒ¯Ð½Ð´ÐµÐ»ÑÐº Ð¶Ð°Ð·Ð±Ð°Ð»Ð°ÑÑ
   diary_entries:
     new:
       title: ÐÐ°Ò£Ð° ÐºÒ¯Ð½Ð´ÐµÐ»ÑÐº Ð¶Ð°Ð·Ð±Ð°ÑÑ
+    form:
+      location: ÐÑÐ½Ð°Ð»Ð°ÑÑÑ
     index:
       title: ÒÐ¾Ð»Ð´Ð°Ð½ÑÑÑÐ»Ð°ÑÐ´ÑÒ£ ÐºÒ¯Ð½Ð´ÐµÐ»ÑÐºÑÐµÑÑ
       title_friends: ÐÐ¾ÑÑÐ°ÑÐ´ÑÒ£ ÐºÒ¯Ð½Ð´ÐµÐ»ÑÐºÑÐµÑÑ
+      user_title: '%{user} ÐºÒ¯Ð½Ð´ÐµÐ»ÑÐ³Ñ'
       in_language_title: '%{language} ÑÑÐ»ÑÐ½Ð´ÐµÐ³Ñ ÐºÒ¯Ð½Ð´ÐµÐ»ÑÐº Ð¶Ð°Ð·Ð±Ð°Ð»Ð°ÑÑ'
       new: ÐÐ°Ò£Ð° ÐºÒ¯Ð½Ð´ÐµÐ»ÑÐº Ð¶Ð°Ð·Ð±Ð°ÑÑ
       my_diary: ÐÒ¯Ð½Ð´ÐµÐ»ÑÐ³ÑÐ¼
       no_entries: ÐÒ¯Ð½Ð´ÐµÐ»ÑÐºÑÐµ ÐµÑ Ð¶Ð°Ð·Ð±Ð° Ð¶Ð¾Ò
+    page:
       recent_entries: ÐÑÑÒÑÐ°ÒÑ ÐºÒ¯Ð½Ð´ÐµÐ»ÑÐº Ð¶Ð°Ð·Ð±Ð°Ð»Ð°ÑÑ
-      older_entries: ÐÑÐºÑÐ»ÐµÑ Ð¶Ð°Ð·Ð±Ð°Ð»Ð°Ñ
-      newer_entries: ÐÐ°Ò£Ð°Ð»Ð°Ñ Ð¶Ð°Ð·Ð±Ð°Ð»Ð°Ñ
     edit:
       title: ÐÒ¯Ð½Ð´ÐµÐ»ÑÐº Ð¶Ð°Ð·Ð±Ð°ÑÑÐ½ Ó©Ò£Ð´ÐµÑ
     show:
@@ -199,10 +373,11 @@ kk-cyrl:
       user_title: '%{user} ÐºÒ¯Ð½Ð´ÐµÐ»ÑÐ³Ñ'
       leave_a_comment: ÐÑÐºÑÑ ÒÐ°Ð»Ð´ÑÑÑ
       login_to_leave_a_comment_html: ÐÑÐºÑÑ ÒÐ°Ð»Ð´ÑÑÑ Ò¯ÑÑÐ½ %{login_link}
-      login: ÐºÑÑÑÒ£ÑÐ·
+      login: ÐÑÑÑ
     no_such_entry:
       title: ÐÒ¯Ð½Ð´ÐµÐ»ÑÐºÑÐµ Ð¼Ò±Ð½Ð´Ð°Ð¹ Ð¶Ð°Ð·Ð±Ð° Ð¶Ð¾Ò
     diary_entry:
+      edit_link: ÐÒ±Ð» Ð¶Ð°Ð·Ð±Ð°Ð½Ñ Ó©Ò£Ð´ÐµÑ
       hide_link: ÐÒ±Ð» Ð¶Ð°Ð·Ð±Ð°Ð½Ñ Ð¶Ð°ÑÑÑÑ
       unhide_link: ÐÒ±Ð» Ð¶Ð°Ð·Ð±Ð°Ð½Ñ ÐºÓ©ÑÑÐµÑÑ
       confirm: ÒÒ±Ð¿ÑÐ°Ñ
@@ -210,43 +385,62 @@ kk-cyrl:
       hide_link: ÐÒ±Ð» Ð¿ÑÐºÑÑÐ´Ñ Ð¶Ð°ÑÑÑÑ
       unhide_link: ÐÒ±Ð» Ð¿ÑÐºÑÑÐ´Ñ ÐºÓ©ÑÑÐµÑÑ
       confirm: ÒÒ±Ð¿ÑÐ°Ñ
-    location:
-      edit: Ó¨Ò£Ð´ÐµÑ
-    comments:
+    subscribe:
+      button: Ð¢Ð°Ð»ÒÑÒÐ° Ð¶Ð°Ð·ÑÐ»Ñ
+  diary_comments:
+    page:
       when: ÒÐ°ÑÐ°Ð½
       comment: ÐÑÐºÑÑ
-      newer_comments: ÐÐ°Ò£Ð°Ð»Ð°Ñ Ð¿ÑÐºÑÑÐ»ÐµÑ
-      older_comments: ÐÑÐºÑÐ»ÐµÑ Ð¿ÑÐºÑÑÐ»ÐµÑ
+  doorkeeper:
+    flash:
+      applications:
+        create:
+          notice: ÒÐ¾ÑÑÐ¼ÑÐ° ÑÑÑÐºÐµÐ»Ð³ÐµÐ½.
+    scopes:
+      address: ÐÑÐ½Ð°Ð»Ð°ÑÒÐ°Ð½ Ð¶ÐµÑÑÒ£ÑÐ·Ð´Ñ ÐºÓ©ÑÑ
+      email: Ð­Ð». Ð¿Ð¾ÑÑÐ°Ò£ÑÐ·Ð´Ñ ÐºÓ©ÑÑ
+      phone: Ð¢ÐµÐ»ÐµÑÐ¾Ð½ Ð½Ó©Ð¼ÑÑÑÒ£ÑÐ·Ð´Ñ ÐºÓ©ÑÑ
+  errors:
+    not_found:
+      title: Ð¤Ð°Ð¹Ð» ÑÐ°Ð±ÑÐ»Ð¼Ð°Ð´Ñ
+  friendships:
+    make_friend:
+      heading: '%{user} Ð´Ð¾ÑÑÐ°ÑÒÐ° ÒÐ¾ÑÑ ÐºÐµÑÐµÐº Ð¿Ðµ?'
+      button: ÐÐ¾ÑÑÐ°ÑÒÐ° ÒÐ¾ÑÑ
+    remove_friend:
+      heading: '%{user} Ð´Ð¾ÑÑÐ°ÑÐ´Ð°Ð½ Ð¶Ð¾Ñ ÐºÐµÑÐµÐº Ð¿Ðµ?'
+      button: ÐÐ¾ÑÑÐ°ÑÐ´Ð°Ð½ Ð¶Ð¾Ñ
+      success: '%{name} Ð´Ð¾ÑÑÐ°ÑÐ´Ð°Ð½ Ð¶Ð¾Ð¹ÑÐ»Ð´Ñ.'
+      not_a_friend: '%{name} Ð´Ð¾ÑÑÒ£ÑÐ· ÐµÐ¼ÐµÑ.'
   geocoder:
     search:
       title:
-        latlon_html: <a href="https://openstreetmap.org/">ÐÑÐºÑ Ð½ÓÑÐ¸Ð¶ÐµÐ»ÐµÑ</a>
-        ca_postcode_html: <a href="https://geocoder.ca/">Geocoder.CA</a> Ð½ÓÑÐ¸Ð¶ÐµÐ»ÐµÑÑ
-        osm_nominatim_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a> Ð½ÓÑÐ¸Ð¶ÐµÐ»ÐµÑÑ
-        geonames_html: <a href="http://www.geonames.org/">GeoNames</a> Ð½ÓÑÐ¸Ð¶ÐµÐ»ÐµÑÑ
-        osm_nominatim_reverse_html: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a> Ð½ÓÑÐ¸Ð¶ÐµÐ»ÐµÑÑ
-        geonames_reverse_html: <a href="http://www.geonames.org/">GeoNames</a> Ð½ÓÑÐ¸Ð¶ÐµÐ»ÐµÑÑ
+        latlon: ÐÒ¯Ð¹Ðµ
     search_osm_nominatim:
       prefix:
         aerialway:
+          cable_car: ÐÑÑ/ÐµÐºÑ Ð²Ð°Ð³Ð¾Ð½Ñ Ð±Ð°Ñ Ð°ÑÒÐ°Ð½ Ð¶Ð¾Ð»
+          gondola: ÐÓ©Ð¿ Ð²Ð°Ð³Ð¾Ð½Ñ Ð±Ð°Ñ Ð°ÑÒÐ°Ð½ Ð¶Ð¾Ð»
           pylon: Ð¢ÑÑÐµÐº
           "yes": ÐÑÒÐ°Ð½ Ð¶Ð¾Ð»
         aeroway:
           aerodrome: ÓÑÐµÐ°Ð¹Ð»Ð°Ò
           airstrip: ÐÐµÒ£ÑÐ» Ò±ÑÐ°ÒÒÐ° Ð°ÑÐ½Ð°Ð»ÒÐ°Ð½ Ò°ÒÐ
-          apron: ÐÐµÑÑÐ¾Ð½
+          apron: ÓÑÐµÐ¶Ð°Ð¹ Ð¿ÐµÑÑÐ¾Ð½Ñ
           hangar: ÐÐ½Ð³Ð°Ñ
           helipad: Ð¢ÑÐºÒ±ÑÐ°Ò Ð°Ð»Ð°Ò£Ñ
           runway: Ò°ÑÑ-ÒÐ¾Ð½Ñ Ð¶Ð¾Ð»Ð°ÒÑ
-          terminal: Ð¢ÐµÑÐ¼Ð¸Ð½Ð°Ð»
+          terminal: ÓÑÐµÐ¶Ð°Ð¹ ÑÐµÑÐ¼Ð¸Ð½Ð°Ð»Ñ
+          windsock: ÐÐµÐ»Ð±Ð°ÒÐ°Ñ
         amenity:
           arts_centre: Ó¨Ð½ÐµÑ Ð¾ÑÑÐ°Ð»ÑÒÑ
           atm: ÐÐ°Ð½ÐºÐ¾Ð¼Ð°Ñ
           bank: ÐÐ°Ð½Ðº
           bar: ÐÐ°Ñ
+          bench: ÐÑÑÐ½Ð´ÑÒ
+          bicycle_parking: ÐÐµÐ»Ð¾ÑÐ¸Ð¿ÐµÐ´ ÑÒ±ÑÐ°ÒÑ
           bicycle_rental: ÐÐµÐ»Ð¾ÑÐ¸Ð¿ÐµÐ´ÑÐµÑÐ´Ñ Ð¶Ð°Ð»ÒÐ° Ð±ÐµÑÑ
+          bicycle_repair_station: ÐÐµÐ»Ð¾ÑÐ¸Ð¿ÐµÐ´ Ð¶Ó©Ð½Ð´ÐµÑ ÑÐµÐ±ÐµÑÑÐ°Ð½Ð°ÑÑ
           biergarten: ÐÑÑÒ Ð°ÑÐ°Ð´Ð°ÒÑ ÑÑÑÐ°ÑÐ°Ð½Ð°
           blood_bank: ÒÐ°Ð½ Ð±Ð°Ð½ÐºÑ
           boat_rental: ÒÐ°Ð¹ÑÒÑÐ°ÑÐ´Ñ Ð¶Ð°Ð»ÒÐ° Ð±ÐµÑÑ
@@ -255,8 +449,10 @@ kk-cyrl:
           bus_station: ÐÐ²ÑÐ¾Ð±ÐµÐºÐµÑ
           cafe: ÐÐ°ÑÐµ
           car_rental: ÐÐ²ÑÐ¾ÐºÓ©Ð»ÑÐºÑÑ Ð¶Ð°Ð»ÒÐ° Ð±ÐµÑÑ
+          car_sharing: ÐÐ°ÑÑÐµÑÐ¸Ò£
           car_wash: ÐÐ²ÑÐ¾Ð¶ÑÑ
           casino: ÐÐ°Ð·Ð¸Ð½Ð¾
+          charging_station: ÐÐ°ÑÑÐ´ÑÐ°Ñ Ð±ÐµÐºÐµÑÑ
           cinema: ÐÐ¸Ð½Ð¾ÑÐµÐ°ÑÑ
           clinic: ÐÐ¼ÑÐ°Ð½Ð°
           clock: Ð¡Ð°ÒÐ°Ñ
@@ -269,9 +465,11 @@ kk-cyrl:
           driving_school: ÐÐ²ÑÐ¾Ð¼ÐµÐºÑÐµÐ¿
           embassy: ÐÐ»ÑÑÐ»ÑÐº
           fast_food: Ð¤Ð°ÑÑÑÑÐ´
+          ferry_terminal: ÐÐ°ÑÐ¾Ð¼ Ð±ÐµÐºÐµÑÑ
           fire_station: Ó¨ÑÑ ÑÓ©Ð½Ð´ÑÑÑ Ð±Ó©Ð»ÑÐ¼Ñ
           fountain: Ð¡Ñ Ð±Ò±ÑÒÐ°Ò
           hospital: ÐÑÑÑÑÐ°Ð½Ð°
+          hunting_stand: ÐÒ£ÑÑ Ð¼Ò±Ð½Ð°ÑÐ°ÑÑ
           ice_cream: ÐÐ°Ð»Ð¼Ò±Ð·Ð´Ð°Ò
           internet_cafe: ÐÐ½ÑÐµÑÐ½ÐµÑ-ÐºÐ°ÑÐµ
           kindergarten: ÐÐ°Ð»Ð°Ð±Ð°ÒÑÐ°
@@ -284,6 +482,7 @@ kk-cyrl:
           nursing_home: ÒÐ°ÑÑÑÐ°Ñ Ò¯Ð¹Ñ
           payment_terminal: Ð¢Ó©Ð»ÐµÐ¼ ÑÐµÑÐ¼Ð¸Ð½Ð°Ð»Ñ
           pharmacy: ÐÓÑÑÑÐ°Ð½Ð°
+          place_of_worship: Ð¢Ð°Ð±ÑÐ½Ñ Ð¾ÑÐ½Ñ
           police: ÐÐ¾Ð»Ð¸ÑÐ¸Ñ
           post_box: ÐÐ¾ÑÑÐ° Ð¶ÓÑÑÐ³Ñ
           post_office: ÐÐ¾ÑÑÐ° Ð±Ó©Ð»ÑÐ¼ÑÐµÑÑ
@@ -292,12 +491,15 @@ kk-cyrl:
           public_bookcase: ÒÐ¾ÒÐ°Ð¼Ð´ÑÒ ÐºÑÑÐ°Ð¿ ÑÐºÐ°ÑÑ
           restaurant: ÐÐµÐ¹ÑÐ°Ð¼ÑÐ°Ð½Ð°
           school: ÐÐµÐºÑÐµÐ¿
+          shelter: ÒÐ°Ð»ÒÐ°
           shower: ÐÑÑ
           studio: Ð¡ÑÑÐ´Ð¸Ñ
           swimming_pool: ÐÐ°ÑÑÐµÐ¹Ð½
           taxi: Ð¢Ð°ÐºÑÐ¸
+          telephone: Ð¢ÐµÐ»ÐµÑÐ¾Ð½
           theatre: Ð¢ÐµÐ°ÑÑ
           toilets: ÐÓÑÐµÑÑÐ°Ð½Ð°
+          townhall: ÒÐ°Ð»Ð° ÓÐºÑÐ¼Ð´ÑÐ³Ñ
           training: ÐÒÑ Ð¾ÑÑÐ°Ð»ÑÒÑ
           university: Ð£Ð½Ð¸Ð²ÐµÑÑÐ¸ÑÐµÑ
           vehicle_inspection: Ð¢ÐµÑÐ½Ð¸ÐºÐ°Ð»ÑÒ Ð±Ð°Ð¹ÒÐ°Ñ
@@ -305,6 +507,7 @@ kk-cyrl:
           veterinary: ÐÐ°Ð» Ð´ÓÑÑÐ³ÐµÑÐ»ÑÐº ÐºÐ»Ð¸Ð½Ð¸ÐºÐ°
           waste_basket: ÒÐ¾ÒÑÑ ÑÐµÐ»ÐµÐ³Ñ
           waste_disposal: ÒÐ¾ÒÑÑ Ð¶ÓÑÑÐ³Ñ
+          weighbridge: ÐÓ©Ð»ÑÐº ÑÐ°ÑÐ°Ð·ÑÑÑ
           "yes": ÐÐ½ÑÑÐ°ÒÒ±ÑÑÐ»ÑÐ¼
         boundary:
           administrative: ÓÐºÑÐ¼ÑÑÐ»ÑÐº ÑÐµÐºÐ°ÑÐ°
@@ -312,12 +515,16 @@ kk-cyrl:
           "yes": Ð¨ÐµÐºÐ°ÑÐ°
         bridge:
           aqueduct: ÐÐºÐ²ÐµÐ´ÑÐº
+          boardwalk: ÐÒÐ°Ñ ÑÑÐ¾ÑÑÐ°Ñ
           suspension: ÐÑÐ¿Ð°Ð»Ñ ÐºÓ©Ð¿ÑÑ
           viaduct: ÐÐ¸Ð°Ð´ÑÐº
           "yes": ÐÓ©Ð¿ÑÑ
         building:
+          apartment: ÐÓÑÐµÑ
+          apartments: ÐÓ©Ð¿ Ð¿ÓÑÐµÑÐ»Ñ Ò¯Ð¹
           bungalow: ÐÑÐ½Ð³Ð°Ð»Ð¾
           church: Ð¨ÑÑÐºÐµÑ ÒÐ¸Ð¼Ð°ÑÐ°ÑÑ
+          civic: ÒÐ¾ÒÐ°Ð¼Ð´ÑÒ ÒÐ¸Ð¼Ð°ÑÐ°Ñ
           college: ÐÐ¾Ð»Ð»ÐµÐ´Ð¶ ÒÐ¸Ð¼Ð°ÑÐ°ÑÑ
           dormitory: ÐÐ°ÑÐ°ÒÑÐ°Ð½Ð°
           garage: ÐÐ°ÑÐ°Ð¶
@@ -328,6 +535,7 @@ kk-cyrl:
           hotel: ÒÐ¾Ð½Ð°Ò Ò¯Ð¹ ÒÐ¸Ð¼Ð°ÑÐ°ÑÑ
           house: Ò®Ð¹
           houseboat: ÐÒ¯Ð·Ð±ÐµÐ»Ñ Ò¯Ð¹
+          hut: ÐÐ°ÑÑÒ
           industrial: Ó¨Ð½ÐµÑÐºÓÑÑÐ¿ÑÑÐº ÒÐ¸Ð¼Ð°ÑÐ°Ñ
           kindergarten: ÐÐ°Ð»Ð°Ð±Ð°ÒÑÐ° ÒÐ¸Ð¼Ð°ÑÐ°ÑÑ
           manufacture: Ó¨Ð½ÐµÑÐºÓÑÑÐ¿ÑÑÐº ÒÐ¸Ð¼Ð°ÑÐ°Ñ
@@ -336,6 +544,7 @@ kk-cyrl:
           school: ÐÐµÐºÑÐµÐ¿ ÒÐ¸Ð¼Ð°ÑÐ°ÑÑ
           stable: ÐÑ ÒÐ¾ÑÐ°
           temple: ÒÐ¸Ð±Ð°Ð´Ð°ÑÑÐ°Ð½Ð° ÒÐ¸Ð¼Ð°ÑÐ°ÑÑ
+          train_station: Ð¢ÐµÐ¼ÑÑ Ð¶Ð¾Ð» Ð²Ð¾ÐºÐ·Ð°Ð»Ñ
           university: Ð£Ð½Ð¸Ð²ÐµÑÑÐ¸ÑÐµÑ ÒÐ¸Ð¼Ð°ÑÐ°ÑÑ
           warehouse: ÒÐ¾Ð¹Ð¼Ð°
           "yes": ÒÐ¸Ð¼Ð°ÑÐ°Ñ
@@ -353,22 +562,28 @@ kk-cyrl:
           handicraft: ÒÐ¾Ð»Ó©Ð½ÐµÑ
           painter: CÑÑÐµÑÑÑ
           photographer: Ð¤Ð¾ÑÐ¾Ð³ÑÐ°Ñ
+          plumber: Ð¡Ð°Ð½ÑÐµÑÐ½Ð¸Ðº
           roofer: Ð¨Ð°ÑÑÑÑÑ
           sawmill: ÐÒÐ°Ñ ÐºÐµÑÐµÑÑÐ½ Ð·Ð°ÑÑÑ
           shoemaker: ÐÑÑÐºÑÑ
+          stonemason: Ð¢Ð°ÑÑÑ
           tailor: Ð¢ÑÐ³ÑÐ½ÑÑ
           "yes": Ð¨ÐµÐ±ÐµÑÑÐ°Ð½Ð°
         emergency:
           ambulance_station: ÐÐµÐ´ÐµÐ» Ð¶ÓÑÐ´ÐµÐ¼ Ð±ÐµÐºÐµÑÑ
           defibrillator: ÐÐµÑÐ¸Ð±ÑÐ¸Ð»Ð»ÑÑÐ¾Ñ
         highway:
+          bridleway: ÐÑÐ¿ÐµÐ½ Ð¶Ò¯ÑÑ Ð¶Ð¾Ð»Ñ
           bus_stop: ÐÐ²ÑÐ¾Ð±ÑÑ Ð°ÑÐ»Ð´Ð°Ð¼Ð°ÑÑ
           cycleway: ÐÐµÐ»Ð¾ÑÐ¸Ð¿ÐµÐ´ Ð¶Ð¾Ð»Ñ
           elevator: ÐÐ¸ÑÑ
+          footway: Ð¢ÑÐ¾ÑÑÐ°Ñ
           ford: Ó¨ÑÐºÐµÐ»
           milestone: ÐÐ¸Ð»Ð¾Ð¼ÐµÑÑÐ»ÑÐº Ð±Ð°ÒÐ°Ð½Ð°
+          motorway: ÐÐ²ÑÐ¾ÐºÒ¯ÑÐµÐ¶Ð¾Ð»
           path: Ð¡Ð¾ÒÐ¿Ð°Ò
           platform: ÐÐ»Ð°ÑÑÐ¾ÑÐ¼Ð°
+          primary: ÐÑÑÑÐ½ÑÑ Ð´ÓÑÐµÐ¶ÐµÐ»Ñ Ð¶Ð¾Ð»
           raceway: ÐÐ°ÑÑÑ ÑÑÐ°ÑÑÐ°ÑÑ
           rest_area: ÐÐµÐ¼Ð°Ð»ÑÑ Ð°Ð¹Ð¼Ð°ÒÑ
           road: ÐÐ¾Ð»
@@ -396,15 +611,18 @@ kk-cyrl:
         landuse:
           cemetery: ÐÐ¸ÑÐ°Ñ
           conservation: ÒÐ¾ÑÑÒ
-          construction: ÒÒ±ÑÑÐ»ÑÑ
+          construction: ÒÒ±ÑÑÐ»ÑÑ Ð°Ð»Ð°Ò£Ñ
           forest: ÐÑÐ¼Ð°Ð½ ÑÐ°ÑÑÐ°ÑÑÐ»ÑÒÑ
           garages: ÐÐ°ÑÐ°Ð¶Ð´Ð°Ñ
           grass: Ð¨Ó©Ð¿
+          industrial: Ó¨Ð½ÐµÑÐºÓÑÑÐ¿ Ð°Ð¹Ð¼Ð°ÒÑ
           landfill: ÒÐ¾ÒÑÑ Ð¾ÑÐ½Ñ
           meadow: Ð¨Ð°Ð±ÑÐ½Ð´ÑÒ
+          military: ÓÑÐºÐµÑÐ¸ Ð°Ð¹Ð¼Ð°Ò
           orchard: ÐÐµÐ¼ÑÑ Ð±Ð°ÒÑ
           quarry: ÐÐ°ÑÑÐµÑ
           railway: Ð¢ÐµÐ¼ÑÑ Ð¶Ð¾Ð»
+          residential: Ð¢Ò±ÑÒÑÐ½ Ð°ÑÐ´Ð°Ð½
           vineyard: ÐÒ¯Ð·ÑÐ¼Ð´ÑÐº
           "yes": ÐÐµÑÐ´Ñ Ð¿Ð°Ð¹Ð´Ð°Ð»Ð°Ð½Ñ
         leisure:
@@ -417,7 +635,7 @@ kk-cyrl:
           ice_rink: ÐÒ±Ð· Ð°Ð¹Ð´ÑÐ½Ñ
           marina: ÐÐ¹Ð»Ð°Ò
           miniature_golf: ÐÐ¸Ð½Ð¸Ð³Ð¾Ð»ÑÑ
-          park: ÐÐ°ÑÐº
+          park: Ð¡Ð°ÑÐ±Ð°Ò
           pitch: Ð¡Ð¿Ð¾ÑÑ Ð°Ð»Ð°Ò£Ñ
           resort: Ð¨Ð¸Ð¿Ð°Ð¶Ð°Ð¹
           sauna: Ð¡Ð°ÑÐ½Ð°
@@ -467,6 +685,8 @@ kk-cyrl:
           atoll: ÐÑÐ¾Ð»Ð»
           bay: Ð¨ÑÒÐ°Ð½Ð°Ò
           beach: ÐÐ°ÒÐ°Ð¶Ð°Ð¹
+          cave_entrance: Ò®Ò£Ð³ÑÑÐ³Ðµ ÐºÑÑÐµÐ±ÐµÑÑÑ
+          cliff: Ð¢ÑÐº Ð¶Ð°ÑÑÐ°Ñ
           coastline: ÐÐ°ÒÐ°Ð»ÑÒ ÑÑÐ·ÑÒ
           crater: ÐÑÐ°ÑÐµÑ
           fjord: Ð¤ÑÐ¾ÑÐ´
@@ -504,6 +724,7 @@ kk-cyrl:
           estate_agent: ÐÑÐ»Ð¶ÑÐ¼Ð°Ð¹ÑÑÐ½ Ð¼Ò¯Ð»ÑÐº Ð°Ð³ÐµÐ½ÑÑÑÐ³Ñ
           government: ÐÐµÐ¼Ð»ÐµÐºÐµÑÑÑÐº Ð¼ÐµÐºÐµÐ¼Ðµ
           insurance: Ð¡Ð°ÒÑÐ°Ð½Ð´ÑÑÑ ÐºÐ¾Ð¼Ð¿Ð°Ð½Ð¸ÑÑÑ
+          it: IT ÐºÐµÒ£ÑÐµÑÑ
           lawyer: ÐÐ°Ò£Ð³ÐµÑ
           notary: ÐÐ¾ÑÐ°ÑÐ¸ÑÑ
           research: ÒÑÐ»ÑÐ¼Ð¸-Ð·ÐµÑÑÑÐµÑ Ò±Ð¹ÑÐ¼Ñ
@@ -520,6 +741,7 @@ kk-cyrl:
           houses: Ò®Ð¹Ð»ÐµÑ
           island: ÐÑÐ°Ð»
           islet: ÐÑÐ°Ð»ÑÑÒ
+          municipality: ÐÑÐ½Ð¸ÑÐ¸Ð¿Ð°Ð»Ð¸ÑÐµÑ
           postcode: ÐÐ¾ÑÑÐ° Ð¸Ð½Ð´ÐµÐºÑÑ
           region: Ó¨Ò£ÑÑ
           sea: Ð¢ÐµÒ£ÑÐ·
@@ -541,7 +763,10 @@ kk-cyrl:
           antiques: ÐÐ½ÑÐ¸ÐºÐ²Ð°ÑÐ¸Ð°Ñ
           appliance: Ð¢Ò±ÑÐ¼ÑÑÑÑÒ ÑÐµÑÐ½Ð¸ÐºÐ° Ð´Ò¯ÐºÐµÐ½Ñ
           baby_goods: ÐÐ°Ð»Ð°Ð»Ð°Ñ ÑÐ°ÑÐ°ÑÐ»Ð°ÑÑ
+          bakery: ÐÐ°ÑÐ±Ð°Ð¹ÑÐ°Ð½Ð°
+          beauty: Ð¡Ò±Ð»ÑÐ»ÑÒ ÑÐ°Ð»Ð¾Ð½Ñ
           bed: Ð¢Ó©ÑÐµÐº Ð¶Ð°Ð±Ð´ÑÒÑÐ°ÑÑ
+          beverages: Ð¡ÑÑÑÐ½ Ð´Ò¯ÐºÐµÐ½Ñ
           bicycle: ÐÐµÐ»Ð¾ÑÐ¸Ð¿ÐµÐ´ Ð´Ò¯ÐºÐµÐ½Ñ
           bookmaker: ÐÑÐºÐ¼ÐµÐºÐµÑ
           books: ÐÑÑÐ°Ð¿ Ð´Ò¯ÐºÐµÐ½Ñ
@@ -557,9 +782,14 @@ kk-cyrl:
           clothes: ÐÐ¸ÑÐ¼ Ð´Ò¯ÐºÐµÐ½Ñ
           coffee: ÐÐ¾ÑÐµ Ð´Ò¯ÐºÐµÐ½Ñ
           computer: ÐÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð´Ò¯ÐºÐµÐ½Ñ
+          confectionery: ÐÐ¾Ð½Ð´Ð¸ÑÐµÑÐ»ÑÐº Ð´Ò¯ÐºÐµÐ½
+          convenience: Ò®Ð¹ Ð¶Ð°Ð½ÑÐ½Ð´Ð°ÒÑ Ð´Ò¯ÐºÐµÐ½
           copyshop: ÐÓ©ÑÑÑÐ¼Ðµ Ð¾ÑÑÐ°Ð»ÑÒÑ
           cosmetics: ÐÐ¾ÑÐ¼ÐµÑÐ¸ÐºÐ° Ð´Ò¯ÐºÐµÐ½Ñ
+          craft: ÒÐ¾Ð»Ó©Ð½ÐµÑÐ³Ðµ ÒÐ°Ð¶ÐµÑÑÑ ÑÐ°ÑÐ°ÑÐ»Ð°Ñ
+          curtain: ÐÐµÑÐ´Ðµ Ð´Ò¯ÐºÐµÐ½Ñ
           dairy: Ð¡Ò¯Ñ Ó©Ð½ÑÐ¼Ð´ÐµÑÑ Ð´Ò¯ÐºÐµÐ½Ñ
+          deli: ÐÐµÐ»Ð¸ÐºÐ°ÑÐµÑÑÐµÑ
           department_store: Ð£Ð½Ð¸Ð²ÐµÑÐ¼Ð°Ð³
           dry_cleaning: Ð¥Ð¸Ð¼ÑÐ°Ð·Ð°Ð»Ð°Ñ
           e-cigarette: Ð­Ð»ÐµÐºÑÑÐ¾Ð½Ð´Ñ ÑÐµÐ¼ÐµÐºÑ Ð´Ò¯ÐºÐµÐ½Ñ
@@ -569,20 +799,26 @@ kk-cyrl:
           fashion: Ð¡ÓÐ½Ð´Ñ ÐºÐ¸ÑÐ¼ Ð´Ò¯ÐºÐµÐ½Ñ
           fishing: ÐÐ°Ð»ÑÒ Ð°ÑÐ»Ð°Ñ ÒÒ±ÑÐ°Ð»Ð´Ð°ÑÑ
           florist: ÐÒ¯Ð»Ð´ÐµÑ Ð´Ò¯ÐºÐµÐ½Ñ
+          funeral_directors: ÐÐµÑÐ»ÐµÑ ÒÑÐ·Ð¼ÐµÑÑÐµÑÑ
           furniture: ÐÐ¸Ò»Ð°Ð·
+          gas: ÐÐ°Ð· Ð´Ò¯ÐºÐµÐ½Ñ
           grocery: ÐÐ·ÑÒ-ÑÒ¯Ð»ÑÐº Ð´Ò¯ÐºÐµÐ½Ñ
           hairdresser: Ð¨Ð°ÑÑÐ°ÑÐ°Ð·
+          hardware: Ð¨Ð°ÑÑÐ°ÑÑÐ»ÑÒ Ð´Ò¯ÐºÐµÐ½Ñ
           health_food: ÐÐ°Ð¹Ð´Ð°Ð»Ñ Ð°Ñ Ð´Ò¯ÐºÐµÐ½Ñ
           hearing_aids: ÐÑÑÑ Ð°Ð¿Ð¿Ð°ÑÐ°ÑÑÐ°ÑÑ
+          houseware: Ð«Ð´ÑÑ-Ð°ÑÒ Ð´Ò¯ÐºÐµÐ½Ñ
           ice_cream: ÐÐ°Ð»Ð¼Ò±Ð·Ð´Ð°Ò Ð´Ò¯ÐºÐµÐ½Ñ
           jewelry: ÐÐµÑÐ³ÐµÑÐ»ÑÐº Ð´Ò¯ÐºÐµÐ½
           laundry: ÐÑÑ Ð¶ÑÐ°ÑÑÐ½ Ð¾ÑÑÐ½
           lottery: ÐÐ¾ÑÐµÑÐµÑ
           mall: Ð¡Ð°ÑÐ´Ð° Ð¾ÑÑÐ°Ð»ÑÒÑ
+          massage: ÐÐ°ÑÑÐ°Ð¶
           mobile_phone: Ò°ÑÐ»Ñ ÑÐµÐ»ÐµÑÐ¾Ð½Ð´Ð°Ñ Ð´Ò¯ÐºÐµÐ½Ñ
           motorcycle: ÐÐ¾ÑÐ¾ÑÐ¸ÐºÐ» Ð´Ò¯ÐºÐµÐ½Ñ
           motorcycle_repair: ÐÐ¾ÑÐ¾ÑÐ¸ÐºÐ» Ð¶Ó©Ð½Ð´ÐµÑ
           musical_instrument: ÐÑÐ·ÑÐºÐ°Ð»ÑÒ Ð°ÑÐ¿Ð°Ð¿ÑÐ°Ñ
+          nutrition_supplements: Ð¢Ð°ÒÐ°Ð¼Ð´ÑÒ ÒÐ¾ÑÐ¿Ð°Ð»Ð°Ñ
           optician: ÐÐ¿ÑÐ¸ÐºÐ°
           pawnbroker: ÐÐ¾Ð¼Ð±Ð°ÑÐ´
           perfumery: ÐÐ°ÑÑÑÐ¼ÐµÑÐ¸Ñ
@@ -592,12 +828,15 @@ kk-cyrl:
           sports: Ð¡Ð¿Ð¾ÑÑ Ð´Ò¯ÐºÐµÐ½Ñ
           stationery: ÐÐµÒ£ÑÐµ ÑÐ°ÑÐ°ÑÐ»Ð°ÑÑ
           supermarket: Ð¡ÑÐ¿ÐµÑÐ¼Ð°ÑÐºÐµÑ
+          tailor: Ð¢ÑÐ³ÑÐ½ÑÑ
           tattoo: Ð¢Ð°ÑÑ ÑÐ°Ð»Ð¾Ð½Ñ
           tea: Ð¨Ð°Ð¹ Ð´Ò¯ÐºÐµÐ½Ñ
           ticket: ÐÐ°ÑÑÐ°
           tobacco: Ð¢ÐµÐ¼ÐµÐºÑ Ð´Ò¯ÐºÐµÐ½Ñ
           toys: ÐÐ¹ÑÐ½ÑÑÒÑÐ°Ñ Ð´Ò¯ÐºÐµÐ½Ñ
           travel_agency: Ð¢ÑÑÐ¸ÑÑÑÐº Ð°Ð³ÐµÐ½ÑÑÑÐº
+          tyres: Ð¨Ð¸Ð½Ð°Ð»Ð°Ñ Ð´Ò¯ÐºÐµÐ½Ñ
+          vacant: ÒÐ°Ò£ÑÑÐ°Ð¿ ÒÐ°Ð»ÒÐ°Ð½ Ð´Ò¯ÐºÐµÐ½
           wholesale: ÐÓ©ÑÐµÑÐ¼Ðµ ÑÐ°ÑÐ´Ð° Ð´Ò¯ÐºÐµÐ½Ñ
           wine: Ð¨Ð°ÑÐ°Ð¿ Ð´Ò¯ÐºÐµÐ½Ñ
           "yes": ÐÒ¯ÐºÐµÐ½
@@ -610,16 +849,21 @@ kk-cyrl:
           motel: ÐÐ¾ÑÐµÐ»Ñ
           museum: ÐÒ±ÑÐ°Ð¶Ð°Ð¹
           zoo: ÐÐ¾Ð¾Ð±Ð°Ò
+        tunnel:
+          "yes": Ð¢ÑÐ½Ð½ÐµÐ»Ñ
         waterway:
           dam: ÐÓ©Ð³ÐµÑÑÐµ
+          lock: Ð¨Ð»ÑÐ·
           rapids: Ð¨Ð¾Ò£ÒÐ°Ð»
           river: Ó¨Ð·ÐµÐ½
           waterfall: Ð¡Ð°ÑÒÑÑÐ°Ð¼Ð°
           weir: ÐÓ©Ð³ÐµÑ
       admin_levels:
+        level2: ÐÐµÐ¼Ð»ÐµÐºÐµÑ ÑÐµÐºÐ°ÑÐ°ÑÑ
+        level5: Ó¨Ò£ÑÑ ÑÐµÐºÐ°ÑÐ°ÑÑ
+        level6: ÐÑÐ´Ð°Ð½ ÑÐµÐºÐ°ÑÐ°ÑÑ
         level8: ÒÐ°Ð»Ð° ÑÐµÐºÐ°ÑÐ°ÑÑ
-      types:
-        places: ÐÑÑÐ½Ð´Ð°Ñ
+        level9: ÐÑÑÐ» ÑÐµÐºÐ°ÑÐ°ÑÑ
     results:
       no_results: ÐÑÑÐµÒ£Ðµ ÑÐ°Ð±ÑÐ»Ð¼Ð°Ð´Ñ
   issues:
@@ -627,6 +871,8 @@ kk-cyrl:
       search: ÐÐ·Ð´ÐµÑ
       states:
         open: ÐÑÑÒ
+    show:
+      reopen: ÒÐ°Ð¹ÑÐ° Ð°ÑÑ
   reports:
     new:
       categories:
@@ -637,6 +883,9 @@ kk-cyrl:
         user:
           other_label: ÐÐ°ÑÒÐ°
         note:
+          spam_label: ÐÒ±Ð» ÐµÑÐºÐµÑÑÐ¿Ðµ ÑÐ¿Ð°Ð¼ÒÐ° Ò±ÒÑÐ°Ð¹Ð´Ñ
+          personal_label: ÐÒ±Ð» ÐµÑÐºÐµÑÑÐ¿ÐµÐ´Ðµ Ð±ÑÑÐµÑÐ´ÑÒ£ Ð¶ÐµÐºÐµ Ð´ÐµÑÐµÐ³Ñ Ð±Ð°Ñ
+          abusive_label: ÐÒ±Ð» ÐµÑÐºÐµÑÑÐ¿ÐµÐ´Ðµ Ð±Ð°Ð»Ð°ÒÐ°Ñ ÑÓ©Ð·Ð´ÐµÑ Ð±Ð°Ñ
           other_label: ÐÐ°ÑÒÐ°
   layouts:
     logo:
@@ -647,39 +896,76 @@ kk-cyrl:
     edit: Ó¨Ò£Ð´ÐµÑ
     history: Ð¢Ð°ÑÐ¸Ñ
     export: Ð­ÐºÑÐ¿Ð¾ÑÑÑÐ°Ñ
+    gps_traces: GPS Ð±Ð°ÒÐ´Ð°ÑÐ»Ð°ÑÑ
+    user_diaries: ÒÐ¾Ð»Ð´Ð°Ð½ÑÑÑÐ»Ð°ÑÐ´ÑÒ£ ÐºÒ¯Ð½Ð´ÐµÐ»ÑÐºÑÐµÑÑ
     edit_with: '%{editor} ÐºÓ©Ð¼ÐµÐ³ÑÐ¼ÐµÐ½ Ó©Ò£Ð´ÐµÑ'
     intro_header: OpenStreetMap-ÐºÐµ ÒÐ¾Ñ ÐºÐµÐ»Ð´ÑÒ£ÑÐ·!
-    partners_ucl: UCL
     partners_fastly: Fastly
-    partners_bytemark: Bytemark Hosting
+    tou: ÒÐ¾Ð»Ð´Ð°Ð½Ñ ÑÐ°ÑÑÑ
     help: ÐÐ½ÑÒÑÐ°Ð¼Ð°
     about: ÐÐ¾Ð±Ð° ÑÑÑÐ°Ð»Ñ
-    foundation_title: OpenStreetMap ÒÐ¾ÑÑ
+    copyright: ÐÐ²ÑÐ¾ÑÐ»ÑÒ ÒÒ±ÒÑÒÑÐ°Ñ
+    communities: ÒÐ°ÑÑÐ¼Ð´Ð°ÑÑÑÒÑÐ°Ñ
     learn_more: ÐÓ©Ð±ÑÑÐµÐº Ð±ÑÐ»Ñ
+    more: ÐÓÐ·ÑÑ
   user_mailer:
+    diary_comment_notification:
+      hi: Ð¡ÓÐ»ÐµÐ¼ÐµÑÑÑÐ· Ð±Ðµ, %{to_user},
     message_notification:
       subject: '[OpenStreetMap] %{message_title}'
+      hi: Ð¡ÓÐ»ÐµÐ¼ÐµÑÑÑÐ· Ð±Ðµ, %{to_user},
+      header: 'OpenStreetMap ÒÐ¾Ð»Ð´Ð°Ð½ÑÑÑÑÑ %{from_user} ÑÑÐ·Ð³Ðµ ÑÐ°Ñ Ð¶ÑÐ±ÐµÑÐ´Ñ. Ð¢Ð°ÒÑÑÑÐ±Ñ:
+        %{subject}'
+    friendship_notification:
+      hi: Ð¡ÓÐ»ÐµÐ¼ÐµÑÑÑÐ· Ð±Ðµ, %{to_user},
+    gpx_failure:
+      hi: Ð¡ÓÐ»ÐµÐ¼ÐµÑÑÑÐ· Ð±Ðµ, %{to_user},
     gpx_success:
+      hi: Ð¡ÓÐ»ÐµÐ¼ÐµÑÑÑÐ· Ð±Ðµ, %{to_user},
       subject: '[OpenStreetMap] GPX ÑÓÑÑÑ Ð¸Ð¼Ð¿Ð¾ÑÑÑÐ°Ð»Ð´Ñ'
     signup_confirm:
       subject: '[OpenStreetMap] OpenStreetMap-ÐºÐµ ÒÐ¾Ñ ÐºÐµÐ»Ð´ÑÒ£ÑÐ·'
+    email_confirm:
+      greeting: Ð¡ÓÐ»ÐµÐ¼ÐµÑÑÑÐ· Ð±Ðµ,
+    lost_password:
+      subject: '[OpenStreetMap] ÒÒ±Ð¿Ð¸ÑÑÓ©Ð·Ð´Ñ Ð°ÑÑÐ»ÑÑ ÑÒ±ÑÐ°Ð½ÑÑÑ'
+      greeting: Ð¡ÓÐ»ÐµÐ¼ÐµÑÑÑÐ· Ð±Ðµ,
+    note_comment_notification:
+      greeting: Ð¡ÓÐ»ÐµÐ¼ÐµÑÑÑÐ· Ð±Ðµ,
+    changeset_comment_notification:
+      hi: Ð¡ÓÐ»ÐµÐ¼ÐµÑÑÑÐ· Ð±Ðµ, %{to_user},
   messages:
-    inbox:
+    messages_table:
+      from: ÐÑÐ¼Ð½ÐµÐ½
+      to: ÐÑÐ¼Ð³Ðµ
       subject: Ð¢Ð°ÒÑÑÑÐ¿
+      actions: ÓÑÐµÐºÐµÑÑÐµÑ
     message_summary:
       unread_button: ÐÒÑÐ»Ð¼Ð°ÒÐ°Ð½ Ð´ÐµÐ¿ Ð±ÐµÐ»Ð³ÑÐ»ÐµÑ
       read_button: ÐÒÑÐ»Ð´Ñ Ð´ÐµÐ¿ Ð±ÐµÐ»Ð³ÑÐ»ÐµÑ
-      reply_button: ÐÐ°ÑÐ°Ð¿ Ð±ÐµÑÑ
       destroy_button: ÐÐ¾Ñ
+    new:
+      title: Ð¥Ð°Ñ Ð¶ÑÐ±ÐµÑÑ
+    outbox:
+      messages:
+        one: '%{count} ÑÐ°Ñ Ð¶ÑÐ±ÐµÑÐ´ÑÒ£ÑÐ·'
+        other: '%{count} ÑÐ°Ñ Ð¶ÑÐ±ÐµÑÐ´ÑÒ£ÑÐ·'
     show:
       reply_button: ÐÐ°ÑÐ°Ð¿ Ð±ÐµÑÑ
+      unread_button: ÐÒÑÐ»Ð¼Ð°ÒÐ°Ð½ Ð´ÐµÐ¿ Ð±ÐµÐ»Ð³ÑÐ»ÐµÑ
       destroy_button: ÐÐ¾Ñ
+      back: ÐÑÑÒÐ°
     sent_message_summary:
       destroy_button: ÐÐ¾Ñ
+    mark:
+      as_read: Ð¥Ð°ÑÒÐ° Ð¾ÒÑÐ»Ð´Ñ Ð´ÐµÐ³ÐµÐ½ Ð±ÐµÐ»Ð³Ñ ÒÐ¾Ð¹Ð´ÑÒ£ÑÐ·
+      as_unread: Ð¥Ð°ÑÒÐ° Ð¾ÒÑÐ»Ð¼Ð°Ð´Ñ Ð´ÐµÐ³ÐµÐ½ Ð±ÐµÐ»Ð³Ñ ÒÐ¾Ð¹Ð´ÑÒ£ÑÐ·
   passwords:
-    lost_password:
-      email address: 'Ð-Ð¿Ð¾ÑÑÐ° Ð¼ÐµÐºÐµÐ½Ð¶Ð°Ð¹Ñ:'
-    reset_password:
+    new:
+      email address: Ð­Ð». Ð¿Ð¾ÑÑÐ° Ð¼ÐµÐºÐµÐ½Ð¶Ð°Ð¹Ñ
+    edit:
+      title: ÒÒ±Ð¿Ð¸ÑÑÓ©Ð·Ð´Ñ Ð°ÑÑÐ»ÑÑ
+    update:
       flash changed: ÒÒ±Ð¿Ð¸Ñ ÑÓ©Ð·ÑÒ£ÑÐ· Ó©Ð·Ð³ÐµÑÑÑÐ»Ð´Ñ.
   preferences:
     show:
@@ -697,21 +983,24 @@ kk-cyrl:
       gravatar:
         gravatar: Gravatar ÒÐ¾Ð»Ð´Ð°Ð½Ñ
         what_is_gravatar: Gravatar Ð´ÐµÐ³ÐµÐ½ Ð½Ðµ?
+        disabled: Gravatar ÑÓ©Ð½Ð´ÑÑÑÐ»Ð´Ñ.
       new image: Ð¡ÑÑÐµÑ ÒÐ¾ÑÑ
       keep image: ÐÒÑÐ¼Ð´Ð°ÒÑ ÑÑÑÐµÑÑÑ ÑÐ°ÒÑÐ°Ð¿ ÒÐ°Ð»Ñ
       delete image: ÐÒÑÐ¼Ð´Ð°ÒÑ ÑÑÑÐµÑÑÑ Ð¶Ð¾Ñ
       replace image: ÐÒÑÐ¼Ð´Ð°ÒÑ ÑÑÑÐµÑÑÑ Ð°Ð»Ð¼Ð°ÑÑÑÑÑ
+      show: ÐÓ©ÑÑÐµÑÑ
+      delete: ÐÐ¾Ñ
     update:
       success: ÐÐµÐ¹ÑÐ½ Ð¶Ð°Ò£Ð°ÑÑÑÐ»Ð´Ñ.
   sessions:
     new:
-      title: ÐÑÑÑ
-      heading: ÐÑÑÑ
-      password: 'ÒÒ±Ð¿Ð¸Ñ ÑÓ©Ð·:'
-      openid_html: '%{logo} OpenID:'
+      tab_title: ÐÑÑÑ
+      password: ÒÒ±Ð¿Ð¸ÑÑÓ©Ð·
+      remember: ÐÒ¯Ð¹ÐµÐ´Ðµ ÒÐ°Ð»Ñ
       login_button: ÐÑÑÑ
     destroy:
       title: Ð¨ÑÒÑ
+      heading: OpenStreetMap-ÑÐµÐ½ ÑÑÒÑ
       logout_button: Ð¨ÑÒÑ
   shared:
     markdown_help:
@@ -721,24 +1010,56 @@ kk-cyrl:
       url: URL
     richtext_field:
       edit: Ó¨Ò£Ð´ÐµÑ
+    pagination:
+      diary_comments:
+        older: ÐÑÐºÑÐ»ÐµÑ Ð¿ÑÐºÑÑÐ»ÐµÑ
+        newer: ÐÐ°Ò£Ð°Ð»Ð°Ñ Ð¿ÑÐºÑÑÐ»ÐµÑ
+      diary_entries:
+        older: ÐÑÐºÑÐ»ÐµÑ Ð¶Ð°Ð·Ð±Ð°Ð»Ð°Ñ
+        newer: ÐÐ°Ò£Ð°Ð»Ð°Ñ Ð¶Ð°Ð·Ð±Ð°Ð»Ð°Ñ
   site:
+    about:
+      open_data_title: ÐÑÑÒ Ð´ÐµÑÐµÐº
     copyright:
       foreign:
         title: ÐÒ±Ð» Ð°ÑÐ´Ð°ÑÐ¼Ð° ÑÑÑÐ°Ð»Ñ
         english_link: ÐÒÑÐ»ÑÑÐ½ÑÐ° ÑÒ¯Ð¿Ð½Ò±ÑÒÐ°ÑÑ
       native:
         title: ÐÒ±Ð» Ð±ÐµÑ ÑÑÑÐ°Ð»Ñ
-    index:
-      permalink: Ð¢Ò±ÑÐ°ÒÑÑ ÑÑÐ»ÑÐµÐ¼Ðµ
+      legal_babble:
+        contributors_at_austria: ÐÑÑÑÑÐ¸Ñ
+        contributors_au_australia: ÐÑÑÑÑÐ°Ð»Ð¸Ñ
+        contributors_ca_canada: ÐÐ°Ð½Ð°Ð´Ð°
+        contributors_cz_czechia: Ð§ÐµÑÐ¸Ñ
+        contributors_fi_finland: Ð¤Ð¸Ð½Ð»ÑÐ½Ð´Ð¸Ñ
+        contributors_fi_nlsfi_license: NLSFI Ð»Ð¸ÑÐµÐ½Ð·Ð¸ÑÑÑ
+        contributors_fr_france: Ð¤ÑÐ°Ð½ÑÐ¸Ñ
+        contributors_hr_croatia: Ð¥Ð¾ÑÐ²Ð°ÑÐ¸Ñ
+        contributors_nl_netherlands: ÐÐ¸Ð´ÐµÑÐ»Ð°Ð½Ð´
+        contributors_nz_new_zealand: ÐÐ°Ò£Ð° ÐÐµÐ»Ð°Ð½Ð´Ð¸Ñ
+        contributors_rs_serbia: Ð¡ÐµÑÐ±Ð¸Ñ
+        contributors_si_slovenia: Ð¡Ð»Ð¾Ð²ÐµÐ½Ð¸Ñ
+        contributors_es_spain: ÐÑÐ¿Ð°Ð½Ð¸Ñ
+        contributors_za_south_africa: ÐÒ£ÑÒ¯ÑÑÑÐº ÐÑÑÐ¸ÐºÐ°
+        contributors_gb_united_kingdom: Ò°Ð»ÑÐ±ÑÐ¸ÑÐ°Ð½Ð¸Ñ
+    edit:
+      user_page_link: ÒÐ¾Ð»Ð´Ð°Ð½ÑÑÑ Ð±ÐµÑÑ
     export:
       title: Ð­ÐºÑÐ¿Ð¾ÑÑÑÐ°Ñ
-      image_size: 'Ð¡ÑÑÐµÑ Ó©Ð»ÑÐµÐ¼Ñ:'
+      too_large:
+        planet:
+          title: OSM ÒÐ°Ð»Ð°Ð¼ÑÐ°ÑÑ
+        overpass:
+          title: Overpass API
       export_button: Ð­ÐºÑÐ¿Ð¾ÑÑÑÐ°Ñ
+    fixthemap:
+      how_to_help:
+        join_the_community:
+          title: ÒÐ°ÑÑÐ¼Ð´Ð°ÑÑÑÒÒÐ° ÒÐ¾ÑÑÐ»Ñ
     help:
       welcome:
+        url: /welcome
         title: OpenStreetMap-ÐºÐµ ÒÐ¾Ñ ÐºÐµÐ»Ð´ÑÒ£ÑÐ·
-      forums:
-        title: Ð¤Ð¾ÑÑÐ¼Ð´Ð°Ñ
       irc:
         title: IRC
       switch2osm:
@@ -749,58 +1070,109 @@ kk-cyrl:
         title: OpenStreetMap Ð£Ð¸ÐºÐ¸
     sidebar:
       search_results: ÐÐ·Ð´ÐµÑ Ð½ÓÑÐ¸Ð¶ÐµÐ»ÐµÑÑ
-      close: ÐÐ°Ð±Ñ
     search:
       search: ÐÐ·Ð´ÐµÑ
+      where_am_i: ÐÒ±Ð» ÒÐ°Ð¹Ð´Ð°?
+      submit_text: Ó¨ÑÑ
     key:
       table:
         entry:
+          motorway: ÐÐ²ÑÐ¾ÐºÒ¯ÑÐµÐ¶Ð¾Ð»
+          main_road: ÐÐ°Ñ Ð¶Ð¾Ð»
+          trunk: Ð¢Ð°Ñ Ð¶Ð¾Ð»
+          primary: ÐÑÑÑÐ½ÑÑ Ð´ÓÑÐµÐ¶ÐµÐ»Ñ Ð¶Ð¾Ð»
+          secondary: ÐÐºÑÐ½ÑÑ Ð´ÓÑÐµÐ¶ÐµÐ»Ñ Ð¶Ð¾Ð»
+          unclassified: ÐÐµÑÐ³ÑÐ»ÑÐºÑÑ Ð¶Ð¾Ð»
           rail: Ð¢ÐµÐ¼ÑÑ Ð¶Ð¾Ð»
-          tram:
-          - ÐÐµÒ£ÑÐ» ÑÐµÐ»ÑÑÑÑ ÐºÓ©Ð»ÑÐº
-          apron:
-            1: ÑÐµÑÐ¼Ð¸Ð½Ð°Ð»
+          train: ÐÐ¾Ð¹ÑÐ·
+          subway: ÐÐµÑÑÐ¾
+          bus: ÐÐ²ÑÐ¾Ð±ÑÑ
+          apron: ÓÑÐµÐ¶Ð°Ð¹ Ð¿ÐµÑÑÐ¾Ð½Ñ
           admin: ÓÐºÑÐ¼ÑÑÐ»ÑÐº ÑÐµÐºÐ°ÑÐ°
           forest: ÐÑÐ¼Ð°Ð½
           golf: ÐÐ¾Ð»ÑÑ Ð°Ð»Ð°Ò£Ñ
-          lake:
-          - ÐÓ©Ð»
+          park: Ð¡Ð°ÑÐ±Ð°Ò
+          resident: Ð¢Ò±ÑÒÑÐ½ Ð°ÑÐ´Ð°Ð½
+          retail: Ð¡Ð°ÑÐ´Ð° Ð°Ð¹Ð¼Ð°ÒÑ
+          industrial: Ó¨Ð½ÐµÑÐºÓÑÑÐ¿ Ð°Ð¹Ð¼Ð°ÒÑ
+          lake: ÐÓ©Ð»
           farm: Ð¤ÐµÑÐ¼Ð°
           cemetery: ÐÐ¸ÑÐ°Ñ
+          allotments: Ð¡Ð°ÑÐ¶Ð°Ð¹Ð»Ð°Ñ
           pitch: Ð¡Ð¿Ð¾ÑÑ Ð°Ð»Ð°Ò£Ñ
           centre: Ð¡Ð¿Ð¾ÑÑ Ð¾ÑÑÐ°Ð»ÑÒÑ
-          school:
-          - ÐÐµÐºÑÐµÐ¿
-          - ÑÐ½Ð¸Ð²ÐµÑÑÐ¸ÑÐµÑ
+          military: ÓÑÐºÐµÑÐ¸ Ð°Ð¹Ð¼Ð°Ò
+          school: ÐÐµÐºÑÐµÐ¿
+          university: Ð£Ð½Ð¸Ð²ÐµÑÑÐ¸ÑÐµÑ
+          building: ÐÐ»ÐµÑÐ»Ñ ÒÐ¸Ð¼Ð°ÑÐ°Ñ
           station: Ð¢ÐµÐ¼ÑÑ Ð¶Ð¾Ð» Ð±ÐµÐºÐµÑÑ
-          summit:
-            1: ÑÑÒ£
+          peak: Ð¨ÑÒ£
+          bus_stop: ÐÐ²ÑÐ¾Ð±ÑÑ Ð°ÑÐ»Ð´Ð°Ð¼Ð°ÑÑ
           bicycle_shop: ÐÐµÐ»Ð¾ÑÐ¸Ð¿ÐµÐ´ Ð´Ò¯ÐºÐµÐ½Ñ
+          bicycle_parking: ÐÐµÐ»Ð¾ÑÐ¸Ð¿ÐµÐ´ ÑÒ±ÑÐ°ÒÑ
           toilets: ÐÓÑÐµÑÑÐ°Ð½Ð°
     welcome:
       title: ÒÐ¾Ñ ÐºÐµÐ»Ð´ÑÒ£ÑÐ·!
+      basic_terms:
+        node: Ð½Ò¯ÐºÑÐµ
+        way: ÑÑÐ·ÑÒ
+      rules:
+        title: ÐÑÐµÐ¶ÐµÐ»ÐµÑi!
+    communities:
+      title: ÒÐ°ÑÑÐ¼Ð´Ð°ÑÑÑÒÑÐ°Ñ
   traces:
     new:
       help: ÐÐ½ÑÒÑÐ°Ð¼Ð°
     edit:
       cancel: ÐÐ¾Ð»Ð´ÑÑÐ¼Ð°Ñ
-    trace_optionals:
-      tags: Ð¢ÐµÐ³ÑÐµÑ
+    update:
+      updated: ÐÐ°ÒÐ´Ð°Ñ Ð¶Ð°Ò£Ð°ÑÑÑÐ»Ð´Ñ
     show:
       filename: 'Ð¤Ð°Ð¹Ð» Ð°ÑÐ°ÑÑ:'
       download: Ð¶Ò¯ÐºÑÐµÐ¿ Ð°Ð»Ñ
+      map: ÐºÐ°ÑÑÐ°
       edit: Ó©Ò£Ð´ÐµÑ
+      owner: 'ÐÐµÑÑ:'
+      tags: 'Ð¢ÐµÐ³ÑÐµÑ:'
+      none: ÐÐ¾Ò
+      delete_trace: ÐÒ±Ð» Ð±Ð°ÒÐ´Ð°ÑÐ´Ñ Ð¶Ð¾Ñ
+      trace_not_found: ÐÐ°ÒÐ´Ð°Ñ ÑÐ°Ð±ÑÐ»Ð¼Ð°Ð´Ñ!
     trace:
       edit_map: ÐÐ°ÑÑÐ°Ð½Ñ Ó©Ò£Ð´ÐµÑ
-  oauth_clients:
-    index:
-      oauth: OAuth
+  application:
+    settings_menu:
+      oauth2_applications: OAuth 2 ÒÐ¾ÑÑÐ¼ÑÐ°Ð»Ð°ÑÑ
+    auth_providers:
+      openid:
+        title: OpenID Ð°ÑÒÑÐ»Ñ ÐºÑÑÑ
+      google:
+        title: Google Ð°ÑÒÑÐ»Ñ ÐºÑÑÑ
+      facebook:
+        title: Facebook Ð°ÑÒÑÐ»Ñ ÐºÑÑÑ
+      microsoft:
+        title: Microsoft Ð°ÑÒÑÐ»Ñ ÐºÑÑÑ
+      github:
+        title: GitHub Ð°ÑÒÑÐ»Ñ ÐºÑÑÑ
+      wikipedia:
+        title: Ð£Ð¸ÐºÐ¸Ð¿ÐµÐ´Ð¸Ñ Ð°ÑÒÑÐ»Ñ ÐºÑÑÑ
   oauth2_applications:
+    index:
+      permissions: Ð Ò±ÒÑÐ°ÑÑÐ°Ñ
     application:
       edit: Ó¨Ò£Ð´ÐµÑ
+      delete: ÐÐ¾Ñ
+      confirm_delete: ÐÒ±Ð» ÒÐ¾ÑÑÐ¼ÑÐ°Ð½Ñ Ð¶Ð¾Ñ ÐºÐµÑÐµÐº Ð¿Ðµ?
+    show:
+      edit: Ó¨Ò£Ð´ÐµÑ
+      delete: ÐÐ¾Ñ
+      confirm_delete: ÐÒ±Ð» ÒÐ¾ÑÑÐ¼ÑÐ°Ð½Ñ Ð¶Ð¾Ñ ÐºÐµÑÐµÐº Ð¿Ðµ?
+  oauth2_authorized_applications:
+    index:
+      permissions: Ð Ò±ÒÑÐ°ÑÑÐ°Ñ
   users:
     new:
-      email address: 'Ð-Ð¿Ð¾ÑÑÐ° Ð¼ÐµÐºÐµÐ½Ð¶Ð°Ð¹Ñ:'
+      display name description: ÐÐ°ÑÒÐ° ÒÐ¾Ð»Ð´Ð°Ð½ÑÑÑÐ»Ð°ÑÒÐ° ÐºÓ©ÑÑÐ½ÐµÑÑÐ½ Ð°ÑÑÒ£ÑÐ·. ÐÐµÐ¹ÑÐ½ÑÑÐµÐº Ð¾Ð½Ñ
+        Ð±Ð°Ð¿ÑÐ°ÑÐ»Ð°ÑÐ´Ð° Ó©Ð·Ð³ÐµÑÑÐµ Ð°Ð»Ð°ÑÑÐ·.
     terms:
       consider_pd_why: Ð±Ò±Ð» Ð½Ðµ?
       continue: ÐÐ°Ð»ÒÐ°ÑÑÑÑÑ
@@ -808,19 +1180,62 @@ kk-cyrl:
         france: Ð¤ÑÐ°Ð½ÑÐ¸Ñ
         italy: ÐÑÐ°Ð»Ð¸Ñ
         rest_of_world: ÒÐ°Ð»ÒÐ°Ð½ ÓÐ»ÐµÐ¼
+    no_such_user:
+      deleted: Ð¶Ð¾Ð¹ÑÐ»ÒÐ°Ð½
     show:
       my diary: ÐÒ¯Ð½Ð´ÐµÐ»ÑÐ³ÑÐ¼
       my edits: Ó¨Ò£Ð´ÐµÐ¼ÐµÐ»ÐµÑÑÐ¼
+      my traces: ÐÐ°ÒÐ´Ð°ÑÐ»Ð°ÑÑÐ¼
+      my notes: ÐÑÐºÐµÑÑÐ¿ÐµÐ»ÐµÑÑÐ¼
+      my messages: Ð¥Ð°ÑÑÐ°ÑÑÐ¼
+      my profile: ÐÐµÐ¹ÑÐ½ÑÐ¼
       my settings: ÐÐ°Ð¿ÑÐ°ÑÐ»Ð°ÑÑÐ¼
       my_preferences: ÒÐ°Ð»Ð°ÑÐ»Ð°ÑÑÐ¼
+      send message: Ð¥Ð°Ñ Ð¶ÑÐ±ÐµÑÑ
       diary: ÐÒ¯Ð½Ð´ÐµÐ»ÑÐº
+      traces: ÐÐ°ÒÐ´Ð°ÑÐ»Ð°ÑÑ
+      remove as friend: ÐÐ¾ÑÑÐ°ÑÐ´Ð°Ð½ Ð¶Ð¾Ñ
+      mapper since: 'Ð¢ÑÑÐºÐµÐ»Ð³ÐµÐ½ ÐºÒ¯Ð½Ñ:'
     index:
       title: ÒÐ¾Ð»Ð´Ð°Ð½ÑÑÑÐ»Ð°Ñ
       heading: ÒÐ¾Ð»Ð´Ð°Ð½ÑÑÑÐ»Ð°Ñ
   user_blocks:
-    blocks:
-      next: ÐÐµÐ»ÐµÑÑ Â»
-      previous: Â« ÐÐ»Ð´ÑÒ£ÒÑ
+    helper:
+      block_duration:
+        hours:
+          one: '%{count} ÑÐ°Ò.'
+          other: '%{count} ÑÐ°Ò.'
+        days:
+          one: '%{count} ÐºÒ¯Ð½'
+          other: '%{count} ÐºÒ¯Ð½'
+        weeks:
+          one: '%{count} Ð°Ð¿ÑÐ°'
+          other: '%{count} Ð°Ð¿ÑÐ°'
+        months:
+          one: '%{count} Ð°Ð¹'
+          other: '%{count} Ð°Ð¹'
+        years:
+          one: '%{count} Ð¶ÑÐ»'
+          other: '%{count} Ð¶ÑÐ»'
+    show:
+      edit: Ó¨Ò£Ð´ÐµÑ
+      reason: 'ÐÒ±ÒÐ°ÑÑÐ°Ñ ÑÐµÐ±ÐµÐ±Ñ:'
+    block:
+      edit: Ó¨Ò£Ð´ÐµÑ
+    page:
+      reason: 'ÐÒ±ÒÐ°ÑÑÐ°Ñ ÑÐµÐ±ÐµÐ±Ñ:'
+  notes:
+    index:
+      description: Ð¡Ð¸Ð¿Ð°ÑÑÐ°Ð¼Ð°
+    show:
+      title: 'ÐÑÐºÐµÑÑÐ¿Ðµ: %{id}'
+      description: Ð¡Ð¸Ð¿Ð°ÑÑÐ°Ð¼Ð°
+      hide: ÐÐ°ÑÑÑÑ
+    new:
+      title: ÐÐ°Ò£Ð° ÐµÑÐºÐµÑÑÐ¿Ðµ
+      add: ÐÑÐºÐµÑÑÐ¿Ðµ ÒÐ¾ÑÑ
+    notes_paging_nav:
+      showing_page: '%{page}-Ð±ÐµÑÑ'
   javascripts:
     close: ÐÐ°Ð±Ñ
     share:
@@ -829,27 +1244,44 @@ kk-cyrl:
       image: Ð¡ÑÑÐµÑ
       link: Ð¡ÑÐ»ÑÐµÐ¼Ðµ Ð½ÐµÐ¼ÐµÑÐµ HTML
       long_link: Ð¡ÑÐ»ÑÐµÐ¼Ðµ
+      short_link: ÒÑÑÒÐ° ÑÑÐ»ÑÐµÐ¼Ðµ
       geo_uri: Geo URI
       embed: HTML
       format: 'Ð¤Ð¾ÑÐ¼Ð°ÑÑ:'
       scale: 'ÐÐ°ÑÑÑÐ°Ð±Ñ:'
-      image_dimensions: Ó¨Ð»ÑÐµÐ¼Ñ %{width} x %{height} ÑÑÑÐµÑÑÐµ ÑÑÐ°Ð½Ð´Ð°ÑÑÑÑ ÒÐ°Ð±Ð°Ñ ÐºÓ©ÑÑÐµÑÑÐ»ÐµÐ´Ñ
+      image_dimensions: Ó¨Ð»ÑÐµÐ¼Ñ %{width} x %{height} Ð±Ð¾Ð»Ð°ÑÑÐ½ ÑÑÑÐµÑÑÐµ ÑÑÐ°Ð½Ð´Ð°ÑÑÑÑ ÒÐ°Ð±Ð°Ñ
+        ÐºÓ©ÑÑÐµÑÑÐ»ÐµÐ´Ñ
       download: ÐÒ¯ÐºÑÐµÐ¿ Ð°Ð»Ñ
+      short_url: ÒÑÑÒÐ° URL
+    key:
+      title: Ð¨Ð°ÑÑÑÑ Ð±ÐµÐ»Ð³ÑÐ»ÐµÑ
+      tooltip: Ð¨Ð°ÑÑÑÑ Ð±ÐµÐ»Ð³ÑÐ»ÐµÑ
+      tooltip_disabled: ÐÒ±Ð» ÒÐ°Ð±Ð°ÑÑÑÒ£ ÑÐ°ÑÑÑÑ Ð±ÐµÐ»Ð³ÑÐ»ÐµÑÑ ÒÐ¾Ð»Ð¶ÐµÑÑÐ¼ÑÑÐ·
     map:
+      zoom:
+        in: Ò®Ð»ÐºÐµÐ¹ÑÑ
+        out: ÐÑÑÑÑÐµÐ¹ÑÑ
+      locate:
+        title: ÐÑÐ½Ð°Ð»Ð°ÑÒÐ°Ð½ Ð¶ÐµÑÑÐ¼Ð´Ñ ÐºÓ©ÑÑÐµÑÑ
+      base:
+        standard: CÑÐ°Ð½Ð´Ð°ÑÑÑÑ
+        transport_map: ÐÓ©Ð»ÑÐº ÐºÐ°ÑÑÐ°ÑÑ
       layers:
         header: ÐÐ°ÑÑÐ° ÒÐ°Ð±Ð°ÑÑÐ°ÑÑ
         title: ÒÐ°Ð±Ð°ÑÑÐ°Ñ
-    changesets:
-      show:
-        subscribe: ÐÐ°Ð·ÑÐ»Ñ
-        hide_comment: Ð¶Ð°ÑÑÑÑ
-    notes:
-      show:
-        hide: ÐÐ°ÑÑÑÑ
+    site:
+      edit_disabled_tooltip: ÐÐ°ÑÑÐ°Ð½Ñ Ó©Ò£Ð´ÐµÑ Ò¯ÑÑÐ½ Ð¾Ð½Ñ Ò¯Ð»ÐºÐµÐ¹ÑÑÐ¿ Ð¶ÑÐ±ÐµÑÑÒ£ÑÐ·
+      queryfeature_tooltip: ÐÐ°Ò£Ð°Ð¹Ð´Ð°ÒÑ Ð½ÑÑÐ°Ð½Ð´Ð°Ñ
+      queryfeature_disabled_tooltip: ÐÐ°Ò£Ð°Ð¹Ð´Ð°ÒÑ Ð½ÑÑÐ°Ð½Ð´Ð°ÑÐ´Ñ ÐºÓ©ÑÑ Ò¯ÑÑÐ½ ÐºÐ°ÑÑÐ°Ð½Ñ Ò¯Ð»ÐºÐµÐ¹ÑÑÐ¿
+        Ð¶ÑÐ±ÐµÑÑÒ£ÑÐ·
     directions:
       engines:
         fossgis_osrm_bike: ÐÐµÐ»Ð¾ÑÐ¸Ð¿ÐµÐ´ (OSRM)
+        fossgis_osrm_foot: ÐÐ°ÑÑ (OSRM)
+        graphhopper_foot: ÐÐ°ÑÑ (GraphHopper)
       instructions:
+        via_point_without_exit: (Ð½Ò¯ÐºÑÐµ Ð°ÑÒÑÐ»Ñ)
+        unnamed: Ð°ÑÐ°ÑÑÑÐ· Ð¶Ð¾Ð»
         exit_counts:
           first: 1-ÑÑ
           second: 2-ÑÑ
@@ -861,6 +1293,31 @@ kk-cyrl:
           eighth: 8-ÑÑ
           ninth: 9-ÑÑ
           tenth: 10-ÑÑ
+      time: Ò°Ð·Ð°ÒÑÑÒÑ
+    query:
+      node: ÐÒ¯ÐºÑÐµ
+      way: Ð¡ÑÐ·ÑÒ
+      relation: ÒÐ°ÑÑÐ½Ð°Ñ
     context:
+      directions_from: ÐÑÑ Ð¶ÐµÑÐ´ÐµÐ½ Ð¼Ð°ÑÑÑÑÑ ÒÒ±ÑÑ
+      directions_to: ÐÑÑ Ð¶ÐµÑÐ³Ðµ Ð¼Ð°ÑÑÑÑÑ ÒÒ±ÑÑ
+      add_note: ÐÒ±Ð½Ð´Ð° ÐµÑÐºÐµÑÑÐ¿Ðµ ÒÐ¾ÑÑ
       show_address: ÐÐµÐºÐµÐ½Ð¶Ð°Ð¹Ð´Ñ ÐºÓ©ÑÑÐµÑÑ
+      query_features: ÐÐ°Ò£Ð°Ð¹Ð´Ð°ÒÑ Ð½ÑÑÐ°Ð½Ð´Ð°Ñ
+      centre_map: ÐÐ°ÑÑÐ° Ð¾ÑÑÐ°ÑÑÐ½ Ð¼Ò±Ð½Ð´Ð° Ð¶ÑÐ»Ð¶ÑÑÑ
+  redactions:
+    edit:
+      heading: Ð¢Ò¯Ð·ÐµÑÑÐ´Ñ Ó©Ò£Ð´ÐµÑ
+      title: Ð¢Ò¯Ð·ÐµÑÑÐ´Ñ Ó©Ò£Ð´ÐµÑ
+    index:
+      heading: Ð¢Ò¯Ð·ÐµÑÑÐ»ÐµÑ ÑÑÐ·ÑÐ¼Ñ
+      title: Ð¢Ò¯Ð·ÐµÑÑÐ»ÐµÑ ÑÑÐ·ÑÐ¼Ñ
+    show:
+      confirm: Ð¡ÐµÐ½ÑÐ¼Ð´ÑÑÑÐ· Ð±Ðµ?
+    create:
+      flash: Ð¢Ò¯Ð·ÐµÑÑ Ð¶Ð°ÑÐ°Ð»Ð´Ñ.
+    update:
+      flash: Ó¨Ð·Ð³ÐµÑÑÑÑÐµÑ ÑÐ°ÒÑÐ°Ð»Ð´Ñ.
+  validations:
+    invalid_characters: ÑÑÑÐ½Ð´Ðµ Ð¶Ð°ÑÐ°Ð¼ÑÑÐ· ÑÐ°Ò£Ð±Ð°Ð»Ð°Ñ Ð±Ð°Ñ
 ...