X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a7092491b069de43bb8d8c30d3526e7095c5cc98..aaae55ffdab5297acdd77b733e543920cd6411b2:/config/locales/he.yml?ds=sidebyside

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 0185b07e8..4d3e82756 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -25,6 +25,8 @@
 # Author: YaronSh
 # Author: Yona b
 # Author: Ypnypn
+# Author: ××××¨ ××
+# Author: ××©×¨×× ×§××¨
 # Author: × ×× ×¡
 # Author: ×ª×××¨ ×
 ---
@@ -34,7 +36,10 @@ he:
   time:
     formats:
       friendly: '%e ×%B %Y ××©×¢× %H:%M'
+      blog: '%e ×%B %Y'
   helpers:
+    file:
+      prompt: ××××¨×ª ×§×××¥
     submit:
       diary_comment:
         create: ×©×××¨×
@@ -47,7 +52,7 @@ he:
         create: ×©××××
       client_application:
         create: ×¨××©××
-        update: ×¢×¨×××
+        update: ×¢××××
       redaction:
         create: ××¦××¨×ª ×××ª××
         update: ×©×××¨×ª ×××ª××
@@ -70,22 +75,24 @@ he:
       diary_comment: ×ª×××× ×××××
       diary_entry: ×¨×©××× ×××××
       friend: ×××¨
+      issue: ×¡××××
       language: ×©×¤×
       message: ××××¢×
-      node: ×¦×××ª
-      node_tag: ×ª× ×¦×××ª
+      node: × ×§×××
+      node_tag: ×ª× ××¤×¨×§
       notifier: ×××××¢
-      old_node: ×¦×××ª ××©×
-      old_node_tag: ×ª× ×¦×××ª ××©×
+      old_node: × ×§××× ××©× ×
+      old_node_tag: ×ª× ××¤×¨×§ ××©×
       old_relation: ×××¡ ××©×
       old_relation_member: ××××¨ ×××¡ ××©×
       old_relation_tag: ×ª× ×××¡ ××©×
       old_way: ××¨× ××©× ×
-      old_way_node: ×¦×××ª ××¨× ××©× ×
+      old_way_node: × ×§×××ª ××¨× ××©× ×
       old_way_tag: ×ª× ××¨× ××©× ×
       relation: ×××¡
       relation_member: ××××¨ ×××¡
       relation_tag: ×ª× ×××¡
+      report: ×××××
       session: ×©××
       trace: ××¡×××
       tracepoint: × ×§×××ª ××¡×××
@@ -94,9 +101,21 @@ he:
       user_preference: ××¢××¤×ª ×××©×ª××©
       user_token: ××¡×××× ××©×ª××©
       way: ××¨×
-      way_node: ×¦×××ª ××¨×
+      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:
@@ -111,17 +130,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: ×¤×¢××
@@ -129,12 +154,17 @@ 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: ××¤× × ××¢×¨× ××××©×××
@@ -192,17 +222,26 @@ he:
     remote:
       name: ×©×××× ××¨×××§
       description: ×©×××× ××¨×××§ (JOSM ×× Merkaartor)
+  auth:
+    providers:
+      none: ×××
+      openid: OpenID
+      google: ××××
+      facebook: ×¤×××¡×××§
+      windowslive: Windows Live
+      github: GitHub
+      wikipedia: ×××§××¤×××
   api:
     notes:
       comment:
-        opened_at_html: × ××¦×¨× ×{{GRAMMAR|×ª×××××ª|%{when}$1}}
-        opened_at_by_html: × ××¦×¨× ×{{GRAMMAR|×ª×××××ª|%{when}$1}} ×¢×Ö¾××× %{user}
-        commented_at_html: ×¢×××× × ×{{GRAMMAR|×ª×××××ª|%{when}}}
-        commented_at_by_html: ×¢×××× × ×{{GRAMMAR|×ª×××××ª|%{when}$1}} ×¢×Ö¾××× %{user}
-        closed_at_html: × ×¤×ª×¨× ×{{GRAMMAR|×ª×××××ª|%{when}$1}}
-        closed_at_by_html: × ×¤×ª×¨× ×{{GRAMMAR|×ª×××××ª|%{when}}} ×¢×Ö¾××× %{user}
-        reopened_at_html: ×××¤×¢×× ××××© ×{{GRAMMAR|×ª×××××ª|%{when}}}
-        reopened_at_by_html: ×××¤×¢×× ××××© {{GRAMMAR|×ª×××××ª|%{when}}} ×¢×Ö¾××× %{user}
+        opened_at_html: × ××¦×¨× %{when}
+        opened_at_by_html: × ××¦×¨× %{when} ×¢×Ö¾××× %{user}
+        commented_at_html: ×¢×××× × %{when}
+        commented_at_by_html: ×¢×××× × %{when} ×¢×Ö¾××× %{user}
+        closed_at_html: × ×¤×ª×¨× %{when}
+        closed_at_by_html: × ×¤×ª×¨× %{when} ×¢×Ö¾××× %{user}
+        reopened_at_html: ×××¤×¢×× ××××© %{when}
+        reopened_at_by_html: ×××¤×¢×× ××××© %{when} ×¢×Ö¾××× %{user}
       rss:
         title: ××¢×¨××ª ×©× OpenStreetMap
         description_area: ×¨×©×××ª ××¢×¨××ª ×©×××¡×¤×, ×©××ª×§××× ×¢×××× ××¢×¨××ª ××©× ××××¨× ×××××¨ ×©××
@@ -218,21 +257,27 @@ he:
   browse:
     created: × ××¦×¨×
     closed: × ×¡××¨×
-    created_html: × ××¦×¨× ×{{GRAMMAR|×ª×××××ª|<abbr title='%{title}'>%{time}</abbr>}}
-    closed_html: × ×¡××¨× ×{{GRAMMAR|×ª×××××ª|<abbr title='%{title}'>%{time}</abbr>}}
-    created_by_html: × ××¦×¨× ×{{GRAMMAR|×ª×××××ª|<abbr title='%{title}'>%{time}</abbr>}}
-      ×¢×Ö¾××× %{user}
-    deleted_by_html: × ×××§× ×{{GRAMMAR|×ª×××××ª|<abbr title='%{title}'>%{time}</abbr>}}
-      ×¢×Ö¾××× %{user}
-    edited_by_html: × ×¢×¨×× ×{{GRAMMAR|×ª×××××ª|<abbr title='%{title}'>%{time}</abbr>}}
-      ×¢×Ö¾××× %{user}
-    closed_by_html: × ×¡××¨× ×{{GRAMMAR|×ª×××××ª|<abbr title='%{title}'>%{time}</abbr>}}
-      ×¢×Ö¾××× %{user}
+    created_html: × ××¦×¨× <abbr title='%{title}'>%{time}</abbr>
+    closed_html: × ×¡××¨× <abbr title='%{title}'>%{time}</abbr>
+    created_by_html: × ××¦×¨× <abbr title='%{title}'>%{time}</abbr> ×¢×Ö¾××× %{user}
+    deleted_by_html: × ×××§× <abbr title='%{title}'>%{time}</abbr> ×¢×Ö¾××× %{user}
+    edited_by_html: × ×¢×¨×× <abbr title='%{title}'>%{time}</abbr> ×¢×Ö¾××× %{user}
+    closed_by_html: × ×¡××¨× <abbr title='%{title}'>%{time}</abbr> ×¢×Ö¾××× %{user}
     version: ××¨×¡×
     in_changeset: ×¢×¨××ª ×©×× ××××
     anonymous: ××××× ×
     no_comment: (××× ××¢×¨××ª)
     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: ××¦××ª ×¤×¨×××
@@ -240,15 +285,15 @@ he:
     changeset:
       title: '×¢×¨××ª ×©×× ××××: %{id}'
       belongs_to: ×××¦×¨
-      node: ×¦××ª×× (%{count})
-      node_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>
+      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:
@@ -258,41 +303,53 @@ he:
       discussion: ××××
       still_open: ×¢×¨××ª ××©×× ×××× ×¢×××× ×¤×ª××× â ××××× ×××¤×ª× ×××¨× ×©×¢×¨××ª ××©×× ××× ×ª××¡××¨.
     node:
-      title: '×¦×××ª: %{name}'
-      history_title: '×××¡×××¨×××ª ××¦×××ª: %{name}'
+      title_html: '× ×§×××: %{name}'
+      history_title_html: '×××¡×××¨×××ª ××¦×××ª: %{name}'
     way:
-      title: '××¨×: %{name}'
-      history_title: '×××¡×××¨×××ª ×××¨×: %{name}'
-      nodes: ×¦××ª××
-      also_part_of:
+      title_html: '××¨×: %{name}'
+      history_title_html: '×××¡×××¨×××ª ×××¨×: %{name}'
+      nodes: × ×§××××ª
+      nodes_count:
+        one: × ×§××× ×××ª
+        two: ×©×ª× × ×§××××ª
+        many: '%{count} × ×§××××ª'
+        other: '%{count} × ×§××××ª'
+      also_part_of_html:
         one: ×××§ ×××¨× %{related_ways}
         other: ×××§ ××××¨××× %{related_ways}
     relation:
-      title: '×××¡: %{name}'
-      history_title: '×××¡×××¨×××ª ××××¡: %{name}'
+      title_html: '×××¡: %{name}'
+      history_title_html: '×××¡×××¨×××ª ××××¡: %{name}'
       members: ×××¨××
+      members_count:
+        one: ×××¨ ×××
+        two: ×©× × ×××¨××
+        many: '%{count} ×××¨××'
+        other: '%{count} ×××¨××'
     relation_member:
-      entry_role: '%{type} %{name} ××ª××¨ %{role}'
+      entry_role_html: '%{type} %{name} ××ª××¨ %{role}'
       type:
-        node: ×¦×××ª
+        node: × ×§×××
         way: ××¨×
         relation: ×××¡
     containing_relation:
-      entry: ×××¡ %{relation_name}
-      entry_role: ×××¡ %{relation_name} (××ª××¨ %{relation_role})
+      entry_html: ×××¡ %{relation_name}
+      entry_role_html: ×××¡ %{relation_name} (××ª××¨ %{relation_role})
     not_found:
+      title: ×× × ××¦×
       sorry: ×× × ××ª× ×¦×××, ×× ××¡×× %{type} ××¢× ××××× %{id} ×× × ××¦×.
       type:
-        node: ×¦×××ª
+        node: × ×§×××
         way: ××¨×
         relation: ×××¡
         changeset: ×¢×¨××ª ×©×× ××××
         note: ××¢×¨×
     timeout:
+      title: ×©××××ª ××× ×××§×¦×
       sorry: ×× × ××ª× ×¦×××, ×× ××¢×× ×ª ××ª××× ×¢×××¨ ×%{type} ×¢× ××××× %{id}, ××¨×× ××× ×¨×
         ×××.
       type:
-        node: ×¦×××ª
+        node: × ×§×××
         way: ××¨×
         relation: ×§×©×¨
         changeset: ×¢×¨××ª ×©×× ××××
@@ -302,7 +359,7 @@ he:
       message_html: '×× × ××ª× ×××¦×× ××ª ×××¨×¡× %{version} ×©× %{type} ×××××× ×©××× × ××ª××.
         ×××××¢ × ××¡×£: %{redaction_link}.'
       type:
-        node: ×¦×××ª
+        node: × ×§×××
         way: ××¨×
         relation: ×××¡
     start_rjs:
@@ -317,7 +374,9 @@ he:
         tag: ×¢××× ××ª××××¨ ×¢×××¨ ××ª× %{key}=%{value}
       wikidata_link: ×¤×¨×× %{page} ×××××§×× ×ª×× ××
       wikipedia_link: ××¢×¨× %{page} ×××××§××¤×××
+      wikimedia_commons_link: ××¤×¨×× %{page} ×××××§××©××ª××£
       telephone_link: ×××ª×§×©×¨ ×××¡×¤×¨ %{phone_number}
+      colour_preview: ×ª×¦××× ××§×××× ×©× ××¦××¢ %{colour_value}
     note:
       title: '××¢×¨×: %{id}'
       new_note: ××¢×¨× ×××©×
@@ -325,15 +384,15 @@ he:
       open_title: ××¢×¨× ×©×× × ×¤×ª×¨× ××¡×³ %{note_name}
       closed_title: ××¢×¨× ×¤×ª××¨× ××¡×³ %{note_name}
       hidden_title: ××¢×¨× ×××¡×ª×¨×ª ××¡×³ %{note_name}
-      open_by: × ××¦×¨× ×¢×Ö¾××× %{user} ×{{GRAMMAR|×ª×××××ª|<abbr title='%{exact_time}'>%{when}</abbr>}}
-      open_by_anonymous: × ××¦×¨× ×¢×Ö¾××× ××××× × ×{{GRAMMAR|×ª×××××ª|<abbr title='%{exact_time}'>%{when}</abbr>}}
-      commented_by: ××¢×¨× ×{{GRAMMAR|×ª×××××ª|%{user}}} ×{{GRAMMAR|×ª×××××ª|<abbr title='%{exact_time}'>%{when}</abbr>}}
-      commented_by_anonymous: ××¢×¨× ×××××× × ×{{GRAMMAR|×ª×××××ª|<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: ×©××××ª×ª ××©××××ª
@@ -372,7 +431,7 @@ he:
   changeset_comments:
     comment:
       comment: ××¢×¨× ×××©× ×¢× ×¢×¨××ª ×©×× ×××× ××¡×³ %{changeset_id} ×××ª %{author}
-      commented_at_by_html: ×¢×××× × ×{{GRAMMAR|×ª×××××ª|%{when}}} ×¢×Ö¾××× %{user}
+      commented_at_by_html: ×¢×××× × %{when} ×¢×Ö¾××× %{user}
     comments:
       comment: ××¢×¨× ×××©× ××¢×¨××ª ×©×× ×××× ××¡×³ %{changeset_id} ×××ª %{author}
     index:
@@ -400,6 +459,7 @@ he:
       in_language_title: ×¨×©××××ª ×××× ×%{language}
       new: ×¨×©×××ª ×××× ×××©×
       new_title: ××ª×××ª ×¨×©××× ×××©× ××××× ×××©×ª××© ×©××
+      my_diary: ×××× ×©××
       no_entries: ××× ×¨×©××××ª ××××
       recent_entries: ×¨×©××××ª ×××× ×××¨×× ××ª
       older_entries: ×¨×©××××ª ××©× ××ª ×××ª×¨
@@ -411,7 +471,7 @@ he:
       title: ××××× ×©×%{user} &rlm; | %{title}
       user_title: ××××× ×©× %{user}
       leave_a_comment: ×××¡×¤×ª ×ª××××
-      login_to_leave_a_comment: × × %{login_link} ××× ×××©×××¨ ×ª××××
+      login_to_leave_a_comment_html: × × %{login_link} ××× ×××©×××¨ ×ª××××
       login: ××××× ×¡
     no_such_entry:
       title: ××× ×¨×©××× ××××ª ×××××
@@ -419,9 +479,9 @@ he:
       body: ×¢×××× ××× ×¨×©×××ª ×××× ×× ×ª×××× ×¢× ××××× %{id}. ×××× ×××××ª ×× × ××× ×××××
         ×××¦×ª ×¢× ×§××©××¨ ×©×××, ×¢×× ××¡××××.
     diary_entry:
-      posted_by: ×¤××¨×¡× ×¢×Ö¾××× %{link_user} ×Ö¾%{created} ×%{language_link}
+      posted_by_html: ×¤××¨×¡× ×¢×Ö¾××× %{link_user} ×Ö¾%{created} ×%{language_link}
       comment_link: ××¢×¨××ª ××¨×©××× ××××ª
-      reply_link: ×ª×××× ××¨×©××× ××××ª
+      reply_link: ×©××××ª ×ª×××× ×××××¨
       comment_count:
         zero: ××× ×ª×××××ª
         one: ×ª×××× ×××ª
@@ -432,7 +492,7 @@ he:
       confirm: ×××©××¨
       report: ××××× ×¢× ××¨×©××× ××××ª
     diary_comment:
-      comment_from: ×ª×××× ×××ª %{link_user} ×¢× %{comment_created_at}
+      comment_from_html: ×ª×××× ×××ª %{link_user} ×¢× %{comment_created_at}
       hide_link: ××¡×ª×¨×ª ××¢×¨× ××
       unhide_link: ××××× ××¡×ª×¨×ª ××¢×¨× ××
       confirm: ×××©××¨
@@ -458,17 +518,29 @@ 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:
-        latlon: ×ª××¦×××ª <a href="https://openstreetmap.org/">××ª×× ×××ª×¨ ×××</a>
-        ca_postcode: ×ª××¦×××ª ×××ª×¨ <a href="https://geocoder.ca/">Geocoder.CA</a>
-        osm_nominatim: ×ª××¦×××ª ×××ª×¨ <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
+        latlon_html: ×ª××¦×××ª <a href="https://openstreetmap.org/">××ª×× ×××ª×¨ ×××</a>
+        ca_postcode_html: ×ª××¦×××ª ×××ª×¨ <a href="https://geocoder.ca/">Geocoder.CA</a>
+        osm_nominatim_html: ×ª××¦×××ª ×××ª×¨ <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
-        geonames: ×ª××¦×××ª ×××ª×¨ <a href="http://www.geonames.org/">GeoNames</a>
-        osm_nominatim_reverse: ×ª××¦×××ª ×Ö¾<a href="https://nominatim.openstreetmap.org/">OpenStreetMap
+        geonames_html: ×ª××¦×××ª ×××ª×¨ <a href="http://www.geonames.org/">GeoNames</a>
+        osm_nominatim_reverse_html: ×ª××¦×××ª ×Ö¾<a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
-        geonames_reverse: ×ª××¦×××ª ×Ö¾<a href="http://www.geonames.org/">GeoNames</a>
+        geonames_reverse_html: ×ª××¦×××ª ×Ö¾<a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
       prefix:
         aerialway:
@@ -476,10 +548,12 @@ he:
           chair_lift: ××¢×××ª ×¡×§× ×××©×××
           drag_lift: ××¢×××ª ×¡×§× ×××¨××¨×
           gondola: ×¨××× ××× ××××
+          magic_carpet: ××¡××¢ ×¡×§×
           platter: ××¢×××ª ×¦×××ª
           pylon: ×¤××××
           station: ×ª×× ×ª ×¨×××
           t-bar: ××¢×××ª ××Ö¾××¨
+          "yes": ×××××¨×
         aeroway:
           aerodrome: ×× ××ª
           airstrip: ×Ö´× ××ª
@@ -488,11 +562,14 @@ he:
           hangar: ×××¡× ××××¡××
           helipad: ×× ××ª ××¡××§××
           holding_position: ×××§×× ××××§×
+          navigationaid: ×¢××¨ × ×××× ×××××¨×
           parking_position: ×××§×× ×× ××
           runway: ××¡××× ×××¨××
           taxiway: ××¡××× × ×¡××¢×ª ××××¡
           terminal: ××¡××£
+          windsock: ×©×¨××× ×¨××
         amenity:
+          animal_boarding: ×¤× ×¡×××
           animal_shelter: ×××ª ×××¡× ×××××ª
           arts_centre: ××¨×× ××× ××××ª
           atm: ××¡×¤×××
@@ -502,7 +579,9 @@ he:
           bench: ×¡×¤×¡×
           bicycle_parking: ×× ×××ª ×××¤× ×××
           bicycle_rental: ××©××¨×ª ×××¤× ×××
+          bicycle_repair_station: ×ª×× ×ª ×ª××§×× ×××¤× ×××
           biergarten: ××× ×ª ×××¨×
+          blood_bank: ×× ×§ ××
           boat_rental: ××©××¨×ª ×¡××¨××ª
           brothel: ×××ª ×××©×ª
           bureau_de_change: ×××¤× ××¡×¤××
@@ -519,6 +598,7 @@ he:
           clock: ×©×¢××
           college: ×××××
           community_centre: ××¨×× ×§××××ª×
+          conference_centre: ××¨×× ×× ×¡××
           courthouse: ×××ª ××©×¤×
           crematorium: ××©×¨×¤×
           dentist: ×¨××¤× ×©×× ×××
@@ -526,6 +606,7 @@ he:
           drinking_water: ×× ×©×ª×××
           driving_school: ×××ª ×¡×¤×¨ ×× ××××
           embassy: ×©××¨××¨××ª
+          events_venue: ××ª×× ×××¨××¢××
           fast_food: ×××× ××××¨
           ferry_terminal: ××¡××£ ××¢×××¨×ª
           fire_station: ×ª×× ×ª ××××× ××©
@@ -538,36 +619,42 @@ he:
           hospital: ×××ª ×××××
           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: ××× ×× ××
+          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: ××ª×§× ×××¨×ª×
           studio: ×¡×××××
           swimming_pool: ××¨Öµ××ª ×©××××
@@ -576,19 +663,27 @@ he:
           theatre: ×ª××××¨××
           toilets: ×©××¨××ª××
           townhall: ×¢××¨×××
+          training: ××ª×§× ×××©×¨×
           university: ××× ×××¨×¡×××
+          vehicle_inspection: ××××§×ª ××× ×¨××
           vending_machine: ×××× ×ª ××××¨×
           veterinary: ××¨×¤×× ×××¨×× ×¨××ª
           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: ×××¨××
@@ -597,24 +692,94 @@ he:
           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: ×× ×
+          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: ××¤×¢×
+          fire_xtinguisher: ×××¤×
+          fire_water_pond: ××××¨ ××× ×××××× ××©
           landing_site: ××ª×¨ × ×××ª×ª ×××¨××
+          life_ring: ×××× ××¦××
           phone: ×××¤×× ×××¨××
+          siren: ×¦××¤×¨ ×××¨××
+          suction_point: × ×§××××ª ×©×××× ××××¨××
           water_tank: ××× ××× ××©×¢×ª ×××¨××
           "yes": ×××¨××
         highway:
@@ -627,6 +792,7 @@ he:
           cycleway: × ×ª×× ×××¤× ×××
           elevator: ××¢×××ª
           emergency_access_point: × ×§×××ª ×××©× ××©××¨××ª× ×××¨××
+          emergency_bay: ××¤×¨×¥ ××××××ª
           footway: ×©××× ×××××× ×¨××
           ford: ××¢××¨× ×× ××
           give_way: ×ª××¨××¨ ×ª× ××××ª ×§××××
@@ -656,38 +822,45 @@ he:
           street_lamp: ×¤× ×¡ ×¨×××
           tertiary: ××¨× ×©×××©×× ××ª
           tertiary_link: ××¨× ×©×××©×× ××ª
-          track: ××¡××× ××¨××¦××
+          track: ××¨× ×¢×¤×¨
+          traffic_mirror: ××¨×× ×¤× ××¨×××ª
           traffic_signals: ×¨××××¨
-          trail: ×©×××
+          trailhead: ×©×× ×ª××××ª ××¡×××
           trunk: ××¨× ×¨××©××ª
           trunk_link: ××¨× ×¨××©××ª
           turning_loop: ××¢×× ×ª× ××¢×
           unclassified: ××¨× ×× ××¡××××ª
           "yes": ××¨×
         historic:
+          aircraft: ××× ×××¡ ×××¡×××¨×
           archaeological_site: ××ª×¨ ××¨×××××××
+          bomb_crater: ×××ª×© ×××¡×××¨× ××¤×¦×¦×
           battlefield: ×©×× ×§×¨×
           boundary_stone: ××× ××××
           building: ×× ××× ×××¡×××¨×
           bunker: ××× ×§×¨
+          cannon: ×ª××ª× ×××¡×××¨×
           castle: ×××¨×
+          charcoal_pile: ×¢×¨×××ª ×¤×× ×××¡×××¨××ª
           church: ×× ×¡×××
           city_gate: ×©×¢×¨ ××¢××¨
           citywalls: ×××××ª ××¢××¨
           fort: ××¢××
           heritage: ××ª×¨ ×××¨×©×ª
           house: ×××ª
-          icon: ×××§×× ××
           manor: ×××××
           memorial: ×× ××¨×× ××××¨××
+          milestone: × ×§×××ª ×¦××× ×××¡×××¨××ª
           mine: ×××¨×
           mine_shaft: ×¤××¨ ×××¨×
           monument: ×× ××¨××
+          railway: ××¡×××ª ×¨×××ª ×××¡×××¨××ª
           roman_road: ××¨× ×¨××××ª
           ruins: ××¨××¡××ª
           stone: ×××
           tomb: ×§××¨
           tower: ××××
+          wayside_chapel: ×§×¤×× ××¦× ×××¨×
           wayside_cross: ×¦×× ××¦× ×××¨×
           wayside_shrine: ××§××© ××¦× ×××¨×
           wreck: ×¡×¤×× × ××¨××¤×
@@ -696,6 +869,7 @@ he:
           "yes": ×¦×××ª
         landuse:
           allotments: ××§×¦××ª ×§×¨×§×¢
+          aquaculture: ××§××××ª ××××ª
           basin: ×××
           brownfield: ××××¨ ×ª×¢×©××× × ×××©
           cemetery: ×××ª ×§××¨××ª
@@ -715,21 +889,28 @@ he:
           military: ×©×× ×¦×××
           mine: ×××¨×
           orchard: ×¤×¨××¡
+          plant_nursery: ××©×ª××
           quarry: ×××¦××
           railway: ××¡×××ª ××¨××
           recreation_ground: ×©××× × ××¤×© ××¤× ××
+          religious: ××ª×× ××ª×
           reservoir: ××××¨
           reservoir_watershed: ×¤×¨×©×ª ××× ×©× ××××¨
           residential: ××××¨ ××××¨××
           retail: ×§××¢×× ××
-          road: ××××¨ ××¨×
           village_green: ××××¨ ×××¤×¨
           vineyard: ××¨×
           "yes": ×©××××© ××§×¨×§×¢
         leisure:
+          adult_gaming_centre: ××¨×× ×××××¨ ××××××¨××
+          amusement_arcade: ××©××§×××
+          bandstand: ××××ª ×ª××××¨×ª
           beach_resort: ××ª×¨ × ××¤×© ××××£ ××
           bird_hide: ××¦×¤××¨
+          bleachers: ××¨×××× ×
+          bowling_alley: ××¡××× ×××××× ×
           common: ×©×× ××©××ª×£
+          dance: ××ª×× ×¨××§××××
           dog_park: ×¤××¨×§ ×××××
           firepit: ×××¨ ××©
           fishing: ××××¨ ×××
@@ -742,7 +923,9 @@ he:
           marina: ××¨×× ×
           miniature_golf: ××× ×Ö¾××××£
           nature_reserve: ×©×××¨×ª ×××¢
+          outdoor_seating: ××©××× ××××¥
           park: ×¤××¨×§
+          picnic_table: ×©×××× ×¤××§× ××§
           pitch: ×××¨×© ×¡×¤××¨×
           playground: ×××¨×© ××©××§××
           recreation_ground: ×©××× × ××¤×© ××¤× ××
@@ -757,13 +940,21 @@ he:
           "yes": × ××¤×©
         man_made:
           adit: ×× ××¡× ×××¤×§××ª ×××¢×¨×
+          advertising: ×¤×¨×¡××
+          antenna: ×× ×× ×
+          avalanche_protection: ××× × ××¤× × ××¤××××ª
           beacon: ××©×××
+          beam: ×§××¨×
           beehive: ××××¨×ª ××××¨××
           breakwater: ×©×××¨ ××××
           bridge: ××©×¨
           bunker_silo: ××× ×§×¨
+          cairn: ×××¢×
           chimney: ××¨×××
+          clearcut: ××¨××ª× ××××
+          communications_tower: ×¢××× ×ª×§×©××¨×ª
           crane: ×¢×××¨×
+          cross: ×¦××
           dolphin: ×¢××× ×¨×ª××§×
           dyke: ××¨××
           embankment: ×¡××××
@@ -772,6 +963,7 @@ he:
           groyne: ×¨×¦××£
           kiln: ×¤××¨× ×¡
           lighthouse: ××××××¨
+          manhole: ××××ª ×× ××¡×
           mast: ×ª××¨×
           mine: ×××¨×
           mineshaft: ×¤××¨ ×××¨×
@@ -779,12 +971,20 @@ he:
           petroleum_well: ×××¨ × ×¤×
           pier: ×¨×¦××£
           pipeline: ×§× ×¦×× ××¨××ª
+          pumping_station: ×ª×× ×ª ×©××××
+          reservoir_covered: ××××¨ ××× ××××¡×
           silo: ×××××¨×
+          snow_cannon: ×ª××ª× ×©××
+          snow_fence: ×××¨ ×©××
           storage_tank: ××× ×××¡××
+          street_cabinet: ××¨×× ××ª ×¨×××
           surveillance: ××¢×§×
+          telescope: ×××¡×§××¤
           tower: ××××
+          utility_pole: ×¢××× ××©××
           wastewater_plant: ××¤×¢× ×××××¨ ×××
           watermill: ××× ×ª ×××
+          water_tap: ××¨× ×××
           water_tower: ×××× ×××
           water_well: ×××¨
           water_works: ××¤×¢× ×××
@@ -795,10 +995,13 @@ he:
           airfield: ×× ××ª ×¦×××
           barracks: ××××¨× ××××××
           bunker: ××× ×§×¨
+          checkpoint: × ×§×××ª ××§×¨×
+          trench: ×©×××
           "yes": ×¦×××
         mountain_pass:
           "yes": ××¢××¨ ××¨×¨×
         natural:
+          bare_rock: ×¡××¢ ××©××£
           bay: ××¤×¨×¥
           beach: ×××£
           cape: ××£
@@ -814,6 +1017,7 @@ he:
           grassland: ××©×
           heath: ××ª×
           hill: ×××¢×
+          hot_spring: ××¢××× ××
           island: ××
           land: ××××
           marsh: ×××¦× ×¨××××
@@ -837,20 +1041,31 @@ he:
           water: ×××
           wetland: ××××
           wood: ××¢×¨
+          "yes": ×ª××× × ×××¢××ª
         office:
           accountant: ×¨××× ××©×××
           administrative: ×Ö´× ××
+          advertising_agency: ×¡××× ××ª ×¤×¨×¡××
           architect: ×××¨×××
           association: ×××××
           company: ×××¨×
+          diplomatic: ××©×¨× ×××¤×××××
           educational_institution: ×××¡× ××× ××
           employment_agency: ×¡××× ××ª ×ª×¢×¡××§×
+          energy_supplier: ××©×¨× ×¡×¤×§ ×× ×¨×××
           estate_agent: ××ª××× × ×××´×
+          financial: ××©×¨× ×××××
           government: ××©×× ×××©××ª××ª
           insurance: ××©×¨× ×××××
           it: ×××¡× ××× ××
           lawyer: ×¢××¨× ×××
+          logistics: ××©×¨× ×××××¡×××§×
+          newspaper: ××©×¨× ×©× ×¢×ª××
           ngo: ××©×¨× ×××¡× ×× ×××©××ª×
+          notary: × ×××¨×××
+          religion: ××©×¨× ××ª
+          research: ××©×¨× ×××§×¨
+          tax_advisor: ×××¢×¥ ××¡
           telecommunication: ××©×¨× ×ª×§×©××¨×ª ×××§××¨×× ××ª
           travel_agent: ×¡××× ××ª × ×¡××¢××ª
           "yes": ××©×¨×
@@ -870,6 +1085,7 @@ he:
           locality: ×××©××
           municipality: ×¢××¨×××
           neighbourhood: ×©××× ×
+          plot: ×××¨×©
           postcode: ×××§××
           quarter: ×¨×××¢
           region: ××××¨
@@ -879,7 +1095,6 @@ he:
           subdivision: ××××§×ª ××©× ×
           suburb: ×¤×¨×××¨
           town: ×¢×××¨×
-          unincorporated_area: ×©×× ×××ª× ×××××
           village: ××¤×¨
           "yes": ××§××
         railway:
@@ -905,12 +1120,19 @@ he:
           switch: × ×§××××ª ××¡×××ª ××¨××
           tram: ××©××××ª
           tram_stop: ×ª×× ×ª ××©××××ª
+          yard: ×××¡× ×¨××××ª
         shop:
+          agrarian: ×× ××ª ××× ××
           alcohol: ×× ××ª ×××××××
           antiques: ×¢×ª××§××ª
+          appliance: ×× ××ª ×××¦×¨× ××©××
           art: ×× ××ª ××¤×¦× ××× ××ª
+          baby_goods: ×× ××ª ××××¦×¨× ×ª×× ××§××ª
+          bag: ×× ××ª ×ª××§××
           bakery: ×××¤×××
+          bathroom_furnishing: ×¦××× ××××¨× ××§×××ª
           beauty: ×¡××× ×××¤×
+          bed: ×× ××ª ××× ××××
           beverages: ×× ××ª ××©×§×××ª
           bicycle: ×× ××ª ××¤× ×××
           bookmaker: ×¡××× ×××××¨××
@@ -922,65 +1144,90 @@ he:
           car_repair: ×××¡×
           carpet: ×× ××ª ×©×××××
           charity: ×× ××ª ×¦××§×
+          cheese: ×× ××ª ×××× ××ª
           chemist: ×××ª ××¨×§××ª
+          chocolate: ×©××§×××
           clothes: ×× ××ª ×××××
+          coffee: ×× ××ª ×§×¤×
           computer: ×× ××ª ×××©×××
           confectionery: ×§×× ×××××¨××
           convenience: ×××××ª
           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: ×××××ª
+          frame: ×× ××ª ××¡××¨××ª
           funeral_directors: ×××ª ××××××ª
           furniture: ×¨×××××
-          gallery: ×××¨××
           garden_centre: ××¨×× ××× ××
+          gas: ×× ××ª ××
           general: ×××××ª
           gift: ×× ××ª ××ª× ××ª
           greengrocer: ××¨×§×
           grocery: ×××××ª
           hairdresser: ××¢×¦× ×©×¢×¨
           hardware: ×× ××ª ××××¨× ×× ×××
+          health_food: ×× ××ª ×××× ××¨××××ª
+          hearing_aids: ×¢××¨× ×©×××¢×
+          herbalist: ×× ××ª ×××¢
           hifi: ×¦××× ×××××§×
           houseware: ×× ××ª ××× ×××ª
+          ice_cream: ×× ××ª ×××××
           interior_decoration: ×¢××¦×× ×¤× ××
           jewelry: ×× ××ª ×ª××©××××
           kiosk: ×§×××¡×§
           kitchen: ×× ××ª ××× ××××
           laundry: ××××¡×
+          locksmith: ×× ×¢×××
           lottery: ×××¨××
           mall: ××¨×× ×§× ×××ª
-          market: ×©××§
           massage: ×¢××¡××
+          medical_supply: ×× ××ª ×¦××× ×¨×¤×××
           mobile_phone: ×× ××ª ×××¤×× ×× × ×××××
+          money_lender: ××××××ª ××¡×¤××
           motorcycle: ×× ××ª ×××¤× ××¢××
+          motorcycle_repair: ×× ××ª ××ª××§×× ×××¤× ××¢××
           music: ×× ××ª ××× × ××× ×
+          musical_instrument: ××× × ××× ×
           newsagent: ×¡××× ××ª ×××©××ª
+          nutrition_supplements: ×ª××¡×¤× ×ª××× ×
           optician: ×××¤×××§××
           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: ×× ××ª ×¦×¢×¦××¢××
@@ -989,6 +1236,8 @@ he:
           vacant: ×× ××ª ×¤× ×××
           variety_store: ××××
           video: ×¡×¤×¨×××ª ×××××
+          video_games: ×× ××ª ××©××§× ×××©×
+          wholesale: ×¡×××× ×××ª
           wine: ×× ××ª ×××
           "yes": ×× ××ª
         tourism:
@@ -998,6 +1247,7 @@ he:
           attraction: ×××§× ×¢× ×××
           bed_and_breakfast: ××× × ×××¨×××ª ×××§×¨
           cabin: ××§×ª×
+          camp_pitch: ×× ××× ××××
           camp_site: ××ª×¨ ××× ×××ª
           caravan_site: ××ª×¨ ××§×¨×××× ××
           chalet: ×××¨×
@@ -1011,6 +1261,7 @@ he:
           picnic_site: ××ª×¨ ××¤××§× ××§××
           theme_park: ×¤××¨×§ ×©×¢×©××¢××
           viewpoint: × ×§×××ª ×ª×¦×¤××ª
+          wilderness_hut: ××§×ª×ª ×××¢
           zoo: ×× ××××ª
         tunnel:
           building_passage: ××¢××¨ ××× ×× ××× ××
@@ -1043,11 +1294,6 @@ he:
         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>
       types:
         cities: ×¢×¨××
         towns: ×¢×××¨××ª
@@ -1110,11 +1356,10 @@ he:
     reopen:
       reopened: ××¦× ×××¢×××ª ×©×× × ×-'×¤×ª××'
     comments:
-      created_at: ×Ö¾%{datetime}
+      comment_from_html: ×ª×××× ×××ª %{user_link} ×¢× %{comment_created_at}
       reassign_param: ×××§×¦××ª ××ª ××ª×§×× ××××©
     reports:
-      updated_at: ×Ö¾%{datetime}
-      reported_by_html: ×××× ××ª××¨ %{category} ×¢× ××× %{user}
+      reported_by_html: ×××× ××ª××¨ %{category} ×¢× ××× %{user} ×Ö¾%{updated_at}
     helper:
       reportable_title:
         diary_comment: '%{entry_title}, ×ª×××× ××¡×³ %{comment_id}'
@@ -1126,8 +1371,6 @@ he:
     new:
       title_html: ××××× ×¢× %{link}
       missing_params: ×× × ××ª× ×××¦××¨ ××××× ×××©
-      details: × × ××¡×¤×§ ×¤×¨××× ×¢× ×××¢×× (× ××¨×©).
-      select: '× × ×××××¨ ××ª ×¡×××ª ××××××:'
       disclaimer:
         intro: '×××¨× ×©××××ª ×××××× ×××¤×§×× ×××ª×¨, × × ××××× ××:'
         not_just_mistake: ××××× ××××¢×ª× ×××¢×× ××× ×× ×¡×ª× ××¢××ª
@@ -1207,18 +1450,20 @@ he:
       text: ×ª×¨×××
     learn_more: ××××¢ × ××¡×£
     more: ×¢××
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[×××¤× ×¡××¨×× ×××¤ OpenStreetMap] ×ª×××× ×××ª %{user} × ××¡×¤× ××¨×©×××ª ××××'
       hi: ×©××× %{to_user},
       header: '%{from_user} ×××× ××¨×©×××ª ××××× ×Ö¾OpenStreetMap ×¢× ×× ××©× %{subject}:'
       footer: ××¤×©×¨ ×× ××§×¨×× ××ª ××ª×××× ×××ª×××ª %{readurl} ×××××× ×××ª×××ª %{commenturl}
-        ×× ×××©×× ×××ª×××ª %{replyurl}
+        ×× ××©××× ××××¢× ××××¦×¨ ×××ª×××ª %{replyurl}
     message_notification:
+      subject_header: '[OpenStreetMap] %{subject}'
       hi: ×©××× %{to_user},
       header: '××ª×××ª× ×Ö¾OpenStreetMap ××××¢× ××××¢× ×××ª %{from_user} ×¢× ×× ××©× %{subject}:'
-      footer_html: × ××ª× ×× ××§×¨×× ××ª ×××××¢× ×××ª×××ª %{readurl} ×××××× ××××¦×¢××ª %{replyurl}
-    friend_notification:
+      footer_html: × ××ª× ×× ××§×¨×× ××ª ×××××¢× ×××ª×××ª %{readurl} ×××©××× ××××¢× ××××¦×¨ ××¨×
+        %{replyurl}
+    friendship_notification:
       hi: ×©××× %{to_user},
       subject: '[×××¤× ×¡××¨×× ×××¤ OpenStreetMap] × ××¡×¤×ª ××¨×©×××ª ××××¨×× ×©× %{user}'
       had_added_you: '%{user} ×××¡××£ ×××ª× ××××¨ ×Ö¾OpenStreetMap.'
@@ -1237,8 +1482,11 @@ he:
         more_info_2: '××× ××¤×©×¨ ×××¦×× ×××:'
       success:
         subject: '[×××¤× ×¡××¨×× ×××¤ OpenStreetMap] ××××× GPX ××¦×××'
-        loaded_successfully: × ××¢× ××¨××× ×¢× %{trace_points} ××ª×× %{possible_points}
-          × ×§××××ª ××¤×©×¨×××ª.
+        loaded_successfully:
+          one: × ××¢× ××¨××× ×¢× %{trace_points} ××ª×× × ×§××× ×××ª ××¤×©×¨××ª.
+          two: × ××¢× ××¨××× ×¢× %{trace_points} ××ª×× %{possible_points} × ×§××××ª ××¤×©×¨×××ª.
+          many: × ××¢× ××¨××× ×¢× %{trace_points} ××ª×× %{possible_points} × ×§××××ª ××¤×©×¨×××ª.
+          other: × ××¢× ××¨××× ×¢× %{trace_points} ××ª×× %{possible_points} × ×§××××ª ××¤×©×¨×××ª.
     signup_confirm:
       subject: '[×××¤× ×¡××¨×× ×××¤ OpenStreetMap] ××¨×× ×××× ××××¤× ×¡××¨×× ×××¤'
       greeting: ××××!
@@ -1282,13 +1530,13 @@ he:
         commented_note: ××ª×§××× ×ª×××× ×××ª %{commenter} ×¢× ××¢×¨× ×¢× ××¤× ×©××××ª ×¢×××. ××¢×¨×
           × ××¦××ª ××× %{place}
       closed:
-        subject_own: '[OpenStreetMap] ×××ª ××××¢×¨××ª ×©×× × ×¤×ª×¨× ×¢×Ö¾××× %{commenter}'
+        subject_own: â«[OpenStreetMap] ×××ª ××××¢×¨××ª ×©×× × ×¤×ª×¨× ×¢×Ö¾××× %{commenter}
         subject_other: '[OpenStreetMap] ××¢×¨× ×©××ª×¢× ××× ×ª ×× × ×¤×ª×¨× ×¢×Ö¾××× %{commenter}'
         your_note: ×××ª ×××¢×¨××ª ×××¤× ×©×× ××× %{place} × ×¤×ª×¨× ×¢×Ö¾××× %{commenter}.
         commented_note: ××¢×¨×ª ××¤× ×©××××ª ×¢××× × ×¤×ª×¨× ×¢×Ö¾××× %{commenter}. ×××¢×¨× × ××¦××ª
           ××× %{place}
       reopened:
-        subject_own: '[OpenStreetMap] ×××ª ×××¢×¨××ª ×©×× ×××¤×¢×× ××××© ×¢×´× %{commenter}'
+        subject_own: â«[OpenStreetMap] ×××ª ×××¢×¨××ª ×©×× ×××¤×¢×× ××××© ×¢×´× %{commenter}
         subject_other: '[OpenStreetMap] ××¢×¨× ×©××¢× ××× ×ª ×××ª× ×××¤×¢×× ××××© ×¢×Ö¾××× %{commenter}'
         your_note: ××¢×¨× ×©×××¡×¤×ª ××× %{place} ×××¤×¢×× ××××© ×¢×Ö¾××× %{commenter}.
         commented_note: ××¢×¨× ×××¤× ×©××××ª ×¢××× ×××¤×¢×× ××××© ×¢×Ö¾××× %{commenter}. ×××¢×¨×
@@ -1298,14 +1546,14 @@ he:
       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} ××¢××¨ ×¢× ××× ××¢×¨×××ª ××©×× ×××× ×××¤×
-          ×©×¢×§××ª ×××¨×× ×©× ××¦×¨× ×¢×Ö¾××× %{changeset_author} ×Ö¾%{time}
+        commented_changeset: ×§××××ª ××¢×¨× ××××©×ª××© %{commenter} ×Ö¾%{time} ×¢× ×××ª ××¢×¨×××ª
+          ××©×× ×××× ×××¤× ×©×¢×§××ª ×××¨×× ×× ××¦×¨× ×¢×Ö¾××× %{changeset_author}
         partial_changeset_with_comment: ×¢× ×××¢×¨× '%{changeset_comment}'
         partial_changeset_without_comment: ××× ××¢×¨×
       details: ×¤×¨××× × ××¡×¤×× ×¢× ×¢×¨××ª ××©×× ×××× ××¤×©×¨ ×××¦×× ×××ª×××ª %{url}
@@ -1326,7 +1574,7 @@ he:
       from: ×××ª
       subject: × ××©×
       date: ×ª××¨××
-      no_messages_yet: ××× ×× ××××¢××ª ×××©××ª ×¢××××. ×× ××¢×ª× ×××¦××¨ ×§×©×¨ ×¢× %{people_mapping_nearby_link}?
+      no_messages_yet_html: ××× ×× ××××¢××ª ×××©××ª ×¢××××. ×× ××¢×ª× ×××¦××¨ ×§×©×¨ ×¢× %{people_mapping_nearby_link}?
       people_mapping_nearby: ×× ×©×× ×××¤×× ××§×¨××ª ××§××
     message_summary:
       unread_button: ×¡×××× ×â×× × ×§×¨×â
@@ -1335,7 +1583,7 @@ he:
       destroy_button: ××××§×
     new:
       title: ×©××××ª ××××¢×
-      send_message_to: ××©××××ª ××××¢× ×××©× ×× %{name}
+      send_message_to_html: ××©××××ª ××××¢× ×××©× ×× %{name}
       subject: × ××©×
       body: ×ª××× ×××××¢×
       back_to_inbox: ×××¨× ××ª×××ª ×××××¨ ×× ×× ×¡
@@ -1348,7 +1596,7 @@ he:
       body: ×× × ××¦××¢×¨××, ××× ××××¢× ×¢× ×××× ××.
     outbox:
       title: ×ª×××ª ××××¨ ×××¦×
-      my_inbox: '%{inbox_link} ×©××'
+      my_inbox_html: '%{inbox_link} ×©××'
       inbox: ×ª×××ª ×××××¨ ×× ×× ×¡
       outbox: ×ª×××ª ×××××¨ ××××¦×
       messages:
@@ -1357,7 +1605,7 @@ he:
       to: ××
       subject: × ××©×
       date: ×ª××¨××
-      no_sent_messages: ××× ×× ××××¢××ª × ×©××× ×¢× ××. ×× ××¢×ª× ×××¦××¨ ×§×©×¨ ×¢× %{people_mapping_nearby_link}?
+      no_sent_messages_html: ××× ×× ××××¢××ª × ×©××× ×¢× ××. ×× ××¢×ª× ×××¦××¨ ×§×©×¨ ×¢× %{people_mapping_nearby_link}?
       people_mapping_nearby: ××©×ª×ª×¤×× ××××¤×× ××§×¨××ª ××§××
     reply:
       wrong_user: × ×× ×¡×ª ××©× â%{user}â, ××× ×××××¢× ×©×××§×©×ª ×××©×× ×¢××× ×× × ×©××× ××××ª×
@@ -1385,7 +1633,8 @@ he:
     about:
       next: ×××
       copyright_html: <span>&copy;</span>×ª××¨××<br>OpenStreetMap
-      used_by: '%{name} ××¤×¢××× × ×ª×× × ×××¤× ××××¤× ××ª×¨× ××× ××¨× ×, ×××©×××× ××××©××¨×× ×©×× ××'
+      used_by_html: '%{name} ××¡×¤×§×ª × ×ª×× × ××¤××ª ××××¤× ××ª×¨× ××× ××¨× ×, ×××©×××× ××××©××¨××
+        ×©×× ××'
       lede_text: ××ª OpenStreetMap ××× × ×§××××ª ×××¤×× ×©×ª××¨××× ×××ª×××§×× × ×ª×× ×× ×¢× ××¨×××,
         ×©×××××, ××ª×Ö¾×§×¤×, ×ª×× ××ª ×¨×××ª ××¢×× ××¨×× ×××ª×¨, ××¡××× ××¢×××.
       local_knowledge_title: ×××¢ ××§×××
@@ -1407,25 +1656,26 @@ he:
         ×××× ××ª ×¢× ××××× ×××¨×× ××¡×××××, ×× ××© ×××¤××¥ ××ª ××ª××¦×××ª ×©× ××
         ××¤× ××ª× ××× ×©× ×××ª× ××¨××©×××. ×¨' ××ª <a href='%{copyright_path}'>××£ ××¨××©××× ×××××××ª ××××¦×¨××</a> ××¤×¨××× × ××¡×¤××.
       legal_title: ××©×¤××
-      legal_html: |-
+      legal_1_html: |-
         ×××ª×¨ ××× ××©××¨××ª×× ×¨××× ×××¨×× ×××¤×¢××× ×¢×Ö¾××× <a href='https://osmfoundation.org/'>×§×¨× OpenStreetMap</a>&rlm; (OSMF) ××©× ××§××××. ××©××××© ××× ××©××¨××ª×× ×××¤×¢××× OSMF ××¤××£
-        ×Ö¾<a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
-        ×××× ×××ª ×©××××© ×§×××</a> ×©×× ×
-        ××Ö¾<a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>×××× ×××ª ××¤×¨××××ª</a> ×©×× ×
-        <br>
-        × × <a href='https://osmfoundation.org/Contact'>×××¦××¨ ×§×©×¨ ×¢× OSMF</a> ×× ××© ×× ×©××××ª ×¢× ×¨××©××, ××××××ª ×××¦×¨×× ×× ×©××××ª ××©×¤××××ª ×××¨××ª.
+        ×<a href="https://wiki.osmfoundation.org/wiki/Terms_of_Use">×ª× ×× ××©××××©</a>, ××¨×××ª <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
+        ×××× ×××ª ××©××××© ××§×××</a> ×©×× ×
+        ××Ö¾<a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">×××× ×××ª ××¤×¨××××ª</a> ×©×× ×.
+      legal_2_html: |-
+        × × <a href='https://osmfoundation.org/Contact'>×××¦××¨ ×§×©×¨ ×¢× OSMF</a>
+        ×× ××© ×× ×©××××ª ×¢× ×¨××©××, ××××××ª ×××¦×¨×× ×× ×©××××ª ××©×¤××××ª ×××¨××ª.
         <br>
         OpenStreetMap, ×¡×× ×××××××ª ××××××ª, ×Ö¾State of the Map ×× <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">×¡××× ×× ××¡××¨××× ×¨×©×××× ×©× ×§×¨× OSM</a>.
       partners_title: ×©××ª×¤××
     copyright:
       foreign:
         title: ×××××ª ×ª×¨××× ××
-        text: ×××§×¨× ×©× ×××¡×¨ ×ª×××××ª ××× ×¢××× ××ª××¨×× ×× ×××× %{english_original_link},
+        html: ×××§×¨× ×©× ×××¡×¨ ×ª×××××ª ××× ×¢××× ××ª××¨×× ×× ×××× %{english_original_link},
           ××© ××ª×ª ×¢×××¤××ª ××¢××× ××× ××××ª
         english_link: ××¢××× ×××§××¨× ××× ××××ª
       native:
         title: ×××××ª ××£ ××
-        text: ××× ×¢××× ××××××ª ××××¦×¨×× ×××¨×¡×ª× ××× ××××ª. ××¤×©×¨ ×××××¨ ×%{native_link} ×©×
+        html: ××× ×¢××× ××××××ª ××××¦×¨×× ×××¨×¡×ª× ××× ××××ª. ××¤×©×¨ ×××××¨ ×%{native_link} ×©×
           ×¢××× ××, ×××¤×©×¨ ×× ×××¤×¡××§ ××§×¨×× ×¢× ××××××ª ×××¦×¨×× ×%{mapping_link}.
         native_link: ××¨×¡× ×¢××¨××ª
         mapping_link: ×××ª××× ×××¤××ª
@@ -1443,13 +1693,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. ×××¤×©×¨××ª× ××¢×©××ª ×××ª ××××¦×¢××ª ×§××©××¨ ××
@@ -1460,7 +1710,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 ×××ª×¨ ×××× ××¨× ×
@@ -1540,7 +1795,7 @@ he:
           ×× ××¡× ×× ×ª×× ×× ×©× OpenStreetMap ×× ×× ×××ª×¨ ×××, × × ××¤× ××ª
           ×× <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">× ×××
           ×××¡×¨×</a> ×©×× × ×× ××ª×× ×ª××× × ××©××¨××ª
-          <a href="http://dmca.openstreetmap.org/">×××£ ××ª××× ××ª ×××§××× ×©×× ×</a>.
+          <a href="https://dmca.openstreetmap.org/">×××£ ××ª××× ××ª ×××§××× ×©×× ×</a>.
         trademarks_title_html: <span id="trademarks"></span>×¡××× ×× ××¡××¨×××
         trademarks_1_html: OpenStreetMap, ×¡×× ×××××××ª ××××××ª ×Ö¾State of the Map ××
           ×¡××× ×× ××¡××¨××× ×©× ×§×¨× OpenStreetMap. ×× ××© ×× ×©××××ª ×¢× ××©××××© ×©×× ××¡××× ××,
@@ -1558,13 +1813,13 @@ he:
         ××©×××× ××§×××¨ ×××¤×¢××ª
     edit:
       not_public: ×× ××××¨×ª ××ª ××¢×¨××××ª ×©×× ××¦××××¨×××ª.
-      not_public_description: ×× ×ª××× ×× ××¤×©×¨××ª ××××©×× ××¢×¨×× ××ª ×××¤× ××¤× × ×©×× ×××¢×©×.
-        ×××¤×©×¨××ª× ××××××¨ ××ª ××¢×¨××××ª ×©×× ××¦××××¨×××ª ××¨× %{user_page} ×©××.
+      not_public_description_html: ×× ×ª××× ×× ××¤×©×¨××ª ××××©×× ××¢×¨×× ××ª ×××¤× ××¤× × ×©××
+        ×××¢×©×. ×××¤×©×¨××ª× ××××××¨ ××ª ××¢×¨××××ª ×©×× ××¦××××¨×××ª ××¨× %{user_page} ×©××.
       user_page_link: ××£ ×××©×ª××©
       anon_edits_link_text: ×¨' ××¡××¨ ××××¢ ×× ××.
-      flash_player_required: ××© ×¦××¨× ×× ×× ×¤×××© ××× ×××©×ª××© ×Ö¾Potlatch, ×¢×¨×× ××¤×××© ×©×
-        OpenStreetMap. ××¤×©×¨ <a href="https://get.adobe.com/flashplayer">××××¨×× × ××
-        ×¤×××© ×××ª×¨ Adobe.com</a>. ××© <a href="https://wiki.openstreetmap.org/wiki/Editing">××¤×©×¨××××ª
+      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, ××©
         ×××× ××ª ×××××¨× ×©× ×××¨× ×× ×× ×§××× ×× ××××× ×××¦× ×¢×¨××× ×××, ×× ××©×××¨ ×× ××¤×ª××¨
@@ -1584,7 +1839,7 @@ he:
       map_image: ×ª××× ×ª ××¤× (×ª×¦×××ª ×©××× ×ª×§× ××ª)
       embeddable_html: HTML ×©× ××ª× ×××××¢×
       licence: ×¨××©×××
-      export_details: ×××××¢ ×Ö¾OpenStreetMap ××××© ×××¤××£ ×<a href="href="https://opendatacommons.org/licenses/odbl/1.0/">×¨××©×××
+      export_details_html: ×××××¢ ×Ö¾OpenStreetMap ××××© ×××¤××£ ×<a href="href="https://opendatacommons.org/licenses/odbl/1.0/">×¨××©×××
         Open Data Commons ×× ×ª×× ×× ×¤×ª××××</a> (ODbL).
       too_large:
         advice: '×× ×××××× ×× ×´× × ××©×, × × ×× ×¡××ª ×××©×ª××© ×××× ×××§××¨××ª ××××:'
@@ -1699,13 +1954,13 @@ he:
           primary: ××××© ×¨××©×
           secondary: ××××© ××©× ×
           unclassified: ××¨× ×× ××¡××××ª
-          track: ××¡××× ××¨××¦××
+          track: ××¡×××
           bridleway: ××¡××× ××¨××××ª ×¡××¡××
           cycleway: ××¨× ××××¤× ×××
           cycleway_national: ××¡××× ×××¤× ××× ×××××
           cycleway_regional: ××¡××× ×××¤× ××× ××××¨×
           cycleway_local: ××¡××× ×××¤× ××× ××§×××
-          footway: ××¨× ×××××× ×¨××
+          footway: ×©××× ×××××× ×¨××
           rail: ××¡×××ª ××¨××
           subway: ×¨×××ª ×ª××ª××ª
           tram:
@@ -1795,10 +2050,11 @@ 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: ×××§××!
         paragraph_1_html: ×Ö¾OpenStreetMap ××© ××¢× ×××§×× ×¤××¨×××××, ××× ×× ×× × ××¦×¤×× ×××
@@ -1829,11 +2085,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: ×¢××¨×
@@ -1848,20 +2099,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: ×××¡××× ×¢××××
@@ -1876,6 +2116,7 @@ he:
       uploaded: '×××¢××:'
       points: '× ×§××××ª:'
       start_coordinates: '× ×§××××ª ×¦××× ×©× ×ª××××:'
+      coordinates_html: '%{latitude}, %{longitude}'
       map: ××¤×
       edit: ×¢×¨×××
       owner: '××¢×××:'
@@ -1893,7 +2134,9 @@ he:
       newer: ××¡××××× ×××©×× ×××ª×¨
     trace:
       pending: ××××ª× ×
-      count_points: '%{count} × ×§××××ª'
+      count_points:
+        one: × ×§×××
+        other: '%{count} × ×§××××ª'
       more: ×¢××
       trace_details: ××¦××ª ×¤×¨×× ××¡×××
       view_map: ××¦××ª ××¤×
@@ -1918,7 +2161,7 @@ he:
       upload_trace: ××¢×××ª ××¡×××
       see_all_traces: ××¦××ª ×× ×××¡×××××
       see_my_traces: ××¦××ª ×× ×ª×××× ×©××
-    delete:
+    destroy:
       scheduled_for_deletion: ××¡××× ××××¢× ×××××§×
     make_public:
       made_public: ××¡××× ×©×××××¨ ×¦××××¨×
@@ -1950,9 +2193,9 @@ he:
   oauth:
     authorize:
       title: ×××©××¨ ××××©× ×××©××× ×©××
-      request_access: ××××©×× %{app_name} ×××¨×© ×××©× ×××©××× ×, %{user}. × × ×××××§ ×××
-        ××ª××× ×× ×©××××©×× ××§×× ××ª ×××××××ª ××××. ××¤×©×¨ ×××××¨ ×× ×× ×××××¨ ××ª ×× ×× ×©××ª×××
-        ××.
+      request_access_html: ××××©×× %{app_name} ×××¨×© ×××©× ×××©××× ×, %{user}. × × ×××××§
+        ××× ××ª××× ×× ×©××××©×× ××§×× ××ª ×××××××ª ××××. ××¤×©×¨ ×××××¨ ×× ×× ×××××¨ ××ª ×× ××
+        ×©××ª××× ××.
       allow_to: ×××¤×©×¨ ××××©×× ×××§×× ×©××
       allow_read_prefs: ××§×¨×× ××ª ××¢××¤××ª ×××©×ª××© ×©××.
       allow_write_prefs: ××©× ××ª ××ª ××¢××¤××ª ×××©×ª××© ×©××.
@@ -1964,7 +2207,7 @@ he:
       grant_access: ××ª× ×××©×
     authorize_success:
       title: ××§×©×ª ×××©××¨ ×××©×¨×
-      allowed: × ×ª×ª ××××©×× %{app_name} ×××©× ×××©××× ×.
+      allowed_html: × ×ª×ª ××××©×× %{app_name} ×××©× ×××©××× ×.
       verification: ×§×× ××××××ª ××× %{code}.
     authorize_failure:
       title: ××§×©×ª ×××©××¨ × ××©××
@@ -1991,13 +2234,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: ××××©×××× ×××××©×¨×× ×©××
@@ -2006,24 +2242,13 @@ he:
       issued_at: ××× ×¤×§ ×
       revoke: ××©×××!
       my_apps: ×××©××× ×××§×× ×©××
-      no_apps: ××× ××© ×× ×××©×× ×©××¨×¦×× × ××¨×©×× ××©××××© ××¦×× × ××××¦×¢××ª ×ª×§× %{oauth}? ××©
-        ××¨×©×× ××ª ×××©×× ××¨×©×ª ×©×× ××¤× × ×©×××× ××©××× ××§×©××ª OAuth ××©××¨××ª ×××.
+      no_apps_html: ××× ××© ×× ×××©×× ×©××¨×¦×× × ××¨×©×× ××©××××© ××¦×× × ××××¦×¢××ª ×ª×§× %{oauth}?
+        ××© ××¨×©×× ××ª ×××©×× ××¨×©×ª ×©×× ××¤× × ×©×××× ××©××× ××§×©××ª OAuth ××©××¨××ª ×××.
+      oauth: oauth
       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:
@@ -2038,7 +2263,7 @@ he:
       heading: ×× ××¡×
       email or username: '××ª×××ª ××××¨ ×××§××¨×× × ×× ×©× ××©×ª××©:'
       password: '×¡××¡××:'
-      openid: '%{logo} OpenID:'
+      openid_html: '%{logo} OpenID:'
       remember: ×××××¨ ×××ª×
       lost password link: ×××××ª ××ª ××¡××¡×× ×©××?
       login_button: ×× ××¡×
@@ -2101,27 +2326,23 @@ he:
     reset_password:
       title: ×××¤××¡ ×¡××¡××
       heading: ×××¤××¡ ××¡×¡×× ×¢×××¨ %{user}
-      password: '×¡××¡××:'
-      confirm password: '×××××ª ××¡××¡××:'
       reset: ×××¤××¡ ××¡×¡××
       flash changed: ×¡××¡××ª× ×©×× ×ª×.
       flash token bad: ×× ××¦×× × ××ª ×××¡×××× ××××, ×××× ××××§×ª ×××ª×××ª ×ª×¢×××¨?
     new:
       title: ××¨×©××
       no_auto_account_create: ×××¨×× ××¦×¢×¨, ××¢×ª ××× × × ×××××× ×××¦××¨ ×× ××©××× ××××¤× ×××××××.
-      contact_webmaster: × × ×××¦××¨ ×§×©×¨ ×¢× <a href="%{webmaster}">×× ×× ×××ª×¨</a> ×¢× ×× ×ª
-        ×××¨×× ××¦××¨×ª ××©××× - ×× ×× × × ×©×ª×× ×××¤× ×××§×©× ××× ×©×××ª×¨ ×××¨.
+      contact_webmaster_html: × × ×××¦××¨ ×§×©×¨ ×¢× <a href="%{webmaster}">×× ×× ×××ª×¨</a>
+        ×¢× ×× ×ª ×××¨×× ××¦××¨×ª ××©××× - ×× ×× × × ×©×ª×× ×××¤× ×××§×©× ××× ×©×××ª×¨ ×××¨.
       about:
         header: ×××¤×©××ª ×× ××ª× ×ª ××¢×¨×××
         html: |-
           <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: ×××ª×××ª ×©×× ×× ×××¦××ª ××¤××××, ×××××¢ × ××¡×£ ×¨×× <a href="https://wiki.openstreetmap.org/wiki/Privacy_Policy"
+      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: ×©× ×××©×ª××© ×©××, ×©×××¦× ××¤××××. ××¤×©×¨ ××©× ××ª ××ª ×× ×××¢××¤××ª
@@ -2150,7 +2371,8 @@ he:
       read_tou: ×§×¨××ª× ××ª ×ª× ×× ××©××××© ××× × ××¡×××/× ××ª× ××× ×××
       consider_pd: ×× ××¡×£ ×××ª×× ××¢××, ××××× ×ª× ×× ×¢×¨××××ª×× ×©×××××ª ×× ×××ª ××××
       consider_pd_why: ×× ××?
-      guidance: ××××¢ ×©×¢×××¨ ××××× ××ª ××ª× ××× ××××a <a href="%{summary}">×ª×§×¦××¨ ×§×¨××</a>
+      consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
+      guidance_html: ××××¢ ×©×¢×××¨ ××××× ××ª ××ª× ××× ××××a <a href="%{summary}">×ª×§×¦××¨ ×§×¨××</a>
         ×××× <a href="%{translations}">×ª×¨××××× ×××ª×Ö¾×¨×©××××</a>
       continue: ××××©××
       declined: https://wiki.openstreetmap.org/wiki/He:Contributor_Terms_Declined
@@ -2198,8 +2420,8 @@ he:
       spam score: '×××¨×× ×××××:'
       description: ×ª××××¨
       user location: ×××§×× ×××©×ª××©
-      if set location: ××××¨× ×©× ×××§×× ××××ª ×©×× ×××£ %{settings_link} ×ª××¤×©×¨ ×× ××¨×××ª
-        ××©×ª××©×× ××¡××××ª×.
+      if_set_location_html: ××××¨× ×©× ×××§×× ××××ª ×©×× ×××£ %{settings_link} ×ª××¤×©×¨ ××
+        ××¨×××ª ××©×ª××©×× ××¡××××ª×.
       settings_link_text: ××××¨××ª
       my friends: ××××¨×× ×©××
       no friends: ×¢×××× ×× ×××¡×¤×ª ×××¨××.
@@ -2255,7 +2477,7 @@ he:
         disabled link text: ××××¢ ××× × ×××× ××¢×¨××?
       public editing note:
         heading: ×¢×¨××× ×¦××××¨××ª
-        text: ××¢×ª ××¢×¨××××ª ×©×× ××××× ×××ª ××× ×©×× ×× ×××××× ××©××× ×× ××××¢××ª ×× ××¨×××ª ××ª
+        html: ××¢×ª ××¢×¨××××ª ×©×× ××××× ×××ª ××× ×©×× ×× ×××××× ××©××× ×× ××××¢××ª ×× ××¨×××ª ××ª
           ××××§×× ×©××. ××× ×××¦×× ×× ×¢×¨××ª ××××¤×©×¨ ××× ×©×× ×××¦××¨ ××ª× ×§×©×¨ ××¨× ×××ª×¨, ××© ×××××¥
           ×¢× ×××¤×ª××¨ ××××. <b>××× ××©×× ×× ×Ö¾API ×××¨×¡× 0.6, ×¨×§ ××©×ª××©×× ×¦××××¨××× ××××××
           ××¢×¨×× × ×ª×× × ××¤×</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">××¡××¨
@@ -2310,10 +2532,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: ×××©××¨ ×©×× ×× ××ª×××ª ×××××´×
@@ -2327,25 +2549,14 @@ 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: ××©×ª××©××
       showing:
         one: ××£ %{page} (%{first_item} ××ª×× %{items})
         other: ××£ %{page} (%{first_item}â%{last_item} ××ª×× %{items})
-      summary: '%{name} × ××¦×¨ ×××ª×××ª %{ip_address} ×Ö¾%{date}'
-      summary_no_ip: '%{name} × ××¦×¨ ×Ö¾%{date}'
+      summary_html: '%{name} × ××¦×¨ ×××ª×××ª %{ip_address} ×Ö¾%{date}'
+      summary_no_ip_html: '%{name} × ××¦×¨ ×Ö¾%{date}'
       confirm: ×××©××¨ ××©×ª××©×× × ×××¨××
       hide: ××¡×ª×¨×ª ××©×ª××©×× × ×××¨××
       empty: ×× × ××¦×× ××©×ª××©×× ×ª×××××
@@ -2353,7 +2564,7 @@ he:
       title: ×××©××× ×××©×¢×
       heading: ×××©××× ×××©×¢×
       webmaster: ×× ×× ×××ª×¨
-      body: |-
+      body_html: |-
         <p>
           ×¡××××, ××©×××× ×××©×¢× ××××¤× ××××××× ×¢×§×
           ×¤×¢××××ª ××©×××.
@@ -2403,7 +2614,7 @@ he:
       back: ×××¨× ×××¤×ª×
     new:
       title: ××¦××¨×ª ××¡××× ×©× %{name}
-      heading: ××¦××¨×ª ××¡××× ×©× %{name}
+      heading_html: ××¦××¨×ª ××¡××× ×©× %{name}
       reason: ××¡××× ×©×××× × ×××©××× %{name} × ××¡×. × × ×××ª×× ××©×× ××××× × ××¨×××¢ ×××ª×ª ×××
         ×©×××ª×¨ ×¤×¨××× ×¢× ×××¦×. × × ×××××¨ ×©×× ×× ×××©×ª××©×× ×××× ×× ××ª ××¢×× ×××§×¦××¢××ª ×©× ××§××××
         ××××©×ª×× ×××©×ª××© ×××××× ××¨××¨××ª ××××.
@@ -2414,7 +2625,7 @@ he:
       back: ××¦××ª ×× ×××¡××××ª
     edit:
       title: ××¡×××ª ×¢×¨××× ×¢× %{name}
-      heading: ××¡×××ª ×¢×¨××× ×¢× %{name}
+      heading_html: ××¡×××ª ×¢×¨××× ×¢× %{name}
       reason: ××¡××× ×©×××× × ×××©××× %{name} × ××¡×. × × ×××ª×× ××©×× ×××× ×× ××¨×××¢ ×××ª×ª ×××
         ×©×××ª×¨ ×¤×¨××× ×¢× ×××¦×. × × ×××××¨ ×©×× ×× ×××©×ª××©×× ×××× ×× ××ª ××¢×× ×××§×¦××¢××ª ×©× ××§××××
         ×××©×ª×× ×××©×ª××© ×××××× ××¨××¨××ª ××××.
@@ -2438,44 +2649,52 @@ he:
       empty: ×¢×× ×× × ×¢×©× ××¡××××ª.
     revoke:
       title: ××××× ×××¡××× ×¢× %{block_on}
-      heading: ××××× ×××¡××× ×©× %{block_on} ×¢×Ö¾××× %{block_by}
+      heading_html: ××××× ×××¡××× ×©× %{block_on} ×¢×Ö¾××× %{block_by}
       time_future: ×××¡××× ×ª×¡×ª××× ×Ö¾%{time}.
       past: ×××¡××× ××××ª ××¡×ª×××× ×Ö¾%{time} ×××Ö¾××¤×©×¨ ×××× ×××ª×.
       confirm: ××× ××¨×¦×× × ×××× ××ª ×××¡××× ××××ª?
       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}
-      heading: ×¨×©×××ª ×××¡××××ª ×©× %{name}
+      heading_html: ×¨×©×××ª ×××¡××××ª ×©× %{name}
       empty: ××¢××× ×× ×××¤×¢×× ××¡××× ×¢× %{name}
     blocks_by:
       title: ××¡××××ª ×¢×Ö¾××× %{name}
-      heading: ×¨×©×××ª ×××¡××××ª ×©× ×¢×©× ×¢×Ö¾××× %{name}
+      heading_html: ×¨×©×××ª ×××¡××××ª ×©× ×¢×©× ×¢×Ö¾××× %{name}
       empty: ××¢××× ×× × ×¢×©×ª× ××¡××× ×¢×Ö¾××× %{name}
     show:
       title: ×××©××× ×©× %{block_on} × ××¡× ×¢×Ö¾××× %{block_by}
-      heading: ×××©××× ×©× %{block_on} × ××¡× ×¢×Ö¾××× %{block_by}
+      heading_html: ×××©××× ×©× %{block_on} × ××¡× ×¢×Ö¾××× %{block_by}
       created: × ××¦×¨
       status: ×¡××××¡
       show: ××¦××
@@ -2501,7 +2720,7 @@ he:
       next: ××× Â»
       previous: Â« ××§×××
   notes:
-    mine:
+    index:
       title: ××¢×¨××ª ××ª×××××ª ×©× %{user}
       heading: ××¢×¨××ª ×©× %{user}
       subheading_html: ××¢×¨××ª ××ª×××××ª ×©× %{user}
@@ -2544,12 +2763,22 @@ he:
         out: ××ª×¨××§××ª
       locate:
         title: ××¦××ª ××××§×× ×©××
-        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: ××¢×¨××ª ×××¤×
@@ -2560,6 +2789,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: ×××ª×§×¨× ××× ××¢×¨×× ××ª ×××¤×
@@ -2620,6 +2855,9 @@ he:
         offramp_right_with_name_directions: ××××¦×× ×× ×ª×× ×××× × ×× %{name}, ××××××
           %{directions}
         onramp_right_without_exit: ××¤× ××ª ×××× × ××¢×××× ×× %{name}
+        onramp_right_with_directions: ××××¦×× ×××× × ×××¦××× ×××××× %{directions}
+        onramp_right_with_name_directions: ××××¦×× ×××× × ×××¦××× ×× %{name}, ××××××
+          %{directions}
         onramp_right_without_directions: ×¤× × ×××× × ×× ××¨××¤×
         onramp_right: ×¤× × ×××× × ×× ××¨××¤×
         endofroad_right_without_exit: ××¡××£ ×××¨× ××¤× ××ª ×××× × ×× %{name}
@@ -2637,8 +2875,12 @@ he:
         offramp_left_with_exit_name_directions: ×¦× ×××¦××× %{exit} ××©××× ×× %{name},
           ×××××× %{directions}
         offramp_left_with_name: ××¢×××ª ×©×××× ×× %{name}
+        offramp_left_with_directions: ××××¦×× ×©×××× ×××¦××× ×××××× %{directions}
+        offramp_left_with_name_directions: ××××¦×× ×× ×ª×× ××©×××× ×× %{name}, ××××××
+          %{directions}
         onramp_left_without_exit: ××¤× ××ª ×©×××× ××¢×××× ×× %{name}
         onramp_left_with_directions: ×¤× × ×©×××× ××¢××¨ ××¨××¤× ×××××× %{directions}
+        onramp_left_with_name_directions: ××¤× ××ª ×©×××× ×××¦××× ×× %{name}, ×××××× %{directions}
         onramp_left_without_directions: ××××¦×× ××©×××
         onramp_left: ××××¦×× ×××××
         endofroad_left_without_exit: ××¡××£ ×××¨× ××¤× ××ª ×©×××× ×× %{name}
@@ -2672,7 +2914,7 @@ he:
           tenth: ×¢×©××¨××ª
       time: ×××
     query:
-      node: ×¦×××ª
+      node: × ×§×××
       way: ××¨×
       relation: ×××¡
       nothing_found: ×× × ××¦×× ××©××××ª