X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0d3a9ed9cb47ce3b89ea9eaffbb589f9a9ff6d22..c7ed8a9e8604b207e24e0899a811ff3cdb2e7c3f:/config/locales/ka.yml

diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 90ddd07a5..ecd314370 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -1,45 +1,19 @@
 # Messages for Georgian (á¥áá áá£áá)
 # Exported from translatewiki.net
-# Export driver: syck-pecl
+# Export driver: phpyaml
 # Author: David1010
+# Author: MIKHEIL
 # Author: Temuri rajavi
-ka: 
-  activerecord: 
-    attributes: 
-      diary_comment: 
-        body: á¢áá¥á¡á¢á
-      diary_entry: 
-        language: ááá
-        latitude: áááááá
-        longitude: áá á«ááá
-        title: á¡áááá£á á
-        user: áááá®ááá ááááá
-      friend: 
-        friend: ááááááá á
-        user: áááá®ááá ááááá
-      message: 
-        body: á¢áá¥á¡á¢á
-        recipient: áááá¦ááá
-        sender: ááááááááá
-        title: á¡áááá£á á
-      trace: 
-        description: áá¦á¬áá á
-        latitude: áááááá
-        longitude: áá á«ááá
-        name: á¡áá®ááá
-        public: á¡áá¯áá á
-        size: áááá
-        user: áááá®ááá ááááá
-        visible: á®áááááááá
-      user: 
-        active: áá¥á¢áá£á á
-        description: áá¦á¬áá á
-        display_name: á¡áá®ááá ááá áááá
-        email: áá. á¤áá¡á¢á
-        languages: ááááá
-        pass_crypt: ááá ááá
-    models: 
+---
+ka:
+  time:
+    formats:
+      friendly: '%á %á %á¬ at %á¡:%á¬'
+  activerecord:
+    models:
       acl: á®ááááá¡áá¬áááááááá¡ á¨ááá¦á£áááá¡ á¡áá
+      changeset: áªáááááááááá¡ ááááá¢á
+      changeset_tag: áªáááááááááá¡ ááááá¢áá¡ á¢ááá
       country: á¥ááá§ááá
       diary_comment: áá¦áá£á áá¡ áááááá¢áá á
       diary_entry: áá¦áá£á áá¡ á©áááá¬áá á
@@ -47,350 +21,278 @@ ka:
       language: ááá
       message: á¨áá¢á§ááááááá
       node: ááááá«á
+      node_tag: á¬áá á¢áááá¡ á¢ááá
       notifier: ááááá¤á áá®ááááááá
       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: á£á áááá ááááá¡ á¢ááá
       session: á¡áá¡áá
       trace: áááááá
       tracepoint: ááááááá¡ á¬áá á¢ááá
+      tracetag: ááá á¨á á£á¢áá¡ á¢ááá
       user: áááá®ááá ááááá
       user_preference: áááá®ááá ááááá¡ áááá¤ááá£á ááªáá
+      user_token: áááá®ááá ááááá¡ á¡áááá¨áá
       way: ááá
       way_node: áááá¡ ááááá«á
-  browse: 
-    changeset: 
-      changeset: "áªáááááááááá¡ ááááá¢á: %{id}"
+      way_tag: á®áááá¡ á¢ááá
+    attributes:
+      diary_comment:
+        body: á¢áá¥á¡á¢á
+      diary_entry:
+        user: áááá®ááá ááááá
+        title: áááá
+        latitude: áááááá
+        longitude: áá á«ááá
+        language: ááá
+      friend:
+        user: áááá®ááá ááááá
+        friend: ááááááá á
+      trace:
+        user: áááá®ááá ááááá
+        visible: á®áááááááá
+        name: á¡áá®ááá
+        size: áááá
+        latitude: áááááá
+        longitude: áá á«ááá
+        public: á¡áá¯áá á
+        description: áá¦á¬áá á
+      message:
+        sender: ááááááááá
+        title: áááá
+        body: á¢áá¥á¡á¢á
+        recipient: áááá¦ááá
+      user:
+        email: áá. á¤áá¡á¢á
+        active: áá¥á¢áá£á á
+        display_name: á¡áá®ááá ááá áááá
+        description: áá¦á¬áá á
+        languages: ááááá
+        pass_crypt: ááá ááá
+  editor:
+    default: á£ááá áááá (ááááááá %{name})
+    potlatch:
+      name: Potlatch 1
+      description: Potlatch 1 (áá áá£ááá áá¡ á áááá¥á¢áá á)
+    id:
+      name: iD
+      description: iD (áá áá£ááá áá¡ á áááá¥á¢áá á)
+    potlatch2:
+      name: Potlatch 2
+      description: Potlatch 2 (áá áá£ááá áá¡ á áááá¥á¢áá á)
+    remote:
+      name: ááá¡á¢áááªáá£á á ááá ááá
+      description: ááá¡á¢áááªáá£á á ááááá (JOSM, áá Merkaartor)
+  api:
+    notes:
+      comment:
+        opened_at_html: á¨ááá¥ááá %{when} á¬áá
+        opened_at_by_html: á¨áá¥ááá %{when} á¬áá áááá®ááá áááááá %{user}
+        commented_at_html: ááááá®ááá %{when} á¬áá
+        commented_at_by_html: áááááá®áá %{when} á¬áá áááá®ááá áááááá %{user}
+      entry:
+        comment: áááááá¢áá á
+  browse:
+    created: á¨ááá¥ááá
+    closed: ááá®á£á á£ááá
+    created_html: á¨ááá¥ááá <abbr title='%{title}'>%{time} á¬áá</abbr>
+    closed_html: áááá®á£á á <abbr title='%{title}'>%{time} á¬áá</abbr>
+    created_by_html: á¨ááá¥ááá <abbr title='%{title}'>%{time} á¬áá</abbr> ááá¢áá á %{user}
+    deleted_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: (á£áááááá¢áá á)
+    download_xml: XML-áá¡ á©áááá¢ááá ááá
+    view_history: áá¡á¢áá ááá¡ ááá®áá
+    view_details: ááá¢áááááá¡ ááá®áá
+    location: 'áááááá áááá:'
+    changeset:
+      title: 'áªáááááááááá¡ ááááá¢á: %{id}'
+      belongs_to: ááá¢áá á
+      node: á¬áá á¢ááááá (%{count})
+      node_paginated: á¬áá á¢ááááá (%{x}-%{y} %{count}-ááá)
+      way: á®ááááá (%{count})
+      way_paginated: á®ááááá (%{x}-%{y} %{count}-ááá)
+      relation: á£á áááá áááááá (%{count})
+      relation_paginated: á£á áááá áááááá (%{x}-%{y} %{count}-ááá)
+      comment: áááááá¢áá ááá (%{count})
+      hidden_commented_by: áááááá£áá áááááá¢áá ááá %{user}-á¡ááá <abbr title='%{exact_time}'>%{when}
+        á¬áá</abbr>
+      commented_by: ááááááá¢áá á %{user}-á¡ááá <abbr title='%{exact_time}'>%{when} á¬áá</abbr>
       changesetxml: áªáááááááááá¡ ááááá¢áá¡ XML
-      feed: 
+      osmchangexml: osmChange XML
+      feed:
         title: áªáááááááááá¡ ááááá¢á %{id}
         title_comment: áªáááááááááá¡ ááááá¢á %{id} - %{comment}
-      title: áªáááááááááá¡ ááááá¢á
-    changeset_details: 
-      belongs_to: "ááá£ááááá¡:"
-      bounding_box: "á¡ááá¦áá ááá:"
-      box: á¡ááá¦ááá á
-      closed_at: "ááááá¢áááá:"
-      created_at: "á¨áá¥áááááá:"
-      has_nodes: 
-        one: "á¨áááªááá¡ %{count} á¬áá á¢ááá¡:"
-        other: "á¨áááªááá¡ %{count} á¬áá á¢ááá¡:"
-      has_ways: 
-        one: "á¨áááªááá¡ %{count} á®ááá¡:"
-        other: "á¨áááªááá¡ %{count} á®ááá¡:"
-      show_area_box: ááááá¨áá£áá á ááááááá¡ á©áááááá
-    common_details: 
-      changeset_comment: "áááááá¢áá á:"
-      deleted_at: "á¬ááá¨ááá:"
-      deleted_by: "á¬ááá¨ááá:"
-      edited_at: "áááá áááá¥á¢áá á:"
-      edited_by: "áááá®ááá ááááá:"
-      version: "ááá á¡áá:"
-    containing_relation: 
+      discussion: áááá®áááá
+    node:
+      title: 'á¬áá á¢ááá: %{name}'
+      history_title: 'á¬áá á¢áááá¡ áá¡á¢áá áá: %{name}'
+    way:
+      title: 'á®ááá: %{name}'
+      history_title: 'á®áááá¡ áá¡á¢áá áá: %{name}'
+      nodes: á¬áá á¢ááááá
+    relation:
+      title: 'á£á áááá áááá: %{name}'
+      history_title: 'á£á áááá ááááá¡ áá¡á¢áá áá: %{name}'
+      members: á¬ááá ááá
+    relation_member:
+      entry_role: '%{type} %{name} á áááá áª %{role}'
+      type:
+        node: ááááá«á
+        way: ááá
+        relation: á£á áááá áááá
+    containing_relation:
       entry: á£á áááá áááá %{relation_name}
       entry_role: á£á áááá áááá %{relation_name} (á áááá áª %{relation_role})
-    map: 
-      deleted: á¬áá¨ááááá
-      edit: 
-        area: á¢áá áá¢áá ááá¡ á áááá¥á¢áá ááá
-        node: á¬áá á¢áááá¡ á áááá¥á¢áá ááá
-        relation: á£á áááá ááááá¡ á áááá¥á¢áá ááá
-        way: áááá¡ á áááá¥á¢áá ááá
-      larger: 
-        area: á ááááááá¡ ááá®áá áááá ááááá¡ á á£áááá
-        node: ááááá«áá¡ ááá®áá áááá ááááá¡ á á£áááá
-        relation: á£á áááá ááááá¡ ááá®áá áááá ááááá¡ á á£áááá
-        way: áááá¡ ááá®áá áááá ááááá¡ á á£áááá
-      loading: áá¢ááá áááá...
-    navigation: 
-      all: 
-        next_changeset_tooltip: á¨áááááá áªáááááááááá¡ ááááá¢á
-        next_node_tooltip: á¨áááááá ááááá«á
-        next_relation_tooltip: á¨áááááá á£á áááá áááá
-        next_way_tooltip: á¨áááááá ááá
-        prev_changeset_tooltip: á¬ááá áªáááááááááá¡ ááááá¢á
-        prev_node_tooltip: á¬ááá ááááá«á
-        prev_relation_tooltip: á¬ááá á£á áááá áááá
-        prev_way_tooltip: á¬ááá ááá
-      user: 
-        name_changeset_tooltip: "%{user} á¨áá¡á¬áá áááááá¡ á®áááá"
-        next_changeset_tooltip: á¨áááááá á¨áá¡á¬áá ááá %{user}
-        prev_changeset_tooltip: á¬ááá á¨áá¡á¬áá ááá %{user}
-    node: 
-      download_xml: áááááá¬áá á XML
-      edit: á áááá¥á¢áá ááá
-      node: ááááá«á
-      node_title: "ááááá«á: %{node_name}"
-      view_history: áá¡á¢áá ááá¡ ááá®áá
-    node_details: 
-      coordinates: "áááá ááááá¢ááá:"
-    node_history: 
-      download_xml: áááááá¬áá á XML
-      node_history: ááááá«áá¡ áá¡á¢áá áá
-      node_history_title: "ááááá«áá¡ áá¡á¢áá áá: %{node_name}"
-      view_details: áá áªááá
-    not_found: 
-      sorry: á£áááªá áááá, %{type} ááááá¢áá¤áááá¢áá áá %{id}, ááá  áááá«áááá.
-      type: 
-        changeset: áªáááááááááá¡ ááááá¢á
+    not_found:
+      sorry: 'á¡ááá¬á£á®áá áá, %{type} #%{id} ááá  áááá«áááá.'
+      type:
         node: ááááá«á
-        relation: á£á áááá áááá
         way: ááá
-    paging_nav: 
-      of: ááá
-      showing_page: áááá ááá¡ á©áááááá
-    redacted: 
-      type: 
-        way: ááá
-    relation: 
-      download_xml: áááááá¬áá á XML
-      relation: á£á áááá áááá
-      relation_title: "á£á áááá áááá: %{relation_name}"
-      view_history: áá¡á¢áá ááá¡ ááá®áá
-    relation_details: 
-      members: "á¬ááá ááá:"
-    relation_history: 
-      download_xml: áááááá¬áá á XML
-      relation_history: á£á áááá ááááá¡ áá¡á¢áá áá
-      relation_history_title: "á£á áááá ááááá¡ áá¡á¢áá áá: %{relation_name}"
-      view_details: áá áªááá
-    relation_member: 
-      entry_role: "%{type} %{name} á áááá áª %{role}"
-      type: 
+        relation: á£á áááá áááá
+        changeset: áªáááááááááá¡ ááááá¢á
+        note: á¨áááá¨ááá
+    timeout:
+      sorry: á£áááªá áááá, áááááªááááá %{type}-áááá¡ ááááá¢áá¤áááá¢áá áá %{id}, á¡áááááá áá á«áááá
+        á¡ááááááááá.
+      type:
         node: ááááá«á
+        way: ááá
         relation: á£á áááá áááá
+        changeset: áªáááááááááá¡ ááááá¢á
+        note: á¨áááá¨ááá
+    redacted:
+      redaction: á áááá¥áªáá %{id}
+      type:
+        node: ááááá«á
         way: ááá
-    start: 
-      manually_select: á¡á®áá á¢áá áá¢áá ááá¡ ááááá§áá¤á á®áááá
-    start_rjs: 
-      data_frame_title: áááááªááááá
-      data_layer_name: á á£ááá¡ áááááªáááááá¡ ááá®áá
-      details: ááá¢ááááá
-      drag_a_box: á ááááááá¡ áá¡áá á©áááá á á£áááá ááá¬áááá á©áá á©á
-      edited_by_user_at_timestamp: á¨ááªáááá [[user]] [[timestamp]]-á¨á
-      hide_areas: á¢áá áá¢áá ááááá¡ ááááááá
-      history_for_feature: áá¡á¢áá áá [[feature]]-áááá¡
+        relation: á£á áááá áááá
+    start_rjs:
       load_data: áááááªáááááá¡ áá¢ááá ááá
       loading: áá¢ááá áááá...
-      manually_select: á¡á®áá á ááááááá¡ ááááá§áá¤á á®áááá
-      object_list: 
-        back: ááááá¥á¢áááá¡ á¡ááá¡ ááááá¡áá®áá
-        details: ááá¢ááááá
-        heading: ááááá¥á¢áááá¡ á¡áá
-        history: 
-          type: 
-            node: ááááá«á [[id]]
-            way: ááá [[id]]
-        selected: 
-          type: 
-            node: ááááá«á [[id]]
-            way: ááá [[id]]
-        type: 
-          node: ááááá«á
-          way: ááá
-      private_user: ááá á«á áááá®ááá ááááá
-      show_areas: á¢áá áá¢áá ááááá¡ á©áááááá
-      show_history: áá¡á¢áá ááá¡ á©áááááá
-      wait: ááááááááá...
-      zoom_or_select: áááááááá áá ááá á©ááá á áááááá á¡áááá®áááá
-    tag_details: 
+    tag_details:
       wikipedia_link: á¡á¢áá¢áá %{page} áááááááááá¨á
-    timeout: 
-      sorry: á£áááªá áááá, áááááªááááá %{type}-áááá¡ ááááá¢áá¤áááá¢áá áá %{id}, á¡áááááá áá á«áááá á¡ááááááááá.
-      type: 
-        changeset: áªáááááááááá¡ ááááá¢á
-        node: ááááá«á
-        relation: á£á áááá áááá
-        way: ááá
-    way: 
-      download_xml: áááááá¬áá á XML
-      edit: á áááá¥á¢áá ááá
-      view_history: áá¡á¢áá ááá¡ ááá®áá
-      way: ááá
-      way_title: "ááá: %{way_name}"
-    way_details: 
-      also_part_of: 
-        one: ááá áááá áááá¡ ááá¬ááá %{related_ways}
-        other: ááá áááá áááááá¡ ááá¬ááá %{related_ways}
-      nodes: "ááááá«ááá:"
-    way_history: 
-      download_xml: áááááá¬áá á XML
-      view_details: áá áªááá
-      way_history: áááá¡ áá¡á¢áá áá
-      way_history_title: "áááá¡ áá¡á¢áá áá: %{way_name}"
-  changeset: 
-    changeset: 
-      anonymous: ááááááá
-      big_area: (áááá)
-      no_comment: (áá á)
-      no_edits: (á áááá¥á¢áá ááá áá  áá áá¡)
-      still_editing: (á áááá¥á¢áá áááá)
-    changeset_paging_nav: 
+      telephone_link: ááá áááá %{phone_number}
+    note:
+      title: 'á¨áááá¨ááá: %{id}'
+      new_note: áá®ááá á¨áááá¨ááá
+      description: áá¦á¬áá á
+      open_title: 'ááá£áá£á¨ááááááá á¨áááá¨ááá #%{note_name}'
+      closed_title: 'áááá£á¨ááááá£áá á¨áááá¨ááá #%{note_name}'
+      hidden_title: 'áááááá£áá á¨áááá¨ááá #%{note_name}'
+  changesets:
+    changeset_paging_nav:
+      showing_page: áááá áá %{page}
       next: á¨áááááá â
       previous: â á¬ááá
-      showing_page: áááá áá %{page}
-    changesets: 
-      area: á¢áá áá¢áá áá
-      comment: áááááá¢áá á
+    changeset:
+      anonymous: ááááááá
+      no_edits: (á áááá¥á¢áá ááá áá  áá áá¡)
+    changesets:
       id: ID
       saved_at: á¨áááá®á£ááá á áááá áª
       user: áááá®ááá ááááá
-    list: 
-      description: áááá áªááááááááá
-      description_user: áááá®ááá áááá %{user} áªááááááááá ááááá¢ááá
-      heading: áªáááááááááá¡ ááááá¢á
-      heading_bbox: áªáááááááááá¡ ááááá¢á
-      heading_friend: áªáááááááááá¡ ááááá¢ááá
-      heading_nearby: áªáááááááááá¡ ááááá¢ááá
-      heading_user: áªáááááááááá¡ ááááá¢á
-      heading_user_bbox: áªáááááááááá¡ ááááá¢á
-      title: áªáááááááááá¡ ááááá¢á
-  diary_entry: 
-    comments: 
-      ago: "%{ago} á¬áá"
       comment: áááááá¢áá á
-      newer_comments: áá®ááá áááááá¢áá ááá
-      older_comments: á«áááá áááááá¢áá ááá
-      post: ááá¡á¢á
-      when: á áááá¡
-    diary_comment: 
-      confirm: ááááá¡á¢á£á ááá
-      hide_link: áá áááááá¢áá áá¡ ááááááá
-    diary_entry: 
-      comment_count: 
-        one: 1 áááááá¢áá á
-        other: "%{count} áááááá¢áá á"
-      comment_link: áááááá¢áá á
-      confirm: ááááá¡á¢á£á ááá
-      edit_link: á©áááá¬áá áá¡ á áááá¥á¢áá ááá
-      hide_link: áá á©áááá¬áá áá¡ ááááááá
-    edit: 
-      body: "á¢áá¥á¡á¢á:"
-      language: "ááá:"
-      latitude: "áááááá:"
-      location: "áááááá áááá:"
-      longitude: "áá á«ááá:"
-      save_button: á¨áááá®áá
-      subject: "áááá:"
-      title: áá¦áá£á áá¡ á©áááá¬áá áá¡ á áááá¥á¢áá ááá
-      use_map_link: á á£áááá á©áááááá
-    list: 
+      area: á¢áá áá¢áá áá
+    index:
+      title: áªáááááááááá¡ ááááá¢á
+      load_more: ááá¢áá¡ á©áá¢ááá ááá
+  changeset_comments:
+    comment:
+      commented_at_by_html: áááááá®áá %{when} á¬áá áááá®ááá áááááá %{user}
+  diary_entries:
+    new:
+      title: áá¦áá£á á¨á áá®ááá á©áááá¬áá áá¡ áááááááá
+      publish_button: ááááá¥ááá§áááá
+    index:
+      title: áááá®ááá ááááááá¡ áá¦áá£á ááá
+      title_friends: áááááá áááá¡ áá¦áá£á ááá
+      title_nearby: áááááááá áááá®ááá ááááááá¡ áá¦áá£á ááá
+      user_title: '%{user}-áá¡ áá¦áá£á á'
       in_language_title: áá¦áá£á áá¡ á©áááá¬áá ááá %{language}
       new: áá¦áá£á á¨á áá®ááá á©áááá¬áá áá¡ áááááááá
-      newer_entries: á£áá®ááá¡á á©áááá¬áá ááá
       no_entries: áá¦áá£á á¨á áá  áá áá¡ á©áááá¬áá ááá
       older_entries: á«áááá á©áááá¬áá ááá
-      title: áááá®ááá ááááááá¡ áá¦áá£á ááá
-      title_friends: áááááá áááá¡ áá¦áá£á ááá
-      title_nearby: áááááááá áááá®ááá ááááááá¡ áá¦áá£á ááá
-      user_title: "%{user}-áá¡ áá¦áá£á á"
-    location: 
-      edit: á áááá¥á¢áá ááá
-      location: "áááááá áááá:"
-      view: áá®áááá
-    new: 
-      title: áá¦áá£á á¨á áá®ááá á©áááá¬áá áá¡ áááááááá
-    no_such_entry: 
-      heading: "id: %{id}-ááá á©áááá¬áá á áá  áá áá¡"
-      title: áá¦áá£á á¨á áá¡ááá á©áááá¬áá á áá  áá áá¡
-    view: 
+      newer_entries: á£áá®ááá¡á á©áááá¬áá ááá
+    edit:
+      title: áá¦áá£á áá¡ á©áááá¬áá áá¡ á áááá¥á¢áá ááá
+      subject: 'áááá:'
+      body: 'á¢áá¥á¡á¢á:'
+      language: 'ááá:'
+      location: 'áááááá áááá:'
+      latitude: 'áááááá:'
+      longitude: 'áá á«ááá:'
+      use_map_link: á á£áááá á©áááááá
+      save_button: á¨áááá®áá
+    show:
+      title: '%{user}-áá¡ áá¦áá£á á | %{title}'
+      user_title: '%{user}-áá¡ áá¦áá£á á'
       leave_a_comment: ááá¢áááá áááááá¢áá á
+      login_to_leave_a_comment: '%{login_link}, á ááá ááá¢áááá áááááá¢áá á'
       login: á¨áá¡ááá
-      login_to_leave_a_comment: "%{login_link}, á ááá ááá¢áááá áááááá¢áá á"
       save_button: á¨áááá®áá
-      title: "%{user}-áá¡ áá¦áá£á á | %{title}"
-      user_title: "%{user}-áá¡ áá¦áá£á á"
-  editor: 
-    default: á£ááá áááá (ááááááá %{name})
-    potlatch: 
-      description: Potlatch 1 (áá áá£ááá áá¡ á áááá¥á¢áá á)
-      name: Potlatch 1
-    potlatch2: 
-      description: Potlatch 2 (áá áá£ááá áá¡ á áááá¥á¢áá á)
-      name: Potlatch 2
-    remote: 
-      description: ááá¡á¢áááªáá£á á ááááá (JOSM, áá Merkaartor)
-      name: ááá¡á¢áááªáá£á á ááá ááá
-  export: 
-    start: 
-      add_marker: á á£áááá ááá¨áá£ááá¡ ááá¡áá
-      area_to_export: á¢áá áá¢áá áá áá¥á¡ááá á¢áá¡ááááá¡
-      export_button: áá¥á¡ááá á¢á
-      format: á¤áá ááá¢á
-      format_to_export: áá¥á¡ááá á¢áá¡ á¤áá ááá¢á
-      image_size: ááááá¡áá®á£ááááá¡ áááá
-      latitude: "áááááá:"
-      licence: áááªááááá
-      longitude: "áá á«ááá:"
-      manually_select: á¡á®áá á ááááááá¡ ááááá§áá¤á á®áááá
-      map_image: á á£ááá¡ á¡á£á ááá (á¡á¢ááááá á¢á£áá á¤áááá¡ á©áááááá)
-      max: ááá¥á¡.
-      options: ááá áááá¢á ááá
-      osm_xml_data: OpenStreetMap XMLâáá¡ áááááªááááá
-      output: á¨ááááá
-      scale: ááá¡á¨á¢ááá
-      too_large: 
-        heading: á¢áá áá¢áá áá á«ááááá ááááá
-      zoom: áááááááá
-    start_rjs: 
-      add_marker: á á£áááá ááá¨áá£ááá¡ ááá¡áá
-      change_marker: ááá¨áá£ááá¡ áááááá ááááá¡ á¨ááªááá
-      click_add_marker: ááá¨áá£ááá¡ ááá¡áá¡ááááá áááá¬áááá£ááá á á£áááá
-      export: áá¥á¡ááá á¢á
-      manually_select: á¡á®áá á ááááááá¡ ááááá§áá¤á á®áááá
-      view_larger_map: áááááááá£áá á á£ááá¡ á®áááá
-  geocoder: 
-    description: 
-      title: 
-        geonames: áááááá áááá <a href="http://www.geonames.org/">GeoNames</a>-ááá
-        osm_nominatim: áááááá áááá <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>-ááá
-      types: 
-        cities: á¥áááá¥ááá
-        places: áááááááá
-        towns: áááááá
-    description_osm_namefinder: 
-      prefix: "%{distance} %{direction} %{type}"
-    direction: 
-      east: áá¦ááá¡áááááá
-      north: á©á ááááááá
-      north_east: á©á áááá-áá¦ááá¡áááááá
-      north_west: á©á áááá-ááá¡áááááá
-      south: á¡ááá®á ááá
-      south_east: á¡ááá®á áá-áá¦ááá¡áááááá
-      south_west: á¡ááá®á áá-ááá¡áááááá
-      west: ááá¡áááááá
-    distance: 
-      one: áááá®áááááá 1 áá
-      other: áááá®áááááá %{count} áá
-      zero: 1 áá-áá ááááááá
-    results: 
-      more_results: ááá¢á á¨ááááá
-      no_results: á¨ááááá ááá  áááá«áááá
-    search: 
-      title: 
+    no_such_entry:
+      title: áá¦áá£á á¨á áá¡ááá á©áááá¬áá á áá  áá áá¡
+      heading: 'id: %{id}-ááá á©áááá¬áá á áá  áá áá¡'
+    diary_entry:
+      comment_link: áááááá¢áá á
+      comment_count:
+        one: '%{count} áááááá¢áá á'
+        zero: áá  áá áá¡ áááááá¢áá á
+        other: '%{count} áááááá¢áá á'
+      edit_link: á©áááá¬áá áá¡ á áááá¥á¢áá ááá
+      hide_link: áá á©áááá¬áá áá¡ ááááááá
+      confirm: ááááá¡á¢á£á ááá
+    diary_comment:
+      hide_link: áá áááááá¢áá áá¡ ááááááá
+      confirm: ááááá¡á¢á£á ááá
+    location:
+      location: 'áááááá áááá:'
+      view: áá®áááá
+      edit: á áááá¥á¢áá ááá
+    comments:
+      post: ááá¡á¢á
+      when: á áááá¡
+      comment: áááááá¢áá á
+      ago: '%{ago} á¬áá'
+      newer_comments: áá®ááá áááááá¢áá ááá
+      older_comments: á«áááá áááááá¢áá ááá
+  geocoder:
+    search:
+      title:
+        latlon: <a href="http://openstreetmap.org/">á¨ááá á¨ááááááá</a>
         ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a>âá¡ á¨ááááááá
+        osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+          Nominatim</a>âáá¡ á¨ááááááá
         geonames: <a href="http://www.geonames.org/">GeoNames</a>âáá¡ á¨ááááááá
-        latlon: <a href="http://openstreetmap.org/">á¨ááá á¨ááááááá</a>
-        osm_namefinder: <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>âáá¡ á¨ááááááá
-        osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>âáá¡ á¨ááááááá
-        uk_postcode: <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>âáá¡ á¨ááááááá
-        us_postcode: <a href="http://geocoder.us/">Geocoder.us</a>âáá¡ á¨ááááááá
-    search_osm_namefinder: 
-      suffix_place: ", %{distance} %{direction} %{placename}âááá"
-    search_osm_nominatim: 
-      prefix: 
-        aeroway: 
+    search_osm_nominatim:
+      prefix:
+        aerialway:
+          cable_car: á¡áááááá á ááá
+          station: á¡áááááá á áááá¡ á¡áááá£á á
+        aeroway:
           aerodrome: ááá ááá ááá
           gate: ááá¡áá¡ááááá
+          helipad: ááá á¢áá¤á áááá¡ ááá¡áá¯áááá
           runway: áá¡áá¤á áá-ááá¡áá¤á ááá áááááá
           terminal: á¢áá áááááá
-        amenity: 
-          WLAN: WiFi á¬áá á¢ááá
-          airport: ááá áááá á¢á
+        amenity:
+          animal_shelter: áªá®áááááá áááá¨áá¡áá¤áá á
           arts_centre: á®ááááááááá¡ áªááá¢á á
           atm: áááááááá¢á
-          auditorium: áá£ááá¢áá áá
           bank: ááááá
           bar: ááá á
           bbq: ááá ááá¥áá£
@@ -398,52 +300,46 @@ ka:
           bicycle_parking: ááááá¡áááááááá¡ á¡áááááá
           bicycle_rental: ááááá¡áááááááá¡ ááá¥áá ááááá
           biergarten: áá£ááá¡ ááá¦á
+          boat_rental: ááááááá¡ ááá¥áá ááááá
           brothel: á¡áá áá¡áááá
           bureau_de_change: áááá£á¢áá¡ áááááªááá
           bus_station: ááá¢ááá£á¡áá¡ ááá©áá ááá
           cafe: ááá¤á
           car_rental: áááá¥áááá¡ ááá¥áá ááááá
+          car_sharing: áááá¥áááááá¡ ááá¥áá ááááá
           car_wash: ááá¢áá¡ááá ááªá®áá
           casino: á¡áááá ááá
+          charging_station: ááá¡ááá£á®á¢á á¡áááá£á á
           cinema: áááááááá¢á á
           clinic: ááááááááááá
-          club: ááá£áá
+          clock: á¡áááá
           college: ááááá¯á
           community_centre: á¡áááááááááá ááá áªááá¢á á
           courthouse: á¡áá¡áááá ááá
           crematorium: áá áááá¢áá áá£áá
           dentist: áááá¢áá¡á¢á
           doctors: áá¥ááá
-          dormitory: á¡ááá áá á¡ááªá®ááá ááááá
           drinking_water: á¡áá¡áááá á¬á§ááá
           driving_school: ááá¢áá¡áááá
           embassy: á¡áááá©á
-          emergency_phone: á¡áááááááá á¡áá¢á£ááªááááá¡ á¡ááá¡áá®á£á áá¡ á¢áááá¤ááá
           fast_food: á¡á¬á áá¤á ááááá
           ferry_terminal: ááá áááá¡ á¡áááá£á á
-          fire_hydrant: á¡áá®ááá«á á á°ááá ááá¢á
           fire_station: á¡áá®ááá«á á áááá§áá¤ááááá
           fountain: á¨ááá ááááá
           fuel: á¡áá¬áááá
           grave_yard: á¡áá¤áááá
-          gym: á¤áá¢ááá¡ áªááá¢á á / á¡áááá á¯áá¨á ááá áááá
-          hall: ááá áááá
-          health_centre: á¯áááá ááááááá¡ áªááá¢á á
           hospital: á¡ááááááá§áá¤á
-          hotel: á¡áá¡á¢á£áá á
           hunting_stand: á¡áááááá á ááá¨áá£á á
           ice_cream: ááá§ááá
           kindergarten: á¡ááááá¨áá ááá¦á
           library: áááááááááá
-          market: ááá¦áááá
           marketplace: ááááá á
-          mountain_rescue: á¡ááááâá¡áááá¨áááá á¡ááá¡áá®á£á á
+          monastery: ááááá¡á¢áá á
           nightclub: á¦áááá¡ ááá£áá
-          nursery: áááá¡ááááá¢á
           nursing_home: ááá®á£áªááá£ááá áááá¨áá¡áá¤áá á
           office: áá¤áá¡á
-          park: ááá áá
           parking: ááá¢áá¡áááááá
+          parking_entrance: á¡ááááááá¡ á¨áá¡áá¡ááááá
           pharmacy: áá¤áááá¥á
           place_of_worship: á áááááá£á á áááááá
           police: áááááªáá
@@ -453,8 +349,6 @@ ka:
           prison: áªáá®á
           pub: áááá
           public_building: á¡áá¯áá á á¨ááááá
-          public_market: áááá ááá
-          reception_area: áááá¦ááá
           recycling: áááááá¡áá§á ááá
           restaurant: á áá¡á¢áá ááá
           retirement_home: ááá®á£áªááá£ááá áááá¨áá¡áá¤áá á
@@ -462,11 +356,10 @@ ka:
           school: á¡áááá
           shelter: áááá¨áá¡áá¤áá á
           shop: ááá¦áááá
-          shopping: á¡áááá­á á áªááá¢á á
           shower: á¨á®ááá
+          social_centre: á¡áááááááááá ááá áªááá¢á á
           social_club: á¡áááááááááá ááá áááá¨áá§á áá¡ áááááá
           studio: á¡á¢á£ááá
-          supermarket: á¡á£ááá ááá ááá¢á
           swimming_pool: á¡ááªá£á áá áá£áá
           taxi: á¢áá¥á¡á
           telephone: á¡áááááááááá ááá á¢áááá¤ááá
@@ -477,28 +370,46 @@ ka:
           vending_machine: á¡áááá­á á ááá¢áááá¢á
           veterinary: ááá¢áá áááá á£áá ááááááá
           waste_basket: áááááá¡ á£á áá
-          wifi: WiFi á¬áá á¢ááá
           youth_centre: áá®áááááá áá£áá áªááá¢á á
-        boundary: 
+        boundary:
           administrative: ááááááá¡á¢á ááªáá£áá á¡ááá¦ááá á
+          census: áá¦á¬áá áá¡ á áááááá¡ á¡ááá¦ááá á
           national_park: áá áááá£áá ááá áá
           protected_area: áááªá£áá á¢áá áá¢áá áá
-        bridge: 
+        bridge:
           aqueduct: áááááá£áá
           suspension: áááááááá£áá á®ááá
           swing: á ááá£ááá ááááá á®ááá
+          viaduct: ááááá£áá
           "yes": á®ááá
-        building: 
+        building:
           "yes": á¨ááááá
-        highway: 
+        craft:
+          brewery: áá£áá¡áá®áá á¨á
+          carpenter: áá£á áááá
+          electrician: áááá¥á¢á áááá¡á
+          gardener: ááááá¦á
+          painter: áá®áá¢ááá á
+          photographer: á¤áá¢ááá áá¤á
+          plumber: á¡ááá¢áá¥ááááá¡á
+          shoemaker: ááá¬áá¦á
+          tailor: ááááá¥á
+          "yes": á¡áá®áááá¡áá
+        emergency:
+          ambulance_station: á¡áá¡á¬á áá¤á ááá®ááá áááá¡ á¡áááá£á á
+          defibrillator: ááá¤ááá áááá¢áá á
+          landing_site: áááá áá£áá ááá¨ááááá¡ áááááá
+          phone: á¡áááááááá áááá¨áá áá¡ á¢áááá¤ááá
+        highway:
+          abandoned: ááá¢ááááá£áá ááá
           bridleway: á¡ááªá®áááá¡áá ááá
           bus_stop: ááá¢ááá£á¡áá¡ ááá©áá ááá
           construction: áááá¡ á¡áá ááááá¢á á¡ááá£á¨ááááá
           cycleway: ááááá¡áááááá¡ ááá
+          elevator: ááá¤á¢á
           emergency_access_point: á¡áá¡á¬á áá¤á ááá®ááá áááá¡ áá£áá¥á¢á
           footway: á¢á áá¢á£áá á
           living_street: á¡ááªá®ááá ááááá á¥á£á©á
-          minor: áááá ááá ááá
           motorway: ááá¢áááááá¡á¢á ááá
           motorway_junction: áááá¯ááá ááááá
           path: áááááá
@@ -506,40 +417,54 @@ ka:
           platform: ááá¥ááá
           primary: áááááá á ááá
           primary_link: áááááá á ááá
-          residential: á¡ááªá®ááá ááááá
+          proposed: áá ááá¥á¢áá ááááá ááá
+          raceway: á¡áá áááá á¢á áá¡á
+          residential: á¡ááªá®ááá ááááá á¥á£á©á
           rest_area: ááá¡áá¡áááááááá á¢áá áá¢áá áá
           road: ááá
           secondary: áááá ááá ááá
           secondary_link: áááá ááá ááá
           speed_camera: á¡áá©á¥áá áá¡ áááááá¢á ááááááá ááááá á
           steps: á¡áá¤áá®á£á ááá
+          street_lamp: á¥á£á©áá¡ á¡ááááá
           tertiary: ááá¡ááá áááá¡áá¡ ááá
+          tertiary_link: ááá¡ááá áááá¡áá¡ ááá
           track: áááááá
+          traffic_signals: á¨á£á¥ááá¨ááá
           trail: áááááá
           unclassified: áááááááá ááá ááá
-          unsurfaced: á£ááááááá á ááá
-        historic: 
+          "yes": ááá
+        historic:
           archaeological_site: áá á¥ááááááá£á á áááá®á ááá
           battlefield: áá á«áááá¡ áááá
           boundary_stone: á¡áá¡ááá¦áá á á¥áá
-          building: á¨ááááá
+          building: áá¡á¢áá áá£áá á¨ááááá
+          bunker: áá£áááá á
           castle: áªáá®á-á¡ááááá á
           church: ááááá¡áá
+          city_gate: á¥áááá¥áá¡ ááá ááá­á
+          citywalls: á¥áááá¥áá¡ ááááááá
           fort: á¤áá á¢á
+          heritage: áá£áá¢á£á á£áá áááááááá ááááá¡ ááááá¥á¢á
           house: á¡áá®áá
           icon: á®áá¢á£áá
           manor: áááá£áá
           memorial: ááááá áááá
           mine: ááá¦áá á
           monument: áááá£áááá¢á
-          museum: áá£ááá£áá
+          roman_road: á áááá£áá ááá
           ruins: ááááá ááááá
+          stone: á¥áá
+          tomb: ááááááá
           tower: ááá¨áá
-        landuse: 
+        junction:
+          "yes": áááá¯ááá ááááá
+        landuse:
           basin: áá£áá
           brownfield: ááá¢ááááá£áá áááááá
           cemetery: á¡áá¡áá¤ááá
           commercial: ááááá áªáá£áá á¢áá áá¢áá áá
+          conservation: áááá¡áá áááªáá
           construction: áá¨áááááááá
           farm: á¤áá áá
           farmland: á¡áááá áá£áá
@@ -552,20 +477,21 @@ ka:
           meadow: áááááá á
           military: á¡ááá®ááá á á¢áá áá¢áá áá
           mine: ááá¦áá á
-          nature_reserve: áááá á«ááá
           orchard: á®áááá¡ ááá¦á
-          park: ááá áá
           quarry: ááá ááá á
           railway: á ááááááá
           recreation_ground: á ááá áááªáá£áá áááá
           reservoir: á¬á§ááá¡ááªááá
           residential: á¡ááªá®ááá ááááá á¢áá áá¢áá áá
+          retail: á¡áááá­á á á¢áá áá¢áá áá
           village_green: áá¬áááá á¡áá¤ááá
           vineyard: ááááá®á
-          wetland: á­áá áá¢áááááá á¢áá áá¢áá áá
-          wood: á¢á§á
-        leisure: 
+          "yes": ááá¬ááá¡áá ááááááá
+        leisure:
+          dog_park: á«áá¦ááááá¡ ááá áá
           fishing: á¡ááááááá á¢áá áá¢áá áá
+          fitness_centre: á¤áá¢ááá¡-áªááá¢á á
+          fitness_station: á¤áá¢ááá¡-á¡áááá£á á
           garden: ááá¦á
           golf_course: áááá¤áá¡ ááááááá
           ice_rink: á§ááá£ááá¡ ááááááá
@@ -576,22 +502,30 @@ ka:
           pitch: á¡ááá á¢á£áá áááááá
           playground: á¡áááááá¨á ááááááá
           recreation_ground: á ááá áááªáá£áá áááá
+          resort: áá£á áá á¢á
           sauna: á¡áá£áá
           sports_centre: á¡ááá á¢á£áá áªááá¢á á
           stadium: á¡á¢áááááá
           swimming_pool: á¡ááªá£á áá áá£áá
           track: á¡áá áááá áááááá
           water_park: ááááááá áá
-        military: 
+        man_made:
+          lighthouse: á¨á£á¥á£á á
+          pipeline: áááá¡ááááá
+          tower: ááá¨áá
+          works: á¤ááá ááá
+          "yes": á®áááááá£á á
+        military:
           airfield: á¡ááá®ááá á ááá ááá ááá
           barracks: á§áááá áááá
           bunker: áá£áááá á
-        natural: 
+        mountain_pass:
+          "yes": á£á¦ááá¢áá®ááá
+        natural:
           bay: á§á£á á
           beach: ááááá
           cape: ááááªá®á
           cave_entrance: ááááá¥áááá£áá¨á á¨áá¡áá¡ááááá
-          channel: áá á®á
           cliff: á®á ááá
           crater: áá áá¢áá á
           dune: ááá£áá
@@ -600,6 +534,7 @@ ka:
           forest: á¢á§á
           geyser: áááááá á
           glacier: áá§ááááá á
+          grassland: ááááá
           hill: ááá áªáá
           island: áá£áá«á£áá
           land: á®áááááá
@@ -610,11 +545,11 @@ ka:
           point: ááááªá®á
           reef: á áá¤á
           ridge: á¥ááá
-          river: áááááá á
           rock: áááá
+          saddle: á£á¦ááá¢áá®ááá
+          sand: á¥ááá¨á
           scree: ááááááááá
           scrub: áá£á©á¥ááá á
-          shoal: ááááá®ááá
           spring: á¬á§áá á
           stone: á¥áá
           strait: á¡á á£á¢á
@@ -623,19 +558,22 @@ ka:
           volcano: áá£ááááá
           water: á¬á§ááá
           wetland: á­áá áá¢áááááá á¢áá áá¢áá áá
-          wetlands: á­áá áá¢áááááá á¢áá áá¢áá áááá
           wood: á¢á§á
-        office: 
+        office:
+          accountant: áá£á¦ááá¢áá á
+          administrative: ááááááá¡á¢á ááªáá
           architect: áá á¥áá¢áá¥á¢áá á
           company: áááááááá
+          employment_agency: ááá¡áá¥ááááá¡ á¡áááááá¢á
           estate_agent: á£á«á ááá á¥áááááá¡ ááááá¢á
           government: á¡áááááá ááá áá¤áá¡á
+          insurance: á¡ááááá¦áááá áá¤áá¡á
+          lawyer: áá£á áá¡á¢á
           ngo: áá áá¡áááááá ááá áá áááááááªááá¡ áá¤áá¡á
           telecommunication: á¡áá¢ááááááá£áááááªáá áá¤áá¡á
           travel_agent: á¢á£á áá¡á¢á£áá á¡áááááá¢á
           "yes": áá¤áá¡á
-        place: 
-          airport: ááá áááá á¢á
+        place:
           city: á¥áááá¥á
           country: á¥ááá§ááá
           county: ááá¥á
@@ -645,8 +583,8 @@ ka:
           houses: á¡áá®áááá
           island: áá£áá«á£áá
           islet: ááá¢áá á áá£áá«á£áá
-          moor: á¢áá á¤ááá á
           municipality: áá£áááªáááááá¢áá¢á
+          neighbourhood: á¡áááááááá
           postcode: á¡áá¤áá¡á¢á ááááá¥á¡á
           region: á áááááá
           sea: áá¦áá
@@ -656,24 +594,26 @@ ka:
           town: áááá
           unincorporated_area: ááááá¡á£á¤ááá áááá
           village: á¡áá¤ááá
-        railway: 
+        railway:
           abandoned: ááá¢ááááá£áá á ááááááá
           construction: á áááááááá¡ á ááááá¢á
           disused: ááá¢ááááá£áá á ááááááá
-          disused_station: ááá¢ááááá£áá á áááááááá¡ á¡áááá£á á
           funicular: á¤á£áááá£áááá á
           halt: ááá¢áá ááááá¡ ááá©áá ááá
-          historic_station: áá¡á¢áá áá£áá á áááááááá¡ á¡áááá£á á
+          level_crossing: á¡áá ááááááá ááááá¡áá¡ááááá
+          light_rail: áá¡á£áá£á¥á á ááááááá
           monorail: ááááá ááá¡á
           platform: á áááááááá¡ ááá¥ááá
+          preserved: áá¡á¢áá áá£áá á ááááááá
+          proposed: áá ááá¥á¢áá ááááá á ááááááá
           station: á áááááááá¡ á¡áááá£á á
-          subway: ááá¢á áá¡áááá£á á
+          stop: á¡áá ááááááá ááá©áá ááá
+          subway: ááá¢á á
           subway_entrance: ááá¢á áá¨á á¨áá¡áá¡ááááá
           switch: á¡áá ááááááá áá¡áá á
           tram: á¢á ááááá
           tram_stop: á¢á áááááá¡ ááá©áá ááá
-          yard: á áááááááá¡ áááá
-        shop: 
+        shop:
           antiques: ááá¢ááááá ááá¢á
           art: á¡ááá®áá¢áá á á¡ááááá
           bakery: á¡ááªá®ááá
@@ -681,6 +621,7 @@ ka:
           beverages: á¡áá¡ááááááá¡ ááá¦áááá
           bicycle: ááááá¡áááááááá¡ ááá¦áááá
           books: á¬ááááá¡ ááá¦áááá
+          boutique: áá£á¢ááá
           butcher: á¡áá§áá¡áá
           car: ááá¢áá¡ááááá
           car_parts: ááá¢áááá¬ááááá
@@ -690,35 +631,53 @@ ka:
           clothes: á¢ááá¡ááªáááá¡ ááá¦áááá
           computer: áááááá£á¢áá áááá¡ ááá¦áááá
           confectionery: á¡ááááááá¢á á
+          convenience: á¡áá¡á£á á¡ááá ááá¦áááá
           cosmetics: ááá¡ááá¢áááá¡ ááá¦áááá
+          dry_cleaning: á¥ááá¬ááááá
           electronics: áááá¥á¢á áá¢áá¥ááááá¡ ááá¦áááá
           estate_agent: á£á«á ááá á¥áááááá¡ ááááá¢á
+          fashion: áááá£á á á¢ááá¡ááªáááá¡ ááá¦áááá
           fish: áááááááá¡ ááá¦áááá
           florist: á§ááááááááá¡ ááá¦áááá
+          food: á¡ááááááá¡ ááá¦áááá
+          funeral_directors: ááááá á«ááááá ááá£á á
           furniture: áááá¯á
           gallery: ááááá áá
           gift: á¡áá©á£á¥á áááá¡ ááá¦áááá
+          greengrocer: á®áá-ááá¡á¢ááá£ááá¡ ááá¦áááá
+          hairdresser: á¡áááá ááááá®áá á
           jewelry: á¡ááá£ááááá á ááá¦áááá
           kiosk: á¯áá®á£á á
           laundry: á¡ááá ááªá®áá
+          mall: áááá
           market: ááááá á
           mobile_phone: áááááá£á á á¢áááá¤áááááá¡ ááá¦áááá
+          motorcycle: ááá¢ááªááááá¢áááá¡ ááá¦áááá
           music: áá£á¡ááááá£á á ááá¦áááá
+          newsagent: á¡ááááááá á¯áá®á£á á
           optician: ááá¢ááá
+          organic: áá áááá£áá á¡ááááááá¡ ááá¦áááá
           pet: áááááá¦áááá
+          pharmacy: áá¤áááá¥á
           photo: á¤áá¢áááá¦áááá
-          salon: á¡ááááá
+          second_hand: áááá áááááá¡ ááá¦áááá
           shoes: á¤áá®á¡ááªáááá¡ ááá¦áááá
-          shopping_centre: á¡áááá­á á áªááá¢á á
           sports: á¡ááá á¢á£áá ááá¦áááá
           stationery: á¡áááááªáááá áá ááá¦áááá
           supermarket: á¡á£ááá ááá ááá¢á
+          tailor: ááááá¥á
           toys: á¡áááááá¨ááááá¡ ááá¦áááá
           travel_agency: á¢á£á áá¡á¢á£áá á¡áááááá¢á
           video: ááááá ááá¦áááá
-        tourism: 
+          wine: á¦ááááá¡ ááá¦áááá
+          "yes": ááá¦áááá
+        tourism:
+          alpine_hut: áááá£á á á¡áá®áá
+          apartment: áááá
+          artwork: á®ááááááááá¡ áááá£á¨á
           attraction: áá¢á áá¥áªáááá
           camp_site: ááááááá¡ áááááá
+          gallery: ááááá áá
           guest_house: á¡áá¡á¢á£áá á á¡áá®áá
           hostel: á°áá¡á¢ááá
           hotel: á¡áá¡á¢á£áá á
@@ -727,533 +686,558 @@ ka:
           museum: áá£ááá£áá
           picnic_site: á¡áááááááá áááááá
           theme_park: ááááá¢á£á á ááá áá
-          valley: áááá
           zoo: áááááá áá
-        tunnel: 
+        tunnel:
           "yes": áááá ááá
-        waterway: 
+        waterway:
+          artificial: á®áááááá£á á á¬á§ááá¡ááááá
           canal: áá á®á
           dam: ááá¨á®ááá
+          derelict_canal: áááá¨á ááá áá á®á
           dock: áááá¡áááá£á á
-          mineral_spring: ááááá ááá£á á á¬á§áá á
           river: áááááá á
-          riverbank: áááááá áá¡ ááááá á
           stream: áááááá£áá
+          wadi: áááá¨á ááá ááááááá¢á
           waterfall: á©ááá©á¥áá á
-  javascripts: 
-    map: 
-      base: 
-        cycle_map: ááááá¡áááááá¡á¢áááá¡ á á£áá
-        standard: á¡á¢ááááá á¢á£áá
-        transport_map: á¢á ááá¡ááá á¢áá¡ á á£áá
-    site: 
-      edit_disabled_tooltip: á áááá¥á¢áá áááá¡ááááá¡ ááááá ááá á á£ááá¡ ááá¡á¨á¢ááá
-      edit_tooltip: á á£ááá¡ á áááá¥á¢áá ááá
-      edit_zoom_alert: á áááá¥á¢áá áááá¡ááááá¡, á¡áá­áá áá á á£ááá¡ ááá¡á¨á¢áááá¡ áááá áá
-      history_disabled_tooltip: ááááá ááá á á£ááá¡ ááá¡á¨á¢ááá, á ááá á¨áá«ááá áá á¢áá áá¢áá ááá¡ á áááá¥á¢áá áááááá¡ á®áááá
-      history_tooltip: áá á¢áá áá¢áá ááá¡ á áááá¥á¢áá áááááá¡ á®áááá
-      history_zoom_alert: á áááá¥á¢áá áááááá¡ áá¡á¢áá ááá¡ á¡áááá®áááá á¡áá­áá áá á á£ááá¡ ááá¡á¨á¢áááá¡ áááá áá
-  layouts: 
-    community: ááááá¡áááááááááá
-    community_blogs: ááááá¡ááááááááááá¡ ááááááá
-    copyright: á¡áááá¢áá á á£á¤áááá áá áááªááááá
-    documentation: áááá£áááá¢ááªáá
-    edit: á áááá¥á¢áá ááá
-    edit_with: á áááá¥á¢áá ááá %{editor}
-    export: áá¥á¡ááá á¢á
-    export_tooltip: á á£ááá¡ áááááªáááááá¡ áá¥á¡ááá á¢áá ááá
-    foundation: á¤áááá
-    foundation_title: á¤áááá OpenStreetMap
-    gps_traces: GPS ááááá
-    help: ááá®ááá ááá
-    help_centre: ááá®ááá áááá¡ áªááá¢á á
-    history: áá¡á¢áá áá
-    home: á¡áá®áá
-    home_tooltip: á¡áá¬á§áá¡ áááááá áááááá áááá á£áááá
-    intro_1: OpenStreetMap áá áá¡ áá¡áá¤áááá¡ ááááá¡á£á¤ááá á á£áá, á¨áá¥ááááá áá¥ááááááá á ááááááááááá¡ áááá .
-    intro_2_create_account: áááá®ááá ááááá¡ ááááá áá¨áá¡ á¨áá¥ááá
-    intro_2_download: áááááá¬áá á
-    intro_2_license: ááááá¡á£á¤ááá áááªááááá
-    intro_2_use: ááááá§ááááá
-    intro_2_use_url: http://wiki.openstreetmap.org/wiki/KA:Using_OpenStreetMap
-    log_in: á¨áá¡ááá
-    logo: 
+      admin_levels:
+        level2: á¥ááá§ááá¡ á¡ááá¦ááá á
+        level4: á¨á¢áá¢áá¡ á¡ááá¦ááá á
+        level5: á ááááááá¡ á¡ááá¦ááá á
+        level6: ááá¥áá¡ á¡ááá¦ááá á
+        level8: á¥áááá¥áá¡ á¡ááá¦ááá á
+        level9: á¡áá¤ááá¡ á¡ááá¦ááá á
+        level10: ááá áá£áááá¡ á¡ááá¦ááá á
+    description:
+      title:
+        osm_nominatim: áááááá áááá <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+          Nominatim</a>-ááá
+        geonames: áááááá áááá <a href="http://www.geonames.org/">GeoNames</a>-ááá
+      types:
+        cities: á¥áááá¥ááá
+        towns: áááááá
+        places: áááááááá
+    results:
+      no_results: á¨ááááá ááá  áááá«áááá
+      more_results: ááá¢á á¨ááááá
+  layouts:
+    logo:
       alt_text: OpenStreetMap-áá¡ áááá
+    home: á¡áá¬á§áá¡ ááááááá áááá á£áááá
     logout: ááá¡ááá
-    logout_tooltip: ááá¡ááá
-    make_a_donation: 
-      text: áá ááá¥á¢áá¡ ááá®ááá ááá
-    partners_partners: ááá á¢áááá ááá
-    partners_url: http://wiki.openstreetmap.org/wiki/Partners
+    log_in: á¨áá¡ááá
     sign_up: á áááá¡á¢á ááªáá
-    tag_line: ááááá¡á£á¤ááá áááá-á á£áá
+    edit: á áááá¥á¢áá ááá
+    history: áá¡á¢áá áá
+    export: áá¥á¡ááá á¢á
+    gps_traces: GPS ááááá
     user_diaries: áááá®ááá ááááááá¡ áá¦áá£á ááá
     user_diaries_tooltip: áááá®ááá ááááááá¡ áá¦áá£á áááá¡ ááá®áá
-    view: áá®áááá
-    view_tooltip: á á£ááá¡ á®áááá
-    welcome_user: áááááá áá§áá¡ áá¥áááá áááá á«ááááá, %{user_link}
-    welcome_user_link_tooltip: áá¥áááá áááá®ááá ááááá¡ áááá áá
-    wiki: áááá
-  license_page: 
-    foreign: 
-      english_link: áááááá¡á£á á áá ááááááá
-    native: 
-      mapping_link: ááá á¢ááá áá¤áá áááá¡ ááá¬á§ááá
-      native_link: á¥áá áá£áá ááá á¡áá
-      title: áá áááá ááá¡ á¨áá¡áá®áá
-  message: 
-    delete: 
-      deleted: á¨áá¢á§ááááááá á¬áá¨ááááá
-    inbox: 
-      date: ááá áá¦á
-      from: ááááááááááá
-      messages: áá¥ááá ááá¥áá %{new_messages} áá %{old_messages}
+    edit_with: á áááá¥á¢áá ááá %{editor}
+    tag_line: ááááá¡á£á¤ááá áááá-á á£áá
+    intro_2_create_account: áááá®ááá ááááá¡ ááááá áá¨áá¡ á¨áá¥ááá
+    partners_partners: ááá á¢áááá ááá
+    help: ááá®ááá ááá
+    copyright: á¡áááá¢áá á á£á¤áááá
+    community: ááááá¡áááááááááá
+    community_blogs: ááááá¡ááááááááááá¡ ááááááá
+    foundation: á¤áááá
+    foundation_title: á¤áááá OpenStreetMap
+    make_a_donation:
+      text: áá ááá¥á¢áá¡ ááá®ááá ááá
+  notifier:
+    diary_comment_notification:
+      subject: '[OpenStreetMap]-áá¡ áááá®ááá áááááá %{user} áá¥áááá¡ áá¦áá£á á¨á ááá¢ááá áááááá¢áá á'
+      hi: ááááá á¯ááá %{to_user},
+    message_notification:
+      hi: ááááá á¯ááá %{to_user},
+    friend_notification:
+      subject: '[OpenStreetMap]-áá¡ áááá®ááá áááááá %{user} ááááááá¢áá áááááá ááá¨á'
+    gpx_notification:
+      greeting: ááááá á¯ááá,
+    signup_confirm:
+      subject: '[OpenStreetMap] ááááá¡ááááááá OpenStreetMap-á¨á'
+      greeting: ááááá á¯ááá!
+    email_confirm:
+      subject: '[OpenStreetMap] áááááá¡á¢á£á áá áá¥áááá áá.á¤áá¡á¢áá¡ ááá¡áááá áá'
+    email_confirm_plain:
+      greeting: ááááá á¯ááá,
+    email_confirm_html:
+      greeting: ááááá á¯ááá,
+    lost_password_plain:
+      greeting: ááááá á¯ááá,
+    lost_password_html:
+      greeting: ááááá á¯ááá,
+    note_comment_notification:
+      anonymous: ááááááá£á á áááá®ááá ááááá
+      greeting: ááááá á¯ááá,
+  messages:
+    inbox:
+      title: ááá¦ááá£áá
       my_inbox: á©ááá ááá¦ááá£áá
-      new_messages: 
-        one: "%{count} áá®ááá á¨áá¢á§ááááááá"
-        other: "%{count} áá®ááá á¨áá¢á§ááááááá"
-      no_messages_yet: áá¥ááá á¯áá  áá  ááá¥áá á¨áá¢á§ááááááááá. á áá¢áá áá  á£ááá ááááá¡áá£áá á áááááá¡ %{people_mapping_nearby_link}?
-      old_messages: 
-        one: "%{count} á«áááá á¨áá¢á§ááááááá"
-        other: "%{count} á«áááá á¨áá¢á§ááááááá"
       outbox: áááááááááá
-      people_mapping_nearby: áá®ááá¡ áá§áá¤á á®ááá®á
+      messages: áá¥ááá ááá¥áá %{new_messages} áá %{old_messages}
+      new_messages:
+        one: '%{count} áá®ááá á¨áá¢á§ááááááá'
+        other: '%{count} áá®ááá á¨áá¢á§ááááááá'
+      old_messages:
+        one: '%{count} á«áááá á¨áá¢á§ááááááá'
+        other: '%{count} á«áááá á¨áá¢á§ááááááá'
+      from: ááááááááááá
       subject: áááá
-      title: ááá¦ááá£áá
-    mark: 
-      as_read: á¨áá¢á§ááááááá ááááá¨áá£ááá á áááá áª á¬ááááá®á£áá
-      as_unread: á¨áá¢á§ááááááá ááááá¨áá£ááá á áááá áª á¬áá£áááá®ááá
-    message_summary: 
-      delete_button: á¬áá¨áá
+      date: ááá áá¦á
+      no_messages_yet: áá¥ááá á¯áá  áá  ááá¥áá á¨áá¢á§ááááááááá. á áá¢áá áá  á£ááá ááááá¡áá£áá á
+        áááááá¡ %{people_mapping_nearby_link}?
+      people_mapping_nearby: áá®ááá¡ áá§áá¤á á®ááá®á
+    message_summary:
+      unread_button: ááááá¨ááá á áááá áª á¬áá£áááá®ááá
       read_button: ááááá¨ááá á áááá áª á¬ááááá®á£áá
       reply_button: ááá¡á£á®á
-      unread_button: ááááá¨ááá á áááá áª á¬áá£áááá®ááá
-    new: 
-      back_to_inbox: ááá¦ááá£áááá¨á áááá á£áááá
-      body: á¢áá¥á¡á¢á
-      limit_exceeded: áá¥ááá áªáá¢á á®ááá¡ á¬áá ááááááááá áááá á á¨áá¢á§ááááááá. á¡áááá ááááá ááááááááááá, ááááªáááá áªáá¢á á®ááá.
-      message_sent: á¨áá¢á§ááááááá ááááááááá
-      send_button: áááááááá
+      destroy_button: á¬áá¨áá
+    new:
+      title: á¨áá¢á§áááááááá¡ áááááááá
       send_message_to: ááá£ááááááá áá®ááá á¨áá¢á§ááááááá %{name}
       subject: áááá
-      title: á¨áá¢á§áááááááá¡ áááááááá
-    no_such_message: 
-      body: ááááá¨áá, áááá áá á¨áá¢á§ááááááá áá ID-áá áá  áá á¡ááááá¡.
-      heading: áá¡ááá á¨áá¢á§ááááááá áá  áá á¡ááááá¡
-      title: áá¡ááá á¨áá¢á§ááááááá áá  áá á¡ááááá¡
-    outbox: 
-      date: ááá áá¦á
+      body: á¢áá¥á¡á¢á
+      send_button: áááááááá
+      back_to_inbox: ááá¦ááá£áááá¨á áááá á£áááá
+    create:
+      message_sent: á¨áá¢á§ááááááá ááááááááá
+      limit_exceeded: áá¥ááá áªáá¢á á®ááá¡ á¬áá ááááááááá áááá á á¨áá¢á§ááááááá. á¡áááá ááááá
+        ááááááááááá, ááááªáááá áªáá¢á á®ááá.
+    no_such_message:
+      title: áá¡ááá á¨áá¢á§ááááááá áá  áá á¡ááááá¡
+      heading: áá¡ááá á¨áá¢á§ááááááá áá  áá á¡ááááá¡
+      body: ááááá¨áá, áááá áá á¨áá¢á§ááááááá áá ID-áá áá  áá á¡ááááá¡.
+    outbox:
+      title: áááááááááá
+      my_inbox: á©ááá %{inbox_link}
       inbox: ááá¦ááá£áá
-      messages: 
+      outbox: áááááááááá
+      messages:
         one: áá¥ááá ááá¥áá %{count} áááááááááá á¨áá¢á§ááááááá
         other: áá¥ááá ááá¥áá %{count} áááááááááá á¨áá¢á§ááááááá
-      my_inbox: á©ááá %{inbox_link}
-      no_sent_messages: áá¥ááá á¯áá  áá  ááá¥áá áááááááááá á¨áá¢á§ááááááááá. á áá¢áá áá  á£ááá ááááá¡áá£áá á áááááá¡ %{people_mapping_nearby_link}?
-      outbox: áááááááááá
-      people_mapping_nearby: áá®ááá¡ áá§áá¤á á®ááá®á
-      subject: áááá
-      title: áááááááááá
       to: ááá¡
-    read: 
-      back_to_inbox: ááá¦ááá£áááá¨á áááá á£áááá
-      back_to_outbox: áááááááááááá¨á áááá á£áááá
+      subject: áááá
       date: ááá áá¦á
+      no_sent_messages: áá¥ááá á¯áá  áá  ááá¥áá áááááááááá á¨áá¢á§ááááááááá. á áá¢áá áá  á£ááá
+        ááááá¡áá£áá á áááááá¡ %{people_mapping_nearby_link}?
+      people_mapping_nearby: áá®ááá¡ áá§áá¤á á®ááá®á
+    reply:
+      wrong_user: áá¥ááá á¨áá®ááááá á áááá áª `%{user}' áááá áá ááá¡á£á®á áá¥ááá áááá®áááá áá 
+        ááááááááá áá áááá®ááá ááááááá. ááá®ááá, á¨áá®ááááá, á áááá áª á¨áá¡áááááá¡á áááá®ááááá¡
+        ááááááááááá áááá®ááá ááááá, á ááá áá®áááá ááá¡á£á®á.
+    show:
+      title: á¨áá¢á§áááááááá¡ á¬ááááá®áá
       from: ááááááááááá
-      reading_your_messages: á¨áá¢á§áááááááááá¡ á¬ááááá®áá
-      reading_your_sent_messages: áááááááááá á¨áá¢á§áááááááááá¡ á¬ááááá®áá
-      reply_button: ááá¡á£á®á
       subject: áááá
-      title: á¨áá¢á§áááááááá¡ á¬ááááá®áá
-      to: ááá¡
+      date: ááá áá¦á
+      reply_button: ááá¡á£á®á
       unread_button: ááááá¨ááá á áááá áª á¬áá£áááá®ááá
-      wrong_user: áá¥ááá á¨áá®ááááá á áááá áª `%{user}' áááá áá á¨áá¢á§ááááááá á ááááá¡ á¬ááááá®áááª áá¡á£á á, áá  áá áá¡ áááááááááá áá áááá®ááá ááááááá, áá ááá¡ áááá . ááá®ááá, á¨áá®ááááá, á áááá áª á¨áá¡áááááá¡á áááá®ááá ááááá, á ááá á¬áááááá®áá áá¡.
-    reply: 
-      wrong_user: áá¥ááá á¨áá®ááááá á áááá áª `%{user}' áááá áá ááá¡á£á®á áá¥ááá áááá®áááá áá  ááááááááá áá áááá®ááá ááááááá. ááá®ááá, á¨áá®ááááá, á áááá áª á¨áá¡áááááá¡á áááá®ááááá¡ ááááááááááá áááá®ááá ááááá, á ááá áá®áááá ááá¡á£á®á.
-    sent_message_summary: 
-      delete_button: á¬áá¨áá
-  notifier: 
-    diary_comment_notification: 
-      hi: ááááá á¯ááá %{to_user},
-      subject: "[OpenStreetMap]-áá¡ áááá®ááá áááááá %{user} áá¥áááá¡ áá¦áá£á á¨á ááá¢ááá áááááá¢áá á"
-    email_confirm: 
-      subject: "[OpenStreetMap] áááááá¡á¢á£á áá áá¥áááá áá.á¤áá¡á¢áá¡ ááá¡áááá áá"
-    email_confirm_html: 
-      greeting: ááááá á¯ááá,
-    email_confirm_plain: 
-      greeting: ááááá á¯ááá,
-    friend_notification: 
-      subject: "[OpenStreetMap]-áá¡ áááá®ááá áááááá %{user} ááááááá¢áá áááááá ááá¨á"
-    gpx_notification: 
-      greeting: ááááá á¯ááá,
-    lost_password_html: 
-      greeting: ááááá á¯ááá,
-    lost_password_plain: 
-      greeting: ááááá á¯ááá,
-    message_notification: 
-      hi: ááááá á¯ááá %{to_user},
-    signup_confirm: 
-      subject: "[OpenStreetMap] áááááá¡á¢á£á áá áá.á¤áá¡á¢áá¡ ááá¡áááá áá"
-    signup_confirm_html: 
-      greeting: ááááá á¯ááá!
-      more_videos: áá¥ áá áá¡ %{more_videos_link}.
-      more_videos_here: ááá¢á ááááá áá¥
-    signup_confirm_plain: 
-      greeting: ááááá á¯ááá!
-  oauth: 
-    oauthorize: 
-      allow_write_api: á á£ááá¡ á¨ááªááá.
-  oauth_clients: 
-    edit: 
-      submit: á áááá¥á¢áá ááá
-    form: 
-      allow_write_api: á á£ááá¡ á áááá¥á¢áá ááá.
-      name: á¡áá®ááá
-      required: á¡áááááááá£ááá
-    index: 
-      revoke: ááááááááá!
-    new: 
-      submit: á áááá¡á¢á ááªáá
-    show: 
-      allow_write_api: á á£ááá¡ á¨ááªááá.
-      confirm: ááá á¬áá£áááá£áá á®áá á?
-      edit: ááá¢áááááá¡ á áááá¥á¢áá ááá
-  redaction: 
-    edit: 
-      description: áá¦á¬áá á
-    show: 
-      description: "áá¦á¬áá á:"
-      user: "á¨ááá¥ááááá:"
-  site: 
-    edit: 
-      user_page_link: áááá®ááá ááááá¡ áááá áá
-    index: 
-      license: 
-        license_name: Creative Commons Attribution-Share Alike 2.0
-        project_name: áá ááá¥á¢á OpenStreetMap
+      to: ááá¡
+      wrong_user: áá¥ááá á¨áá®ááááá á áááá áª `%{user}' áááá áá á¨áá¢á§ááááááá á ááááá¡ á¬ááááá®áááª
+        áá¡á£á á, áá  áá áá¡ áááááááááá áá áááá®ááá ááááááá, áá ááá¡ áááá . ááá®ááá, á¨áá®ááááá,
+        á áááá áª á¨áá¡áááááá¡á áááá®ááá ááááá, á ááá á¬áááááá®áá áá¡.
+    sent_message_summary:
+      destroy_button: á¬áá¨áá
+    mark:
+      as_read: á¨áá¢á§ááááááá ááááá¨áá£ááá á áááá áª á¬ááááá®á£áá
+      as_unread: á¨áá¢á§ááááááá ááááá¨áá£ááá á áááá áª á¬áá£áááá®ááá
+    destroy:
+      destroyed: á¨áá¢á§ááááááá á¬áá¨ááááá
+  site:
+    copyright:
+      foreign:
+        english_link: áááááá¡á£á á áá ááááááá
+      native:
+        title: áá áááá ááá¡ á¨áá¡áá®áá
+        native_link: á¥áá áá£áá ááá á¡áá
+        mapping_link: ááá á¢ááá áá¤áá áááá¡ ááá¬á§ááá
+      legal_babble:
+        title_html: á¡áááá¢áá á á£á¤áááááá áá áááªááááá
+    index:
       permalink: áá£ááááá ááá£áá
       shortlink: ááááá ááá£áá
-    key: 
-      map_key: ááá ááááá áá¦ááá¨ááááá
-      map_key_tooltip: á á£ááá¡ ááááááá
-      table: 
-        entry: 
-          admin: ááááááá¡á¢á ááªáá£áá á¡ááá¦ááá á
-          apron: 
-            1: á¢áá áááááá
+      createnote: á¨áááá¨áááá¡ ááááá¢ááá
+    edit:
+      user_page_link: áááá®ááá ááááá¡ áááá áá
+    export:
+      title: áá¥á¡ááá á¢á
+      area_to_export: á¢áá áá¢áá áá áá¥á¡ááá á¢áá¡ááááá¡
+      manually_select: á¡á®áá á ááááááá¡ ááááá§áá¤á á®áááá
+      format_to_export: áá¥á¡ááá á¢áá¡ á¤áá ááá¢á
+      osm_xml_data: OpenStreetMap XMLâáá¡ áááááªááááá
+      map_image: á á£ááá¡ á¡á£á ááá (á¡á¢ááááá á¢á£áá á¤áááá¡ á©áááááá)
+      licence: áááªááááá
+      too_large:
+        planet:
+          title: áááááá¢á OSM
+      options: ááá áááá¢á ááá
+      format: á¤áá ááá¢á
+      scale: ááá¡á¨á¢ááá
+      max: ááá¥á¡.
+      image_size: ááááá¡áá®á£ááááá¡ áááá
+      zoom: áááááááá
+      add_marker: á á£áááá ááá¨áá£ááá¡ ááá¡áá
+      latitude: 'áááááá:'
+      longitude: 'áá á«ááá:'
+      output: á¨ááááá
+      export_button: áá¥á¡ááá á¢á
+    sidebar:
+      search_results: á«ááááá¡ á¨ááááááá
+      close: ááá®á£á áá
+    search:
+      search: á«áááá
+      where_am_i: á¡áá ááá  áá?
+      submit_text: Ok
+    key:
+      table:
+        entry:
+          motorway: ááá¢áááááá¡á¢á ááá
+          primary: ááááá¡á¢á ááá£á á á¡ááá ááá¨áá áá¡á áááá¨áááááááá¡ ááá
+          secondary: á¡áá®áááá¬áá¤á áááá¨áááááááá¡ ááá
+          unclassified: áááááááá ááá áááá¨áááááááá¡ ááá
+          track: á¡áá¤ááá¡ ááá
           bridleway: á¡ááªá®áááá¡áá ááá
-          byway: áááááá
-          cable: 
-            - á¡áááááá á ááá
-          cemetery: á¡áá¡áá¤ááá
-          centre: á¡ááá á¢á£áá áªááá¢á á
-          commercial: ááááá áªáá£áá á¢áá áá¢áá áá
           cycleway: ááááá¡áááááá¡ ááá
-          farm: á¤áá áá
           footway: á¡áá¤áá®ááááá ááá
+          rail: á ááááááá
+          subway: ááá¢á á
+          tram:
+            1: á¢á ááááá
+          cable:
+          - á¡áááááá á ááá
+          runway:
+          - ááá áááá á¢áá¡ áá¡áá¤á áá-ááá¡áá¤á ááá áááááá
+          apron:
+            1: á¢áá áááááá
+          admin: ááááááá¡á¢á ááªáá£áá á¡ááá¦ááá á
           forest: á¢á§á
+          wood: á¢á§á
           golf: áááá¤áá¡ ááááááá
-          lake: 
-            - á¢áá
-            - á¬á§ááá¡ááªááá
-          military: á¡ááá®ááá á á¢áá áá¢áá áá
-          motorway: ááá¢áááááá¡á¢á ááá
           park: ááá áá
+          resident: á¡ááªá®ááá ááááá á¢áá áá¢áá áá
+          commercial: ááááá áªáá£áá á¢áá áá¢áá áá
+          lake:
+          - á¢áá
+          - á¬á§ááá¡ááªááá
+          farm: á¤áá áá
+          cemetery: á¡áá¡áá¤ááá
           pitch: á¡ááá á¢á£áá ááááááá
-          primary: ááááá¡á¢á ááá£á á á¡ááá ááá¨áá áá¡á áááá¨áááááááá¡ ááá
-          rail: á ááááááá
+          centre: á¡ááá á¢á£áá áªááá¢á á
           reserve: áááá á«ááá
-          resident: á¡ááªá®ááá ááááá á¢áá áá¢áá áá
-          runway: 
-            - ááá áááá á¢áá¡ áá¡áá¤á áá-ááá¡áá¤á ááá áááááá
-          school: 
-            - á¡áááá
-            - á£ááááá á¡áá¢áá¢á
-          secondary: á¡áá®áááá¬áá¤á áááá¨áááááááá¡ ááá
+          military: á¡ááá®ááá á á¢áá áá¢áá áá
+          school:
+          - á¡áááá
+          - á£ááááá á¡áá¢áá¢á
           station: á áááááááá¡ á¡áááá£á á
-          subway: ááá¢á á
-          summit: 
-            - áá¬ááá áááá
-            - áááá
-          tourist: á¦áá á¡á¨áá¡áááá¨ááááá
-          track: á¡áá¤ááá¡ ááá
-          tram: 
-            1: á¢á ááááá
-          unclassified: áááááááá ááá áááá¨áááááááá¡ ááá
-          unsurfaced: á§áááá á ááá
-          wood: á¢á§á
-    markdown_help: 
-      alt: ááá¢áá ááá¢áá£áá á¢áá¥á¡á¢á
+          summit:
+          - áá¬ááá áááá
+          - áááá
+    richtext_area:
+      edit: á áááá¥á¢áá ááá
+      preview: á¬áááá¡á¬áá á ááááá®áááá
+    markdown_help:
       first: ááá áááá ááááááá¢á
-      image: á¡á£á ááá
-      link: ááá£áá
       second: áááá á ááááááá¢á
+      link: ááá£áá
       text: á¢áá¥á¡á¢á
+      image: á¡á£á ááá
+      alt: ááá¢áá ááá¢áá£áá á¢áá¥á¡á¢á
       url: URL
-    search: 
-      search: á«áááá
-      search_help: "áááááááááá: 'áá®ááá¢á', 'á á£á¡ááááááá¡ áááááá á, áááááá¡á', 'ááá áá¡ á°áá¡ááá¢ááá', áá 'ááááááá¡ áªáá®á' <a href='http://wiki.openstreetmap.org/wiki/Search'>ááá¢á áááááááá...</a>"
-      submit_text: Ok
-      where_am_i: á¡áá ááá  áá?
-    sidebar: 
-      close: ááá®á£á áá
-      search_results: á«ááááá¡ á¨ááááááá
-  time: 
-    formats: 
-      friendly: "%á %á %á¬ at %á¡:%á¬"
-  trace: 
-    edit: 
-      description: "áá¦á¬áá á:"
+  traces:
+    new:
+      description: 'áá¦á¬áá á:'
+      tags_help: áá«áááá¡ á¨ááááá
+      visibility: 'á®áááááááá:'
+      visibility_help: áá¡ á áá¡ ááá¨áááá¡?
+      upload_button: áá¢ááá ááá
+      help: ááá®ááá ááá
+    edit:
+      filename: 'á¤ááááá¡ á¡áá®ááá:'
       download: áááááá¬áá á
-      edit: á áááá¥á¢áá ááá
-      filename: "á¤ááááá¡ á¡áá®ááá:"
+      uploaded_at: 'áá¢ááá áá£ááá:'
+      points: 'á¬áá á¢ááá:'
+      start_coord: 'á¡áá¬á§áá¡á áááá ááááá¢á:'
       map: á á£áá
-      owner: "áá¤áááááá:"
-      points: "á¬áá á¢ááá:"
-      save_button: áªáááááááááá¡ á¨áááá®áá
-      start_coord: "á¡áá¬á§áá¡á áááá ááááá¢á:"
+      edit: á áááá¥á¢áá ááá
+      owner: 'áá¤áááááá:'
+      description: 'áá¦á¬áá á:'
       tags_help: áá«áááá¡ á¨ááááá
-      uploaded_at: "áá¢ááá áá£ááá:"
-      visibility: "á®áááááááá:"
+      save_button: áªáááááááááá¡ á¨áááá®áá
+      visibility: 'á®áááááááá:'
       visibility_help: áá¡ á áá¡ ááá¨áááá¡?
-    trace: 
-      ago: "%{time_in_words_ago} á¬áá"
-      by: "ááá¢áá á:"
-      count_points: "%{count} á¬áá á¢ááá"
+    show:
+      pending: áááá£á¨ááááá
+      filename: 'á¤ááááá¡ á¡áá®ááá:'
+      download: áááááá¬áá á
+      uploaded: 'áá¢ááá áá£ááá:'
+      points: 'á¬áá á¢ááá:'
+      start_coordinates: 'á¡áá¬á§áá¡á áááá ááááá¢á:'
+      map: á á£áá
+      edit: á áááá¥á¢áá ááá
+      owner: 'áá¤áááááá:'
+      description: 'áá¦á¬áá á:'
+      none: áá á
+      visibility: 'á®áááááááá:'
+    trace_paging_nav:
+      showing_page: áááá áá %{page}
+    trace:
+      pending: áááá£á¨ááááá
+      count_points: '%{count} á¬áá á¢ááá'
+      ago: '%{time_in_words_ago} á¬áá'
+      more: ááá¢á
+      view_map: á á£ááá¡ ááá®áá
       edit: á áááá¥á¢áá ááá
       edit_map: á á£ááá¡ á áááá¥á¢áá ááá
+      public: á¡áá¯áá á
       identifiable: ááááá¢áá¤ááªáá ááááá
-      map: á á£áá
-      more: ááá¢á
-      pending: áááá£á¨ááááá
       private: ááá ááá
-      public: á¡áá¯áá á
       trackable: áááá¢á áááá ááááá
-      view_map: á á£ááá¡ ááá®áá
-    trace_form: 
-      description: "áá¦á¬áá á:"
-      help: ááá®ááá ááá
-      tags_help: áá«áááá¡ á¨ááááá
-      upload_button: áá¢ááá ááá
-      visibility: "á®áááááááá:"
-      visibility_help: áá¡ á áá¡ ááá¨áááá¡?
-    trace_paging_nav: 
-      showing_page: ááá©ááááááá áááá áá %{page}
-    view: 
-      description: "áá¦á¬áá á:"
-      download: áááááá¬áá á
-      edit: á áááá¥á¢áá ááá
-      filename: "á¤ááááá¡ á¡áá®ááá:"
+      by: 'ááá¢áá á:'
       map: á á£áá
-      none: áá á
-      owner: "áá¤áááááá:"
-      pending: áááá£á¨ááááá
-      points: "á¬áá á¢ááá:"
-      start_coordinates: "á¡áá¬á§áá¡á áááá ááááá¢á:"
-      uploaded: "áá¢ááá áá£ááá:"
-      visibility: "á®áááááááá:"
-  user: 
-    account: 
-      contributor terms: 
-        link text: á á áá áá¡ áá¡?
-      current email address: "áá-á¤áá¡á¢áá¡ ááááááááááá ááá¡áááá áá:"
-      home location: "á©ááá áááááá¡ááá§áá¤ááá:"
-      image: "á¡á£á ááá:"
-      latitude: "áááááá:"
-      longitude: "áá á«ááá:"
-      my settings: á©ááá ááá áááá¢á ááá
-      new email address: "áá®ááá áá. á¤áá¡á¢áá¡ ááá¡áááá áá:"
-      new image: á¡á£á áááá¡ ááááá¢ááá
-      openid: 
-        link: http://wiki.openstreetmap.org/wiki/KA:OpenID
-        link text: á á áá áá¡ áá¡?
-        openid: "OpenID:"
-      public editing: 
-        disabled link text: á áá¢áá áá  á¨áááá«ááá á áááá¥á¢áá ááá?
-        enabled link text: á á áá áá¡ áá¡?
-      return to profile: áá áá¤ááá¨á áááá á£áááá
-      save changes button: áªáááááááááá¡ á¨áááá®áá
-      title: ááááá áá¨áá¡ á áááá¥á¢áá ááá
-    confirm: 
-      button: ááááá¡á¢á£á ááá
-      heading: áááá®ááá ááááá¡ ááááá áá¨áá¡ ááááá¡á¢á£á ááá
-    confirm_email: 
-      button: ááááá¡á¢á£á ááá
-      heading: áá. á¤áá¡á¢áá¡ ááá¡áááá ááá¡ áªáááááááá¡ ááááá¡á¢á£á ááá
-    confirm_resend: 
-      failure: áááá®ááá ááááá %{name} ááá  áááá«áááá.
-    list: 
-      heading: áááá®ááá áááááá
-      title: áááá®ááá áááááá
-    login: 
-      create account minute: á¨áá¥ááááá ááááá áá¨á. áááá¡ááááá¡ áá®áááá áá áá á¬á£ááá á¡áá­áá á.
-      email or username: "áá. á¤áá¡á¢áá¡ ááá¡áááá áá, áá áááá®ááá ááááá¡ á¡áá®ááá:"
+  oauth:
+    authorize:
+      allow_write_api: á á£ááá¡ á¨ááªááá.
+  oauth_clients:
+    new:
+      submit: á áááá¡á¢á ááªáá
+    edit:
+      submit: á áááá¥á¢áá ááá
+    show:
+      edit: ááá¢áááááá¡ á áááá¥á¢áá ááá
+      confirm: ááá á¬áá£áááá£áá á®áá á?
+      allow_write_api: á á£ááá¡ á¨ááªááá.
+    index:
+      application: áááááááªááá¡ á¡áá®ááá
+      revoke: ááááááááá!
+    form:
+      name: á¡áá®ááá
+      required: á¡áááááááá£ááá
+      allow_write_api: á á£ááá¡ á áááá¥á¢áá ááá.
+  users:
+    login:
+      title: á¨áá¡ááá
       heading: á¨áá¡ááá
-      login_button: á¨áá¡ááá
+      email or username: 'áá. á¤áá¡á¢áá¡ ááá¡áááá áá, áá áááá®ááá ááááá¡ á¡áá®ááá:'
+      password: 'ááá ááá:'
+      openid: '%{logo} OpenID:'
+      remember: 'ááááááá®á¡ááá á:'
       lost password link: ááááááá¬á§ááá ááá ááá?
+      login_button: á¨áá¡ááá
+      register now: ááá áááá¡á¢á áá ááá áá®áááá
       new to osm: áá®ááá á®áá á OpenStreetMap-áá?
+      create account minute: á¨áá¥ááááá ááááá áá¨á. áááá¡ááááá¡ áá®áááá áá áá á¬á£ááá á¡áá­áá á.
       no account: áá  ááá¥áá ááááá áá¨á?
-      openid: "%{logo} OpenID:"
       openid_logo_alt: á¨áá¡ááá OpenID-áá¡ á¡áá¨á£áááááá
-      openid_providers: 
-        aol: 
-          alt: á¨áá¡ááá AOL OpenID-áá¡ á¡áá¨á£áááááá
-          title: á¨áá¡ááá AOL-áá¡ á¡áá¨á£áááááá
-        google: 
-          alt: á¨áá¡ááá Google OpenID-áá¡ á¡áá¨á£áááááá
-          title: á¨áá¡ááá Google-áá¡ á¡áá¨á£áááááá
-        myopenid: 
-          alt: á¨áá¡ááá myOpenID OpenID-áá¡ á¡áá¨á£áááááá
-          title: á¨áá¡ááá myOpenID-áá¡ á¡áá¨á£áááááá
-        openid: 
-          alt: á¨áá¡ááá OpenID URL-áá¡ á¡áá¨á£áááááá
-          title: á¨áá¡ááá OpenID-áá¡ á¡áá¨á£áááááá
-        wordpress: 
-          alt: á¨áá¡ááá Wordpress OpenID-áá¡ á¡áá¨á£áááááá
-          title: á¨áá¡ááá Wordpress-áá¡ á¡áá¨á£áááááá
-        yahoo: 
-          alt: á¨áá¡ááá Yahoo OpenID-áá¡ á¡áá¨á£áááááá
-          title: á¨áá¡ááá Yahoo-á¡ á¡áá¨á£áááááá
-      password: "ááá ááá:"
-      register now: ááá áááá¡á¢á áá ááá áá®áááá
-      remember: "ááááááá®á¡ááá á:"
-      title: á¨áá¡ááá
-    logout: 
+    logout:
+      title: ááá¡ááá
       heading: OpenStreetMap-ááá ááá¡ááá
       logout_button: ááá¡ááá
-      title: ááá¡ááá
-    lost_password: 
-      email address: "áá. á¤áá¡á¢áá¡ ááá¡áááá áá:"
-      heading: ááááááá¬á§ááá ááá ááá?
+    lost_password:
       title: ááá áááá¡ áá¦ááááá
-    new: 
-      confirm email address: "áá. á¤áá¡á¢áá¡ ááá¡áááá ááá¡ ááááá¡á¢á£á ááá:"
-      confirm password: "ááá áááá¡ ááááá¡á¢á£á ááá:"
-      continue: áááá á«ááááá
-      display name: "á¡áá®ááá ááá áááá:"
-      email address: "áá. á¤áá¡á¢áá¡ ááá¡áááá áá:"
-      heading: áááá®ááá ááááá¡ ááááá áá¨áá¡ á¨áá¥ááá
-      openid: "%{logo} OpenID:"
-      password: "ááá ááá:"
-      title: ááááá áá¨áá¡ á¨áá¥ááá
-    no_such_user: 
-      heading: áááá®ááá ááááá %{user} áá  áá á¡ááááá¡
-    popup: 
-      friend: ááááááá á
-      your location: áá¥áááá ááááááááááá áááá
-    reset_password: 
-      confirm password: "ááá áááá¡ ááááá¡á¢á£á ááá:"
+      heading: ááááááá¬á§ááá ááá ááá?
+      email address: 'áá. á¤áá¡á¢áá¡ ááá¡áááá áá:'
+    reset_password:
+      password: 'ááá ááá:'
+      confirm password: 'ááá áááá¡ ááááá¡á¢á£á ááá:'
       flash changed: áá¥áááá ááá ááá á¨áááªáááá.
-      password: "ááá ááá:"
-    suspended: 
-      webmaster: ááá-ááá¡á¢áá á
-    terms: 
-      agree: ááá¦ááá
+    new:
+      title: á áááá¡á¢á ááªáá
+      email address: 'áá. á¤áá¡á¢áá¡ ááá¡áááá áá:'
+      confirm email address: 'áá. á¤áá¡á¢áá¡ ááá¡áááá ááá¡ ááááá¡á¢á£á ááá:'
+      display name: 'á¡áá®ááá ááá áááá:'
+      password: 'ááá ááá:'
+      confirm password: 'ááá áááá¡ ááááá¡á¢á£á ááá:'
+      continue: á áááá¡á¢á ááªáá
+    terms:
       consider_pd_why: á á áá áá¡ áá¡?
       decline: á£áá á§áá¤á
-      legale_names: 
+      legale_select: 'ááá®ááá, ááá á©ááá áá¥áááá á¥ááá§ááá:'
+      legale_names:
         france: á¡áá¤á áááááá
         italy: áá¢áááá
         rest_of_world: ááááá á©ááá áá¡áá¤ááá
-      legale_select: "ááá®ááá, ááá á©ááá áá¥áááá á¥ááá§ááá:"
-    view: 
-      activate_user: áá áááá®ááá ááááá¡ áá¥á¢ááááªáá
-      add as friend: áááááá¢á ááááááá á
-      comments: áááááá¢áá ááá
-      confirm: ááááá¡á¢á£á ááá
-      confirm_user: áá áááá®ááá ááááá¡ ááááá¡á¢á£á ááá
-      create_block: áá áááá®ááá ááááá¡ áááááááá
-      created from: "á¨áá¥áááááá:"
-      ct accepted: ááá¦ááá£ááá %{ago} á¬áá
-      deactivate_user: áá áááá®ááá ááááá¡ áááá¥á¢ááááªáá
-      delete_user: áá áááá®ááá ááááá¡ á¬áá¨áá
-      description: áá¦á¬áá á
-      diary: áá¦áá£á á
-      edits: á áááá¥á¢áá ááááá
-      email address: "áá. á¤áá¡á¢áá¡ ááá¡áááá áá:"
-      hide_user: áá áááá®ááá ááááá¡ ááááááá
-      km away: "%{count}áá áá¥áááááá"
-      latest edit: "áááá á áááá¥á¢áá ááá %{ago}:"
-      m away: "%{count}á áá¥áááááá"
-      my comments: á©ááá áááááá¢áá ááá
+    no_such_user:
+      heading: áááá®ááá ááááá %{user} áá  áá á¡ááááá¡
+    show:
       my diary: á©ááá áá¦áá£á á
-      my edits: á©ááá á áááá¥á¢áá ááááá
-      my settings: á©ááá ááá áááá¢á ááá
       new diary entry: áá¦áá£á á¨á áá®ááá á©áááá¬áá áá¡ áááááááá
-      remove as friend: áááááá áááááá á¬áá¨áá
-      role: 
-        administrator: áá¡ áááá®ááá ááááá ááááááá¡á¢á áá¢áá áá
+      my edits: á©ááá á áááá¥á¢áá ááá
+      my settings: á©ááá ááá áááá¢á ááá
+      my comments: á©ááá áááááá¢áá ááá
       send message: á¨áá¢á§áááááááá¡ áááááááá
+      diary: áá¦áá£á á
+      edits: á áááá¥á¢áá ááááá
+      remove as friend: áááááá áááááá á¬áá¨áá
+      add as friend: áááááá ááá¨á ááááá¢ááá
+      ct accepted: ááá¦ááá£ááá %{ago} á¬áá
+      latest edit: 'áááá á áááá¥á¢áá ááá %{ago}:'
+      email address: 'áá. á¤áá¡á¢áá¡ ááá¡áááá áá:'
+      created from: 'á¨áá¥áááááá:'
+      status: 'á¡á¢áá¢á£á¡á:'
+      spam score: 'á¡ááááá¡ á¨áá¤áá¡ááá:'
+      description: áá¦á¬áá á
+      user location: áááá®ááá ááááá¡ ááááááááááá áááá
       settings_link_text: ááá áááá¢á ááá
-      spam score: "á¡ááááá¡ á¨áá¤áá¡ááá:"
-      status: "á¡á¢áá¢á£á¡á:"
+      km away: '%{count}áá áá¥áááááá'
+      m away: '%{count}á áá¥áááááá'
+      role:
+        administrator: áá¡ áááá®ááá ááááá ááááááá¡á¢á áá¢áá áá
+      comments: áááááá¢áá ááá
+      create_block: áá áááá®ááá ááááá¡ áááááááá
+      activate_user: áá áááá®ááá ááááá¡ áá¥á¢ááááªáá
+      deactivate_user: áá áááá®ááá ááááá¡ áááá¥á¢ááááªáá
+      confirm_user: áá áááá®ááá ááááá¡ ááááá¡á¢á£á ááá
+      hide_user: áá áááá®ááá ááááá¡ ááááááá
       unhide_user: áá áááá®ááá ááááá¡ ááááá©ááá
-      user location: áááá®ááá ááááá¡ ááááááááááá áááá
-      your friends: áá¥áááá áááááá ááá
-  user_block: 
-    blocks_by: 
-      empty: "%{name} á¯áá  áá ááááá á áááááá ááá áá  ááá£ááááááá."
-      heading: "%{name}-áá¡ áááá  áááááááá£áá áááááá áááááá¡ á¡áá"
-      title: "%{name}-áá¡ áááá  áááááááá£áá áááááá ááááá"
-    blocks_on: 
-      empty: "%{name} á¯áá  áá áá¡áá áá¡ áá  á§áá¤ááá ááááááááá."
-      heading: "%{name}-áá¡ áááá  áááááááá£áá áááááá áááááá¡ á¡áá"
-      title: "%{name}-áá¡ áááá  áááááááá£áá áááááá ááááá"
-    edit: 
+      delete_user: áá áááá®ááá ááááá¡ á¬áá¨áá
+      confirm: ááááá¡á¢á£á ááá
+    popup:
+      your location: áá¥áááá ááááááááááá áááá
+      friend: ááááááá á
+    account:
+      title: ááááá áá¨áá¡ á áááá¥á¢áá ááá
+      my settings: á©ááá ááá áááá¢á ááá
+      current email address: 'áá-á¤áá¡á¢áá¡ ááááááááááá ááá¡áááá áá:'
+      new email address: 'áá®ááá áá. á¤áá¡á¢áá¡ ááá¡áááá áá:'
+      openid:
+        link: http://wiki.openstreetmap.org/wiki/KA:OpenID
+        link text: á á áá áá¡ áá¡?
+      public editing:
+        enabled link text: á á áá áá¡ áá¡?
+        disabled link text: á áá¢áá áá  á¨áááá«ááá á áááá¥á¢áá ááá?
+      contributor terms:
+        link text: á á áá áá¡ áá¡?
+      image: 'á¡á£á ááá:'
+      gravatar:
+        link text: áá¡ á á áá áá¡?
+      new image: á¡á£á áááá¡ ááááá¢ááá
+      home location: 'á©ááá áááááá¡ááá§áá¤ááá:'
+      latitude: 'áááááá:'
+      longitude: 'áá á«ááá:'
+      save changes button: áªáááááááááá¡ á¨áááá®áá
+      return to profile: áá áá¤ááá¨á áááá á£áááá
+    confirm:
+      heading: á¨ááááá¬ááá áá¥áááá áá.á¤áá¡á¢á!
+      button: ááááá¡á¢á£á ááá
+    confirm_resend:
+      failure: áááá®ááá ááááá %{name} ááá  áááá«áááá.
+    confirm_email:
+      heading: áá. á¤áá¡á¢áá¡ ááá¡áááá ááá¡ áªáááááááá¡ ááááá¡á¢á£á ááá
+      button: ááááá¡á¢á£á ááá
+    make_friend:
+      heading: ááááááá¢á %{user} áááááá ááá¨á?
+      button: áááááá ááá¨á ááááá¢ááá
+      success: '%{name} áá®áá á£ááá áá¥áááá ááááááá áá!'
+    remove_friend:
+      heading: á¬ááá¨ááá áááááá áááááá %{user}?
+      button: áááááá áááááá á¬áá¨áá
+    index:
+      title: áááá®ááá áááááá
+      heading: áááá®ááá áááááá
+    suspended:
+      webmaster: ááá-ááá¡á¢áá á
+  user_role:
+    grant:
+      confirm: ááááá¡á¢á£á ááá
+    revoke:
+      confirm: ááááá¡á¢á£á ááá
+  user_blocks:
+    new:
+      title: áááá®ááá áááá %{name} áááááá áááá¡ á¨áá¥ááá
+      heading: áááá®ááá áááá %{name} áááááá áááá¡ á¨áá¥ááá
+      submit: áááááá áááá¡ á¨áá¥ááá
       back: á§áááá áááááá áááá¡ á©áááááá
+    edit:
+      title: áááá®ááá áááá %{name} áááááá áááá¡ á áááá¥á¢áá ááá
       heading: áááá®ááá áááá %{name} áááááá áááá¡ á áááá¥á¢áá ááá
-      show: áá áááááá áááá¡ á©áááááá
       submit: áááááá®ááá áááááá ááá
-      title: áááá®ááá áááá %{name} áááááá áááá¡ á áááá¥á¢áá ááá
-    helper: 
-      time_future: ááááá áááá %{time}âá¨á.
-      time_past: ááá¡á á£ááá %{time} á¬áá.
-      until_login: áá¥á¢áá£á áá ááááááá, á¡áááá áááá®ááá ááááá áá  á¨ááá á¡áá¡á¢áááá¨á.
-    index: 
-      heading: áááá®ááá ááááá¡ áááááá áááááá¡ á¡áá
-      title: áááá®ááá ááááá¡ áááááá ááááá
-    new: 
+      show: áá áááááá áááá¡ á©áááááá
       back: á§áááá áááááá áááá¡ á©áááááá
-      heading: áááá®ááá áááá %{name} áááááá áááá¡ á¨áá¥ááá
-      submit: áááááá áááá¡ á¨áá¥ááá
-      title: áááá®ááá áááá %{name} áááááá áááá¡ á¨áá¥ááá
-    partial: 
-      confirm: ááá á¬áá£áááá£áá á®áá á?
-      creator_name: á¨ááá¥ááááá
-      display_name: ááááááááá áááá®ááá ááááá
-      edit: á áááá¥á¢áá ááá
-      not_revoked: (áá  áá áá¡ áááááááááá)
-      reason: ááááááááá¡ áááááá
-      revoke: ááááááááá!
-      revoker_name: ááááááááááá
-      show: á©áááááá
-      status: á¡á¢áá¢á£á¡á
-    period: 
-      one: 1 á¡áááá
-      other: "%{count} á¡áááá"
-    revoke: 
+    update:
+      success: áááááá áááá¡ ááááá®áááá
+    index:
+      title: áááá®ááá ááááá¡ áááááá ááááá
+      heading: áááá®ááá ááááá¡ áááááá áááááá¡ á¡áá
+    revoke:
+      time_future: áá¡ áááááá ááá ááá¡á á£ááá %{time}.
+      past: áá¡ áááááá ááá ááá¡á á£ááá %{time} á¬áá áá ááá¡á ááá£á¥áááá á£ááá á¨áá£á«ááááááá.
       confirm: ááá á¬áá£áááá£áá á®áá á, á áá áá áááááá áááá¡ ááá®á¡áá áá¡á£á á?
+      revoke: ááááááááá!
       flash: áá¡ áááááá ááá áááá®á¡áá.
-      past: áá¡ áááááá ááá ááá¡á á£ááá %{time} á¬áá áá ááá¡á ááá£á¥áááá á£ááá á¨áá£á«ááááááá.
+    period:
+      one: 1 á¡áááá
+      other: '%{count} á¡áááá'
+    helper:
+      time_future: ááááá áááá %{time}âá¨á.
+      until_login: áá¥á¢áá£á áá ááááááá, á¡áááá áááá®ááá ááááá áá  á¨ááá á¡áá¡á¢áááá¨á.
+      time_past: ááá¡á á£ááá %{time} á¬áá.
+    blocks_on:
+      title: '%{name}-áá¡ áááá  áááááááá£áá áááááá ááááá'
+      heading: '%{name}-áá¡ áááá  áááááááá£áá áááááá áááááá¡ á¡áá'
+      empty: '%{name} á¯áá  áá áá¡áá áá¡ áá  á§áá¤ááá ááááááááá.'
+    blocks_by:
+      title: '%{name}-áá¡ áááá  áááááááá£áá áááááá ááááá'
+      heading: '%{name}-áá¡ áááá  áááááááá£áá áááááá áááááá¡ á¡áá'
+      empty: '%{name} á¯áá  áá ááááá á áááááá ááá áá  ááá£ááááááá.'
+    show:
+      title: '%{block_on}, ááááá ááááá: %{block_by}'
+      heading: '%{block_on}, ááááá ááááá: %{block_by}'
+      time_future: ááááá áááá %{time}âá¨á
+      time_past: ááá¡á á£ááá %{time} á¬áá
+      status: á¡á¢áá¢á£á¡á
+      show: á©áááááá
+      edit: á áááá¥á¢áá ááá
       revoke: ááááááááá!
-      time_future: áá¡ áááááá ááá ááá¡á á£ááá %{time}.
-    show: 
-      back: á§áááá áááááá áááá¡ á©áááááá
       confirm: ááá á¬áá£áááá£áá á®áá á?
-      edit: á áááá¥á¢áá ááá
-      heading: "%{block_on}, ááááá ááááá: %{block_by}"
+      reason: 'ááááááááá¡ áááááá:'
+      back: á§áááá áááááá áááá¡ á©áááááá
+      revoker: 'áááááááááááá:'
       needs_view: á¡áááá ááá®áááá áááááá¡ ááá®á¡áá, ááááááá á¡áá­áá áá áááá®ááá ááááá¡ ááá áááá¡á¢á áá ááá
-      reason: "ááááááááá¡ áááááá:"
-      revoke: ááááááááá!
-      revoker: "áááááááááááá:"
+    block:
+      not_revoked: (áá  áá áá¡ áááááááááá)
       show: á©áááááá
+      edit: á áááá¥á¢áá ááá
+      revoke: ááááááááá!
+    blocks:
+      display_name: ááááááááá áááá®ááá ááááá
+      creator_name: á¨ááá¥ááááá
+      reason: ááááááááá¡ áááááá
       status: á¡á¢áá¢á£á¡á
-      time_future: ááááá áááá %{time}âá¨á
-      time_past: ááá¡á á£ááá %{time} á¬áá
-      title: "%{block_on}, ááááá ááááá: %{block_by}"
-    update: 
-      success: áááááá áááá¡ ááááá®áááá
-  user_role: 
-    grant: 
-      confirm: ááááá¡á¢á£á ááá
-    revoke: 
-      confirm: ááááá¡á¢á£á ááá
+      revoker_name: ááááááááááá
+      showing_page: áááá áá %{page}
+      next: á¨áááááá Â»
+      previous: Â« á¬ááá
+  notes:
+    mine:
+      creator: á¨ááá¥ááááá
+      description: áá¦á¬áá á
+      ago_html: '%{when} á¬áá'
+  javascripts:
+    map:
+      base:
+        standard: á¡á¢ááááá á¢á£áá
+        cycle_map: ááááá¡áááááá¡á¢áááá¡ á á£áá
+        transport_map: á¢á ááá¡ááá á¢áá¡ á á£áá
+    site:
+      edit_tooltip: á á£ááá¡ á áááá¥á¢áá ááá
+      edit_disabled_tooltip: á áááá¥á¢áá áááá¡ááááá¡ ááááá ááá á á£ááá¡ ááá¡á¨á¢ááá
+      createnote_tooltip: á á£áááá á¨áááá¨áááá¡ ááááá¢ááá
+    notes:
+      new:
+        add: á¨áááá¨áááá¡ ááááá¢ááá
+      show:
+        hide: ááááááá
+        comment: áááááá¢áá á
+    context:
+      show_address: ááá¡áááá ááá¡ á©áááááá
+  redactions:
+    edit:
+      description: áá¦á¬áá á
+    new:
+      description: áá¦á¬áá á
+    show:
+      description: 'áá¦á¬áá á:'
+      user: 'á¨ááá¥ááááá:'
+      confirm: ááá á¬áá£áááá£áá á®áá á?
+...