X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c5d77dea0a0424098038f44163a1d241b22d0b70..0fa09de8f82bdd77410e3330079c13bf6a3c6517:/config/locales/he.yml

diff --git a/config/locales/he.yml b/config/locales/he.yml
index fd1968b20..9c96905f0 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -25,7 +25,9 @@
 # Author: YaronSh
 # Author: Yona b
 # Author: Ypnypn
+# Author: Zstadler
 # Author: ××××¨ ××
+# Author: ××©×¨×× ×§××¨
 # Author: × ×× ×¡
 # Author: ×ª×××¨ ×
 ---
@@ -35,7 +37,10 @@ he:
   time:
     formats:
       friendly: '%e ×%B %Y ××©×¢× %H:%M'
+      blog: '%e ×%B %Y'
   helpers:
+    file:
+      prompt: ××××¨×ª ×§×××¥
     submit:
       diary_comment:
         create: ×©×××¨×
@@ -48,10 +53,10 @@ he:
         create: ×©××××
       client_application:
         create: ×¨××©××
-        update: ×¢×¨×××
+        update: ×¢××××
       redaction:
-        create: ××¦××¨×ª ×××ª××
-        update: ×©×××¨×ª ×××ª××
+        create: ××¦××¨×ª ××¡×¨×
+        update: ×©×××¨×ª ××¡×¨×
       trace:
         create: ××¢×××
         update: ×©×××¨×ª ×©×× ××××
@@ -62,7 +67,7 @@ he:
     errors:
       messages:
         invalid_email_address: ×××ª ××× × ××ª×××ª ××××´× ×ª×§× ××ª
-        email_address_not_routable: ××× ××¤×©×¨××ª ×××××ª ××¡×××
+        email_address_not_routable: ×× ××¤×©×¨ ×××¦××¨ × ×ª××
     models:
       acl: ×¨×©×××ª ××§×¨×ª ×××©×
       changeset: ×¢×¨××ª ×©×× ××××
@@ -71,33 +76,47 @@ he:
       diary_comment: ×ª×××× ×××××
       diary_entry: ×¨×©××× ×××××
       friend: ×××¨
+      issue: ×××××
       language: ×©×¤×
       message: ××××¢×
-      node: ×¦×××ª
-      node_tag: ×ª× ×¦×××ª
-      notifier: ×××××¢
-      old_node: ×¦×××ª ××©×
-      old_node_tag: ×ª× ×¦×××ª ××©×
+      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: ×ª× ××¨× ××©× ×
+      old_way: ×§× ××©×
+      old_way_node: × ×§×××ª ×§× ××©× ×
+      old_way_tag: ×ª× ×§× ××©×
       relation: ×××¡
       relation_member: ××××¨ ×××¡
       relation_tag: ×ª× ×××¡
+      report: ×××
       session: ×©××
-      trace: ××¡×××
-      tracepoint: × ×§×××ª ××¡×××
-      tracetag: ×ª× ××¡×××
+      trace: ××§×××
+      tracepoint: × ×§×××ª ××§×××
+      tracetag: ×ª× ××§×××
       user: ××©×ª××©
-      user_preference: ××¢××¤×ª ×××©×ª××©
+      user_preference: ××¢××¤××ª ××©×ª××©
       user_token: ××¡×××× ××©×ª××©
-      way: ××¨×
-      way_node: ×¦×××ª ××¨×
-      way_tag: ×ª× ××¨×
+      way: ×§×
+      way_node: × ×§××× ×©× ×§×
+      way_tag: ×ª× ×§×
     attributes:
+      client_application:
+        name: ×©× (× ××¨×©)
+        url: ××ª×××ª ×××©×× ×¨××©××ª (× ××¨×©)
+        callback_url: ××ª×××ª ×§×¨××× ××××¨×ª (callback)
+        support_url: ××ª×××ª ××ª××××
+        allow_read_prefs: ××§×¨×× ××ª ××¢××¤××ª ×××©×ª××© ×©×××
+        allow_write_prefs: ××©× ××ª ××ª ××¢××¤××ª ×××©×ª××© ×©×××
+        allow_write_diary: ×××¦××¨ ×¨×©××××ª ×××××, ××¢×¨××ª ××××¦××¨ ×××¨××××ª
+        allow_write_api: ××©× ××ª ××ª ×××¤×
+        allow_read_gpx: ××§×¨×× ××ª ××§××××ª ×Ö¾GPS ××¤×¨××××ª ×©×××
+        allow_write_gpx: ×××¢×××ª ××§××××ª GPS
+        allow_write_notes: ××©× ××ª ××¢×¨××ª
       diary_comment:
         body: ×××£
       diary_entry:
@@ -112,17 +131,23 @@ he:
       trace:
         user: ××©×ª××©
         visible: ××××
-        name: ×©×
+        name: ×©× ×§×××¥
         size: ××××
         latitude: ×§× ×¨×××
         longitude: ×§× ×××¨×
         public: ×¦××××¨×
         description: ×ª××××¨
+        gpx_file: ××¢×××ª ×§×××¥ GPX
+        visibility: × Ö´×¨××Ö¼×ª
+        tagstring: ×ª×××
       message:
         sender: ×©×××
         title: × ××©×
         body: ×××£
         recipient: × ××¢×
+      report:
+        category: × × ×××××¨ ××ª ××¡××× ×××××× ×©××
+        details: × × ××¡×¤×§ ×¤×¨××× × ××¡×¤×× ×¢× ×××¢×× (× ××¨×©).
       user:
         email: ××××´×
         active: ×¤×¢××
@@ -130,69 +155,92 @@ he:
         description: ×ª××××¨
         languages: ×©×¤××ª
         pass_crypt: ×¡××¡××
+        pass_crypt_confirmation: ×××××ª ×¡××¡××
+    help:
+      trace:
+        tagstring: ×××¤×¨× ××¤×¡××§××
   datetime:
     distance_in_words_ago:
       about_x_hours:
-        one: ××¤× × ××¢×¨× ×©×¢×
-        two: ××¤× × ××¢×¨× ×©×¢×ª×××
-        other: ××¤× × ××¢×¨× %{count} ×©×¢××ª
+        one: ××¤× × ×©×¢× ××¢×¨×
+        two: ××¤× × ×©×¢×ª××× ××¢×¨×
+        many: ××¤× × %{count} ×©×¢××ª ××¢×¨×
+        other: ××¤× × %{count} ×©×¢××ª ××¢×¨×
       about_x_months:
-        one: ××¤× × ××¢×¨× ××××©
-        two: ××¤× × ××¢×¨× ××××©×××
-        other: ××¤× × ××¢×¨× %{count} ××××©××
+        one: ××¤× × ××××© ××¢×¨×
+        two: ××¤× × ××××©××× ××¢×¨×
+        many: ××¤× × %{count} ××××©×× ××¢×¨×
+        other: ××¤× × %{count} ××××©×× ××¢×¨×
       about_x_years:
-        one: ××¤× × ××¢×¨× ×©× ×
-        two: ××¤× × ××¢×¨× ×©× ×ª×××
-        other: ××¤× × ××¢×¨× %{count} ×©× ××
+        one: ××¤× × ×©× × ××¢×¨×
+        two: ××¤× × ×©× ×ª××× ××¢×¨×
+        many: ××¤× × %{count} ×©× ×× ××¢×¨×
+        other: ××¤× × %{count} ×©× ×× ××¢×¨×
       almost_x_years:
         one: ××¤× × ×××¢× ×©× ×
         two: ××¤× × ×××¢× ×©× ×ª×××
+        many: ××¤× × ×××¢× %{count} ×©× ××
         other: ××¤× × ×××¢× %{count} ×©× ××
       half_a_minute: ××¤× × ××¦× ××§×
       less_than_x_seconds:
         one: ××¤× × ×¤×××ª ××©× ×××
+        two: ××¤× × ×¤×××ª ×Ö¾%{count} ×©× ×××ª
+        many: ××¤× × ×¤×××ª ×Ö¾%{count} ×©× ×××ª
         other: ××¤× × ×¤×××ª ×Ö¾%{count} ×©× ×××ª
       less_than_x_minutes:
         one: ××¤× × ×¤×××ª ×××§×
+        two: ××¤× × ×¤×××ª ×Ö¾%{count} ××§××ª
+        many: ××¤× × ×¤×××ª ×Ö¾%{count} ××§××ª
         other: ××¤× × ×¤×××ª ×Ö¾%{count} ××§××ª
       over_x_years:
         one: ××¤× × ×××¢×× ××©× ×
         two: ××¤× × ×××¢×× ××©× ×ª×××
+        many: ××¤× × ×××¢×× ×Ö¾%{count} ×©× ××
         other: ××¤× × ×××¢×× ×Ö¾%{count} ×©× ××
       x_seconds:
         one: ××¤× × ×©× ×××
+        two: ××¤× × %{count} ×©× ×××ª
+        many: ××¤× × %{count} ×©× ×××ª
         other: ××¤× × %{count} ×©× ×××ª
       x_minutes:
         one: ××¤× × ××§×
+        two: ××¤× × %{count} ××§××ª
+        many: ××¤× × %{count} ××§××ª
         other: ××¤× × %{count} ××§××ª
       x_days:
         one: ××ª×××
         two: ×©××©××
+        many: ××¤× × %{count} ××××
         other: ××¤× × %{count} ××××
       x_months:
         one: ××¤× × ××××©
         two: ××¤× × ××××©×××
+        many: ××¤× × %{count} ××××©××
         other: ××¤× × %{count} ××××©××
       x_years:
         one: ××¤× × ×©× ×
         two: ××¤× × ×©× ×ª×××
-        other: ××¤× × ××¢×¨× %{count} ×©× ××
+        many: ××¤× × %{count} ×©× ××
+        other: ××¤× × %{count} ×©× ××
   printable_name:
     with_name_html: '%{name} (%{id})'
   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)
+  auth:
+    providers:
+      none: ×××
+      openid: OpenID
+      google: ××××
+      facebook: ×¤×××¡×××§
+      windowslive: Windows Live
+      github: ××××××
+      wikipedia: ×××§××¤×××
   api:
     notes:
       comment:
@@ -206,12 +254,12 @@ he:
         reopened_at_by_html: ×××¤×¢×× ××××© %{when} ×¢×Ö¾××× %{user}
       rss:
         title: ××¢×¨××ª ×©× OpenStreetMap
-        description_area: ×¨×©×××ª ××¢×¨××ª ×©×××¡×¤×, ×©××ª×§××× ×¢×××× ××¢×¨××ª ××©× ××××¨× ×××××¨ ×©××
+        description_area: ×¨×©×××ª ××¢×¨××ª ×©×××¡×¤×, ×©××ª×§××× ×¢×××× ××¢×¨××ª ××©× ×¤×ª×¨× ×××××¨ ×©××
           [(%{min_lat}|%{min_lon}) â (%{max_lat}|%{max_lon})]
         description_item: ××× ×ª rss ×¢×××¨ ×××¢×¨× %{id}
         opened: ××¢×¨× ×××©× (××× %{place})
         commented: ×ª×××× ×××©× (××× %{place})
-        closed: ××¢×¨× ×¡×××¨× (××× %{place})
+        closed: ××¢×¨× ×¤×ª××¨× (××× %{place})
         reopened: ××¢×¨× ×©×××¤×¢×× ××××© (××× %{place})
       entry:
         comment: ×ª××××
@@ -230,6 +278,16 @@ he:
     anonymous: ××××× ×
     no_comment: (××× ××¢×¨××ª)
     part_of: ×××§ ××ª××
+    part_of_relations:
+      one: ×××¡ ×××
+      two: ×©× × ×××¡××
+      many: '%{count} ×××¡××'
+      other: '%{count} ×××¡××'
+    part_of_ways:
+      one: ××¨× ×××ª
+      two: ×©×ª× ××¨×××
+      many: '%{count} ××¨×××'
+      other: '%{count} ××¨×××'
     download_xml: ×××¨××ª XML
     view_history: ××¦××ª ××××¡×××¨××
     view_details: ××¦××ª ×¤×¨×××
@@ -237,16 +295,16 @@ he:
     changeset:
       title: '×¢×¨××ª ×©×× ××××: %{id}'
       belongs_to: ×××¦×¨
-      node: ×¦××ª×× (%{count})
-      node_paginated: ×¦××ª×× (%{x}â%{y} ××ª×× %{count})
-      way: ××¨××× (%{count})
-      way_paginated: ××¨××× (%{x}â%{y} ××ª×× %{count})
+      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 ×©× ×¢×¨××ª ×©×× ××××
+      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}
@@ -255,51 +313,64 @@ he:
       discussion: ××××
       still_open: ×¢×¨××ª ××©×× ×××× ×¢×××× ×¤×ª××× â ××××× ×××¤×ª× ×××¨× ×©×¢×¨××ª ××©×× ××× ×ª××¡××¨.
     node:
-      title_html: '×¦×××ª: %{name}'
-      history_title_html: '×××¡×××¨×××ª ××¦×××ª: %{name}'
+      title_html: '× ×§×××: %{name}'
+      history_title_html: '×××¡×××¨×××ª ×× ×§×××: %{name}'
     way:
-      title_html: '××¨×: %{name}'
-      history_title_html: '×××¡×××¨×××ª ×××¨×: %{name}'
-      nodes: ×¦××ª××
+      title_html: '×§×: %{name}'
+      history_title_html: '×××¡×××¨×××ª ××§×: %{name}'
+      nodes: × ×§××××ª
+      nodes_count:
+        one: × ×§××× ×××ª
+        two: ×©×ª× × ×§××××ª
+        many: '%{count} × ×§××××ª'
+        other: '%{count} × ×§××××ª'
       also_part_of_html:
-        one: ×××§ ×××¨× %{related_ways}
+        one: ×××§ ××§×%{related_ways}
+        two: ×××§ ××××¨××× %{related_ways}
+        many: ×××§ ××××¨××× %{related_ways}
         other: ×××§ ××××¨××× %{related_ways}
     relation:
       title_html: '×××¡: %{name}'
       history_title_html: '×××¡×××¨×××ª ××××¡: %{name}'
       members: ×××¨××
+      members_count:
+        one: ×××¨ ×××
+        two: ×©× × ×××¨××
+        many: '%{count} ×××¨××'
+        other: '%{count} ×××¨××'
     relation_member:
       entry_role_html: '%{type} %{name} ××ª××¨ %{role}'
       type:
-        node: ×¦×××ª
-        way: ××¨×
+        node: × ×§×××
+        way: ×§×
         relation: ×××¡
     containing_relation:
       entry_html: ×××¡ %{relation_name}
       entry_role_html: ×××¡ %{relation_name} (××ª××¨ %{relation_role})
     not_found:
-      sorry: ×× × ××ª× ×¦×××, ×× ××¡×× %{type} ××¢× ××××× %{id} ×× × ××¦×.
+      title: ×× × ××¦×
+      sorry: ×× × ××ª× ×¦×××, ×× ×× ××¦×× × %{type} ××¡×¤×¨ %{id}.
       type:
-        node: ×¦×××ª
-        way: ××¨×
+        node: × ×§×××
+        way: ×§×
         relation: ×××¡
         changeset: ×¢×¨××ª ×©×× ××××
         note: ××¢×¨×
     timeout:
-      sorry: ×× × ××ª× ×¦×××, ×× ××¢×× ×ª ××ª××× ×¢×××¨ ×%{type} ×¢× ××××× %{id}, ××¨×× ××× ×¨×
-        ×××.
+      title: ×©××××ª ××× ×××§×¦×
+      sorry: ×× × ××ª× ×¦×××, ×× ××¢×× ×ª ×××××¢ ×¢×××¨ %{type} ××¡×¤×¨ %{id}, ××¨×× ××× ×¨× ×××.
       type:
-        node: ×¦×××ª
-        way: ××¨×
+        node: × ×§×××
+        way: ×§×
         relation: ×§×©×¨
         changeset: ×¢×¨××ª ×©×× ××××
         note: ××¢×¨×
     redacted:
-      redaction: ×××ª×× %{id}
-      message_html: '×× × ××ª× ×××¦×× ××ª ×××¨×¡× %{version} ×©× %{type} ×××××× ×©××× × ××ª××.
+      redaction: ××¡×¨× %{id}
+      message_html: '×× × ××ª× ×××¦×× ××ª ×××¨×¡× %{version} ×©× %{type} ×××××× ×©××× ×××¡×¨×.
         ×××××¢ × ××¡×£: %{redaction_link}.'
       type:
-        node: ×¦×××ª
+        node: × ×§×××
         way: ××¨×
         relation: ×××¡
     start_rjs:
@@ -324,21 +395,21 @@ he:
       open_title: ××¢×¨× ×©×× × ×¤×ª×¨× ××¡×³ %{note_name}
       closed_title: ××¢×¨× ×¤×ª××¨× ××¡×³ %{note_name}
       hidden_title: ××¢×¨× ×××¡×ª×¨×ª ××¡×³ %{note_name}
-      opened_by: × ××¦×¨× ×¢×Ö¾××× %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous: × ××¦×¨× ×¢×Ö¾××× ××××× × <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by: ××¢×¨× ×¢× ××× %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous: ××¢×¨× ×¢× ××× ××××× × <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by: × ×¤×ª×¨ ×¢×Ö¾××× %{user} ×Ö¾<abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous: × ×¤×ª×¨ ×¢×Ö¾××× ××××× × ×Ö¾<abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by: ×××¤×¢× ××××© ×¢×Ö¾××× %{user} ×Ö¾<abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous: ×××¤×¢× ××××© ×¢×Ö¾××× ××××× × ×Ö¾<abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by: ×××¡×ª×¨ ×¢×Ö¾××× %{user} ×Ö¾<abbr title='%{exact_time}'>%{when}</abbr>
+      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: ××©××××ª ×¡×××××ª
+      enclosing: ××©××××ª ××××××ª
   changesets:
     changeset_paging_nav:
       showing_page: ×××£ %{page}
@@ -350,7 +421,7 @@ he:
       view_changeset_details: ××¦××ª ×¤×¨×× ×¢×¨××ª ×©×× ××××
     changesets:
       id: ××××
-      saved_at: × ×©××¨× ×ª××ª
+      saved_at: × ×©××¨× ×
       user: ××©×ª××©
       comment: ××¢×¨×
       area: ×©××
@@ -384,12 +455,7 @@ he:
     new:
       title: ×¨×©×××ª ×××× ×××©×
     form:
-      subject: '× ××©×:'
-      body: '×ª×××:'
-      language: '×©×¤×:'
-      location: '×××§××:'
-      latitude: '×§× ×¨×××:'
-      longitude: '×§× ×××¨×:'
+      location: ×××§××
       use_map_link: ×××©×ª××© ×××¤×
     index:
       title: ×××× ×× ×©× ×××©×ª××©
@@ -399,6 +465,7 @@ he:
       in_language_title: ×¨×©××××ª ×××× ×%{language}
       new: ×¨×©×××ª ×××× ×××©×
       new_title: ××ª×××ª ×¨×©××× ×××©× ××××× ×××©×ª××© ×©××
+      my_diary: ×××× ×©××
       no_entries: ××× ×¨×©××××ª ××××
       recent_entries: ×¨×©××××ª ×××× ×××¨×× ××ª
       older_entries: ×¨×©××××ª ××©× ××ª ×××ª×¨
@@ -418,9 +485,10 @@ he:
       body: ×¢×××× ××× ×¨×©×××ª ×××× ×× ×ª×××× ×¢× ××××× %{id}. ×××× ×××××ª ×× × ××× ×××××
         ×××¦×ª ×¢× ×§××©××¨ ×©×××, ×¢×× ××¡××××.
     diary_entry:
-      posted_by_html: ×¤××¨×¡× ×¢×Ö¾××× %{link_user} ×Ö¾%{created} ×%{language_link}
+      posted_by_html: ×¤××¨×¡× ×¢×Ö¾××× %{link_user} ×Ö¾%{created} ×%{language_link}.
+      updated_at_html: ×¢×××× ××××¨×× × ×Ö¾%{updated}.
       comment_link: ××¢×¨××ª ××¨×©××× ××××ª
-      reply_link: ×ª×××× ××¨×©××× ××××ª
+      reply_link: ×©××××ª ×ª×××× ×××××¨
       comment_count:
         zero: ××× ×ª×××××ª
         one: ×ª×××× ×××ª
@@ -457,6 +525,18 @@ he:
       comment: ××¢×¨×
       newer_comments: ××¢×¨××ª ×××©××ª
       older_comments: ××¢×¨××ª ××©× ××ª
+  friendships:
+    make_friend:
+      heading: ××××¡××£ ××ª %{user} ××ª××¨ ×××¨?
+      button: ××××¡××£ ××××¨
+      success: '%{name} ×××¨ ×©×× ×¢××©××!'
+      failed: ××¦××¢×¨××, ×××¡×¤×ª %{name} ××××¨ × ××©××.
+      already_a_friend: '%{name} ×××¨ ×××¨ ×©××.'
+    remove_friend:
+      heading: ×××¡××¨ ××ª %{user} ××¨×©×××ª ××××¨××?
+      button: ×××¡××¨ ××¨×©×××ª ××××¨××
+      success: '%{name} ×××¡×¨ ××¨×©×××ª ××××¨×× ×©××.'
+      not_a_friend: '%{name} ××× × ××× ×××××¨×× ×©××.'
   geocoder:
     search:
       title:
@@ -474,24 +554,30 @@ he:
           cable_car: ×¨×××
           chair_lift: ××¢×××ª ×¡×§× ×××©×××
           drag_lift: ××¢×××ª ×¡×§× ×××¨××¨×
-          gondola: ×¨××× ××× ××××
-          platter: ××¢×××ª ×¦×××ª
-          pylon: ×¤××××
+          gondola: ×¨×××
+          magic_carpet: ××¡××¢ ×¡×§×
+          platter: ××¢×××ª ×¡×§× ×××¨××¨×ª ×¦×××ª
+          pylon: ×¢××× ×¨×××
           station: ×ª×× ×ª ×¨×××
-          t-bar: ××¢×××ª ××Ö¾××¨
+          t-bar: ××¢×××ª ×¡×§× ××Ö¾××¨
+          "yes": ×¨××× ××××
         aeroway:
-          aerodrome: ×× ××ª
+          aerodrome: ×©×× ×ª×¢××¤×
           airstrip: ×Ö´× ××ª
-          apron: ×¨×××ª ×× ××
+          apron: ×¨×××ª ×× ×××ª ××××¡××
           gate: ×©×¢×¨
           hangar: ×××¡× ××××¡××
           helipad: ×× ××ª ××¡××§××
           holding_position: ×××§×× ××××§×
-          parking_position: ×××§×× ×× ××
+          navigationaid: ×¢××¨ × ×××× ×××××¨×
+          parking_position: ×¢×××ª ×× ××
           runway: ××¡××× ×××¨××
-          taxiway: ××¡××× × ×¡××¢×ª ××××¡
+          taxilane: × ×ª×× ××¡×¢×
+          taxiway: ××¡××× ××¡×¢×
           terminal: ××¡××£
+          windsock: ×©×¨××× ×¨××
         amenity:
+          animal_boarding: ×¤× ×¡××× ×××××ª
           animal_shelter: ×××ª ×××¡× ×××××ª
           arts_centre: ××¨×× ××× ××××ª
           atm: ××¡×¤×××
@@ -501,7 +587,9 @@ he:
           bench: ×¡×¤×¡×
           bicycle_parking: ×× ×××ª ×××¤× ×××
           bicycle_rental: ××©××¨×ª ×××¤× ×××
+          bicycle_repair_station: ×ª×× ×ª ×ª××§×× ×××¤× ×××
           biergarten: ××× ×ª ×××¨×
+          blood_bank: ×× ×§ ××
           boat_rental: ××©××¨×ª ×¡××¨××ª
           brothel: ×××ª ×××©×ª
           bureau_de_change: ×××¤× ××¡×¤××
@@ -518,6 +606,7 @@ he:
           clock: ×©×¢××
           college: ×××××
           community_centre: ××¨×× ×§××××ª×
+          conference_centre: ××¨×× ×× ×¡××
           courthouse: ×××ª ××©×¤×
           crematorium: ××©×¨×¤×
           dentist: ×¨××¤× ×©×× ×××
@@ -525,49 +614,56 @@ he:
           drinking_water: ×× ×©×ª×××
           driving_school: ×××ª ×¡×¤×¨ ×× ××××
           embassy: ×©××¨××¨××ª
+          events_venue: ××ª×× ×××¨××¢××
           fast_food: ×××× ××××¨
           ferry_terminal: ××¡××£ ××¢×××¨×ª
           fire_station: ×ª×× ×ª ××××× ××©
-          food_court: ××××¨ ×××× ××××¨
+          food_court: ××ª×× ×××× ××××¨
           fountain: ×××¨×§×
           fuel: ×××§
           gambling: ×××××¨××
           grave_yard: ×××ª ×§××¨××ª
-          grit_bin: grit bin
+          grit_bin: ××¨×× ××× ×××××©
           hospital: ×××ª ×××××
-          hunting_stand: ×ª×¦×¤××ª ×¦×××××
+          hunting_stand: ×¢×××ª ×¦×××××
           ice_cream: ×××××
+          internet_cafe: ×§×¤× ××× ××¨× ×
           kindergarten: ×× ×××××
+          language_school: ×××ª ×¡×¤×¨ ××©×¤××ª
           library: ×¡×¤×¨×××
+          loading_dock: ×¨×¦××£ ××¢××¡×
+          love_hotel: ×××× ××××
           marketplace: ×©××§
+          mobile_money_agent: ×¡××× ×ª×©××××× ×× ×××
           monastery: ×× ××¨
+          money_transfer: ××¢××¨×ª ××¡×¤××
           motorcycle_parking: ×× ×××ª ×××¤× ××¢××
+          music_school: ×××ª ×¡×¤×¨ ××××××§×
           nightclub: ×××¢××× ××××
           nursing_home: ×××ª ××××ª
-          office: ××©×¨×
           parking: ×× ××
           parking_entrance: ×× ××¡× ××× ××
-          parking_space: ××× ×× ××
+          parking_space: ×¢×××ª ×× ××
+          payment_terminal: ××¡××£ ×ª×©×××
           pharmacy: ×××ª ××¨×§××ª
           place_of_worship: ××§×× ×¤××××
           police: ××©××¨×
           post_box: ×ª×××ª ××××¨
           post_office: ×¡× ××£ ××××¨
-          preschool: ×× ×××××
           prison: ×××
           pub: ×¤××
+          public_bath: ××¨××¥ ×¦××××¨×
+          public_bookcase: ×¡×¤×¨××× ××¢××¨×
           public_building: ××× × ×¦××××¨
+          ranger_station: ×ª×× ×ª ×¤×§×××
           recycling: × ×§×××ª ××××××¨
           restaurant: ××¡×¢××
-          retirement_home: ×××ª ××××ª
-          sauna: ×¡××× ×
+          sanitary_dump_station: ×ª×× ×ª ×¨××§×× ×¤×¡×××ª
           school: ×××ª ×¡×¤×¨
           shelter: ×××¡×
-          shop: ×× ××ª
           shower: ××§×××ª
           social_centre: ××¨×× ×××¨×ª×
-          social_club: ×××¢×××
-          social_facility: ××ª×§× ×××¨×ª×
+          social_facility: ×©××¨××ª×× ×××¨×ª×××
           studio: ×¡×××××
           swimming_pool: ××¨Öµ××ª ×©××××
           taxi: ××× ××ª
@@ -575,78 +671,157 @@ he:
           theatre: ×ª××××¨××
           toilets: ×©××¨××ª××
           townhall: ×¢××¨×××
+          training: ××ª×§× ×××©×¨×
           university: ××× ×××¨×¡×××
+          vehicle_inspection: ××××§×ª ××× ×¨××
           vending_machine: ×××× ×ª ××××¨×
           veterinary: ××¨×¤×× ×××¨×× ×¨××ª
-          village_hall: ×××× ×××¤×¨
+          village_hall: ×××ª ××¢×
           waste_basket: ×¤× ××©×¤×
           waste_disposal: ×××¤×× ××¤×¡×××ª
+          waste_dump_site: ××ª×¨ ×××¡××£ ×¤×¡×××ª
+          watering_place: ×©××§×ª
           water_point: × ×§×××ª ×××
-          youth_centre: ××¨×× × ××¢×¨
+          weighbridge: ×××× × ××©×¨
+          "yes": ×©××¨××ª ××¦××××¨
         boundary:
+          aboriginal_lands: ×××××ª ××××¨×××³×× ×××ª
           administrative: ×××× ×©×× ×©××¤××
           census: ×××× ××¤×§× ××××××¡××
           national_park: ×¤××¨×§ ×××××
+          political: ×××× ××××¨ ××××¨×
           protected_area: ××××¨ ××××
+          "yes": ××××
         bridge:
           aqueduct: ×××ª ×××
-          boardwalk: ×××¨××
+          boardwalk: ×©××× ×¦×£
           suspension: ××©×¨ ×ª×××
           swing: ××©×¨ ×¡×××
-          viaduct: ××××
+          viaduct: ××©×¨ ×¢×××××
           "yes": ××©×¨
         building:
+          apartment: ×××¨×
+          apartments: ×××ª ×××¨××ª
+          barn: ××¡×
+          bungalow: ××× ×××
+          cabin: ××§×ª×
+          chapel: ×§×¤××
+          church: ×× ××× ×× ×¡×××
+          civic: ×× ××× ×¦××××¨×
+          college: ×× ××× ×××××
+          commercial: ×× ××× ××¡××¨×
+          construction: ×× ××× ××× ×××
+          detached: ×××ª ×¤×¨××
+          dormitory: ××¢×× ××ª
+          duplex: ×××ª ×××¤××§×¡
+          farm: ×××ª ××××
+          farm_auxiliary: ×× ××× ×× ××××©× ×××××
+          garage: ×× ××
+          garages: ×× ×××ª
+          greenhouse: ××××
+          hangar: ×× ×××¨
+          hospital: ×××ª ×××××
+          hotel: ×× ××× ××××
+          house: ×××ª
+          houseboat: ×××ª ×¡××¨×
+          hut: ×¦×¨××£
+          industrial: ×× ××× ×ª×¢×©×××ª×
+          kindergarten: ××× × ×× ×××××
+          manufacture: ××× × ×ª×¢×©×××
+          office: ×× ××× ××©×¨×××
+          public: ×× ××× ×¦××××¨×
+          residential: ×× ××× ××××¨××
+          retail: ××× × ××¡××¨×
+          roof: ××
+          ruins: ×××¨××
+          school: ×××ª ×¡×¤×¨
+          semidetached_house: ××Ö¾××©×¤××ª×
+          service: ×× ××× ×©××¨××ª
+          shed: ×¦×¨××£
+          stable: ×××¨×××
+          static_caravan: ×§×¨××××
+          temple: ××§××©
+          terrace: ×× ××× ××××¨×
+          train_station: ×× ××× ×ª×× ×ª ×¨×××ª
+          university: ××× ×××¨×¡×××
+          warehouse: ×××¡×
           "yes": ×× ×××
+        club:
+          scout: ×©×× ×¦××¤××
+          sport: ×××¢××× ×¡×¤××¨×
+          "yes": ×××¢×××
         craft:
+          beekeper: ××××¨×
+          blacksmith: × ×¤×
           brewery: ×××©××ª ×××¨×
           carpenter: × ××¨
+          caterer: ××¡×¢××
+          confectionery: ×××ª×§××
+          dressmaker: ×ª×¤××¨×ª ×©××××ª
           electrician: ××©××××
+          electronics_repair: ×ª××§×× ×××§××¨×× ××§×
           gardener: ×× ×
-          painter: ×¦×××¨
+          glaziery: ×××
+          handicraft: ×××××ª ××
+          hvac: ×ª×× ×× ××××× ×××××¨
+          metal_construction: ××¨×× ×× ×××
+          painter: ×¦Ö·×Ö¸Ö¼×¢
           photographer: ×¦××
           plumber: ×©×¨××¨×
+          roofer: ×××
+          sawmill: × ××¨
           shoemaker: ×¡× ×××¨
+          stonemason: ×¡×ª×ª
           tailor: ××××
+          window_construction: ××¨×××ª ×××× ××ª
+          winery: ××§×
           "yes": ×× ××ª ×××××ªÖ¾××
         emergency:
+          access_point: × ×§×××ª ×××©×
           ambulance_station: ×ª×× ×ª ×××××× ×¡××
           assembly_point: × ×§×××ª ××ª××¡×¤××ª
-          defibrillator: ××¤×¢×
-          landing_site: ××ª×¨ × ×××ª×ª ×××¨××
+          defibrillator: ××¤×¢× (××¤×××¨×××××¨)
+          fire_xtinguisher: ×××¤×
+          fire_water_pond: ××××¨ ××× ×××××× ××©
+          landing_site: ××ª×¨ × ×××ª× ××××¨××
+          life_ring: ×××× ××¦××
           phone: ×××¤×× ×××¨××
+          siren: ×¦××¤×¨ ×××¨××
+          suction_point: × ×§××××ª ×©×××× ××××¨××
           water_tank: ××× ××× ××©×¢×ª ×××¨××
           "yes": ×××¨××
         highway:
           abandoned: ××××© × ×××©
           bridleway: ×©××× ×¢×××¨ ×¡××¡××
-          bus_guideway: × ×ª×× ×ª××××¨× ×¦××××¨××ª ××× ×××ª
+          bus_guideway: × ×ª×× ×ª××××¨× ×¦××××¨××ª ××××¨××ª
           bus_stop: ×ª×× ×ª ×××××××¡
-          construction: ××××© ××××¨ ××× ×××
+          construction: ××¨× ××× ×××
           corridor: ×¤×¨×××××¨
           cycleway: × ×ª×× ×××¤× ×××
           elevator: ××¢×××ª
-          emergency_access_point: × ×§×××ª ×××©× ××©××¨××ª× ×××¨××
-          footway: ×©××× ×××××× ×¨××
-          ford: ××¢××¨× ×× ××
-          give_way: ×ª××¨××¨ ×ª× ××××ª ×§××××
-          living_street: ×¨××× ××××¨××
+          emergency_access_point: × ×§×××ª ×¦××× ××××¨××
+          emergency_bay: ××¤×¨×¥ ××××××ª
+          footway: × ×ª×× ×××××× ×¨××
+          ford: ××©×¨ ×××¨×
+          give_way: ×ª××¨××¨ ××ª× ××××ª ×§××××
+          living_street: ×¨××× ×××× ××
           milestone: ××× ××¨×
-          motorway: ××××©
-          motorway_junction: ×¦×××ª ××××©××
-          motorway_link: ××××© ×××× ×××ª
-          passing_place: ×××§×× ××××£
-          path: × ×ª××
-          pedestrian: ××¨× ×××××× ×¨××
-          platform: ×¤×××¤××¨××
+          motorway: ××××© ××××¨
+          motorway_junction: ×¦×××ª ××¨×××
+          motorway_link: ×××××¨ ×××××© ××××¨
+          passing_place: ××¤×¨×¥ ××¢××¨
+          path: ×©×××
+          pedestrian: ×××¨×××
+          platform: ×¨×¦××£
           primary: ××¨× ×¨××©××ª
-          primary_link: ××¨× ×¨××©××ª
+          primary_link: ×××××¨ ×××¨× ×¨××©××ª
           proposed: ××¨× ×××¦×¢×ª
           raceway: ××¡××× ××¨××¦××
           residential: ××¨× ×××××¨ ××××¨××
           rest_area: ××××¨ ×× ×××
           road: ××¨×
           secondary: ××¨× ××©× ××ª
-          secondary_link: ××¨× ××©× ××ª
+          secondary_link: ×××××¨ ×××¨× ××©× ××ª
           service: ××××© ×©××¨××ª
           services: ×©××¨××ª× ××¨×
           speed_camera: ××¦×××ª ××××¨××ª
@@ -654,58 +829,67 @@ he:
           stop: ×ª××¨××¨ ×¢×¦××¨
           street_lamp: ×¤× ×¡ ×¨×××
           tertiary: ××¨× ×©×××©×× ××ª
-          tertiary_link: ××¨× ×©×××©×× ××ª
-          track: ××¡××× ××¨××¦××
+          tertiary_link: ×××××¨ ×××¨× ×©×××©×× ××ª
+          track: ××¨× ×¢×¤×¨
+          traffic_mirror: ××¨×× ×¤× ××¨×××ª
           traffic_signals: ×¨××××¨
-          trail: ×©×××
-          trunk: ××¨× ×¨××©××ª
-          trunk_link: ××¨× ×¨××©××ª
+          trailhead: ×©×× ×ª××××ª ××¡×××
+          trunk: ××¨× ×¢××§×¨××ª
+          trunk_link: ×××××¨ ×××¨× ×¢××§×¨××ª
           turning_loop: ××¢×× ×ª× ××¢×
           unclassified: ××¨× ×× ××¡××××ª
           "yes": ××¨×
         historic:
+          aircraft: ××× ×××¡ ×××¡×××¨×
           archaeological_site: ××ª×¨ ××¨×××××××
+          bomb_crater: ×××ª×© ××¤×¦×¦× ×××¡×××¨×
           battlefield: ×©×× ×§×¨×
-          boundary_stone: ××× ××××
+          boundary_stone: ××× ×××× ×××¡×××¨××ª
           building: ×× ××× ×××¡×××¨×
-          bunker: ××× ×§×¨
-          castle: ×××¨×
-          church: ×× ×¡×××
-          city_gate: ×©×¢×¨ ××¢××¨
-          citywalls: ×××××ª ××¢××¨
-          fort: ××¢××
+          bunker: ××× ×§×¨ ×××¡×××¨×
+          cannon: ×ª××ª× ×××¡×××¨×
+          castle: ×××¨× ×××¡×××¨××ª
+          charcoal_pile: ×¢×¨×××ª ×¤×× ×××¡×××¨××ª
+          church: ×× ×¡××× ×××¡×××¨××ª
+          city_gate: ×©×¢×¨ ×¢××¨ ×××¡×××¨×
+          citywalls: ×××××ª ×¢××¨ ×××¡×××¨×××ª
+          fort: ××¦××× ×××¡×××¨××ª
           heritage: ××ª×¨ ×××¨×©×ª
-          house: ×××ª
-          icon: ×××§×× ××
-          manor: ×××××
-          memorial: ×× ××¨×× ××××¨××
-          mine: ×××¨×
-          mine_shaft: ×¤××¨ ×××¨×
-          monument: ×× ××¨××
+          hollow_way: ××¨× ×©×©×§×¢×
+          house: ×××ª ×××¡×××¨×
+          manor: ××××× ×××¡×××¨××ª
+          memorial: ×× ××¨××ª ××××¨××
+          milestone: ××× ××¨× ×××¡×××¨××ª
+          mine: ×××¨× ×××¡×××¨×
+          mine_shaft: ×¤××¨ ×××¨× ×××¡×××¨×
+          monument: ××ª×¨ ×× ×¦××
+          railway: ××¡×××ª ×¨×××ª ×××¡×××¨××ª
           roman_road: ××¨× ×¨××××ª
-          ruins: ××¨××¡××ª
-          stone: ×××
+          ruins: ×××¨××
+          stone: ××× ×××¡×××¨××ª
           tomb: ×§××¨
-          tower: ××××
-          wayside_cross: ×¦×× ××¦× ×××¨×
-          wayside_shrine: ××§××© ××¦× ×××¨×
+          tower: ×××× ×××¡×××¨×
+          wayside_chapel: ×§×¤××ª ××¨××× ×××¡×××¨××ª
+          wayside_cross: ×¦×× ×××¡×××¨× ××¦× ×××¨×
+          wayside_shrine: ××§××© ×××¡×××¨× ××¦× ×××¨×
           wreck: ×¡×¤×× × ××¨××¤×
           "yes": ××ª×¨ ×××¡×××¨×
         junction:
           "yes": ×¦×××ª
         landuse:
-          allotments: ××§×¦××ª ×§×¨×§×¢
-          basin: ×××
+          allotments: ×××§×ª ××× ×
+          aquaculture: ××§××××ª ××××ª
+          basin: ××××¨
           brownfield: ××××¨ ×ª×¢×©××× × ×××©
           cemetery: ×××ª ×§××¨××ª
           commercial: ××××¨ ××¡××¨×
-          conservation: ×©×××¨×
+          conservation: ××××¨ ××©××××¨
           construction: ××××¨ ×× ×××
           farm: ××××
           farmland: ×©×× ××§×××
-          farmyard: ××¦×¨ ××××
+          farmyard: ××¦×¨ ××§××××ª
           forest: ××¢×¨
-          garages: ×××¡×××
+          garages: ×××¡× ××
           grass: ××©×
           greenfield: ×©×××× ××¨××§××
           industrial: ××××¨ ×ª×¢×©×××
@@ -713,35 +897,44 @@ he:
           meadow: ×××
           military: ×©×× ×¦×××
           mine: ×××¨×
-          orchard: ×¤×¨××¡
+          orchard: ×××¢
+          plant_nursery: ××©×ª××
           quarry: ×××¦××
           railway: ××¡×××ª ××¨××
-          recreation_ground: ×©××× × ××¤×© ××¤× ××
+          recreation_ground: ×©×× × ××¤×© ××¤× ××
+          religious: ××ª×× ××ª×
           reservoir: ××××¨
-          reservoir_watershed: ×¤×¨×©×ª ××× ×©× ××××¨
+          reservoir_watershed: ××× × ××§×× ×©× ××××¨
           residential: ××××¨ ××××¨××
-          retail: ×§××¢×× ××
-          road: ××××¨ ××¨×
+          retail: ×××××¨ ××¡××¨×
           village_green: ××××¨ ×××¤×¨
           vineyard: ××¨×
           "yes": ×©××××© ××§×¨×§×¢
         leisure:
+          adult_gaming_centre: ××¨×× ×××××¨ ××××××¨××
+          amusement_arcade: ××©××§×××
+          bandstand: ××××ª ×ª××××¨×ª
           beach_resort: ××ª×¨ × ××¤×© ××××£ ××
-          bird_hide: ××¦×¤××¨
+          bird_hide: ××¦×¤× ×¦××¤××¨××
+          bleachers: ××¨×××× ×
+          bowling_alley: ×××××× ×
           common: ×©×× ××©××ª×£
+          dance: ××ª×× ×¨××§××××
           dog_park: ×¤××¨×§ ×××××
-          firepit: ×××¨ ××©
+          firepit: ××§×× ×××¡××¨ ×××××¨×
           fishing: ××××¨ ×××
           fitness_centre: ×××× ×××©×¨
           fitness_station: ×ª×× ×ª ×××©×¨
           garden: ××
           golf_course: ×××¨×© ××××£
-          horse_riding: ×¨××××ª ×¡××¡××
-          ice_rink: ××××©× ×¢× ××§×¨×
+          horse_riding: ×¨×××× ×¢× ×¡××¡××
+          ice_rink: ××××§× ×¢× ××§×¨×
           marina: ××¨×× ×
           miniature_golf: ××× ×Ö¾××××£
           nature_reserve: ×©×××¨×ª ×××¢
+          outdoor_seating: ××©××× ××××¥
           park: ×¤××¨×§
+          picnic_table: ×©×××× ×¤××§× ××§
           pitch: ×××¨×© ×¡×¤××¨×
           playground: ×××¨×© ××©××§××
           recreation_ground: ×©××× × ××¤×© ××¤× ××
@@ -755,35 +948,52 @@ he:
           water_park: ×¤××¨×§ ×××
           "yes": × ××¤×©
         man_made:
-          adit: ×× ××¡× ×××¤×§××ª ×××¢×¨×
+          adit: ×¤×ª× ×××¨×
+          advertising: ×¤×¨×¡××
+          antenna: ×× ×× ×
+          avalanche_protection: ××× × ××¤× × ××¤××××ª
           beacon: ××©×××
+          beam: ×§××¨×
           beehive: ××××¨×ª ××××¨××
           breakwater: ×©×××¨ ××××
           bridge: ××©×¨
           bunker_silo: ××× ×§×¨
+          cairn: ×××¢×
           chimney: ××¨×××
-          crane: ×¢×××¨×
-          dolphin: ×¢××× ×¨×ª××§×
-          dyke: ××¨××
-          embankment: ×¡××××
+          clearcut: ×§×¨××ª ××¢×¨
+          communications_tower: ×××× ×ª×§×©××¨×ª
+          crane: ×× ××£
+          cross: ×¦××
+          dolphin: ×¢××× ×¨×ª××§× ×××× ×©×××
+          dyke: ×¡××××ª ××× × ××¤× × ××¦×¤××ª
+          embankment: ×¡×××× ×××¨× ×× ××¡×××
           flagpole: ×ª××¨×
           gasometer: ××××××¨
-          groyne: ×¨×¦××£
-          kiln: ×¤××¨× ×¡
+          groyne: ×××¡×× ××¢×¦××¨×ª ×¡××£
+          kiln: ×××©×
           lighthouse: ××××××¨
+          manhole: ×××¡× ×××¨ ×ª×ªÖ¾×§×¨×§×¢×
           mast: ×ª××¨×
           mine: ×××¨×
           mineshaft: ×¤××¨ ×××¨×
-          monitoring_station: ×ª×× ×ª ××¢×§×
+          monitoring_station: ×ª×× ×ª × ××××¨
           petroleum_well: ×××¨ × ×¤×
           pier: ×¨×¦××£
           pipeline: ×§× ×¦×× ××¨××ª
+          pumping_station: ×ª×× ×ª ×©××××
+          reservoir_covered: ××××¨ ××× ××××¡×
           silo: ×××××¨×
+          snow_cannon: ×ª××ª× ×©××
+          snow_fence: ×××¨ ×©××
           storage_tank: ××× ×××¡××
+          street_cabinet: ××¨×× ××ª ×¨×××
           surveillance: ××¢×§×
+          telescope: ×××¡×§××¤
           tower: ××××
-          wastewater_plant: ××¤×¢× ×××××¨ ×××
+          utility_pole: ×¢××× ××©×× ×× ×××¤××
+          wastewater_plant: ××¤×¢× ×××¤×× ××©×¤×××
           watermill: ××× ×ª ×××
+          water_tap: ××¨× ×××
           water_tower: ×××× ×××
           water_well: ×××¨
           water_works: ××¤×¢× ×××
@@ -794,38 +1004,42 @@ he:
           airfield: ×× ××ª ×¦×××
           barracks: ××××¨× ××××××
           bunker: ××× ×§×¨
+          checkpoint: ××¢××¨ ××××§×
+          trench: ×©×××
           "yes": ×¦×××
         mountain_pass:
-          "yes": ××¢××¨ ××¨×¨×
+          "yes": ××¢××¨ ××¨××
         natural:
+          bare_rock: ×¡××¢ ××©××£
           bay: ××¤×¨×¥
           beach: ×××£
           cape: ××£
           cave_entrance: ×× ××¡× ×××¢×¨×
           cliff: ××¦××§
           crater: ×××ª×©
-          dune: ×××××ª
-          fell: ×ª×
+          dune: ×××× ×
+          fell: ×¢×¨×× ×××¤×× ××ª
           fjord: ×¤×××¨×
           forest: ××¢×¨
           geyser: ×××××¨
           glacier: ×§×¨×××
-          grassland: ××©×
+          grassland: ×¢×¨××
           heath: ××ª×
           hill: ×××¢×
+          hot_spring: ××¢××× ××
           island: ××
           land: ××××
-          marsh: ×××¦× ×¨××××
-          moor: ××××ª ××××
+          marsh: ×××¦× ×¨×××× (×××××£)
+          moor: ×¢×¨×× ×××××
           mud: ×××¥
           peak: ×¤×¡××
           point: × ×§×××
           reef: ×©×× ××ª
           ridge: ×¨××¡
           rock: ×¡××¢
-          saddle: ××¢××¨ ××× ××¨××
+          saddle: ××××£
           sand: ×××
-          scree: ×¢×¨××ª ×¡××¢××
+          scree: ××¤×××ª ××× ××
           scrub: ×¡××
           spring: ××¢×××
           stone: ×××
@@ -834,41 +1048,53 @@ he:
           valley: ×¢××§
           volcano: ××¨ ××¢×©
           water: ×××
-          wetland: ××××
+          wetland: ×××¦×
           wood: ××¢×¨
+          "yes": ×××× × ×××¢×
         office:
           accountant: ×¨××× ××©×××
-          administrative: ×Ö´× ××
+          administrative: ×Ö´× Ö°×Ö¸×
+          advertising_agency: ×¡××× ××ª ×¤×¨×¡××
           architect: ×××¨×××
           association: ×××××
           company: ×××¨×
-          educational_institution: ×××¡× ××× ××
+          diplomatic: ××©×¨× ×××¤×××××
+          educational_institution: ×××¡× ××× ×××
           employment_agency: ×¡××× ××ª ×ª×¢×¡××§×
+          energy_supplier: ××©×¨× ×¡×¤×§ ×× ×¨×××
           estate_agent: ××ª××× × ×××´×
-          government: ××©×× ×××©××ª××ª
+          financial: ××©×¨× ×¤×× × ×¡×
+          government: ××©×¨× ×××©××ª×
           insurance: ××©×¨× ×××××
-          it: ×××¡× ××× ××
+          it: ××©×¨× ×××©××
           lawyer: ×¢××¨× ×××
-          ngo: ××©×¨× ×××¡× ×× ×××©××ª×
+          logistics: ××©×¨× ×××××¡×××§×
+          newspaper: ××©×¨× ×©× ×¢×ª××
+          ngo: ××¨××× ××× ×××¨×ª ×¨×××
+          notary: × ×××¨×××
+          religion: ××©×¨× ××ª
+          research: ×××× ×××§×¨
+          tax_advisor: ×××¢×¥ ××¡
           telecommunication: ××©×¨× ×ª×§×©××¨×ª ×××§××¨×× ××ª
           travel_agent: ×¡××× ××ª × ×¡××¢××ª
           "yes": ××©×¨×
         place:
-          allotments: ×©×××× ××§×××××
+          allotments: ×××§××ª ××× ××
           city: ×¢××¨
           city_block: ××××§ ××¢××¨
           country: ××¨×¥
           county: ××××
           farm: ××××
-          hamlet: ××¤×¨
+          hamlet: ×××©××
           house: ×××ª
           houses: ××ª××
           island: ××
           islet: ×××Ö¹×
-          isolated_dwelling: ××××¨×× ×××××××
-          locality: ×××©××
-          municipality: ×¢××¨×××
+          isolated_dwelling: ××××ª ××××××
+          locality: ××§×× ×× ××××©×
+          municipality: ×¢××¨ ×× ×¨×©××ª ××§××××ª
           neighbourhood: ×©××× ×
+          plot: ×××¨×©
           postcode: ×××§××
           quarter: ×¨×××¢
           region: ××××¨
@@ -878,142 +1104,177 @@ he:
           subdivision: ××××§×ª ××©× ×
           suburb: ×¤×¨×××¨
           town: ×¢×××¨×
-          unincorporated_area: ×©×× ×××ª× ×××××
           village: ××¤×¨
-          "yes": ××§××
+          "yes": ××§×× ×× ×××××¨
         railway:
           abandoned: ××¡×××ª ××¨×× × ×××©×
           construction: ××¡×××ª ××¨×× ××× ×××
           disused: ××¡×××ª ××¨×× ×©××× × ××©××××©
           funicular: ×¤×× ××§×××¨
-          halt: ×ª×× ×ª ×¨×××ª
+          halt: ×ª×× ×ª ×¢×¦××¨× ××¨×××ª
           junction: ××¤××© ××¡××××ª ××¨××
-          level_crossing: ××¤××© ××¡×××ª ××¨×× ×××××©
+          level_crossing: ××¦×××ª ××¡×××ª ××¨××
           light_rail: ×¨×××ª ×§××
           miniature: ×¨×××ª ××¢××¨×
           monorail: ×¨×××ª ××Ö¾×¤×¡××ª
-          narrow_gauge: ××¡×××ª ×¨×××ª ×¦×¨×
+          narrow_gauge: ××¡×××ª ××¨×× ×¦×¨×
           platform: ×¨×¦××£ ×¨×××ª
-          preserved: ×¨×××ª ××©×××¨×ª
-          proposed: ×¤×¡× ×¨×××ª ×××¦×¢××
+          preserved: ××¡×××ª ××¨×× ××©××××¨
+          proposed: ××¡×××ª ××¨×× ×××¦×¢×ª
           spur: ×©××××ª ××¡×××ª ××¨××
           station: ×ª×× ×ª ×¨×××ª
-          stop: ×ª×× ×ª ×¨×××ª
+          stop: ×ª×× ×ª ×¢×¦××¨× ××¨×××ª
           subway: ×¨×××ª ×ª××ª××ª
-          subway_entrance: ×× ××¡× ××ª×× ×ª ×¨×××ª ×ª××ª××ª
-          switch: × ×§××××ª ××¡×××ª ××¨××
+          subway_entrance: ×× ××¡× ××¨×××ª ×ª××ª××ª
+          switch: ×¤××¦×× ××¡×××ª ××¨××
           tram: ××©××××ª
           tram_stop: ×ª×× ×ª ××©××××ª
+          yard: ×××¡× ×¨××××ª
         shop:
+          agrarian: ×× ××ª ××× ××
           alcohol: ×× ××ª ×××××××
           antiques: ×¢×ª××§××ª
-          art: ×× ××ª ××¤×¦× ××× ××ª
+          appliance: ×××¦×¨× ××©××
+          art: ××¤×¦× ××× ××ª
+          baby_goods: ×××¦×¨× ×ª×× ××§××ª
+          bag: ×ª××§××
           bakery: ×××¤×××
+          bathroom_furnishing: ×¦××× ××××¨× ××§×××ª
           beauty: ×¡××× ×××¤×
+          bed: ×××¨× ×©×× ×
           beverages: ×× ××ª ××©×§×××ª
           bicycle: ×× ××ª ××¤× ×××
-          bookmaker: ×¡××× ×××××¨××
+          bookmaker: ×¡××× ××ª ×××××¨××
           books: ×× ××ª ×¡×¤×¨××
           boutique: ×××××§
           butcher: ×§×¦×
-          car: ×× ××ª ××× ×¨××
-          car_parts: ×××§× ×¨××
+          car: ×¡××× ××ª ××× ×¨××
+          car_parts: ×××§× ×××××£ ××¨××
           car_repair: ×××¡×
           carpet: ×× ××ª ×©×××××
           charity: ×× ××ª ×¦××§×
+          cheese: ×× ××ª ×××× ××ª
           chemist: ×××ª ××¨×§××ª
+          chocolate: ×©××§×××
           clothes: ×× ××ª ×××××
+          coffee: ×× ××ª ×§×¤×
           computer: ×× ××ª ×××©×××
           confectionery: ×§×× ×××××¨××
           convenience: ×××××ª
-          copyshop: ×× ××ª ×¦××××
+          copyshop: ×¦×××× ××¡××××
           cosmetics: ×× ××ª ×§××¡××××§×
+          craft: ×× ××ª ×××××ª ××
+          curtain: ×× ××ª ××××× ××ª
+          dairy: ×× ××ª ×××¦×¨× ×××
           deli: ××¢×× ×××
           department_store: ××××
           discount: ×× ××ª ×××××ª
           doityourself: ×× ××ª ×¢×©×Ö¾×××ªÖ¾××¢×¦××
           dry_cleaning: × ××§×× ×××©
+          e-cigarette: ×× ××ª ××¡×××¨×××ª ×××§××¨×× ×××ª
           electronics: ×× ××ª ×××§××¨×× ××§×
+          erotic: ×× ××ª ×××¨××××ª
           estate_agent: ××ª××× × ×××´×
+          fabric: ×× ××ª ××××
           farm: ×× ××ª ×××¦×¨× ××××
           fashion: ×× ××ª ×××¤× ×
-          fish: ×× ××ª ××××
+          fishing: ×× ××ª ×¦××× ×××
           florist: ×× ××ª ×¤×¨×××
-          food: ×××××ª
+          food: ×× ××ª ××××
+          frame: ×× ××ª ××¡×××¨
           funeral_directors: ×××ª ××××××ª
           furniture: ×¨×××××
-          gallery: ×××¨××
           garden_centre: ××¨×× ××× ××
-          general: ×××××ª
+          gas: ×× ××ª ××
+          general: ××-××
           gift: ×× ××ª ××ª× ××ª
           greengrocer: ××¨×§×
           grocery: ×××××ª
           hairdresser: ××¢×¦× ×©×¢×¨
           hardware: ×× ××ª ××××¨× ×× ×××
+          health_food: ×× ××ª ×××× ××¨××××ª
+          hearing_aids: ×¢××¨× ×©×××¢×
+          herbalist: ×× ××ª ×××¢
           hifi: ×¦××× ×××××§×
           houseware: ×× ××ª ××× ×××ª
+          ice_cream: ×× ××ª ×××××
           interior_decoration: ×¢××¦×× ×¤× ××
           jewelry: ×× ××ª ×ª××©××××
           kiosk: ×§×××¡×§
-          kitchen: ×× ××ª ××× ××××
+          kitchen: ×× ××ª ××××××
           laundry: ××××¡×
-          lottery: ×××¨××
+          locksmith: ×× ×¢×××
+          lottery: ××××¨ ×××¨×××ª
           mall: ××¨×× ×§× ×××ª
-          market: ×©××§
           massage: ×¢××¡××
+          medical_supply: ×× ××ª ×¦××× ×¨×¤×××
           mobile_phone: ×× ××ª ×××¤×× ×× × ×××××
+          money_lender: ××××××ª ××¡×¤××
           motorcycle: ×× ××ª ×××¤× ××¢××
-          music: ×× ××ª ××× × ××× ×
-          newsagent: ×¡××× ××ª ×××©××ª
+          motorcycle_repair: ×××¡× ×××¤× ××¢××
+          music: ×× ××ª ×××××§×
+          musical_instrument: ××× × ××× ×
+          newsagent: ×××× ×¢××ª×× ××
+          nutrition_supplements: ×ª××¡×¤× ×ª××× ×
           optician: ×××¤×××§××
-          organic: ×× ××ª ×××× ×××¨×× ×
-          outdoor: ×× ××ª ×¦××× ××× ×××ª
-          paint: ×× ××ª ×¦××¢
+          organic: ×××× ×××¨×× ×
+          outdoor: ×¦××× ××× ×××ª
+          paint: ×× ××ª ×¦××¢××
+          pastry: ×××ª ×××¤×
           pawnbroker: ×Ö·×©××Ö¼×Ö¹× Ö·××
+          perfumery: ×¤×¨×¤××¨××¨××
           pet: ×× ××ª ××××ª ××××
-          pharmacy: ×××ª ××¨×§××ª
+          pet_grooming: ×××¤×× ×××××ª ××××
           photo: ×× ××ª ×¦××××
           seafood: ××××× ××
           second_hand: ×× ××ª ×× ×©× ×××
+          sewing: ×× ××ª ×ª×¤××¨×
           shoes: ×× ××ª × ×¢××××
           sports: ×× ××ª ×¡×¤××¨×
           stationery: ×× ××ª ××× ××ª×××
+          storage_rental: ××©××¨×ª ×××¡× ××
           supermarket: ×¡××¤×¨××¨×§×
           tailor: ××××
+          tattoo: ×§×¢×§××¢××
+          tea: ×× ××ª ×ª×
           ticket: ×× ××ª ××¨×××¡××
           tobacco: ×× ××ª ×××§
           toys: ×× ××ª ×¦×¢×¦××¢××
           travel_agency: ×¡××× ××ª × ×¡××¢××ª
           tyres: ×× ××ª ×¦×××××
           vacant: ×× ××ª ×¤× ×××
-          variety_store: ××××
+          variety_store: ×× ××ª ××¦××××ª
           video: ×¡×¤×¨×××ª ×××××
+          video_games: ×× ××ª ××©××§× ×××©×
+          wholesale: ×¡×××× ×××ª
           wine: ×× ××ª ×××
-          "yes": ×× ××ª
+          "yes": ×× ××ª ×× ×××××¨×ª
         tourism:
           alpine_hut: ××§×ª× ×××¤×× ××ª
           apartment: ×××¨×ª × ××¤×©
-          artwork: ××¦××¨×ª ××× ××ª
+          artwork: ×××¦× ×××× ××ª×
           attraction: ×××§× ×¢× ×××
           bed_and_breakfast: ××× × ×××¨×××ª ×××§×¨
           cabin: ××§×ª×
-          camp_site: ××ª×¨ ××× ×××ª
-          caravan_site: ××ª×¨ ××§×¨×××× ××
-          chalet: ×××¨×
+          camp_pitch: ×××§× ××§××¤×× ×
+          camp_site: ×× ××× ××××
+          caravan_site: ×× ××× ×§×¨×××× ××
+          chalet: ××§×ª×ª × ××¤×©
           gallery: ×××¨××
           guest_house: ×××ª ×××¨××
           hostel: ×××¡× ××
           hotel: ×××ª ××××
-          information: ××××¢
+          information: ××××¢ ××××××
           motel: ×××× ××¨×××
           museum: ×××××××
-          picnic_site: ××ª×¨ ××¤××§× ××§××
+          picnic_site: ××ª×¨ ××¤××§× ××§××, ×× ××× ×××
           theme_park: ×¤××¨×§ ×©×¢×©××¢××
           viewpoint: × ×§×××ª ×ª×¦×¤××ª
+          wilderness_hut: ××§×ª×ª ×××¢
           zoo: ×× ××××ª
         tunnel:
           building_passage: ××¢××¨ ××× ×× ××× ××
-          culvert: ××××
+          culvert: ××¢××¨ ×××
           "yes": ×× ××¨×
         waterway:
           artificial: × ×ª×× ××× ××××××ª×
@@ -1023,30 +1284,28 @@ he:
           derelict_canal: ×ª×¢×× × ×××©×
           ditch: ×××¤××¨×ª
           dock: ×¨×¦××£
-          drain: ××××
+          drain: ×ª×¢××ª × ××§××
           lock: ×ª× ×©××
           lock_gate: ×©×¢×¨ ××ª× ×©××
-          mooring: ××¢××
+          mooring: ××¦××£ ×¢××× ×
           rapids: ××©×××ª
           river: × ××¨
           stream: ×¤××
           wadi: ××××
           waterfall: ××¤× ×××
           weir: ×¡××¨
-          "yes": ××¢××¨ ××××
+          "yes": × ×ª×× ×©×× ×× ×××××¨
       admin_levels:
-        level2: ×××× ××××× ×
-        level4: ×××× ××××× ×
-        level5: ×××× ×××××¨
-        level6: ×××× ×××××
-        level8: ×××× ××¢××¨
-        level9: ×××× ×××¤×¨
-        level10: ×××× ××¤×¨×××¨
-    description:
-      title:
-        osm_nominatim: ×××§×× ×××ª×¨ <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>
-        geonames: ×××§×× ×××ª×¨ <a href="http://www.geonames.org/">GeoNames</a>
+        level2: ×××× ×××× ×
+        level3: ×××× ××××¨
+        level4: ×××× ××××
+        level5: ×××× × ×¤×
+        level6: ×××× ×××××¨ ×××¢×
+        level7: ×××× ×××¨××¤××××
+        level8: ×××× ×¢××¨, ×××¢×¦× ××§××××ª ×× ×××××¨××ª
+        level9: ×××× ×¨×××¢
+        level10: ×××× ×©××× ×
+        level11: ×××× ×ª×ªÖ¾×©××× ×
       types:
         cities: ×¢×¨××
         towns: ×¢×××¨××ª
@@ -1057,9 +1316,9 @@ he:
   issues:
     index:
       title: ××¢×××ª
-      select_status: ×××××¨ ××¦×
-      select_type: ×××¨ ×¡××
-      select_last_updated_by: ××××¨×ª ××¢×××× ××××¨×× ××¤×
+      select_status: ××××¨×ª ××¦×
+      select_type: ××××¨×ª ×¡××
+      select_last_updated_by: ××××¨×ª ××¢×××× ××××¨××
       reported_user: ××©×ª××© ×××××
       not_updated: ×× ×¢××× ×
       search: ×××¤××©
@@ -1109,9 +1368,10 @@ he:
     reopen:
       reopened: ××¦× ×××¢×××ª ×©×× × ×-'×¤×ª××'
     comments:
+      comment_from_html: ×ª×××× ×××ª %{user_link} ×¢× %{comment_created_at}
       reassign_param: ×××§×¦××ª ××ª ××ª×§×× ××××©
     reports:
-      reported_by_html: ×××× ××ª××¨ %{category} ×¢× ××× %{user}
+      reported_by_html: ×××× ××ª××¨ %{category} ×¢× ××× %{user} ×Ö¾%{updated_at}
     helper:
       reportable_title:
         diary_comment: '%{entry_title}, ×ª×××× ××¡×³ %{comment_id}'
@@ -1123,8 +1383,6 @@ he:
     new:
       title_html: ××××× ×¢× %{link}
       missing_params: ×× × ××ª× ×××¦××¨ ××××× ×××©
-      details: × × ××¡×¤×§ ×¤×¨××× ×¢× ×××¢×× (× ××¨×©).
-      select: '× × ×××××¨ ××ª ×¡×××ª ××××××:'
       disclaimer:
         intro: '×××¨× ×©××××ª ×××××× ×××¤×§×× ×××ª×¨, × × ××××× ××:'
         not_just_mistake: ××××× ××××¢×ª× ×××¢×× ××× ×× ×¡×ª× ××¢××ª
@@ -1204,38 +1462,51 @@ he:
       text: ×ª×¨×××
     learn_more: ××××¢ × ××¡×£
     more: ×¢××
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[×××¤× ×¡××¨×× ×××¤ OpenStreetMap] ×ª×××× ×××ª %{user} × ××¡×¤× ××¨×©×××ª ××××'
       hi: ×©××× %{to_user},
       header: '%{from_user} ×××× ××¨×©×××ª ××××× ×Ö¾OpenStreetMap ×¢× ×× ××©× %{subject}:'
+      header_html: '%{from_user} ×××× ××¨×©×××ª ××××× ×Ö¾OpenStreetMap ×¢× ×× ××©× %{subject}:'
       footer: ××¤×©×¨ ×× ××§×¨×× ××ª ××ª×××× ×××ª×××ª %{readurl} ×××××× ×××ª×××ª %{commenturl}
-        ×× ×××©×× ×××ª×××ª %{replyurl}
+        ×× ××©××× ××××¢× ××××¦×¨ ×××ª×××ª %{replyurl}
+      footer_html: ××¤×©×¨ ×× ××§×¨×× ××ª ××ª×××× ×××ª×××ª %{readurl} ×××××× ×××ª×××ª %{commenturl}
+        ×× ××©××× ××××¢× ×××××¨ ×××ª×××ª %{replyurl}
     message_notification:
+      subject: '[OpenStreetMap] %{message_title}'
       hi: ×©××× %{to_user},
       header: '××ª×××ª× ×Ö¾OpenStreetMap ××××¢× ××××¢× ×××ª %{from_user} ×¢× ×× ××©× %{subject}:'
-      footer_html: × ××ª× ×× ××§×¨×× ××ª ×××××¢× ×××ª×××ª %{readurl} ×××××× ××××¦×¢××ª %{replyurl}
-    friend_notification:
+      header_html: '%{from_user} ×©×× ×× ××××¢× ××¨× OpenStreetMap ×¢× ×× ××©× %{subject}:'
+      footer: × ××ª× ×× ××§×¨×× ××ª ×××××¢× ×××ª×××ª %{readurl} ×××©××× ××××¢× ××©××× ××¨× %{replyurl}
+      footer_html: × ××ª× ×× ××§×¨×× ××ª ×××××¢× ×××ª×××ª %{readurl} ×××©××× ××××¢× ××××¦×¨ ××¨×
+        %{replyurl}
+    friendship_notification:
       hi: ×©××× %{to_user},
       subject: '[×××¤× ×¡××¨×× ×××¤ OpenStreetMap] × ××¡×¤×ª ××¨×©×××ª ××××¨×× ×©× %{user}'
       had_added_you: '%{user} ×××¡××£ ×××ª× ××××¨ ×Ö¾OpenStreetMap.'
       see_their_profile: ×××¤×©×¨××ª× ××¦×¤××ª ××¤×¨××¤×× ×©×× ×××ª×××ª %{userurl}.
+      see_their_profile_html: ×××¤×©×¨××ª× ××¦×¤××ª ××¤×¨××¤×× ×©×× ×××ª×××ª %{userurl}.
       befriend_them: ×××¤×©×¨××ª× ××¡×× × ××××¨ ×××ª×××ª %{befriendurl}.
-    gpx_notification:
-      greeting: ×©×××,
-      your_gpx_file: × ×¨×× ×©×§×××¥ ×Ö¾GPX ×©××
-      with_description: ××¢× ××ª××××¨
-      and_the_tags: ×××ª×××
-      and_no_tags: ×××¡×¨ ××ª×××
-      failure:
-        subject: '[×××¤× ×¡××¨×× ×××¤ OpenStreetMap] ×©×××× ×××××× GPX'
-        failed_to_import: '×× ×××× ××¨×××. ×× × ××©××××:'
-        more_info_1: ××××¢ × ××¡×£ ×¢× ×××©××× ××ª ×××××× GPX ×××× ××××× ×¢
-        more_info_2: '××× ××¤×©×¨ ×××¦×× ×××:'
-      success:
-        subject: '[×××¤× ×¡××¨×× ×××¤ OpenStreetMap] ××××× GPX ××¦×××'
-        loaded_successfully: × ××¢× ××¨××× ×¢× %{trace_points} ××ª×× %{possible_points}
-          × ×§××××ª ××¤×©×¨×××ª.
+      befriend_them_html: ×××¤×©×¨××ª× ××¡×× × ××××¨ ×××ª×××ª %{befriendurl}.
+    gpx_description:
+      description_with_tags_html: '×× × ×¨×× ××× ×§×××¥ ×Ö¾GPX ×©×× %{trace_name} ×¢× ××ª××××¨
+        %{trace_description} ×××ª××××ª ×××××ª: %{tags}'
+      description_with_no_tags_html: ×× × ×¨×× ××× ×§×××¥ ×Ö¾GPX ×©×× %{trace_name} ×¢× ××ª××××¨
+        %{trace_description} ×××× ×ª××××ª
+    gpx_failure:
+      hi: ×©××× %{to_user},
+      failed_to_import: '×× ×××× ××¨×××. ×× × ××©××××:'
+      more_info_html: ××××¢ ×¢× ×ª×§×××ª ×××××× GPX ××××¦× ××××× ×¢ ××× × ××¦× ×ª××ª %{url}.
+      import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures
+      subject: '[×××¤× ×¡××¨×× ×××¤ OpenStreetMap] ×©×××× ×××××× GPX'
+    gpx_success:
+      hi: ×©××× %{to_user},
+      loaded_successfully:
+        one: × ××¢× ××¨××× ×¢× %{trace_points} ××ª×× × ×§××× ×××ª ××¤×©×¨××ª.
+        two: × ××¢× ××¨××× ×¢× %{trace_points} ××ª×× %{possible_points} × ×§××××ª ××¤×©×¨×××ª.
+        many: × ××¢× ××¨××× ×¢× %{trace_points} ××ª×× %{possible_points} × ×§××××ª ××¤×©×¨×××ª.
+        other: × ××¢× ××¨××× ×¢× %{trace_points} ××ª×× %{possible_points} × ×§××××ª ××¤×©×¨×××ª.
+      subject: '[×××¤× ×¡××¨×× ×××¤ OpenStreetMap] ××××× GPX ××¦×××'
     signup_confirm:
       subject: '[×××¤× ×¡××¨×× ×××¤ OpenStreetMap] ××¨×× ×××× ××××¤× ×¡××¨×× ×××¤'
       greeting: ××××!
@@ -1245,28 +1516,16 @@ he:
       welcome: ×××¨× ××××ª ×××©××× ×©××, × ×¡×¤×§ ×× ××××¢ × ××¡×£ ×©××¢×××¨ ×× ×××ª×××.
     email_confirm:
       subject: '[×××¤× ×¡××¨×× ×××¤ OpenStreetMap] × × ××××ª ××ª ××ª×××ª ×××××´× ×©××'
-    email_confirm_plain:
       greeting: ×©×××,
       hopefully_you: ×××©×× (×× ×× × ××§×××× ×©××ª ×× ××ª×) ×××§×© ××©× ××ª ××ª ××ª×××ª ××××"× ××××ª
         ×××ª×¨ %{server_url} ×××ª×××ª %{new_address}
       click_the_link: ×× ××××ª ×¢×©××ª ××ª ××, × × ×××××¥ ×¢× ××§××©××¨ ×××× ××× ×××©×¨ ××ª ××©×× ××.
-    email_confirm_html:
-      greeting: ×©×××,
-      hopefully_you: ×××©×× (××ª×§××× ×××××¨ ××) ×¨××¦× ××©× ××ª ××ª ××ª×××ª ×××××´× ×××©××××ª ×××©×××
-        ××©×¨×ª %{server_url} ×× %{new_address}.
-      click_the_link: ×× ××××ª ×¢×©××ª ××ª ××, × × ×××××¥ ×¢× ××§××©××¨ ×××× ××× ×××©×¨ ××ª ××©×× ××.
     lost_password:
       subject: '[×××¤× ×¡××¨×× ×××¤ OpenStreetMap] ××§×©×ª ×××¤××¡ ×¡××¡××'
-    lost_password_plain:
       greeting: ×©×××,
       hopefully_you: ×××©×× (×××× ××ª ×× ××ª×) ×××§×© ×©××¡××¡×× ×××©××××ª ×××©××× ×××××× ×¢×
         ××ª×××ª ××××"× ××××ª ×××ª×¨ openstreetmap.org.
       click_the_link: ×× ××× ×¢×©××ª ×××ª, ××© ×××××¥ ×¢× ××§××©××¨ ×××× ××× ×××¤×¡ ××ª ××¡××¡××.
-    lost_password_html:
-      greeting: ×©×××,
-      hopefully_you: ×××©×× (××ª×§××× ×©×××××¨ ××) ×××§×© ×× ××¡××¡×× ×××©××× ×××××× ×¢× ××ª×××ª
-        ×××××´× ××××ª ×××ª×¨ openstreetmap.org ×ª×××¤×¡.
-      click_the_link: ×× ××××ª ×××§×©×ª ××ª ××, × × ×××××¥ ×¢× ××§××©××¨ ×××× ××× ×××¤×¡ ××ª ××¡××¡××.
     note_comment_notification:
       anonymous: ××©×ª××© ××××× ×
       greeting: ×©×××,
@@ -1276,38 +1535,56 @@ he:
         subject_other: '[OpenStreetMap] ××ª×§××× ×ª×××× ×××ª %{commenter} ×¢× ××¢×¨× ×©××ª×¢× ××× ×ª
           ××'
         your_note: ××ª×§××× ×ª×××× ×××ª %{commenter} ×¢× ×××ª ×××¢×¨××ª ×××¤× ×©×× ××× %{place}
+        your_note_html: ××ª×§××× ×ª×××× ×××ª %{commenter} ×¢× ×××ª ×××¢×¨××ª ×××¤× ×©×× ××× %{place}
         commented_note: ××ª×§××× ×ª×××× ×××ª %{commenter} ×¢× ××¢×¨× ×¢× ××¤× ×©××××ª ×¢×××. ××¢×¨×
           × ××¦××ª ××× %{place}
+        commented_note_html: '%{commenter} ×××× ×¢× ××¢×¨×ª ××¤× ×©××××ª ×¢××× ×××§×× ×××ª×¨.
+          ××¢×¨× × ××¦××ª ××× %{place}'
       closed:
-        subject_own: '[OpenStreetMap] ×××ª ××××¢×¨××ª ×©×× × ×¤×ª×¨× ×¢×Ö¾××× %{commenter}'
+        subject_own: â«[OpenStreetMap] ×××ª ××××¢×¨××ª ×©×× × ×¤×ª×¨× ×¢×Ö¾××× %{commenter}
         subject_other: '[OpenStreetMap] ××¢×¨× ×©××ª×¢× ××× ×ª ×× × ×¤×ª×¨× ×¢×Ö¾××× %{commenter}'
         your_note: ×××ª ×××¢×¨××ª ×××¤× ×©×× ××× %{place} × ×¤×ª×¨× ×¢×Ö¾××× %{commenter}.
+        your_note_html: '%{commenter} ×¤×ª×¨ ××ª ×××ª ×××¢×¨××ª ×××¤× ×©×× ××× %{place}.'
         commented_note: ××¢×¨×ª ××¤× ×©××××ª ×¢××× × ×¤×ª×¨× ×¢×Ö¾××× %{commenter}. ×××¢×¨× × ××¦××ª
           ××× %{place}
+        commented_note_html: '%{commenter} ×¤×ª×¨ ××¢×¨×ª ××¤× ×©××××ª ×¢×××. ×××¢×¨× × ××¦××ª ×××
+          %{place}.'
       reopened:
-        subject_own: '[OpenStreetMap] ×××ª ×××¢×¨××ª ×©×× ×××¤×¢×× ××××© ×¢×´× %{commenter}'
+        subject_own: â«[OpenStreetMap] ×××ª ×××¢×¨××ª ×©×× ×××¤×¢×× ××××© ×¢×´× %{commenter}
         subject_other: '[OpenStreetMap] ××¢×¨× ×©××¢× ××× ×ª ×××ª× ×××¤×¢×× ××××© ×¢×Ö¾××× %{commenter}'
         your_note: ××¢×¨× ×©×××¡×¤×ª ××× %{place} ×××¤×¢×× ××××© ×¢×Ö¾××× %{commenter}.
+        your_note_html: '%{commenter} ××¤×¢×× ××××© ××¢×¨×ª ××¤× ×©×××¡×¤×ª ××× %{place}.'
         commented_note: ××¢×¨× ×××¤× ×©××××ª ×¢××× ×××¤×¢×× ××××© ×¢×Ö¾××× %{commenter}. ×××¢×¨×
           ××× ××× %{place}.
+        commented_note_html: '%{commenter} ××¤×¢×× ××××© ××¢×¨×ª ××¤× ×©××××ª ×¢×××. ××¢×¨× × ××¦××ª
+          ××× %{place}'
       details: ××¤×©×¨ ×××¦×× ×¤×¨××× × ××¡×¤×× ×¢× ×××¢×¨× ×××ª×××ª %{url}
+      details_html: ××¤×©×¨ ×××¦×× ×¤×¨××× × ××¡×¤×× ×¢× ×××¢×¨× ×××ª×××ª %{url}.
     changeset_comment_notification:
       hi: ×©××× %{to_user},
       greeting: ×©×××,
       commented:
-        subject_own: '[OpenStreetMap] ×××©×ª××© %{commenter} ××¢××¨ ×¢× ××× ××¢×¨×××ª ××©×× ××××
-          ×©××'
-        subject_other: '[OpenStreetMap] ×××©×ª××© %{commenter} ××¢××¨ ×¢× ××× ××¢×¨×××ª ××©×× ××××
-          ×©××ª×¢× ×××ª ×××'
-        your_changeset: ×§××××ª ××¢×¨× ××××©×ª××© %{commenter} ××× ××¢×¨×××ª ××©×× ×××× ×©××¦×¨×ª
+        subject_own: â«[OpenStreetMap] ×§××××ª ××¢×¨× ×××ª %{commenter} ×¢× ×××ª ××¢×¨×××ª ××©×× ××××
+          ×©××
+        subject_other: '[OpenStreetMap] ×××©×ª××© %{commenter} ××¢××¨ ×¢× ×××ª ××¢×¨×××ª ××©×× ××××
+          ×©××ª×¢× ××× ×ª ×××'
+        your_changeset: ×§××××ª ××¢×¨× ××××©×ª××© %{commenter} ×¢× ××ª ××¢×¨×××ª ××©×× ×××× ×©××¦×¨×ª
           ×Ö¾%{time}
-        commented_changeset: ×§××××ª ××¢×¨× ××××©×ª××© %{commenter} ×Ö¾%{time} ×¢× ××× ××¢×¨×××ª
+        your_changeset_html: ×××©×ª××© %{commenter} ×××¡××£ ××¢×¨× ×Ö¾%{time} ×¢× ×××ª ××¢×¨×××ª
+          ××©×× ×××× ×©××.
+        commented_changeset: ×§××××ª ××¢×¨× ××××©×ª××© %{commenter} ×Ö¾%{time} ×¢× ×××ª ××¢×¨×××ª
           ××©×× ×××× ×××¤× ×©×¢×§××ª ×××¨×× ×× ××¦×¨× ×¢×Ö¾××× %{changeset_author}
+        commented_changeset_html: ×××©×ª××© %{commenter} ×××¡××£ ××¢×¨× ×Ö¾%{time} ×¢× ×¢×¨××ª
+          ×©×× ×××× ×©××¦×¨ %{changeset_author} ×××ª/× ×¢××§×/×ª ×××¨××.
         partial_changeset_with_comment: ×¢× ×××¢×¨× '%{changeset_comment}'
+        partial_changeset_with_comment_html: ×¢× ×××¢×¨× '%{changeset_comment}'
         partial_changeset_without_comment: ××× ××¢×¨×
       details: ×¤×¨××× × ××¡×¤×× ×¢× ×¢×¨××ª ××©×× ×××× ××¤×©×¨ ×××¦×× ×××ª×××ª %{url}
+      details_html: ×¤×¨××× × ××¡×¤×× ×¢× ×¢×¨××ª ××©×× ×××× ××¤×©×¨ ×××¦×× ×××ª×××ª %{url}
       unsubscribe: ××× ×××× ××ª ×××× ×× ××¢×××× ×× ××¢×¨××ª ××©×× ×××× ××××ª, × × ×××§×¨ ×××ª×××ª
         %{url} ××××××¥ ×¢× â××××× ××× ××â.
+      unsubscribe_html: ××× ×××× ××ª ×××¢×§× ×××¨× ×¢×××× × ××¢×¨××ª ××©×× ×××× ××××ª, × × ×××§×¨
+        ×××ª×××ª %{url} ××××××¥ ×¢× â××××× ××× ××â.
   messages:
     inbox:
       title: ×ª×××ª ××××¨ × ×× ×¡
@@ -1378,11 +1655,29 @@ he:
       as_unread: ×××××¢× ×¡××× × ×××××¢× ×©×× × ×§×¨××
     destroy:
       destroyed: ×××××¢× × ×××§×
+  shared:
+    markdown_help:
+      title_html: ×¤××¢× × ××¢××¨×ª <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a>
+      headings: ×××ª×¨××ª
+      heading: ×××ª×¨×ª
+      subheading: ×××ª×¨×ª ××©× ×
+      unordered: ×¨×©××× ×××ª×Ö¾××××× ×ª
+      ordered: ×¨×©××× ××××× ×ª
+      first: ××¤×¨×× ××¨××©××
+      second: ××¤×¨×× ××©× ×
+      link: ×§××©××¨
+      text: ××§×¡×
+      image: ×ª××× ×
+      alt: ××§×¡× ××××¤×
+      url: ××ª×××ª URL
+    richtext_field:
+      edit: ×¢×¨×××
+      preview: ×ª×¦××× ××§××××
   site:
     about:
       next: ×××
       copyright_html: <span>&copy;</span>×ª××¨××<br>OpenStreetMap
-      used_by_html: '%{name} ××¤×¢××× × ×ª×× × ×××¤× ××××¤× ××ª×¨× ××× ××¨× ×, ×××©×××× ××××©××¨××
+      used_by_html: '%{name} ××¡×¤×§×ª × ×ª×× × ××¤××ª ××××¤× ××ª×¨× ××× ××¨× ×, ×××©×××× ××××©××¨××
         ×©×× ××'
       lede_text: ××ª OpenStreetMap ××× × ×§××××ª ×××¤×× ×©×ª××¨××× ×××ª×××§×× × ×ª×× ×× ×¢× ××¨×××,
         ×©×××××, ××ª×Ö¾×§×¤×, ×ª×× ××ª ×¨×××ª ××¢×× ××¨×× ×××ª×¨, ××¡××× ××¢×××.
@@ -1442,13 +1737,13 @@ he:
           ×××ª×¨ ××× ×××¤××¥ ××ª ××ª××¦×××ª ×¨×§ ××¤× ×ª× ×× ×××ª× ××¨××©×××.
           <a href="https://opendatacommons.org/licenses/odbl/1.0/">×××¡××
           ×××©×¤××</a> ×××× ××¡×××¨ ××ª ××××××ª××× ×××ª ×ª×××× ××××¨×××ª ×©×××.
-        intro_3_html: |-
-          ××××¤×× ×××¨××× ×××¤× ×©×× ×, ×××ª××¢×× ×©×× × ××××©×× ×××¤××£
+        intro_3_1_html: |-
+          ××ª××¢×× ×©×× × ××××© ×××¤××£
           ××¨××©××× <a href="https://creativecommons.org/licenses/by-sa/2.0/">×§×¨×××××××
-          ×§×××× × ×××××¡â×©××ª××£Ö¾××× 2.0</a> license (××§××¦××¨ CC-BY-SA).
+          ×§×××× × ×××××¡â×©××ª××£Ö¾××× 2.0</a> license (××§××¦××¨  CC-BY-SA 2.0).
         credit_title_html: ××× ××ª×ª ×××××¡ ×Ö¾OpenStreetMap
         credit_1_html: ×× × ×××¨×©×× ×××××¡ ×× â&copy; ×ª××¨×× OpenStreetMapâ.
-        credit_2_html: |-
+        credit_2_1_html: |-
           ×××Ö¾××, ××××ª× ××××××¨ ×©×× ×ª×× ×× ×××× ×× ×××¤××£ ××¨××©××× ×××¡××
           × ×ª×× ×× ×¤×ª××××, ××× × ×¢×©× ×©××××© ×××¨××× ×××¤× ×©×× ×, ×©××××¤×× ××¤××¤××ª
           ××¨××©××× CC-BY-SA. ×××¤×©×¨××ª× ××¢×©××ª ×××ª ××××¦×¢××ª ×§××©××¨ ××
@@ -1459,7 +1754,12 @@ he:
           ×××¤× ××ª ××ª ××§××¨××× ×©×× ×× openstreetmap.org (×××× ×¢×Ö¾××× ××¨×××ª
           âOpenStreetMapâ ×××ª×××ª ××××), ×× opendatacommons.org, ×××
           ×× ××ª×××, ×× creativecommons.org.
-        credit_3_html: '××©××× ××¤× ×××§××¨×× ××ª ×©××¤×©×¨ ××¢××× ××, ××××××¡ ×¦×¨×× ××××¤××¢ ××¤×× ×ª
+        credit_3_1_html: "××¨××× ×××¤× ×&ldquo;×¡×× ×× ××¨×××&rdquo; ×Ö¾www.openstreetmap.org
+          ×× ×ª××¦×¨×ª ×©×××¤×§× ×¢× ××× \n×¢×××ª×ª OpenStreetMap ××××¦×¢××ª ×× ×ª×× ×× ×©× OpenStreetMap
+          \n×ª××ª ×¨××©××× ××¡× ×× ×ª×× ×× ××¤×ª×× (Open Database License). ×× ×××¨×ª ×××©×ª××© ×××¨××××
+          ×××× × × ×××©×ª××© ××××××¡ ×××: \n&ldquo;××¤×ª ××¡××¡ ×× ×ª×× ×× ×Ö¾OpenStreetMap ××¢×××ª×ª
+          OpenStreetMap&rdquo;."
+        credit_4_html: '××©××× ××¤× ×××§××¨×× ××ª ×©××¤×©×¨ ××¢××× ××, ××××××¡ ×¦×¨×× ××××¤××¢ ××¤×× ×ª
           ×××¤×. ×××©×:'
         attribution_example:
           alt: ××××× ××¦××¨× ×× ××× × ××ª×ª ×××××¡ ×Ö¾OpenStreetMap ×××ª×¨ ×××× ××¨× ×
@@ -1561,16 +1861,6 @@ he:
         ×××¢×©×. ×××¤×©×¨××ª× ××××××¨ ××ª ××¢×¨××××ª ×©×× ××¦××××¨×××ª ××¨× %{user_page} ×©××.
       user_page_link: ××£ ×××©×ª××©
       anon_edits_link_text: ×¨' ××¡××¨ ××××¢ ×× ××.
-      flash_player_required_html: ××© ×¦××¨× ×× ×× ×¤×××© ××× ×××©×ª××© ×Ö¾Potlatch, ×¢×¨×× ××¤×××©
-        ×©× OpenStreetMap. ××¤×©×¨ <a href="https://get.adobe.com/flashplayer">××××¨××
-        × ×× ×¤×××© ×××ª×¨ Adobe.com</a>. ××© <a href="https://wiki.openstreetmap.org/wiki/Editing">××¤×©×¨××××ª
-        × ××¡×¤××ª</a> ××¢×¨×××ª OpenStreetMap.
-      potlatch_unsaved_changes: ××© ×× ×©×× ×××× ×©×× × ×©××¨×. (××× ××©×××¨ ×Ö¾Potlatch, ××©
-        ×××× ××ª ×××××¨× ×©× ×××¨× ×× ×× ×§××× ×× ××××× ×××¦× ×¢×¨××× ×××, ×× ××©×××¨ ×× ××¤×ª××¨
-        ××©×××¨× ××××.)
-      potlatch2_not_configured: Potlatch 2 ×× ×××××¨ â ×¨×³ https://wiki.openstreetmap.org/wiki/The_Rails_Port
-      potlatch2_unsaved_changes: ××© ×× ×©×× ×××× ×©×× × ×©××¨×. (××× ××©×××¨ ×Ö¾Potlatch 2,
-        ××© ×××××¥ â×©×××¨×â.)
       id_not_configured: ×× ××ª××¦×¢× ××××¨××ª ×©× iD
       no_iframe_support: ×××¤××¤× ×©×× ××× × ×ª××× ××××× ××× ××¡×× iframe ×©× HTML, ×××× ×××× ×××
         ×¢×××¨ ×ª××× × ××.
@@ -1698,13 +1988,13 @@ he:
           primary: ××××© ×¨××©×
           secondary: ××××© ××©× ×
           unclassified: ××¨× ×× ××¡××××ª
-          track: ××¡××× ××¨××¦××
+          track: ××¡×××
           bridleway: ××¡××× ××¨××××ª ×¡××¡××
           cycleway: ××¨× ××××¤× ×××
           cycleway_national: ××¡××× ×××¤× ××× ×××××
           cycleway_regional: ××¡××× ×××¤× ××× ××××¨×
           cycleway_local: ××¡××× ×××¤× ××× ××§×××
-          footway: ××¨× ×××××× ×¨××
+          footway: ×©××× ×××××× ×¨××
           rail: ××¡×××ª ××¨××
           subway: ×¨×××ª ×ª××ª××ª
           tram:
@@ -1794,9 +2084,10 @@ he:
         paragraph_1_html: ××××× OpenStreetMap ××© ×¢×× ××©××. ×× × ××¡×¤×¨ ×××××ª ××¤×ª× ×©××××
           ×©××××©×××ª.
         editor_html: <strong>×¢××¨×</strong> ××× ×ª×× × ×× ××ª×¨ ××¢×¨×××ª ×××¤×.
-        node_html: <strong>×¦×××ª</strong> × ×× × ×§××× ×¢× ××¤×, ×××× ××¡×¢×× ×××ª ×× ×¢×¥ ×××.
+        node_html: <strong>× ×§×××</strong> ××××¦××ª ×××§×× × ×§×××ª×, ×××× ××¡×¢×× ×××ª ×× ×¢×¥
+          ×××.
         way_html: <strong>× ×ª××</strong> ××× ×§× ×× ××××¨ ××× ××¨×, ××¨×, ××× ×× ××× ×.
-        tag_html: <strong>×ª×</strong> ××× ×¤××¡×ª ××××¢ ×¢× ×¦×××ª ×× ×¢× × ×ª×× ××× ×©× ×©× ××¡×¢××
+        tag_html: <strong>×ª×</strong> ××× ×¤××¡×ª ××××¢ ×¢× × ×§××× ×× ×¢× ×§× ××× ×©× ×©× ××¡×¢××
           ×× ×××××ª ××××¨××ª ×××¨×.
       rules:
         title: ×××§××!
@@ -1828,11 +2119,6 @@ he:
         ×××)
     new:
       upload_trace: ××¢×××ª ××¡××× GPS
-      upload_gpx: '××¢×××ª ×§×××¥ GPX:'
-      description: '×ª××××¨:'
-      tags: '×ª×××:'
-      tags_help: ×××¤×¨× ××¤×¡××§××
-      visibility: '× Ö´×¨××Ö¼×ª:'
       visibility_help: ×× ×× ××××¨?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: ×¢××¨×
@@ -1847,20 +2133,9 @@ he:
         other: ××© ×× ××¡××× ×©×××× ×××¢×××. × × ××©×§×× ×××××ª ×¢× ×¡××× ××¢×××ª× ××¤× × ××¢×××ª
           ××¡××××× × ××¡×¤××, ××× ×× ×××¡×× ××ª ××ª××¨ ×××©×ª××©×× ×××¨××.
     edit:
+      cancel: ×××××
       title: ×¢×¨×××ª ××¡××× %{name}
       heading: ×¢×¨×××ª ×××¡××× %{name}
-      filename: '×©× ××§×××¥:'
-      download: ×××¨××
-      uploaded_at: '×ª××¨×× ××¢×××:'
-      points: '× ×§××××ª:'
-      start_coord: '× ×§××××ª ×¦××× ×©× ×ª××××:'
-      map: ××¤×
-      edit: ×¢×¨×××
-      owner: '××¢×××:'
-      description: '×ª××××¨:'
-      tags: '×ª×××:'
-      tags_help: ×××¤×¨× ××¤×¡××§××
-      visibility: '× Ö´×¨××Ö¼×ª:'
       visibility_help: ×× ×× ××××¨?
     update:
       updated: ×××¡××× ×¢××××
@@ -1875,6 +2150,7 @@ he:
       uploaded: '×××¢××:'
       points: '× ×§××××ª:'
       start_coordinates: '× ×§××××ª ×¦××× ×©× ×ª××××:'
+      coordinates_html: '%{latitude}, %{longitude}'
       map: ××¤×
       edit: ×¢×¨×××
       owner: '××¢×××:'
@@ -1909,9 +2185,9 @@ he:
       map: ××¤×
     index:
       public_traces: ××¡×××× GPS ×¦××××¨×××
-      my_traces: × ×ª××× ×Ö¾GPS ×©××
+      my_traces: ××§××××ª ×Ö¾GPS ×©××
       public_traces_from: ××¡×××× GPS ×¦××××¨××× ×××ª %{user}
-      description: ×¢××× ×××¢××××ª ×××¨×× ××ª ×©× × ×ª××× GPS
+      description: ×¢××× ×××¢××××ª ×××¨×× ××ª ×©× ××§××××ª GPS
       tagged_with: ' ××ª××× ×¢× %{tags}'
       empty_html: ××× ×¤× ×¢×××× ×©×× ×××¨. ××¤×©×¨ <a href='%{upload_link}'>×××¢×××ª ××××¢
         ×××©</a> ×× ××××× ×¢×× ×¢× ××¢×§× ××¡××××× ×Ö¾GPS ×<a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>××£
@@ -1992,13 +2268,6 @@ he:
       delete: ××××§×ª ××§××
       confirm: ××××ª?
       requests: '×××§×© ××ª ×××¨×©×××ª ×××××ª ××××©×ª××©:'
-      allow_read_prefs: ××§×¨×× ××ª ××¢××¤××ª ×××©×ª××© ×©×××.
-      allow_write_prefs: ××©× ××ª ××ª ×××¢××¤××ª ×©×××.
-      allow_write_diary: ×××¦××¨ ×¨×©××××ª ×××× ×××¢×¨××ª ×××××¡××£ ×××¨××.
-      allow_write_api: ××©× ××ª ××ª ×××¤×.
-      allow_read_gpx: ××§×¨×× ××ª ××¡×××× ×Ö¾GPS ×©××.
-      allow_write_gpx: ×××¢×××ª ××¡×××× GPS.
-      allow_write_notes: ××©× ××ª ××¢×¨××ª
     index:
       title: ×¤×¨×× ×Ö¾OAuth ×©××
       my_tokens: ××××©×××× ×××××©×¨×× ×©××
@@ -2013,19 +2282,7 @@ he:
       registered_apps: '×¨×©××ª ××ª ×××©××× ×××§×× ×××××:'
       register_new: ×¨××©×× ××××©×× ×©××
     form:
-      name: ×©×
-      required: ××¨××©
-      url: ××ª×××ª ××××©×× ××¨××©××ª
-      callback_url: ××ª×××ª ×§×¨××× (callback)
-      support_url: ××ª×××ª ××ª××××
       requests: '×××§×© ××ª ×××¨×©×××ª ×××××ª ××××©×ª××©:'
-      allow_read_prefs: ××§×¨×× ××ª ×××¢××¤××ª ×©× ×××©×ª××©.
-      allow_write_prefs: ××©× ××ª ×××¢××¤××ª ×©× ×××©×ª××©.
-      allow_write_diary: ×××¦××¨ ×¨×©××××ª ×××× ×××¢×¨××ª ×××××¡××£ ×××¨××.
-      allow_write_api: ××©× ××ª ××ª ×××¤×.
-      allow_read_gpx: ××§×¨×× ××ª ××¡×××× ×Ö¾GPS ××¤×¨×××× ×©×××.
-      allow_write_gpx: ×××¢×××ª ××¡×××× GPS.
-      allow_write_notes: ××©× ××ª ××¢×¨××ª
     not_found:
       sorry: ×¡××××, ××¡×× %{type} ×× × ××¦×.
     create:
@@ -2103,8 +2360,6 @@ he:
     reset_password:
       title: ×××¤××¡ ×¡××¡××
       heading: ×××¤××¡ ××¡×¡×× ×¢×××¨ %{user}
-      password: '×¡××¡××:'
-      confirm password: '×××××ª ××¡××¡××:'
       reset: ×××¤××¡ ××¡×¡××
       flash changed: ×¡××¡××ª× ×©×× ×ª×.
       flash token bad: ×× ××¦×× × ××ª ×××¡×××× ××××, ×××× ××××§×ª ×××ª×××ª ×ª×¢×××¨?
@@ -2119,8 +2374,6 @@ he:
           <p>×××××× ×××¤××ª ×××¨××ª, OpenStreetMap × ××¦×¨×ª ×××× ×¢×Ö¾××× ×× ×©×× ××××,
           ××××× ×××¤×©××× ××ª×§×, ××¢××× ×××××¨×× ×××ª× ××××©×ª××© ××.</p>
           <p>××× ×××ª××× ××ª×¨×× ××© ××××¨×©×. ×× × × ×©×× ××××¨ ×××§××¨×× × ××× ××××ª ××ª ××©××× ×.</p>
-      license_agreement: ×¢× ×××©××¨ ×××©××× ××© ××§×× ××ª <a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">×ª× ××
-        ××ª×¨×××</a>.
       email address: '××ª×××ª ××××´×:'
       confirm email address: '×××××ª ××ª×××ª ××××´×:'
       not_displayed_publicly_html: ×××ª×××ª ×©×× ×× ×××¦××ª ××¤××××, ×××××¢ × ××¡×£ ×¨×× <a href="https://wiki.openstreetmap.org/wiki/Privacy_Policy"
@@ -2313,10 +2566,10 @@ he:
       reconfirm_html: ×× ××¨×¦×× × ××§×× ×©×× ×××ª× ×××××ª, <a href="%{reconfirm}">× × ×××××¥
         ×××</a>.
     confirm_resend:
-      success: ×©××× × ××××¢×ª ×××©××¨ ×××© ×××ª×××ª %{email} ×××¨××¢ ×××©××¨ ××©××× ×, ××¤×©×¨ ××××
-        ×××ª××× ×××¤××ª.<br /><br />×× ×××××¨ ××××§××¨×× × ×©×× ×××¤×¢××ª ××¢×¨××ª × ×× ××××¨ ×××
-        ××©×¨ ×©××××ª ××§×©××ª ×××©××¨, × × ××××¡××£ ××ª %{sender} ××¨×©××× ×××× ×, ××××¨ ×××× × × ××××××
-        ×××©×× ×××§×©××ª ×××©××¨ ×××©××.
+      success_html: ×©××× × ××××¢×ª ×××©××¨ ×××© ×××ª×××ª %{email} ×××¨××¢ ×××©××¨ ××©××× ×, ××¤×©×¨
+        ×××× ×××ª××× ×××¤××ª.<br /><br />×× ×××××¨ ××××§××¨×× × ×©×× ×××¤×¢××ª ××¢×¨××ª × ×× ××××¨
+        ××× ××©×¨ ×©××××ª ××§×©××ª ×××©××¨, × × ××××¡××£ ××ª %{sender} ××¨×©××× ×××× ×, ××××¨ ×××× × ×
+        ×××××× ×××©×× ×××§×©××ª ×××©××¨ ×××©××.
       failure: ××©×ª××© %{name} ×× × ××¦×.
     confirm_email:
       heading: ×××©××¨ ×©×× ×× ××ª×××ª ×××××´×
@@ -2330,17 +2583,6 @@ he:
       flash success: ×××§×× ×¨××©× × ×©××¨ ×××¦×××
     go_public:
       flash success: ×× ××¢×¨××××ª ×©×× ×¦××××¨×××ª ×¢××©×× ×××© ×× ××¨×©×× ××¢×¨××.
-    make_friend:
-      heading: ××××¡××£ ××ª %{user} ××ª××¨ ×××¨?
-      button: ××××¡××£ ××××¨
-      success: '%{name} ×××¨ ×©×× ×¢××©××!'
-      failed: ×¡××××, ×××¡×¤×ª %{name} ××××¨ × ××©××.
-      already_a_friend: '%{name} ×××¨ ×××¨ ×©××.'
-    remove_friend:
-      heading: ×××¡××¨ ××ª %{user} ××¨×©×××ª ××××¨××?
-      button: ×××¡××¨ ××¨×©×××ª ××××¨××
-      success: '%{name} ×××¡×¨ ××¨×©×××ª ××××¨×× ×©××.'
-      not_a_friend: '%{name} ×× ××× ×××××¨×× ×©××.'
     index:
       title: ××©×ª××©××
       heading: ××©×ª××©××
@@ -2448,25 +2690,33 @@ he:
       revoke: ××××!
       flash: ×××¡××× ××××ª ×××××.
     helper:
-      time_future: ×ª×¡×ª××× ××¢×× %{time}
+      time_future_html: ×ª×¡×ª××× ××¢×× %{time}
       until_login: ×¤×¢××× ×¢× ×©×××©×ª××© ×××× ×¡ ×××©×××.
-      time_future_and_until_login: ××¡×ª××× ×Ö¾%{time} ××××¨× ×©×××©×ª××© × ×× ×¡ ×××©×××.
-      time_past: ××¡×ª×××× ×Ö¾%{time}.
+      time_future_and_until_login_html: ××¡×ª××× ×Ö¾%{time} ××××¨× ×©×××©×ª××© × ×× ×¡ ×××©×××.
+      time_past_html: ××¡×ª×××× ×Ö¾%{time}.
       block_duration:
         hours:
           one: ×©×¢× ×××ª
+          two: ×©×¢×ª×××
+          many: '%{count} ×©×¢××ª'
           other: '%{count} ×©×¢××ª'
         days:
           one: ××× ×××
           other: '%{count} ××××'
         weeks:
           one: ×©×××¢ ×××
+          two: ×©×××¢×××
+          many: '%{count} ×©×××¢××ª'
           other: '%{count} ×©×××¢××ª'
         months:
           one: ××××© ×××
+          two: ××××©×××
+          many: '%{count} ××××©××'
           other: '%{count} ××××©××'
         years:
           one: ×©× × ×××ª
+          two: ×©× ×ª×××
+          many: '%{count} ×©× ××'
           other: '%{count} ×©× ××'
     blocks_on:
       title: ××¡××××ª ×©× %{name}
@@ -2504,7 +2754,7 @@ he:
       next: ××× Â»
       previous: Â« ××§×××
   notes:
-    mine:
+    index:
       title: ××¢×¨××ª ××ª×××××ª ×©× %{user}
       heading: ××¢×¨××ª ×©× %{user}
       subheading_html: ××¢×¨××ª ××ª×××××ª ×©× %{user}
@@ -2547,14 +2797,22 @@ he:
         out: ××ª×¨××§××ª
       locate:
         title: ××¦××ª ××××§×× ×©××
-        metersUnit: ×××¨
-        feetUnit: ×¨××
-        popup: ×××¨××§ ×©×× ××× ×§××× ××××ª ××× {distance} {unit}
+        metersPopup:
+          one: ×××¨××§ ×©×× ××× ×§××× ××××ª ××× ××××× ×××¨
+          two: ×××¨××§ ×©×× ××× ××××× ×©× %{count} ×××¨×× ×× ×§××× ××
+          many: ×××¨××§ ×©×× ××× ××××× ×©× %{count} ×××¨×× ×× ×§××× ××
+          other: ×××¨××§ ×©×× ××× ××××× ×©× %{count} ×××¨×× ×× ×§××× ××
+        feetPopup:
+          one: ×××¨××§ ×©×× ××× ×§××× ××××ª ××× ××××× ×¨××
+          two: ×××¨××§ ×©×× ××× ××××× ×©× %{count} ×¨××××× ×× ×§××× ××
+          many: ×××¨××§ ×©×× ××× ××××× ×©× %{count} ×¨××××× ×× ×§××× ××
+          other: ×××¨××§ ×©×× ××× ××××× ×©× %{count} ×¨××××× ×× ×§××× ××
       base:
         standard: ×ª×§× ×
         cycle_map: ××¤×ª ×××¤× ×××
         transport_map: ××¤×ª ×ª××××¨×
         hot: ×××× ×××¨×
+        opnvkarte: ÃPNVKarte
       layers:
         header: ×©××××ª ×××¤×
         notes: ××¢×¨××ª ×××¤×
@@ -2565,6 +2823,12 @@ he:
       copyright: Â© <a href='%{copyright_url}'>××ª× ××× OpenStreetMap</a>
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>××ª×¨××</a>
       terms: <a href='%{terms_url}' target='_blank'>×ª× ×× ××ª×¨ ×Ö¾API</a>
+      thunderforest: ×××¨×××× ×××××××ª <a href='%{thunderforest_url}' target='_blank'>×× ××
+        ×××</a>
+      opnvkarte: ×××¨×××× ×××××××ª <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>
+      hotosm: ×××¨×××× ×¡××× × × ×¢× ××× <a href='%{hotosm_url}' target='_blank'>××¦×××ª
+        ××××× ×××¨× ×©× OpenStreetMap</a> ××××¨×× <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap
+        ×¦×¨×¤×ª</a>
     site:
       edit_tooltip: ×¢×¨×××ª ×××¤×
       edit_disabled_tooltip: ×××ª×§×¨× ××× ××¢×¨×× ××ª ×××¤×
@@ -2684,7 +2948,7 @@ he:
           tenth: ×¢×©××¨××ª
       time: ×××
     query:
-      node: ×¦×××ª
+      node: × ×§×××
       way: ××¨×
       relation: ×××¡
       nothing_found: ×× × ××¦×× ××©××××ª
@@ -2700,33 +2964,33 @@ he:
   redactions:
     edit:
       description: ×ª××××¨
-      heading: ×¢×¨×××ª ×××ª××
+      heading: ×¢×¨×××ª ××¡×¨×
       title: ×¢×¨×××ª ×××ª××
     index:
-      empty: ××× ×××ª×××× ×©××¤×©×¨ ×××¦××
+      empty: ××× ××¡×¨××ª ×©××¤×©×¨ ×××¦××
       heading: ×¨×©×××ª ×××ª××××
-      title: ×¨×©×××ª ×××ª××××
+      title: ×¨×©×××ª ××¡×¨××ª
     new:
       description: ×ª××××¨
-      heading: ××× ×ª ××××¢ ××××ª×× ×××©
+      heading: ×××¡×¤×ª ××××¢ ×××¡×¨× ×××©×
       title: ××ª××¦×¢×ª ××¦××¨×ª ×××ª×× ×××©
     show:
       description: '×ª××××¨:'
-      heading: ××¦××ª ××××ª×× â%{title}â
+      heading: ××¦××ª ×××¡×¨× â%{title}â
       title: ××¦××ª ×××ª××
       user: '×××¦×¨:'
-      edit: ×¢×¨×××ª ××××ª×× ×××
+      edit: ×¢×¨×××ª ×××¡×¨× ××××ª
       destroy: ××¡×¨×ª ××××ª×× ×××
       confirm: ××××ª?
     create:
-      flash: × ××¦×¨ ×××ª××
+      flash: ××¡×¨× × ××¦×¨×.
     update:
       flash: ××©×× ×××× ×©× ×©××¨×.
     destroy:
-      not_empty: ××××ª×× ××× × ×¨××§. × × ×××× ××ª ××××ª×××× ×©× ×××¨×¡×××ª ×©×©××××ª ××××ª×× ×××
-        ××¤× × ××¨××¡×ª×.
+      not_empty: ×××¡×¨× ××× × ×¨××§×. × × ×××× ××ª ×××¡×¨××ª ×©× ×××¨×¡×××ª ×©×©××××ª ×××¡×¨× ×× ××¤× ×
+        ××××××.
       flash: ××××ª×× × ××¨×¡.
-      error: ×××¨×¢× ×©×××× ××¢×ª ××¨××¡×ª ××××ª×× ×××.
+      error: ×××¨×¢× ×©×××× ××¢×ª ××××× ×××¡×¨× ××××ª.
   validations:
     leading_whitespace: ××© ×¨××× ×××ª×××
     trailing_whitespace: ××© ×¨××× ××¡××£