X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b39251810b7f2e52d6e61a5657284da72655af2d..ea6ace3ac57646e268c0e51c8b0d679de117f735:/config/locales/he.yml

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 75c512da5..18291aabd 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1,32 +1,42 @@
 # Messages for Hebrew (×¢××¨××ª)
 # Exported from translatewiki.net
 # Export driver: phpyaml
-# Author: Abijeet Patro
 # Author: Amire80
 # Author: Aude
+# Author: Avma
 # Author: Dan.translate
+# Author: Danieldegroot2
 # Author: Dekel E
 # Author: Deror avi
 # Author: Erelon
 # Author: Ex-Diktator
 # Author: ExampleTomer
+# Author: Ghsuvr
 # Author: GilCahana
 # Author: Guycn2
 # Author: HarelM
 # Author: Inkbug
 # Author: Itay naor
 # Author: LaG roiL
+# Author: Leononon
 # Author: Metraduk
+# Author: N100a
 # Author: Nemo bis
+# Author: Nimrod Rak
 # Author: Orsa
 # Author: Ruila
 # Author: Steeve815
+# Author: Xnet1234
 # Author: Yali23
 # Author: YaronSh
 # Author: Yona b
 # Author: Ypnypn
+# Author: Zstadler
 # Author: ××××¨ ××
+# Author: ××©×¨×× ×§××¨
+# Author: ××§×£
 # Author: × ×× ×¡
+# Author: ×¢×¨×
 # Author: ×ª×××¨ ×
 ---
 he:
@@ -41,7 +51,7 @@ he:
       prompt: ××××¨×ª ×§×××¥
     submit:
       diary_comment:
-        create: ×©×××¨×
+        create: ×¤×¨×¡×× ××¢×¨×
       diary_entry:
         create: ×¤×¨×¡××
         update: ×¢××××
@@ -52,9 +62,12 @@ he:
       client_application:
         create: ×¨××©××
         update: ×¢××××
+      oauth2_application:
+        create: ××¨×©××
+        update: ×¢××××
       redaction:
-        create: ××¦××¨×ª ×××ª××
-        update: ×©×××¨×ª ×××ª××
+        create: ××¦××¨×ª ××¡×¨×
+        update: ×©×××¨×ª ××¡×¨×
       trace:
         create: ××¢×××
         update: ×©×××¨×ª ×©×× ××××
@@ -65,64 +78,74 @@ he:
     errors:
       messages:
         invalid_email_address: ×××ª ××× × ××ª×××ª ××××´× ×ª×§× ××ª
-        email_address_not_routable: ××× ××¤×©×¨××ª ×××××ª ××¡×××
+        email_address_not_routable: ×× ××¨Ö¾× ××ª××
+        display_name_is_user_n: ×× ×× ×××× ×××××ª user_n ××× ×× ×× n ××× ×××× ×××©×ª××©
+          ×©××
+      models:
+        user_mute:
+          is_already_muted: ×××¨ ×××©×ª×§
     models:
       acl: ×¨×©×××ª ××§×¨×ª ×××©×
       changeset: ×¢×¨××ª ×©×× ××××
       changeset_tag: ×ª× ×¢×¨××ª ×©×× ××××
       country: ×××× ×
       diary_comment: ×ª×××× ×××××
-      diary_entry: ×¨×©××× ×××××
+      diary_entry: ×¨×©×××ª ××××
       friend: ×××¨
-      issue: ×¡××××
+      issue: ××¢××
       language: ×©×¤×
       message: ××××¢×
       node: × ×§×××
-      node_tag: ×ª× ××¤×¨×§
-      notifier: ×××××¢
+      node_tag: ×ª× × ×§×××
       old_node: × ×§××× ××©× ×
-      old_node_tag: ×ª× ××¤×¨×§ ××©×
+      old_node_tag: ×ª× ×¦×××ª ××©×
       old_relation: ×××¡ ××©×
       old_relation_member: ××××¨ ×××¡ ××©×
       old_relation_tag: ×ª× ×××¡ ××©×
       old_way: ××¨× ××©× ×
-      old_way_node: × ×§×××ª ××¨× ××©× ×
-      old_way_tag: ×ª× ××¨× ××©× ×
+      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)
+        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_read_gpx: ××§×¨×× ××ª ××§××××ª ×Ö¾GPS ××¤×¨××××ª ×©×××
+        allow_write_gpx: ×××¢×××ª ××§××××ª GPS
         allow_write_notes: ××©× ××ª ××¢×¨××ª
       diary_comment:
         body: ×××£
       diary_entry:
         user: ××©×ª××©
         title: × ××©×
+        body: ×××£
         latitude: ×§× ×¨×××
         longitude: ×§× ×××¨×
-        language: ×©×¤×
+        language_code: ×©×¤×
+      doorkeeper/application:
+        name: ×©×
+        redirect_uri: ××ª×××ª URL ×©× ××¤× ××
+        confidential: ×××©×× ×¡×××?
+        scopes: ××¨×©×××ª
       friend:
         user: ××©×ª××©
         friend: ×××¨
@@ -137,98 +160,125 @@ 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:
+      doorkeeper/application:
+        confidential: ××××©×× ××©××© ×××§××××ª ×©×× ×¡×× ×××§×× ×××× ××××©××¨ ××¡×××××ª (×××©××××
+          × ××××× ××××××× ××××©××× ××£ ××× ××× × ×¡×××××)
+        redirect_uri: ×××©×ª××© ××©××¨× ×××ª ×××ª×××ª URI
       trace:
-        tagstring: ×××¤×¨× ××¤×¡××§××
+        tagstring: ×××¤×¨××× ××¤×¡××§××
+      user_block:
+        reason: ××¡××× ×©×××× × ×××©×ª××© × ××¡×. × × ×××ª×× ××©×× ××××× × ××¨×××¢ ×××ª×ª ××× ×©×××ª×¨
+          ×¤×¨××× ×¢× ×××¦×. × × ×××××¨ ×©×× ×× ×××©×ª××©×× ×××× ×× ××ª ××¢×× ×××§×¦××¢××ª ×©× ××§××××
+          ××××©×ª×× ×××©×ª××© ×××××× ××¨××¨××ª ××××.
+        needs_view: ××× ×××©×ª××© ×¦×¨×× ××××× ×¡ ××¤× × ×©×××¡××× ××××ª ×ª× ××§×?
+      user:
+        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} ×©× ××
-  printable_name:
-    with_name_html: '%{name} (%{id})'
+        many: ××¤× × %{count} ×©× ××
+        other: ××¤× × %{count} ×©× ××
   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: ×××
-      openid: OpenID
       google: ××××
       facebook: ×¤×××¡×××§
-      windowslive: Windows Live
-      github: GitHub
+      microsoft: ×××§×¨××¡××¤×
+      github: ××××××
       wikipedia: ×××§××¤×××
   api:
     notes:
@@ -243,26 +293,88 @@ he:
         reopened_at_by_html: ×××¤×¢×× ××××© %{when} ×¢×Ö¾××× %{user}
       rss:
         title: ××¢×¨××ª ×©× OpenStreetMap
-        description_area: ×¨×©×××ª ××¢×¨××ª ×©×××¡×¤×, ×©××ª×§××× ×¢×××× ××¢×¨××ª ××©× ××××¨× ×××××¨ ×©××
+        description_all: ×¨×©××× ×©× ××¢×¨××ª ×××××××ª, ×©××××× ×¢×××× ×× ×©× ×¡××¨×
+        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: ×ª××××
         full: ××¢×¨× ××××
+  account:
+    deletions:
+      show:
+        title: ×××××§ ××ª ×××©×××
+        warning: ××××¨×! ×ª×××× ××××§×ª ×××©××× ××× ×¡××¤× ××××ª×Ö¾××¤××.
+        delete_account: ××××§×ª ××©×××
+        delete_introduction: '×××¤×©×¨××ª× ×××××§ ××ª ××©××× ×Ö¾OpenStreetMap ×©×× ×¢×Ö¾××× ××××¦×
+          ×¢× ×××¤×ª××¨ ×©××××. ×©×× ×× ××¤×¨××× ×××××:'
+        delete_profile: ××××¢ ××¤×¨××¤×× ×©××, ×××× ××ª××× ×, ××ª××××¨, ××××§×× ××××ª ×©×× ×××¡×¨×.
+        delete_display_name: ×©× ××ª×¦××× ×©×× ×××¡×¨, ×× ××ª× ×××× ×××©×ª××© ×× ×××©××× ××ª ×××¨××.
+        retain_caveats: '××× ×××§ ××××××¢ ×¢××× ×××©××¨ ×Ö¾OpenStreetMap, ××¤××× ×××¨× ××××§×ª
+          ××©××× ×:'
+        retain_edits: ××¢×¨××××ª ×©×× ×××¡××¡ ×× ×ª×× ×× ×©× ×××¤×, ×× ×§×××××ª, ×××©××¨×.
+        retain_traces: ×××§××××ª ×©××¢×××ª×, ×× ××© ××××, ×××©××¨×.
+        retain_diary_entries: ×××× ××× ××¡××ª ××××× ××ª×××××ª ×©××, ×× ×§×××××, ×××©××¨×, ××
+          ×× × ××ª× ×××× ××¦×¤××ª ×××.
+        retain_notes: ××¢×¨××ª ×××¤× ××ª×××××ª ×××¢×¨××ª, ×× ××© ××××, ×××©××¨×, ××× ×××¡×ª×¨×.
+        retain_changeset_discussions: ××××× ×× ×©××× ×¢× ×¢×¨×××ª ××©×× ××××, ×× ××© ××××,
+          ×××©××¨×.
+        retain_email: ××ª×××ª ×××××¨ ××××§××¨×× × ×©×× ×ª××©××¨.
+        recent_editing_html: ××××× ×©×¢×¨××ª ××××¨×× × ××× ××¤×©×¨××ª ×××××§ ××ª ×××©××× ×©××. ××¤×©×¨
+          ×××× ×××××§ ×××ª× ××¢×× %{time}.
+        confirm_delete: ××××©××?
+        cancel: ×××××
+  accounts:
+    edit:
+      title: ×¢×¨×××ª ××©×××
+      my settings: ×××××¨××ª ×©××
+      current email address: ××ª×××ª ××××´× × ×××××ª
+      external auth: ×××××ª ×××¦×× ×
+      openid:
+        link text: ×× ××?
+      public editing:
+        heading: ×¢×¨××× ×¦××××¨××ª
+        enabled: ×××¤×¢××ª. ×× ××××× × ××××× ××¢×¨×× ××××¢.
+        enabled link text: ×× ××?
+        disabled: ×× ×××¤×¢××ª, ××× ××¤×©×¨××ª ××¢×¨×× × ×ª×× ×× ××× ××¢×¨××××ª ××§×××××ª ××××× ×××ª.
+        disabled link text: ××××¢ ××× × ×××× ××¢×¨××?
+      contributor terms:
+        heading: ×ª× ×× ×ª×¨×××
+        agreed: ××¡×××ª ××ª× ×× ××ª×¨××× ××××©××.
+        not yet agreed: ×¢×××× ×× ××¡×××ª ××ª× ×× ××ª×¨××× ××××©××.
+        review link text: × × ××¢×××¨ ××§××©××¨ ××× ×××× × ××¤× ×× ××× ××¡×§××¨ ×××§×× ××ª ×ª× ××
+          ××ª×¨××× ××××©××.
+        agreed_with_pd: ××¦××¨×ª ×× ×©××××× ×ª× ××¢×¨××××ª ×©×× ×××× ×× ×××ª ××××.
+        link text: ×× ××?
+      save changes button: ×©×××¨×ª ××©×× ××××
+      delete_account: ××××§×ª ××©×××...
+    go_public:
+      heading: ×¢×¨××× ×¦××××¨××ª
+      currently_not_public: ××¢×ª, ××¢×¨××××ª ×©×× ××××× ×××ª ××× ×©×× ×× ×××××× ××©××× ×× ××××¢××ª
+        ×× ××¨×××ª ××ª ××××§×× ×©××. ××× ×××¨×××ª ×× ×¢×¨××ª ××××¤×©×¨ ××× ×©×× ×××¦××¨ ×××ª× ×§×©×¨ ××¨×
+        ×××ª×¨, ××© ×××××¥ ×¢× ×××¤×ª××¨ ××××.
+      only_public_can_edit: ××× ×××¢××¨ ×Ö¾API 0.6, ×¨×§ ××©×ª××©×× ×¦××××¨××× ×××××× ××¢×¨××
+        × ×ª×× × ××¤×.
+      find_out_why: ×××¨×¨ ×××
+      email_not_revealed: ××ª×××ª ××××"× ×©×× ×× ×ª×××©×£ ××©×ª××¤×× ××¦××××¨××ª.
+      not_reversible: ×× × ××ª× ×××¤×× ××ª ××¤×¢××× ××××ª, ××× ×××©×ª××©×× ××××©×× ××¢×ª ×¦××××¨×××
+        ×××¨××¨×ª ××××.
+      make_edits_public_button: ×××¤×× ××ª ×× ×¢×¨××××ª×× ××¦××××¨×××ª
+    update:
+      success_confirm_needed: ××××¢ ×¢× ×××©×ª××© ×¢×××× ×××¦×××. × × ×××××§ ××ª ×ª×××ª ×××××´×
+        ××× ××××ª ××ª ×××××´× ××××©.
+      success: ×¤×¨×× ×××©×ª××© ×¢×××× × ×××¦×××.
+    destroy:
+      success: ××©××× × ×××§.
   browse:
-    created: × ××¦×¨×
-    closed: × ×¡××¨×
-    created_html: × ××¦×¨× <abbr title='%{title}'>%{time}</abbr>
-    closed_html: × ×¡××¨× <abbr title='%{title}'>%{time}</abbr>
-    created_by_html: × ××¦×¨× <abbr title='%{title}'>%{time}</abbr> ×¢×Ö¾××× %{user}
-    deleted_by_html: × ×××§× <abbr title='%{title}'>%{time}</abbr> ×¢×Ö¾××× %{user}
-    edited_by_html: × ×¢×¨×× <abbr title='%{title}'>%{time}</abbr> ×¢×Ö¾××× %{user}
-    closed_by_html: × ×¡××¨× <abbr title='%{title}'>%{time}</abbr> ×¢×Ö¾××× %{user}
+    deleted_ago_by_html: × ×××§× %{time_ago} ×¢×Ö¾××× %{user}
+    edited_ago_by_html: × ×¢×¨×× %{time_ago} ×¢×Ö¾××× %{user}
     version: ××¨×¡×
+    redacted_version: ××¨×¡× ×©×××¡×¨ ××× × ××××¢
     in_changeset: ×¢×¨××ª ×©×× ××××
     anonymous: ××××× ×
     no_comment: (××× ××¢×¨××ª)
@@ -279,34 +391,17 @@ he:
       other: '%{count} ××¨×××'
     download_xml: ×××¨××ª XML
     view_history: ××¦××ª ××××¡×××¨××
+    view_unredacted_history: ××¦××ª ×××¡×××¨×× ××× ××¡×¨××ª
     view_details: ××¦××ª ×¤×¨×××
+    view_redacted_data: ××¦××ª ×× ×ª×× ×× ×©×××¡×¨×
+    view_redaction_message: ××¦××ª ××××¢×ª ××¡×¨×
     location: '×××§××:'
-    changeset:
-      title: '×¢×¨××ª ×©×× ××××: %{id}'
-      belongs_to: ×××¦×¨
-      node: × ×§××××ª (%{count})
-      node_paginated: ××¤×¨×§×× (%{x}â%{y} ××ª×× %{count})
-      way: ××¨××× (%{count})
-      way_paginated: ××¨××× (%{x}â%{y} ××ª×× %{count})
-      relation: ×××¡×× (%{count})
-      relation_paginated: ×××¡×× (%{x}â%{y} ××ª×× %{count})
-      comment: ××¢×¨××ª (%{count})
-      hidden_commented_by: ××¢×¨× ×××¡×ª×¨×ª ×××©×ª××© %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by: ××¢×¨× ×××©×ª××© %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      changesetxml: XML ×©× ×¢×¨××ª ×©×× ××××
-      osmchangexml: osmChange XML
-      feed:
-        title: ×¢×¨××ª ×©×× ×××× %{id}
-        title_comment: ×¢×¨××ª ×©×× ×××× %{id} â %{comment}
-      join_discussion: × × ××××× ×¡ ×××©××× ××× ×××¦××¨×£ ×××××
-      discussion: ××××
-      still_open: ×¢×¨××ª ××©×× ×××× ×¢×××× ×¤×ª××× â ××××× ×××¤×ª× ×××¨× ×©×¢×¨××ª ××©×× ××× ×ª××¡××¨.
     node:
       title_html: '× ×§×××: %{name}'
-      history_title_html: '×××¡×××¨×××ª ××¦×××ª: %{name}'
+      history_title_html: '×××¡×××¨×××ª ×× ×§×××: %{name}'
     way:
-      title_html: '××¨×: %{name}'
-      history_title_html: '×××¡×××¨×××ª ×××¨×: %{name}'
+      title_html: '×§×: %{name}'
+      history_title_html: '×××¡×××¨×××ª ××§×: %{name}'
       nodes: × ×§××××ª
       nodes_count:
         one: × ×§××× ×××ª
@@ -314,7 +409,9 @@ he:
         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}'
@@ -329,31 +426,32 @@ he:
       entry_role_html: '%{type} %{name} ××ª××¨ %{role}'
       type:
         node: × ×§×××
-        way: ××¨×
+        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: ××¨×
+        way: ×§×
         relation: ×××¡
         changeset: ×¢×¨××ª ×©×× ××××
         note: ××¢×¨×
     timeout:
-      sorry: ×× × ××ª× ×¦×××, ×× ××¢×× ×ª ××ª××× ×¢×××¨ ×%{type} ×¢× ××××× %{id}, ××¨×× ××× ×¨×
-        ×××.
+      title: ×©××××ª ××× ×××§×¦×
+      sorry: ×× × ××ª× ×¦×××, ×× ××¢×× ×ª ×××××¢ ×¢×××¨ %{type} ××¡×¤×¨ %{id}, ××¨×× ××× ×¨× ×××.
       type:
         node: × ×§×××
-        way: ××¨×
+        way: ×§×
         relation: ×§×©×¨
         changeset: ×¢×¨××ª ×©×× ××××
         note: ××¢×¨×
     redacted:
-      redaction: ×××ª×× %{id}
-      message_html: '×× × ××ª× ×××¦×× ××ª ×××¨×¡× %{version} ×©× %{type} ×××××× ×©××× × ××ª××.
+      redaction: ××¡×¨× %{id}
+      message_html: '×× × ××ª× ×××¦×× ××ª ×××¨×¡× %{version} ×©× %{type} ×××××× ×©××× ×××¡×¨×.
         ×××××¢ × ××¡×£: %{redaction_link}.'
       type:
         node: × ×§×××
@@ -367,35 +465,28 @@ he:
     tag_details:
       tags: ×ª×××
       wiki_link:
-        key: ×¢××× ××ª××××¨ ×¢×××¨ ××ª× %{key}
-        tag: ×¢××× ××ª××××¨ ×¢×××¨ ××ª× %{key}=%{value}
+        key: ××£ ××ª××××¨ ×¢×××¨ ××ª× %{key}
+        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: ××¢×¨× ×××©×
-      description: ×ª××××¨
-      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>
-      report: ××××× ×¢× ×××¢×¨× ××××ª
+      email_link: ××××´× %{email}
     query:
       title: ×©××××ª×ª ××©××××ª
-      introduction: ××© ×××××¥ ×¢××××¤× ××× ×××¦×× ××©××××ª ××¡××××.
+      introduction: ××© ×××××¥ ×¢× ×××¤× ××× ×××¦×× ××©××××ª ××¡××××.
       nearby: ××©××××ª ××¡××××
-      enclosing: ××©××××ª ×¡×××××ª
+      enclosing: ××©××××ª ××××××ª
+  old_nodes:
+    not_found:
+      sorry: ×× × ××ª× ×××¦×× ××ª × ×§××× ××¡×³ %{id} ×××¨×¡× %{version}, ×××××.
+  old_ways:
+    not_found:
+      sorry: ×× × ××ª× ×××¦×× ××ª ××¨× ××¡×³ %{id} ×××¨×¡× %{version}, ×××××.
+  old_relations:
+    not_found:
+      sorry: ×× × ××ª× ×××¦×× ××ª ×××¡ ××¡×³ %{id} ×××¨×¡× %{version}, ×××××.
   changesets:
     changeset_paging_nav:
       showing_page: ×××£ %{page}
@@ -407,13 +498,14 @@ he:
       view_changeset_details: ××¦××ª ×¤×¨×× ×¢×¨××ª ×©×× ××××
     changesets:
       id: ××××
-      saved_at: × ×©××¨× ×ª××ª
+      saved_at: × ×©××¨× ×Ö¾
       user: ××©×ª××©
-      comment: ××¢×¨×
+      comment: ×ª××××
       area: ×©××
     index:
       title: ×¢×¨×××ª ×©×× ××××
       title_user: ×¢×¨×××ª ×©×× ×××× ×××ª %{user}
+      title_user_link_html: ×¢×¨×××ª ×©×× ×××× ×××ª %{user_link}
       title_friend: ×¢×¨×××ª ×©×× ×××× ×©× ××××¨×× ×©××
       title_nearby: ×¢×¨×××ª ×©×× ×××× ×©× ××©×ª××©×× ××¡××××
       empty: ×× × ××¦×× ××£ ×¢×¨××ª ×©×× ××××.
@@ -423,6 +515,48 @@ he:
       no_more_area: ××× ×¢×× ×¢×¨×××ª ×©×× ×××× ×××××¨ ×××.
       no_more_user: ××× ×¢×¨×××ª ×©×× ×××× × ××¡×¤××ª ×××ª ×××©×ª××© ×××.
       load_more: ×××¢×× ×¢××
+      feed:
+        title: ×¢×¨××ª ×©×× ×××× %{id}
+        title_comment: ×¢×¨××ª ×©×× ×××× %{id} â %{comment}
+        created: × ××¦×¨×
+        closed: × ×¡××¨×
+        belongs_to: ×××¦×¨
+    subscribe:
+      heading: ××¢×©××ª ××× ×× ××××× ××¢×¨××ª ××©×× ×××× ××××?
+      button: ××× ×× ×××××
+    unsubscribe:
+      heading: ×××× ××ª ×××× ×× ××××× ××¢×¨××ª ××©×× ×××× ××××?
+      button: ××××× ×××× ×× ×××××
+    heading:
+      title: ×¢×¨××ª ×©×× ×××× %{id}
+      created_by_html: × ××¦×¨× ×¢×Ö¾××× %{link_user} ×Ö¾%{created}.
+    no_such_entry:
+      title: ××× ×¢×¨××ª ×©×× ×××× ××××ª
+      heading: '××× ×¨×©××× ×¢× ×××××: %{id}'
+      body: ×¡××××, ××× ×¢×¨××ª ×©×× ×××× ×¢× ××××× %{id}. ×××× ×××××ª ×× × ××× ××××× ×××¦×ª
+        ×¢× ×§××©××¨ ×©×××.
+    show:
+      title: '×¢×¨××ª ×©×× ××××: %{id}'
+      created: '× ××¦×¨×: %{when}'
+      closed: '× ×¡××¨×: %{when}'
+      created_ago_html: × ××¦×¨× %{time_ago}
+      closed_ago_html: × ×¡××¨× %{time_ago}
+      created_ago_by_html: × ××¦×¨× %{time_ago} ×¢×Ö¾××× %{user}
+      closed_ago_by_html: × ×¡××¨× %{time_ago} ×¢×Ö¾××× %{user}
+      discussion: ××××
+      join_discussion: × × ××××× ×¡ ×××©××× ××× ×××¦××¨×£ ×××××
+      still_open: ×¢×¨××ª ××©×× ×××× ×¢×××× ×¤×ª××× â ××××× ×××¤×ª× ×××¨× ×©×¢×¨××ª ××©×× ××× ×ª××¡××¨.
+      comment_by_html: ××¢×¨× ×××ª %{user} %{time_ago}
+      hidden_comment_by_html: ××¢×¨× ×××¡×ª×¨×ª ×××ª %{user} %{time_ago}
+      changesetxml: XML ×©× ×¢×¨××ª ××©×× ××××
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: × ×§××××ª (%{count})
+      nodes_paginated: × ×§××××ª (%{x}â%{y} ××ª×× %{count})
+      ways: ×§×××× (%{count})
+      ways_paginated: ×§×××× (%{x}â%{y} ××ª×× %{count})
+      relations: ×××¡×× (%{count})
+      relations_paginated: ×××¡×× (%{x}â%{y} ××ª×× %{count})
     timeout:
       sorry: ×§×××ª ×¨×©×××ª ×¢×¨×××ª ××©×× ×××× ×©×××§×©×ª ×××¨××ª ××× ×¨× ×××, ×¢×× ××¡××××.
   changeset_comments:
@@ -437,16 +571,33 @@ he:
     timeout:
       sorry: ×××× ×©××§× ××¨×©×××ª ×××¢×¨××ª ×¢× ×¢×¨××ª ××©×× ×××× ×©×××§×©×ª ×××ª×§×× ××¨×× ×××, ×¢××
         ××¡××××.
+  dashboards:
+    contact:
+      km away: ×××¨××§ %{count} ×§×´×
+      m away: ×××¨××§ %{count} ××³
+      latest_edit_html: '×¢×¨××× ×××¨×× × (%{ago}):'
+    popup:
+      your location: ×××§×××
+      nearby mapper: ×××¤× ×¡×××
+      friend: ×××¨
+    show:
+      title: ××× ×××§×¨× ×©××
+      no_home_location_html: '%{edit_profile_link} ×××××¨×ª ×××§×× ××××ª ×©×× ××¦×¤××× ×××©×ª××©××
+        ×§×¨××××.'
+      edit_your_profile: ×¢×¨×××ª ××¤×¨××¤×× ×©××
+      my friends: ××××¨×× ×©××
+      no friends: ×¢×××× ×× ×××¡×¤×ª ×××¨××.
+      nearby users: ×¢×× ××©×ª××©×× ××¡××××
+      no nearby users: ××× ×¢×××× ×¢×× ××©×ª××©×× ×©××××× ×©×× ×××¤× ××¡××××.
+      friends_changesets: ×¢×¨×××ª ×©×× ×××× ×©× ×××¨××
+      friends_diaries: ×¨×©××××ª ×××× ×©× ×××¨××
+      nearby_changesets: ×¢×¨×××ª ××©×× ×××× ×©× ××©×ª××©×× ××¡××××
+      nearby_diaries: ×¨×©××××ª ×××× ×©× ××©×ª××©×× ××¡××××
   diary_entries:
     new:
       title: ×¨×©×××ª ×××× ×××©×
     form:
-      subject: '× ××©×:'
-      body: '×ª×××:'
-      language: '×©×¤×:'
-      location: '×××§××:'
-      latitude: '×§× ×¨×××:'
-      longitude: '×§× ×××¨×:'
+      location: ×××§××
       use_map_link: ×××©×ª××© ×××¤×
     index:
       title: ×××× ×× ×©× ×××©×ª××©
@@ -467,6 +618,7 @@ he:
     show:
       title: ××××× ×©×%{user} &rlm; | %{title}
       user_title: ××××× ×©× %{user}
+      discussion: ××××
       leave_a_comment: ×××¡×¤×ª ×ª××××
       login_to_leave_a_comment_html: × × %{login_link} ××× ×××©×××¨ ×ª××××
       login: ××××× ×¡
@@ -476,13 +628,16 @@ 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:
-        zero: ××× ×ª×××××ª
         one: ×ª×××× ×××ª
+        two: '%{count} ×ª×××××ª'
+        many: '%{count} ×ª×××××ª'
         other: '%{count} ×ª×××××ª'
+      no_comments: ××× ×ª×××××ª
       edit_link: ×¢×¨×××ª ×¨×©××× ××
       hide_link: ××¡×ª×¨×ª ×¨×©××× ××
       unhide_link: ××××× ××¡×ª×¨×ª ×¨×©××× ××
@@ -490,8 +645,8 @@ he:
       report: ××××× ×¢× ××¨×©××× ××××ª
     diary_comment:
       comment_from_html: ×ª×××× ×××ª %{link_user} ×¢× %{comment_created_at}
-      hide_link: ××¡×ª×¨×ª ××¢×¨× ××
-      unhide_link: ××××× ××¡×ª×¨×ª ××¢×¨× ××
+      hide_link: ××¡×ª×¨×ª ×××¢×¨× ××××ª
+      unhide_link: ××××× ××¡×ª×¨×ª ×××¢×¨× ××××ª
       confirm: ×××©××¨
       report: ××××× ×¢× ×××¢×¨× ××××ª
     location:
@@ -509,64 +664,118 @@ he:
         title: ×¨×©××××ª ××××× ×©× OpenStreetMap
         description: ×¨×©××××ª ×××× ×××¨×× ××ª ×××©×ª××©× OpenStreetMap
     comments:
-      has_commented_on: × ××¡×¤× ××¢×¨× ×××ª %{display_name} ×¢× ×¨×©××××ª ××××× ×××××ª
+      title: ××¢×¨××ª ×××× ×©× ××¡×¤× ×¢×Ö¾××× %{user}
+      heading: ××¢×¨××ª ××××× ×©× %{user}
+      subheading_html: ××¢×¨××ª ×××× ×©× ××¡×¤× ×¢×Ö¾××× %{user}
+      no_comments: ××× ××¢×¨××ª ××××
       post: ×¨×©×××
       when: ××ª×
-      comment: ××¢×¨×
+      comment: ×ª××××
       newer_comments: ××¢×¨××ª ×××©××ª
       older_comments: ××¢×¨××ª ××©× ××ª
+    subscribe:
+      heading: ××¢×©××ª ××× ×× ××××× ××¨×©×××ª ××××× ××××?
+      button: ××× ×× ×××××
+    unsubscribe:
+      heading: ×××× ××ª ×××× ×× ××××× ××¨×©×××ª ××××× ××××?
+      button: ××××× ×××× ×× ×××××
+  doorkeeper:
+    errors:
+      messages:
+        account_selection_required: ×©×¨×ª ××××××ª ×××¨×© ××××¨×ª ××©××× ××©×ª××© ×§×¦×
+        consent_required: ×©×¨×ª ××××××ª ×××¨×© ××ª ××¡×××ª ××©×ª××© ××§×¦×
+        interaction_required: ×©×¨×ª ××××××ª ×××¨×© ×¤×¢××× ×××××ª ×¢× ××©×ª××© ××§×¦×
+        login_required: ×©×¨×ª ××××××ª ×××¨×© ××ª ×××××ª ××©×ª××© ××§×¦×
+    flash:
+      applications:
+        create:
+          notice: ××××©×× × ×¨×©×.
+    openid_connect:
+      errors:
+        messages:
+          auth_time_from_resource_owner_not_configured: |-
+            ××©× ×¢×§× ××××¨× ××¡×¨× ×©× Doorkeeper
+            ::OpenidConnect.configure.auth_time_from_resource_owner.
+          reauthenticate_resource_owner_not_configured: ××©× ×¢×§× ××××¨× ××¡×¨× ×©× Doorkeeper::OpenidConnect.configure.reauthenticate_resource_owner.
+          resource_owner_from_access_token_not_configured: ××©× ×¢×§× ××××¨× ××¡×¨× ×©× Doorkeeper::OpenidConnect.configure.resource_owner_from_access_token.
+          select_account_for_resource_owner_not_configured: ××©× ×¢×§× ××××¨× ××¡×¨× ×©×
+            Doorkeeper::OpenidConnect.configure.select_account_for_resource_owner.
+          subject_not_configured: ××¦××¨×ª ××¡×××× ×××× × ××©×× ××©× ×ª×¦××¨× ××¡×¨× ×©× Doorkeeper::OpenidConnect.configure.subject.
+    scopes:
+      address: ××¦××ª ×××ª×××ª ××¤××××ª ×©××
+      email: ××¦××ª ××ª×××ª ×××××´× ×©××
+      openid: ×××××ª ×××©××× ×©××
+      phone: ××¦××ª ××¡×¤×¨ ××××¤×× ×©××
+      profile: ××¦××ª ×¤×¨×× ××¤×¨××¤×× ×©××
+  errors:
+    contact:
+      contact_url_title: ××¡××¨ ×¢× ××××× ×¢×¨××¦× ××ª×§×©××¨×ª
+      contact: ×××¦××¨ ×§×©×¨
+      contact_the_community_html: ××¤×©×¨ %{contact_link} ×¢× ×§××××ª OpenStreetMap ×× ××¦××ª
+        ×§××©××¨ ×¤××× / ×ª×§××. ××© ××ª×¢× ××ª ×××ª×××ª ××××××§×ª ×©× ×××§×©× ×©××.
+    forbidden:
+      title: ××¡××¨
+      description: ××¤×¢××× ×©×××§×©×ª ×××¦×¢ ××× ×©×¨×ª OpenStreetMap ×××× × ××× ×××× ×××× (HTTP
+        403)
+    internal_server_error:
+      title: ×©××××ª ×××©××
+      description: ××©×¨×ª ×©× OpenStreetMap × ×ª×§× ××ª× ×× ×××ª×Ö¾×¦×¤×× ×©×× ×¢ ××× × ×××× ××ª ×××§×©×
+        (HTTP 500)
+    not_found:
+      title: ××§×××¥ ×× × ××¦×
+      description: ×××ª××¨ ×§×××¥/×ª××§×××/×¤×¢×××ª API ××©× ××× ××©×¨×ª ×©× OpenStreetMap ×× ××¦××××
+        (HTTP 404)
   friendships:
     make_friend:
       heading: ××××¡××£ ××ª %{user} ××ª××¨ ×××¨?
       button: ××××¡××£ ××××¨
       success: '%{name} ×××¨ ×©×× ×¢××©××!'
-      failed: ×¡××××, ×××¡×¤×ª %{name} ××××¨ × ××©××.
+      failed: ××¦××¢×¨××, ×××¡×¤×ª %{name} ××××¨ × ××©××.
       already_a_friend: '%{name} ×××¨ ×××¨ ×©××.'
+      limit_exceeded: ×©×××ª ××§×©××ª ×××¨××ª ×¨×××ª ××××¨×× ×. × × ××××ª×× ××¤× × ×©××××ª ××§×©××ª ×××¨××ª
+        × ××¡×¤××ª
     remove_friend:
       heading: ×××¡××¨ ××ª %{user} ××¨×©×××ª ××××¨××?
       button: ×××¡××¨ ××¨×©×××ª ××××¨××
       success: '%{name} ×××¡×¨ ××¨×©×××ª ××××¨×× ×©××.'
-      not_a_friend: '%{name} ×× ××× ×××××¨×× ×©××.'
+      not_a_friend: '%{name} ××× × ××× ×××××¨×× ×©××.'
   geocoder:
     search:
       title:
-        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_html: ×ª××¦×××ª ×××ª×¨ <a href="http://www.geonames.org/">GeoNames</a>
-        osm_nominatim_reverse_html: ×ª××¦×××ª ×Ö¾<a href="https://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>
-        geonames_reverse_html: ×ª××¦×××ª ×Ö¾<a href="http://www.geonames.org/">GeoNames</a>
+        results_from_html: ×ª××¦×××ª ××ª×× %{results_link}
+        latlon: ××§××¨××ª ×¤× ×××××
+        osm_nominatim: × ×××× ××× ×©× OpenStreetMap
+        osm_nominatim_reverse: × ×××× ××× ×©× OpenStreetMap
     search_osm_nominatim:
       prefix:
         aerialway:
           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: ×¨×××ª ×× ××
-          gate: ×©×¢×¨
+          apron: ×¨×××ª ×× ×××ª ××××¡××
+          gate: ×©×¢×¨ ×©×× ×ª×¢××¤×
           hangar: ×××¡× ××××¡××
           helipad: ×× ××ª ××¡××§××
           holding_position: ×××§×× ××××§×
           navigationaid: ×¢××¨ × ×××× ×××××¨×
-          parking_position: ×××§×× ×× ××
+          parking_position: ×¢×××ª ×× ××
           runway: ××¡××× ×××¨××
-          taxiway: ××¡××× × ×¡××¢×ª ××××¡
-          terminal: ××¡××£
+          taxilane: × ×ª×× ××¡×¢×
+          taxiway: ××¡××× ××¡×¢×
+          terminal: ×××ª × ×ª××××ª ×©× ×©×× ×ª×¢××¤×
           windsock: ×©×¨××× ×¨××
         amenity:
-          animal_boarding: ×¤× ×¡×××
+          animal_boarding: ×¤× ×¡××× ×××××ª
           animal_shelter: ×××ª ×××¡× ×××××ª
           arts_centre: ××¨×× ××× ××××ª
           atm: ××¡×¤×××
@@ -607,32 +816,32 @@ he:
           fast_food: ×××× ××××¨
           ferry_terminal: ××¡××£ ××¢×××¨×ª
           fire_station: ×ª×× ×ª ××××× ××©
-          food_court: ××××¨ ×××× ××××¨
+          food_court: ××ª×× ×××× ××××¨
           fountain: ×××¨×§×
-          fuel: ×××§
+          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: ××§×× ×¤××××
@@ -641,10 +850,10 @@ he:
           post_office: ×¡× ××£ ××××¨
           prison: ×××
           pub: ×¤××
-          public_bath: ××§×××ª ×¦××××¨××ª
+          public_bath: ××¨××¥ ×¦××××¨×
           public_bookcase: ×¡×¤×¨××× ××¢××¨×
           public_building: ××× × ×¦××××¨
-          ranger_station: ×ª×× ×ª ××¤×§×××
+          ranger_station: ×ª×× ×ª ×¤×§×××
           recycling: × ×§×××ª ××××××¨
           restaurant: ××¡×¢××
           sanitary_dump_station: ×ª×× ×ª ×¨××§×× ×¤×¡×××ª
@@ -652,8 +861,8 @@ he:
           shelter: ×××¡×
           shower: ××§×××ª
           social_centre: ××¨×× ×××¨×ª×
-          social_facility: ××ª×§× ×××¨×ª×
-          studio: ×¡×××××
+          social_facility: ×©××¨××ª×× ×××¨×ª×××
+          studio: ×××¨×ª ×¡×××××
           swimming_pool: ××¨Öµ××ª ×©××××
           taxi: ××× ××ª
           telephone: ×××¤×× ×¦××××¨×
@@ -665,10 +874,10 @@ 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: ×××× × ××©×¨
@@ -678,58 +887,58 @@ he:
           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: ×× ××× ×ª×¢×©×××
+          manufacture: ××× × ×ª×¢×©×××
           office: ×× ××× ××©×¨×××
           public: ×× ××× ×¦××××¨×
           residential: ×× ××× ××××¨××
-          retail: ×× ××× ××¡××¨×
+          retail: ××× × ××¡××¨×
           roof: ××
-          ruins: ×× ××× ××¨××¡
+          ruins: ×××¨××
           school: ×××ª ×¡×¤×¨
           semidetached_house: ××Ö¾××©×¤××ª×
           service: ×× ××× ×©××¨××ª
-          shed: ×××¡×
+          shed: ×¦×¨××£
           stable: ×××¨×××
           static_caravan: ×§×¨××××
-          temple: ×× ××× ××§××©
+          temple: ××§××©
           terrace: ×× ××× ××××¨×
           train_station: ×× ××× ×ª×× ×ª ×¨×××ª
           university: ××× ×××¨×¡×××
@@ -740,7 +949,7 @@ he:
           sport: ×××¢××× ×¡×¤××¨×
           "yes": ×××¢×××
         craft:
-          beekeper: ××××¨×
+          beekeeper: ××××¨×
           blacksmith: × ×¤×
           brewery: ×××©××ª ×××¨×
           carpenter: × ××¨
@@ -753,8 +962,8 @@ he:
           glaziery: ×××
           handicraft: ×××××ª ××
           hvac: ×ª×× ×× ××××× ×××××¨
-          metal_construction: ×¡×¤×§ ××ª××ª
-          painter: ×¦×××¨
+          metal_construction: ××¨×× ×× ×××
+          painter: ×¦Ö·×Ö¸Ö¼×¢
           photographer: ×¦××
           plumber: ×©×¨××¨×
           roofer: ×××
@@ -769,48 +978,48 @@ he:
           access_point: × ×§×××ª ×××©×
           ambulance_station: ×ª×× ×ª ×××××× ×¡××
           assembly_point: × ×§×××ª ××ª××¡×¤××ª
-          defibrillator: ××¤×¢×
-          fire_xtinguisher: ×××¤×
+          defibrillator: ××¤×¢× (××¤×××¨×××××¨)
+          fire_extinguisher: ×××¤×
           fire_water_pond: ××××¨ ××× ×××××× ××©
-          landing_site: ××ª×¨ × ×××ª×ª ×××¨××
+          landing_site: ××ª×¨ × ×××ª× ××××¨××
           life_ring: ×××× ××¦××
           phone: ×××¤×× ×××¨××
           siren: ×¦××¤×¨ ×××¨××
           suction_point: × ×§××××ª ×©×××× ××××¨××
           water_tank: ××× ××× ××©×¢×ª ×××¨××
-          "yes": ×××¨××
         highway:
           abandoned: ××××© × ×××©
           bridleway: ×©××× ×¢×××¨ ×¡××¡××
-          bus_guideway: × ×ª×× ×ª××××¨× ×¦××××¨××ª ××× ×××ª
+          bus_guideway: × ×ª×× ×ª××××¨× ×¦××××¨××ª ××××¨××ª
           bus_stop: ×ª×× ×ª ×××××××¡
-          construction: ××××© ××××¨ ××× ×××
+          construction: ××¨× ××× ×××
           corridor: ×¤×¨×××××¨
+          crossing: ××¢××¨
           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: ××¦×××ª ××××¨××ª
@@ -818,66 +1027,68 @@ he:
           stop: ×ª××¨××¨ ×¢×¦××¨
           street_lamp: ×¤× ×¡ ×¨×××
           tertiary: ××¨× ×©×××©×× ××ª
-          tertiary_link: ××¨× ×©×××©×× ××ª
+          tertiary_link: ×××××¨ ×××¨× ×©×××©×× ××ª
           track: ××¨× ×¢×¤×¨
           traffic_mirror: ××¨×× ×¤× ××¨×××ª
           traffic_signals: ×¨××××¨
           trailhead: ×©×× ×ª××××ª ××¡×××
-          trunk: ××¨× ×¨××©××ª
-          trunk_link: ××¨× ×¨××©××ª
+          trunk: ××¨× ×¢××§×¨××ª
+          trunk_link: ×××××¨ ×××¨× ×¢××§×¨××ª
+          turning_circle: ××××¨ ×××¡×ª×××××ª
           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: ×××¨××
+          rune_stone: ××× ×¨×× ××ª
+          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: ××××¨ ×ª×¢×©×××
@@ -885,16 +1096,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": ×©××××© ××§×¨×§×¢
@@ -903,20 +1114,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: ×©×××¨×ª ×××¢
@@ -936,7 +1147,7 @@ he:
           water_park: ×¤××¨×§ ×××
           "yes": × ××¤×©
         man_made:
-          adit: ×× ××¡× ×××¤×§××ª ×××¢×¨×
+          adit: ×¤×ª× ×××¨×
           advertising: ×¤×¨×¡××
           antenna: ×× ×× ×
           avalanche_protection: ××× × ××¤× × ××¤××××ª
@@ -948,23 +1159,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: ×§× ×¦×× ××¨××ª
@@ -978,8 +1189,8 @@ he:
           surveillance: ××¢×§×
           telescope: ×××¡×§××¤
           tower: ××××
-          utility_pole: ×¢××× ××©××
-          wastewater_plant: ××¤×¢× ×××××¨ ×××
+          utility_pole: ×¢××× ××©×× ×× ×××¤××
+          wastewater_plant: ××¤×¢× ×××¤×× ××©×¤×××
           watermill: ××× ×ª ×××
           water_tap: ××¨× ×××
           water_tower: ×××× ×××
@@ -992,95 +1203,103 @@ he:
           airfield: ×× ××ª ×¦×××
           barracks: ××××¨× ××××××
           bunker: ××× ×§×¨
-          checkpoint: × ×§×××ª ××§×¨×
+          checkpoint: ××¢××¨ ××××§×
           trench: ×©×××
           "yes": ×¦×××
         mountain_pass:
-          "yes": ××¢××¨ ××¨×¨×
+          "yes": ××¢××¨ ××¨××
         natural:
+          atoll: ××××
           bare_rock: ×¡××¢ ××©××£
           bay: ××¤×¨×¥
           beach: ×××£
           cape: ××£
           cave_entrance: ×× ××¡× ×××¢×¨×
           cliff: ××¦××§
+          coastline: ×§× ×××£
           crater: ×××ª×©
-          dune: ×××××ª
-          fell: ×ª×
+          dune: ×××× ×
+          fell: ×¢×¨×× ×××¤×× ××ª
           fjord: ×¤×××¨×
           forest: ××¢×¨
           geyser: ×××××¨
-          glacier: ×§×¨×××
-          grassland: ××©×
+          glacier: ×§×¨××× ×××©×ª×
+          grassland: ×¢×¨××
           heath: ××ª×
           hill: ×××¢×
           hot_spring: ××¢××× ××
           island: ××
+          isthmus: ××¦×¨
           land: ××××
-          marsh: ×××¦× ×¨××××
-          moor: ××××ª ××××
+          marsh: ×××¦× ×¨×××× (×××××£)
+          moor: ×¢×¨×× ×××××
           mud: ×××¥
           peak: ×¤×¡××
+          peninsula: ××¦× ××
           point: × ×§×××
           reef: ×©×× ××ª
           ridge: ×¨××¡
           rock: ×¡××¢
-          saddle: ××¢××¨ ××× ××¨××
+          saddle: ××××£
           sand: ×××
-          scree: ×¢×¨××ª ×¡××¢××
+          scree: ××¤×××ª ××× ××
           scrub: ×¡××
+          shingle: ×××£ ××××§××
           spring: ××¢×××
           stone: ×××
           strait: ××¦×¨
           tree: ×¢×¥
+          tree_row: ×©××¨×ª ×¢×¦××
+          tundra: ××× ××¨×
           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: ×××§××ª ××× ××
+          archipelago: ××¨×××¤××
           city: ×¢××¨
           city_block: ××××§ ××¢××¨
           country: ××¨×¥
           county: ××××
           farm: ××××
-          hamlet: ××¤×¨
+          hamlet: ×××©××
           house: ×××ª
           houses: ××ª××
           island: ××
           islet: ×××Ö¹×
-          isolated_dwelling: ××××¨×× ×××××××
-          locality: ×××©××
-          municipality: ×¢××¨×××
+          isolated_dwelling: ××××ª ××××××
+          locality: ××§×× ×× ××××©×
+          municipality: ×¢××¨ ×× ×¨×©××ª ××§××××ª
           neighbourhood: ×©××× ×
           plot: ×××¨×©
           postcode: ×××§××
@@ -1093,51 +1312,54 @@ he:
           suburb: ×¤×¨×××¨
           town: ×¢×××¨×
           village: ××¤×¨
-          "yes": ××§××
+          "yes": ××§×× ×× ×××××¨
         railway:
           abandoned: ××¡×××ª ××¨×× × ×××©×
+          buffer_stop: ××× ×¤×××©
           construction: ××¡×××ª ××¨×× ××× ×××
           disused: ××¡×××ª ××¨×× ×©××× × ××©××××©
           funicular: ×¤×× ××§×××¨
-          halt: ×ª×× ×ª ×¨×××ª
+          halt: ×ª×× ×ª ×¢×¦××¨× ××¨×××ª
           junction: ××¤××© ××¡××××ª ××¨××
-          level_crossing: ××¤××© ××¡×××ª ××¨×× ×××××©
+          level_crossing: ××¦×××ª ××¡×××ª ××¨××
           light_rail: ×¨×××ª ×§××
           miniature: ×¨×××ª ××¢××¨×
           monorail: ×¨×××ª ××Ö¾×¤×¡××ª
-          narrow_gauge: ××¡×××ª ×¨×××ª ×¦×¨×
+          narrow_gauge: ××¡×××ª ××¨×× ×¦×¨×
           platform: ×¨×¦××£ ×¨×××ª
-          preserved: ×¨×××ª ××©×××¨×ª
-          proposed: ×¤×¡× ×¨×××ª ×××¦×¢××
+          preserved: ××¡×××ª ××¨×× ××©××××¨
+          proposed: ××¡×××ª ××¨×× ×××¦×¢×ª
+          rail: ××¡×××ª ××¨××
           spur: ×©××××ª ××¡×××ª ××¨××
           station: ×ª×× ×ª ×¨×××ª
-          stop: ×ª×× ×ª ×¨×××ª
+          stop: ×ª×× ×ª ×¢×¦××¨× ××¨×××ª
           subway: ×¨×××ª ×ª××ª××ª
-          subway_entrance: ×× ××¡× ××ª×× ×ª ×¨×××ª ×ª××ª××ª
-          switch: × ×§××××ª ××¡×××ª ××¨××
+          subway_entrance: ×× ××¡× ××¨×××ª ×ª××ª××ª
+          switch: ×¤××¦×× ××¡×××ª ××¨××
           tram: ××©××××ª
           tram_stop: ×ª×× ×ª ××©××××ª
+          turntable: ×¡××××
           yard: ×××¡× ×¨××××ª
         shop:
           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: ×× ××ª ×¦××§×
@@ -1149,9 +1371,9 @@ he:
           computer: ×× ××ª ×××©×××
           confectionery: ×§×× ×××××¨××
           convenience: ×××××ª
-          copyshop: ×× ××ª ×¦××××
+          copyshop: ×¦×××× ××¡××××
           cosmetics: ×× ××ª ×§××¡××××§×
-          craft: ×× ××ª ×××¦×¨× ×××××ª ××
+          craft: ×× ××ª ×××××ª ××
           curtain: ×× ××ª ××××× ××ª
           dairy: ×× ××ª ×××¦×¨× ×××
           deli: ××¢×× ×××
@@ -1168,13 +1390,13 @@ he:
           fashion: ×× ××ª ×××¤× ×
           fishing: ×× ××ª ×¦××× ×××
           florist: ×× ××ª ×¤×¨×××
-          food: ×××××ª
-          frame: ×× ××ª ××¡××¨××ª
+          food: ×× ××ª ××××
+          frame: ×× ××ª ××¡×××¨
           funeral_directors: ×××ª ××××××ª
           furniture: ×¨×××××
           garden_centre: ××¨×× ××× ××
           gas: ×× ××ª ××
-          general: ×××××ª
+          general: ××-××
           gift: ×× ××ª ××ª× ××ª
           greengrocer: ××¨×§×
           grocery: ×××××ª
@@ -1183,34 +1405,34 @@ he:
           health_food: ×× ××ª ×××× ××¨××××ª
           hearing_aids: ×¢××¨× ×©×××¢×
           herbalist: ×× ××ª ×××¢
-          hifi: ×¦××× ×××××§×
+          hifi: ×× ××ª ×¦××× ×××××§×
           houseware: ×× ××ª ××× ×××ª
           ice_cream: ×× ××ª ×××××
           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: ×× ××ª ×¦××××
@@ -1223,7 +1445,7 @@ he:
           storage_rental: ××©××¨×ª ×××¡× ××
           supermarket: ×¡××¤×¨××¨×§×
           tailor: ××××
-          tattoo: ×× ××ª ×§×¢×§××¢××
+          tattoo: ×§×¢×§××¢××
           tea: ×× ××ª ×ª×
           ticket: ×× ××ª ××¨×××¡××
           tobacco: ×× ××ª ×××§
@@ -1231,38 +1453,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: ×××¨×
+          cabin: ××§×ª×ª ×ª×××¨××
+          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: × ×ª×× ××× ××××××ª×
@@ -1272,30 +1494,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: ×¢×××¨××ª
@@ -1306,69 +1526,69 @@ 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: ×××¤××©
-      search_guidance: '×ª×§×××ª ×××¤××©:'
+      search_guidance: '×××¤××© ××¢×××ª:'
       user_not_found: ×××©×ª××© ×× ×§×××
-      issues_not_found: ×× × ××¦×× ×ª×§×××ª ××××
+      issues_not_found: ×× × ××¦×× ××¢×××ª ××××
       status: ××¦×
       reports: ×××××××
       last_updated: ×¢×××× ×××¨××
-      last_updated_time_html: <abbr title='%{title}'>%{time}</abbr>
-      last_updated_time_user_html: ×Ö¾<abbr title='%{title}'>%{time}</abbr> ×××ª %{user}
+      last_updated_time_ago_user_html: '%{time_ago} ×××ª %{user}'
       link_to_reports: ××¦××ª ×××××××
       reports_count:
         one: ××××× ×××
+        two: '%{count} ×××××××'
+        many: '%{count} ×××××××'
         other: '%{count} ×××××××'
       reported_item: ×¤×¨×× ×©××××
       states:
         ignored: ××ª×¢××××ª
         open: ×¤×ª×××
         resolved: × ×¤×ª×¨×
-    update:
-      new_report: ×××× ×©×× × ×¨×©× ×××¦×××
-      successful_update: ×××××× ×©×× ×¢×××× ×××¦×××
-      provide_details: × × ××¡×¤×§ ××ª ××¤×¨××× ×× ××¨×©××
     show:
-      title: '%{status} ×¡×××× #%{issue_id}'
+      title: ××¢×× ×××¦× %{status} ××¡×³ %{issue_id}
       reports:
-        zero: ××× ×××××××
-        one: ××××× ×××
-        other: '%{count} ×××××××'
-      report_created_at: ××××× ×¨××©×× ×Ö¾%{datetime}
-      last_resolved_at: × ×¤×ª×¨ ××××¨×× × ×Ö¾%{datetime}
-      last_updated_at: ×¢×××× ×××¨×× ×Ö¾%{datetime} ×¢× ××× %{displayname}
+        one: ×××´× ×××
+        two: '%{count} ×××´×××ª'
+        many: '%{count} ×××´×××ª'
+        other: '%{count} ×××´×××ª'
+      no_reports: ××× ×××××××
+      report_created_at_html: ××××× ×¨××©×× ×Ö¾%{datetime}
+      last_resolved_at_html: × ×¤×ª×¨ ××××¨×× × ×Ö¾%{datetime}
+      last_updated_at_html: ×¢×××× ×××¨×× ×Ö¾%{datetime} ×¢×Ö¾××× %{displayname}
       resolve: ××¤×ª××¨
       ignore: ××ª×¢××××ª
       reopen: ×¤×ª××× ××××©
-      reports_of_this_issue: ×××× ×¢× ××¢×× ××
-      read_reports: ×§×¨× ××ª ××××××××
+      reports_of_this_issue: ××××××× ×¢× ×××¢×× ××××ª
+      read_reports: ××§×¨×× ××ª ××××××××
       new_reports: ××××××× ×××©××
-      other_issues_against_this_user: ×¢×× ××¢×××ª ×¢× ××©×ª××© ××.
-      no_other_issues: ××× ××¢×××ª × ××¡×¤××ª ×¢× ××©×ª××© ××.
+      other_issues_against_this_user: ×¢×× ××¢×××ª ×¢× ×××©×ª××© ×××
+      no_other_issues: ××× ××¢×××ª × ××¡×¤××ª ×¢× ×××©×ª××© ×××.
       comments_on_this_issue: ××¢×¨××ª ×¢× ××¢×× ××
     resolve:
-      resolved: ××¦× ×××¢×××ª ×©×× × ×-'×××¤×'
+      resolved: ××¦× ×××¢×× ×©×× × ×â×××¤×â
     ignore:
-      ignored: ××¦× ×××¢×××ª ×©×× × ×-'××ª×¢××××ª'
+      ignored: ××¦× ×××¢×× ×©×× × ×â××ª×¢××××ªâ
     reopen:
-      reopened: ××¦× ×××¢×××ª ×©×× × ×-'×¤×ª××'
+      reopened: ××¦× ×××¢×××ª ×©×× × ×â×¤×ª×××â
     comments:
       comment_from_html: ×ª×××× ×××ª %{user_link} ×¢× %{comment_created_at}
-      reassign_param: ×××§×¦××ª ××ª ××ª×§×× ××××©
+      reassign_param: ×××§×¦××ª ××ª ×××¢×× ××××©?
     reports:
-      reported_by_html: ×××× ××ª××¨ %{category} ×¢× ××× %{user} ×Ö¾%{updated_at}
+      reported_by_html: ×××× ××ª××¨ %{category} ×¢×Ö¾××× %{user} ×Ö¾%{updated_at}
     helper:
       reportable_title:
         diary_comment: '%{entry_title}, ×ª×××× ××¡×³ %{comment_id}'
         note: ××¢×¨× ××¡×³ %{note_id}
   issue_comments:
     create:
-      comment_created: ×××××¢× ×©×× × ××¦×¨× ×××¦×××
+      comment_created: ××ª×××× ×©×× × ××¦×¨× ×××¦×××
+      issue_reassigned: ××ª×××× ×©×× × ××¦×¨× ××××¢×× ×××§×¦×ª× ××××©
   reports:
     new:
       title_html: ××××× ×¢× %{link}
@@ -1390,10 +1610,10 @@ he:
           threat_label: ××¢×¨× ×× ××××× ××××× ××××
           other_label: ×××¨
         user:
-          spam_label: ×¤×¨××¤×× ××©×ª××© ×× ×××/×××× ×¡×¤××
-          offensive_label: ×¤×¨××¤×× ××©×ª××© ×× ××××/×¤×××¢× ×
-          threat_label: ×¤×¨××¤×× ××©×ª××© ×× ×××× ××××
-          vandal_label: ××©×ª××© ×× ××©×××ª
+          spam_label: ×¤×¨××¤×× ×××©×ª××© ××× ××× ×¡×¤×× (×× ×××× ×¡×¤××)
+          offensive_label: ×¤×¨××¤×× ×××©×ª××© ××× ×××× ×× ×¤×××¢× ×
+          threat_label: ×¤×¨××¤×× ×××©×ª××© ××× ×××× ××××
+          vandal_label: ×××©×ª××© ××× ××× ××©×××ª
           other_label: ×××¨
         note:
           spam_label: ××¢×¨× ×× ××× ×××
@@ -1409,13 +1629,11 @@ he:
     home: ××¢××¨ ××××§×× ××××ª
     logout: ××¦××× ××××©×××
     log_in: ×× ××¡× ×××©×××
-    log_in_tooltip: ×× ××¡× ×¢× ××©××× ×§×××
     sign_up: ××¨×©××
     start_mapping: ×××ª××× ×××¤××ª
-    sign_up_tooltip: ××¦××¨×ª ××©××× ××¢×¨×××
     edit: ×¢×¨×××
     history: ×××¡×××¨××
-    export: ×××¦××
+    export: ××¦××
     issues: ×ª×§×××ª
     data: × ×ª×× ××
     export_data: ×××¦×× × ×ª×× ××
@@ -1429,11 +1647,12 @@ he:
     intro_text: OpenStreetMap ××× ××¤× ×©× ××¢×××, ×©× ××¦×¨×ª ×¢×Ö¾××× ×× ×©×× ××××, ××××¤×©××ª
       ××©××××© ×ª××ª ×¨××©××× ×¤×ª××.
     intro_2_create_account: × × ×××¦××¨ ××©××× ××©×ª××©
-    hosting_partners_html: ××××¨×× ××ª××××ª %{ucl}, %{bytemark} ×%{partners} × ××¡×¤××.
-    partners_ucl: UCL
-    partners_bytemark: Bytemark Hosting
+    hosting_partners_2024_html: ××××¨×× × ×ª×× ×¢×Ö¾××× %{fastly}, %{corpmembers} ××¢××
+      %{partners}
+    partners_fastly: ×¤××¡×××
+    partners_corpmembers: ×××¨×× ×ª××××××× ×××¨×× ×Ö¾OSMF
     partners_partners: ×©××ª×¤××
-    tou: ×ª× ×× ×©××××©
+    tou: ×ª× ×× ××©××××©
     osm_offline: ××¡× ×× ×ª×× ×× ×©× ××ª×¨ OpenStreetMap ××× × ××§××× ××¢×ª ××©× ×¢×××××ª ×ª××××§×
       ×××××¦×¢××ª ××.
     osm_read_only: ××¡× ×× ×ª×× ×× ×©× ××ª×¨ OpenStreetMap × ×ª×× ××¢×ª ×××¦× ×§×¨××× ×××× ××©× ×¢×××××ª
@@ -1442,11 +1661,10 @@ he:
     help: ×¢××¨×
     about: ×××××ª
     copyright: ××××××ª ×××¦×¨××
+    communities: ×§×××××ª
     community: ×§××××
     community_blogs: ×××××× ×©× ××§××××
     community_blogs_title: ×××××× ×©× ×××¨× ×§××××ª OpenStreetMap
-    foundation: ×§×¨×
-    foundation_title: ×§×¨× ×××¤× ×¡××¨×× ×××¤
     make_a_donation:
       title: ×ªÖ´××× ××××× OpenStreetMap ×¢×Ö¾××× ××ª× ×ª×¨××× ××¡×¤××ª
       text: ×ª×¨×××
@@ -1454,14 +1672,23 @@ he:
     more: ×¢××
   user_mailer:
     diary_comment_notification:
+      description: ×¨×©×××ª ×××× OpenStreetMap ××¡×³ %{id}
       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}
+      footer_unsubscribe: ××¤×©×¨ ×××× ××ª ×××× ×× ××××× ×××ª×××ª %{unsubscribeurl}
+      footer_unsubscribe_html: ××¤×©×¨ ×××× ××ª ×××× ×× ××××× ×××ª×××ª %{unsubscribeurl}
     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:
@@ -1469,25 +1696,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}.
+      subject: '[×××¤× ×¡××¨×× ×××¤ OpenStreetMap] ×©×××× ×××××× GPX'
+    gpx_success:
+      hi: ×©××× %{to_user},
+      loaded:
+        one: × ××¢× ×××¦××× ×¢×  × ×§××× ×××ª ××¤×©×¨××ª.
+        two: × ××¢× ×××¦××× ×¢× %{trace_points} × ×§××××ª ××ª×× %{count} × ×§××××ª ××¤×©×¨×××ª.
+        many: × ××¢× ×××¦××× ×¢× %{trace_points} × ×§××××ª ××ª×× %{count} × ×§××××ª ××¤×©×¨×××ª.
+        other: × ××¢× ×××¦××× ×¢× %{trace_points} × ×§××××ª ××ª×× %{count} × ×§××××ª ××¤×©×¨×××ª.
+      all_your_traces_html: ××¤×©×¨ ×××¦×× ××ª ×× ×¢×§×××ª ×Ö¾GPX ×©×× ×©×××¢×× ×××¦××× ××¨× %{url}.
+      subject: '[×××¤× ×¡××¨×× ×××¤ OpenStreetMap] ××××× GPX ××¦×××'
     signup_confirm:
       subject: '[×××¤× ×¡××¨×× ×××¤ OpenStreetMap] ××¨×× ×××× ××××¤× ×¡××¨×× ×××¤'
       greeting: ××××!
@@ -1497,29 +1727,18 @@ 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:
+      description: ××¢×¨×ª OpenStreetMap ××¡×³ %{id}
       anonymous: ××©×ª××© ××××× ×
       greeting: ×©×××,
       commented:
@@ -1528,22 +1747,33 @@ 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:
+      description: ×¢×¨××ª ×©×× ×××× ×©× OpenStreetMap ××¡×³ %{id}
       hi: ×©××× %{to_user},
       greeting: ×©×××,
       commented:
@@ -1553,18 +1783,51 @@ 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}
-      unsubscribe: ××× ×××× ××ª ×××× ×× ××¢×××× ×× ××¢×¨××ª ××©×× ×××× ××××ª, × × ×××§×¨ ×××ª×××ª
-        %{url} ××××××¥ ×¢× â××××× ××× ××â.
+      details_html: ×¤×¨××× × ××¡×¤×× ×¢× ×¢×¨××ª ××©×× ×××× ××¤×©×¨ ×××¦×× ×××ª×××ª %{url}
+      unsubscribe: ×××¤×©×¨××ª× ×××× ××ª ×××× ×× ××¢×××× ×× ××¢×¨××ª ××©×× ×××× ××××ª ×××ª×××ª %{url}.
+      unsubscribe_html: ×××¤×©×¨××ª× ×××× ××ª ×××× ×× ××¢×××× ×× ××¢×¨××ª ××©×× ×××× ××××ª ×××ª×××ª
+        %{url}.
+  confirmations:
+    confirm:
+      heading: ×××××ª ××©××× ××©×ª××©
+      introduction_1: ×©××× × ×× ×××ª× ×××××ª.
+      introduction_2: × × ××××ª ××ª ×××©××× ×©×× ××××¦×¢××ª ××××¦× ×¢× ×§××©××¨ ××××"×, ××××¨× ××
+        ×ª××× ×× ××¤×©×¨××ª ×××ª××× ×××¤××ª.
+      press confirm button: × × ×××××¥ ×¢× ××¤×ª××¨ ××××©××¨ ××× ×××¤×¢×× ××ª ××©××× ×.
+      button: ×××©××¨
+      success: ××©××× × ×××©×¨, ×ª××× ×©× ×¨×©××ª!
+      already active: ×××©××× ××× ×××¨ ×××©×¨.
+      unknown token: × ×¨×× ×©×§×× ××××©××¨ ××× ×¤× ×× ×©××× × ×§×××.
+      resend_html: ×× ×¦×¨×× ×©× ×©×× ×× ×©×× ××ª ××××´× ××××©××¨, %{reconfirm_link}.
+      click_here: × × ×××××¥ ×××
+    confirm_resend:
+      failure: ××©×ª××© %{name} ×× × ××¦×.
+    confirm_email:
+      heading: ×××©××¨ ×©×× ×× ××ª×××ª ×××××´×
+      press confirm button: × × ×××××¥ ×¢× ××¤×ª××¨ ××××©××¨ ×××× ××× ×××©×¨ ××ª ××ª×××ª ×××××´×
+        ××××©×.
+      button: ×××©××¨
+      success: ×©×× ×× ××ª×××ª ×××××´× ×©×× ×××©×¨!
+      failure: ××ª×××ª ×××××´× ×©×× ×××¨ ×××©×¨× ×××¡×××× ×××.
+      unknown_token: ×§×× ××××©××¨ ×¤× ×× ××× × ×§×××.
+    resend_success_flash:
+      confirmation_sent: ×©××× × ××××¢×ª ×××©××¨ ×××©× ×××ª×××ª %{email} ×××©×ª×§×× ××ª ×××©×××
+        ×©××, ×ª××× ××§×× ×××¤××.
+      whitelist: ×× ××ª× ××©×ª××© ×××¢×¨××ª × ×× ××× ×©×©××××ª ××§×©××ª ×××©××¨, × × ××××× ×©×××¡×¤×ª ××ª
+        %{sender} ××¨×©×××ª ××××ª×¨×× ×× ×× ××¦××× × ×××©×× ×××§×©××ª ×××©××¨.
   messages:
     inbox:
       title: ×ª×××ª ××××¨ × ×× ×¡
-      my_inbox: ×ª×××ª ×××××¨ ×× ×× ×¡ ×©××
-      outbox: ×ª×××ª ××××¨ ×××¦×
       messages: ××© ×× %{new_messages} ××¢×× %{old_messages}
       new_messages:
         one: ××××¢× ×××©× ×××ª
@@ -1572,68 +1835,199 @@ he:
       old_messages:
         one: ××××¢× ××©× × ×××ª
         other: '%{count} ××××¢××ª ××©× ××ª'
+      no_messages_yet_html: ××× ×× ××××¢××ª ×××©××ª ×¢××××. ×× ××¢×ª× ×××¦××¨ ×§×©×¨ ×¢× %{people_mapping_nearby_link}?
+      people_mapping_nearby: ×× ×©×× ×××¤×× ××§×¨××ª ××§××
+    messages_table:
       from: ×××ª
+      to: ××
       subject: × ××©×
       date: ×ª××¨××
-      no_messages_yet_html: ××× ×× ××××¢××ª ×××©××ª ×¢××××. ×× ××¢×ª× ×××¦××¨ ×§×©×¨ ×¢× %{people_mapping_nearby_link}?
-      people_mapping_nearby: ×× ×©×× ×××¤×× ××§×¨××ª ××§××
+      actions: ×¤×¢××××ª
     message_summary:
       unread_button: ×¡×××× ×â×× × ×§×¨×â
       read_button: ×¡×××× ×â× ×§×¨×â
-      reply_button: ×ª×©×××
+      reply_button: ×××©××
       destroy_button: ××××§×
+      unmute_button: ××¢××¨× ×××××¨ ×× ×× ×¡
     new:
       title: ×©××××ª ××××¢×
       send_message_to_html: ××©××××ª ××××¢× ×××©× ×× %{name}
-      subject: × ××©×
-      body: ×ª××× ×××××¢×
       back_to_inbox: ×××¨× ××ª×××ª ×××××¨ ×× ×× ×¡
     create:
       message_sent: ××××¢× × ×©×××
       limit_exceeded: ×©×××ª ××××¢××ª ×¨×××ª ××××¨×× ×. × × ××××ª×× ××¤× × ×©××××ª ××××¢××ª × ××¡×¤××ª.
     no_such_message:
-      title: ××× ××××¢× ×××
-      heading: ××× ××××¢× ×××
-      body: ×× × ××¦××¢×¨××, ××× ××××¢× ×¢× ×××× ××.
+      title: ××× ××××¢× ××××ª
+      heading: ××× ××××¢× ××××ª
+      body: ×× × ××¦××¢×¨××, ××× ××××¢× ×¢× ××××× ×××.
     outbox:
       title: ×ª×××ª ××××¨ ×××¦×
-      my_inbox_html: '%{inbox_link} ×©××'
-      inbox: ×ª×××ª ×××××¨ ×× ×× ×¡
-      outbox: ×ª×××ª ×××××¨ ××××¦×
+      actions: ×¤×¢××××ª
       messages:
         one: ××© ×× ××××¢× ×××ª ×©× ×©×××
         other: ××© ×× %{count} ××××¢××ª ×©× ×©×××
-      to: ××
-      subject: × ××©×
-      date: ×ª××¨××
       no_sent_messages_html: ××× ×× ××××¢××ª × ×©××× ×¢× ××. ×× ××¢×ª× ×××¦××¨ ×§×©×¨ ×¢× %{people_mapping_nearby_link}?
       people_mapping_nearby: ××©×ª×ª×¤×× ××××¤×× ××§×¨××ª ××§××
+    muted:
+      title: ××××¢××ª ×××©×ª×§××ª
+      messages:
+        one: ××××¢× ×××©×ª×§×ª
+        two: ××© ×× ×©×ª× ××××¢××ª ×××©×ª×§××ª
+        many: ××© ×× %{count} ××××¢××ª ×××©×ª×§××ª
+        other: ××© ×× %{count} ××××¢××ª ×××©×ª×§××ª
     reply:
       wrong_user: × ×× ×¡×ª ××©× â%{user}â, ××× ×××××¢× ×©×××§×©×ª ×××©×× ×¢××× ×× × ×©××× ××××ª×
         ×××©×ª××©. × × ××××× ×¡ ×××©××× ×× ××× ××× ×××©××.
     show:
       title: ××××¢× ×©× ×§×¨××
-      from: ×××ª
-      subject: × ××©×
-      date: ×ª××¨××
       reply_button: ×××©××
       unread_button: ××¡×××× ×××××¢× ×©×× × ×§×¨××
       destroy_button: ××××§×
       back: ×××¨×
-      to: ××
       wrong_user: × ×× ×¡×ª ××©× â%{user}â, ××× ×××××¢× ×©×××§×©×ª ××§×¨×× ×× × ×©××× ××××ª× ×××©×ª××©.
-        × × ××××× ×¡ ×××©××× ×× ××× ××× ×××§×¨×× ×××ª×.
+        × × ××××× ×¡ ×××©××× ×× ××× ××× ××§×¨×× ×××ª×.
     sent_message_summary:
       destroy_button: ××××§×
+    heading:
+      my_inbox: ×ª×××ª ×××××¨ ×× ×× ×¡ ×©××
+      my_outbox: ×ª×××ª ×××××¨ ××××¦× ×©××
+      muted_messages: ××××¢××ª ×××©×ª×§××ª
     mark:
       as_read: ×××××¢× ×¡××× × ×××××¢× ×©× ×§×¨××
       as_unread: ×××××¢× ×¡××× × ×××××¢× ×©×× × ×§×¨××
+    unmute:
+      notice: ××××¢× ×××¢××¨× ×××××¨ ×× ×× ×¡
+      error: ××Ö¾××¤×©×¨ ×××¢×××¨ ××ª ×××××¢× ×××××¨ ×× ×× ×¡.
     destroy:
       destroyed: ×××××¢× × ×××§×
+  passwords:
+    new:
+      title: ××¡××¡×× ×××× ××××××
+      heading: ×©×××ª ×¡××¡××?
+      email address: ××ª×××ª ××××´×
+      new password button: × × ××©××× ×× ×¡××¡×× ×××©×
+      help_text: × × ××××× ××ª ××ª×××ª ×××××´× ×©××©×ª××©×ª ×× ××× ××××¨×©×. ×× × × ×©×× ×××× ×§××©××¨
+        ×©××¤×©×¨ ×××©×ª××© ×× ××× ×××¤×¡ ××ª ×¡××¡××ª×.
+    create:
+      send_paranoid_instructions: ×× ××ª×××ª ×××××´× ×©×× ×§××××ª ×××¡× ×× ×ª×× ×× ×©×× ×, ×××©××
+        ×××× ×§××©××¨ ××©××××¨ ×¡××¡×× ×××ª×××ª ×××××´× ××××ª ××¢×× ××× ××§××ª.
+    edit:
+      title: ×××¤××¡ ×¡××¡××
+      heading: ×××¤××¡ ××¡××¡×× ×¢×××¨ %{user}
+      reset: ×××¤××¡ ××¡××¡××
+      flash token bad: ×× ××¦×× × ××ª ×××¡×××× ××××, ×××× ××××§×ª ×××ª×××ª ×ª×¢×××¨?
+    update:
+      flash changed: ×¡××¡××ª× ×©×× ×ª×.
+      flash token bad: ×××¡×××× ×× × ××¦×, ×××× ××©×× ×¢× ×××ª×××ª?
+  preferences:
+    show:
+      title: ×××¢××¤××ª ×©××
+      preferred_editor: ×¢××¨× ×××¢××£
+      preferred_languages: ×©×¤××ª ×××¢××¤××ª
+      edit_preferences: ×¢×¨×××ª ××¢××¤××ª
+    edit:
+      title: ×¢×¨×××ª ××¢××¤××ª
+      save: ×¢×××× ××¢××¤××ª
+      cancel: ×××××
+    update:
+      failure: ×× × ××ª× ××¢××× ××¢××¤××ª.
+    update_success_flash:
+      message: ×××¢××¤××ª ×¢×××× ×.
+  profiles:
+    edit:
+      title: ×¢×¨×××ª ×¤×¨××¤××
+      save: ×¢×××× ×¤×¨××¤××
+      cancel: ×××××
+      image: ×ª××× ×
+      gravatar:
+        gravatar: ×××©×ª××© ×Ö¾Gravatar
+        what_is_gravatar: ×× ×× Gravatar?
+        disabled: ×××¨×××××¨ ××××.
+        enabled: ××¦××ª ×××¨×××××¨ ×©×× ×××¤×¢××.
+      new image: ×××¡×¤×ª ×ª××× ×
+      keep image: ××©×××¨× ×¢× ××ª××× × ×× ×××××ª
+      delete image: ×××¡×¨×ª ××ª××× × ×× ×××××ª
+      replace image: ×××××¤×ª ××ª××× × ×× ×××××ª
+      image size hint: (×ª××× × ××¨×××¢×ª ××××× 100x100 ××¤×××ª ×¢××××ª ××× ×××)
+      home location: ×××§×× ×¨××©×
+      no home location: ×× ××× ×ª ××ª ×××§××× ××¨××©×.
+      update home location on click: ×¢×××× ××××§×× ××¨××©× ×©×× ××¢×ª ××××¦× ×¢× ×××¤×?
+      show: ××¦××
+      delete: ××××§×
+      undelete: ××××× ××××§×
+    update:
+      success: ××¤×¨××¤×× ×¢××××.
+      failure: ×× × ××ª× ××¢××× ×¤×¨××¤××.
+  sessions:
+    new:
+      title: ×× ××¡×
+      heading: ×× ××¡×
+      email or username: ××ª×××ª ××××´× ×× ×©× ××©×ª××©
+      password: ×¡××¡××
+      remember: ×××××¨ ×××ª×
+      lost password link: ×××××ª ××ª ××¡××¡×× ×©××?
+      login_button: ×× ××¡×
+      register now: ××××¨×©× ×¢××©××
+      with external: '×××××¤××, ××©×ª××©× ××¦× ×©×××©× ××× ××××× ×¡:'
+      no account: ××× ×× ××©×××?
+      auth failure: ×¡××××, ×× × ××ª× ××××× ×¡ ×¢× ××¤×¨××× ××××.
+      openid_logo_alt: ×× ××¡× ×¢× OpenID
+      auth_providers:
+        openid:
+          title: ×× ××¡× ×¢× OpenID
+          alt: ×× ××¡× ×¢× URL ×©× OpenID
+        google:
+          title: ×× ××¡× ×¢× ××××
+          alt: ×× ××¡× ×¢× OpenID ×©× ××××
+        facebook:
+          title: ×× ××¡× ×¢× ×¤×××¡×××§
+          alt: ×× ××¡× ×¢× ××©××× ×¤×××¡×××§
+        microsoft:
+          title: ×× ××¡× ×¢× ×××§×¨××¡××¤×
+          alt: ×× ××¡× ×¢× ××©××× ×××§×¨××¡××¤×
+        github:
+          title: ×× ××¡× ×¢× ××××××
+          alt: ×× ××¡× ×¢× ××©××× ××××××
+        wikipedia:
+          title: ×× ××¡× ×¢× ×××§××¤×××
+          alt: ×× ××¡× ×¢× ××©××× ×××§××¤×××
+        wordpress:
+          title: ×× ××¡× ×¢× ×××¨××¤×¨×¡
+          alt: ×× ××¡× ×¢× OpenID ×©× ×××¨××¤×¨×¡
+        aol:
+          title: ×× ××¡× ×¢× AOL
+          alt: ×× ××¡× ×¢× OpenID ×©× AOL
+    destroy:
+      title: ××¦×××
+      heading: ××¦××× ×Ö¾OpenStreetMap
+      logout_button: ××¦×××
+    suspended_flash:
+      suspended: ×××©××× ×©×× ×××©×¢× ×¢×§× ×¤×¢××××ª ××©×××, ×¢×× ××¡××××.
+      contact_support_html: × × ×××¦××¨ ×§×©×¨ ×¢× ×%{support_link} ××× ×××× ××××××.
+      support: ×ª××××
+  shared:
+    markdown_help:
+      heading_html: ×¤××¢× × ××××¦×¢××ª %{kramdown_link}
+      headings: ×××ª×¨××ª
+      heading: ×××ª×¨×ª
+      subheading: ×××ª×¨×ª ××©× ×
+      unordered: ×¨×©×××ª ×ª××××××
+      ordered: ×¨×©××× ××××¡×¤×¨×ª
+      first: ××¤×¨×× ××¨××©××
+      second: ××¤×¨×× ××©× ×
+      link: ×§××©××¨
+      text: ××§×¡×
+      image: ×ª××× ×
+      alt: ××§×¡× ××××¤×
+      url: ××ª×××ª URL
+      codeblock: ×§××¢ ×§××
+    richtext_field:
+      edit: ×¢×¨×××
+      preview: ×ª×¦××× ××§××××
   site:
     about:
       next: ×××
-      copyright_html: <span>&copy;</span>×ª××¨××<br>OpenStreetMap
+      heading_html: '%{copyright}×ª××¨×× %{br} OpenStreetMap'
       used_by_html: '%{name} ××¡×¤×§×ª × ×ª×× × ××¤××ª ××××¤× ××ª×¨× ××× ××¨× ×, ×××©×××× ××××©××¨××
         ×©×× ××'
       lede_text: ××ª OpenStreetMap ××× × ×§××××ª ×××¤×× ×©×ª××¨××× ×××ª×××§×× × ×ª×× ×× ×¢× ××¨×××,
@@ -1644,144 +2038,198 @@ he:
         ××ª××× ××ª ×××××××¨, ×××©××¨× GPS, ×××¤××ª ×©×× â××××Ö¾××§â ××× ××××× ×©Ö¾OSM
         ×××××§×ª ×××¢×××× ×ª.
       community_driven_title: ××× ×× ×¢×Ö¾××× ××§××××
-      community_driven_html: |-
+      community_driven_1_html: |-
         ×§××××ª OpenStreetMap ××××× ×ª, ××¢××ª ×ª×©××§×, ××××× ×××× ××××.
         ××§×¨× ××ª××¨××× ×©×× × ××© ×××¤×× × ×××××, ××§×¦××¢× × ××¢×¨×××ª ××××¢ ×××××¨×¤×××ª (GIS), ××× ××¡××
         ×©××¨××¦×× ××ª ×©×¨×ª× OSM, ×¤×¢××× ×¡×××¢ ×××× ×××¨× ×©×××¤×× ××××¨× ××××Ö¾××¡××,
         ××¨××× ×××¨××.
-        ×××××¢ × ××¡×£ ×¢× ××§××××, ×¨×³ ××ª <a href='https://blog.openstreetmap.org'>OpenStreetMap Blog</a>, <a href='%{diary_path}'>×××× × ××©×ª××©××</a>, <a href='https://blogs.openstreetmap.org/'>×××× × ×§××××</a>, ×××ª×¨ <a href='https://www.osmfoundation.org/'>OSM Foundation</a>.
+        ×××××¢ × ××¡×£ ×¢× ××§××××, ×¨×³ ××ª %{osm_blog_link},
+        %{user_diaries_link}, %{community_blogs_link}, ×××ª
+        ××ª×¨ %{osm_foundation_link}.
+      community_driven_osm_blog: ×××× OpenStreetMap
+      community_driven_user_diaries: ×××× × ××©×ª××©××
+      community_driven_community_blogs: ×××××× ×§××××ª×××
+      community_driven_osm_foundation: ×§×¨× OSM
       open_data_title: × ×ª×× ×× ×¤×ª××××
-      open_data_html: |-
-        OpenStreetMap ××× <strong>× ×ª×× ×× ×¤×ª××××</strong>: ××© ×× ×××¤×© ×××©×ª××© ×× ××× ×××¨×,
+      open_data_1_html: |-
+        OpenStreetMap ××× %{open_data}: ××© ×× ×××¤×© ×××©×ª××© ×× ××× ×××¨×,
         ×× ×¢×× × ××ª× ×××××¡ ×Ö¾OpenStreetMap ×××ª××¨×××. ×××ª×¨ ××©× ××ª ××ª ×× ×ª×× ××
         ×××× ××ª ×¢× ××××× ×××¨×× ××¡×××××, ×× ××© ×××¤××¥ ××ª ××ª××¦×××ª ×©× ××
-        ××¤× ××ª× ××× ×©× ×××ª× ××¨××©×××. ×¨' ××ª <a href='%{copyright_path}'>××£ ××¨××©××× ×××××××ª ××××¦×¨××</a> ××¤×¨××× × ××¡×¤××.
+        ××¤× ××ª× ××× ×©× ×××ª× ××¨××©×××. ×¨' ××ª %{copyright_license_link}
+        ××¤×¨××× × ××¡×¤××.
+      open_data_open_data: × ×ª×× ×× ×¤×ª××××
+      open_data_copyright_license: ××£ ××××××ª ×××¦×¨×× ××¨××©×××
       legal_title: ××©×¤××
-      legal_1_html: |-
-        ×××ª×¨ ××× ××©××¨××ª×× ×¨××× ×××¨×× ×××¤×¢××× ×¢×Ö¾××× <a href='https://osmfoundation.org/'>×§×¨× OpenStreetMap</a>&rlm; (OSMF) ××©× ××§××××. ××©××××© ××× ××©××¨××ª×× ×××¤×¢××× OSMF ××¤××£
-        ×<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>.
+      legal_1_1_html: ×××ª×¨ ××× ××©××¨××ª×× ×¨××× ×××¨×× ×××¤×¢××× ×¢×Ö¾××× %{openstreetmap_foundation_link}&rlm;
+        (OSMF) ××©× ××§××××. ××©××××© ××× ××©××¨××ª×× ×©××¤×¢××× OSMF ××¤××£ ×%{terms_of_use_link},
+        ×%{aup_link}, ××%{privacy_policy_link}
+      legal_1_1_openstreetmap_foundation: ×§×¨× ×××¤× ×¡××¨×× ×××¤
+      legal_1_1_terms_of_use: ×ª× ×× ×©××××©
+      legal_1_1_aup: ×××× ×××ª ×©××××© ××§×××
+      legal_1_1_privacy_policy: ×××× ×××ª ×¤×¨××××ª
+      legal_2_1_html: |-
+        × × %{contact_the_osmf_link}
+        ×× ××© ×× ×©××××ª ×¢× ×¨××©××, ××××××ª ×××¦×¨×× ×× × ××©××× ××©×¤×××× ×××¨××.
+      legal_2_1_contact_the_osmf: ×××¦××¨ ×§×©×¨ ×¢× OSMF
+      legal_2_2_html: OpenStreetMap, ×¡×× ×××××××ª ××××××ª ×Ö¾State of the Map ×× %{registered_trademarks_link}.
+      legal_2_2_registered_trademarks: ×¡××× ×× ××¡××¨××× ×©× OSMF
       partners_title: ×©××ª×¤××
     copyright:
       foreign:
-        title: ×××××ª ×ª×¨××× ××
-        html: ×××§×¨× ×©× ×××¡×¨ ×ª×××××ª ××× ×¢××× ××ª××¨×× ×× ×××× %{english_original_link},
-          ××© ××ª×ª ×¢×××¤××ª ××¢××× ××× ××××ª
-        english_link: ××¢××× ×××§××¨× ××× ××××ª
+        title: ×××××ª ××ª×¨××× ×××
+        html: ×××§×¨× ×©× ×××¡×¨ ×ª×××××ª ××× ×××£ ×××ª××¨×× ××× ×××× %{english_original_link},
+          ×××£ ××× ××××ª ××× ××§×××¢
+        english_link: ×××§××¨ ××× ××××ª
       native:
-        title: ×××××ª ××£ ××
-        html: ××× ×¢××× ××××××ª ××××¦×¨×× ×××¨×¡×ª× ××× ××××ª. ××¤×©×¨ ×××××¨ ×%{native_link} ×©×
-          ×¢××× ××, ×××¤×©×¨ ×× ×××¤×¡××§ ××§×¨×× ×¢× ××××××ª ×××¦×¨×× ×%{mapping_link}.
-        native_link: ××¨×¡× ×¢××¨××ª
+        title: ×××××ª ×××£ ×××
+        html: ××× ××£ ××××××ª ××××¦×¨×× ×××¨×¡×ª× ××× ××××ª. ××¤×©×¨ ×××××¨ ×%{native_link} ×©×
+          ×××£ ×××, ×××¤×©×¨ ×× ×××¤×¡××§ ××§×¨×× ×¢× ××××××ª ×××¦×¨×× ×%{mapping_link}.
+        native_link: ××¨×¡× ××¢××¨××ª
         mapping_link: ×××ª××× ×××¤××ª
       legal_babble:
         title_html: ××××××ª ×××¦×¨×× ××¨××©×××
-        intro_1_html: |-
-          ×××× OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> ××× <i>× ×ª×× ×× ×¤×ª××××</i>, ×©××ª×¤×¨×¡××× ××¤× ×¨××©××× <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database</a>  (×¨×´×ª ODbL) ×¢×Ö¾××× <a
-          href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (×¨×´×ª OSMF).
-        intro_2_html: |-
-          ××ª× ×××¤×©××× ×××¢×ª××§, ×××¤××¥, ××©××¨ ××××ª××× ××ª ×× ×ª×× ×× ×©×× ×,
-          ×× ×¢×× ××ª× × ××ª× ×× ×××××¡ ×Ö¾OpenStreetMap
-          ×××ª××¨××× ×××××. ×× ××ª× ××©× ×× ××ª ×× ×ª×× ×× ×× ××ª ×××¤××ª ×©×× × ×× ××¡×ª×××× ×¢×××× ××× ×××¦××¨ ××©×× ×××©,
-          ×××ª×¨ ××× ×××¤××¥ ××ª ××ª××¦×××ª ×¨×§ ××¤× ×ª× ×× ×××ª× ××¨××©×××.
-          <a href="https://opendatacommons.org/licenses/odbl/1.0/">×××¡××
-          ×××©×¤××</a> ×××× ××¡×××¨ ××ª ××××××ª××× ×××ª ×ª×××× ××××¨×××ª ×©×××.
-        intro_3_1_html: |-
-          ××ª××¢×× ×©×× × ××××© ×××¤××£
-          ××¨××©××× <a href="https://creativecommons.org/licenses/by-sa/2.0/">×§×¨×××××××
-          ×§×××× × ×××××¡â×©××ª××£Ö¾××× 2.0</a> license (××§××¦××¨  CC-BY-SA 2.0).
+        introduction_1_html: |-
+          OpenStreetMap%{registered_trademark_link} ××× ×××× %{open_data}, ×©××ª×¤×¨×¡××× ××¤× ×ª× ××
+          %{odc_odbl_link} (×¨×´×ª ODbL) ×¢×Ö¾××× %{osm_foundation_link} (×¨×´×ª OSMF).
+        introduction_1_open_data: × ×ª×× ×× ×¤×ª××××
+        introduction_1_odc_odbl: ×¨××©××× ××¡× × ×ª×× ×× ×¤×ª×× ×©× Open Data Commons
+        introduction_1_osm_foundation: ×§×¨× ×××¤× ×¡××¨×× ×××¤
+        introduction_2_html: |-
+          ××© ×× ×××¤×© ×××¢×ª××§, ×××¤××¥, ××©××¨ ××××ª××× ××ª ×× ×ª×× ×× ×©×× ×,
+          ××× ×××× ××ª×ª ×××××¡ ×Ö¾OpenStreetMap
+          ×××ª××¨××× ×××××. ×× ×©×× ××ª ××ª ×× ×ª×× ×× ×× ××ª ×××¤××ª ×©×× × ×× ××¡×ª×××ª ×¢×××× ××× ×××¦××¨ ××©×× ×××©,
+          ×××ª×¨ ×× ×××¤××¥ ××ª ××ª××¦×××ª ×¨×§ ××¤× ×ª× ×× ×××ª× ××¨××©×××.
+          %{legal_code_link} ×××× ××¡×××¨ ××ª ×××××××ª ×©×× ×××ª ×ª×××× ××××¨×××ª ×©××.
+        introduction_2_legal_code: ×××¡×× ×××©×¤××
+        introduction_3_html: ××ª××¢×× ×©×× × ××ª×¤×¨×¡× ××¤× ×ª× ×× ×¨××©××× %{creative_commons_link}
+          (×¨×´×ª CC BY-SA 2.0).
+        introduction_3_creative_commons: ×§×¨××××××× ×§×××× ×â×××××¡â×©××ª××£ ××× 2.0
+        introduction_3_creative_commons_url: https://creativecommons.org/licenses/by-sa/2.0/deed.he
         credit_title_html: ××× ××ª×ª ×××××¡ ×Ö¾OpenStreetMap
-        credit_1_html: ×× × ×××¨×©×× ×××××¡ ×× â&copy; ×ª××¨×× OpenStreetMapâ.
-        credit_2_1_html: |-
-          ×××Ö¾××, ××××ª× ××××××¨ ×©×× ×ª×× ×× ×××× ×× ×××¤××£ ××¨××©××× ×××¡××
-          × ×ª×× ×× ×¤×ª××××, ××× × ×¢×©× ×©××××© ×××¨××× ×××¤× ×©×× ×, ×©××××¤×× ××¤××¤××ª
-          ××¨××©××× CC-BY-SA. ×××¤×©×¨××ª× ××¢×©××ª ×××ª ××××¦×¢××ª ×§××©××¨ ××
-          <a href="https://www.openstreetmap.org/copyright">××£ ××××××ª ××××¦××¨×</a>.
-          ×××××¤××, ××× ××××ª× ××¢×ª ××¤×¦×ª OSM ××¦××¨×ª
-          × ×ª×× ××, ×××¤×©×¨××ª× ××¦××× ××ª ××©×××ª ×××§×©×¨ ××©××¨××ª ×× ××¨××©××× ×× ××¨××©××× ××ª. ××××¦×¢× ×ª×§×©××¨×ª
-          ×©×× × ××ª× ×××©×ª××© ××× ××§××©××¨×× (×××©× ×××¤××¡), ×× × ×××××¦××
-          ×××¤× ××ª ××ª ××§××¨××× ×©×× ×× openstreetmap.org (×××× ×¢×Ö¾××× ××¨×××ª
-          âOpenStreetMapâ ×××ª×××ª ××××), ×× opendatacommons.org, ×××
-          ×× ××ª×××, ×× creativecommons.org.
-        credit_3_1_html: "××¨××× ×××¤× ×&ldquo;×¡×× ×× ××¨×××&rdquo; ×Ö¾www.openstreetmap.org
-          ×× ×ª××¦×¨×ª ×©×××¤×§× ×¢× ××× \n×¢×××ª×ª OpenStreetMap ××××¦×¢××ª ×× ×ª×× ×× ×©× OpenStreetMap
-          \n×ª××ª ×¨××©××× ××¡× ×× ×ª×× ×× ××¤×ª×× (Open Database License). ×× ×××¨×ª ×××©×ª××© ×××¨××××
-          ×××× × × ×××©×ª××© ××××××¡ ×××: \n&ldquo;××¤×ª ××¡××¡ ×× ×ª×× ×× ×Ö¾OpenStreetMap ××¢×××ª×ª
-          OpenStreetMap&rdquo;."
-        credit_4_html: '××©××× ××¤× ×××§××¨×× ××ª ×©××¤×©×¨ ××¢××× ××, ××××××¡ ×¦×¨×× ××××¤××¢ ××¤×× ×ª
-          ×××¤×. ×××©×:'
+        credit_1_html: '××¢×ª ×©××××© ×× ×ª×× ×× ×©× OpenStreetMap, ×××× ××¢×©××ª ××ª ×©× × ××××¨××
+          ×××××:'
+        credit_2_1: ××© ××ª×ª ×××××¡ ×Ö¾OpenStreetMap ×¢×Ö¾××× ××¦××ª ××××¢×ª ××××××ª ××××¦×¨××
+          ×©×× ×.
+        credit_2_2: ××© ××××××¨ ×©×× ×ª×× ×× ×××× ×× ××¤× ×¨××©××× ××¡× × ×ª×× ×× ×¤×ª××.
+        credit_3_html: |-
+          ×××× ××××¢×ª ××××××ª ××××¦×¨××, ××© ×× × ××¨××©××ª ×©×× ××ª ×××× ××× ×× ×¦×¨×× ×××××ª
+          ×××¦×, ×××ª×× ××××¤× ×©×× ×¢×©××ª ×©××××© ×× ×ª×× ×× ×©×× ×. ×××©×, ××××× ×©×× ××
+          ×××× ×¢× ×××¤× ××¦××ª ××××¢×ª ××××××ª ××××¦×¨×× â ×ª××× ××
+          ××¦×¨×ª ××¤× × ××ª× ×ª ××¢×××, ××¤× ××××¤×¡×ª, ×× ×ª××× × ×¡××××ª. ×¤×¨××× ××××× ×¢×
+          ××¨××©××ª × ××ª× ×××¦×× ×××£ %{attribution_guidelines_link}.
+        credit_3_attribution_guidelines: ×× ××××ª ×××××¡
+        credit_4_1_html: |-
+          ××× ××××××¨ ×©×× ×ª×× ×× ×××× ×× ××¤× ×ª× ×× ×¨××©××× ××¡× ×× ×ª×× ×× ××¤×ª××, ×××¤×©×¨××ª× ××§×©×¨ ×%{this_copyright_page_link}.
+          ×××××¤××, ××××¨××©× ×× OSM ×××¤×¥ ×¢×Ö¾×××× ××¦××¨×ª × ×ª×× ××, ××¤×©×¨ ××¡×¤×§ ×©× ×××§×©×¨ ××©××¨××ª ××¨××©××× (×× ×¨××©××× ××ª). ××××¦×¢× ×××¡×× ×©××× ×§××©××¨×× ××× × ××¤×©×¨××× (×××©× ×¢×××××ª ××××¤×¡××ª), ×× × ××¦××¢×× ×× ×××¤× ××ª ××ª ××§××¨××× ×©×× ×××ª×¨ openstreetmap.org (×××× ×¢×ââÖ¾××× ××¨×××ª
+          âOpenStreetMapâ ×××ª×××ª ××××× ××××ª) ××××ª×¨ opendatacommons.org.
+          ×××××× ××××ª, ××ª××××ª ×××¤××¢××ª ××¤×× ×ª ×××¤×.
+        credit_4_1_this_copyright_page: ××£ ××××××ª ××××¦×¨×× ×××
         attribution_example:
           alt: ××××× ××¦××¨× ×× ××× × ××ª×ª ×××××¡ ×Ö¾OpenStreetMap ×××ª×¨ ×××× ××¨× ×
           title: ××××× ××××××¡
         more_title_html: ××× ×××¦×× ××××¢ × ××¡×£
-        more_1_html: |-
-          ×§Ö´×¨×× ×¢×× ×¢× ×©××××© ×× ×ª×× ×× ×©×× × ××¢× ××¨××× ×××××¡ ×××× × ××¦××¨××ª × ×××¨××ª ×<a
-          href="http://osmfoundation.org/Licence">××£ ×¨××©××× OSMF</a>.
-        more_2_html: |-
-          ××£Ö¾×¢×Ö¾×¤× ×©Ö¾OpenStreetMap ××× ×××× × ×ª×× ×× ×¤×ª××××, ××× × × ×××××× ××¡×¤×§
-          API ××¤××ª ×××× × ××× ×¦× ×©×××©×.
-          ×¨×³ ××ª ××¤× ××××× ×××ª ×©×× ×: <a href="https://operations.osmfoundation.org/policies/api/">××××× ×××ª ××©××××© ×Ö¾API</a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles/">×××× ×××ª ××©××××© ×××¨××××</a>
-          ×<a href="https://operations.osmfoundation.org/policies/nominatim/">×××× ×××ª ××©××××© ×× ×××× ×××</a>.
+        more_1_1_html: ××¤×©×¨ ××§×¨×× ×¢×× ×¢× ××©××××© ×× ×ª×× ×× ×©×× ×, ××¢× ××× ××ª×ª ×× × ×××××¡,
+          ×Ö¾%{osmf_licence_page_link}.
+        more_1_1_osmf_licence_page: ××£ ××¨××©××× ×©× OSMF
+        more_2_1_html: |-
+          ××£ ×©Ö¾OpenStreetMap ××× × ×ª×× ×× ×¤×ª××××, ××× × × ×××××× ××¡×¤×§
+          API ×©× ××¤××ª ××× ×ª×©××× ×¢×××¨ ×¦×××× ×©×××©×××.
+          × × ××¢××× ×%{api_usage_policy_link}, ×%{tile_usage_policy_link} ××%{nominatim_usage_policy_link} ×©×× ×.
+        more_2_1_api_usage_policy: ×××× ××ª ××©××××© ×Ö¾API
+        more_2_1_tile_usage_policy: ×××× ×××ª ××©××××© ×××¨××××
+        more_2_1_nominatim_usage_policy: ×××× ×××ª ××©××××© ×× ×××× ×××
         contributors_title_html: ××ª××¨××× ×©×× ×
         contributors_intro_html: |-
           ××ª××¨××× ×©×× × ×× ×××¤× ×× ×©××. ×× × ×× ××××××
           × ×ª×× ×× ××¨××©××× ×¤×ª×× ××¡××× ××××ª ×××¤×× ××××××ª
           ××××§××¨××ª ×××¨××, ×××:
-        contributors_at_html: |-
-          <strong>×××¡××¨××</strong>: ×××× × ×ª×× ××
-          ×<a href="https://data.wien.gv.at/">×¢××¨×××ª ××× ×</a> ××¤× ×ª× ××
-          <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>,
-          ×<a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">×××× ×ª ×¤××¨××¨×××¨×</a>
-          ×××××× ×ª ×××¨×× (××¤× <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT ×¢× ×ª××§×× ××</a>).
-        contributors_au_html: |-
-          <strong>×××¡××¨×××</strong>: ×××× ×× ×ª×× × ×¤×¨×××¨×× ×××××¡×¡×× ×¢×
-          × ×ª×× × ×××©×× ××××¡××¨×××ª ××¡××××¡×××§× (Australian Bureau of Statistics).
-        contributors_ca_html: |-
-          <strong>×§× ××</strong>: ×××× × ×ª×× ××
-          ×Ö¾GeoBase&reg;&rlm;, GeoGratis&rlm; (&copy;&rlm; Department of Natural
-          Resources Canada)&rlm;, CanVec&rlm; (&copy;&rlm; Department of Natural
-          Resources Canada), ×Ö¾StatCan&rlm; (Geography Division,
-          Statistics Canada).
-        contributors_fi_html: |-
-          <strong>×¤×× ×× ×</strong>: ×××× ××××¢ ×××¡× × ×ª×× ×× ×××¤×××¨×¤××× ×©× ×¤×× ×× × ××××§××¨××ª ××××¢ ×××¨××, ×ª××ª
-          <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">×¨××©××× NLSFI</a>.
-        contributors_fr_html: |-
-          <strong>×¦×¨×¤×ª</strong>: ×××× × ×ª×× ×× ×©××××¢× ×××§××¨
-          ××× ×××ª ×××¡×× ××××××ª (Direction GÃ©nÃ©rale des ImpÃ´ts).
-        contributors_nl_html: |-
-          <strong>×××× ×</strong>: ×××× &copy; × ×ª×× ×× ×Ö¾ AND&rlm;, 2007
-          (<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: ×¡×ª×
-        contributors_si_html: |-
-          <strong>×¡×××× ××</strong>: ×××× × ×ª×× ×× ×<a href="http://www.gu.gov.si/en/">××¨×©××ª ××××××ªÖ¾×§×¨×§×¢××ª ×××××¤××</a> ××<a href="http://www.mkgp.gov.si/en/">××©×¨× ×××§××××ª, ×××¢×¨× ××ª ××××××</a>
+        contributors_at_credit_html: |-
+          %{austria}: ××××× × ×ª×× ×× ×%{stadt_wien_link} (×ª××ª %{cc_by_link}), %{land_vorarlberg_link}
+          ××××× ×ª ×××¨×× (×ª××ª %{cc_by_at_with_amendments_link}).
+        contributors_at_austria: ×××¡××¨××
+        contributors_at_stadt_wien: ××¢××¨ ××× ×
+        contributors_at_cc_by: ×§×¨××××××× ×§×××× × ×××××¡
+        contributors_at_land_vorarlberg: ×××× ×ª ×¤××¨××¨×××¨×
+        contributors_at_cc_by_at_with_amendments: ×§×¨××××××× ×§×××× × ×××××¡ ×××¡××¨×× ×¢×
+          ×ª××§×× ××
+        contributors_au_credit_html: |-
+          %{australia}: ××©×××ª ×× ××¤××ª××ª ××××¦×¢××ª Administrative Boundariesâ &copy;â %{geoscape_australia_link}
+          ×××¨××©××× × ××ª× ×¢×Ö¾××× ××§×××××× ×©× ×××¡××¨××× ×ª××ª %{cc_licence_link}.
+        contributors_au_australia: ×××¡××¨×××
+        contributors_au_geoscape_australia: Geoscape ×××¡××¨×××
+        contributors_au_cc_licence: ×¨××©××× ×§×¨××××××× ×§×××× × ×××××¡ 4.0 ×××Ö¾××××× (CC
+          BY 4.0)
+        contributors_ca_credit_html: |-
+          %{canada}: ××××× × ×ª×× ×× ××ª××
+          GeoBase&reg;â, GeoGratis (&copy; ××××§×ª ××©×××
+          ××××¢ ×©× ×§× ××), CanVec (&copy; ××××§×ª ××©×××
+          ××××¢ ×©× ×§× ××), ×Ö¾StatCan (××××§×ª ××××××¨×¤××,
+          ×¡××× ××ª ××¡××××¡×××§× ×©× ×§× ××).
+        contributors_ca_canada: ×§× ××
+        contributors_cz_credit_html: |-
+          %{czechia}: ××××× × ×ª×× ×× ×××× ×× ××××××ª× ×××××××ª ×§×¨×§×¢
+          ××¡×¤×¨× ××××× ××¨××©××× %{cc_licence_link}
+        contributors_cz_czechia: ×¦×³×××
+        contributors_cz_cc_licence: ×¨××©××× ×§×¨××××××× ×§×××× × ×××××¡ 4.0 ×××Ö¾××××× (CC
+          BY 4.0)
+        contributors_fi_credit_html: |-
+          %{finland}: ××××× × ×ª×× ×× ×××××¨ ×× ×ª×× ×× ××××¤×××¨×¤× ×©×
+          ××× ××§×¨×§×¢ ×××××× ×©× ×¤×× ×× ×
+          ×××¢×¨×× × ×ª×× ×× ×××¨××, ××¤× ×ª× ×× %{nlsfi_license_link}.
+        contributors_fi_finland: ×¤×× ×× ×
+        contributors_fi_nlsfi_license: ×¨××©××× ××× ××§×¨×§×¢ ×××××× ×©× ×¤×× ×× ×
+        contributors_fr_credit_html: |-
+          %{france}: ××××× × ×ª×× ×× ×©××××¢× ×××§××¨
+          ××× ×××ª ××××¡×× ××××××ª (Direction GÃ©nÃ©rale des ImpÃ´ts).
+        contributors_fr_france: ×¦×¨×¤×ª
+        contributors_hr_credit_html: |-
+          %{croatia}: ××××× × ×ª×× ×× ×%{dgu_link} ××%{open_data_portal}
+          (××××¢ ×¦××××¨× ×©× ×§×¨×××××).
+        contributors_hr_croatia: ×§×¨×××××
+        contributors_hr_dgu: ××Ö´× ×× ××××××× ××××××ª× ×©× ×§×¨×××××
+        contributors_hr_open_data_portal: ×¤××¨×× ×× ×ª×× ×× ××¤×ª×××× ××××××
+        contributors_nl_credit_html: '%{netherlands}: ××××× Â© × ×ª×× × ANDâ, 2007 (â%{and_link})'
+        contributors_nl_netherlands: ×××× ×
+        contributors_nz_credit_html: |-
+          %{new_zealand}: ××××× × ×ª×× ×× ×©××§××¨× ×Ö¾%{linz_data_service_link}
+          ××××¨×©×× ××©××××© ××××¨ ××¤× ×ª× ×× ×¨××©××× %{cc_by_link}.
+        contributors_nz_new_zealand: × ×× ×××× ×
+        contributors_nz_linz_data_service: ×©××¨××ª ×× ×ª×× ×× ×©× ××××¢ ×¢× ××§×¨×§×¢ ×©× × ×× ×××× ×
+          (LINZ)
+        contributors_nz_cc_by: ×§×¨××××××× ×§×××× × ×××××¡ 4.0
+        contributors_rs_credit_html: |-
+          %{serbia}: ××××× × ×ª×× ×× ×%{rgz_link} ××%{open_data_portal}
+          (××××¢ ×¦××××¨× ×©× ×¡×¨×××), 2018.
+        contributors_rs_serbia: ×¡×¨×××
+        contributors_rs_rgz: ××¨×©××ª ××××××××ª ××¡×¨×××ª
+        contributors_rs_open_data_portal: ×¤××¨×× ×× ×ª×× ×× ××¤×ª×××× ××××××
+        contributors_si_credit_html: |-
+          %{slovenia}: ××××× × ×ª×× ×× ×%{gu_link} ××%{mkgp_link}
           (××××¢ ×¦××××¨× ×©× ×¡×××× ××).
-        contributors_es_html: |-
-          <strong>×¡×¤×¨×</strong>: ×××× × ×ª×× ×× ×©×¡××¤×§× ×¢× ×××
-          ××××× ××××××¨×¤× ×××××× ×©× ×¡×¤×¨× (<a href="http://www.ign.es/">IGN</a>) ××¢× ×××
-          ××¢×¨××ª ××××¤×× ×××××××ª (<a href="http://www.scne.es/">SCNE</a>)
-          ×©×××ª×¨ ×××©×ª××© ××× ×ª××ª ×ª× ×× <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_za_html: |-
-          <strong>××¨×× ××¤×¨××§×</strong>: ×××× × ×ª×× ×× ×©××××¢×
-          ×Ö¾<a href="http://www.ngi.gov.za/">×Ö´× ×× ××××:
-          ××××¢ ×××Ö¾××¨××× ×××××</a>, ××××ª ×××¦×¨×× ×××××ª××ª ×©×××¨×.
-        contributors_gb_html: |-
-          <strong>×××××× ×××××××ª</strong>: ×××× × ×ª×× × ×¡×§×¨ ××××××ª
+        contributors_si_slovenia: ×¡×××× ××
+        contributors_si_gu: ×¨×©××ª ×××××× ×××××¤××
+        contributors_si_mkgp: ××©×¨× ×××§××××ª, ×××¢×¨× ××ª ××××××
+        contributors_es_credit_html: |-
+          %{spain}: ××××× × ×ª×× ×× ×©××§××¨×
+          ××××× ×××××× ××××××¨×¤× ××¡×¤×¨×× (%{ign_link})
+          ××××¢×¨××ª ××××¤×× ×××××××ª (%{scne_link})
+          ××©×××¨×©×× ××©××××© ××××¨ ××¤× ×ª× ×× ×¨××©××× %{cc_by_link}.
+        contributors_es_spain: ×¡×¤×¨×
+        contributors_es_ign: ××××× ×××××¤××¨×¤× ×××××× ×©× ×¡×¤×¨×
+        contributors_es_cc_by: ×§×¨××××××× ×§×××× × ×××××¡ 4.0
+        contributors_za_credit_html: '%{south_africa}: ××××× × ×ª×× ×× ×©××§××¨× ×%{ngi_link},
+          ××××××ª ××××¦×¨×× ×©× ××××× × ×©×××¨××ª.'
+        contributors_za_south_africa: ××¨×× ××¤×¨××§×
+        contributors_za_ngi: '×× ×××ª ×¨××©××ª: ××××¢ ×××Ö¾××¨××× ×××××'
+        contributors_gb_credit_html: |-
+          %{united_kingdom}: ××××× × ×ª×× × ×¡×§×¨ ××××××ª
           &copy; ××××××ª ×××ª×¨ ×××××××ª ××¡×× × ×ª×× ××
-          2010â2019.
-        contributors_footer_1_html: |-
-          ×××××¢ × ××¡×£ ×¢× ××§××¨××ª ××× ××××¨×× ×©×©×××©×
-          ××©××¤××¨ OpenStreetMap, × × ××¨×××ª ××ª <a
-          href="https://wiki.openstreetmap.org/wiki/Contributors">××£
-          ××ª××¨×××</a> ×××××§× ×©× OpenStreetMap.
+          2010â2023.
+        contributors_gb_united_kingdom: ×××××× ×××××××ª
+        contributors_2_html: |-
+          ××¤×¨××× × ××¡×¤×× ×¢× ××× ××¢× ××§××¨××ª ×××¨×× ×©× ×¢×©× ××× ×©××××©
+          ××× ××¢×××¨ ××©×¤×¨ ××ª OpenStreetMap, × × ××¢××× ×%{contributors_page_link} ×××××§× ×©× OpenStreetMap.
+        contributors_2_contributors_page: ××£ ××ª××¨×××
         contributors_footer_2_html: |-
           ××××× ×©× × ×ª×× ×× ×Ö¾OpenStreetMap ××× × ××××¨×ª ×©××¡×¤×§ ×××§××¨×
           ×©× ×× ×ª×××× ×ª××× ×Ö¾OpenStreetMap, ×××§× ×¢× ×¢×¦×× ×××¨×××ª ×××©××, ××
@@ -1791,17 +2239,19 @@ he:
           ×× × ×××××¨×× ××ª××¨××× ×Ö¾OSM ××¢××× ×× ××××¡××£ × ×ª×× ×× ××©×× ××§××¨
           ×©××××× ×××××××ª ×××¦×¨×× (×××©× ××¤××ª ×××× ×× ××¤××ª ××××¤×¡××ª) ×××
           ×××©××¨ ××¤××¨×© ×××¢×× ×××××××ª.
-        infringement_2_html: |-
-          ×× × ×¨×× ×× ×©××××¨ ×©××××× ×××××××ª ×××¦×¨×× × ××¡×£ ××××¤× ×× ××××
-          ×× ××¡× ×× ×ª×× ×× ×©× OpenStreetMap ×× ×× ×××ª×¨ ×××, × × ××¤× ××ª
-          ×× <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">× ×××
-          ×××¡×¨×</a> ×©×× × ×× ××ª×× ×ª××× × ××©××¨××ª
-          <a href="https://dmca.openstreetmap.org/">×××£ ××ª××× ××ª ×××§××× ×©×× ×</a>.
-        trademarks_title_html: <span id="trademarks"></span>×¡××× ×× ××¡××¨×××
-        trademarks_1_html: OpenStreetMap, ×¡×× ×××××××ª ××××××ª ×Ö¾State of the Map ××
-          ×¡××× ×× ××¡××¨××× ×©× ×§×¨× OpenStreetMap. ×× ××© ×× ×©××××ª ×¢× ××©××××© ×©×× ××¡××× ××,
-          ×¨' ××ª <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">×××× ×××ª
-          ××¡××× ×× ×××¡××¨××× ×©×× ×</a>.
+        infringement_2_1_html: |-
+          ×× × ×¨×× ×× ×©××××¨ ×××××× ×××××××ª ×××¦×¨×× ××ª×××¡×£ ××××¤× ×××ª×Ö¾××××
+          ×××¡× ×× ×ª×× ×× ×©× OpenStreetMap ×× ×××ª×¨ ×××, × × ××¢×××
+          ×%{takedown_procedure_link} ×©×× × ×× ×××××© ××§×©× ××©××¨××ª
+          ×%{online_filing_page_link} ×©×× ×.
+        infringement_2_1_takedown_procedure: ×××× ×××¡×¨×
+        infringement_2_1_online_filing_page: ××£ ××××©× ×××§×××
+        trademarks_title: ×¡××× ×× ××¡××¨×××
+        trademarks_1_1_html: |-
+          OpenStreetMap, ×××× ×××××××ª ××××××ª ×Ö¾State of the Map ×× ×¡××× ×× ××¡××¨××× ×¨×©×××× ×©×
+          ×§×¨× OpenStreetMap. ×× ××© ×× ×©××××ª ×××× ××©××××© ×©×× ××¡××× ××,
+          ×¨×³ ××ª %{trademark_policy_link} ×©×× ×.
+        trademarks_1_1_trademark_policy: ×××× ×××ª ××¡××× ×× ×××¡××¨×××
     index:
       js_1: ×××¤××¤× ×©×× ××ª× ××©×ª××© ××× × ×ª××× ×Ö¾JavaScript, ×× ×©×××××ª ××ª ××©××××© ×Ö¾JavaScript.
       js_2: ××ª×¨ OpenStreetMap ××©×ª××© ×Ö¾JavaScript ×××¤× ××××××§×.
@@ -1818,30 +2268,16 @@ 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, ×××× ×××× ×××
-        ×¢×××¨ ×ª××× × ××.
+      no_iframe_support: ×××¤××¤× ×©×× ××× × ×ª××× ×××¡××¨××ª iframe ×©× HTML, ×©×××× ×××ª ××ª××× ×
+        ××××ª.
     export:
-      title: ×××¦××
-      area_to_export: ×××××¨ ××××¦××
+      title: ××¦××
       manually_select: ××××¨× ××× ××ª ×©× ××××¨ ×××¨
-      format_to_export: ×ª×¡×××¨ ××××¦××
-      osm_xml_data: × ×ª×× × XML ×©× OpenStreetMap
-      map_image: ×ª××× ×ª ××¤× (×ª×¦×××ª ×©××× ×ª×§× ××ª)
-      embeddable_html: HTML ×©× ××ª× ×××××¢×
       licence: ×¨××©×××
-      export_details_html: ×××××¢ ×Ö¾OpenStreetMap ××××© ×××¤××£ ×<a href="href="https://opendatacommons.org/licenses/odbl/1.0/">×¨××©×××
-        Open Data Commons ×× ×ª×× ×× ×¤×ª××××</a> (ODbL).
+      licence_details_html: × ×ª×× × OpenStreetMap ××ª×¤×¨×¡××× ×¢××©×× ××¤× ×¨××©××× %{odbl_link}
+        (ODbL).
+      odbl: ×¨××©××× ××¡× × ×ª×× ×× ×¤×ª×× ×©× Open Data Commons
       too_large:
         advice: '×× ×××××× ×× ×´× × ××©×, × × ×× ×¡××ª ×××©×ª××© ×××× ×××§××¨××ª ××××:'
         body: '×××××¨ ×××× ×××× ×©××¤×©×¨ ×××× ××××¦× ×××ª× ××ª××¨ × ×ª×× × XML ×©× OpenStreetMap.
@@ -1856,24 +2292,10 @@ he:
         geofabrik:
           title: ×××¨×××ª ×©× Geofabrik
           description: ×¢××ª×§×× ××¢×××× ×× ××××¤× ×§×××¢ ×©× ×××©××ª, ×××× ××ª ××¢×¨×× × ×××¨××ª
-        metro:
-          title: ××××××ª ×××¨×
-          description: ××××××ª ×××§×××ª ××¢×¨×× ×¢××××××ª ××××××ª ×××××¨×× ××¡××××ª×
         other:
           title: ××§××¨××ª ×××¨××
           description: ××§××¨××ª × ××¡×¤×× ×¨×©×××× ×××××§× ×©× OpenStreetMap
-      options: ××¤×©×¨××××ª
-      format: ×ª×¡×××¨
-      scale: ×§× × ××××
-      max: ××× ××××ª×¨
-      image_size: ×××× ××ª××× ×
-      zoom: ××¨××§ ××ª×¦×××
-      add_marker: ×××¡×¤×ª ×¡×× ×××¤×
-      latitude: '×§××× ×××¨×:'
-      longitude: '×§××× ×¨×××:'
-      output: ×¤××
-      paste_html: ××××××§ HTML ×××××¢× ×××ª×¨
-      export_button: ×××¦××
+      export_button: ××¦××
     fixthemap:
       title: ××××× ×¢× ××¢×× / ××ª×§× ××ª ×××¤×
       how_to_help:
@@ -1884,16 +2306,17 @@ he:
             ×× ×©××ª ×× ×××¢×× ×¢× × ×ª×× × ×××¤× ×©×× ×, ×××©× ×©××¨× ×× ×©××ª×××ª ×©×× ××¡×¨×, ×××¨× ××××× ××××ª×¨
             ××××©×× ××× ×××¦××¨×£ ××§××××ª OpenStreetMap ×××ª×§× ××ª ×× ×ª×× ×× ××¢×¦××.
         add_a_note:
-          instructions_html: |-
-            ×¦×¨×× ×¤×©×× ×××××¥ ×¢× <a class='icon note'></a> ×× ×¢× ×××ª× ××¡×× ××ª×¦×××ª ×××¤×.
+          instructions_1_html: |-
+            ×¦×¨×× ×¤×©×× ×××××¥ ×¢× %{note_icon} ×× ×¢× ×××ª× ××¡×× ××ª×¦×××ª ×××¤×.
             ×× ×××¡××£ ×××¤× ×¡×× ×©××¤×©×¨ ×××××
-            ××××¦×¢××ª ××¨××¨×. ××© ××××¡××£ ×©× ××¢×¨× ×××©×××¨ ×××ª× ××××¤×× ×××¨×× ×××§×¨× ××ª ××.
+            ××××¦×¢××ª ××¨××¨×. ××© ××××¡××£ ××ª ×××¢×¨× ×©××, ××× ×××××¥ ×©×××¨×, ××××¤×× ×××¨×× ×××§×¨× ××ª ××.
       other_concerns:
         title: ×××××ª ×××¨××ª
-        explanation_html: ×× ××© ×× ×××××ª ×××× ××× ×©×× ×ª×× ×× ×©×× × ××©××©×× ×× ×¢× ××ª×××,
-          × × ××§×¨×× ××ª <a href='/copyright'>××£ ××××××ª ××××¦×¨××</a> ×©×× × ×××××¢ ××©×¤××
-          × ××¡×£, ×× ×××¦××¨ ×§×©×¨ ×¢× <a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>×§×××¦×ª
-          ××¢×××× ×××ª×××× ×Ö¾OSMF</a>.
+        concerns_html: ×× ××© ×× ××©×©××ª ×××× ×××¤× ××©××××© ×× ×ª×× ×× ×©×× × ×× ×××× ××ª×××,
+          × × ××¢××× ×%{copyright_link} ×©×× × ××§×××ª ××××¢ ××©×¤×× × ××¡×£, ×× ×××¦××¨ ×§×©×¨ ×¢×
+          %{working_group_link} ×××ª××××.
+        copyright: ××£ ××××××ª ××××¦×¨××
+        working_group: ×§×××¦×ª ×¢××××ª ×Ö¾OSMF
     help:
       title: ×§×××ª ×¢××¨×
       introduction: |-
@@ -1907,17 +2330,13 @@ he:
         url: https://wiki.openstreetmap.org/wiki/He:Beginners%27_guide
         title: ××××¨×× ×××ª×××××
         description: ×××¨×× ××ª××××§×ª ××§×××× ×××ª×××××.
-      help:
-        url: https://help.openstreetmap.org/
-        title: ×¤××¨×× ××¢××¨×
-        description: ××©××× ×©××× ×× ×××¤×© ×ª×©××××ª ×××ª×¨ ××©××××ª ×××ª×©××××ª ×©× OpenStreetMap.
+      community:
+        title: ×¢××¨× ××¤××¨×× ×§××××ª×
+        description: ××§×× ××©××ª×£ ×××¤×© ×¢××¨× ××× ×× ×©××××ª ×¢× OpenStreetMap.
       mailing_lists:
         title: ×¨×©××××ª ×ª×¤××¦×
         description: ××©××× ×©××× ×× ×××× ××××¨×× ××¢× ××× ×× ××¨×©××××ª ×ª×¤××¦× × ××©××× ×××××¨×××ª
           ×¨×××ª.
-      forums:
-        title: ×¤××¨××××
-        description: ×©××××ª ××××× ×× ××× ×©×× ×©××¢×××¤×× ×××©×§ ××¡×× ×× ×¤××¨××.
       irc:
         title: IRC
         description: ×©××× ××× ××¨××§×××××ª ××©×¤××ª ×©×× ××ª ×¨×××ª ××× ××©××× ×¨×××.
@@ -1925,14 +2344,27 @@ he:
         title: switch2osm
         description: ×¢××¨× ××××¨××ª ×××¨××× ×× ×©×¢×××¨×× ×××¤××ª ××©××¨××ª×× ×××¨×× ×©× OpenStreetMap.
       welcomemat:
-        url: https://welcome.openstreetmap.org/
         title: ×××¨××× ××
         description: ×××¨××× ×©×× ××ª×× × ×ª×× ×××ª ×¢× OpenStreetMap? ×× ×××××¢ ×× ×××¥ ×× × ××¦×
           ××××¦××ª ××× ××¡×.
       wiki:
-        url: https://wiki.openstreetmap.org/
         title: ×××××§× ×©× OpenStreetMap
         description: ××¢××× ×××××§× ××ª××¢×× ××¢×××§ ×¢× OpenStreetMap.
+    potlatch:
+      removed: ×¢××¨× ×OpenStreetMap ××¨××¨×ª ××××× ×©×× ×××××¨ ×Potlatch. ×××× ×©× ×× ××¤×××©
+        ×©× ××××× ×××¨ ×× × ×ª××, Potlatch ×××¨ ×× ×××× ×××¤××¤×.
+      desktop_application_html: ×¢×××× ××¤×©×¨ ×××©×ª××© ×Ö¾Potlatch ×¢×Ö¾××× %{download_link}.
+      download: ×××¨××ª ×××©×× ×©×××× ××¢×××× ×¢×××¨ ×××©×× ×××§ ××××× ××ª
+      id_editor_html: ×××××¤××, × ××ª× ××××××¨ ××ª ×¢××¨× ××¨××¨×ª ××××× ×©×× ×Ö¾iD, ×©×××¤×¢× ×××¤××¤×
+        ××× ×©Ö¾Potlach ×¢×©× ××¢××¨. %{change_preferences_link}
+      change_preferences: ××¤×©×¨ ××©× ××ª ××ª ×××¢××¤××ª ×©×× ×××
+    any_questions:
+      title: ××© ×©××××ª?
+      paragraph_1_html: |-
+        ×Ö¾OpenStreetMap ××© ××× ××©×××× ×××××× ×¢× ××¤×¨×××§×, ××©××××ª ××ª×©××××ª, ×××××× ××ª××¢×× ××©××ª×¤×× ×©× × ××©×× ×××¤××.
+        %{help_link}. ××© ×× ×§×©×¨ ×××¨××× ×©××ª×× × ××¢×©××ª ××©×× ×¢× OpenStreetMap? %{welcome_mat_link}
+      get_help_here: ××× × ××ª× ××§×× ×¢××¨×
+      welcome_mat: ××××§ ××ª ××××¨ ×§×××ª ××¤× ××
     sidebar:
       search_results: ×ª××¦×××ª ××××¤××©
       close: ××¡×××¨×
@@ -1955,128 +2387,150 @@ he:
           primary: ××××© ×¨××©×
           secondary: ××××© ××©× ×
           unclassified: ××¨× ×× ××¡××××ª
+          pedestrian: ××¨× ×××××× ×¨××
           track: ××¡×××
           bridleway: ××¡××× ××¨××××ª ×¡××¡××
           cycleway: ××¨× ××××¤× ×××
           cycleway_national: ××¡××× ×××¤× ××× ×××××
           cycleway_regional: ××¡××× ×××¤× ××× ××××¨×
           cycleway_local: ××¡××× ×××¤× ××× ××§×××
+          cycleway_mtb: ××¡××× ×××¤× × ××¨××
           footway: ×©××× ×××××× ×¨××
           rail: ××¡×××ª ××¨××
+          train: ×¨×××ª
           subway: ×¨×××ª ×ª××ª××ª
-          tram:
-          - ×¨×××ª ×§××
-          - ××©××××ª
-          cable:
-          - ×¨×××
-          - ××¢×××ª ×¡×§×
-          runway:
-          - ××¡××× × ×××ª×
-          - ××¨× ×××× ×××ª
-          apron:
-          - ×¨×××ª ×× ×× ×××××¡××
-          - ××¡××£
+          ferry: ××¢×××¨×ª
+          light_rail: ×¨×××ª ×§××
+          tram: ××©××××ª
+          trolleybus: ××¨××××××¡
+          bus: ×××××××¡
+          cable_car: ×¨×××
+          chair_lift: ×¨××× ×××©×××
+          runway: ××¡××× × ×××ª×
+          taxiway: ××¡××× ××¡×¢×
+          apron: ×¨×××ª ×× ×× ×××××¡××
           admin: ×××× ×©×× ×©××¤××
+          capital: ×××¨×
+          city: ×¢××¨
+          orchard: ×××¢
+          vineyard: ××¨×
           forest: ××¢×¨
           wood: ×××¨×©×
+          farmland: ×©×× ××§×××
+          grass: ××©×
+          meadow: ×××
+          bare_rock: ×¡××¢ ××©××£
+          sand: ×××
           golf: ××¡××× ××××£
           park: ×¤××¨×§
+          common: ××¨×¢×
+          built_up: ×©×× ×× ××
           resident: ××××¨ ××××¨××
-          common:
-          - ××¨×¢×
-          - ××¨×¢×
           retail: ××××¨ ×§××¢×× ××
           industrial: ××××¨ ×ª×¢×©×××
           commercial: ××××¨ ××¡××¨×
           heathland: ×©×× ×¤×¨×
-          lake:
-          - ×××
-          - ××××¨
+          scrubland: ××ª×
+          lake: ×××
+          reservoir: ××××¨
+          intermittent_water: ×××£ ××× ×ª×§××¤×ª×
+          glacier: ×§×¨××× ×××©×ª×
+          reef: ×©×× ××ª
+          wetland: ×××¦×
           farm: ××××
           brownfield: ××××¨ ×ª×¢×©××× × ×××©
           cemetery: ×××ª ×¢××××
           allotments: ×©×××× ××§×××××
           pitch: ×××¨×© ×¡×¤××¨×
           centre: ××¨×× ×¡×¤××¨×
+          beach: ×××£
           reserve: ×©×××¨×ª ×××¢
           military: ×©×× ×¦×××
-          school:
-          - ×××ª ×¡×¤×¨
-          - ××× ×××¨×¡×××
+          school: ×××ª ×¡×¤×¨
+          university: ××× ×××¨×¡×××
+          hospital: ×××ª ×××××
           building: ×× ××× ××¢× ××©××××ª
           station: ×ª×× ×ª ×¨×××ª
-          summit:
-          - ×¤×¡××
-          - ×¤×¡××
+          summit: ×¤×¡××
+          peak: ×¤×¡××
           tunnel: ×§× ××§×××§× = ×× ××¨×
           bridge: ×§× ×©×××¨ = ××©×¨
           private: ×××©× ×¤×¨×××ª
           destination: ×××©× ×××¢×
           construction: ××¨××× ××× ×××
+          bus_stop: ×ª×× ×ª ×××××××¡
+          stop: ×¢×¦××¨×
           bicycle_shop: ×× ××ª ×××¤× ×××
+          bicycle_rental: ××©××¨×ª ×××¤× ×××
           bicycle_parking: ×× ×××ª ×××¤× ×××
+          bicycle_parking_small: ×× ×××ª ×××¤× ××× ×§×× ×
           toilets: ×©××¨××ª××
-    richtext_area:
-      edit: ×¢×¨×××
-      preview: ×ª×¦××× ××§××××
-    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: ××ª×××ª
     welcome:
       title: ××¨×× ××××!
-      introduction_html: ××¨×× ×××× ×Ö¾OpenStreetMap, ××¤× ×××¤×©××ª ×©× ××¢×××, ×©××¤×©×¨ ××¢×¨××.
-        ×¢××©×× ×©× ×¨×©××ª, ×××× ×××× ×××¤×©×¨ ×××ª××× ××¦×××¨ ××¤××ª. ×× × ×××¨×× ×§×¦×ª ×©×××ª× ×× ××ª
-        ××××¨×× ×××©×××× ×©×××× ×× ×××¢×ª.
+      introduction: ××¨×× ×××× ×Ö¾OpenStreetMap, ××¤× ×××¤×©××ª ×©× ××¢×××, ×©××¤×©×¨ ××¢×¨××. ×¢××©××
+        ×©× ×¨×©××ª, ×××× ×××× ×××¤×©×¨ ×××ª××× ××¦×××¨ ××¤××ª. ×× × ×××¨×× ×§×¦×ª ×©×××ª× ×× ××ª ××××¨××
+        ×××©×××× ×©×××× ×× ×××¢×ª.
       whats_on_the_map:
         title: ×× ×¢× ×××¤×
-        on_html: OpenStreetMap ××× ××§×× ××××¤×× ×××¨×× ×××ª××× ×× ×××××× â ××× ×××× ×××××× ×
-          ××× ××, ××¨××× ××¤×¨××× ×××¨×× ×¢× ××§××××ª. ××¤×©×¨ ×××¤××ª ×× ××©××ª ×××¢××× ××××ª× ×©××¢× ×××
-          ×××ª×.
-        off_html: ×× ×©××× ×¤× ×× ××××¢ ××¢×ª× × ××× ×××¨××××, ××§××××ª ×××¡×××¨××× ×× ×××¤××ª××××
-          ×× ×ª×× ×× ×××§××¨××ª ×©××××××× ×××××××ª ×××¦×¨××. ×× × ×××¨×©×× ××× ×× ××××¡××£  ××××¢
-          ×××¤××ª ××§××× ××ª ×× ××××¤×¡××ª ××× ×× ××© ×× ×××©××¨ ××××× ×××.
+        on_the_map_html: OpenStreetMap ××× ××§×× ××××¤×× ×××¨×× %{real_and_current} â
+          ××× ×××× ×××××× × ××× ××, ××¨××× ××¤×¨××× ×××¨×× ×¢× ××§××××ª. ××¤×©×¨ ×××¤××ª ×× ××©××ª
+          ×××¢××× ×××××ª× ×©××¢× ××× ×ª ×××ª×.
+        real_and_current: ××××ª××× ×× ××××××
+        off_the_map_html: ×× ×©%{doesnt} ×¤× ××× ××××¢ ××¢×ª× × ××× ×××¨××××, ××§××××ª ×××¡×××¨×××
+          ×× ×××¤××ª×××× ×× ×ª×× ×× ×××§××¨××ª ×©××××××× ×××××××ª ×××¦×¨××. ×× × ×××¨×©×× ××× ××
+          ××××¡××£ ××××¢ ×××¤××ª ××§××× ××ª ×× ××××¤×¡××ª ××× ×× ××© ×× ×××©××¨ ××××× ×××.
+        doesnt: ×× × ××¦×
       basic_terms:
         title: ××× ××× ××¡××¡××× ××××¤××
-        paragraph_1_html: ××××× OpenStreetMap ××© ×¢×× ××©××. ×× × ××¡×¤×¨ ×××××ª ××¤×ª× ×©××××
-          ×©××××©×××ª.
-        editor_html: <strong>×¢××¨×</strong> ××× ×ª×× × ×× ××ª×¨ ××¢×¨×××ª ×××¤×.
-        node_html: <strong>× ×§×××</strong> ××××¦××ª ×××§×× × ×§×××ª×, ×××× ××¡×¢×× ×××ª ×× ×¢×¥
-          ×××.
-        way_html: <strong>× ×ª××</strong> ××× ×§× ×× ××××¨ ××× ××¨×, ××¨×, ××× ×× ××× ×.
-        tag_html: <strong>×ª×</strong> ××× ×¤××¡×ª ××××¢ ×¢× × ×§××× ×× ×¢× × ×ª×× ××× ×©× ×©×
-          ××¡×¢×× ×× ×××××ª ××××¨××ª ×××¨×.
+        paragraph_1: ××××× OpenStreetMap ××© ×¢×× ××©××. ××× × ××× ×××××ª ××¤×ª× ×©×××× ×©××××©×××ª.
+        an_editor_html: '%{editor} ××× ×ª××× × ×× ××ª×¨ ×©×××¤×©×¨××ª× ×××©×ª××© ×× ××¢×¨×××ª ×××¤×.'
+        a_node_html: '%{node} ××× × ×§××× ×××¤×, ××× ××¡×¢×× ×××××ª ×× ×¢×¥.'
+        a_way_html: '%{way} ××× ×§× ×× ×©××, ×××× ××××©, ××××, × ×× ×× ×× ×××.'
+        a_tag_html: '%{tag} ××× ×××§××§ ×©× ××××¢ ×¢× × ×§××× ×× ××¨×, ×××× ×©× ×©× ××¡×¢×× ××
+          ×××××ª ××××¨××ª ×××××©.'
+        editor: ×¢××¨×
+        node: × ×§×××
+        way: ××¨×
+        tag: ×ª×
       rules:
         title: ×××§××!
-        paragraph_1_html: ×Ö¾OpenStreetMap ××© ××¢× ×××§×× ×¤××¨×××××, ××× ×× ×× × ××¦×¤×× ×××
-          ×××©×ª×ª×¤×× ××©×ª×£ ×¤×¢××× ×××ª×§×©×¨ ×¢× ××§××××. ×× ××ª× ×©××§××× ×××¦×¢ ×¤×¢××××ª ×××©×× ××××
-          ×¢×¨××× ××× ××ª, ×× × ×§×¨×× ××ª ××××¨×××× ×¢× <a href='https://wiki.openstreetmap.org/wiki/Import/Guidelines'>××××</a>
-          ××¢× <a href='https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>×¢×¨××××ª
-          ×××××××××ª</a>.
-      questions:
-        title: ××© ×©××××ª?
-        paragraph_1_html: |-
-          ×Ö¾OpenStreetMap ××© ××¡×¤×¨ ××©×××× ×××××× ×¢× ×××××, ××©××××ª ××ª×©××××ª,
-          ×××××× ××ª××¢×× ×©××ª××¤× ×©× × ××©×× ×××¤××.
-          <a href='%{help_url}'>××§×× ××§×× ×¢××¨×</a>. ××© ×× ××¢××¨×××ª ×××¨××× ×©×¢××©× ×ª×× ×××ª ×¢× OpenStreetMap? ××××× ×× ×××ª× ××¤×××© ××ª ×××¦××ª ××× ××¡×</a>.
+        para_1_html: ×Ö¾OpenStreetMap ××© ××¢× ××××× ×¨×©×××× ×× ×× × ××¦×¤×× ×××©×ª×ª×¤××ª ×©×
+          ×× ×× ×©××¤×¥ ××× ×××¦××¨ ×§×©×¨ ×¢× ××§××××. ×× ×©×§××ª ×¤×¢××××××ª ×××©×× ×××¥ ××¢×¨××× ××× ××ª,
+          × × ××§×¨×× ×××¢×§×× ×××¨ ××§×××× ××× ××× ×¢× %{imports_link} ×%{automated_edits_link}.
+        imports: ×××××¨× ××××
+        automated_edits: ×¢×¨××××ª ××××××××ª
       start_mapping: ×××ª××× ×××¤××ª
+      continue_authorization: ×××©× ××××©××¨
       add_a_note:
         title: ××× ×× ××× ××¢×¨××? ××¤×©×¨ ××××¡××£ ××¢×¨×!
-        paragraph_1_html: ×× ×¨×§ ×¨×¦××ª ××ª×§× ××©×× ×§×× ×××× ×× ××× ××××¨×©× ×××××× ××× ××¢×¨××,
-          ×§× ××××¡××£ ××¢×¨×.
-        paragraph_2_html: '×¦×¨×× ×¤×©×× ××××ª ×× <a href=''%{map_url}''>×××¤×</a> ××××××¥
-          ×¢× ×¡×× ×××¢×¨×: <span class=''icon note''></span>. ×× ×××¡××£ ×××¤× ×¡××, ×©××¤×©×¨
-          ×××¨××¨. ×××¨× ×××¡×¤×ª ×××¢×¨× ××© ×××××¥ ×¢× ×©×××¨× ××××¤×× ×××¨×× ××××§× ××ª ××.'
+        para_1: ×× ×¨×§ ×¨×¦××ª ××ª×§× ××©×× ×§×× ×××× ×× ××× ××××¨×©× ×××××× ××× ××¢×¨××, ×§× ××××¡××£
+          ××¢×¨×.
+        para_2_html: |-
+          ×¦×¨×× ×¤×©×× ×××©×ª ×%{map_link} ××××××¥ ×¢× ×¡×× ××¤×ª×§: %{note_icon}.
+          ××¤×¢××× ××××ª ×ª××¡××£ ×¡×× ×××¤×, ×©× ××ª× ×××¢×××¨ ×××¨××¨×.
+          ××¤×©×¨ ××××¡××£ ××ª ×××××¢× ×©××, ×××××¥ ×¢× ×©×××¨× ××××¤×× ×××¨×× ×××§×¨× ××ª ××.
+        the_map: ××¤×
+    communities:
+      title: ×§×××××ª
+      lede_text: "×× ×©×× ××× ×¨××× ××¢××× ×ª××¨××× ×× ××©×ª××©×× ×Ö¾OpenStreetMap.\n××¢×× ×©×¨×××
+        ××©×ª×ª×¤×× ×××××××, ×××¨×× ××¦×¨× ×§×××××ª.\n××§×××¦××ª ×××× ××××¢××ª ×××××× ××××× ×××××¦×××ª
+        ××××¨×× ×××××¨×¤××× ××¢×××¨××ª ×§×× ××ª ××¢× ××××¨×× ×××××× ××¨××× ×××× ××ª. \n×× ××××××ª
+        ×××××ª ×¨×©××××ª ×× ×× ×¨×©××××ª."
+      local_chapters:
+        title: ×¢×××ª××ª ××§×××××ª
+        about_text: |-
+          ×¢×××ª××ª ××§×××××ª ×× ×§×××¦××ª ××¨××ª ××××× × ×× ×××××¨ ×©×¢×©× ××ª ××¦×¢× ××¨×©×× ×©×
+          ××§××ª ××©××××ª ××©×¤××××ª ××× ×××¨××ª ×¨×××. ×× ××××¦×××ª ××ª ×××¤× ×××ª ××××¤×× ×©× ×××××¨ ××¢×ª
+          ××ª×¢×¡×§××ª ×¢× ×©××××, ×¢×¡×§××, ××ª×§×©××¨×ª ×××§××. ×× ×× ××¦×¨× ×©××ª×¤××ª
+          ×¢× OpenStreetMap Foundation (××§××¦××¨ OSMF), ××× ××¢× ××§ ××× ×××§× ××××£ ×××©×¤×× ×©×× ×× ××××××ª ××××¦×¨××.
+        list_text: '××§×××××ª ×××××ª ×××§×× ×¨×©×××ª ××¢×××ª××ª ××§××××:'
+      other_groups:
+        title: ×§×××¦××ª ×××¨××ª
+        other_groups_html: |-
+          ××× ×¦××¨× ×××§×× ×§×××¦× ××××¤× ×¨×©×× ××××ª× ×××× ××× ××¢×××ª××ª ×××§×××××ª.
+          ×××× ×, ×§×××¦××ª ×¨×××ª ×§×××××ª ×××¦××× ×¨×× ×××× ××¡ ×××ª×Ö¾×¨×©×× ×©× ×× ×©×× ×× ××§×××¦×
+          ×§××××ª××ª. ×× ××× ×××× ×××§×× ×××ª× ×× ×××¦××¨×£ ×××××. ××¤×©×¨ ××§×¨×× ×¢×× ×%{communities_wiki_link}.
+        communities_wiki: ××£ ×××××§× ×©× ×§×××××ª
   traces:
     visibility:
       private: ×¤×¨×× (××©××ª×£ ×¨×§ ×××××× ×, × ×§××××ª ×× ××××× ××ª)
@@ -2087,7 +2541,6 @@ he:
     new:
       upload_trace: ××¢×××ª ××¡××× GPS
       visibility_help: ×× ×× ××××¨?
-      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: ×¢××¨×
       help_url: https://wiki.openstreetmap.org/wiki/Upload
     create:
@@ -2130,38 +2583,40 @@ he:
       visibility: '× ×¨××Ö¼×ª:'
       confirm_delete: ×××××§ ××ª ×× ×ª×× ×××?
     trace_paging_nav:
-      showing_page: ×××£ %{page}
       older: ××¡××××× ××©× ×× ×××ª×¨
       newer: ××¡××××× ×××©×× ×××ª×¨
     trace:
       pending: ××××ª× ×
       count_points:
-        one: × ×§×××
-        other: '%{count} × ×§××××ª'
+        one: × ×§×××.
+        two: ×©×ª× × ×§××××ª.
+        many: '%{count} × ×§××××ª.'
+        other: '%{count} × ×§××××ª.'
       more: ×¢××
       trace_details: ××¦××ª ×¤×¨×× ××¡×××
       view_map: ××¦××ª ××¤×
-      edit: ×¢×¨×××
       edit_map: ×¢×¨×××ª ××¤×
       public: ×¦××××¨×
       identifiable: ××¨ ×××××
       private: ×¤×¨××
       trackable: ××¨ ××¢×§×
-      by: ×××ª
-      in: ×
-      map: ××¤×
+      details_with_tags_html: '%{time_ago} ×××ª %{user} ×Ö¾%{tags}'
+      details_without_tags_html: '%{time_ago} ×××ª %{user}'
     index:
       public_traces: ××¡×××× GPS ×¦××××¨×××
-      my_traces: × ×ª××× ×Ö¾GPS ×©××
+      my_gps_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'>××£
-        ×××××§×</a>.
+      empty_title: ×¢×× ××× ××× ××××
+      empty_upload_html: ××¤×©×¨ %{upload_link} ×× ××××× ×¢×× ×¢× ××¢×§× GPS ×¢× %{wiki_link}.
+      upload_new: ×××¢×××ª ××¢×§× ×××©
+      wiki_page: ××£ ×××××§×
       upload_trace: ××¢×××ª ××¡×××
-      see_all_traces: ××¦××ª ×× ×××¡×××××
-      see_my_traces: ××¦××ª ×× ×ª×××× ×©××
+      all_traces: ×× ×××¡×××××
+      my_traces: ×××¡××××× ×©××
+      traces_from: ××¡××××× ×¦××××¨××× ×××ª %{user}
+      remove_tag_filter: ××¡×¨×ª ×¡×× ×× ××¤× ×ª×
     destroy:
       scheduled_for_deletion: ××¡××× ××××¢× ×××××§×
     make_public:
@@ -2191,6 +2646,12 @@ he:
       blocked: ×××©×ª× ×Ö¾API × ××¡××. × × ××××× ×¡ ××××©×§ ×××× ×××××¢ × ××¡×£.
       need_to_see_terms: ×××©×ª× ×Ö¾API ×××©×¢××ª ××× ××ª. × × ××××× ×¡ ×××ª×¨ ××× ××¦×¤××ª ××ª× ××
         ××ª×¨×××. ××× ×¦××¨× ××§×× ×××ª×, ××× ×××× ×××¦×× ×××ª×.
+    settings_menu:
+      account_settings: ××××¨××ª ××©×××
+      oauth1_settings: ××××¨××ª OAuth 1
+      oauth2_applications: ×××©××× OAuth 2
+      oauth2_authorizations: ×××©××¨× OAuth 2
+      muted_users: ××©×ª××©×× ×××©×ª×§××
   oauth:
     authorize:
       title: ×××©××¨ ××××©× ×××©××× ×©××
@@ -2218,9 +2679,22 @@ he:
       flash: ×©×××ª ××ª ×××¡×××× ×××××©×× %{application}.
     permissions:
       missing: ×× × ×ª×ª ×××¨×©×× ×××©× ×××ª×§× ×××
+    scopes:
+      openid: ×× ××¡× ×¢× OpenStreetMap
+      read_prefs: ××¢××¤××ª ×§×¨×××
+      write_prefs: ×©×× ×× ××¢××¤××ª ××©×ª××©
+      write_diary: ×××¦××¨ ×¨×©××××ª ×××××, ××¢×¨××ª ××××¦××¨ ×××¨××××ª
+      write_api: ××©× ××ª ××ª ×××¤×
+      read_gpx: ××§×¨×× ××ª ××¡×××× ×Ö¾GPS ××¤×¨×××× ×©××
+      write_gpx: ×××¢×××ª ××¡×××× GPS
+      write_notes: ××©× ××ª ××¢×¨××ª
+      write_redactions: ×©×× ×× × ×ª×× × ×××¤×
+      read_email: ××§×¨×× ××ª ××ª×××ª ××××"× ×©× ×××©×ª××©
+      skip_authorization: ×××©×¨ ××ª ××××©×× ××××××××ª
   oauth_clients:
     new:
       title: ×¨××©×× ×××©×× ×××©
+      disabled: ×¨××©×× ×××©××× OAuth 1 ×××©××ª
     edit:
       title: ×¢×¨×××ª ××××©×× ×©××
     show:
@@ -2240,7 +2714,7 @@ he:
       my_tokens: ××××©×××× ×××××©×¨×× ×©××
       list_tokens: '×××¡×××× ×× ××××× ××× ×¤×§× ××××©×× ××©××:'
       application: ×©× ××××©××
-      issued_at: ××× ×¤×§ ×
+      issued_at: ××× ×¤×§ ×Ö¾
       revoke: ××©×××!
       my_apps: ×××©××× ×××§×× ×©××
       no_apps_html: ××× ××© ×× ×××©×× ×©××¨×¦×× × ××¨×©×× ××©××××© ××¦×× × ××××¦×¢××ª ×ª×§× %{oauth}?
@@ -2258,125 +2732,97 @@ he:
       flash: ××××¢ ×××§×× ×¢×××× ×××¦×××
     destroy:
       flash: ×¨××©×× ×××©×× ×××§×× × ××¨×¡
+  oauth2_applications:
+    index:
+      title: ×××©××× ×××§×× ×©××
+      no_applications_html: ××© ×× ×××©×× ×©××¨×¦×× × ××¨×©×× ××©××××© ××©×× ×× × ××©×ª××©×× ××ª×§×
+        %{oauth2}? ×¢××× ××¨×©×× ××ª ××××©×× ×©×× ××¤× × ×©××¤×©×¨ ××©××× ××§×©××ª OAuth ××©××¨××ª ×××.
+      new: ×××¡×¤×ª ××¤×××§×¦×× ×××©×
+      name: ×©×
+      permissions: ××¨×©×××ª
+    application:
+      edit: ×¢×¨×××
+      delete: ××××§×
+      confirm_delete: ×××××§ ××ª ×××¤×××§×¦××?
+    new:
+      title: ×××¡×¤×ª ××¤×××§×¦×× ×××©×
+    edit:
+      title: ×¢×¨×××ª ××××©×× ×©××
+    show:
+      edit: ×¢×¨×××
+      delete: ××××§×
+      confirm_delete: ×××××§ ××ª ×××¤×××§×¦××?
+      client_id: ×××× ××§××
+      client_secret: '×¡×× ×××§××:'
+      client_secret_warning: ×× × ×©××¨× ×××ª ××¡××, ×× ×ª×××× ×××©×ª ××× ×©××
+      permissions: ××¨×©×××ª
+      redirect_uris: ××¤× ×××ª ××ª××××ª
+    not_found:
+      sorry: ×× × ××ª× ×××¦×× ××ª ××××©××, ×¢×× ××¡××××.
+  oauth2_authorizations:
+    new:
+      title: ××¨××© ×××××ª
+      introduction: ×××©×¨ ××××©×× %{application} ×××©×ª ×××©××× ×©×× ×¢× ×××¨×©×××ª ×××××ª?
+      authorize: ×××©×¨
+      deny: ×××××ª
+    error:
+      title: ×××¨×¢× ×©××××
+    show:
+      title: ×§×× ×××©××¨
+  oauth2_authorized_applications:
+    index:
+      title: ×××¤×××§×¦×××ª ××××¨×©××ª ×©××
+      application: ××¤×××§×¦××
+      permissions: ××¨×©×××ª
+      last_authorized: ×××©×¨ ××¤×¢× ××××¨×× ×
+      no_applications_html: ×× ×××©×¨×ª ×¢×××× ×××©××× %{oauth2}.
+    application:
+      revoke: ×©××××ª ×××©×
+      confirm_revoke: ××©××× ××ª ××××©× ××××©×× ×××?
   users:
-    login:
-      title: ×× ××¡×
-      heading: ×× ××¡×
-      email or username: '××ª×××ª ××××¨ ×××§××¨×× × ×× ×©× ××©×ª××©:'
-      password: '×¡××¡××:'
-      openid_html: '%{logo} OpenID:'
-      remember: ×××××¨ ×××ª×
-      lost password link: ×××××ª ××ª ××¡××¡×× ×©××?
-      login_button: ×× ××¡×
-      register now: ××××¨×©× ×¢××©××
-      with username: '×××¨ ××© ×× ××©××× OpenStreetMap? × × ××××× ×¡ ×¢× ×©× ××©×ª××© ××¡××¡××:'
-      with external: '×××××¤××, ××©×ª××©× ××¦× ×©×××©× ××× ××××× ×¡:'
-      new to osm: ×××¢×ª ×¢××©×× ×Ö¾OpenStreetMap?
-      to make changes: ××× ××©× ××ª ××ª × ×ª×× × OpenStreetMap, ×¦×¨×× ×©×××× ×× ××©×××.
-      create account minute: × × ×××¦××¨ ××©×××. ×× ×××§× ×¨×§ ××§×.
-      no account: ××× ×× ××©×××?
-      account not active: ×¡××××, ×××©××× ××× ×¢×××× ××× × ×¤×¢××.<br />× × ×××©×ª××© ××§××©××¨
-        ××××ª× ×××©××¨ ×××©××× ××× ×××¤×¢×× ××ª ××©××× × ×× or <a href="%{reconfirm}">×××§×©
-        ×××ª× ×××©××¨ ×××©</a>.
-      account is suspended: ×¡××××, ×××©××× ××× ×××©×¢× ××¢×§×××ª ×¤×¢××××ª ××©×××.<br />× × ×××¦××¨
-        ×§×©×¨ ×¢× <a href="%{webmaster}">×× ×× ×××ª×¨</a> ×× ××¨×¦×× × ×××× ×××.
-      auth failure: ×¡××××, ×× × ××ª× ××××× ×¡ ×¢× ××¤×¨××× ××××.
-      openid_logo_alt: ×× ××¡× ×¢× OpenID
-      auth_providers:
-        openid:
-          title: ×× ××¡× ×¢× OpenID
-          alt: ×× ××¡× ×¢× URL ×©× OpenID
-        google:
-          title: ×× ××¡× ×¢× ××××
-          alt: ×× ××¡× ×¢× OpenID ×©× ××××
-        facebook:
-          title: ×× ××¡× ×¢× ×¤×××¡×××§
-          alt: ×× ××¡× ×¢× ××©××× ×¤×××¡×××§
-        windowslive:
-          title: ×× ××¡× ×¢× Windows Live
-          alt: ×× ××¡× ×¢× ××©××× Windows Live
-        github:
-          title: ×× ××¡× ××××¦×¢××ª GitHub
-          alt: ×× ××¡× ×¢× ××©××× GitHub
-        wikipedia:
-          title: ×× ××¡× ×¢× ×××§××¤×××
-          alt: ×× ××¡× ×¢× ××©××× ×××§××¤×××
-        yahoo:
-          title: ×× ××¡× ×¢× ××××
-          alt: ×× ××¡× ×¢× OpenID ×©× ××××
-        wordpress:
-          title: ×× ××¡× ×¢× ×××¨××¤×¨×¡
-          alt: ×× ××¡× ×¢× OpenID ×©× ×××¨××¤×¨×¡
-        aol:
-          title: ×× ××¡× ×¢× AOL
-          alt: ×× ××¡× ×¢× OpenID ×©× AOL
-    logout:
-      title: ××¦×××
-      heading: ××¦××× ×Ö¾OpenStreetMap
-      logout_button: ××¦×××
-    lost_password:
-      title: ××¡××¡×× ×××× ××××××
-      heading: ×©×××ª ×¡××¡××?
-      email address: '××ª×××ª ××××´×:'
-      new password button: × × ××©××× ×× ×¡××¡×× ×××©×
-      help_text: × × ××××× ××ª ××ª×××ª ×××××´× ×©××©×ª××©×ª ×× ××× ××××¨×©×. ×× × × ×©×× ×××× ×§××©××¨
-        ×©××¤×©×¨ ×××©×ª××© ×× ××× ×××¤×¡ ××ª ×¡××¡××ª×.
-      notice email on way: ×× × ××¦××¢×¨×× ××©×××¢ ×©×××××ª ×××ª× :-( ××× × ×©×× ×××××¨ ××××§××¨×× ×
-        ×©×× ×××ª× ×©××××¦×¢××ª× ××¤×©×¨ ×××¤×¡ ×××ª×.
-      notice email cannot find: ×¡××××, ×××ª×××ª ××××ª ×× × ××¦××.
-    reset_password:
-      title: ×××¤××¡ ×¡××¡××
-      heading: ×××¤××¡ ××¡×¡×× ×¢×××¨ %{user}
-      reset: ×××¤××¡ ××¡×¡××
-      flash changed: ×¡××¡××ª× ×©×× ×ª×.
-      flash token bad: ×× ××¦×× × ××ª ×××¡×××× ××××, ×××× ××××§×ª ×××ª×××ª ×ª×¢×××¨?
     new:
       title: ××¨×©××
       no_auto_account_create: ×××¨×× ××¦×¢×¨, ××¢×ª ××× × × ×××××× ×××¦××¨ ×× ××©××× ××××¤× ×××××××.
-      contact_webmaster_html: × × ×××¦××¨ ×§×©×¨ ×¢× <a href="%{webmaster}">×× ×× ×××ª×¨</a>
-        ×¢× ×× ×ª ×××¨×× ××¦××¨×ª ××©××× - ×× ×× × × ×©×ª×× ×××¤× ×××§×©× ××× ×©×××ª×¨ ×××¨.
+      please_contact_support_html: × × ×××¦××¨ ×§×©×¨ ×¢× %{support_link} ××× ×××¨×× ××¦××¨×ª
+        ××©××× - × ×©×ª×× ×××¤× ×××§×©× ×××××¨××ª ×××¤×©×¨××ª.
+      support: ×ª××××
       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_html: ×××ª×××ª ×©×× ×× ×××¦××ª ××¤××××, ×××××¢ × ××¡×£ ×¨×× <a href="https://wiki.openstreetmap.org/wiki/Privacy_Policy"
-        title="OSMF privacy policy including section on email addresses">×××× ×××ª ×¤×¨××××ª</a>
-      display name: '×©× ×××¦××:'
+        paragraph_1: ×× ×××× ×××¤××ª ×××¨××ª, OpenStreetMap × ××¦×¨× ××××××× ×¢×Ö¾××× ×× ×©××
+          ×××× ×××× ×××¤×©××ª ××ª××§×× ××, ×¢×××× ××, ×××¨×× ××©××××© ×©× ×× ×× ×©××¤×¥.
+        paragraph_2: ××¤×©×¨ ××××¨×©× ××× ×××ª××× ××ª×¨××. ×× × × ×©×× ×× ××××¢×ª ××××´× ××× ×××©×¨
+          ××ª ×××©××× ×©××.
       display name description: ×©× ×××©×ª××© ×©××, ×©×××¦× ××¤××××. ××¤×©×¨ ××©× ××ª ××ª ×× ×××¢××¤××ª
         ×©××.
       external auth: '×××××ª ×¢× ×¦× ×©×××©×:'
-      password: '×¡××¡××:'
-      confirm password: '×××××ª ×¡××¡××:'
-      use external auth: '×××××¤××, ××©×ª××©× ××¦× ×©×××©× ××× ××××× ×¡:'
+      use external auth: ×××××¤××, ××¤×©×¨ ×××©×ª××© ××××¨×× ×¦× ×©×××©× ××× ××××× ×¡
       auth no password: ×¢× ×××××ª ×¦× ×©×××©× ××× ×¦××¨× ××¡××¡××, ××× ×××× × ××¡×¤×× ×× ×©×¨×ª
         ×××××× ×××××§×§ ××××.
       continue: ××¨×©××
       terms accepted: ×ª××× ×¢× ×§×××ª ×ª× ×× ××ª×¨××× ××××©××!
-      terms declined: ×× ×× × ××¦××¢×¨×× ×©×××××ª ×× ××§×× ××ª ×ª× ×× ××ª×¨××× ××××©××. ×××××¢ × ××¡×£
-        ×¨×³ <a href="%{url}">××£ ×××××§× ×××</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/He:Contributor_Terms_Declined
+      email_confirmation_help_html: ×××ª×××ª ×©×× ××× × ×××¦××ª ××¤××××, ×¨' ××ª %{privacy_policy_link}
+        ×©×× × ×××××¢ × ××¡×£.
+      privacy_policy: ×××× ×××ª ××¤×¨××××ª
+      privacy_policy_title: ×××× ×××ª ××¤×¨××××ª ×©× OSMF ×××××ª ×¡×¢××£ ×¢× ××ª××××ª ××××´×
     terms:
       title: ×ª× ×××
       heading: ×ª× ×××
       heading_ct: ×ª× ×× ××ª× ××××ª
       read and accept with tou: × × ××§×¨×× ××ª ××¡×× ×××ª× ×××× ×××ª ×ª× ×× ××©××××©, ××© ××¡××
         ××ª ×©×ª× ××ª××××ª ×¢× ××¡××× ××× ×××××¥ ×¢× ××¤×ª××¨ ××××©×.
-      contributor_terms_explain: ××¡×× ×× ×××× ××ª ×ª× ×× ××ª×¨××××ª ××§×××××ª ×××¢×ª×××××ª ×©××.
-      read_ct: ×§×¨××ª× ××ª ×ª× ×× ××ª××¨××× ××¢×× ××× × ××¡×××/× ××ª× ××× ×××
-      tou_explain_html: '%{tou_link} ××× ×××××× ××ª ×ª× ×× ××©××××© ×××ª×¨ ×××ª×©×ª××ª × ××¡×¤×ª
-        ×©××¡××¤×§×ª ×¢× ××× ×Ö¾OSMF. × × ×××××¥ ×¢× ××§××©××¨, ××§×¨×× ××××¡××× ×××§×¡×.'
+      contributor_terms_explain: ×××¡×× ××× ×××××¨ ××ª ××ª× ××× ×©× ××ª×¨××××ª ××§×××××ª ×××¢×ª×××××ª
+        ×©××.
+      read_ct: ×§×¨××ª× ××ª ×ª× ×× ××ª××¨××× ××¢×× ×××¡×××ª× ×××ª×
+      tou_explain_html: '%{tou_link} ×××× ×××××× ××ª ×ª× ×× ××©××××© ×××ª×¨ ×××ª×©×ª××ª × ××¡×¤×ª
+        ×©××¡××¤×§×ª ×¢×Ö¾××× ×Ö¾OSMF. × × ×××××¥ ×¢× ××§××©××¨, ××§×¨×× ××××¡××× ×××§×¡×.'
       read_tou: ×§×¨××ª× ××ª ×ª× ×× ××©××××© ××× × ××¡×××/× ××ª× ××× ×××
       consider_pd: ×× ××¡×£ ×××ª×× ××¢××, ××××× ×ª× ×× ×¢×¨××××ª×× ×©×××××ª ×× ×××ª ××××
       consider_pd_why: ×× ××?
-      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>
+      consider_pd_why_url: https://wiki.osmfoundation.org/wiki/License_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
+      guidance_info_html: '××××¢ ×©××¢×××¨ ××××× ××ª ×××× ××× ××××: %{readable_summary_link}
+        ×××× %{informal_translations_link}'
+      readable_summary: ×ª×§×¦××¨ ×§×¨×× ××× ×Ö¾×××
+      informal_translations: ×ª×¨××××× ×××ª×Ö¾×¤××¨×××××
       continue: ××××©××
       declined: https://wiki.openstreetmap.org/wiki/He:Contributor_Terms_Declined
       decline: ×¡××¨××
@@ -2387,6 +2833,11 @@ he:
         france: ×¦×¨×¤×ª
         italy: ××××××
         rest_of_world: ×©××¨ ××¢×××
+    terms_declined_flash:
+      terms_declined_html: ××ª× ×¦××× ×©×××××ª ×× ×××©×¨ ××ª ×ª× ×× ××©××××© ××××©××. ×××××¢ × ××¡×£,
+        × × ××¤× ××ª ×× %{terms_declined_link}
+      terms_declined_link: ××£ ×××××§× ×××
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/He:Contributor_Terms_Declined
     no_such_user:
       title: ××× ××©×ª××© ×××
       heading: ×××©×ª××© %{user} ××× × ×§×××
@@ -2394,7 +2845,6 @@ he:
       deleted: × ×××§
     show:
       my diary: ××××× ×©××
-      new diary entry: ×¨×©××× ×××©× ×××××
       my edits: ××¢×¨××××ª ×©××
       my traces: ×××¡××××× ×©××
       my notes: ××¢×¨××ª ×××¤× ×©××
@@ -2402,9 +2852,13 @@ he:
       my profile: ××¤×¨××¤×× ×©××
       my settings: ×××××¨××ª ×©××
       my comments: ×××¢×¨××ª ×©××
-      oauth settings: ××××¨××ª oauth
+      my_preferences: ×××¢××¤××ª ×©××
+      my_dashboard: ××× ×××§×¨× ×©××
       blocks on me: ××ª× ××¡×× ×××ª×
       blocks by me: ××ª× ××¡××ª×
+      create_mute: ××©×ª×§×ª ×××©×ª××© ×××
+      destroy_mute: ××××× ××©×ª×§×ª ×××©×ª××© ×××
+      edit_profile: ×¢×¨×××ª ×¤×¨××¤××
       send message: ×©××××ª ××××¢×
       diary: ××××
       edits: ×¢×¨××××ª
@@ -2413,151 +2867,52 @@ he:
       remove as friend: ××¡×¨× ××¨×©×××ª ×××¨××
       add as friend: ×××¡×¤× ××××¨
       mapper since: '×××¤× ×××:'
+      uid: '×××× ××©×ª××©:'
       ct status: '×ª× ×× ×ª×¨×××:'
       ct undecided: ×¢×× ××× ×××××
       ct declined: × ×××
-      latest edit: '×¢×¨××× ×××¨×× × (%{ago}):'
       email address: '××ª×××ª ××××´×:'
       created from: '× ××¦×¨ ××ª××:'
       status: '××¦×:'
       spam score: '×××¨×× ×××××:'
-      description: ×ª××××¨
-      user location: ×××§×× ×××©×ª××©
-      if_set_location_html: ××××¨× ×©× ×××§×× ××××ª ×©×× ×××£ %{settings_link} ×ª××¤×©×¨ ××
-        ××¨×××ª ××©×ª××©×× ××¡××××ª×.
-      settings_link_text: ××××¨××ª
-      my friends: ××××¨×× ×©××
-      no friends: ×¢×××× ×× ×××¡×¤×ª ×××¨××.
-      km away: ×××¨××§ %{count} ×§×´×
-      m away: ×××¨××§ %{count} ××³
-      nearby users: ×¢×× ××©×ª××©×× ××¡××××
-      no nearby users: ××× ×¢×××× ×¢×× ××©×ª××©×× ×©××××× ×©×× ×××¤× ××¡××××.
       role:
-        administrator: ×××©××× ××× ××© ××¨×©×××ª ××¤×¢××
-        moderator: ××× ××©××× ×× ××
+        administrator: ×××©××× ××× ××© ××¨×©×××ª ×× ××
+        moderator: ××× ××©××× ××¤×§×
+        importer: ××× ××©××× ×××××
         grant:
-          administrator: ××¢× ×§×ª ××¨×©×××ª ××¤×¢××
-          moderator: ××¢× ×§×ª ××¨×©×××ª ×× ××
+          administrator: ××¢× ×§×ª ××¨×©×××ª ×× ××
+          moderator: ××¢× ×§×ª ××¨×©×××ª ××¤×§×
+          importer: ××¢× ×§×ª ××¨×©×××ª ×××××
         revoke:
-          administrator: ×©××××ª ××¨×©×××ª ××¤×¢××
-          moderator: ×©××××ª ××¨×©×××ª ×× ××
+          administrator: ×©××××ª ××¨×©×××ª ×× ××
+          moderator: ×©××××ª ××¨×©×××ª ××¤×§×
+          importer: ×©××××ª ××¨×©×××ª ×××××
       block_history: ××¡××××ª ×¤×¢××××ª
       moderator_history: ××¡××××ª ×©× ××ª× ×
+      revoke_all_blocks: ××××× ×× ×××¡××××ª
       comments: ××¢×¨××ª
-      create_block: ××¡×××ª ××©×ª××© ××
-      activate_user: ××¤×¢××ª ××©×ª××© ××
-      deactivate_user: ××××× ××©×ª××© ××
-      confirm_user: ×××©××¨ ××©×ª××© ××
-      hide_user: ××¡×ª×¨×ª ××©×ª××© ××
-      unhide_user: ××××× ××¡×ª×¨×ª ××©×ª××© ××
-      delete_user: ××××§×ª ××©×ª××© ××
+      create_block: ××¡×××ª ×××©×ª××© ×××
+      activate_user: ××¤×¢××ª ×××©×ª××© ×××
+      confirm_user: ×××©××¨ ×××©×ª××© ×××
+      unconfirm_user: ××××× ×××©××¨ ×××©×ª××© ×××
+      unsuspend_user: ××××× ××©×¢×××ª ×××©×ª××© ×××
+      hide_user: ××¡×ª×¨×ª ×××©×ª××© ×××
+      unhide_user: ××××× ××¡×ª×¨×ª ×××©×ª××© ×××
+      delete_user: ××××§×ª ×××©×ª××© ×××
       confirm: ×××©××¨
-      friends_changesets: ×¢×¨×××ª ×©×× ×××× ×©× ×××¨××
-      friends_diaries: ×¨×©××××ª ×××× ×©× ×××¨××
-      nearby_changesets: ×¢×¨×××ª ××©×× ×××× ×©× ××©×ª××©×× ××¡××××
-      nearby_diaries: ×¨×©××××ª ×××× ×©× ××©×ª××©×× ××¡××××
       report: ××××× ×¢× ×××©×ª××©
-    popup:
-      your location: ×××§×××
-      nearby mapper: ×××¤× ×¡×××
-      friend: ×××¨
-    account:
-      title: ×¢×¨×××ª ××©×××
-      my settings: ×××××¨××ª ×©××
-      current email address: '××ª×××ª ××××´× × ×××××ª:'
-      new email address: '××ª×××ª ××××´× ×××©×:'
-      email never displayed publicly: (××¢××× ×× ×××¦××ª ××¤××××)
-      external auth: '×××××ª ×××¦×× ×:'
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: ×× ××?
-      public editing:
-        heading: '×¢×¨××× ×¦××××¨××ª:'
-        enabled: ×××¤×¢××ª. ×× ××××× × ××××× ××¢×¨×× ××××¢.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: ×× ××?
-        disabled: ×× ×××¤×¢××ª, ××× ××¤×©×¨××ª ××¢×¨×× × ×ª×× ×× ××× ××¢×¨××××ª ××§×××××ª ××××× ×××ª.
-        disabled link text: ××××¢ ××× × ×××× ××¢×¨××?
-      public editing note:
-        heading: ×¢×¨××× ×¦××××¨××ª
-        html: ××¢×ª ××¢×¨××××ª ×©×× ××××× ×××ª ××× ×©×× ×× ×××××× ××©××× ×× ××××¢××ª ×× ××¨×××ª ××ª
-          ××××§×× ×©××. ××× ×××¦×× ×× ×¢×¨××ª ××××¤×©×¨ ××× ×©×× ×××¦××¨ ××ª× ×§×©×¨ ××¨× ×××ª×¨, ××© ×××××¥
-          ×¢× ×××¤×ª××¨ ××××. <b>××× ××©×× ×× ×Ö¾API ×××¨×¡× 0.6, ×¨×§ ××©×ª××©×× ×¦××××¨××× ××××××
-          ××¢×¨×× × ×ª×× × ××¤×</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">××¡××¨
-          ××× ×× ×××</a>).<ul><li>××ª×××ª ××××"× ×©×× ×× ×ª×××©×£ ××ª××¦×× ××× ×©×ª××× ××©×ª××©
-          ×¦××××¨×.</li><li>×× × ××ª× ×××¤×× ××ª ××¤×¢××× ××××ª ××× ×××©×ª××©×× ××××©×× ×××× ××¢×ª×
-          ×¦××××¨××× ××¤× ××¨××¨×ª ×××××.</li></ul>
-      contributor terms:
-        heading: '×ª× ×× ×ª×¨×××:'
-        agreed: ××¡×××ª ××ª× ×× ××ª×¨××× ××××©××.
-        not yet agreed: ×¢×××× ×× ××¡×××ª ××ª× ×× ××ª×¨××× ××××©××.
-        review link text: × × ××¢×××¨ ××§××©××¨ ××× ×××× × ××¤× ×× ××× ××¡×§××¨ ×××§×× ××ª ×ª× ××
-          ××ª×¨××× ××××©××.
-        agreed_with_pd: ××¦××¨×ª ×× ×©××××× ×ª× ××¢×¨××××ª ×©×× ×××× ×× ×××ª ××××.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: ×× ××?
-      profile description: '×ª××××¨ ×¤×¨××¤××:'
-      preferred languages: '×©×¤××ª ×××¢××¤××ª:'
-      preferred editor: '×¢××¨× ×××¢××£:'
-      image: '×ª××× ×:'
-      gravatar:
-        gravatar: ×××©×ª××© ×Ö¾Gravatar
-        link: http://wiki.openstreetmap.org/wiki/Gravatar
-        link text: ×× ××?
-        disabled: ×××¨×××××¨ ××××.
-        enabled: ××¦××ª ×××¨×××××¨ ×©×× ×××¤×¢××.
-      new image: ×××¡×¤×ª ×ª××× ×
-      keep image: ××©×××¨× ×¢× ××ª××× × ×× ×××××ª
-      delete image: ×××¡×¨×ª ××ª××× × ×× ×××××ª
-      replace image: ×××××¤×ª ××ª××× × ×× ×××××ª
-      image size hint: (×ª××× × ××¨×××¢×ª ××××× 100x100 ××¤×××ª ×¢××××ª ××× ×××)
-      home location: '×××§×× ×¨××©×:'
-      no home location: ×× ××× ×ª ××ª ×××§××× ××¨××©×.
-      latitude: '×§× ×¨×××:'
-      longitude: '×§× ×××¨×:'
-      update home location on click: ×¢×××× ××××§×× ××¨××©× ×©×× ××¢×ª ××××¦× ×¢× ×××¤×?
-      save changes button: ×©×××¨×ª ××©×× ××××
-      make edits public button: ×××¤×× ××ª ×× ×¢×¨××××ª×× ××¦××××¨×××ª
-      return to profile: ×××¨× ××¤×¨××¤××
-      flash update success confirm needed: ××××¢ ×¢× ×××©×ª××© ×¢×××× ×××¦×××. × × ×××××§ ××ª
-        ×ª×××ª ××××"× ××× ××××ª ××ª ××××"× ××××©.
-      flash update success: ×¤×¨×× ×××©×ª××© ×¢×××× × ×××¦×××.
-    confirm:
-      heading: ×××××ª ××©××× ××©×ª××©
-      introduction_1: ×©××× × ×× ×××ª× ×××××ª.
-      introduction_2: × × ××××ª ××ª ×××©××× ×©×× ××××¦×¢××ª ××××¦× ×¢× ×§××©××¨ ××××"×, ××××¨× ××
-        ×ª××× ×× ××¤×©×¨××ª ×××ª××× ×××¤××ª.
-      press confirm button: × × ×××××¥ ×¢× ××¤×ª××¨ ××××©××¨ ××× ×××¤×¢×× ××ª ××©××× ×.
-      button: ×××©××¨
-      success: ××©××× × ×××©×¨, ×ª××× ×©× ×¨×©××ª!
-      already active: ×××©××× ××× ×××¨ ×××©×¨.
-      unknown token: × ×¨×× ×©×§×× ××××©××¨ ××× ×¤× ×× ×©××× × ×§×××.
-      reconfirm_html: ×× ××¨×¦×× × ××§×× ×©×× ×××ª× ×××××ª, <a href="%{reconfirm}">× × ×××××¥
-        ×××</a>.
-    confirm_resend:
-      success: ×©××× × ××××¢×ª ×××©××¨ ×××© ×××ª×××ª %{email} ×××¨××¢ ×××©××¨ ××©××× ×, ××¤×©×¨ ××××
-        ×××ª××× ×××¤××ª.<br /><br />×× ×××××¨ ××××§××¨×× × ×©×× ×××¤×¢××ª ××¢×¨××ª × ×× ××××¨ ×××
-        ××©×¨ ×©××××ª ××§×©××ª ×××©××¨, × × ××××¡××£ ××ª %{sender} ××¨×©××× ×××× ×, ××××¨ ×××× × × ××××××
-        ×××©×× ×××§×©××ª ×××©××¨ ×××©××.
-      failure: ××©×ª××© %{name} ×× × ××¦×.
-    confirm_email:
-      heading: ×××©××¨ ×©×× ×× ××ª×××ª ×××××´×
-      press confirm button: × × ×××××¥ ×¢× ××¤×ª××¨ ××××©××¨ ×××× ××× ×××©×¨ ××ª ××ª×××ª ×××××´×
-        ××××©×.
-      button: ×××©××¨
-      success: ×©×× ×× ××ª×××ª ×××××´× ×©×× ×××©×¨!
-      failure: ××ª×××ª ×××××´× ×©×× ×××¨ ×××©×¨× ×××¡×××× ×××.
-      unknown_token: ×§×× ××××©××¨ ×¤× ×× ××× × ×§×××.
-    set_home:
-      flash success: ×××§×× ×¨××©× × ×©××¨ ×××¦×××
     go_public:
       flash success: ×× ××¢×¨××××ª ×©×× ×¦××××¨×××ª ×¢××©×× ×××© ×× ××¨×©×× ××¢×¨××.
     index:
       title: ××©×ª××©××
       heading: ××©×ª××©××
-      showing:
-        one: ××£ %{page} (%{first_item} ××ª×× %{items})
-        other: ××£ %{page} (%{first_item}â%{last_item} ××ª×× %{items})
+      older: ××©×ª××©×× ××©× ×× ×××ª×¨
+      newer: ××©×ª××©×× ×××©×× ×××ª×¨
+      found_users:
+        one: × ××¦× ××©×ª××© ×××
+        two: × ××¦×× ×©× × ××©×ª××©××
+        many: × ××¦×× %{count} ××©×ª××©××
+        other: × ××¦×× %{count} ××©×ª××©××
       summary_html: '%{name} × ××¦×¨ ×××ª×××ª %{ip_address} ×Ö¾%{date}'
       summary_no_ip_html: '%{name} × ××¦×¨ ×Ö¾%{date}'
       confirm: ×××©××¨ ××©×ª××©×× × ×××¨××
@@ -2566,22 +2921,17 @@ he:
     suspended:
       title: ×××©××× ×××©×¢×
       heading: ×××©××× ×××©×¢×
-      webmaster: ×× ×× ×××ª×¨
-      body_html: |-
-        <p>
-          ×¡××××, ××©×××× ×××©×¢× ××××¤× ××××××× ×¢×§×
-          ×¤×¢××××ª ××©×××.
-        </p>
-        <p>
-          ××××× ×× ×ª×××× ×¢×Ö¾××× ×× ×× ××¢×¨××ª ××ª×× ××× ×§×¦×¨, ××
-          ×××¤×©×¨××ª× ××¤× ××ª ×× %{webmaster} ×× ××¨×¦×× × ×××× ×××.
-        </p>
+      support: ×ª××××
+      automatically_suspended: ×¡××××, ×××©××× ×©×× ×××©×¢× ×¢×§× ×¤×¢××××ª ××©×××.
+      contact_support_html: ×××××× ××××ª ×ª××××§ ×¢×Ö¾××× ×× ×× ××¢×¨××ª ××§×¨××, ×× ×©×ª××× ×××¦××¨
+        ×§×©×¨ ×¢× %{support_link} ×× ××¨×¦×× × ×××× ×××.
     auth_failure:
       connection_failed: ××ª×××¨××ª ××¡×¤×§ ×××××ª × ××©××
       invalid_credentials: × ×ª×× × ××××××ª ×××ª×Ö¾×ª×§×× ××
       no_authorization_code: ××× ×§×× ×× ××¡×
       unknown_signature_algorithm: ×××××¨××ª× ××ª××× ×××ª×Ö¾××××¢
       invalid_scope: ×××× ×××ª×Ö¾×ª×§××
+      unknown_error: ××××××ª × ××©×
     auth_association:
       heading: ××××× ×©×× ×¢×××× ××× × ××©××× ×××©××× ×××©××× OpenStreetMap.
       option_1: ×× ××ª×××ª ×¨×§ ×¢××©×× ×¢× OpenStreetMap, × × ×××¦××¨ ××©××× ×××© ××××¦×¢××ª ××××¤×¡
@@ -2593,7 +2943,7 @@ he:
       not_a_role: ××××¨×××ª â%{role}â ××× × ×ª×¤×§×× ×ª×§××.
       already_has_role: ×××©×ª××© ×××¨ ××© ×ª×¤×§×× %{role}.
       doesnt_have_role: ×××©×ª××© ××× ×ª×¤×§×× %{role}.
-      not_revoke_admin_current_user: ×× × ××ª× ××©××× ××¨×©×××ª ××¤×¢×× ××××©×ª××© ×× ××××.
+      not_revoke_admin_current_user: ×× × ××ª× ××©××× ××¨×©×××ª ×× ×× ××××©×ª××© ×× ××××.
     grant:
       title: ×××©×¨ ××¢× ×§×ª ×ª×¤×§××
       heading: ×××©×¨ ××¢× ×§×ª ×ª×¤×§××
@@ -2610,59 +2960,59 @@ he:
         ×ª×§×× ××.
   user_blocks:
     model:
-      non_moderator_update: ×¦×¨×× ×××××ª ×× ×× ××× ×××¦××¨ ×× ××¢××× ××¡×××.
-      non_moderator_revoke: ×¦×¨×× ×××××ª ×× ×× ××× ×××× ××¡×××.
+      non_moderator_update: ×¦×¨×× ×××××ª ××¤×§× ××× ×××¦××¨ ×× ××¢××× ××¡×××.
+      non_moderator_revoke: ×¦×¨×× ×××××ª ××¤×§× ××× ×××× ××¡×××.
     not_found:
       sorry: ×¡××××, ×××¡××× ×¢× ××××× %{id} ×× × ××¦××.
       back: ×××¨× ×××¤×ª×
     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} × ××¡×. × × ×××ª×× ××©×× ×××× ×× ××¨×××¢ ×××ª×ª ×××
-        ×©×××ª×¨ ×¤×¨××× ×¢× ×××¦×. × × ×××××¨ ×©×× ×× ×××©×ª××©×× ×××× ×× ××ª ××¢×× ×××§×¦××¢××ª ×©× ××§××××
-        ×××©×ª×× ×××©×ª××© ×××××× ××¨××¨××ª ××××.
+      title: ×¢×¨×××ª ×××¡××× ×¢× %{name}
+      heading_html: ×¢×¨×××ª ×××¡××× ×¢× %{name}
       period: ×××©× ××× ××× ××¢××©×× ×××©××× ××××¡× ××××¦××¢ ×¤×¢××××ª API.
       show: ××¦××ª ×××¡××× ××××ª
       back: ××¦××ª ×× ×××¡××××ª
-      needs_view: ××× ×××©×ª××© ×¦×¨×× ××××× ×¡ ××¤× × ×©×××¡××× ××××ª ×ª× ××§×?
     filter:
-      block_expired: ×××ª×× ×©×××¡××× ×××¨ ×¤×§×¢× ×××Ö¾××¤×©×¨ ××¢×¨×× ×××ª×.
+      block_expired: ×××¡××× ×××¨ ×¤×§×¢× ×××Ö¾××¤×©×¨ ××¢×¨×× ×××ª×.
       block_period: ×ª×§××¤×ª ×××¡××× ×¦×¨××× ×××××ª ××× ××¢×¨××× ×©××¤×©×¨ ×××××¨ ××¨×©××× ×× ×¤×ª××ª.
     create:
-      try_contacting: × × ×× ×¡××ª ×××¦××¨ ×§×©×¨ ×¢× ××©×ª××© ××¤× × ××¡×××ª× ×××ª×ª ×× ××× ×¡×××¨ ×××©××.
-      try_waiting: × × ××ª×ª ×××©×ª××© ××× ×¡×××¨ ×××©×× ××¤× × ×××¡×××.
       flash: × ××¦×¨× ××¡××× ×¢× ××©××× %{name}
     update:
-      only_creator_can_edit: ×¨×§ ××× ×× ×©××¦×¨ ××ª ×××¡××× ××××ª ×××× ××¢×¨×× ×××ª×.
+      only_creator_can_edit: ×¨×§ ×××¤×§× ×©××¦×¨ ××ª ×××¡××× ××××ª ×××× ××¢×¨×× ×××ª×.
       success: ×××¡××× ×¢×××× ×.
     index:
       title: ××¡××××ª ××©×ª××©
       heading: ×¨×©×××ª ××¡××××ª ××©×ª××©
       empty: ×¢×× ×× × ×¢×©× ××¡××××ª.
     revoke:
-      title: ××××× ×××¡××× ×¢× %{block_on}
+      title: ××××× ×××¡××× ×¢× %{block_on}
       heading_html: ××××× ×××¡××× ×©× %{block_on} ×¢×Ö¾××× %{block_by}
-      time_future: ×××¡××× ×ª×¡×ª××× ×Ö¾%{time}.
-      past: ×××¡××× ××××ª ××¡×ª×××× ×Ö¾%{time} ×××Ö¾××¤×©×¨ ×××× ×××ª×.
+      time_future_html: ×××¡××× ×ª×¡×ª××× ×Ö¾%{time}.
+      past_html: ×××¡××× ××××ª ××¡×ª×××× ×Ö¾%{time} ×××Ö¾××¤×©×¨ ×××× ×××ª×.
       confirm: ××× ××¨×¦×× × ×××× ××ª ×××¡××× ××××ª?
       revoke: ××××!
       flash: ×××¡××× ××××ª ×××××.
+    revoke_all:
+      title: ××¡×¨×ª ×× ×××¡××××ª ×©× %{block_on}
+      heading_html: ××¡×¨×ª ×× ×××¡××××ª ×©× %{block_on}
+      empty: ××× ××¡××××ª ×©× %{name}.
+      confirm: ××× ××¨×¦×× × ×××¡××¨ %{active_blocks}?
+      active_blocks:
+        one: ××¡××× ×¤×¢×××
+        two: ×©×ª× ××¡××××ª ×¤×¢××××ª
+        many: '%{count} ××¡××××ª ×¤×¢××××ª'
+        other: '%{count} ××¡××××ª ×¤×¢××××ª'
+      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: ×©×¢× ×××ª
@@ -2670,8 +3020,10 @@ he:
           many: '%{count} ×©×¢××ª'
           other: '%{count} ×©×¢××ª'
         days:
-          one: ××× ×××
-          other: '%{count} ××××'
+          one: ×©×¢×
+          two: ×©×¢×ª×××
+          many: '%{count} ×©×¢××ª'
+          other: '%{count} ×©×¢××ª'
         weeks:
           one: ×©×××¢ ×××
           two: ×©×××¢×××
@@ -2685,7 +3037,7 @@ he:
         years:
           one: ×©× × ×××ª
           two: ×©× ×ª×××
-          many: '%{count} ×©× ××'
+          many: '%{count} ×©× ×'
           other: '%{count} ×©× ××'
     blocks_on:
       title: ××¡××××ª ×©× %{name}
@@ -2698,14 +3050,14 @@ he:
     show:
       title: ×××©××× ×©× %{block_on} × ××¡× ×¢×Ö¾××× %{block_by}
       heading_html: ×××©××× ×©× %{block_on} × ××¡× ×¢×Ö¾××× %{block_by}
-      created: × ××¦×¨
-      status: ×¡××××¡
+      created: '×ª××¨×× ×××¦××¨×:'
+      duration: '××©× ×××:'
+      status: '××¦×:'
       show: ××¦××
       edit: ×¢×¨×××
       revoke: ×××××!
       confirm: ××××ª?
       reason: '×¡××× ×××¡×××:'
-      back: ×¦×¤××× ××× ×××¡××××ª
       revoker: '××××:'
       needs_view: ×××©×ª××© ×¦×¨×× ××××× ×¡ ×××©××× ××¤× × ×©×××¡××× ××××ª ××××× ×××ª×××.
     block:
@@ -2719,19 +3071,89 @@ he:
       reason: ×¡××× ×××¡×××
       status: ××¦×
       revoker_name: ××××× ×¢×Ö¾×××
-      showing_page: ×××£ %{page}
-      next: ××× Â»
-      previous: Â« ××§×××
+      older: ××¡××××ª ××©× ××ª ×××ª×¨
+      newer: ××¡××××ª ×××©××ª ×××ª×¨
+    navigation:
+      all_blocks: ×× ×××¡××××ª
+      blocks_on_me: ××¡××××ª ×©××
+      blocks_on_user: ××¡××××ª ×©× %{user}
+      blocks_by_me: ××¡××××ª ×©×¢×©××ª×
+      blocks_by_user: ××¡××××ª ×©× ×¢×©× ×¢×Ö¾××× %{user}
+      block: ×××¡×× ××ª %{id}
+  user_mutes:
+    index:
+      title: ××©×ª××©×× ×××©×ª×§××
+      my_muted_users: ×××©×ª××©×× ××××©×ª×§×× ×©××
+      you_have_muted_n_users:
+        one: ××©×ª×§×ª ××©×ª××© ×××
+        two: ××©×ª×§×ª ×©× × ××©×ª××©××
+        many: ××©×ª×§×ª %{count} ××©×ª××©××
+        other: ××©×ª×§×ª %{count} ××©×ª××©××
+      user_mute_explainer: ××××¢××ª ×©× ××©×ª××©×× ×××©×ª×§×× ×××¢××¨××ª ××ª×××ª ××××¨ × ×¤×¨××ª ×××
+        ×ª××©××× × ×××× ××ª×¨×××ª ×××××´×.
+      user_mute_admins_and_moderators: ××¤×©×¨ ×××©×ª××§ ×× ×××× ×××¤×§××× ××× ×××××¢××ª ×©×××
+        ×× ×××©×ª×§×.
+      table:
+        thead:
+          muted_user: ××©×ª××© ×××©×ª×§
+          actions: ×¤×¢××××ª
+        tbody:
+          unmute: ××××× ××©×ª×§×
+          send_message: ×©××××ª ××××¢×
+    create:
+      notice: ××©×ª×§×ª ××ª %{name}.
+      error: ×× ××× ××¤×©×¨ ×××©×ª××§ ××ª %{name}.â %{full_message}
+    destroy:
+      notice: ×××××ª ××ª ×××©×ª×§× ×©× %{name}.
+      error: ×× ××× ××¤×©×¨ ×××× ××ª ××©×ª×§×ª ×××©×ª××©. × × ×× ×¡××ª ×©××.
   notes:
     index:
       title: ××¢×¨××ª ××ª×××××ª ×©× %{user}
       heading: ××¢×¨××ª ×©× %{user}
-      subheading_html: ××¢×¨××ª ××ª×××××ª ×©× %{user}
+      subheading_html: ××¢×¨××ª ×©%{submitted} ×¢×Ö¾××× %{user} ×× %{commented} ×××ª %{user}
+      subheading_submitted: ×©× ×©×××
+      subheading_commented: ×§×××× ×ª×××××ª
+      no_notes: ××× ××¢×¨××ª
       id: ××××
       creator: ×××¦×¨
       description: ×ª××××¨
       created_at: '××¦××¨×:'
       last_changed: '×©×× ×× ×××¨××:'
+    show:
+      title: '××¢×¨×: %{id}'
+      description: ×ª××××¨
+      open_title: ××¢×¨× ×©×× × ×¤×ª×¨× ××¡×³ %{note_name}
+      closed_title: ××¢×¨× ×¤×ª××¨× ××¡×³ %{note_name}
+      hidden_title: ××¢×¨× ×××¡×ª×¨×ª ××¡×³ %{note_name}
+      event_opened_by_html: × ××¦×¨ ×¢×Ö¾××× %{user} %{time_ago}
+      event_opened_by_anonymous_html: × ××¦×¨ ×¢×Ö¾××× ××××× × %{time_ago}
+      event_commented_by_html: ××¢×¨× ×××ª %{user} %{time_ago}
+      event_commented_by_anonymous_html: ×ª×××× ×××ª ××××× × %{time_ago}
+      event_closed_by_html: × ××¦×¨ ×¢×Ö¾××× %{user} %{time_ago}
+      event_closed_by_anonymous_html: × ×¤×ª×¨ ×¢×Ö¾××× ××××× × %{time_ago}
+      event_reopened_by_html: ×××¤×¢× ××××© ×¢×Ö¾××× %{user} %{time_ago}
+      event_reopened_by_anonymous_html: ×××¤×¢× ××××© ×¢×Ö¾××× ××××× × %{time_ago}
+      event_hidden_by_html: ×××¡×ª×¨ ×¢×Ö¾××× %{user} %{time_ago}
+      report: ××××× ×¢× ×××¢×¨× ××××ª
+      anonymous_warning: ×××¢×¨× ××××ª ×××××ª ×ª×××××ª ×××©×ª××©×× ××××× ××× ×©×¦×¨×× ××××ª ××××¤×
+        ×¢×¦×××.
+      hide: ×××¡×ª××¨
+      resolve: ××¤×ª××¨
+      reactivate: ××¤×¢×× ××××©
+      comment_and_resolve: ××××× ×××¤×ª××¨
+      comment: ×××××
+      log_in_to_comment: ××© ××××× ×¡ ××× ××××× ×¢× ×××¢×¨× ××××ª
+      report_link_html: ×× ×××¢×¨× ××××ª ××××× ××××¢ ×¨×××© ×©××© ×××¡××¨, ××¤×©×¨ %{link}.
+      other_problems_resolve: ×¢×××¨ ×× ×©××¨ ×××¢×××ª ×¢× ×××¢×¨×, × × ××¤×ª××¨ ×××ª× ××¢×¦×× ××××¦×¢××ª
+        ××¢×¨×.
+      other_problems_resolved: ×¢×××¨ ×× ×©××¨ ×××¢×××ª, ××¡×¤××§ ××¤×ª××¨.
+      disappear_date_html: ××¢×¨× ×©× ×¤×ª×¨× ×ª××¢×× ××××¤× ××¢×× %{disappear_in}.
+    new:
+      title: ××¢×¨× ×××©×
+      intro: ××© ×¤× ××¢××ª ×× ×©××¡×¨ ××©××? ×× × ×××§×©×× ××× ××¡×¤×¨ ××ª ×× ××××¤×× ×××¨××. ××©×
+        ×× ×¦×¨×× ××××× ××ª ××¡×× ×××§×× ×× ××× ××××ª×× ××¢×¨× ×©××¡×××¨× ××ª ×××¢××.
+      advice: /start
+      add: ×××¡×¤×ª ××¢×¨×
   javascripts:
     close: ×¡×××¨×
     share:
@@ -2746,7 +3168,7 @@ he:
       custom_dimensions: ××××¨×ª ××××× ×××ª××× ×××©××ª
       format: '×ª×¡×××¨:'
       scale: '×§× × ××××:'
-      image_size: ××ª××× × ×ª×¦×× ×©××× ×¨×××× ×ª××ª
+      image_dimensions: ××ª××× × ×ª××¤××¢ ××××§ ×××©××× ××¨×××× ××××× %{width} x %{height}
       download: ×××¨××
       short_url: ××ª×××ª ×§×¦×¨×
       include_marker: ××××× ×¡××
@@ -2757,8 +3179,8 @@ he:
     embed:
       report_problem: ××××× ×¢× ××¢××
     key:
-      title: ××¤×ª ××¤×ª×
-      tooltip: ××¤×ª ××¤×ª×
+      title: ××¤×ª× ××¤×
+      tooltip: ××¤×ª× ××¤×
       tooltip_disabled: ××¤×ª× ××¤× ××× × ×××× ××©××× ××××ª
     map:
       zoom:
@@ -2767,21 +3189,21 @@ he:
       locate:
         title: ××¦××ª ××××§×× ×©××
         metersPopup:
-          one: ×××¨××§ ×©×× ××× ×§××× ××××ª ××× ××××× ×××¨
-          two: ×××¨××§ ×©×× ××× ××××× ×©× %{count} ×××¨×× ×× ×§××× ××
-          many: ×××¨××§ ×©×× ××× ××××× ×©× %{count} ×××¨×× ×× ×§××× ××
-          other: ×××¨××§ ×©×× ××× ××××× ×©× %{count} ×××¨×× ×× ×§××× ××
+          one: ×××¨××§ ×©×× ××× ×§××× ××××ª ××× ×¤×××ª ××××¨
+          two: ×××¨××§ ×©×× ××× ×§××× ××××ª ××× ×¢× %{count} ×××¨××
+          many: ×××¨××§ ×©×× ××× ×§××× ××××ª ××× ×¢× %{count} ×××¨
+          other: ×××¨××§ ×©×× ××× ×§××× ××××ª ××× ×¢× %{count} ×××¨××
         feetPopup:
-          one: ×××¨××§ ×©×× ××× ×§××× ××××ª ××× ××××× ×¨××
-          two: ×××¨××§ ×©×× ××× ××××× ×©× %{count} ×¨××××× ×× ×§××× ××
-          many: ×××¨××§ ×©×× ××× ××××× ×©× %{count} ×¨××××× ×× ×§××× ××
-          other: ×××¨××§ ×©×× ××× ××××× ×©× %{count} ×¨××××× ×× ×§××× ××
+          one: ×××¨××§ ×©×× ××× ×§××× ××××ª ××× ×¤×××ª ××¨××
+          two: ×××¨××§ ×©×× ××× ×§××× ××××ª ××× ×¢× %{count} ×¨××
+          many: ×××¨××§ ×©×× ××× ×§××× ××××ª ××× ×¢× %{count} ×¨××
+          other: ×××¨××§ ×©×× ××× ×§××× ××××ª ××× ×¢× %{count} ×¨××
       base:
-        standard: ×ª×§× ×
+        standard: ×ª×§× ××ª
         cycle_map: ××¤×ª ×××¤× ×××
         transport_map: ××¤×ª ×ª××××¨×
-        hot: ×××× ×××¨×
-        opnvkarte: ÃPNVKarte
+        tracestracktop_topo: ×××¤×××¨×¤×× ×©× Tracestrack
+        hot: ×××× ×××¨××ª
       layers:
         header: ×©××××ª ×××¤×
         notes: ××¢×¨××ª ×××¤×
@@ -2789,45 +3211,33 @@ he:
         gps: ××¡×××× GPS ×¦××××¨×××
         overlays: ××¤×¢××ª ×©××××ª ××¤×ª×¨×× ×ª×§×××ª ×××¤×
         title: ×©××××ª
-      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>
+      openstreetmap_contributors: ×ª××¨×× OpenStreetMap
+      make_a_donation: ×ª×¨×××
+      website_and_api_terms: ×ª× ×× ××ª×¨ ×Ö¾API
+      cyclosm_credit: ×¡×× ×× ××¨×××× ×××ª %{cyclosm_link} ××ª××¨× ××¦× %{osm_france_link}
+      osm_france: OpenStreetMap ×¦×¨×¤×ª
+      thunderforest_credit: ××¨×××× ×××××××ª %{thunderforest_link}
+      andy_allan: ×× ×× ×××
+      tracestrack_credit: ×××¨×××× ×××××××ª %{tracestrack_link}
+      hotosm_credit: ×¡×× ×× ××¨×××× ×××ª %{hotosm_link} ××ª××¨× ××¦× %{osm_france_link}
+      hotosm_name: ×¦×××ª OpenStreetMap ×××× ×××¨×
     site:
       edit_tooltip: ×¢×¨×××ª ×××¤×
       edit_disabled_tooltip: ×××ª×§×¨× ××× ××¢×¨×× ××ª ×××¤×
       createnote_tooltip: ×××¡×¤×ª ××¢×¨× ×××¤×
-      createnote_disabled_tooltip: × × ×××ª×§×¨× ××× ××××¡××£ ××¢×¨× ×××¤×
+      createnote_disabled_tooltip: ××ª×§×¨×××ª ××× ××××¡××£ ××¢×¨× ×××¤×
       map_notes_zoom_in_tooltip: ××ª×§×¨×××ª ××× ××¨×××ª ××¢×¨××ª ×¢× ×××¤×
-      map_data_zoom_in_tooltip: ××© ××§×¨× ××ª ×××¤× ××× ××¨×××ª × ×ª×× × ××¤×
+      map_data_zoom_in_tooltip: ××© ×××ª×§×¨× ××× ××¨×××ª × ×ª×× × ××¤×
       queryfeature_tooltip: ×©××××ª×ª ××©××××ª
-      queryfeature_disabled_tooltip: ×ª×§×¨×× ××©××××ª×ª ××©××××ª
+      queryfeature_disabled_tooltip: ××ª×§×¨×××ª ××× ×××¨××¥ ×©××××ª×ª ××©××××ª
+      embed_html_disabled: ××××¢×ª HTML ××× × ×××× × ××©×××ª ×××¤× ××××ª
     changesets:
       show:
-        comment: ××¢×¨×
+        comment: ×××××
         subscribe: ××× ××
         unsubscribe: ××××× ××× ××
         hide_comment: ××¡×ª×¨×
         unhide_comment: ××××× ××¡×ª×¨×
-    notes:
-      new:
-        intro: ××© ×¤× ××¢××ª ×× ×©××¡×¨ ××©××? ×× × ×××§×©×× ××× ××¡×¤×¨ ××ª ×× ××××¤×× ×××¨××. ××©×
-          ×× ×¦×¨×× ××××× ××ª ××¡×× ×××§×× ×× ××× ××××ª×× ××¢×¨× ×©××¡×××¨× ××ª ×××¢××.
-        advice: /start
-        add: ×××¡×¤×ª ××¢×¨×
-      show:
-        anonymous_warning: ×××¢×¨× ××××ª ×××××ª ×ª×××××ª ×××©×ª××©×× ××××× ××× ×©×¦×¨×× ××××ª ××××¤×
-          ×¢×¦×××.
-        hide: ×××¡×ª××¨
-        resolve: ××¤×ª××¨
-        reactivate: ××¤×¢×× ××××©
-        comment_and_resolve: ××××× ×××¤×ª××¨
-        comment: ×××××
     edit_help: ××© ××××× ××ª ×××¤× ××××ª××§× ×¢× ×××§×× ×©××¨×¦×× × ××¢×¨×× ××× ×××××¥ ×××.
     directions:
       ascend: ××¢××
@@ -2838,9 +3248,14 @@ he:
         graphhopper_bicycle: ××××¤× ××× (GraphHopper)
         graphhopper_car: ××××× ××ª (GraphHopper)
         graphhopper_foot: ××¨×× (GraphHopper)
+        fossgis_valhalla_bicycle: ×××¤× ××× (Valhalla)
+        fossgis_valhalla_car: ××××× ××ª (Valhalla)
+        fossgis_valhalla_foot: ××¨×× (Valhalla)
       descend: ×××
       directions: ××××× ××
       distance: ××¨××§
+      distance_m: '%{distance} ××³'
+      distance_km: '%{distance} ×§×´×'
       errors:
         no_route: ×× ××¦×× × × ×ª×× ×©××××¨ ××× ×©× × ×××§××××ª ××××.
         no_place: ×¡×××× â ×× ××¦×× × ××ª %{place}.
@@ -2928,38 +3343,36 @@ he:
       directions_to: ××××× ×× ×× ×
       add_note: ××××¡××£ ××¢×¨× ×××
       show_address: ×××¦×× ××ª×××ª
-      query_features: ××¤×©×¨××××ª ×©××××ª×
+      query_features: ×©××××ª×ª ××©××××ª
       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: ××© ×¨××× ××¡××£