X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0b421c9314baf227a0b3a27207b2645afa19cba7..5761371a561f785e17e5403cd47f76ecd3604eff:/config/locales/he.yml

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 35c64ae1b..018f417a4 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1,7 +1,6 @@
 # Messages for Hebrew (×¢××¨××ª)
 # Exported from translatewiki.net
 # Export driver: phpyaml
-# Author: Abijeet Patro
 # Author: Amire80
 # Author: Aude
 # Author: Dan.translate
@@ -10,6 +9,7 @@
 # Author: Erelon
 # Author: Ex-Diktator
 # Author: ExampleTomer
+# Author: Ghsuvr
 # Author: GilCahana
 # Author: Guycn2
 # Author: HarelM
@@ -25,7 +25,9 @@
 # Author: YaronSh
 # Author: Yona b
 # Author: Ypnypn
+# Author: Zstadler
 # Author: ××××¨ ××
+# Author: ××©×¨×× ×§××¨
 # Author: × ×× ×¡
 # Author: ×ª×××¨ ×
 ---
@@ -35,6 +37,7 @@ he:
   time:
     formats:
       friendly: '%e ×%B %Y ××©×¢× %H:%M'
+      blog: '%e ×%B %Y'
   helpers:
     file:
       prompt: ××××¨×ª ×§×××¥
@@ -52,8 +55,8 @@ he:
         create: ×¨××©××
         update: ×¢××××
       redaction:
-        create: ××¦××¨×ª ×××ª××
-        update: ×©×××¨×ª ×××ª××
+        create: ××¦××¨×ª ××¡×¨×
+        update: ×©×××¨×ª ××¡×¨×
       trace:
         create: ××¢×××
         update: ×©×××¨×ª ×©×× ××××
@@ -64,7 +67,7 @@ he:
     errors:
       messages:
         invalid_email_address: ×××ª ××× × ××ª×××ª ××××´× ×ª×§× ××ª
-        email_address_not_routable: ××× ××¤×©×¨××ª ×××××ª ××¡×××
+        email_address_not_routable: ×× ××¤×©×¨ ×××¦××¨ × ×ª××
     models:
       acl: ×¨×©×××ª ××§×¨×ª ×××©×
       changeset: ×¢×¨××ª ×©×× ××××
@@ -73,46 +76,46 @@ he:
       diary_comment: ×ª×××× ×××××
       diary_entry: ×¨×©××× ×××××
       friend: ×××¨
-      issue: ×¡××××
+      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: ×××××
+      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)
+        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_read_gpx: ××§×¨×× ××ª ××§××××ª ×Ö¾GPS ××¤×¨××××ª ×©×××
+        allow_write_gpx: ×××¢×××ª ××§××××ª GPS
         allow_write_notes: ××©× ××ª ××¢×¨××ª
       diary_comment:
         body: ×××£
@@ -136,90 +139,118 @@ he:
         description: ×ª××××¨
         gpx_file: ××¢×××ª ×§×××¥ GPX
         visibility: × Ö´×¨××Ö¼×ª
-        tagstring: ×ª××××ª
+        tagstring: ×ª×××
       message:
         sender: ×©×××
         title: × ××©×
         body: ×××£
         recipient: × ××¢×
+      redaction:
+        title: ×××ª×¨×ª
+        description: ×ª××××¨
       report:
         category: × × ×××××¨ ××ª ××¡××× ×××××× ×©××
-        details: × × ××¡×¤×§ ×¤×¨××× ×¢× ×××¢×× (× ××¨×©).
+        details: × × ××¡×¤×§ ×¤×¨××× × ××¡×¤×× ×¢× ×××¢×× (× ××¨×©).
       user:
+        auth_provider: ×¡×¤×§ ×××××ª
+        auth_uid: ×××× ×××××ª ××××××
         email: ××××´×
+        email_confirmation: ×××××ª ××××´×
+        new_email: ××ª×××ª ××××´× ×××©×
         active: ×¤×¢××
         display_name: ×©× ××ª×¦×××
-        description: ×ª××××¨
-        languages: ×©×¤××ª
+        description: ×ª××××¨ ×¤×¨××¤××
+        home_lat: ×§× ×¨×××
+        home_lon: ×§× ×××¨×
+        languages: ×©×¤××ª ×××¢××¤××ª
+        preferred_editor: ×¢××¨× ×××¢××£
         pass_crypt: ×¡××¡××
-        pass_crypt_confirmation: ×××××ª ×¡×¡××
+        pass_crypt_confirmation: ×××××ª ×¡××¡××
     help:
       trace:
         tagstring: ×××¤×¨× ××¤×¡××§××
+      user_block:
+        reason: ××¡××× ×©×××× × ×××©×ª××© × ××¡×. × × ×××ª×× ××©×× ××××× × ××¨×××¢ ×××ª×ª ××× ×©×××ª×¨
+          ×¤×¨××× ×¢× ×××¦×. × × ×××××¨ ×©×× ×× ×××©×ª××©×× ×××× ×× ××ª ××¢×× ×××§×¦××¢××ª ×©× ××§××××
+          ××××©×ª×× ×××©×ª××© ×××××× ××¨××¨××ª ××××.
+        needs_view: ××× ×××©×ª××© ×¦×¨×× ××××× ×¡ ××¤× × ×©×××¡××× ××××ª ×ª× ××§×?
+      user:
+        email_confirmation: ×××ª×××ª ×©×× ×× ×××¤××¢× ××¤××××, × × ××¢××× ×<a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy"
+          title="×××× ×××ª ××¤×¨××××ª ×©× OSMF ××¨×××ª ×¡×¢××£ ×¢× ××ª××××ª ××××´×">×××× ×××ª ××¤×¨××××ª</a>
+        new_email: (××¢××× ×× ×××¦××ª ××¤××××)
   datetime:
     distance_in_words_ago:
       about_x_hours:
-        one: ××¤× × ××¢×¨× ×©×¢×
-        two: ××¤× × ××¢×¨× ×©×¢×ª×××
-        many: ××¤× × ××¢×¨× %{count} ×©×¢××ª
-        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)
+      description: ×©×××× ××¨×××§ (JOSM, Potlatch ×× Merkaartor)
   auth:
     providers:
       none: ×××
@@ -227,7 +258,7 @@ he:
       google: ××××
       facebook: ×¤×××¡×××§
       windowslive: Windows Live
-      github: GitHub
+      github: ××××××
       wikipedia: ×××§××¤×××
   api:
     notes:
@@ -242,12 +273,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: ×ª××××
@@ -283,16 +314,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}
@@ -301,16 +332,21 @@ 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: ×¦××ª××
-      nodes_count: '{{PLURAL|one=××¤×¨×§ ×××|two=×©× × ××¤×¨×§××|many=%{count} ××¤×¨×§××|%{count}
-        ××¤×¨×§××}'
+      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}'
@@ -324,35 +360,36 @@ he:
     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:
@@ -377,21 +414,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}
@@ -403,7 +440,7 @@ he:
       view_changeset_details: ××¦××ª ×¤×¨×× ×¢×¨××ª ×©×× ××××
     changesets:
       id: ××××
-      saved_at: × ×©××¨× ×ª××ª
+      saved_at: × ×©××¨× ×
       user: ××©×ª××©
       comment: ××¢×¨×
       area: ×©××
@@ -437,12 +474,7 @@ he:
     new:
       title: ×¨×©×××ª ×××× ×××©×
     form:
-      subject: '× ××©×:'
-      body: '×ª×××:'
-      language: '×©×¤×:'
-      location: '×××§××:'
-      latitude: '×§× ×¨×××:'
-      longitude: '×§× ×××¨×:'
+      location: ×××§××
       use_map_link: ×××©×ª××© ×××¤×
     index:
       title: ×××× ×× ×©× ×××©×ª××©
@@ -472,7 +504,8 @@ 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: ×©××××ª ×ª×××× ×××××¨
       comment_count:
@@ -516,13 +549,13 @@ he:
       heading: ××××¡××£ ××ª %{user} ××ª××¨ ×××¨?
       button: ××××¡××£ ××××¨
       success: '%{name} ×××¨ ×©×× ×¢××©××!'
-      failed: ×¡××××, ×××¡×¤×ª %{name} ××××¨ × ××©××.
+      failed: ××¦××¢×¨××, ×××¡×¤×ª %{name} ××××¨ × ××©××.
       already_a_friend: '%{name} ×××¨ ×××¨ ×©××.'
     remove_friend:
       heading: ×××¡××¨ ××ª %{user} ××¨×©×××ª ××××¨××?
       button: ×××¡××¨ ××¨×©×××ª ××××¨××
       success: '%{name} ×××¡×¨ ××¨×©×××ª ××××¨×× ×©××.'
-      not_a_friend: '%{name} ×× ××× ×××××¨×× ×©××.'
+      not_a_friend: '%{name} ××× × ××× ×××××¨×× ×©××.'
   geocoder:
     search:
       title:
@@ -540,29 +573,30 @@ he:
           cable_car: ×¨×××
           chair_lift: ××¢×××ª ×¡×§× ×××©×××
           drag_lift: ××¢×××ª ×¡×§× ×××¨××¨×
-          gondola: ×¨××× ××× ××××
+          gondola: ×¨×××
           magic_carpet: ××¡××¢ ×¡×§×
-          platter: ××¢×××ª ×¦×××ª
-          pylon: ×¤××××
+          platter: ××¢×××ª ×¡×§× ×××¨××¨×ª ×¦×××ª
+          pylon: ×¢××× ×¨×××
           station: ×ª×× ×ª ×¨×××
-          t-bar: ××¢×××ª ××Ö¾××¨
-          "yes": ×××××¨×
+          t-bar: ××¢×××ª ×¡×§× ××Ö¾××¨
+          "yes": ×¨××× ××××
         aeroway:
-          aerodrome: ×× ××ª
+          aerodrome: ×©×× ×ª×¢××¤×
           airstrip: ×Ö´× ××ª
-          apron: ×¨×××ª ×× ××
+          apron: ×¨×××ª ×× ×××ª ××××¡××
           gate: ×©×¢×¨
           hangar: ×××¡× ××××¡××
           helipad: ×× ××ª ××¡××§××
           holding_position: ×××§×× ××××§×
           navigationaid: ×¢××¨ × ×××× ×××××¨×
-          parking_position: ×××§×× ×× ××
+          parking_position: ×¢×××ª ×× ××
           runway: ××¡××× ×××¨××
-          taxiway: ××¡××× × ×¡××¢×ª ××××¡
+          taxilane: × ×ª×× ××¡×¢×
+          taxiway: ××¡××× ××¡×¢×
           terminal: ××¡××£
           windsock: ×©×¨××× ×¨××
         amenity:
-          animal_boarding: ×¤× ×¡×××
+          animal_boarding: ×¤× ×¡××× ×××××ª
           animal_shelter: ×××ª ×××¡× ×××××ª
           arts_centre: ××¨×× ××× ××××ª
           atm: ××¡×¤×××
@@ -603,32 +637,32 @@ he:
           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: ××× ××¨× × ×§×¤×
+          internet_cafe: ×§×¤× ××× ××¨× ×
           kindergarten: ×× ×××××
           language_school: ×××ª ×¡×¤×¨ ××©×¤××ª
           library: ×¡×¤×¨×××
-          loading_dock: ×¨×¦××£ ×ª×¤×¢×××
+          loading_dock: ×¨×¦××£ ××¢××¡×
           love_hotel: ×××× ××××
           marketplace: ×©××§
-          mobile_money_agent: ×¡××× × ×× ×§×××ª ××¨×××§××
+          mobile_money_agent: ×¡××× ×ª×©××××× ×× ×××
           monastery: ×× ××¨
-          money_transfer: ××¢××¨×ª ××¡×£
+          money_transfer: ××¢××¨×ª ××¡×¤××
           motorcycle_parking: ×× ×××ª ×××¤× ××¢××
           music_school: ×××ª ×¡×¤×¨ ××××××§×
           nightclub: ×××¢××× ××××
           nursing_home: ×××ª ××××ª
           parking: ×× ××
           parking_entrance: ×× ××¡× ××× ××
-          parking_space: ××× ×× ××
+          parking_space: ×¢×××ª ×× ××
           payment_terminal: ××¡××£ ×ª×©×××
           pharmacy: ×××ª ××¨×§××ª
           place_of_worship: ××§×× ×¤××××
@@ -637,10 +671,10 @@ he:
           post_office: ×¡× ××£ ××××¨
           prison: ×××
           pub: ×¤××
-          public_bath: ××§×××ª ×¦××××¨××ª
+          public_bath: ××¨××¥ ×¦××××¨×
           public_bookcase: ×¡×¤×¨××× ××¢××¨×
           public_building: ××× × ×¦××××¨
-          ranger_station: ×ª×× ×ª ××¤×§×××
+          ranger_station: ×ª×× ×ª ×¤×§×××
           recycling: × ×§×××ª ××××××¨
           restaurant: ××¡×¢××
           sanitary_dump_station: ×ª×× ×ª ×¨××§×× ×¤×¡×××ª
@@ -648,7 +682,7 @@ he:
           shelter: ×××¡×
           shower: ××§×××ª
           social_centre: ××¨×× ×××¨×ª×
-          social_facility: ××ª×§× ×××¨×ª×
+          social_facility: ×©××¨××ª×× ×××¨×ª×××
           studio: ×¡×××××
           swimming_pool: ××¨Öµ××ª ×©××××
           taxi: ××× ××ª
@@ -661,69 +695,71 @@ he:
           vehicle_inspection: ××××§×ª ××× ×¨××
           vending_machine: ×××× ×ª ××××¨×
           veterinary: ××¨×¤×× ×××¨×× ×¨××ª
-          village_hall: ×××× ×××¤×¨
+          village_hall: ×××ª ××¢×
           waste_basket: ×¤× ××©×¤×
           waste_disposal: ×××¤×× ××¤×¡×××ª
-          waste_dump_site: ××ª×¨ ××©×××ª ×¤×¡×××ª
+          waste_dump_site: ××ª×¨ ×××¡××£ ×¤×¡×××ª
           watering_place: ×©××§×ª
           water_point: × ×§×××ª ×××
           weighbridge: ×××× × ××©×¨
+          "yes": ×©××¨××ª ××¦××××¨
         boundary:
           aboriginal_lands: ×××××ª ××××¨×××³×× ×××ª
           administrative: ×××× ×©×× ×©××¤××
           census: ×××× ××¤×§× ××××××¡××
           national_park: ×¤××¨×§ ×××××
-          political: ×××× ××××¨× ××××¨×
+          political: ×××× ××××¨ ××××¨×
           protected_area: ××××¨ ××××
           "yes": ××××
         bridge:
           aqueduct: ×××ª ×××
-          boardwalk: ×××¨××
+          boardwalk: ×©××× ×¦×£
           suspension: ××©×¨ ×ª×××
           swing: ××©×¨ ×¡×××
-          viaduct: ××××
+          viaduct: ××©×¨ ×¢×××××
           "yes": ××©×¨
         building:
           apartment: ×××¨×
-          apartments: ××ª×× ×××¨××ª
+          apartments: ×××ª ×××¨××ª
           barn: ××¡×
           bungalow: ××× ×××
           cabin: ××§×ª×
           chapel: ×§×¤××
           church: ×× ××× ×× ×¡×××
-          civic: ×× ××× ×××¨××
+          civic: ×× ××× ×¦××××¨×
           college: ×× ××× ×××××
           commercial: ×× ××× ××¡××¨×
           construction: ×× ××× ××× ×××
           detached: ×××ª ×¤×¨××
           dormitory: ××¢×× ××ª
-          duplex: ×××¨×ª ×××¤××§×¡
+          duplex: ×××ª ×××¤××§×¡
           farm: ×××ª ××××
-          farm_auxiliary: ×××ª ×××× ××× ×ª××©×××
-          garage: ×××¡×
-          garages: ××ª×× ×××¡× ××
+          farm_auxiliary: ×× ××× ×× ××××©× ×××××
+          garage: ×× ××
+          garages: ×× ×××ª
           greenhouse: ××××
           hangar: ×× ×××¨
           hospital: ×××ª ×××××
           hotel: ×× ××× ××××
           house: ×××ª
-          houseboat: ×××ª ×¢× ×¡××¨×
+          houseboat: ×××ª ×¡××¨×
           hut: ×¦×¨××£
           industrial: ×× ××× ×ª×¢×©×××ª×
           kindergarten: ××× × ×× ×××××
+          manufacture: ××× × ×ª×¢×©×××
           office: ×× ××× ××©×¨×××
           public: ×× ××× ×¦××××¨×
           residential: ×× ××× ××××¨××
-          retail: ×× ××× ××¡××¨×
+          retail: ××× × ××¡××¨×
           roof: ××
-          ruins: ×× ××× ××¨××¡
+          ruins: ×××¨××
           school: ×××ª ×¡×¤×¨
           semidetached_house: ××Ö¾××©×¤××ª×
           service: ×× ××× ×©××¨××ª
-          shed: ×××¡×
+          shed: ×¦×¨××£
           stable: ×××¨×××
           static_caravan: ×§×¨××××
-          temple: ×× ××× ××§××©
+          temple: ××§××©
           terrace: ×× ××× ××××¨×
           train_station: ×× ××× ×ª×× ×ª ×¨×××ª
           university: ××× ×××¨×¡×××
@@ -747,8 +783,8 @@ he:
           glaziery: ×××
           handicraft: ×××××ª ××
           hvac: ×ª×× ×× ××××× ×××××¨
-          metal_construction: ×¡×¤×§ ××ª××ª
-          painter: ×¦×××¨
+          metal_construction: ××¨×× ×× ×××
+          painter: ×¦Ö·×Ö¸Ö¼×¢
           photographer: ×¦××
           plumber: ×©×¨××¨×
           roofer: ×××
@@ -763,10 +799,10 @@ he:
           access_point: × ×§×××ª ×××©×
           ambulance_station: ×ª×× ×ª ×××××× ×¡××
           assembly_point: × ×§×××ª ××ª××¡×¤××ª
-          defibrillator: ××¤×¢×
+          defibrillator: ××¤×¢× (××¤×××¨×××××¨)
           fire_xtinguisher: ×××¤×
           fire_water_pond: ××××¨ ××× ×××××× ××©
-          landing_site: ××ª×¨ × ×××ª×ª ×××¨××
+          landing_site: ××ª×¨ × ×××ª× ××××¨××
           life_ring: ×××× ××¦××
           phone: ×××¤×× ×××¨××
           siren: ×¦××¤×¨ ×××¨××
@@ -776,35 +812,35 @@ he:
         highway:
           abandoned: ××××© × ×××©
           bridleway: ×©××× ×¢×××¨ ×¡××¡××
-          bus_guideway: × ×ª×× ×ª××××¨× ×¦××××¨××ª ××× ×××ª
+          bus_guideway: × ×ª×× ×ª××××¨× ×¦××××¨××ª ××××¨××ª
           bus_stop: ×ª×× ×ª ×××××××¡
-          construction: ××××© ××××¨ ××× ×××
+          construction: ××¨× ××× ×××
           corridor: ×¤×¨×××××¨
           cycleway: × ×ª×× ×××¤× ×××
           elevator: ××¢×××ª
-          emergency_access_point: × ×§×××ª ×××©× ××©××¨××ª× ×××¨××
+          emergency_access_point: × ×§×××ª ×¦××× ××××¨××
           emergency_bay: ××¤×¨×¥ ××××××ª
-          footway: ×©××× ×××××× ×¨××
-          ford: ××¢××¨× ×× ××
-          give_way: ×ª××¨××¨ ×ª× ××××ª ×§××××
-          living_street: ×¨××× ××××¨××
+          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: ××¦×××ª ××××¨××ª
@@ -812,66 +848,67 @@ he:
           stop: ×ª××¨××¨ ×¢×¦××¨
           street_lamp: ×¤× ×¡ ×¨×××
           tertiary: ××¨× ×©×××©×× ××ª
-          tertiary_link: ××¨× ×©×××©×× ××ª
-          track: ××¡××× ××¨××¦××
+          tertiary_link: ×××××¨ ×××¨× ×©×××©×× ××ª
+          track: ××¨× ×¢×¤×¨
           traffic_mirror: ××¨×× ×¤× ××¨×××ª
           traffic_signals: ×¨××××¨
           trailhead: ×©×× ×ª××××ª ××¡×××
-          trunk: ××¨× ×¨××©××ª
-          trunk_link: ××¨× ×¨××©××ª
+          trunk: ××¨× ×¢××§×¨××ª
+          trunk_link: ×××××¨ ×××¨× ×¢××§×¨××ª
           turning_loop: ××¢×× ×ª× ××¢×
           unclassified: ××¨× ×× ××¡××××ª
           "yes": ××¨×
         historic:
           aircraft: ××× ×××¡ ×××¡×××¨×
           archaeological_site: ××ª×¨ ××¨×××××××
-          bomb_crater: ×××ª×© ×××¡×××¨× ××¤×¦×¦×
+          bomb_crater: ×××ª×© ××¤×¦×¦× ×××¡×××¨×
           battlefield: ×©×× ×§×¨×
-          boundary_stone: ××× ××××
+          boundary_stone: ××× ×××× ×××¡×××¨××ª
           building: ×× ××× ×××¡×××¨×
-          bunker: ××× ×§×¨
+          bunker: ××× ×§×¨ ×××¡×××¨×
           cannon: ×ª××ª× ×××¡×××¨×
-          castle: ×××¨×
+          castle: ×××¨× ×××¡×××¨××ª
           charcoal_pile: ×¢×¨×××ª ×¤×× ×××¡×××¨××ª
-          church: ×× ×¡×××
-          city_gate: ×©×¢×¨ ××¢××¨
-          citywalls: ×××××ª ××¢××¨
-          fort: ××¢××
+          church: ×× ×¡××× ×××¡×××¨××ª
+          city_gate: ×©×¢×¨ ×¢××¨ ×××¡×××¨×
+          citywalls: ×××××ª ×¢××¨ ×××¡×××¨×××ª
+          fort: ××¦××× ×××¡×××¨××ª
           heritage: ××ª×¨ ×××¨×©×ª
-          house: ×××ª
-          manor: ×××××
-          memorial: ×× ××¨×× ××××¨××
-          milestone: × ×§×××ª ×¦××× ×××¡×××¨××ª
-          mine: ×××¨×
-          mine_shaft: ×¤××¨ ×××¨×
-          monument: ×× ××¨××
+          hollow_way: ××¨× ×©×©×§×¢×
+          house: ×××ª ×××¡×××¨×
+          manor: ××××× ×××¡×××¨××ª
+          memorial: ×× ××¨××ª ××××¨××
+          milestone: ××× ××¨× ×××¡×××¨××ª
+          mine: ×××¨× ×××¡×××¨×
+          mine_shaft: ×¤××¨ ×××¨× ×××¡×××¨×
+          monument: ××ª×¨ ×× ×¦××
           railway: ××¡×××ª ×¨×××ª ×××¡×××¨××ª
           roman_road: ××¨× ×¨××××ª
-          ruins: ××¨××¡××ª
-          stone: ×××
+          ruins: ×××¨××
+          stone: ××× ×××¡×××¨××ª
           tomb: ×§××¨
-          tower: ××××
-          wayside_chapel: ×§×¤×× ××¦× ×××¨×
-          wayside_cross: ×¦×× ××¦× ×××¨×
-          wayside_shrine: ××§××© ××¦× ×××¨×
+          tower: ×××× ×××¡×××¨×
+          wayside_chapel: ×§×¤××ª ××¨××× ×××¡×××¨××ª
+          wayside_cross: ×¦×× ×××¡×××¨× ××¦× ×××¨×
+          wayside_shrine: ××§××© ×××¡×××¨× ××¦× ×××¨×
           wreck: ×¡×¤×× × ××¨××¤×
           "yes": ××ª×¨ ×××¡×××¨×
         junction:
           "yes": ×¦×××ª
         landuse:
-          allotments: ××§×¦××ª ×§×¨×§×¢
+          allotments: ×××§×ª ××× ×
           aquaculture: ××§××××ª ××××ª
-          basin: ×××
+          basin: ××××¨
           brownfield: ××××¨ ×ª×¢×©××× × ×××©
           cemetery: ×××ª ×§××¨××ª
           commercial: ××××¨ ××¡××¨×
-          conservation: ×©×××¨×
+          conservation: ××××¨ ××©××××¨
           construction: ××××¨ ×× ×××
           farm: ××××
           farmland: ×©×× ××§×××
-          farmyard: ××¦×¨ ××××
+          farmyard: ××¦×¨ ××§××××ª
           forest: ××¢×¨
-          garages: ×××¡×××
+          garages: ×××¡× ××
           grass: ××©×
           greenfield: ×©×××× ××¨××§××
           industrial: ××××¨ ×ª×¢×©×××
@@ -879,16 +916,16 @@ he:
           meadow: ×××
           military: ×©×× ×¦×××
           mine: ×××¨×
-          orchard: ×¤×¨××¡
+          orchard: ×××¢
           plant_nursery: ××©×ª××
           quarry: ×××¦××
           railway: ××¡×××ª ××¨××
-          recreation_ground: ×©××× × ××¤×© ××¤× ××
+          recreation_ground: ×©×× × ××¤×© ××¤× ××
           religious: ××ª×× ××ª×
           reservoir: ××××¨
-          reservoir_watershed: ×¤×¨×©×ª ××× ×©× ××××¨
+          reservoir_watershed: ××× × ××§×× ×©× ××××¨
           residential: ××××¨ ××××¨××
-          retail: ×§××¢×× ××
+          retail: ×××××¨ ××¡××¨×
           village_green: ××××¨ ×××¤×¨
           vineyard: ××¨×
           "yes": ×©××××© ××§×¨×§×¢
@@ -897,20 +934,20 @@ he:
           amusement_arcade: ××©××§×××
           bandstand: ××××ª ×ª××××¨×ª
           beach_resort: ××ª×¨ × ××¤×© ××××£ ××
-          bird_hide: ××¦×¤××¨
+          bird_hide: ××¦×¤× ×¦××¤××¨××
           bleachers: ××¨×××× ×
-          bowling_alley: ××¡××× ×××××× ×
+          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: ×©×××¨×ª ×××¢
@@ -930,7 +967,7 @@ he:
           water_park: ×¤××¨×§ ×××
           "yes": × ××¤×©
         man_made:
-          adit: ×× ××¡× ×××¤×§××ª ×××¢×¨×
+          adit: ×¤×ª× ×××¨×
           advertising: ×¤×¨×¡××
           antenna: ×× ×× ×
           avalanche_protection: ××× × ××¤× × ××¤××××ª
@@ -942,23 +979,23 @@ he:
           bunker_silo: ××× ×§×¨
           cairn: ×××¢×
           chimney: ××¨×××
-          clearcut: ××¨××ª× ××××
-          communications_tower: ×¢××× ×ª×§×©××¨×ª
-          crane: ×¢×××¨×
+          clearcut: ×§×¨××ª ××¢×¨
+          communications_tower: ×××× ×ª×§×©××¨×ª
+          crane: ×× ××£
           cross: ×¦××
-          dolphin: ×¢××× ×¨×ª××§×
-          dyke: ××¨××
-          embankment: ×¡××××
+          dolphin: ×¢××× ×¨×ª××§× ×××× ×©×××
+          dyke: ×¡××××ª ××× × ××¤× × ××¦×¤××ª
+          embankment: ×¡×××× ×××¨× ×× ××¡×××
           flagpole: ×ª××¨×
           gasometer: ××××××¨
-          groyne: ×¨×¦××£
-          kiln: ×¤××¨× ×¡
+          groyne: ×××¡×× ××¢×¦××¨×ª ×¡××£
+          kiln: ×××©×
           lighthouse: ××××××¨
-          manhole: ××××ª ×× ××¡×
+          manhole: ×××¡× ×××¨ ×ª×ªÖ¾×§×¨×§×¢×
           mast: ×ª××¨×
           mine: ×××¨×
           mineshaft: ×¤××¨ ×××¨×
-          monitoring_station: ×ª×× ×ª ××¢×§×
+          monitoring_station: ×ª×× ×ª × ××××¨
           petroleum_well: ×××¨ × ×¤×
           pier: ×¨×¦××£
           pipeline: ×§× ×¦×× ××¨××ª
@@ -972,8 +1009,8 @@ he:
           surveillance: ××¢×§×
           telescope: ×××¡×§××¤
           tower: ××××
-          utility_pole: ×¢××× ××©××
-          wastewater_plant: ××¤×¢× ×××××¨ ×××
+          utility_pole: ×¢××× ××©×× ×× ×××¤××
+          wastewater_plant: ××¤×¢× ×××¤×× ××©×¤×××
           watermill: ××× ×ª ×××
           water_tap: ××¨× ×××
           water_tower: ×××× ×××
@@ -986,11 +1023,11 @@ he:
           airfield: ×× ××ª ×¦×××
           barracks: ××××¨× ××××××
           bunker: ××× ×§×¨
-          checkpoint: × ×§×××ª ××§×¨×
+          checkpoint: ××¢××¨ ××××§×
           trench: ×©×××
           "yes": ×¦×××
         mountain_pass:
-          "yes": ××¢××¨ ××¨×¨×
+          "yes": ××¢××¨ ××¨××
         natural:
           bare_rock: ×¡××¢ ××©××£
           bay: ××¤×¨×¥
@@ -999,29 +1036,29 @@ he:
           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: ×××
@@ -1030,51 +1067,51 @@ he:
           valley: ×¢××§
           volcano: ××¨ ××¢×©
           water: ×××
-          wetland: ××××
+          wetland: ×××¦×
           wood: ××¢×¨
-          "yes": ×ª××× × ×××¢××ª
+          "yes": ×××× × ×××¢×
         office:
           accountant: ×¨××× ××©×××
-          administrative: ×Ö´× ××
+          administrative: ×Ö´× Ö°×Ö¸×
           advertising_agency: ×¡××× ××ª ×¤×¨×¡××
           architect: ×××¨×××
           association: ×××××
           company: ×××¨×
           diplomatic: ××©×¨× ×××¤×××××
-          educational_institution: ×××¡× ××× ××
+          educational_institution: ×××¡× ××× ×××
           employment_agency: ×¡××× ××ª ×ª×¢×¡××§×
           energy_supplier: ××©×¨× ×¡×¤×§ ×× ×¨×××
           estate_agent: ××ª××× × ×××´×
-          financial: ××©×¨× ×××××
-          government: ××©×× ×××©××ª××ª
+          financial: ××©×¨× ×¤×× × ×¡×
+          government: ××©×¨× ×××©××ª×
           insurance: ××©×¨× ×××××
-          it: ×××¡× ××× ××
+          it: ××©×¨× ×××©××
           lawyer: ×¢××¨× ×××
           logistics: ××©×¨× ×××××¡×××§×
           newspaper: ××©×¨× ×©× ×¢×ª××
-          ngo: ××©×¨× ×××¡× ×× ×××©××ª×
+          ngo: ××¨××× ××× ×××¨×ª ×¨×××
           notary: × ×××¨×××
           religion: ××©×¨× ××ª
-          research: ××©×¨× ×××§×¨
+          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: ×××§××
@@ -1087,28 +1124,28 @@ he:
           suburb: ×¤×¨×××¨
           town: ×¢×××¨×
           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: ×××¡× ×¨××××ª
@@ -1116,22 +1153,22 @@ he:
           agrarian: ×× ××ª ××× ××
           alcohol: ×× ××ª ×××××××
           antiques: ×¢×ª××§××ª
-          appliance: ×× ××ª ×××¦×¨× ××©××
-          art: ×× ××ª ××¤×¦× ××× ××ª
-          baby_goods: ×× ××ª ××××¦×¨× ×ª×× ××§××ª
-          bag: ×× ××ª ×ª××§××
+          appliance: ×××¦×¨× ××©××
+          art: ××¤×¦× ××× ××ª
+          baby_goods: ×××¦×¨× ×ª×× ××§××ª
+          bag: ×ª××§××
           bakery: ×××¤×××
           bathroom_furnishing: ×¦××× ××××¨× ××§×××ª
           beauty: ×¡××× ×××¤×
-          bed: ×× ××ª ××× ××××
+          bed: ×××¨× ×©×× ×
           beverages: ×× ××ª ××©×§×××ª
           bicycle: ×× ××ª ××¤× ×××
-          bookmaker: ×¡××× ×××××¨××
+          bookmaker: ×¡××× ××ª ×××××¨××
           books: ×× ××ª ×¡×¤×¨××
           boutique: ×××××§
           butcher: ×§×¦×
-          car: ×× ××ª ××× ×¨××
-          car_parts: ×××§× ×¨××
+          car: ×¡××× ××ª ××× ×¨××
+          car_parts: ×××§× ×××××£ ××¨××
           car_repair: ×××¡×
           carpet: ×× ××ª ×©×××××
           charity: ×× ××ª ×¦××§×
@@ -1143,9 +1180,9 @@ he:
           computer: ×× ××ª ×××©×××
           confectionery: ×§×× ×××××¨××
           convenience: ×××××ª
-          copyshop: ×× ××ª ×¦××××
+          copyshop: ×¦×××× ××¡××××
           cosmetics: ×× ××ª ×§××¡××××§×
-          craft: ×× ××ª ×××¦×¨× ×××××ª ××
+          craft: ×× ××ª ×××××ª ××
           curtain: ×× ××ª ××××× ××ª
           dairy: ×× ××ª ×××¦×¨× ×××
           deli: ××¢×× ×××
@@ -1162,13 +1199,13 @@ he:
           fashion: ×× ××ª ×××¤× ×
           fishing: ×× ××ª ×¦××× ×××
           florist: ×× ××ª ×¤×¨×××
-          food: ×××××ª
-          frame: ×× ××ª ××¡××¨××ª
+          food: ×× ××ª ××××
+          frame: ×× ××ª ××¡×××¨
           funeral_directors: ×××ª ××××××ª
           furniture: ×¨×××××
           garden_centre: ××¨×× ××× ××
           gas: ×× ××ª ××
-          general: ×××××ª
+          general: ××-××
           gift: ×× ××ª ××ª× ××ª
           greengrocer: ××¨×§×
           grocery: ×××××ª
@@ -1183,28 +1220,28 @@ he:
           interior_decoration: ×¢××¦×× ×¤× ××
           jewelry: ×× ××ª ×ª××©××××
           kiosk: ×§×××¡×§
-          kitchen: ×× ××ª ××× ××××
+          kitchen: ×× ××ª ××××××
           laundry: ××××¡×
           locksmith: ×× ×¢×××
-          lottery: ×××¨××
+          lottery: ××××¨ ×××¨×××ª
           mall: ××¨×× ×§× ×××ª
           massage: ×¢××¡××
           medical_supply: ×× ××ª ×¦××× ×¨×¤×××
           mobile_phone: ×× ××ª ×××¤×× ×× × ×××××
           money_lender: ××××××ª ××¡×¤××
           motorcycle: ×× ××ª ×××¤× ××¢××
-          motorcycle_repair: ×× ××ª ××ª××§×× ×××¤× ××¢××
-          music: ×× ××ª ××× × ××× ×
+          motorcycle_repair: ×××¡× ×××¤× ××¢××
+          music: ×× ××ª ×××××§×
           musical_instrument: ××× × ××× ×
-          newsagent: ×¡××× ××ª ×××©××ª
+          newsagent: ×××× ×¢××ª×× ××
           nutrition_supplements: ×ª××¡×¤× ×ª××× ×
           optician: ×××¤×××§××
-          organic: ×× ××ª ×××× ×××¨×× ×
-          outdoor: ×× ××ª ×¦××× ××× ×××ª
-          paint: ×× ××ª ×¦××¢
-          pastry: ×× ××ª ×××¤××
+          organic: ×××× ×××¨×× ×
+          outdoor: ×¦××× ××× ×××ª
+          paint: ×× ××ª ×¦××¢××
+          pastry: ×××ª ×××¤×
           pawnbroker: ×Ö·×©××Ö¼×Ö¹× Ö·××
-          perfumery: ×× ××ª ××©×××
+          perfumery: ×¤×¨×¤××¨××¨××
           pet: ×× ××ª ××××ª ××××
           pet_grooming: ×××¤×× ×××××ª ××××
           photo: ×× ××ª ×¦××××
@@ -1217,7 +1254,7 @@ he:
           storage_rental: ××©××¨×ª ×××¡× ××
           supermarket: ×¡××¤×¨××¨×§×
           tailor: ××××
-          tattoo: ×× ××ª ×§×¢×§××¢××
+          tattoo: ×§×¢×§××¢××
           tea: ×× ××ª ×ª×
           ticket: ×× ××ª ××¨×××¡××
           tobacco: ×× ××ª ×××§
@@ -1225,38 +1262,38 @@ he:
           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_pitch: ×× ××× ××××
-          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: × ×ª×× ××× ××××××ª×
@@ -1266,30 +1303,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: ×¢×××¨××ª
@@ -1300,9 +1335,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: ×××¤××©
@@ -1446,16 +1481,22 @@ 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}
+      footer_html: ××¤×©×¨ ×× ××§×¨×× ××ª ××ª×××× ×××ª×××ª %{readurl} ×××××× ×××ª×××ª %{commenturl}
+        ×× ××©××× ××××¢× ×××××¨ ×××ª×××ª %{replyurl}
     message_notification:
+      subject: '[OpenStreetMap] %{message_title}'
       hi: ×©××× %{to_user},
       header: '××ª×××ª× ×Ö¾OpenStreetMap ××××¢× ××××¢× ×××ª %{from_user} ×¢× ×× ××©× %{subject}:'
+      header_html: '%{from_user} ×©×× ×× ××××¢× ××¨× OpenStreetMap ×¢× ×× ××©× %{subject}:'
+      footer: × ××ª× ×× ××§×¨×× ××ª ×××××¢× ×××ª×××ª %{readurl} ×××©××× ××××¢× ××©××× ××¨× %{replyurl}
       footer_html: × ××ª× ×× ××§×¨×× ××ª ×××××¢× ×××ª×××ª %{readurl} ×××©××× ××××¢× ××××¦×¨ ××¨×
         %{replyurl}
     friendship_notification:
@@ -1463,25 +1504,28 @@ he:
       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:
-          one: × ××¢× ××¨××× ×¢× %{trace_points} ××ª×× × ×§××× ×××ª ××¤×©×¨××ª.
-          two: × ××¢× ××¨××× ×¢× %{trace_points} ××ª×× %{possible_points} × ×§××××ª ××¤×©×¨×××ª.
-          many: × ××¢× ××¨××× ×¢× %{trace_points} ××ª×× %{possible_points} × ×§××××ª ××¤×©×¨×××ª.
-          other: × ××¢× ××¨××× ×¢× %{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: ××××!
@@ -1491,28 +1535,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: ×©×××,
@@ -1522,21 +1554,31 @@ 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_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_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: ×©×××,
@@ -1547,13 +1589,21 @@ he:
           ×©××ª×¢× ××× ×ª ×××'
         your_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: ×ª×××ª ××××¨ × ×× ×¡
@@ -1624,6 +1674,24 @@ 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: ×××
@@ -1812,16 +1880,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, ×××× ×××× ×××
         ×¢×××¨ ×ª××× × ××.
@@ -1927,6 +1985,13 @@ he:
         url: https://wiki.openstreetmap.org/
         title: ×××××§× ×©× OpenStreetMap
         description: ××¢××× ×××××§× ××ª××¢×× ××¢×××§ ×¢× OpenStreetMap.
+    potlatch:
+      removed: ×¢××¨× ×OpenStreetMap ××¨××¨×ª ××××× ×©×× ×××××¨ ×Potlatch. ×××× ×©× ×× ××¤×××©
+        ×©× ××××× ×××¨ ×× × ×ª××, Potlatch ×××¨ ×× ×××× ×××¤××¤×.
+      desktop_html: × ××ª× ×¢×××× ×××©×ª××© ×Potlatch ×¢× ××× <a href="https://www.systemed.net/potlatch/">×××¨××ª
+        ×××©×× ×©×××× ××¢×××× ×-Windows ×× ×-Mac</a>.
+      id_html: ×××××¤××, × ××ª× ××××××¨ ××ª ×¢××¨× ××¨××¨×ª ××××× ×-iD, ×©×¤××¢× ×××¤××¤× ×©×× ××¤×
+        ×©Potlatch ×¤×¢× ××¢××¨. <a href="%{settings_url}">×©×× ×× ××××¨××ª ×××©×ª××© ×××</a>.
     sidebar:
       search_results: ×ª××¦×××ª ××××¤××©
       close: ××¡×××¨×
@@ -1949,13 +2014,13 @@ he:
           primary: ××××© ×¨××©×
           secondary: ××××© ××©× ×
           unclassified: ××¨× ×× ××¡××××ª
-          track: ××¡××× ××¨××¦××
+          track: ××¡×××
           bridleway: ××¡××× ××¨××××ª ×¡××¡××
           cycleway: ××¨× ××××¤× ×××
           cycleway_national: ××¡××× ×××¤× ××× ×××××
           cycleway_regional: ××¡××× ×××¤× ××× ××××¨×
           cycleway_local: ××¡××× ×××¤× ××× ××§×××
-          footway: ××¨× ×××××× ×¨××
+          footway: ×©××× ×××××× ×¨××
           rail: ××¡×××ª ××¨××
           subway: ×¨×××ª ×ª××ª××ª
           tram:
@@ -2045,9 +2110,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: ×××§××!
@@ -2145,9 +2211,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'>××£
@@ -2319,8 +2385,8 @@ he:
       notice email cannot find: ×¡××××, ×××ª×××ª ××××ª ×× × ××¦××.
     reset_password:
       title: ×××¤××¡ ×¡××¡××
-      heading: ×××¤××¡ ××¡×¡×× ×¢×××¨ %{user}
-      reset: ×××¤××¡ ××¡×¡××
+      heading: ×××¤××¡ ××¡××¡×× ×¢×××¨ %{user}
+      reset: ×××¤××¡ ××¡××¡××
       flash changed: ×¡××¡××ª× ×©×× ×ª×.
       flash token bad: ×× ××¦×× × ××ª ×××¡×××× ××××, ×××× ××××§×ª ×××ª×××ª ×ª×¢×××¨?
     new:
@@ -2334,18 +2400,12 @@ 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"
-        title="OSMF privacy policy including section on email addresses">×××× ×××ª ×¤×¨××××ª</a>
       display name: '×©× ×××¦××:'
       display name description: ×©× ×××©×ª××© ×©××, ×©×××¦× ××¤××××. ××¤×©×¨ ××©× ××ª ××ª ×× ×××¢××¤××ª
         ×©××.
       external auth: '×××××ª ×¢× ×¦× ×©×××©×:'
-      password: '×¡××¡××:'
-      confirm password: '×××××ª ×¡××¡××:'
       use external auth: '×××××¤××, ××©×ª××©× ××¦× ×©×××©× ××× ××××× ×¡:'
       auth no password: ×¢× ×××××ª ×¦× ×©×××©× ××× ×¦××¨× ××¡××¡××, ××× ×××× × ××¡×¤×× ×× ×©×¨×ª
         ×××××× ×××××§×§ ××××.
@@ -2457,15 +2517,13 @@ he:
     account:
       title: ×¢×¨×××ª ××©×××
       my settings: ×××××¨××ª ×©××
-      current email address: '××ª×××ª ××××´× × ×××××ª:'
-      new email address: '××ª×××ª ××××´× ×××©×:'
-      email never displayed publicly: (××¢××× ×× ×××¦××ª ××¤××××)
-      external auth: '×××××ª ×××¦×× ×:'
+      current email address: ××ª×××ª ××××´× × ×××××ª
+      external auth: ×××××ª ×××¦×× ×
       openid:
         link: https://wiki.openstreetmap.org/wiki/OpenID
         link text: ×× ××?
       public editing:
-        heading: '×¢×¨××× ×¦××××¨××ª:'
+        heading: ×¢×¨××× ×¦××××¨××ª
         enabled: ×××¤×¢××ª. ×× ××××× × ××××× ××¢×¨×× ××××¢.
         enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: ×× ××?
@@ -2481,7 +2539,7 @@ he:
           ×¦××××¨×.</li><li>×× × ××ª× ×××¤×× ××ª ××¤×¢××× ××××ª ××× ×××©×ª××©×× ××××©×× ×××× ××¢×ª×
           ×¦××××¨××× ××¤× ××¨××¨×ª ×××××.</li></ul>
       contributor terms:
-        heading: '×ª× ×× ×ª×¨×××:'
+        heading: ×ª× ×× ×ª×¨×××
         agreed: ××¡×××ª ××ª× ×× ××ª×¨××× ××××©××.
         not yet agreed: ×¢×××× ×× ××¡×××ª ××ª× ×× ××ª×¨××× ××××©××.
         review link text: × × ××¢×××¨ ××§××©××¨ ××× ×××× × ××¤× ×× ××× ××¡×§××¨ ×××§×× ××ª ×ª× ××
@@ -2489,14 +2547,11 @@ he:
         agreed_with_pd: ××¦××¨×ª ×× ×©××××× ×ª× ××¢×¨××××ª ×©×× ×××× ×× ×××ª ××××.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: ×× ××?
-      profile description: '×ª××××¨ ×¤×¨××¤××:'
-      preferred languages: '×©×¤××ª ×××¢××¤××ª:'
-      preferred editor: '×¢××¨× ×××¢××£:'
-      image: '×ª××× ×:'
+      image: ×ª××× ×
       gravatar:
         gravatar: ×××©×ª××© ×Ö¾Gravatar
         link: http://wiki.openstreetmap.org/wiki/Gravatar
-        link text: ×× ××?
+        what_is_gravatar: ×× ×× Gravatar?
         disabled: ×××¨×××××¨ ××××.
         enabled: ××¦××ª ×××¨×××××¨ ×©×× ×××¤×¢××.
       new image: ×××¡×¤×ª ×ª××× ×
@@ -2504,10 +2559,8 @@ he:
       delete image: ×××¡×¨×ª ××ª××× × ×× ×××××ª
       replace image: ×××××¤×ª ××ª××× × ×× ×××××ª
       image size hint: (×ª××× × ××¨×××¢×ª ××××× 100x100 ××¤×××ª ×¢××××ª ××× ×××)
-      home location: '×××§×× ×¨××©×:'
+      home location: ×××§×× ×¨××©×
       no home location: ×× ××× ×ª ××ª ×××§××× ××¨××©×.
-      latitude: '×§× ×¨×××:'
-      longitude: '×§× ×××¨×:'
       update home location on click: ×¢×××× ××××§×× ××¨××©× ×©×× ××¢×ª ××××¦× ×¢× ×××¤×?
       save changes button: ×©×××¨×ª ××©×× ××××
       make edits public button: ×××¤×× ××ª ×× ×¢×¨××××ª×× ××¦××××¨×××ª
@@ -2528,10 +2581,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: ×××©××¨ ×©×× ×× ××ª×××ª ×××××´×
@@ -2611,24 +2664,16 @@ he:
     new:
       title: ××¦××¨×ª ××¡××× ×©× %{name}
       heading_html: ××¦××¨×ª ××¡××× ×©× %{name}
-      reason: ××¡××× ×©×××× × ×××©××× %{name} × ××¡×. × × ×××ª×× ××©×× ××××× × ××¨×××¢ ×××ª×ª ×××
-        ×©×××ª×¨ ×¤×¨××× ×¢× ×××¦×. × × ×××××¨ ×©×× ×× ×××©×ª××©×× ×××× ×× ××ª ××¢×× ×××§×¦××¢××ª ×©× ××§××××
-        ××××©×ª×× ×××©×ª××© ×××××× ××¨××¨××ª ××××.
       period: ×××©× ××× ××× ××¢××©×× ×××©××× ××××¡× ××××¦××¢ ×¤×¢××××ª API.
       tried_contacting: ××¦×¨×ª× ×§×©×¨ ×¢× ×××©×ª××© ××××§×©×ª× ×××¤×¡××§.
       tried_waiting: × ×ª×ª× ×××©×ª××© ××× ×¡×××¨ ×××©×× ×¢× ×××××¢××ª ××××.
-      needs_view: ×××©×ª××© ×¦×¨×× ××××× ×¡ ××¤× × ×©×××¡××× ××××ª ×ª× ××§×.
       back: ××¦××ª ×× ×××¡××××ª
     edit:
       title: ××¡×××ª ×¢×¨××× ×¢× %{name}
       heading_html: ××¡×××ª ×¢×¨××× ×¢× %{name}
-      reason: ××¡××× ×©×××× × ×××©××× %{name} × ××¡×. × × ×××ª×× ××©×× ×××× ×× ××¨×××¢ ×××ª×ª ×××
-        ×©×××ª×¨ ×¤×¨××× ×¢× ×××¦×. × × ×××××¨ ×©×× ×× ×××©×ª××©×× ×××× ×× ××ª ××¢×× ×××§×¦××¢××ª ×©× ××§××××
-        ×××©×ª×× ×××©×ª××© ×××××× ××¨××¨××ª ××××.
       period: ×××©× ××× ××× ××¢××©×× ×××©××× ××××¡× ××××¦××¢ ×¤×¢××××ª API.
       show: ××¦××ª ×××¡××× ××××ª
       back: ××¦××ª ×× ×××¡××××ª
-      needs_view: ××× ×××©×ª××© ×¦×¨×× ××××× ×¡ ××¤× × ×©×××¡××× ××××ª ×ª× ××§×?
     filter:
       block_expired: ×××ª×× ×©×××¡××× ×××¨ ×¤×§×¢× ×××Ö¾××¤×©×¨ ××¢×¨×× ×××ª×.
       block_period: ×ª×§××¤×ª ×××¡××× ×¦×¨××× ×××××ª ××× ××¢×¨××× ×©××¤×©×¨ ×××××¨ ××¨×©××× ×× ×¤×ª××ª.
@@ -2652,10 +2697,10 @@ 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: ×©×¢× ×××ª
@@ -2739,7 +2784,7 @@ he:
       custom_dimensions: ××××¨×ª ××××× ×××ª××× ×××©××ª
       format: '×ª×¡×××¨:'
       scale: '×§× × ××××:'
-      image_size: ××ª××× × ×ª×¦×× ×©××× ×¨×××× ×ª××ª
+      image_dimensions: ××ª××× × ×ª××¤××¢ ××××§ ×××©××× ××¨×××× ××××× %{width} x %{height}
       download: ×××¨××
       short_url: ××ª×××ª ×§×¦×¨×
       include_marker: ××××× ×¡××
@@ -2771,6 +2816,7 @@ he:
           other: ×××¨××§ ×©×× ××× ××××× ×©× %{count} ×¨××××× ×× ×§××× ××
       base:
         standard: ×ª×§× ×
+        cyclosm: CyclOSM
         cycle_map: ××¤×ª ×××¤× ×××
         transport_map: ××¤×ª ×ª××××¨×
         hot: ×××× ×××¨×
@@ -2785,6 +2831,8 @@ 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>
+      cyclosm: ×××¨×××× ×¡××× × × ×¢× ××× <a href='%{cyclosm_url}' target='_blank'>CyclOSM</a>
+        ××××¨×× ×©×¨×ª <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap France</a>
       thunderforest: ×××¨×××× ×××××××ª <a href='%{thunderforest_url}' target='_blank'>×× ××
         ×××</a>
       opnvkarte: ×××¨×××× ×××××××ª <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>
@@ -2910,7 +2958,7 @@ he:
           tenth: ×¢×©××¨××ª
       time: ×××
     query:
-      node: ×¦×××ª
+      node: × ×§×××
       way: ××¨×
       relation: ×××¡
       nothing_found: ×× × ××¦×× ××©××××ª
@@ -2925,34 +2973,32 @@ he:
       centre_map: ×××¨×× ××ª ×××¤× ×××
   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: ××© ×¨××× ××¡××£