X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/35392c1a2f25ced94150ac81cba1b7e517ce145b..6290405336817cd282ad5062ce3fc3774ccf61e4:/config/locales/kk-cyrl.yml?ds=sidebyside

diff --git a/config/locales/kk-cyrl.yml b/config/locales/kk-cyrl.yml
index 7c3568b3c..5e86447b8 100644
--- a/config/locales/kk-cyrl.yml
+++ b/config/locales/kk-cyrl.yml
@@ -1,9 +1,13 @@
 # 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: Ð¤Ð°Ð¹Ð»Ð´Ñ ÑÐ°Ò£Ð´Ð°Ò£ÑÐ·
@@ -20,51 +24,130 @@ kk-cyrl:
       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: Ð¶Ð°ÑÐ°Ð¼Ð´Ñ Ðµ-Ð¿Ð¾ÑÑÐ° Ð¼ÐµÐºÐµÐ½Ð¶Ð°Ð¹ÑÐ½Ð° Ò±ÒÑÐ°Ð¼Ð°Ð¹Ð´Ñ
+        email_address_not_routable: ÒÐ¾Ð»Ð¶ÐµÑÑÐ¼Ð´Ñ ÐµÐ¼ÐµÑ
     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: Ð¢ÑÐ»
+        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: Ð-Ð¿Ð¾ÑÑÐ°
+        email_confirmation: E-mail ÑÐ°ÑÑÐ°Ñ
         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:
@@ -76,6 +159,9 @@ kk-cyrl:
       about_x_years:
         one: ÑÐ°Ð¼Ð°Ð¼ÐµÐ½ 1 Ð¶ÑÐ» Ð±Ò±ÑÑÐ½
         other: ÑÐ°Ð¼Ð°Ð¼ÐµÐ½ %{count} Ð¶ÑÐ» Ð±Ò±ÑÑÐ½
+      almost_x_years:
+        one: 1 Ð¶ÑÐ» Ð±Ò±ÑÑÐ½ Ð´ÐµÑÐ»ÑÐº
+        other: '%{count} Ð¶ÑÐ» Ð±Ò±ÑÑÐ½ Ð´ÐµÑÐ»ÑÐº'
       half_a_minute: Ð¶Ð°ÑÑÑ Ð¼Ð¸Ð½ÑÑ Ð±Ò±ÑÑÐ½
       x_seconds:
         one: 1 ÑÐµÐºÑÐ½Ð´ Ð±Ò±ÑÑÐ½
@@ -102,10 +188,9 @@ kk-cyrl:
       description: ÒÐ°ÑÑÒÑÐ°Ð½ Ð±Ð°ÑÒÐ°ÑÑ (JOSM, Potlatch, Merkaartor)
   auth:
     providers:
-      openid: OpenID
+      none: ÐÐ¾Ò
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Ð£Ð¸ÐºÐ¸Ð¿ÐµÐ´Ð¸Ñ
   api:
@@ -120,6 +205,9 @@ kk-cyrl:
   account:
     deletions:
       show:
+        title: Ð¢ÑÑÐºÐµÐ»Ð³ÑÐ¼Ð´Ñ Ð¶Ð¾Ñ
+        delete_account: Ð¢ÑÑÐºÐµÐ»Ð³ÑÐ½Ñ Ð¶Ð¾Ñ
+        confirm_delete: Ð¡ÐµÐ½ÑÐ¼Ð´ÑÑÑÐ· Ð±Ðµ?
         cancel: ÐÐ¾Ð»Ð´ÑÑÐ¼Ð°Ñ
   accounts:
     edit:
@@ -133,30 +221,67 @@ kk-cyrl:
       contributor terms:
         link text: Ð±Ò±Ð» Ð½Ðµ?
       save changes button: Ó¨Ð·Ð³ÐµÑÑÑÑÐµÑÐ´Ñ ÑÐ°ÒÑÐ°Ñ
+      delete_account: Ð¢ÑÑÐºÐµÐ»Ð³ÑÐ½Ñ Ð¶Ð¾Ñ...
+    go_public:
+      heading: ÐÐ°ÑÐ¸Ñ Ó©Ò£Ð´ÐµÑ
+      make_edits_public_button: ÐÐ°ÑÐ»ÑÒ Ó©Ò£Ð´ÐµÐ¼ÐµÐ»ÐµÑÑÐ¼Ð´Ñ Ð¶Ð°ÑÐ¸Ñ ÐµÑÑ
+    destroy:
+      success: Ð¢ÑÑÐºÐµÐ»Ð³Ñ Ð¶Ð¾Ð¹ÑÐ»Ð´Ñ.
   browse:
-    closed: ÐÐ°Ð±ÑÒ
-    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: 1 ÒÐ°ÑÑÐ½Ð°Ñ
+      other: '%{count} ÒÐ°ÑÑÐ½Ð°Ñ'
+    part_of_ways:
+      one: 1 ÑÑÐ·ÑÒ
+      other: '%{count} ÑÑÐ·ÑÒ'
     download_xml: XML Ð¶Ò¯ÐºÑÐµÐ¿ Ð°Ð»Ñ
+    view_history: Ð¢Ð°ÑÐ¸ÑÑÐ½ ÐºÓ©ÑÑ
+    view_details: ÐÐ³Ð¶ÐµÐ¹-ÑÐµÐ³Ð¶ÐµÐ¹ÑÐ½ ÐºÓ©ÑÑ
     location: 'ÐÐµÐ¾Ð³ÑÐ°ÑÐ¸ÑÐ»ÑÒ Ð¾ÑÐ½Ñ:'
-    changeset:
-      comment: ÐÑÐºÑÑÐ»ÐµÑ (%{count})
-      osmchangexml: osmChange XML
-      discussion: Ð¢Ð°Ð»ÒÑÐ»Ð°Ñ
+    node:
+      title_html: 'ÐÒ¯ÐºÑÐµ: %{name}'
+      history_title_html: 'ÐÒ¯ÐºÑÐµ ÑÐ°ÑÐ¸ÑÑ: %{name}'
+    way:
+      title_html: 'Ð¡ÑÐ·ÑÒ: %{name}'
+      history_title_html: 'Ð¡ÑÐ·ÑÒ ÑÐ°ÑÐ¸ÑÑ: %{name}'
+      nodes: ÐÒ¯ÐºÑÐµÐ»ÐµÑ
+      nodes_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}
       type:
         node: Ð½Ò¯ÐºÑÐµ
+        way: ÑÑÐ·ÑÒ
+        relation: ÒÐ°ÑÑÐ½Ð°Ñ
     start_rjs:
       loading: ÐÒ¯ÐºÑÐµÐ»ÑÐ´Ðµâ¦
     tag_details:
@@ -164,9 +289,9 @@ kk-cyrl:
       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} ÑÐ°Ñ Ð¶ÑÐ±ÐµÑÑ'
   changesets:
     changeset_paging_nav:
       showing_page: '%{page}-Ð±ÐµÑÑ'
@@ -175,16 +300,40 @@ kk-cyrl:
     changeset:
       anonymous: ÐÐ½Ð¾Ð½Ð¸Ð¼
       no_edits: (Ó©Ò£Ð´ÐµÐ¼ÐµÐ»ÐµÑ Ð¶Ð¾Ò)
+      view_changeset_details: Ó¨Ò£Ð´ÐµÐ¼Ðµ Ð´ÐµÑÑÐµÑÑÐ½ÑÒ£ ÐµÐ³Ð¶ÐµÐ¹-ÑÐµÐ³Ð¶ÐµÐ¹ÑÐ½ ÐºÓ©ÑÑ
     changesets:
       id: ID
       user: ÒÐ¾Ð»Ð´Ð°Ð½ÑÑÑ
     index:
+      title: Ó¨Ò£Ð´ÐµÐ¼Ðµ Ð´ÐµÑÑÐµÐ»ÐµÑÑ
+      title_user: '%{user} Ð¶Ð°ÑÐ°ÒÐ°Ð½ Ó©Ò£Ð´ÐµÐ¼ÐµÐ»ÐµÑ Ð´ÐµÑÑÐµÐ»ÐµÑÑ'
+      title_user_link_html: '%{user_link} Ð¶Ð°ÑÐ°ÒÐ°Ð½ Ó©Ò£Ð´ÐµÐ¼Ðµ Ð´ÐµÑÑÐµÐ»ÐµÑÑ'
+      title_friend: ÐÐ¾ÑÑÐ°ÑÑÐ¼Ð½ÑÒ£ Ó©Ò£Ð´ÐµÐ¼ÐµÐ»ÐµÑ Ð´ÐµÑÑÐµÐ»ÐµÑÑ
       load_more: ÐÓ©Ð±ÑÑÐµÐº Ð¶Ò¯ÐºÑÐµÑ
+      feed:
+        title: Ó¨Ò£Ð´ÐµÐ¼Ðµ Ð´ÐµÑÑÐµÑÑ %{id}
+        closed: ÐÐ°Ð±ÑÒ
+    show:
+      title: 'Ó¨Ò£Ð´ÐµÐ¼Ðµ Ð´ÐµÑÑÐµÑÑ: %{id}'
+      discussion: Ð¢Ð°Ð»ÒÑÐ»Ð°Ñ
+      changesetxml: Ó¨Ò£Ð´ÐµÐ¼Ðµ Ð´ÐµÑÑÐµÑÑÐ½ÑÒ£ XML-Ñ
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: ÐÒ¯ÐºÑÐµÐ»ÐµÑ (%{count})
+      ways: Ð¡ÑÐ·ÑÒÑÐ°Ñ (%{count})
+      relations: ÒÐ°ÑÑÐ½Ð°ÑÑÐ°Ñ (%{count})
+  changeset_comments:
+    comment:
+      commented_at_by_html: '%{when} %{user} Ð¶Ð°Ò£Ð°ÑÑÒÐ°Ð½'
   dashboards:
+    contact:
+      km away: ÐÒ±Ð´Ð°Ð½ %{count} ÐºÐ¼ Ð¶ÐµÑÐ´Ðµ
+      m away: ÐÒ±Ð´Ð°Ð½ %{count} Ð¼ Ð¶ÐµÑÐ´Ðµ
     popup:
       friend: ÐÐ¾Ñ
     show:
       my friends: ÐÐ¾ÑÑÐ°ÑÑÐ¼
+      friends_changesets: Ð´Ð¾ÑÑÐ°ÑÐ´ÑÒ£ Ó©Ò£Ð´ÐµÐ¼Ðµ Ð´ÐµÑÑÐµÐ»ÐµÑÑ
       friends_diaries: ÐÐ¾ÑÑÐ°ÑÐ´ÑÒ£ ÐºÒ¯Ð½Ð´ÐµÐ»ÑÐº Ð¶Ð°Ð·Ð±Ð°Ð»Ð°ÑÑ
   diary_entries:
     new:
@@ -210,6 +359,7 @@ kk-cyrl:
     no_such_entry:
       title: ÐÒ¯Ð½Ð´ÐµÐ»ÑÐºÑÐµ Ð¼Ò±Ð½Ð´Ð°Ð¹ Ð¶Ð°Ð·Ð±Ð° Ð¶Ð¾Ò
     diary_entry:
+      edit_link: ÐÒ±Ð» Ð¶Ð°Ð·Ð±Ð°Ð½Ñ Ó©Ò£Ð´ÐµÑ
       hide_link: ÐÒ±Ð» Ð¶Ð°Ð·Ð±Ð°Ð½Ñ Ð¶Ð°ÑÑÑÑ
       unhide_link: ÐÒ±Ð» Ð¶Ð°Ð·Ð±Ð°Ð½Ñ ÐºÓ©ÑÑÐµÑÑ
       confirm: ÒÒ±Ð¿ÑÐ°Ñ
@@ -224,17 +374,21 @@ kk-cyrl:
       comment: ÐÑÐºÑÑ
       newer_comments: ÐÐ°Ò£Ð°Ð»Ð°Ñ Ð¿ÑÐºÑÑÐ»ÐµÑ
       older_comments: ÐÑÐºÑÐ»ÐµÑ Ð¿ÑÐºÑÑÐ»ÐµÑ
+  doorkeeper:
+    flash:
+      applications:
+        create:
+          notice: ÒÐ¾ÑÑÐ¼ÑÐ° ÑÑÑÐºÐµÐ»Ð³ÐµÐ½.
+  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> Ð½ÓÑÐ¸Ð¶ÐµÐ»ÐµÑÑ
     search_osm_nominatim:
       prefix:
         aerialway:
@@ -243,11 +397,12 @@ kk-cyrl:
         aeroway:
           aerodrome: ÓÑÐµÐ°Ð¹Ð»Ð°Ò
           airstrip: ÐÐµÒ£ÑÐ» Ò±ÑÐ°ÒÒÐ° Ð°ÑÐ½Ð°Ð»ÒÐ°Ð½ Ò°ÒÐ
-          apron: ÐÐµÑÑÐ¾Ð½
+          apron: ÓÑÐµÐ¶Ð°Ð¹ Ð¿ÐµÑÑÐ¾Ð½Ñ
           hangar: ÐÐ½Ð³Ð°Ñ
           helipad: Ð¢ÑÐºÒ±ÑÐ°Ò Ð°Ð»Ð°Ò£Ñ
           runway: Ò°ÑÑ-ÒÐ¾Ð½Ñ Ð¶Ð¾Ð»Ð°ÒÑ
-          terminal: Ð¢ÐµÑÐ¼Ð¸Ð½Ð°Ð»
+          terminal: ÓÑÐµÐ¶Ð°Ð¹ ÑÐµÑÐ¼Ð¸Ð½Ð°Ð»Ñ
+          windsock: ÐÐµÐ»Ð±Ð°ÒÐ°Ñ
         amenity:
           arts_centre: Ó¨Ð½ÐµÑ Ð¾ÑÑÐ°Ð»ÑÒÑ
           atm: ÐÐ°Ð½ÐºÐ¾Ð¼Ð°Ñ
@@ -262,8 +417,10 @@ kk-cyrl:
           bus_station: ÐÐ²ÑÐ¾Ð±ÐµÐºÐµÑ
           cafe: ÐÐ°ÑÐµ
           car_rental: ÐÐ²ÑÐ¾ÐºÓ©Ð»ÑÐºÑÑ Ð¶Ð°Ð»ÒÐ° Ð±ÐµÑÑ
+          car_sharing: ÐÐ°ÑÑÐµÑÐ¸Ò£
           car_wash: ÐÐ²ÑÐ¾Ð¶ÑÑ
           casino: ÐÐ°Ð·Ð¸Ð½Ð¾
+          charging_station: ÐÐ°ÑÑÐ´ÑÐ°Ñ Ð±ÐµÐºÐµÑÑ
           cinema: ÐÐ¸Ð½Ð¾ÑÐµÐ°ÑÑ
           clinic: ÐÐ¼ÑÐ°Ð½Ð°
           clock: Ð¡Ð°ÒÐ°Ñ
@@ -276,9 +433,11 @@ kk-cyrl:
           driving_school: ÐÐ²ÑÐ¾Ð¼ÐµÐºÑÐµÐ¿
           embassy: ÐÐ»ÑÑÐ»ÑÐº
           fast_food: Ð¤Ð°ÑÑÑÑÐ´
+          ferry_terminal: ÐÐ°ÑÐ¾Ð¼ Ð±ÐµÐºÐµÑÑ
           fire_station: Ó¨ÑÑ ÑÓ©Ð½Ð´ÑÑÑ Ð±Ó©Ð»ÑÐ¼Ñ
           fountain: Ð¡Ñ Ð±Ò±ÑÒÐ°Ò
           hospital: ÐÑÑÑÑÐ°Ð½Ð°
+          hunting_stand: ÐÒ£ÑÑ Ð¼Ò±Ð½Ð°ÑÐ°ÑÑ
           ice_cream: ÐÐ°Ð»Ð¼Ò±Ð·Ð´Ð°Ò
           internet_cafe: ÐÐ½ÑÐµÑÐ½ÐµÑ-ÐºÐ°ÑÐµ
           kindergarten: ÐÐ°Ð»Ð°Ð±Ð°ÒÑÐ°
@@ -303,6 +462,7 @@ kk-cyrl:
           studio: Ð¡ÑÑÐ´Ð¸Ñ
           swimming_pool: ÐÐ°ÑÑÐµÐ¹Ð½
           taxi: Ð¢Ð°ÐºÑÐ¸
+          telephone: Ð¢ÐµÐ»ÐµÑÐ¾Ð½
           theatre: Ð¢ÐµÐ°ÑÑ
           toilets: ÐÓÑÐµÑÑÐ°Ð½Ð°
           training: ÐÒÑ Ð¾ÑÑÐ°Ð»ÑÒÑ
@@ -335,6 +495,7 @@ kk-cyrl:
           hotel: ÒÐ¾Ð½Ð°Ò Ò¯Ð¹ ÒÐ¸Ð¼Ð°ÑÐ°ÑÑ
           house: Ò®Ð¹
           houseboat: ÐÒ¯Ð·Ð±ÐµÐ»Ñ Ò¯Ð¹
+          hut: ÐÐ°ÑÑÒ
           industrial: Ó¨Ð½ÐµÑÐºÓÑÑÐ¿ÑÑÐº ÒÐ¸Ð¼Ð°ÑÐ°Ñ
           kindergarten: ÐÐ°Ð»Ð°Ð±Ð°ÒÑÐ° ÒÐ¸Ð¼Ð°ÑÐ°ÑÑ
           manufacture: Ó¨Ð½ÐµÑÐºÓÑÑÐ¿ÑÑÐº ÒÐ¸Ð¼Ð°ÑÐ°Ñ
@@ -369,13 +530,17 @@ kk-cyrl:
           ambulance_station: ÐÐµÐ´ÐµÐ» Ð¶ÓÑÐ´ÐµÐ¼ Ð±ÐµÐºÐµÑÑ
           defibrillator: ÐÐµÑÐ¸Ð±ÑÐ¸Ð»Ð»ÑÑÐ¾Ñ
         highway:
+          bridleway: ÐÑÐ¿ÐµÐ½ Ð¶Ò¯ÑÑ Ð¶Ð¾Ð»Ñ
           bus_stop: ÐÐ²ÑÐ¾Ð±ÑÑ Ð°ÑÐ»Ð´Ð°Ð¼Ð°ÑÑ
           cycleway: ÐÐµÐ»Ð¾ÑÐ¸Ð¿ÐµÐ´ Ð¶Ð¾Ð»Ñ
           elevator: ÐÐ¸ÑÑ
+          footway: Ð¢ÑÐ¾ÑÑÐ°Ñ
           ford: Ó¨ÑÐºÐµÐ»
           milestone: ÐÐ¸Ð»Ð¾Ð¼ÐµÑÑÐ»ÑÐº Ð±Ð°ÒÐ°Ð½Ð°
+          motorway: ÐÐ²ÑÐ¾ÐºÒ¯ÑÐµÐ¶Ð¾Ð»
           path: Ð¡Ð¾ÒÐ¿Ð°Ò
           platform: ÐÐ»Ð°ÑÑÐ¾ÑÐ¼Ð°
+          primary: ÐÑÑÑÐ½ÑÑ Ð´ÓÑÐµÐ¶ÐµÐ»Ñ Ð¶Ð¾Ð»
           raceway: ÐÐ°ÑÑÑ ÑÑÐ°ÑÑÐ°ÑÑ
           rest_area: ÐÐµÐ¼Ð°Ð»ÑÑ Ð°Ð¹Ð¼Ð°ÒÑ
           road: ÐÐ¾Ð»
@@ -407,11 +572,14 @@ kk-cyrl:
           forest: ÐÑÐ¼Ð°Ð½ ÑÐ°ÑÑÐ°ÑÑÐ»ÑÒÑ
           garages: ÐÐ°ÑÐ°Ð¶Ð´Ð°Ñ
           grass: Ð¨Ó©Ð¿
+          industrial: Ó¨Ð½ÐµÑÐºÓÑÑÐ¿ Ð°Ð¹Ð¼Ð°ÒÑ
           landfill: ÒÐ¾ÒÑÑ Ð¾ÑÐ½Ñ
           meadow: Ð¨Ð°Ð±ÑÐ½Ð´ÑÒ
+          military: ÓÑÐºÐµÑÐ¸ Ð°Ð¹Ð¼Ð°Ò
           orchard: ÐÐµÐ¼ÑÑ Ð±Ð°ÒÑ
           quarry: ÐÐ°ÑÑÐµÑ
           railway: Ð¢ÐµÐ¼ÑÑ Ð¶Ð¾Ð»
+          residential: Ð¢Ò±ÑÒÑÐ½ Ð°ÑÐ´Ð°Ð½
           vineyard: ÐÒ¯Ð·ÑÐ¼Ð´ÑÐº
           "yes": ÐÐµÑÐ´Ñ Ð¿Ð°Ð¹Ð´Ð°Ð»Ð°Ð½Ñ
         leisure:
@@ -424,7 +592,7 @@ kk-cyrl:
           ice_rink: ÐÒ±Ð· Ð°Ð¹Ð´ÑÐ½Ñ
           marina: ÐÐ¹Ð»Ð°Ò
           miniature_golf: ÐÐ¸Ð½Ð¸Ð³Ð¾Ð»ÑÑ
-          park: ÐÐ°ÑÐº
+          park: Ð¡Ð°ÑÐ±Ð°Ò
           pitch: Ð¡Ð¿Ð¾ÑÑ Ð°Ð»Ð°Ò£Ñ
           resort: Ð¨Ð¸Ð¿Ð°Ð¶Ð°Ð¹
           sauna: Ð¡Ð°ÑÐ½Ð°
@@ -567,6 +735,7 @@ kk-cyrl:
           copyshop: ÐÓ©ÑÑÑÐ¼Ðµ Ð¾ÑÑÐ°Ð»ÑÒÑ
           cosmetics: ÐÐ¾ÑÐ¼ÐµÑÐ¸ÐºÐ° Ð´Ò¯ÐºÐµÐ½Ñ
           dairy: Ð¡Ò¯Ñ Ó©Ð½ÑÐ¼Ð´ÐµÑÑ Ð´Ò¯ÐºÐµÐ½Ñ
+          deli: ÐÐµÐ»Ð¸ÐºÐ°ÑÐµÑÑÐµÑ
           department_store: Ð£Ð½Ð¸Ð²ÐµÑÐ¼Ð°Ð³
           dry_cleaning: Ð¥Ð¸Ð¼ÑÐ°Ð·Ð°Ð»Ð°Ñ
           e-cigarette: Ð­Ð»ÐµÐºÑÑÐ¾Ð½Ð´Ñ ÑÐµÐ¼ÐµÐºÑ Ð´Ò¯ÐºÐµÐ½Ñ
@@ -579,8 +748,10 @@ kk-cyrl:
           furniture: ÐÐ¸Ò»Ð°Ð·
           grocery: ÐÐ·ÑÒ-ÑÒ¯Ð»ÑÐº Ð´Ò¯ÐºÐµÐ½Ñ
           hairdresser: Ð¨Ð°ÑÑÐ°ÑÐ°Ð·
+          hardware: Ð¨Ð°ÑÑÐ°ÑÑÐ»ÑÒ Ð´Ò¯ÐºÐµÐ½Ñ
           health_food: ÐÐ°Ð¹Ð´Ð°Ð»Ñ Ð°Ñ Ð´Ò¯ÐºÐµÐ½Ñ
           hearing_aids: ÐÑÑÑ Ð°Ð¿Ð¿Ð°ÑÐ°ÑÑÐ°ÑÑ
+          houseware: Ð«Ð´ÑÑ-Ð°ÑÒ Ð´Ò¯ÐºÐµÐ½Ñ
           ice_cream: ÐÐ°Ð»Ð¼Ò±Ð·Ð´Ð°Ò Ð´Ò¯ÐºÐµÐ½Ñ
           jewelry: ÐÐµÑÐ³ÐµÑÐ»ÑÐº Ð´Ò¯ÐºÐµÐ½
           laundry: ÐÑÑ Ð¶ÑÐ°ÑÑÐ½ Ð¾ÑÑÐ½
@@ -617,6 +788,8 @@ kk-cyrl:
           motel: ÐÐ¾ÑÐµÐ»Ñ
           museum: ÐÒ±ÑÐ°Ð¶Ð°Ð¹
           zoo: ÐÐ¾Ð¾Ð±Ð°Ò
+        tunnel:
+          "yes": Ð¢ÑÐ½Ð½ÐµÐ»Ñ
         waterway:
           dam: ÐÓ©Ð³ÐµÑÑÐµ
           rapids: Ð¨Ð¾Ò£ÒÐ°Ð»
@@ -654,14 +827,17 @@ kk-cyrl:
     edit: Ó¨Ò£Ð´ÐµÑ
     history: Ð¢Ð°ÑÐ¸Ñ
     export: Ð­ÐºÑÐ¿Ð¾ÑÑÑÐ°Ñ
+    gps_traces: GPS Ð±Ð°ÒÐ´Ð°ÑÐ»Ð°ÑÑ
+    gps_traces_tooltip: GPS Ð±Ð°ÒÐ´Ð°ÑÐ»Ð°ÑÑÐ½ Ð±Ð°ÑÒÐ°ÑÑ
+    user_diaries: ÒÐ¾Ð»Ð´Ð°Ð½ÑÑÑÐ»Ð°ÑÐ´ÑÒ£ ÐºÒ¯Ð½Ð´ÐµÐ»ÑÐºÑÐµÑÑ
     edit_with: '%{editor} ÐºÓ©Ð¼ÐµÐ³ÑÐ¼ÐµÐ½ Ó©Ò£Ð´ÐµÑ'
     intro_header: OpenStreetMap-ÐºÐµ ÒÐ¾Ñ ÐºÐµÐ»Ð´ÑÒ£ÑÐ·!
-    partners_ucl: UCL
     partners_fastly: Fastly
-    partners_bytemark: Bytemark Hosting
     help: ÐÐ½ÑÒÑÐ°Ð¼Ð°
     about: ÐÐ¾Ð±Ð° ÑÑÑÐ°Ð»Ñ
-    foundation_title: OpenStreetMap ÒÐ¾ÑÑ
+    copyright: ÐÐ²ÑÐ¾ÑÐ»ÑÒ ÒÒ±ÒÑÒÑÐ°Ñ
+    communities: ÒÐ°ÑÑÐ¼Ð´Ð°ÑÑÑÒÑÐ°Ñ
+    community_blogs: ÒÐ°ÑÑÐ¼Ð´Ð°ÑÑÑÒ Ð±Ð»Ð¾Ð³ÑÐ°ÑÑ
     learn_more: ÐÓ©Ð±ÑÑÐµÐº Ð±ÑÐ»Ñ
   user_mailer:
     message_notification:
@@ -670,8 +846,10 @@ kk-cyrl:
       subject: '[OpenStreetMap] GPX ÑÓÑÑÑ Ð¸Ð¼Ð¿Ð¾ÑÑÑÐ°Ð»Ð´Ñ'
     signup_confirm:
       subject: '[OpenStreetMap] OpenStreetMap-ÐºÐµ ÒÐ¾Ñ ÐºÐµÐ»Ð´ÑÒ£ÑÐ·'
+    lost_password:
+      subject: '[OpenStreetMap] ÒÒ±Ð¿Ð¸ÑÑÓ©Ð·Ð´Ñ Ð°ÑÑÐ»ÑÑ ÑÒ±ÑÐ°Ð½ÑÑÑ'
   messages:
-    inbox:
+    messages_table:
       subject: Ð¢Ð°ÒÑÑÑÐ¿
     message_summary:
       unread_button: ÐÒÑÐ»Ð¼Ð°ÒÐ°Ð½ Ð´ÐµÐ¿ Ð±ÐµÐ»Ð³ÑÐ»ÐµÑ
@@ -680,13 +858,16 @@ kk-cyrl:
       destroy_button: ÐÐ¾Ñ
     show:
       reply_button: ÐÐ°ÑÐ°Ð¿ Ð±ÐµÑÑ
+      unread_button: ÐÒÑÐ»Ð¼Ð°ÒÐ°Ð½ Ð´ÐµÐ¿ Ð±ÐµÐ»Ð³ÑÐ»ÐµÑ
       destroy_button: ÐÐ¾Ñ
     sent_message_summary:
       destroy_button: ÐÐ¾Ñ
   passwords:
-    lost_password:
+    new:
       email address: 'Ð-Ð¿Ð¾ÑÑÐ° Ð¼ÐµÐºÐµÐ½Ð¶Ð°Ð¹Ñ:'
-    reset_password:
+    edit:
+      title: ÒÒ±Ð¿Ð¸ÑÑÓ©Ð·Ð´Ñ Ð°ÑÑÐ»ÑÑ
+    update:
       flash changed: ÒÒ±Ð¿Ð¸Ñ ÑÓ©Ð·ÑÒ£ÑÐ· Ó©Ð·Ð³ÐµÑÑÑÐ»Ð´Ñ.
   preferences:
     show:
@@ -704,6 +885,7 @@ kk-cyrl:
       gravatar:
         gravatar: Gravatar ÒÐ¾Ð»Ð´Ð°Ð½Ñ
         what_is_gravatar: Gravatar Ð´ÐµÐ³ÐµÐ½ Ð½Ðµ?
+        disabled: Gravatar ÑÓ©Ð½Ð´ÑÑÑÐ»Ð´Ñ.
       new image: Ð¡ÑÑÐµÑ ÒÐ¾ÑÑ
       keep image: ÐÒÑÐ¼Ð´Ð°ÒÑ ÑÑÑÐµÑÑÑ ÑÐ°ÒÑÐ°Ð¿ ÒÐ°Ð»Ñ
       delete image: ÐÒÑÐ¼Ð´Ð°ÒÑ ÑÑÑÐµÑÑÑ Ð¶Ð¾Ñ
@@ -714,11 +896,13 @@ kk-cyrl:
     new:
       title: ÐÑÑÑ
       heading: ÐÑÑÑ
-      password: 'ÒÒ±Ð¿Ð¸Ñ ÑÓ©Ð·:'
-      openid_html: '%{logo} OpenID:'
+      password: 'ÒÒ±Ð¿Ð¸ÑÑÓ©Ð·:'
+      remember: ÐÒ¯Ð¹ÐµÐ´Ðµ ÒÐ°Ð»Ñ
       login_button: ÐÑÑÑ
+      no account: Ð¢ÑÑÐºÐµÐ»Ð³ÑÒ£ÑÐ· Ð¶Ð¾Ò Ð¿Ð°?
     destroy:
       title: Ð¨ÑÒÑ
+      heading: OpenStreetMap-ÑÐµÐ½ ÑÑÒÑ
       logout_button: Ð¨ÑÒÑ
   shared:
     markdown_help:
@@ -729,6 +913,8 @@ kk-cyrl:
     richtext_field:
       edit: Ó¨Ò£Ð´ÐµÑ
   site:
+    about:
+      open_data_title: ÐÑÑÒ Ð´ÐµÑÐµÐº
     copyright:
       foreign:
         title: ÐÒ±Ð» Ð°ÑÐ´Ð°ÑÐ¼Ð° ÑÑÑÐ°Ð»Ñ
@@ -737,15 +923,26 @@ kk-cyrl:
         title: ÐÒ±Ð» Ð±ÐµÑ ÑÑÑÐ°Ð»Ñ
     index:
       permalink: Ð¢Ò±ÑÐ°ÒÑÑ ÑÑÐ»ÑÐµÐ¼Ðµ
+      shortlink: ÒÑÑÒÐ° ÑÑÐ»ÑÐµÐ¼Ðµ
+      createnote: ÐÑÑÐµÐ»ÑÐº ÒÐ¾ÑÑ
+    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:
@@ -762,52 +959,89 @@ kk-cyrl:
     key:
       table:
         entry:
+          motorway: ÐÐ²ÑÐ¾ÐºÒ¯ÑÐµÐ¶Ð¾Ð»
+          main_road: ÐÐ°Ñ Ð¶Ð¾Ð»
+          trunk: Ð¢Ð°Ñ Ð¶Ð¾Ð»
+          primary: ÐÑÑÑÐ½ÑÑ Ð´ÓÑÐµÐ¶ÐµÐ»Ñ Ð¶Ð¾Ð»
+          secondary: ÐÐºÑÐ½ÑÑ Ð´ÓÑÐµÐ¶ÐµÐ»Ñ Ð¶Ð¾Ð»
+          unclassified: ÐÐµÑÐ³ÑÐ»ÑÐºÑÑ Ð¶Ð¾Ð»
           rail: Ð¢ÐµÐ¼ÑÑ Ð¶Ð¾Ð»
-          tram:
-          - ÐÐµÒ£ÑÐ» ÑÐµÐ»ÑÑÑÑ ÐºÓ©Ð»ÑÐº
-          apron:
-            1: ÑÐµÑÐ¼Ð¸Ð½Ð°Ð»
+          subway: ÐÐµÑÑÐ¾
+          apron: ÓÑÐµÐ¶Ð°Ð¹ Ð¿ÐµÑÑÐ¾Ð½Ñ
           admin: ÓÐºÑÐ¼ÑÑÐ»ÑÐº ÑÐµÐºÐ°ÑÐ°
           forest: ÐÑÐ¼Ð°Ð½
           golf: ÐÐ¾Ð»ÑÑ Ð°Ð»Ð°Ò£Ñ
-          lake:
-          - ÐÓ©Ð»
+          park: Ð¡Ð°ÑÐ±Ð°Ò
+          resident: Ð¢Ò±ÑÒÑÐ½ Ð°ÑÐ´Ð°Ð½
+          retail: Ð¡Ð°ÑÐ´Ð° Ð°Ð¹Ð¼Ð°ÒÑ
+          industrial: Ó¨Ð½ÐµÑÐºÓÑÑÐ¿ Ð°Ð¹Ð¼Ð°ÒÑ
+          lake: ÐÓ©Ð»
           farm: Ð¤ÐµÑÐ¼Ð°
           cemetery: ÐÐ¸ÑÐ°Ñ
+          allotments: Ð¡Ð°ÑÐ¶Ð°Ð¹Ð»Ð°Ñ
           pitch: Ð¡Ð¿Ð¾ÑÑ Ð°Ð»Ð°Ò£Ñ
           centre: Ð¡Ð¿Ð¾ÑÑ Ð¾ÑÑÐ°Ð»ÑÒÑ
-          school:
-          - ÐÐµÐºÑÐµÐ¿
-          - ÑÐ½Ð¸Ð²ÐµÑÑÐ¸ÑÐµÑ
+          military: ÓÑÐºÐµÑÐ¸ Ð°Ð¹Ð¼Ð°Ò
+          school: ÐÐµÐºÑÐµÐ¿
+          university: ÑÐ½Ð¸Ð²ÐµÑÑÐ¸ÑÐµÑ
+          building: ÐÐ»ÐµÑÐ»Ñ ÒÐ¸Ð¼Ð°ÑÐ°Ñ
           station: Ð¢ÐµÐ¼ÑÑ Ð¶Ð¾Ð» Ð±ÐµÐºÐµÑÑ
-          summit:
-            1: ÑÑÒ£
+          peak: ÑÑÒ£
           bicycle_shop: ÐÐµÐ»Ð¾ÑÐ¸Ð¿ÐµÐ´ Ð´Ò¯ÐºÐµÐ½Ñ
           toilets: ÐÓÑÐµÑÑÐ°Ð½Ð°
     welcome:
       title: ÒÐ¾Ñ ÐºÐµÐ»Ð´ÑÒ£ÑÐ·!
+      rules:
+        title: ÐÑÐµÐ¶ÐµÐ»ÐµÑi!
+    communities:
+      title: ÒÐ°ÑÑÐ¼Ð´Ð°ÑÑÑÒÑÐ°Ñ
   traces:
     new:
       help: ÐÐ½ÑÒÑÐ°Ð¼Ð°
     edit:
       cancel: ÐÐ¾Ð»Ð´ÑÑÐ¼Ð°Ñ
+    update:
+      updated: ÐÐ°ÒÐ´Ð°Ñ Ð¶Ð°Ò£Ð°ÑÑÑÐ»Ð´Ñ
     trace_optionals:
       tags: Ð¢ÐµÐ³ÑÐµÑ
     show:
       filename: 'Ð¤Ð°Ð¹Ð» Ð°ÑÐ°ÑÑ:'
       download: Ð¶Ò¯ÐºÑÐµÐ¿ Ð°Ð»Ñ
+      map: ÐºÐ°ÑÑÐ°
       edit: Ó©Ò£Ð´ÐµÑ
+      tags: 'Ð¢ÐµÐ³ÑÐµÑ:'
+      none: ÐÐ¾Ò
+      delete_trace: ÐÒ±Ð» Ð±Ð°ÒÐ´Ð°ÑÐ´Ñ Ð¶Ð¾Ñ
+      trace_not_found: ÐÐ°ÒÐ´Ð°Ñ ÑÐ°Ð±ÑÐ»Ð¼Ð°Ð´Ñ!
     trace:
       edit_map: ÐÐ°ÑÑÐ°Ð½Ñ Ó©Ò£Ð´ÐµÑ
+  application:
+    settings_menu:
+      oauth1_settings: OAuth 1 Ð±Ð°Ð¿ÑÐ°ÑÐ»Ð°ÑÑ
+      oauth2_applications: OAuth 2 ÒÐ¾ÑÑÐ¼ÑÐ°Ð»Ð°ÑÑ
   oauth_clients:
+    show:
+      confirm: Ð¡ÐµÐ½ÑÐ¼Ð´ÑÑÑÐ· Ð±Ðµ?
     index:
+      revoke: ÐÒ¯ÑÑÐ½ Ð¶Ð¾Ñ!
       oauth: OAuth
   oauth2_applications:
+    index:
+      permissions: Ð Ò±ÒÑÐ°ÑÑÐ°Ñ
     application:
       edit: Ó¨Ò£Ð´ÐµÑ
+      delete: ÐÐ¾Ñ
+      confirm_delete: ÐÒ±Ð» ÒÐ¾ÑÑÐ¼ÑÐ°Ð½Ñ Ð¶Ð¾Ñ ÐºÐµÑÐµÐº Ð¿Ðµ?
+    show:
+      delete: ÐÐ¾Ñ
+      confirm_delete: ÐÒ±Ð» ÒÐ¾ÑÑÐ¼ÑÐ°Ð½Ñ Ð¶Ð¾Ñ ÐºÐµÑÐµÐº Ð¿Ðµ?
+  oauth2_authorized_applications:
+    index:
+      permissions: Ð Ò±ÒÑÐ°ÑÑÐ°Ñ
   users:
     new:
-      email address: 'Ð-Ð¿Ð¾ÑÑÐ° Ð¼ÐµÐºÐµÐ½Ð¶Ð°Ð¹Ñ:'
+      display name description: ÐÐ°ÑÒÐ° ÒÐ¾Ð»Ð´Ð°Ð½ÑÑÑÐ»Ð°ÑÒÐ° ÐºÓ©ÑÑÐ½ÐµÑÑÐ½ Ð°ÑÑÒ£ÑÐ·. ÐÐµÐ¹ÑÐ½ÑÑÐµÐº Ð¾Ð½Ñ
+        Ð±Ð°Ð¿ÑÐ°ÑÐ»Ð°ÑÐ´Ð° Ó©Ð·Ð³ÐµÑÑÐµ Ð°Ð»Ð°ÑÑÐ·.
     terms:
       consider_pd_why: Ð±Ò±Ð» Ð½Ðµ?
       continue: ÐÐ°Ð»ÒÐ°ÑÑÑÑÑ
@@ -815,19 +1049,58 @@ kk-cyrl:
         france: Ð¤ÑÐ°Ð½ÑÐ¸Ñ
         italy: ÐÑÐ°Ð»Ð¸Ñ
         rest_of_world: ÒÐ°Ð»ÒÐ°Ð½ ÓÐ»ÐµÐ¼
+    no_such_user:
+      deleted: Ð¶Ð¾Ð¹ÑÐ»ÒÐ°Ð½
     show:
       my diary: ÐÒ¯Ð½Ð´ÐµÐ»ÑÐ³ÑÐ¼
       my edits: Ó¨Ò£Ð´ÐµÐ¼ÐµÐ»ÐµÑÑÐ¼
+      my traces: ÐÐ°ÒÐ´Ð°ÑÐ»Ð°ÑÑÐ¼
+      my notes: ÐÑÑÐµÐ»ÑÐºÑÐµÑÑÐ¼
       my settings: ÐÐ°Ð¿ÑÐ°ÑÐ»Ð°ÑÑÐ¼
       my_preferences: ÒÐ°Ð»Ð°ÑÐ»Ð°ÑÑÐ¼
       diary: ÐÒ¯Ð½Ð´ÐµÐ»ÑÐº
+      traces: ÐÐ°ÒÐ´Ð°ÑÐ»Ð°ÑÑ
+      remove as friend: ÐÐ¾ÑÑÐ°ÑÐ´Ð°Ð½ Ð¶Ð¾Ñ
+      mapper since: 'Ð¢ÑÑÐºÐµÐ»Ð³ÐµÐ½ ÐºÒ¯Ð½Ñ:'
     index:
       title: ÒÐ¾Ð»Ð´Ð°Ð½ÑÑÑÐ»Ð°Ñ
       heading: ÒÐ¾Ð»Ð´Ð°Ð½ÑÑÑÐ»Ð°Ñ
   user_blocks:
+    helper:
+      block_duration:
+        hours:
+          one: 1 ÑÐ°Ò.
+          other: '%{count} ÑÐ°Ò.'
+        days:
+          one: 1 ÐºÒ¯Ð½
+          other: '%{count} ÐºÒ¯Ð½'
+        weeks:
+          one: 1 Ð°Ð¿ÑÐ°
+          other: '%{count} Ð°Ð¿ÑÐ°'
+        months:
+          one: 1 Ð°Ð¹
+          other: '%{count} Ð°Ð¹'
+        years:
+          one: 1 Ð¶ÑÐ»
+          other: '%{count} Ð¶ÑÐ»'
+    show:
+      edit: Ó¨Ò£Ð´ÐµÑ
+      confirm: Ð¡ÐµÐ½ÑÐ¼Ð´ÑÑÑÐ· Ð±Ðµ?
+      reason: 'ÐÒ±ÒÐ°ÑÑÐ°Ñ ÑÐµÐ±ÐµÐ±Ñ:'
+    block:
+      edit: Ó¨Ò£Ð´ÐµÑ
     blocks:
-      next: ÐÐµÐ»ÐµÑÑ Â»
-      previous: Â« ÐÐ»Ð´ÑÒ£ÒÑ
+      reason: 'ÐÒ±ÒÐ°ÑÑÐ°Ñ ÑÐµÐ±ÐµÐ±Ñ:'
+  notes:
+    index:
+      description: Ð¡Ð¸Ð¿Ð°ÑÑÐ°Ð¼Ð°
+    show:
+      title: 'ÐÑÑÐµÐ»ÑÐº: %{id}'
+      description: Ð¡Ð¸Ð¿Ð°ÑÑÐ°Ð¼Ð°
+      hide: ÐÐ°ÑÑÑÑ
+    new:
+      title: ÐÐ°Ò£Ð° ÐµÑÑÐµÐ»ÑÐº
+      add: ÐÑÑÐµÐ»ÑÐº ÒÐ¾ÑÑ
   javascripts:
     close: ÐÐ°Ð±Ñ
     share:
@@ -836,13 +1109,21 @@ kk-cyrl:
       image: Ð¡ÑÑÐµÑ
       link: Ð¡ÑÐ»ÑÐµÐ¼Ðµ Ð½ÐµÐ¼ÐµÑÐµ HTML
       long_link: Ð¡ÑÐ»ÑÐµÐ¼Ðµ
+      short_link: ÒÑÑÒÐ° ÑÑÐ»ÑÐµÐ¼Ðµ
       geo_uri: Geo URI
       embed: HTML
       format: 'Ð¤Ð¾ÑÐ¼Ð°ÑÑ:'
       scale: 'ÐÐ°ÑÑÑÐ°Ð±Ñ:'
       image_dimensions: Ó¨Ð»ÑÐµÐ¼Ñ %{width} x %{height} ÑÑÑÐµÑÑÐµ ÑÑÐ°Ð½Ð´Ð°ÑÑÑÑ ÒÐ°Ð±Ð°Ñ ÐºÓ©ÑÑÐµÑÑÐ»ÐµÐ´Ñ
       download: ÐÒ¯ÐºÑÐµÐ¿ Ð°Ð»Ñ
+      short_url: ÒÑÑÒÐ° URL
     map:
+      zoom:
+        in: Ò®Ð»ÐºÐµÐ¹ÑÑ
+        out: ÐÑÑÑÑÐµÐ¹ÑÑ
+      base:
+        standard: CÑÐ°Ð½Ð´Ð°ÑÑÑÑ
+        transport_map: ÐÓ©Ð»ÑÐº ÐºÐ°ÑÑÐ°ÑÑ
       layers:
         header: ÐÐ°ÑÑÐ° ÒÐ°Ð±Ð°ÑÑÐ°ÑÑ
         title: ÒÐ°Ð±Ð°ÑÑÐ°Ñ
@@ -850,13 +1131,15 @@ kk-cyrl:
       show:
         subscribe: ÐÐ°Ð·ÑÐ»Ñ
         hide_comment: Ð¶Ð°ÑÑÑÑ
-    notes:
-      show:
-        hide: ÐÐ°ÑÑÑÑ
+        unhide_comment: ÐºÓ©ÑÑÐµÑÑ
     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-ÑÑ
@@ -868,6 +1151,21 @@ kk-cyrl:
           eighth: 8-ÑÑ
           ninth: 9-ÑÑ
           tenth: 10-ÑÑ
+    query:
+      node: ÐÒ¯ÐºÑÐµ
     context:
       show_address: ÐÐµÐºÐµÐ½Ð¶Ð°Ð¹Ð´Ñ ÐºÓ©ÑÑÐµÑÑ
+  redactions:
+    edit:
+      heading: Ð¢Ò¯Ð·ÐµÑÑÐ´Ñ Ó©Ò£Ð´ÐµÑ
+      title: Ð¢Ò¯Ð·ÐµÑÑÐ´Ñ Ó©Ò£Ð´ÐµÑ
+    index:
+      heading: Ð¢Ò¯Ð·ÐµÑÑÐ»ÐµÑ ÑÑÐ·ÑÐ¼Ñ
+      title: Ð¢Ò¯Ð·ÐµÑÑÐ»ÐµÑ ÑÑÐ·ÑÐ¼Ñ
+    show:
+      confirm: Ð¡ÐµÐ½ÑÐ¼Ð´ÑÑÑÐ· Ð±Ðµ?
+    create:
+      flash: Ð¢Ò¯Ð·ÐµÑÑ Ð¶Ð°ÑÐ°Ð»Ð´Ñ.
+    update:
+      flash: Ó¨Ð·Ð³ÐµÑÑÑÑÐµÑ ÑÐ°ÒÑÐ°Ð»Ð´Ñ.
 ...