X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ca318eeb7d825f0c381cf39c36e39ebadbf51361..7e7ede890e8e948236d3dbc48e24aca00cd01f62:/config/locales/xmf.yml?ds=inline

diff --git a/config/locales/xmf.yml b/config/locales/xmf.yml
index db723ed8c..3c1882f2d 100644
--- a/config/locales/xmf.yml
+++ b/config/locales/xmf.yml
@@ -5,15 +5,18 @@
 # Author: Silovan
 ---
 xmf:
+  html:
+    dir: ltr
   time:
     formats:
       friendly: '%á %á %á¬ at %á¡:%á¬'
+      blog: '%e %B %Y'
   helpers:
     file:
       prompt: á¤ááááá¨ ááá¨áááá á£á
     submit:
       diary_comment:
-        create: á©á£ááá
+        create: áááááá¢áá á
       diary_entry:
         create: áá£áááááááá¤á
         update: áááá®áááá¤á
@@ -24,7 +27,7 @@ xmf:
       client_application:
         create: á áááá¡á¢á ááªáá
         update: áááá®áááá¤á
-      doorkeeper_application:
+      oauth2_application:
         create: á áááá¡á¢á ááªáá
         update: áááá®áááá¤á
       redaction:
@@ -37,10 +40,6 @@ xmf:
         create: áááááá áá¤áá¨ ááá­á§áá¤á
         update: áááááá áá¤áá¨ áááá®áááá¤á
   activerecord:
-    errors:
-      messages:
-        invalid_email_address: áááá áááá¥á¢á ááá£áá á¤áá¡á¢áá¨ áááá¬á£á áá¤á£á¡ áááááááá¡
-        email_address_not_routable: ááá á ááá á¨á á£á¢áá áá¤ááá
     models:
       acl: á®áááá­áá ááá¤áá¨ áááá¢á áááá¨ áá áááá£áá
       changeset: ááá áá¤áá¤áá¨ ááááá¢á
@@ -54,7 +53,6 @@ xmf:
       message: ááááá¤á
       node: á­á£á á­á£áá
       node_tag: á­á£á á­á£ááá¨ á®ááá¢áá
-      notifier: áá·ááá áá®áááááá á
       old_node: á¯ááá¨á á­á£á á­á£áá
       old_node_tag: á­á£á á­á£ááá¨ á¯ááá¨á á®ááá¢áá
       old_relation: á¯ááá¨á á£á áááá áááá
@@ -96,9 +94,10 @@ xmf:
       diary_entry:
         user: ááá®ááá ááá£
         title: 'áááá:'
+        body: á¢áá¥á¡á¢á
         latitude: áááááá
         longitude: áá á«ááá
-        language: áááá
+        language_code: áááá
       doorkeeper/application:
         name: á¯áá®á
         redirect_uri: URIs ááááá¬á£á áá¤á
@@ -134,7 +133,6 @@ xmf:
         auth_provider: áááááá¢áá¤ááááªááá¨ áá ááááááá á
         auth_uid: áááááá¢áá¤ááááªááá¨ UID
         email: áá. á¤áá¡á¢á
-        email_confirmation: áá-á¤áá¡á¢áá¨ ááááá¡á£á áá¤á
         new_email: áá®ááá áá-á¤áá¡á¢áá¨ áááá¬á£á áá¤á£
         active: áá¥á¢áá£á á
         display_name: á¯áá®á ááá ááá¡
@@ -203,10 +201,8 @@ xmf:
   auth:
     providers:
       none: ááá ááá á
-      openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: ááááááááá
   api:
@@ -230,15 +226,48 @@ xmf:
       entry:
         comment: áááááá¢áá á
         full: ááááá£á¨ááá á¢áá¥á¡á¢á
+  account:
+    deletions:
+      show:
+        title: á©á¥ááá ááááá áá¨áá¨ ááá¡á£á
+        warning: áá£á  áá£á©áá! ááááá áá¨áá¨ ááá¡á£á á¤ááááá£á  áá ááªáá¡áá¡ á á, áááá£á¨ ááá ááááá¤á ááá¨ááááá.
+        delete_account: ááááá áá¨áá¨ ááá¡á£á
+        delete_introduction: 'á¨áááááá·áá áá¥ááá OpenStreetMap ááááá áá¨áá¨ ááá¡á£á áááá ááá©áááá
+          áááá­áá á¥áá áá®ááá, áá£á  áá£á©áá ááá¸áááá¯ ááá¢áááá¤á¡:'
+        delete_profile: áá¥áááá áá áá¤áááá¨ ááá¤áá áááªáá, áá¥áááá áááá¢áá áá, áá­áá á£áá áá á¸á£ááá¨á£á á
+          áááááªááá ááááá¡á£.
+        delete_display_name: áá¥áááá áá«áá áá¤ááá ááá®ááá ááá£á¨ á¯áá®á ááááá¡á£ áá á¨ááááá ááá¥
+          áá·á áá·ááá áááá¤ááá¥ áá¸á£áá¡ á¨á®áá ááááá áá¨áá¤á¡.
+        retain_caveats: 'ááá¨ á£ááá£á¯ááááá, áá¥ááá ááá¨á ááááááá ááá¤áá áááªááá¥ á¨ááááá á¥á·ááá¡á¥áááá¡
+          OpenStreetMap-áá¡, áá¥ááá ááááá áá¨áá¨ ááá¡á£áá¨ á£áá£ááá:'
+        retain_edits: á á£ááá¨ áá£ááá©áááá¤áá¨ ááááá¨á áá¥ááá ááá¨ááá¦áá á áááá¥á¢áá áá¤áá¤á, á¥á á á
+          ááá¯áá£á á áá£áá£á-áá, ááá©á£ááá£áá¤á£.
+        retain_traces: á á£ááá¨ áááá®áá áá á¨áá áá¤á, á¥á á á ááá¯áá£á á áá£áá£á-áá, ááá©á£ááá£áá¤á£.
+        retain_email: áá¥ááá áá-á¤áá¨á¢á ááá©á£ááá£áá¤á£.
+        confirm_delete: ááá¡á£á á áááááá·áááá?
+        cancel: ááá£á¥ááá¤á
+  accounts:
+    edit:
+      title: ááááá áá¨áá¨ á áááá¥á¢áá áá¤á
+      my settings: á©á¥ááá ááá áááá¢á áá¤á
+      current email address: áá-á¤áá¡á¢áá¨ áá¡ááááá áááá¬á£á áá¤á£
+      external auth: áááááá áá£áááá¢áá¤ááááªáá
+      openid:
+        link: http://wiki.openstreetmap.org/wiki/KA:OpenID
+        link text: áá£ á á áááá?
+      public editing:
+        enabled link text: áá£ á á áááá?
+        disabled link text: áá£á¨áá ááá¨áááááá£ á áááá¥á¢áá áá¤á?
+      contributor terms:
+        link text: áá£ á á áááá?
+      save changes button: ááá á£áá¤áá¨ á©á£ááá
+      delete_account: ááááá áá¨áá¨ ááá¡á£á...
+    go_public:
+      find_out_why: á¥áááááá áá£á¨áá
+      find_out_why_url: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+    destroy:
+      success: ááááá áá¨áá¥ ááááá¡á·.
   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: ááááááá
@@ -254,29 +283,6 @@ xmf:
     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_html: á¢á§ááááááá áááááá¢áá áá¤á %{user}-á¨á <abbr title='%{exact_time}'>%{when}
-        ááááá®</abbr>
-      commented_by_html: ááááááá¢áá á %{user}-á¨á <abbr title='%{exact_time}'>%{when}
-        ááááá®</abbr>
-      changesetxml: ááá á£áá¤áá¨ ááááá¢áá¨ XML
-      osmchangexml: osmChange XML
-      feed:
-        title: ááá á£áá¤áá¨ ááááá¢á %{id}
-        title_comment: ááá á£áá¤áá¨ ááááá¢á %{id} - %{comment}
-      join_discussion: áááá¨áá ááá á¡áá¡á¢áááá¨á, ááá¨áá áááá·-áá, á¡á®á£áá£áá¡ á¥áááááááá
-      discussion: á¡á®á£áá£á
-      still_open: ááá á£áá¤áá¨ ááááá¢á ááá á¦ááá á á. á¡á®á£áá£á á®ááááá­áá áááá¤á£ áá¸á, áá£á­á ááá á£áá¤áá¨
-        ááááá¢á áááááá£á.
     node:
       title_html: 'á­á£á á­á£áá: %{name}'
       history_title_html: 'á­á£á á­á£ááá¨ áá¡á¢áá áá: %{name}'
@@ -303,7 +309,6 @@ xmf:
         way: á áá
         relation: á£á áááá áááá
     containing_relation:
-      entry_html: á£á áááá áááá %{relation_name}
       entry_role_html: á£á áááá áááá %{relation_name} (áá£á­áá %{relation_role})
     not_found:
       title: ááááá á·
@@ -347,51 +352,23 @@ xmf:
       wikimedia_commons_link: ááááááá¢á %{page} áááááá¬ááá á£áá¡
       telephone_link: á ááá£á %{phone_number}
       colour_preview: á¤áá á %{colour_value} ááá¬áááááá áá¤á
-    note:
-      title: 'á®ááááá¤á: %{id}'
-      new_note: áá®ááá á®ááááá¤á
-      description: áá­áá á£á
-      open_title: 'á£áá£áá£á¨ááá£ á®ááááá¤á #%{note_name}'
-      closed_title: 'áááá£á¨ááá£áá á®ááááá¤á #%{note_name}'
-      hidden_title: 'á¢á§áááááá¤ááá á®ááááá¤á #%{note_name}'
-      opened_by_html: áááá¥ááááá£ ááá®ááá ááá£á¥ %{user} <abbr title='%{exact_time}'>%{when}
-        ááááá®</abbr>
-      opened_by_anonymous_html: áááá¥ááááá£ ááááááá¥ <abbr title='%{exact_time}'>%{when}
-        ááááá®</abbr>
-      commented_by_html: ááá®ááá ááá£ %{user}-á¨ áááááá¢áá á <abbr title='%{exact_time}'>%{when}
-        ááááá®</abbr>
-      commented_by_anonymous_html: áááááááá¨ áááááá¢áá á <abbr title='%{exact_time}'>%{when}
-        ááááá®</abbr>
-      closed_by_html: áááá£á¨ááá£áá á á ááá®ááá ááá£ %{user}-á¨áá <abbr title='%{exact_time}'>%{when}
-        ááááá®</abbr>
-      closed_by_anonymous_html: áááá£á¨ááá£áá á á ááááááá£á á <abbr title='%{exact_time}'>%{when}
-        ááááá®</abbr>
-      reopened_by_html: ááá®ááá ááá£ %{user}-á¥ áá®ááá¨á áááá¬á§á£ <abbr title='%{exact_time}'>%{when}
-        ááááá®</abbr>
-      reopened_by_anonymous_html: áá®ááá¨á áááá¬á§á£áááá á á ááááááá£á á <abbr title='%{exact_time}'>%{when}
-        ááááá®</abbr>
-      hidden_by_html: ááá¢á§ááááá£ %{user}-á¥ <abbr title='%{exact_time}'>%{when} ááááá®</abbr>
-      report: á¥á·ááááááá¤áá áá ááá¦áááá£áá¨ ááá¨á
     query:
       title: áá£ á á ááá¥?
       introduction: á£áá®áááá¨á ááááá¥á¢áá¤áá¨ áááá ááá á¥ááá£áá­áá áá á á£áá.
       nearby: á£áá®áááá¨á ááááá¥á¢áá¤á
       enclosing: áá ááá
+  changeset_comments:
+    feeds:
+      comment:
+        comment: 'áá®ááá áááááá¢áá á ááá á£áá¤áá¨ ááááá¢á¨á #%{changeset_id} %{author}-á¨á'
+        commented_at_by_html: áááá®ááááá£á á á á %{when} %{user}-áá¨áá
+      show:
+        title_all: OpenStreetMap-á¨ ááá á£áá¤áá¨ ááááá¢áá¨ á¡á®á£áá£á
+        title_particular: 'OpenStreetMap ááá á£áá¤áá¨ ááááá¢áá¨ á¡á®á£áá£á #%{changeset_id}'
   changesets:
-    changeset_paging_nav:
-      showing_page: á®áá¡á·áá %{page}
-      next: ááá¸áááá¯á â
-      previous: â ááááá®áááá
     changeset:
-      anonymous: ááááááá
       no_edits: (á áááá¥á¢áá áá¤á áá á á)
       view_changeset_details: ááá á£áá¤áá¨ ááááá¢áá¨ ááááá¨áááá ááá¤áá áááªááá¨ á«áá áá¤á
-    changesets:
-      id: ID
-      saved_at: áááá£áá á á
-      user: ááá®ááá ááá£
-      comment: áááááá¢áá á
-      area: á¢áá áá¢áá áá
     index:
       title: ááá á£áá¤áá¨ ááááá¢á
       title_user: ááá®ááá ááá£ %{user}-á¨ ááá á£áá¤áá¨ ááááá¢áá¤á
@@ -404,18 +381,46 @@ xmf:
       no_more_area: áá á¢áá áá¢áá ááá¡ ááá á£áá¤áá¨ ááááá¢áá¤á¥ ááááá á£.
       no_more_user: áá ááá®ááá ááá£á¨ ááá á£áá¤áá¨ ááááá¢áá¤á¥ ááááá á£.
       load_more: á£ááá¡áá¨ áá·ááá®áá áá£á
+      feed:
+        title: ááá á£áá¤áá¨ ááááá¢á %{id}
+        title_comment: ááá á£áá¤áá¨ ááááá¢á %{id} - %{comment}
+        created: áááá¥ááááá£
+        closed: ááááá á
+        belongs_to: ááá¢áá á
+    show:
+      title: 'ááá áá¤áá¤áá¨ ááááá¢á: %{id}'
+      created_ago_html: ááá­á§á· %{time_ago}
+      closed_ago_html: ááá­á§á· %{time_ago}
+      discussion: á¡á®á£áá£á
+      join_discussion: áááá¨áá ááá á¡áá¡á¢áááá¨á, ááá¨áá áááá·-áá, á¡á®á£áá£áá¡ á¥áááááááá
+      still_open: ááá á£áá¤áá¨ ááááá¢á ááá á¦ááá á á. á¡á®á£áá£á á®ááááá­áá áááá¤á£ áá¸á, áá£á­á ááá á£áá¤áá¨
+        ááááá¢á áááááá£á.
+      changesetxml: ááá á£áá¤áá¨ ááááá¢áá¨ XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: á­á£á á­á£ááá¤á (%{count})
+      nodes_paginated: á­á£á á­á£ááá¤á (%{x}-%{y} %{count}-á¨á)
+      ways: á¦áááá¤á (%{count})
+      ways_paginated: á¦áááá¤á (%{x}-%{y} %{count}-á¨á)
+      relations: á£á áááá ááááá¤á (%{count})
+      relations_paginated: á£á áááá ááááá¤á (%{x}-%{y} %{count}-á¨á)
     timeout:
       sorry: á¡áááá á¦áá, ááá á£áá¤áá¨ ááááá¢áá¤áá¨ áá áááá£áá, áááá£á áá¥áá áááá®ááá·á, á«áááá áááá
         ááá á¯á ááá ááá¨áá¦áááá á.
-  changeset_comments:
-    comment:
-      comment: 'áá®ááá áááááá¢áá á ááá á£áá¤áá¨ ááááá¢á¨á #%{changeset_id} %{author}-á¨á'
-      commented_at_by_html: áááá®ááááá£á á á á %{when} %{user}-áá¨áá
-    comments:
-      comment: 'áá®ááá áááááá¢áá á ááá á£áá¤áá¨ ááááá¢á¨á #%{changeset_id} %{author}-á¨á'
-    index:
-      title_all: OpenStreetMap-á¨ ááá á£áá¤áá¨ ááááá¢áá¨ á¡á®á£áá£á
-      title_particular: 'OpenStreetMap ááá á£áá¤áá¨ ááááá¢áá¨ á¡á®á£áá£á #%{changeset_id}'
+  dashboards:
+    contact:
+      km away: áá¥ááááá %{count}áá.
+      m away: áá¥ááááá %{count}á.
+    popup:
+      your location: áá¥áááá áá ááá
+      nearby mapper: á£áá®áááá¨á ááá á¢ááá áá¤á
+      friend: ááá¸ááá
+    show:
+      title: á©á¥ááá áááááá
+      edit_your_profile: áá¥áááá áá áá¤áááá¨ á áááá¥á¢áá áá¤á
+      my friends: á©á¥ááá ááá¸ááááá¤á
+      no friends: ááá ááá ááá¸ááá áááááá«ááá·áá.
+      nearby users: á¨á®áá á£áá®áááá¨á ááá®ááá ááá£
   diary_entries:
     new:
       title: áá¦áá á¡ áá®ááá áááááá­áá áá¨ áááááá
@@ -448,9 +453,9 @@ xmf:
       comment_link: ááá áááááá­áá áá¨ áááááá¢áá á
       reply_link: ááá¢áá á¨á ááá­áá áá¨ á¯á¦ááá£á
       comment_count:
-        zero: áá á á áááááá¢áá á
         one: '%{count} áááááá¢áá á'
         other: '%{count} áááááá¢áá á'
+      no_comments: áááááá¢áá áá¤á áá á á
       edit_link: áá áááááá­áá áá¨ á áááá¥á¢áá áá¤á
       hide_link: áá áááááá­áá áá¨ á¢á§áááááá¤á
       unhide_link: áá áááááá­áá áá¨ á«áá áá¤á
@@ -461,8 +466,6 @@ xmf:
       confirm: ááá¦ááá
     location:
       location: áá áááË
-      view: á«áá áá¤á
-      edit: á áááá¥á¢áá áá¤á
     feed:
       user:
         title: OpenStreetMap áá¦áá áá¨ áááááá­áá áá¤á ááá®ááá ááá£á¨á %{user}
@@ -470,19 +473,26 @@ xmf:
         title: OpenStreetMap áá¦áá áá¨ áááááá­áá áá¤á ááá¸áááá¯á ááááá¨á %{language_name}
       all:
         title: OpenStreetMap áá¦áá áá¨ áááááá­áá áá¤á
-    comments:
+  diary_comments:
+    index:
       no_comments: áá¦áá á áááááá¢áá áá¤á áá á á
+    page:
       post: ááá¡á¢á
       when: áá£áááá¡
       comment: áááááá¢áá á
-      newer_comments: á£áá®áááá¨á áááááá¢áá áá¤á
-      older_comments: á¯ááá¨á áááááá¢áá áá¤á
+  errors:
+    contact:
+      contact: áááá¢áá¥á¢á
+    internal_server_error:
+      title: áááááááªááá¨ á©ááááá
+    not_found:
+      title: á¤áááá¥ ááááá á·
   friendships:
     make_friend:
       heading: á¥ááá£á«áááá %{user} ááá¸áááá?
       button: ááá¸áááá ááá«ááá
       success: '%{name} áá¡á á£ááá áá¥áááá ááá¸ááá á á!'
-      already_a_friend: áá¥áá áá %{name} á£ááá ááá¸ááááá¤á ááá áá.
+      already_a_friend: áá¥áá áá %{name} á£ááá ááá¸ááááá¤á á áá.
     remove_friend:
       heading: ááá¨ááááá¡ááá ááá¸ááááá¤á¨á %{user}?
       button: ááá¸ááááá¤á¨á ááá¡á£á
@@ -496,14 +506,14 @@ xmf:
         aeroway:
           aerodrome: ááá ááá ááá
           airstrip: áááá¤á£á á·ááá-ááá¤á£á á·áááá á¡áá áá¢á
-          gate: ááá¨áá£ááá á
+          gate: ááá áááá á¢áá¨ ááá áááááá
           hangar: á¡áá¤áá¨á
           helipad: ááá á¢á¤á£á ááá¯áá¨ ááá®á£áááá
           parking_position: ááá áááááá¨ ááááá
           runway: áááá¤á£á á·ááá-ááá¤á£á á·áááá á¦ááá
           taxilane: á¢áá¥á¡áá¨ á¦ááá
           taxiway: á¢áá¥á¡áá¨ á áá
-          terminal: á¢áá áááááá
+          terminal: ááá áááá á¢áá¨ á¢áá áááááá
           windsock: ááá ááááá«áá áá¤ááá
         amenity:
           arts_centre: á®ááá£áááá¤áá¨ áªááá¢á á
@@ -543,7 +553,7 @@ xmf:
           fast_food: ááá¬áá á á­áááá£
           ferry_terminal: ááááá áá¨ ááá·áááá
           fire_station: ááááá©á®áá á áá·áááá áá
-          fuel: áá­á£áá¨á
+          fuel: áá­á£áá¨áá¨ ááá·áááá
           gambling: áááá á¢á£áá ááá¸áá¤áá¤á
           grave_yard: á¡áá¤á£áá
           hospital: áá¡á¥ááááá
@@ -568,6 +578,7 @@ xmf:
           police: áááááªáá
           post_box: á¡áá¤áá¡á¢á á§á£áá
           post_office: á¤áá¡á¢á
+          prison: áªáá®á
           pub: áááá
           public_bath: áá¯áá ááá ááááá
           public_building: áá¯áá á ááááá·áá
@@ -612,14 +623,22 @@ xmf:
           viaduct: ááááá£áá
           "yes": á®ááá¯á
         building:
+          apartment: áááá
+          apartments: ááááá¤á
+          barn: á¤áá á¦áá
           bungalow: áá£ááááá
+          cabin: á¥áá®á
           chapel: áá®ááááá á
           church: áá®ááááá¨ ááá·áááá
           civic: áááááá¦ááá ááá·áááá
           college: ááááá¯áá¨ ááá·áááá
           commercial: ááááá áªáá£áá ááá·áááá
           construction: ááááááá¤á ááá·áááá
+          detached: ááá®áá ááá·áááá á¸á£áá
           dormitory: áá áááá áá®áá á£á
+          duplex: áá£áááá¥á¡á
+          farm: á¤áá áá
+          farm_auxiliary: áá·ááá®ááá á á¤áá ááá¨ á¸á£áá
           greenhouse: á¡áááá£á á
           hangar: á¡áá¤áá¨á
           hospital: áá¡á¥ááááá
@@ -656,6 +675,7 @@ xmf:
           confectionery: á¡ááááááá¢áá á
           dressmaker: ááá­ááá
           electrician: áááá¥á¢á áááá¡á
+          electronics_repair: áááá¢á áááááá¨ á ááááá¢á
           gardener: ááááá¦á
           glaziery: ááá¡áá áá
           painter: á®ááá¢á£
@@ -697,9 +717,13 @@ xmf:
           rest_area: ááá¡áááá¯áá¤ááá á¢áá áá¢áá áá
           road: á áá
           speed_camera: ááá¬áá áá¨ áááááá¢á áááá¤ááá ááááá á
+          steps: ááá¯ááá¤á
+          stop: á¡á¢áá á¨ááá
           street_lamp: á¨áá¨áá¨ ááá¡áááá
           tertiary: ááá¡á£áá áááá¡áá¨ á áá
           tertiary_link: ááá¡á£áá áááá¡áá¨ á áá
+          track: á¨á£áá
+          traffic_mirror: á¨áá áá¨ á¡áá áá
           unclassified: ááááááá£á á á áá
           "yes": á áá
         historic:
@@ -734,7 +758,6 @@ xmf:
           commercial: ááááá áªáá£áá á¢áá áá¢áá áá
           conservation: áááá¡áá áááªáá
           construction: áááááá¤á
-          farm: á¤áá áá
           farmland: áá áááá£
           forest: á¢á§á
           grass: ááááá á
@@ -784,6 +807,7 @@ xmf:
           communications_tower: ááááá£áááááªáá á§áá á¨á
           cross: á¯ááá á
           lighthouse: áá¡ááááá¤á£
+          pipeline: á¡ááá ááá
           storage_tank: á áááá áá£áá á
           telescope: á¢áááá¡áááá
           tower: á§áá á¨á
@@ -791,8 +815,11 @@ xmf:
           water_tower: á¬á§áá áá¨ á§áá á¨á
           water_well: ááá­á
           windmill: ááá ááá¨ áá¥á£áá
+          works: á¥áá á®ááá
+          "yes": á®ááá£ááá£á á
         military:
           airfield: áá£á áá£áá ááá ááá ááá
+          barracks: ááááá áá
           bunker: áá£áááá á
           checkpoint: á¡ááááá¢á ááá-áá·ááá¢ááááá áá£áá¥á¢á
           "yes": áá£á áá£áá
@@ -833,9 +860,11 @@ xmf:
           stone: á¥á£á
           strait: á¡áá áá¢á
           tree: á¯á
+          tundra: á¢á£ááá á
           valley: áá
           volcano: áá£ááááá
           water: á¬á§áá á
+          wetland: á¡á£á¯ááá á¢áá áá¢áá áá
           wood: á¢á§á
         office:
           accountant: áá£á¦ááá¢áá á
@@ -886,7 +915,9 @@ xmf:
           funicular: á¤á£áááá£áááá á
           monorail: ááááá ááá¡á
           narrow_gauge: ááá¬á ááááááááááá á ááááá¨áá á
+          platform: á ááááá¨áá áá¨ áááá¢á¤áá áá
           preserved: áá¡á¢áá áá£áá á ááááá¨áá á
+          proposed: áááááá áá¤ááá á ááááá¨áá á
           station: á ááááá¨áá áá¨ ááá·áááá
           subway: ááá¢á á
           subway_entrance: ááá¢á áá¨ ááááá£ááá á
@@ -900,11 +931,17 @@ xmf:
           books: á¬ááááá¨ ááá¦áááá
           boutique: áá£á¢ááá
           car: ááá¢áá¡ááááá
+          car_parts: ááá¢áááá ááá¤á
+          car_repair: ááá¢ááá á¡ááá¢áá
           carpet: ááá®áá¤áá¨ ááá¦áááá
+          charity: ááááá á£áá áá£ááá¥á£áááá
+          cheese: á¸ááááá¨ ááá¦áááá
+          chemist: á¥áááá
           chocolate: á¨ááááááá
           clothes: áá£ááá¥á£ááááá¨ ááá¦áááá
           coffee: á§áááá¨ ááá¦áááá
           computer: áááááá£á¢áá áá¤áá¨ ááá¦áááá
+          confectionery: á¡ááááááá¢á á
           cosmetics: ááá¡ááá¢áááá¨ ááá¦áááá
           dairy: áááá¨ áá ááá£á¥á¢áá¤áá¨ ááá¦áááá
           deli: ááááááá¢áá¡áá¤á
@@ -919,9 +956,12 @@ xmf:
           fashion: áááá£á á áá£ááá¥á£ááááá¨ ááá¦áááá
           florist: ááá£ááá¤áá¨ ááá¦áááá
           food: áá­ááááááá¨ ááá¦áááá
+          furniture: áááá¯á
           garden_centre: ááá¦áá¨ áªááá¢á á
           gift: áá©á£á¥áááááá¤áá¨ ááá¦áááá
           greengrocer: á®áá-áá á¢ááááááá¨ ááá¦áááá
+          lottery: ááá¢áá áá
+          mall: áááá
           massage: ááá¡ááá
           mobile_phone: áááááá£á á á¢áááá¤áááá¤áá¨ ááá¦áááá
           money_lender: áá áááá¢áá á
@@ -974,9 +1014,40 @@ xmf:
           theme_park: ááááá¢á£á á ááá áá
           viewpoint: ááááá¯ááá£
           zoo: áááááá áá
+        tunnel:
+          "yes": áááá ááá
         waterway:
           artificial: á®ááá£ááá£á á á¬á§áá ááááá
           canal: áá á®á
+          river: á¬á§áá áááá£
+          stream: á¡á¥á£á áá
+          wadi: ááá¡á¥áá áá¤ááá ááááááá¢á
+          waterfall: á¬á§áá ááááá¤á£
+      admin_levels:
+        level2: á¥ááááá¨ á®á£á áá
+        level3: á ááááááá¨ á®á£á áá
+        level4: á¨á¢áá¢áá¨ á®á£á áá
+        level5: á ááááááá¨ á®á£á áá
+        level6: ááá¥áá¨ á®á£á áá
+        level7: áá£áááªáááááá¢áá¢áá¨ á®á£á áá
+        level8: ááá¦áá¨ á®á£á áá
+        level9: áá¤á£á¢áá¨ á®á£á áá
+        level11: á¡áááá«áááá¨ á®á£á áá
+    results:
+      no_results: á¨áááááá¥ ááááá á·
+      more_results: á£ááá¡á á¨ááááá
+  layouts:
+    intro_header: ááááá¯áá OpenStreetMap-á¨á!
+    tou: áá·ááá áááá¤áá¨ á¬áá¡áá¤á
+    about: ááá¨á
+  shared:
+    pagination:
+      diary_comments:
+        older: á¯ááá¨á áááááá¢áá áá¤á
+        newer: á£áá®áááá¨á áááááá¢áá áá¤á
+  users:
+    auth_failure:
+      unknown_error: áááááá¢áá¤ááááªááá¥ áááá¨áá áá·
   user_blocks:
     show:
       created: 'ááá­á§á·:'
@@ -985,4 +1056,15 @@ xmf:
   notes:
     index:
       no_notes: áá á á á®ááááá¤áá¤á
+    show:
+      title: 'á®ááááá¤á: %{id}'
+      description: áá­áá á£á
+      open_title: 'á£áá£áá£á¨ááá£ á®ááááá¤á #%{note_name}'
+      closed_title: 'áááá£á¨ááá£áá á®ááááá¤á #%{note_name}'
+      hidden_title: 'á¢á§áááááá¤ááá á®ááááá¤á #%{note_name}'
+      report: á¥á·ááááááá¤áá áá ááá¦áááá£áá¨ ááá¨á
+    new:
+      title: áá®ááá á®ááááá¤á
+    notes_paging_nav:
+      showing_page: á®áá¡á·áá %{page}
 ...