X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/778659a78cdbdbf03014943b9ce85b990daa8cb1..3790dd2aba45ca5b8b4ae30880045e3636023645:/config/locales/he.yml

diff --git a/config/locales/he.yml b/config/locales/he.yml
index d34e53252..9b362ff10 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -9,6 +9,7 @@
 # Author: ExampleTomer
 # Author: GilCahana
 # Author: Guycn2
+# Author: HarelM
 # Author: Inkbug
 # Author: Itay naor
 # Author: LaG roiL
@@ -19,6 +20,7 @@
 # Author: YaronSh
 # Author: Yona b
 # Author: Ypnypn
+# Author: × ×× ×¡
 # Author: ×ª×××¨ ×
 ---
 he:
@@ -94,11 +96,11 @@ he:
         display_name: ×©× ××ª×¦×××
         description: ×ª××××¨
         languages: ×©×¤××ª
-        pass_crypt: ×¡×¡××
+        pass_crypt: ×¡××¡××
   printable_name:
     with_name_html: '%{name} (%{id})'
   editor:
-    default: ××¨×¨×ª ×××× (××¢×ª %{name})
+    default: ××¨××¨×ª ×××× (××¢×ª %{name})
     potlatch:
       name: Potlatch 1
       description: Potlatch 1 (×¢××¨× ××ª×× ×××¤××¤×)
@@ -149,6 +151,7 @@ he:
         title_comment: ×¢×¨××ª ×©×× ×××× %{id} â %{comment}
       join_discussion: × × ××××× ×¡ ×××©××× ××× ×××¦××¨×£ ×××××
       discussion: ××××
+      still_open: ×¢×¨××ª ××©×× ×××× ×¢×××× ×¤×ª××× â ××××× ×××¤×ª× ×××¨× ×©×¢×¨××ª ××©×× ××× ×ª××¡××¨.
     node:
       title: '×¦×××ª: %{name}'
       history_title: '×××¡×××¨×××ª ××¦×××ª: %{name}'
@@ -227,6 +230,7 @@ he:
       reopened_by_anonymous: ×××¤×¢× ××××© ×¢×Ö¾××× ××××× × <abbr title='%{exact_time}'>××¤× ×
         %{when}</abbr>
       hidden_by: ×××¡×ª×¨ ×¢×Ö¾××× %{user} <abbr title='%{exact_time}'>××¤× × %{when}</abbr>
+      report: ××××× ×¢× ×××¢×¨× ××××ª
     query:
       title: ×©××××ª×ª ××©××××ª
       introduction: ××© ×××××¥ ×¢××××¤× ××× ×××¦×× ××©××××ª ××¡××××.
@@ -247,10 +251,10 @@ he:
       user: ××©×ª××©
       comment: ××¢×¨×
       area: ×©××
-    list:
+    index:
       title: ×¢×¨×××ª ×©×× ××××
       title_user: ×¢×¨×××ª ×©×× ×××× ×©× %{user}
-      title_friend: ×¢×¨×××ª ×©×× ×××× ×©× ××××¨×× ×©××
+      title_friend: ×¢×¨×××ª ×©×× ×××× ×©× ××××¨×× ×©××
       title_nearby: ×¢×¨×××ª ×©×× ×××× ×©× ××©×ª××©×× ××¡××××
       empty: ×× × ××¦×× ×©×× ×¢×¨××ª ×©×× ××××.
       empty_area: ××× ×¢×¨×××ª ×©×× ×××× ×××××¨ ×××.
@@ -261,25 +265,25 @@ he:
       load_more: ×××¢×× ×¢××
     timeout:
       sorry: ×¡××××, ×××§× ×××ª×¨ ××× ××× ×××××¨ ×¢× ×¨×©×××ª ×¢×¨×××ª ××©×× ×××× ×©×××§×©×ª.
-    rss:
-      title_all: ×××× ××¢×¨××ª ×©×× ×××× ×©× OpenStreetMap
-      title_particular: ×××× ××¢×¨××ª ×©×× ×××× ××¡' %{changeset_id} ×©× OpenStreetMap
+  changeset_comments:
+    comment:
       comment: ××¢×¨× ×××©× ×¢× ××¢×¨××ª ×©×× ×××× ××¡' %{changeset_id} ×××ª %{author}
-      commented_at_html: ×¢×××× ××¤× × %{when}
       commented_at_by_html: ×¢×××× ××¤× × %{when} ×¢×Ö¾××× %{user}
-      full: ×××× ×××
-  diary_entry:
+    index:
+      title_all: ×××× ××¢×¨××ª ×©×× ×××× ×©× OpenStreetMap
+      title_particular: ×××× ××¢×¨××ª ×©×× ×××× ××¡' %{changeset_id} ×©× OpenStreetMap
+  diary_entries:
     new:
       title: ×¨×©×××ª ×××× ×××©×
       publish_button: ×¤×¨×¡××
-    list:
+    index:
       title: ×××× ×× ×©× ×××©×ª××©
       title_friends: ×××× ×× ×©× ×××¨××
       title_nearby: ×××× ×× ×©× ××©×ª××©×× ××¡××××
       user_title: ××××× ×©× %{user}
       in_language_title: ×¨×©××××ª ×××× ×%{language}
       new: ×¨×©×××ª ×××× ×××©×
-      new_title: ××ª×××ª ×¨×©××× ×××©× ××××× ×××©×ª××© ×©××
+      new_title: ××ª×××ª ×¨×©××× ×××©× ××××× ×××©×ª××© ×©××
       no_entries: ××× ×¨×©××××ª ××××
       recent_entries: ×¨×©××××ª ×××× ×××¨×× ××ª
       older_entries: ×¨×©××××ª ××©× ××ª ×××ª×¨
@@ -295,7 +299,7 @@ he:
       use_map_link: ×××©×ª××© ×××¤×
       save_button: ×©×××¨×
       marker_text: ×××§×× ×¨×©×××ª ×××××
-    view:
+    show:
       title: ××××× ×©× %{user}&rlm; | %{title}
       user_title: ××××× ×©× %{user}â
       leave_a_comment: ×××¡×¤×ª ×ª××××
@@ -318,10 +322,12 @@ he:
       edit_link: ×¢×¨×××ª ×¨×©×××
       hide_link: ××¡×ª×¨×ª ×¨×©×××
       confirm: ×××©××¨
+      report: ××××× ×¢× ××¨×©××× ××××ª
     diary_comment:
       comment_from: ×ª×××× ×Ö¾%{link_user} ×Ö¾%{comment_created_at}
       hide_link: ××¡×ª×¨×ª ××¢×¨× ××
       confirm: ×××©××¨
+      report: ××××× ×¢× ×××¢×¨× ××××ª
     location:
       location: '×××§××:'
       view: ××¦××
@@ -344,62 +350,15 @@ he:
       ago: ××¤× %{ago}
       newer_comments: ××¢×¨××ª ×××©××ª
       older_comments: ××¢×¨××ª ××©× ××ª
-  export:
-    title: ×××¦××
-    start:
-      area_to_export: ×××××¨ ××××¦××
-      manually_select: ××××¨× ××× ××ª ×©× ××××¨ ×××¨
-      format_to_export: ×ª×¡×××¨ ××××¦××
-      osm_xml_data: × ×ª×× × XML ×©× OpenStreetMap
-      map_image: ×ª××× ×ª ××¤× (×ª×¦×××ª ×©××× ×ª×§× ××ª)
-      embeddable_html: HTML ×©× ××ª× ×××××¢×
-      licence: ×¨××©×××
-      export_details: ×××××¢ ×Ö¾OpenStreetMap ××××© ×××¤××£ ×<a href="href="http://opendatacommons.org/licenses/odbl/1.0/">×¨××©×××
-        Open Data Commons ×× ×ª×× ×× ×¤×ª××××</a> (ODbL).
-      too_large:
-        advice: '×× ×××××× ×× ×´× × ××©×, × × ×× ×¡××ª ×××©×ª××© ×××× ×××§××¨××ª ××××:'
-        body: '×××××¨ ×××× ×××× ×©××¤×©×¨ ×××× ××××¦× ×××ª× ××ª××¨ × ×ª×× × XML ×©× OpenStreetMap.
-          × × ×××ª×§×¨× ×× ×××××¨ ××××¨ ×§×× ×××ª×¨, ×× ×××©×ª××© ×××§××¨××ª ××××× ××©××× ×××¨×××ª × ×ª×× ××
-          ××××××ª:'
-        planet:
-          title: ×¤××× × OSM
-          description: ×¢××ª×§×× ××¢×××× ×× ××××¤× ×§×××¢ ×©× ×× ××¡× ×× ×ª×× ×× ×©× OpenStreetMap
-        overpass:
-          title: Overpass API
-          description: ×××¨××ª ××ª××× ××ª××××ª ××××ª ×××ª×¨ ××¨×× ×©× ××¡× ×× ×ª×× ×× ×©× OpenStreetMap
-        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: ×××¦××
   geocoder:
     search:
       title:
-        latlon: ×ª××¦×××ª <a href="http://openstreetmap.org/">××ª×× ×××ª×¨ ×××</a>
-        us_postcode: ×ª××¦×××ª ×××ª×¨ <a href="http://geocoder.us/">Geocoder.us</a>
-        uk_postcode: ×ª××¦×××ª ×××ª×¨ <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
-          Postcode</a>
-        ca_postcode: ×ª××¦×××ª ×××ª×¨ <a href="http://geocoder.ca/">Geocoder.CA</a>
-        osm_nominatim: ×ª××¦×××ª ×××ª×¨ <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        latlon: ×ª××¦×××ª <a href="https://openstreetmap.org/">××ª×× ×××ª×¨ ×××</a>
+        ca_postcode: ×ª××¦×××ª ×××ª×¨ <a href="https://geocoder.ca/">Geocoder.CA</a>
+        osm_nominatim: ×ª××¦×××ª ×××ª×¨ <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames: ×ª××¦×××ª ×××ª×¨ <a href="http://www.geonames.org/">GeoNames</a>
-        osm_nominatim_reverse: ×ª××¦×××ª ×Ö¾<a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim_reverse: ×ª××¦×××ª ×Ö¾<a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames_reverse: ×ª××¦×××ª ×Ö¾<a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
@@ -409,12 +368,19 @@ he:
           chair_lift: ××¢×××ª ×¡×§× ×××©×××
           drag_lift: ××¢×××ª ×¡×§× ×××¨××¨×
           gondola: ×¨××× ××× ××××
+          platter: ××¢×××ª ×¦×××ª
+          pylon: ×¤××××
           station: ×ª×× ×ª ×¨×××
+          t-bar: ××¢×××ª ××Ö¾××¨
         aeroway:
           aerodrome: ×× ××ª
+          airstrip: ×Ö´× ××ª
           apron: ×¨×××ª ×× ××
           gate: ×©×¢×¨
+          hangar: ×××¡× ××××¡××
           helipad: ×× ××ª ××¡××§××
+          holding_position: ×××§×× ××××§×
+          parking_position: ×××§×× ×× ××
           runway: ××¡××× ×××¨××
           taxiway: ××¡××× × ×¡××¢×ª ××××¡
           terminal: ××¡××£
@@ -449,37 +415,32 @@ he:
           crematorium: ××©×¨×¤×
           dentist: ×¨××¤× ×©×× ×××
           doctors: ×¨××¤×××
-          dormitory: ××¢×× ××ª
           drinking_water: ×× ×©×ª×××
           driving_school: ×××ª ×¡×¤×¨ ×× ××××
           embassy: ×©××¨××¨××ª
-          emergency_phone: ×××¤×× ×××¨××
           fast_food: ×××× ××××¨
           ferry_terminal: ××¡××£ ××¢×××¨×ª
-          fire_hydrant: ××¨× ××××× ××©
           fire_station: ×ª×× ×ª ××××× ××©
           food_court: ××××¨ ×××× ××××¨
           fountain: ×××¨×§×
           fuel: ×××§
           gambling: ×××××¨××
           grave_yard: ×××ª ×§××¨××ª
-          gym: ×××× ×××©×¨/×××¨ ×××©×¨
-          health_centre: ××¨×× ××¨××××ª
+          grit_bin: grit bin
           hospital: ×××ª ×××××
           hunting_stand: ×ª×¦×¤××ª ×¦×××××
           ice_cream: ×××××
           kindergarten: ×× ×××××
           library: ×¡×¤×¨×××
-          market: ×©××§
           marketplace: ×©××§
           monastery: ×× ××¨
           motorcycle_parking: ×× ×××ª ×××¤× ××¢××
           nightclub: ×××¢××× ××××
-          nursery: ×¤×¢××××
           nursing_home: ×××ª ××××ª
           office: ××©×¨×
           parking: ×× ××
           parking_entrance: ×× ××¡× ××× ××
+          parking_space: ××× ×× ××
           pharmacy: ×××ª ××¨×§××ª
           place_of_worship: ××§×× ×¤××××
           police: ××©××¨×
@@ -489,7 +450,6 @@ he:
           prison: ×××
           pub: ×¤××
           public_building: ××× × ×¦××××¨
-          reception_area: ××××¨ ×§××××
           recycling: × ×§×××ª ××××××¨
           restaurant: ××¡×¢××
           retirement_home: ×××ª ××××ª
@@ -514,6 +474,7 @@ he:
           village_hall: ×××× ×××¤×¨
           waste_basket: ×¤× ××©×¤×
           waste_disposal: ×××¤×× ××¤×¡×××ª
+          water_point: × ×§×××ª ×××
           youth_centre: ××¨×× × ××¢×¨
         boundary:
           administrative: ×××× ×©×× ×©××¤××
@@ -522,6 +483,7 @@ he:
           protected_area: ××××¨ ××××
         bridge:
           aqueduct: ×××ª ×××
+          boardwalk: ×××¨××
           suspension: ××©×¨ ×ª×××
           swing: ××©×¨ ×¡×××
           viaduct: ××××
@@ -541,25 +503,31 @@ he:
           "yes": ×× ××ª ×××××ªÖ¾××
         emergency:
           ambulance_station: ×ª×× ×ª ×××××× ×¡××
+          assembly_point: × ×§×××ª ××ª××¡×¤××ª
           defibrillator: ××¤×¢×
           landing_site: ××ª×¨ × ×××ª×ª ×××¨××
           phone: ×××¤×× ×××¨××
+          water_tank: ××× ××× ××©×¢×ª ×××¨××
+          "yes": ×××¨××
         highway:
           abandoned: ××××© × ×××©
           bridleway: ×©××× ×¢×××¨ ×¡××¡××
           bus_guideway: × ×ª×× ×ª××××¨× ×¦××××¨××ª ××× ×××ª
           bus_stop: ×ª×× ×ª ×××××××¡
           construction: ××××© ××××¨ ××× ×××
+          corridor: ×¤×¨×××××¨
           cycleway: × ×ª×× ×××¤× ×××
           elevator: ××¢×××ª
           emergency_access_point: × ×§×××ª ×××©× ××©××¨××ª× ×××¨××
           footway: ×©××× ×××××× ×¨××
           ford: ××¢××¨× ×× ××
+          give_way: ×ª××¨××¨ ×ª× ××××ª ×§××××
           living_street: ×¨××× ××××¨××
           milestone: ××× ××¨×
           motorway: ××××©
           motorway_junction: ×¦×××ª ××××©××
           motorway_link: ××××© ×××× ×××ª
+          passing_place: ×××§×× ××××£
           path: × ×ª××
           pedestrian: ××¨× ×××××× ×¨××
           platform: ×¤×××¤××¨××
@@ -576,6 +544,7 @@ he:
           services: ×©××¨××ª× ××¨×
           speed_camera: ××¦×××ª ××××¨××ª
           steps: ×××¨×××ª
+          stop: ×ª××¨××¨ ×¢×¦××¨
           street_lamp: ×¤× ×¡ ×¨×××
           tertiary: ××¨× ×©×××©×× ××ª
           tertiary_link: ××¨× ×©×××©×× ××ª
@@ -584,8 +553,8 @@ he:
           trail: ×©×××
           trunk: ××¨× ×¨××©××ª
           trunk_link: ××¨× ×¨××©××ª
+          turning_loop: ××¢×× ×ª× ××¢×
           unclassified: ××¨× ×× ××¡××××ª
-          unsurfaced: ××¨× ×××ª×Ö¾×¡××××
           "yes": ××¨×
         historic:
           archaeological_site: ××ª×¨ ××¨×××××××
@@ -604,6 +573,7 @@ he:
           manor: ×××××
           memorial: ×× ××¨×× ××××¨××
           mine: ×××¨×
+          mine_shaft: ×¤××¨ ×××¨×
           monument: ×× ××¨××
           roman_road: ××¨× ×¨××××ª
           ruins: ××¨××¡××ª
@@ -613,6 +583,7 @@ he:
           wayside_cross: ×¦×× ××¦× ×××¨×
           wayside_shrine: ××§××© ××¦× ×××¨×
           wreck: ×¡×¤×× × ××¨××¤×
+          "yes": ××ª×¨ ×××¡×××¨×
         junction:
           "yes": ×¦×××ª
         landuse:
@@ -650,9 +621,9 @@ he:
         leisure:
           beach_resort: ××ª×¨ × ××¤×© ××××£ ××
           bird_hide: ××¦×¤××¨
-          club: ×××¢×××
           common: ×©×× ××©××ª×£
           dog_park: ×¤××¨×§ ×××××
+          firepit: ×××¨ ××©
           fishing: ××××¨ ×××
           fitness_centre: ×××× ×××©×¨
           fitness_station: ×ª×× ×ª ×××©×¨
@@ -677,15 +648,46 @@ he:
           water_park: ×¤××¨×§ ×××
           "yes": × ××¤×©
         man_made:
+          adit: ×× ××¡× ×××¤×§××ª ×××¢×¨×
+          beacon: ××©×××
+          beehive: ××××¨×ª ××××¨××
+          breakwater: ×©×××¨ ××××
+          bridge: ××©×¨
+          bunker_silo: ××× ×§×¨
+          chimney: ××¨×××
+          crane: ×¢×××¨×
+          dolphin: ×¢××× ×¨×ª××§×
+          dyke: ××¨××
+          embankment: ×¡××××
+          flagpole: ×ª××¨×
+          gasometer: ××××××¨
+          groyne: ×¨×¦××£
+          kiln: ×¤××¨× ×¡
           lighthouse: ××××××¨
+          mast: ×ª××¨×
+          mine: ×××¨×
+          mineshaft: ×¤××¨ ×××¨×
+          monitoring_station: ×ª×× ×ª ××¢×§×
+          petroleum_well: ×××¨ × ×¤×
+          pier: ×¨×¦××£
           pipeline: ×§× ×¦×× ××¨××ª
+          silo: ×××××¨×
+          storage_tank: ××× ×××¡××
+          surveillance: ××¢×§×
           tower: ××××
+          wastewater_plant: ××¤×¢× ×××××¨ ×××
+          watermill: ××× ×ª ×××
+          water_tower: ×××× ×××
+          water_well: ×××¨
+          water_works: ××¤×¢× ×××
+          windmill: ××× ×ª ×¨××
           works: ××¤×¢×
           "yes": ××¢×©×Ö¾×××
         military:
           airfield: ×× ××ª ×¦×××
           barracks: ××××¨× ××××××
           bunker: ××× ×§×¨
+          "yes": ×¦×××
         mountain_pass:
           "yes": ××¢××¨ ××¨×¨×
         natural:
@@ -731,11 +733,14 @@ he:
           accountant: ×¨××× ××©×××
           administrative: ×Ö´× ××
           architect: ×××¨×××
+          association: ×××××
           company: ×××¨×
+          educational_institution: ×××¡× ××× ××
           employment_agency: ×¡××× ××ª ×ª×¢×¡××§×
           estate_agent: ××ª××× × ×××´×
           government: ××©×× ×××©××ª××ª
           insurance: ××©×¨× ×××××
+          it: ×××¡× ××× ××
           lawyer: ×¢××¨× ×××
           ngo: ××©×¨× ×××¡× ×× ×××©××ª×
           telecommunication: ××©×¨× ×ª×§×©××¨×ª ×××§××¨×× ××ª
@@ -743,9 +748,8 @@ he:
           "yes": ××©×¨×
         place:
           allotments: ×©×××× ××§×××××
-          block: ×¨×××¢
-          airport: × ×× ×ª×¢××¤×
           city: ×¢××¨
+          city_block: ××××§ ××¢××¨
           country: ××¨×¥
           county: ××××
           farm: ××××
@@ -756,12 +760,13 @@ he:
           islet: ×××Ö¹×
           isolated_dwelling: ××××¨×× ×××××××
           locality: ×××©××
-          moor: ××××ª ××××
           municipality: ×¢××¨×××
           neighbourhood: ×©××× ×
           postcode: ×××§××
+          quarter: ×¨×××¢
           region: ××××¨
           sea: ××
+          square: ××××¨
           state: ×××× ×
           subdivision: ××××§×ª ××©× ×
           suburb: ×¤×¨×××¨
@@ -773,10 +778,8 @@ he:
           abandoned: ××¡×××ª ××¨×× × ×××©×
           construction: ××¡×××ª ××¨×× ××× ×××
           disused: ××¡×××ª ××¨×× ×©××× × ××©××××©
-          disused_station: ×ª×× ×ª ×¨×××ª ×©××× × ××©××××©
           funicular: ×¤×× ××§×××¨
           halt: ×ª×× ×ª ×¨×××ª
-          historic_station: ×ª×× ×ª ×¨×××ª ×××¡×××¨××ª
           junction: ××¤××© ××¡××××ª ××¨××
           level_crossing: ××¤××© ××¡×××ª ××¨×× ×××××©
           light_rail: ×¨×××ª ×§××
@@ -802,6 +805,7 @@ he:
           beauty: ×¡××× ×××¤×
           beverages: ×× ××ª ××©×§×××ª
           bicycle: ×× ××ª ××¤× ×××
+          bookmaker: ×¡××× ×××××¨××
           books: ×× ××ª ×¡×¤×¨××
           boutique: ×××××§
           butcher: ×§×¦×
@@ -840,12 +844,16 @@ he:
           hairdresser: ××¢×¦× ×©×¢×¨
           hardware: ×× ××ª ××××¨× ×× ×××
           hifi: ×¦××× ×××××§×
-          insurance: ×××××
+          houseware: ×× ××ª ××× ×××ª
+          interior_decoration: ×¢××¦×× ×¤× ××
           jewelry: ×× ××ª ×ª××©××××
           kiosk: ×§×××¡×§
+          kitchen: ×× ××ª ××× ××××
           laundry: ××××¡×
+          lottery: ×××¨××
           mall: ××¨×× ×§× ×××ª
           market: ×©××§
+          massage: ×¢××¡××
           mobile_phone: ×× ××ª ×××¤×× ×× × ×××××
           motorcycle: ×× ××ª ×××¤× ××¢××
           music: ×× ××ª ××× × ××× ×
@@ -853,21 +861,27 @@ he:
           optician: ×××¤×××§××
           organic: ×× ××ª ×××× ×××¨×× ×
           outdoor: ×× ××ª ×¦××× ××× ×××ª
+          paint: ×× ××ª ×¦××¢
+          pawnbroker: ×Ö·×©××Ö¼×Ö¹× Ö·××
           pet: ×× ××ª ××××ª ××××
           pharmacy: ×××ª ××¨×§××ª
           photo: ×× ××ª ×¦××××
-          salon: ×¡×××
+          seafood: ××××× ××
           second_hand: ×× ××ª ×× ×©× ×××
           shoes: ×× ××ª × ×¢××××
-          shopping_centre: ××¨×× ×§× ×××ª
           sports: ×× ××ª ×¡×¤××¨×
           stationery: ×× ××ª ××× ××ª×××
           supermarket: ×¡××¤×¨××¨×§×
           tailor: ××××
+          ticket: ×× ××ª ××¨×××¡××
+          tobacco: ×× ××ª ×××§
           toys: ×× ××ª ×¦×¢×¦××¢××
           travel_agency: ×¡××× ××ª × ×¡××¢××ª
+          tyres: ×× ××ª ×¦×××××
+          vacant: ×× ××ª ×¤× ×××
+          variety_store: ××××
           video: ×¡×¤×¨×××ª ×××××
-          wine: ×× ××ª ×××××××
+          wine: ×× ××ª ×××
           "yes": ×× ××ª
         tourism:
           alpine_hut: ××§×ª× ×××¤×× ××ª
@@ -891,6 +905,7 @@ he:
           viewpoint: × ×§×××ª ×ª×¦×¤××ª
           zoo: ×× ××××ª
         tunnel:
+          building_passage: ××¢××¨ ××× ×× ××× ××
           culvert: ××××
           "yes": ×× ××¨×
         waterway:
@@ -922,7 +937,7 @@ he:
         level10: ×××× ××¤×¨×××¨
     description:
       title:
-        osm_nominatim: ×××§×× ×××ª×¨ <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim: ×××§×× ×××ª×¨ <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames: ×××§×× ×××ª×¨ <a href="http://www.geonames.org/">GeoNames</a>
       types:
@@ -932,6 +947,11 @@ he:
     results:
       no_results: ×× × ××¦×× ×ª××¦×××ª
       more_results: ×ª××¦×××ª × ××¡×¤××ª
+  issues:
+    index:
+      title: ××¢×××ª
+      select_status: ×××××¨ ××¦×
+      select_type: ×××¨ ×¡××
   layouts:
     logo:
       alt_text: ××××× ×©× OpenStreetMap
@@ -957,13 +977,9 @@ he:
     intro_text: OpenStreetMap ××× ××¤× ×©× ××¢×××, ×©× ××¦×¨×ª ×¢×Ö¾××× ×× ×©×× ××××, ××××¤×©××ª
       ××©××××© ×ª××ª ×¨××©××× ×¤×ª××.
     intro_2_create_account: × × ×××¦××¨ ××©××× ××©×ª××©
-    partners_html: ××××¨×× × ×ª×× ×¢×Ö¾××× ××¨×× %{ucl}â, %{ic} ×%{bytemark}, ××¢×Ö¾××× %{partners}
-      ×××¨××.
-    partners_ucl: ××¨×× UCL VR
-    partners_ic: ×××××× ××××××ª××ª ×©× ××× ×××
-    partners_bytemark: ×××¨×× ×××××××¨×§
+    partners_ucl: UCL
+    partners_bytemark: Bytemark Hosting
     partners_partners: ×©××ª×¤××
-    partners_url: http://wiki.openstreetmap.org/wiki/Partners
     osm_offline: ××¡× ×× ×ª×× ×× ×©× ××ª×¨ OpenStreetMap ××× × ××§××× ××¢×ª ××©× ×¢×××××ª ×ª××××§×
       ×××××¦×¢××ª ××.
     osm_read_only: ××¡× ×× ×ª×× ×× ×©× ××ª×¨ OpenStreetMap × ×ª×× ××¢×ª ×××¦× ×§×¨××× ×××× ××©× ×¢×××××ª
@@ -982,264 +998,11 @@ he:
       text: ×ª×¨×××
     learn_more: ××××¢ × ××¡×£
     more: ×¢××
-  license_page:
-    foreign:
-      title: ×××××ª ×ª×¨××× ××
-      text: ×××§×¨× ×©× ×××¡×¨ ×ª×××××ª ××× ×¢××× ××ª××¨×× ×× ×××× %{english_original_link},
-        ××© ××ª×ª ×¢×××¤××ª ××¢××× ××× ××××ª
-      english_link: ××¢××× ×××§××¨× ××× ××××ª
-    native:
-      title: ×××××ª ××£ ××
-      text: ××× ×¢××× ××××××ª ××××¦×¨×× ×××¨×¡×ª× ××× ××××ª. ××¤×©×¨ ×××××¨ ×%{native_link} ×©×
-        ×¢××× ××, ×××¤×©×¨ ×× ×××¤×¡××§ ××§×¨×× ×¢× ××××××ª ×××¦×¨×× ×%{mapping_link}.
-      native_link: ××¨×¡× ×¢××¨××ª
-      mapping_link: ×××ª××× ×××¤××ª
-    legal_babble:
-      title_html: ××××××ª ×××¦×¨×× ××¨××©×××
-      intro_1_html: "OpenStreetMap&rlm;<sup><a href=\"#trademarks\">&reg;</a></sup>
-        ××× <i>×××× × ×ª×× ×× ×¤×ª××××</i>, ×©××ª×¤×¨×¡× ××¤× ×¨××©××× <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open
-        Data\nCommons Open Database License</a>&rlm; (ODbL) ×¢×Ö¾××× <a\n \t+\t\nhref=\"http://osmfoundation.org/\">×§×¨×
-        OpenStreetMap</a>&rlm; (OSMF)."
-      intro_2_html: |-
-        ××ª× ×××¤×©××× ×××¢×ª××§, ×××¤××¥, ××©××¨ ××××ª××× ××ª ×× ×ª×× ×× ×©×× ×,
-        ×× ×¢×× ××ª× × ××ª× ×× ×××××¡ ×Ö¾OpenStreetMap
-        ×××ª××¨××× ×××××. ×× ××ª× ××©× ×× ××ª ×× ×ª×× ×× ×× ××ª ×××¤××ª ×©×× × ×× ××¡×ª×××× ×¢×××× ××× ×××¦××¨ ××©×× ×××©,
-        ×××ª×¨ ××× ×××¤××¥ ××ª ××ª××¦×××ª ×¨×§ ××¤× ×ª× ×× ×××ª× ××¨××©×××.
-        <a href="http://opendatacommons.org/licenses/odbl/1.0/">×××¡××
-        ×××©×¤××</a> ×××× ××¡×××¨ ××ª ××××××ª××× ×××ª ×ª×××× ××××¨×××ª ×©×××.
-      intro_3_html: |-
-        ××××¤×× ×××¨××× ×××¤× ×©×× ×, ×××ª××¢×× ×©×× × ××××©×× ×××¤××£
-        ××¨××©××× <a href="http://creativecommons.org/licenses/by-sa/2.0/">×§×¨×××××××
-        ×§×××× × ×××××¡â×©××ª××£Ö¾××× 2.0</a> license (××§××¦××¨ CC-BY-SA).
-      credit_title_html: ××× ××ª×ª ×××××¡ ×Ö¾OpenStreetMap
-      credit_1_html: ×× × ×××¨×©×× ×××××¡ ×× â&copy; ×ª××¨×× OpenStreetMapâ.
-      credit_2_html: |-
-        ×××Ö¾××, ××××ª× ××××××¨ ×©×× ×ª×× ×× ×××× ×× ×××¤××£ ××¨××©××× ×××¡××
-        × ×ª×× ×× ×¤×ª××××, ××× × ×¢×©× ×©××××© ×××¨××× ×××¤× ×©×× ×, ×©××××¤×× ××¤××¤××ª
-        ××¨××©××× CC-BY-SA. ×××¤×©×¨××ª× ××¢×©××ª ×××ª ××××¦×¢××ª ×§××©××¨ ××
-        <a href="http://www.openstreetmap.org/copyright">××£ ××××××ª ××××¦××¨×</a>.
-        ×××××¤××, ××× ××××ª× ××¢×ª ××¤×¦×ª OSM ××¦××¨×ª
-        × ×ª×× ××, ×××¤×©×¨××ª× ××¦××× ××ª ××©×××ª ×××§×©×¨ ××©××¨××ª ×× ××¨××©××× ×× ××¨××©××× ××ª. ××××¦×¢× ×ª×§×©××¨×ª
-        ×©×× × ××ª× ×××©×ª××© ××× ××§××©××¨×× (×××©× ×××¤××¡), ×× × ×××××¦××
-        ×××¤× ××ª ××ª ××§××¨××× ×©×× ×× openstreetmap.org (×××× ×¢×Ö¾××× ××¨×××ª
-        âOpenStreetMapâ ×××ª×××ª ××××), ×× opendatacommons.org, ×××
-        ×× ××ª×××, ×× creativecommons.org.
-      credit_3_html: '××©××× ××¤× ×××§××¨×× ××ª ×©××¤×©×¨ ××¢××× ××, ××××××¡ ×¦×¨×× ××××¤××¢ ××¤×× ×ª
-        ×××¤×. ×××©×:'
-      attribution_example:
-        alt: ××××× ××¦××¨× ×× ××× × ××ª×ª ×××××¡ ×Ö¾OpenStreetMap ×××ª×¨ ×××× ××¨× ×
-        title: ××××× ××××××¡
-      more_title_html: ××× ×××¦×× ××××¢ × ××¡×£
-      more_1_html: |-
-        ×§Ö´×¨×× ×¢×× ×¢× ×©××××© ×× ×ª×× ×× ×©×× × ××¢× ××¨××× ×××××¡ ×××× × ××¦××¨××ª × ×××¨××ª ×<a
-        href="http://osmfoundation.org/Licence">××£ ×¨××©××× OSMF</a> ××<a
-        href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">××£ ××©××´×ª
-        ××©×¤××</a> ×©× ××§××××.
-      more_2_html: |-
-        ××£Ö¾×¢×Ö¾×¤× ×©Ö¾OpenStreetMap ××× ×××× × ×ª×× ×× ×¤×ª××××, ××× × × ×××××× ××¡×¤×§
-        API ××¤××ª ×××× × ×××¤×ª×× ×¦× ×©×××©×.
-        ×¨×³ ××ª ××¤× ××××× ×××ª ×©×× ×: <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">××××× ×××ª ××©××××© ×Ö¾API</a>,
-        <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">×××× ×××ª ××©××××© ×××¨××××</a>
-        ×<a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">×××× ×××ª ××©××××© ×× ×××× ×××</a>.
-      contributors_title_html: ××ª××¨××× ×©×× ×
-      contributors_intro_html: |-
-        ××ª××¨××× ×©×× × ×× ×××¤× ×× ×©××. ×× × ×× ××××××
-        × ×ª×× ×× ××¨××©××× ×¤×ª×× ××¡××× ××××ª ×××¤×× ××××××ª
-        ××××§××¨××ª ×××¨××, ×××:
-      contributors_at_html: |-
-        <strong>×××¡××¨××</strong>: ×××× × ×ª×× ××
-        ×<a href="http://data.wien.gv.at/">×¢××¨×××ª ××× ×</a> ××¤× ×ª× ××
-        <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>,
-        ×<a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">×××× ×ª ×¤××¨××¨×××¨×</a>
-        ×××××× ×ª ×××¨×× (××¤× <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT ×¢× ×ª××§×× ××</a>).
-      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="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">×¨××©××× 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="http://www.and.com">www.and.com</a>)
-      contributors_nz_html: |-
-        <strong>× ×× ×××× ×</strong>: ×××× × ×ª×× ×× ×©××××¢× ×××§××¨
-        ×Ö¾Land Information New Zealand. ××××××ª ××××¦×¨×× ×©× ×××ª×¨ ×©×××¨××ª.
-      contributors_si_html: |-
-        <strong>×¡×××× ××</strong>: ×××× × ×ª×× ×× ×<a href="http://www.gu.gov.si/en/">××¨×©××ª ××××××ªÖ¾×§×¨×§×¢××ª ×××××¤××</a> ××<a href="http://www.mkgp.gov.si/en/">××©×¨× ×××§××××ª, ×××¢×¨× ××ª ××××××</a>
-        (××××¢ ×¦××××¨× ×©× ×¡×××× ××).
-      contributors_za_html: |-
-        <strong>××¨×× ××¤×¨××§×</strong>: ×××× × ×ª×× ×× ×©××××¢×
-        ×Ö¾<a href="http://www.ngi.gov.za/">×Ö´× ×× ××××:
-        ××××¢ ×××Ö¾××¨××× ×××××</a>, ××××ª ×××¦×¨×× ×××××ª××ª ×©×××¨×.
-      contributors_gb_html: |-
-        <strong>×××××× ×××××××ª</strong>: ×××× × ×ª×× × ×¡×§×¨ ××××××ª
-        &copy; ××××××ª ×××ª×¨ ×××××××ª ××¡×× × ×ª×× ××
-        2010â2012.
-      contributors_footer_1_html: |-
-        ×××××¢ × ××¡×£ ×¢× ××§××¨××ª ××× ××××¨×× ×©×©×××©×
-        ××©××¤××¨ OpenStreetMap, × × ××¨×××ª ××ª <a
-        href="http://wiki.openstreetmap.org/wiki/Contributors">××£
-        ××ª××¨×××</a> ×××××§× ×©× OpenStreetMap.
-      contributors_footer_2_html: |-
-        ××××× ×©× × ×ª×× ×× ×Ö¾OpenStreetMap ××× × ××××¨×ª ×©××¡×¤×§ ×××§××¨×
-        ×©× ×× ×ª×××× ×ª××× ×Ö¾OpenStreetMap, ×××§× ×¢× ×¢×¦×× ×××¨×××ª ×××©××, ××
-        ××§×× ××××ª ×××©××.
-      infringement_title_html: ××¤×¨×ª ××××××ª ×××¦×¨××
-      infringement_1_html: |-
-        ×× × ×××××¨×× ××ª××¨××× ×Ö¾OSM ××¢××× ×× ××××¡××£ × ×ª×× ×× ××©×× ××§××¨
-        ×©××××× ×××××××ª ×××¦×¨×× (×××©× ××¤××ª ×××× ×× ××¤××ª ××××¤×¡××ª) ×××
-        ×××©××¨ ××¤××¨×© ×××¢×× ×××××××ª.
-      infringement_2_html: |-
-        ×× × ×¨×× ×× ×©××××¨ ×©××××× ×××××××ª ×××¦×¨×× × ××¡×£ ××××¤× ×× ××××
-        ×× ××¡× ×× ×ª×× ×× ×©× OpenStreetMap ×× ×× ×××ª×¨ ×××, × × ××¤× ××ª
-        ×× <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">× ×××
-        ×××¡×¨×</a> ×©×× × ×× ××ª×× ×ª××× × ××©××¨××ª
-        <a href="http://dmca.openstreetmap.org/">×××£ ××ª××× ××ª ×××§××× ×©×× ×</a>.
-      trademarks_title_html: <span id="trademarks"></span>×¡××× ×× ××¡××¨×××
-      trademarks_1_html: OpenStreetMap, ×¡×× ×××××××ª ××××××ª ×Ö¾State of the Map ×× ×¡××× ××
-        ××¡××¨××× ×©× ×§×¨× OpenStreetMap. ×× ××© ×× ×©××××ª ×¢× ××©××××© ×©×× ××¡××× ××, × × ××©×××
-        ××ª ××©××××ª ×<a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">×§×××¦×ª
-        ××¢×××× ×©× ××¨××©××</a>.
-  welcome_page:
-    title: ××¨×× ××××!
-    introduction_html: ××¨×× ×××× ×Ö¾OpenStreetMap, ××¤× ×××¤×©××ª ×©× ××¢×××, ×©××¤×©×¨ ××¢×¨××.
-      ×¢××©×× ×©× ×¨×©××ª, ×××× ×××× ×××¤×©×¨ ×××ª××× ××¦×××¨ ××¤××ª. ×× × ×××¨×× ×§×¦×ª ×©×××ª× ×× ××ª ××××¨××
-      ×××©×××× ×©×××× ×× ×××¢×ª.
-    whats_on_the_map:
-      title: ×× ×¢× ×××¤×
-      on_html: OpenStreetMap ××× ××§×× ××××¤×× ×××¨×× ×××ª××× ×× ×××××× â ××× ×××× ×××××× ×
-        ××× ××, ××¨××× ××¤×¨××× ×××¨×× ×¢× ××§××××ª. ××¤×©×¨ ×××¤××ª ×× ××©××ª ×××¢××× ××××ª× ×©××¢× ×××
-        ×××ª×.
-      off_html: ×× ×©××× ×¤× ×× ××××¢ ××¢×ª× × ××× ×××¨××××, ××§××××ª ×××¡×××¨××× ×× ×××¤××ª××××
-        ×× ×ª×× ×× ×××§××¨××ª ×©××××××× ×××××××ª ×××¦×¨××. ×× × ×××¨×©×× ××× ×× ××××¡××£  ××××¢ ×××¤××ª
-        ××§××× ××ª ×× ××××¤×¡××ª ××× ×× ××© ×× ×××©××¨ ××××× ×××.
-    basic_terms:
-      title: ××× ××× ××¡××¡××× ××××¤××
-      paragraph_1_html: ××××× OpenStreetMap ××© ×¢×× ××©××. ×× × ××¡×¤×¨ ×××××ª ××¤×ª× ×©××××
-        ×©××××©×××ª.
-      editor_html: <strong>×¢××¨×</strong> ××× ×ª×× × ×× ××ª×¨ ××¢×¨×××ª ×××¤×.
-      node_html: <strong>×¦×××ª</strong> × ×× × ×§××× ×¢× ××¤×, ×××× ××¡×¢×× ×××ª ×× ×¢×¥ ×××.
-      way_html: <strong>× ×ª××</strong> ××× ×§× ×× ××××¨ ××× ××¨×, ××¨×, ××× ×× ××× ×.
-      tag_html: <strong>×ª×</strong> ××× ×¤××¡×ª ××××¢ ×¢× ×¦×××ª ×× ×¢× × ×ª×× ××× ×©× ×©× ××¡×¢××
-        ×× ×××××ª ××××¨××ª ×××¨×.
-    rules:
-      title: ×××§××!
-      paragraph_1_html: ×Ö¾OpenStreetMap ××© ××¢× ×××§×× ×¤××¨×××××, ××× ×× ×× × ××¦×¤×× ×××
-        ×××©×ª×ª×¤×× ××©×ª×£ ×¤×¢××× ×××ª×§×©×¨ ×¢× ××§××××. ×× ××ª× ×©××§××× ×××¦×¢ ×¤×¢××××ª ×××©×× ××××
-        ×¢×¨××× ××× ××ª, ×× × ×§×¨×× ××ª ××××¨×××× ×¢× <a href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'>××××</a>
-        ××¢× <a href='http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>×¢×¨××××ª
-        ×××××××××ª</a>.
-    questions:
-      title: ××© ×©××××ª?
-      paragraph_1_html: |-
-        ×Ö¾OpenStreetMap ××© ××¡×¤×¨ ××©×××× ×××××× ×¢× ×××××, ××©××××ª ××ª×©××××ª,
-        ×××××× ××ª××¢×× ×©××ª××¤× ×©× × ××©×× ×××¤××.
-        <a href='%{help_url}'>××§×× ××§×× ×¢××¨×</a>.
-    start_mapping: ×××ª××× ×××¤××ª
-    add_a_note:
-      title: ××× ×× ××× ××¢×¨××? ××¤×©×¨ ××××¡××£ ××¢×¨×!
-      paragraph_1_html: ×× ×¨×§ ×¨×¦××ª ××ª×§× ××©×× ×§×× ×××× ×× ××× ××××¨×©× ×××××× ××× ××¢×¨××,
-        ×§× ××××¡××£ ××¢×¨×.
-      paragraph_2_html: '×¦×¨×× ×¤×©×× ××××ª ×× <a href=''%{map_url}''>×××¤×</a> ××××××¥
-        ×¢× ×¡×× ×××¢×¨×: <span class=''icon note''></span>. ×× ×××¡××£ ×××¤× ×¡××, ×©××¤×©×¨
-        ×××¨××¨. ×××¨× ×××¡×¤×ª ×××¢×¨× ××© ×××××¥ ×¢× ×©×××¨× ××××¤×× ×××¨×× ××××§× ××ª ××.'
-  fixthemap:
-    title: ××××× ×¢× ××¢×× / ××ª×§× ××ª ×××¤×
-    how_to_help:
-      title: ××× ××¤×©×¨ ××¢×××¨
-      join_the_community:
-        title: ×××¦××¨×£ ××§××××
-        explanation_html: |-
-          ×× ×©××ª ×× ×××¢×× ×¢× × ×ª×× × ×××¤× ×©×× ×, ×××©× ×©××¨× ×× ×©××ª×××ª ×©×× ××¡×¨×, ×××¨× ××××× ××××ª×¨
-          ××××©×× ××× ×××¦××¨×£ ××§××××ª OpenStreetMap ×××ª×§× ××ª ×× ×ª×× ×× ××¢×¦××.
-      add_a_note:
-        instructions_html: |-
-          ×¦×¨×× ×¤×©×× ×××××¥ ×¢× <a class='icon note'></a> ×× ×¢× ×××ª× ××¡×× ××ª×¦×××ª ×××¤×.
-          ×× ×××¡××£ ×××¤× ×¡×× ×©××¤×©×¨ ×××××
-          ××××¦×¢××ª ××¨××¨×. ××© ××××¡××£ ×©× ××¢×¨× ×××©×××¨ ×××ª× ××××¤×× ×××¨×× ×××§×¨× ××ª ××.
-    other_concerns:
-      title: ×××××ª ×××¨××ª
-      explanation_html: ×× ××© ×× ×××××ª ×××× ××× ×©×× ×ª×× ×× ×©×× × ××©××©×× ×× ×¢× ××ª×××,
-        × × ××§×¨×× ××ª <a href='/copyright'>××£ ××××××ª ××××¦×¨××</a> ×©×× × ×××××¢ ××©×¤×× × ××¡×£,
-        ×× ×××¦××¨ ×§×©×¨ ×¢× <a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>×§×××¦×ª
-        ××¢×××× ×××ª×××× ×Ö¾OSMF</a>.
-  help_page:
-    title: ×§×××ª ×¢××¨×
-    introduction: |-
-      ×Ö¾OpenStreetMap ××© ××¡×¤×¨ ××©×××× ×××××× ×¢× ×××××, ××©××××ª ××ª×©××××ª,
-      ×××××× ××ª××¢×× ×©××ª××¤× ×©× × ××©×× ×××¤××.
-    welcome:
-      url: /welcome
-      title: ××¨×××× ××××× ×Ö¾OSM
-      description: ×ª××××ª ××××¨××ª ××¢××¨×ª ×××¨×× ××××¨ ×©×¡××§×¨ ××ª ×××¡××××ª ×©× OpenStreetMap.
-    beginners_guide:
-      url: http://wiki.openstreetmap.org/wiki/He:Beginners%27_guide
-      title: ××××¨×× ×××ª×××××
-      description: ×××¨×× ××ª××××§×ª ××§×××× ×××ª×××××.
-    help:
-      url: https://help.openstreetmap.org/
-      title: help.openstreetmap.org
-      description: ××©××× ×©××× ×× ×××¤×© ×ª×©××××ª ×××ª×¨ ××©××××ª ×××ª×©××××ª ×©× OSM.
-    mailing_lists:
-      title: ×¨×©××××ª ×ª×¤××¦×
-      description: ××©××× ×©××× ×× ×××× ××××¨×× ××¢× ××× ×× ××¨×©××××ª ×ª×¤××¦× × ××©××× ×××××¨×××ª
-        ×¨×××ª.
-    forums:
-      title: ×¤××¨××××
-      description: ×©××××ª ××××× ×× ××× ×©×× ×©××¢×××¤×× ×××©×§ ××¡×× ×× ×¤××¨××.
-    irc:
-      title: IRC
-      description: ×©××× ××× ××¨××§×××××ª ××©×¤××ª ×©×× ××ª ×¨×××ª ××× ××©××× ×¨×××.
-    switch2osm:
-      title: switch2osm
-      description: ×¢××¨× ××××¨××ª ×××¨××× ×× ×©×¢×××¨×× ×××¤××ª ××©××¨××ª×× ×××¨×× ×©× OpenStreetMap.
-    wiki:
-      url: http://wiki.openstreetmap.org/
-      title: wiki.openstreetmap.org
-      description: ××¢××× ×××××§× ××ª××¢×× ××¢×××§ ×¢× OSM.
-  about_page:
-    next: ×××
-    copyright_html: <span>&copy;</span>×ª××¨××<br>OpenStreetMap
-    used_by: '%{name} ××¤×¢××× × ×ª×× × ×××¤× ××××¤× ××ª×¨× ××× ××¨× ×, ×××©×××× ××××©××¨×× ×©×× ××'
-    lede_text: ××ª OpenStreetMap ××× × ×§××××ª ×××¤×× ×©×ª××¨××× ×××ª×××§×× × ×ª×× ×× ×¢× ××¨×××,
-      ×©×××××, ××ª×Ö¾×§×¤×, ×ª×× ××ª ×¨×××ª ××¢×× ××¨×× ×××ª×¨, ××¡××× ××¢×××.
-    local_knowledge_title: ×××¢ ××§×××
-    local_knowledge_html: |-
-      OpenStreetMap ×××××©× ×××¢ ××§×××. ××ª××¨××× ××©×ª××©××
-      ××ª××× ××ª ×××××××¨, ×××©××¨× GPS, ×××¤××ª ×©×× â××××Ö¾××§â ××× ××××× ×©Ö¾OSM
-      ×××××§×ª ×××¢×××× ×ª.
-    community_driven_title: ××× ×× ×¢×Ö¾××× ××§××××
-    community_driven_html: |-
-      ×§××××ª OpenStreetMap ××××× ×ª, ××¢××ª ×ª×©××§×, ××××× ×××× ××××.
-      ××§×¨× ××ª××¨××× ×©×× × ××© ×××¤×× × ×××××, ××§×¦××¢× × ××¢×¨×××ª ××××¢ ×××××¨×¤×××ª (GIS), ××× ××¡××
-      ×©××¨××¦×× ××ª ×©×¨×ª× OSM, ×¤×¢××× ×¡×××¢ ×××× ×××¨× ×©×××¤×× ××××¨× ××××Ö¾××¡××,
-      ××¨××× ×××¨××.
-      ×××××¢ × ××¡×£ ×¢× ××§×××× ×¨' ××ª <a href='%{diary_path}'>×××× × ×××©×ª××©××</a>,
-      ××ª <a href='http://blogs.openstreetmap.org/'>××××××× ×©× ××§××××</a>, ×××ª ×××ª×¨ ×©× <a href='http://www.osmfoundation.org/'>×§×¨× OSM</a>.
-    open_data_title: × ×ª×× ×× ×¤×ª××××
-    open_data_html: |-
-      OpenStreetMap ××× <strong>× ×ª×× ×× ×¤×ª××××</strong>: ××© ×× ×××¤×© ×××©×ª××© ×× ××× ×××¨×,
-      ×× ×¢×× × ××ª× ×××××¡ ×Ö¾OpenStreetMap ×××ª××¨×××. ×××ª×¨ ××©× ××ª ××ª ×× ×ª×× ××
-      ×××× ××ª ×¢× ××××× ×××¨×× ××¡×××××, ×× ××© ×××¤××¥ ××ª ××ª××¦×××ª ×©× ××
-      ××¤× ××ª× ××× ×©× ×××ª× ××¨××©×××. ×¨' ××ª <a href='%{copyright_path}'>××£ ××¨××©××× ×××××××ª ××××¦×¨××</a> ××¤×¨××× × ××¡×¤××.
-    legal_title: ××©×¤××
-    legal_html: |-
-      ×××ª×¨ ××× ××©××¨××ª×× ×¨××× ×××¨×× ×××¤×¢××× ×¢×Ö¾××× <a href='http://osmfoundation.org/'>×§×¨× OpenStreetMap</a>&rlm; (OSMF) ××©× ××§××××.
-      <br>
-      × × <a href='http://osmfoundation.org/Contact'>×××¦××¨ ×§×©×¨ ×¢× OSMF</a> ×× ××© ×× ×©××××ª ×¢× ×¨××©××, ××××××ª ×××¦×¨×× ×× ×©××××ª ×××¢×××ª ××©×¤××××ª ×××¨××ª.
-    partners_title: ×©××ª×¤××
   notifier:
     diary_comment_notification:
-      subject: '[×××¤× ×¡××¨×× ×××¤ OpenStreetMap] ×ª×××× ×××ª %{user} × ××¡×¤× ××¨×©×××ª ××××
-        ×©××'
+      subject: '[×××¤× ×¡××¨×× ×××¤ OpenStreetMap] ×ª×××× ×××ª %{user} × ××¡×¤× ××¨×©×××ª ××××'
       hi: ×©××× %{to_user},
-      header: '%{from_user} ×××× ××¨×©×××ª ××××× ×©×× ×Ö¾OpenStreetMap ×¢× ×× ××©× %{subject}:'
+      header: '%{from_user} ×××× ××¨×©×××ª ××××× ×Ö¾OpenStreetMap ×¢× ×× ××©× %{subject}:'
       footer: ××¤×©×¨ ×× ××§×¨×× ××ª ××ª×××× ×××ª×××ª %{readurl} ×××××× ×××ª×××ª %{commenturl}
         ×× ×××©×× ×××ª×××ª %{replyurl}
     message_notification:
@@ -1247,6 +1010,7 @@ he:
       header: '××ª×××ª× ×Ö¾OpenStreetMap ××××¢× ××××¢× ×××ª %{from_user} ×¢× ×× ××©× %{subject}:'
       footer_html: × ××ª× ×× ××§×¨×× ××ª ×××××¢× ×××ª×××ª %{readurl} ×××××× ××××¦×¢××ª %{replyurl}
     friend_notification:
+      hi: ×©××× %{to_user},
       subject: '[×××¤× ×¡××¨×× ×××¤ OpenStreetMap] × ××¡×¤×ª ××¨×©×××ª ××××¨×× ×©× %{user}'
       had_added_you: '%{user} ×××¡××£ ×××ª× ××××¨ ×Ö¾OpenStreetMap.'
       see_their_profile: ×××¤×©×¨××ª× ××¦×¤××ª ××¤×¨××¤×× ×©×× ×××ª×××ª %{userurl}.
@@ -1286,17 +1050,17 @@ he:
         ××©×¨×ª %{server_url} ×× %{new_address}.
       click_the_link: ×× ××××ª ×¢×©××ª ××ª ××, × × ×××××¥ ×¢× ××§××©××¨ ×××× ××× ×××©×¨ ××ª ××©×× ××.
     lost_password:
-      subject: '[×××¤× ×¡××¨×× ×××¤ OpenStreetMap] ××§×©×ª ×××¤××¡ ×¡×¡××'
+      subject: '[×××¤× ×¡××¨×× ×××¤ OpenStreetMap] ××§×©×ª ×××¤××¡ ×¡××¡××'
     lost_password_plain:
       greeting: ×©×××,
-      hopefully_you: ×××©×× (×××× ××ª ×× ××ª×) ×××§×© ×©××¡×¡×× ×××©××××ª ×××©××× ×××××× ×¢× ××ª×××ª
-        ××××"× ××××ª ×××ª×¨ openstreetmap.org.
-      click_the_link: ×× ××× ×¢×©××ª ××ª ××, ××© ×××××¥ ×¢× ××§××©××¨ ×××× ××× ×××¤×¡ ××ª ××¡×¡××.
+      hopefully_you: ×××©×× (×××× ××ª ×× ××ª×) ×××§×© ×©××¡××¡×× ×××©××××ª ×××©××× ×××××× ×¢×
+        ××ª×××ª ××××"× ××××ª ×××ª×¨ openstreetmap.org.
+      click_the_link: ×× ××× ×¢×©××ª ×××ª, ××© ×××××¥ ×¢× ××§××©××¨ ×××× ××× ×××¤×¡ ××ª ××¡××¡××.
     lost_password_html:
       greeting: ×©×××,
-      hopefully_you: ×××©×× (××ª×§××× ×××××¨ ××) ×××§×© ×× ××¡×¡×× ×××©××× ×××××× ×¢× ××ª×××ª
+      hopefully_you: ×××©×× (××ª×§××× ×©×××××¨ ××) ×××§×© ×× ××¡××¡×× ×××©××× ×××××× ×¢× ××ª×××ª
         ×××××´× ××××ª ×××ª×¨ openstreetmap.org ×ª×××¤×¡.
-      click_the_link: ×× ××××ª ×××§×©×ª ××ª ××, × × ×××××¥ ×¢× ××§××©××¨ ×××× ××× ×××¤×¡ ××ª ××¡×¡××.
+      click_the_link: ×× ××××ª ×××§×©×ª ××ª ××, × × ×××××¥ ×¢× ××§××©××¨ ×××× ××× ×××¤×¡ ××ª ××¡××¡××.
     note_comment_notification:
       anonymous: ××©×ª××© ××××× ×
       greeting: ×©×××,
@@ -1322,6 +1086,7 @@ he:
           ××× ××× %{place}.
       details: ××¤×©×¨ ×××¦×× ×¤×¨××× × ××¡×¤×× ×¢× ×××¢×¨× ×××ª×××ª %{url}
     changeset_comment_notification:
+      hi: ×©××× %{to_user},
       greeting: ×©×××,
       commented:
         subject_own: '[OpenStreetMap] ×××©×ª××© %{commenter} ××¢××¨ ×¢× ××× ××¢×¨×××ª ××©×× ××××
@@ -1335,7 +1100,9 @@ he:
         partial_changeset_with_comment: ×¢× ×××¢×¨× '%{changeset_comment}'
         partial_changeset_without_comment: ××× ××¢×¨×
       details: ×¤×¨××× × ××¡×¤×× ×¢× ×¢×¨××ª ××©×× ×××× ××¤×©×¨ ×××¦×× ×××ª×××ª %{url}
-  message:
+      unsubscribe: ××× ×××× ××ª ×××× ×× ××¢×××× ×× ××¢×¨××ª ××©×× ×××× ××××ª, × × ×××§×¨ ×××ª×××ª
+        %{url} ××××××¥ ×¢× â××××× ××× ××â.
+  messages:
     inbox:
       title: ×ª×××ª ××××¨ × ×× ×¡
       my_inbox: ×ª×××ª ×××××¨ ×× ×× ×¡ ×©××
@@ -1356,7 +1123,7 @@ he:
       unread_button: ×¡×××× ×â×× × ×§×¨×â
       read_button: ×¡×××× ×â× ×§×¨×â
       reply_button: ×ª×©×××
-      delete_button: ××××§×
+      destroy_button: ××××§×
     new:
       title: ×©××××ª ××××¢×
       send_message_to: ××©××××ª ××××¢× ×××©× ×× %{name}
@@ -1364,6 +1131,7 @@ he:
       body: ×ª××× ×××××¢×
       send_button: ×©××××
       back_to_inbox: ×××¨× ××ª×××ª ×××××¨ ×× ×× ×¡
+    create:
       message_sent: ××××¢× × ×©×××
       limit_exceeded: ×©×××ª ××××¢××ª ×¨×××ª ××××¨×× ×. × × ××××ª×× ××¤× × ×©××××ª ××××¢××ª × ××¡×¤××ª.
     no_such_message:
@@ -1386,25 +1154,185 @@ he:
     reply:
       wrong_user: × ×× ×¡×ª ××©× â%{user}â, ××× ×××××¢× ×©×××§×©×ª ×××©×× ×¢××× ×× × ×©××× ××××ª×
         ×××©×ª××©. × × ××××× ×¡ ×××©××× ×× ××× ××× ×××©××.
-    read:
+    show:
       title: ××××¢× ×©× ×§×¨××
       from: ×××ª
       subject: × ××©×
       date: ×ª××¨××
       reply_button: ×××©××
       unread_button: ××¡×××× ×××××¢× ×©×× × ×§×¨××
+      destroy_button: ××××§×
       back: ×××¨×
       to: ××
       wrong_user: × ×× ×¡×ª ××©× â%{user}â, ××× ×××××¢× ×©×××§×©×ª ××§×¨×× ×× × ×©××× ××××ª× ×××©×ª××©.
         × × ××××× ×¡ ×××©××× ×× ××× ××× ×××§×¨×× ×××ª×.
     sent_message_summary:
-      delete_button: ××××§×
+      destroy_button: ××××§×
     mark:
       as_read: ×××××¢× ×¡××× × ×××××¢× ×©× ×§×¨××
       as_unread: ×××××¢× ×¡××× × ×××××¢× ×©×× × ×§×¨××
-    delete:
-      deleted: ×××××¢× × ×××§×
+    destroy:
+      destroyed: ×××××¢× × ×××§×
   site:
+    about:
+      next: ×××
+      copyright_html: <span>&copy;</span>×ª××¨××<br>OpenStreetMap
+      used_by: '%{name} ××¤×¢××× × ×ª×× × ×××¤× ××××¤× ××ª×¨× ××× ××¨× ×, ×××©×××× ××××©××¨×× ×©×× ××'
+      lede_text: ××ª OpenStreetMap ××× × ×§××××ª ×××¤×× ×©×ª××¨××× ×××ª×××§×× × ×ª×× ×× ×¢× ××¨×××,
+        ×©×××××, ××ª×Ö¾×§×¤×, ×ª×× ××ª ×¨×××ª ××¢×× ××¨×× ×××ª×¨, ××¡××× ××¢×××.
+      local_knowledge_title: ×××¢ ××§×××
+      local_knowledge_html: |-
+        OpenStreetMap ×××××©× ×××¢ ××§×××. ××ª××¨××× ××©×ª××©××
+        ××ª××× ××ª ×××××××¨, ×××©××¨× GPS, ×××¤××ª ×©×× â××××Ö¾××§â ××× ××××× ×©Ö¾OSM
+        ×××××§×ª ×××¢×××× ×ª.
+      community_driven_title: ××× ×× ×¢×Ö¾××× ××§××××
+      community_driven_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>.
+      open_data_title: × ×ª×× ×× ×¤×ª××××
+      open_data_html: |-
+        OpenStreetMap ××× <strong>× ×ª×× ×× ×¤×ª××××</strong>: ××© ×× ×××¤×© ×××©×ª××© ×× ××× ×××¨×,
+        ×× ×¢×× × ××ª× ×××××¡ ×Ö¾OpenStreetMap ×××ª××¨×××. ×××ª×¨ ××©× ××ª ××ª ×× ×ª×× ××
+        ×××× ××ª ×¢× ××××× ×××¨×× ××¡×××××, ×× ××© ×××¤××¥ ××ª ××ª××¦×××ª ×©× ××
+        ××¤× ××ª× ××× ×©× ×××ª× ××¨××©×××. ×¨' ××ª <a href='%{copyright_path}'>××£ ××¨××©××× ×××××××ª ××××¦×¨××</a> ××¤×¨××× × ××¡×¤××.
+      legal_title: ××©×¤××
+      legal_html: |-
+        ×××ª×¨ ××× ××©××¨××ª×× ×¨××× ×××¨×× ×××¤×¢××× ×¢×Ö¾××× <a href='https://osmfoundation.org/'>×§×¨× OpenStreetMap</a>&rlm; (OSMF) ××©× ××§××××. ××©××××© ××× ××©××¨××ª×× ×××¤×¢××× OSMF ××¤××£
+        ×Ö¾<a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
+        ×××× ×××ª ×©××××© ×§×××</a> ×©×× ×
+        ××Ö¾<a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>×××× ×××ª ××¤×¨××××ª</a> ×©×× ×
+        <br>
+        × × <a href='https://osmfoundation.org/Contact'>×××¦××¨ ×§×©×¨ ×¢× OSMF</a> ×× ××© ×× ×©××××ª ×¢× ×¨××©××, ××××××ª ×××¦×¨×× ×× ×©××××ª ××©×¤××××ª ×××¨××ª.
+        <br>
+        OpenStreetMap, ×¡×× ×××××××ª ××××××ª, ×Ö¾State of the Map ×× <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">×¡××× ×× ××¡××¨××× ×¨×©×××× ×©× ×§×¨× OSM</a>.
+      partners_title: ×©××ª×¤××
+    copyright:
+      foreign:
+        title: ×××××ª ×ª×¨××× ××
+        text: ×××§×¨× ×©× ×××¡×¨ ×ª×××××ª ××× ×¢××× ××ª××¨×× ×× ×××× %{english_original_link},
+          ××© ××ª×ª ×¢×××¤××ª ××¢××× ××× ××××ª
+        english_link: ××¢××× ×××§××¨× ××× ××××ª
+      native:
+        title: ×××××ª ××£ ××
+        text: ××× ×¢××× ××××××ª ××××¦×¨×× ×××¨×¡×ª× ××× ××××ª. ××¤×©×¨ ×××××¨ ×%{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_html: |-
+          ××××¤×× ×××¨××× ×××¤× ×©×× ×, ×××ª××¢×× ×©×× × ××××©×× ×××¤××£
+          ××¨××©××× <a href="https://creativecommons.org/licenses/by-sa/2.0/">×§×¨×××××××
+          ×§×××× × ×××××¡â×©××ª××£Ö¾××× 2.0</a> license (××§××¦××¨ CC-BY-SA).
+        credit_title_html: ××× ××ª×ª ×××××¡ ×Ö¾OpenStreetMap
+        credit_1_html: ×× × ×××¨×©×× ×××××¡ ×× â&copy; ×ª××¨×× OpenStreetMapâ.
+        credit_2_html: |-
+          ×××Ö¾××, ××××ª× ××××××¨ ×©×× ×ª×× ×× ×××× ×× ×××¤××£ ××¨××©××× ×××¡××
+          × ×ª×× ×× ×¤×ª××××, ××× × ×¢×©× ×©××××© ×××¨××× ×××¤× ×©×× ×, ×©××××¤×× ××¤××¤××ª
+          ××¨××©××× CC-BY-SA. ×××¤×©×¨××ª× ××¢×©××ª ×××ª ××××¦×¢××ª ×§××©××¨ ××
+          <a href="https://www.openstreetmap.org/copyright">××£ ××××××ª ××××¦××¨×</a>.
+          ×××××¤××, ××× ××××ª× ××¢×ª ××¤×¦×ª OSM ××¦××¨×ª
+          × ×ª×× ××, ×××¤×©×¨××ª× ××¦××× ××ª ××©×××ª ×××§×©×¨ ××©××¨××ª ×× ××¨××©××× ×× ××¨××©××× ××ª. ××××¦×¢× ×ª×§×©××¨×ª
+          ×©×× × ××ª× ×××©×ª××© ××× ××§××©××¨×× (×××©× ×××¤××¡), ×× × ×××××¦××
+          ×××¤× ××ª ××ª ××§××¨××× ×©×× ×× openstreetmap.org (×××× ×¢×Ö¾××× ××¨×××ª
+          âOpenStreetMapâ ×××ª×××ª ××××), ×× opendatacommons.org, ×××
+          ×× ××ª×××, ×× creativecommons.org.
+        credit_3_html: '××©××× ××¤× ×××§××¨×× ××ª ×©××¤×©×¨ ××¢××× ××, ××××××¡ ×¦×¨×× ××××¤××¢ ××¤×× ×ª
+          ×××¤×. ×××©×:'
+        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>.
+        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_za_html: |-
+          <strong>××¨×× ××¤×¨××§×</strong>: ×××× × ×ª×× ×× ×©××××¢×
+          ×Ö¾<a href="http://www.ngi.gov.za/">×Ö´× ×× ××××:
+          ××××¢ ×××Ö¾××¨××× ×××××</a>, ××××ª ×××¦×¨×× ×××××ª××ª ×©×××¨×.
+        contributors_gb_html: |-
+          <strong>×××××× ×××××××ª</strong>: ×××× × ×ª×× × ×¡×§×¨ ××××××ª
+          &copy; ××××××ª ×××ª×¨ ×××××××ª ××¡×× × ×ª×× ××
+          2010â2012.
+        contributors_footer_1_html: |-
+          ×××××¢ × ××¡×£ ×¢× ××§××¨××ª ××× ××××¨×× ×©×©×××©×
+          ××©××¤××¨ OpenStreetMap, × × ××¨×××ª ××ª <a
+          href="https://wiki.openstreetmap.org/wiki/Contributors">××£
+          ××ª××¨×××</a> ×××××§× ×©× OpenStreetMap.
+        contributors_footer_2_html: |-
+          ××××× ×©× × ×ª×× ×× ×Ö¾OpenStreetMap ××× × ××××¨×ª ×©××¡×¤×§ ×××§××¨×
+          ×©× ×× ×ª×××× ×ª××× ×Ö¾OpenStreetMap, ×××§× ×¢× ×¢×¦×× ×××¨×××ª ×××©××, ××
+          ××§×× ××××ª ×××©××.
+        infringement_title_html: ××¤×¨×ª ××××××ª ×××¦×¨××
+        infringement_1_html: |-
+          ×× × ×××××¨×× ××ª××¨××× ×Ö¾OSM ××¢××× ×× ××××¡××£ × ×ª×× ×× ××©×× ××§××¨
+          ×©××××× ×××××××ª ×××¦×¨×× (×××©× ××¤××ª ×××× ×× ××¤××ª ××××¤×¡××ª) ×××
+          ×××©××¨ ××¤××¨×© ×××¢×× ×××××××ª.
+        infringement_2_html: |-
+          ×× × ×¨×× ×× ×©××××¨ ×©××××× ×××××××ª ×××¦×¨×× × ××¡×£ ××××¤× ×× ××××
+          ×× ××¡× ×× ×ª×× ×× ×©× OpenStreetMap ×× ×× ×××ª×¨ ×××, × × ××¤× ××ª
+          ×× <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">× ×××
+          ×××¡×¨×</a> ×©×× × ×× ××ª×× ×ª××× × ××©××¨××ª
+          <a href="http://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>.
     index:
       js_1: ×××¤××¤× ×©×× ××ª× ××©×ª××© ××× × ×ª××× ×Ö¾JavaScript, ×× ×©×××××ª ××ª ××©××××© ×Ö¾JavaScript.
       js_2: ××ª×¨ OpenStreetMap ××©×ª××© ×Ö¾JavaScript ×××¤× ××××××§×.
@@ -1422,18 +1350,115 @@ he:
       user_page_link: ××£ ×××©×ª××©
       anon_edits_link_text: ×¨' ××¡××¨ ××××¢ ×× ××.
       flash_player_required: ××© ×¦××¨× ×× ×× ×¤×××© ××× ×××©×ª××© ×Ö¾Potlatch, ×¢×¨×× ××¤×××© ×©×
-        OpenStreetMap. ××¤×©×¨ <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">××××¨××
-        × ×× ×¤×××© ×××ª×¨ Adobe.com</a>. ××© <a href="http://wiki.openstreetmap.org/wiki/Editing">××¤×©×¨××××ª
+        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 ×× ×××××¨ â ×¨×³ http://wiki.openstreetmap.org/wiki/The_Rails_Port
+      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, ×××× ×××× ×××
         ×¢×××¨ ×ª××× × ××.
+    export:
+      title: ×××¦××
+      area_to_export: ×××××¨ ××××¦××
+      manually_select: ××××¨× ××× ××ª ×©× ××××¨ ×××¨
+      format_to_export: ×ª×¡×××¨ ××××¦××
+      osm_xml_data: × ×ª×× × XML ×©× OpenStreetMap
+      map_image: ×ª××× ×ª ××¤× (×ª×¦×××ª ×©××× ×ª×§× ××ª)
+      embeddable_html: HTML ×©× ××ª× ×××××¢×
+      licence: ×¨××©×××
+      export_details: ×××××¢ ×Ö¾OpenStreetMap ××××© ×××¤××£ ×<a href="href="https://opendatacommons.org/licenses/odbl/1.0/">×¨××©×××
+        Open Data Commons ×× ×ª×× ×× ×¤×ª××××</a> (ODbL).
+      too_large:
+        advice: '×× ×××××× ×× ×´× × ××©×, × × ×× ×¡××ª ×××©×ª××© ×××× ×××§××¨××ª ××××:'
+        body: '×××××¨ ×××× ×××× ×©××¤×©×¨ ×××× ××××¦× ×××ª× ××ª××¨ × ×ª×× × XML ×©× OpenStreetMap.
+          × × ×××ª×§×¨× ×× ×××××¨ ××××¨ ×§×× ×××ª×¨, ×× ×××©×ª××© ×××§××¨××ª ××××× ××©××× ×××¨×××ª × ×ª×× ××
+          ××××××ª:'
+        planet:
+          title: ×¤××× × OSM
+          description: ×¢××ª×§×× ××¢×××× ×× ××××¤× ×§×××¢ ×©× ×× ××¡× ×× ×ª×× ×× ×©× OpenStreetMap
+        overpass:
+          title: Overpass API
+          description: ×××¨××ª ××ª××× ××ª××××ª ××××ª ×××ª×¨ ××¨×× ×©× ××¡× ×× ×ª×× ×× ×©× OpenStreetMap
+        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: ×××¦××
+    fixthemap:
+      title: ××××× ×¢× ××¢×× / ××ª×§× ××ª ×××¤×
+      how_to_help:
+        title: ××× ××¤×©×¨ ××¢×××¨
+        join_the_community:
+          title: ×××¦××¨×£ ××§××××
+          explanation_html: |-
+            ×× ×©××ª ×× ×××¢×× ×¢× × ×ª×× × ×××¤× ×©×× ×, ×××©× ×©××¨× ×× ×©××ª×××ª ×©×× ××¡×¨×, ×××¨× ××××× ××××ª×¨
+            ××××©×× ××× ×××¦××¨×£ ××§××××ª OpenStreetMap ×××ª×§× ××ª ×× ×ª×× ×× ××¢×¦××.
+        add_a_note:
+          instructions_html: |-
+            ×¦×¨×× ×¤×©×× ×××××¥ ×¢× <a class='icon note'></a> ×× ×¢× ×××ª× ××¡×× ××ª×¦×××ª ×××¤×.
+            ×× ×××¡××£ ×××¤× ×¡×× ×©××¤×©×¨ ×××××
+            ××××¦×¢××ª ××¨××¨×. ××© ××××¡××£ ×©× ××¢×¨× ×××©×××¨ ×××ª× ××××¤×× ×××¨×× ×××§×¨× ××ª ××.
+      other_concerns:
+        title: ×××××ª ×××¨××ª
+        explanation_html: ×× ××© ×× ×××××ª ×××× ××× ×©×× ×ª×× ×× ×©×× × ××©××©×× ×× ×¢× ××ª×××,
+          × × ××§×¨×× ××ª <a href='/copyright'>××£ ××××××ª ××××¦×¨××</a> ×©×× × ×××××¢ ××©×¤××
+          × ××¡×£, ×× ×××¦××¨ ×§×©×¨ ×¢× <a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>×§×××¦×ª
+          ××¢×××× ×××ª×××× ×Ö¾OSMF</a>.
+    help:
+      title: ×§×××ª ×¢××¨×
+      introduction: |-
+        ×Ö¾OpenStreetMap ××© ××¡×¤×¨ ××©×××× ×××××× ×¢× ×××××, ××©××××ª ××ª×©××××ª,
+        ×××××× ××ª××¢×× ×©××ª××¤× ×©× × ××©×× ×××¤××.
+      welcome:
+        url: /welcome
+        title: ××¨×××× ××××× ×Ö¾OSM
+        description: ×ª××××ª ××××¨××ª ××¢××¨×ª ×××¨×× ××××¨ ×©×¡××§×¨ ××ª ×××¡××××ª ×©× OpenStreetMap.
+      beginners_guide:
+        url: https://wiki.openstreetmap.org/wiki/He:Beginners%27_guide
+        title: ××××¨×× ×××ª×××××
+        description: ×××¨×× ××ª××××§×ª ××§×××× ×××ª×××××.
+      help:
+        url: https://help.openstreetmap.org/
+        title: help.openstreetmap.org
+        description: ××©××× ×©××× ×× ×××¤×© ×ª×©××××ª ×××ª×¨ ××©××××ª ×××ª×©××××ª ×©× OSM.
+      mailing_lists:
+        title: ×¨×©××××ª ×ª×¤××¦×
+        description: ××©××× ×©××× ×× ×××× ××××¨×× ××¢× ××× ×× ××¨×©××××ª ×ª×¤××¦× × ××©××× ×××××¨×××ª
+          ×¨×××ª.
+      forums:
+        title: ×¤××¨××××
+        description: ×©××××ª ××××× ×× ××× ×©×× ×©××¢×××¤×× ×××©×§ ××¡×× ×× ×¤××¨××.
+      irc:
+        title: IRC
+        description: ×©××× ××× ××¨××§×××××ª ××©×¤××ª ×©×× ××ª ×¨×××ª ××× ××©××× ×¨×××.
+      switch2osm:
+        title: switch2osm
+        description: ×¢××¨× ××××¨××ª ×××¨××× ×× ×©×¢×××¨×× ×××¤××ª ××©××¨××ª×× ×××¨×× ×©× OpenStreetMap.
+      wiki:
+        url: https://wiki.openstreetmap.org/
+        title: wiki.openstreetmap.org
+        description: ××¢××× ×××××§× ××ª××¢×× ××¢×××§ ×¢× OSM.
     sidebar:
       search_results: ×ª××¦×××ª ××××¤××©
       close: ××¡×××¨×
@@ -1443,9 +1468,10 @@ he:
       get_directions_title: ×××¦×× ××ª ×××¨× ××× ×©×ª× × ×§××××ª
       from: ×
       to: ×
-      where_am_i: ×××¤× ×× ×?
+      where_am_i: ×××¤× ××?
       where_am_i_title: × × ××ª××¨ ××ª ×××§××× ×× ×××× ××××¦×¢××ª ×× ××¢ ××××¤××©
       submit_text: ××¢××¨
+      reverse_directions_text: ××××× ×××¨× ×××¨×
     key:
       table:
         entry:
@@ -1458,6 +1484,9 @@ he:
           track: ××¡××× ××¨××¦××
           bridleway: ××¡××× ××¨××××ª ×¡××¡××
           cycleway: ××¨× ××××¤× ×××
+          cycleway_national: ××¡××× ×××¤× ××× ×××××
+          cycleway_regional: ××¡××× ×××¤× ××× ××××¨×
+          cycleway_local: ××¡××× ×××¤× ××× ××§×××
           footway: ××¨× ×××××× ×¨××
           rail: ××¡×××ª ××¨××
           subway: ×¨×××ª ×ª××ª××ª
@@ -1510,11 +1539,14 @@ he:
           private: ×××©× ×¤×¨×××ª
           destination: ×××©× ×××¢×
           construction: ××¨××× ××× ×××
+          bicycle_shop: ×× ××ª ×××¤× ×××
+          bicycle_parking: ×× ×××ª ×××¤× ×××
+          toilets: ×©××¨××ª××
     richtext_area:
       edit: ×¢×¨×××
       preview: ×ª×¦××× ××§××××
     markdown_help:
-      title_html: ××¤××¢× × ×¢× <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
+      title_html: ××¤××¢× × ×¢× <a href="https://daringfireball.net/projects/markdown/">Markdown</a>
       headings: ×××ª×¨××ª
       heading: ×××ª×¨×ª
       subheading: ×××ª×¨×ª ××©× ×
@@ -1527,17 +1559,72 @@ he:
       image: ×ª××× ×
       alt: ××§×¡× ××××¤×
       url: ××ª×××ª
-  trace:
+    welcome:
+      title: ××¨×× ××××!
+      introduction_html: ××¨×× ×××× ×Ö¾OpenStreetMap, ××¤× ×××¤×©××ª ×©× ××¢×××, ×©××¤×©×¨ ××¢×¨××.
+        ×¢××©×× ×©× ×¨×©××ª, ×××× ×××× ×××¤×©×¨ ×××ª××× ××¦×××¨ ××¤××ª. ×× × ×××¨×× ×§×¦×ª ×©×××ª× ×× ××ª
+        ××××¨×× ×××©×××× ×©×××× ×× ×××¢×ª.
+      whats_on_the_map:
+        title: ×× ×¢× ×××¤×
+        on_html: OpenStreetMap ××× ××§×× ××××¤×× ×××¨×× ×××ª××× ×× ×××××× â ××× ×××× ×××××× ×
+          ××× ××, ××¨××× ××¤×¨××× ×××¨×× ×¢× ××§××××ª. ××¤×©×¨ ×××¤××ª ×× ××©××ª ×××¢××× ××××ª× ×©××¢× ×××
+          ×××ª×.
+        off_html: ×× ×©××× ×¤× ×× ××××¢ ××¢×ª× × ××× ×××¨××××, ××§××××ª ×××¡×××¨××× ×× ×××¤××ª××××
+          ×× ×ª×× ×× ×××§××¨××ª ×©××××××× ×××××××ª ×××¦×¨××. ×× × ×××¨×©×× ××× ×× ××××¡××£  ××××¢
+          ×××¤××ª ××§××× ××ª ×× ××××¤×¡××ª ××× ×× ××© ×× ×××©××¨ ××××× ×××.
+      basic_terms:
+        title: ××× ××× ××¡××¡××× ××××¤××
+        paragraph_1_html: ××××× OpenStreetMap ××© ×¢×× ××©××. ×× × ××¡×¤×¨ ×××××ª ××¤×ª× ×©××××
+          ×©××××©×××ª.
+        editor_html: <strong>×¢××¨×</strong> ××× ×ª×× × ×× ××ª×¨ ××¢×¨×××ª ×××¤×.
+        node_html: <strong>×¦×××ª</strong> × ×× × ×§××× ×¢× ××¤×, ×××× ××¡×¢×× ×××ª ×× ×¢×¥ ×××.
+        way_html: <strong>× ×ª××</strong> ××× ×§× ×× ××××¨ ××× ××¨×, ××¨×, ××× ×× ××× ×.
+        tag_html: <strong>×ª×</strong> ××× ×¤××¡×ª ××××¢ ×¢× ×¦×××ª ×× ×¢× × ×ª×× ××× ×©× ×©× ××¡×¢××
+          ×× ×××××ª ××××¨××ª ×××¨×.
+      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>.
+      start_mapping: ×××ª××× ×××¤××ª
+      add_a_note:
+        title: ××× ×× ××× ××¢×¨××? ××¤×©×¨ ××××¡××£ ××¢×¨×!
+        paragraph_1_html: ×× ×¨×§ ×¨×¦××ª ××ª×§× ××©×× ×§×× ×××× ×× ××× ××××¨×©× ×××××× ××× ××¢×¨××,
+          ×§× ××××¡××£ ××¢×¨×.
+        paragraph_2_html: '×¦×¨×× ×¤×©×× ××××ª ×× <a href=''%{map_url}''>×××¤×</a> ××××××¥
+          ×¢× ×¡×× ×××¢×¨×: <span class=''icon note''></span>. ×× ×××¡××£ ×××¤× ×¡××, ×©××¤×©×¨
+          ×××¨××¨. ×××¨× ×××¡×¤×ª ×××¢×¨× ××© ×××××¥ ×¢× ×©×××¨× ××××¤×× ×××¨×× ××××§× ××ª ××.'
+  traces:
     visibility:
       private: ×¤×¨×× (××©××ª×£ ×¨×§ ×××××× ×, × ×§××××ª ×× ××××× ××ª)
       public: ×¦××××¨× (×××¦× ××¨×©×××ª ×××¡××××× ××××××× ×, × ×§××××ª ×× ××××× ××ª)
       trackable: ××¤×©×¨ ××¨×©×× ×××¡××× (××©××ª×£ ×¨×§ ×××××× ×, × ×§××××ª ×¡×××¨××ª ×¢× ×××ª×× ×××)
       identifiable: ××¨ ××××× (×××¦× ××¨×©×××ª ×××¡××××× ×××××××, × ×§××××ª ×¡×××¨××ª ×¢× ×××ª××
         ×××)
+    new:
+      upload_gpx: '××¢×××ª ×§×××¥ GPX:'
+      description: '×ª××××¨:'
+      tags: '×ª×××:'
+      tags_help: ×××¤×¨× ××¤×¡××§××
+      visibility: '× Ö´×¨××Ö¼×ª:'
+      visibility_help: ×× ×× ××××¨?
+      upload_button: ××¢×××
+      help: ×¢××¨×
     create:
       upload_trace: ××¢×××ª ××¡××× GPS
-      trace_uploaded: ×§×××¥ ×Ö¾GPX ×©×× ×××¢×× ××××× ×××× ×¡× ×× ××¡× ×× ×ª×× ××. ×× ×××¨× ××§×¨×
-        ××ª×× ××¦× ×©×¢× ××××©×× ×× ×××ª× ×¢× ××©×××ª ××¤×¢×××.
+      trace_uploaded: ×§×××¥ ×Ö¾GPX ×©×× ×××¢×× ××××× ×××× ×¡× ×× ××¡× ×× ×ª×× ××. ×× ×××¨× ×××
+        ××§×¨× ××ª×× ××¦× ×©×¢× ××××©×× ×× ×××ª× ×¢× ××©×××ª ××¤×¢×××.
+      traces_waiting:
+        other: ××© ×× ××¡××× ×©×××× ×××¢×××. × × ××©×§×× ×××××ª ×¢× ×¡××× ××¢×××ª× ××¤× × ××¢×××ª
+          ××¡××××× × ××¡×¤××, ××× ×× ×××¡×× ××ª ××ª××¨ ×××©×ª××©×× ×××¨××.
     edit:
       title: ×¢×¨×××ª ××¡××× %{name}
       heading: ×¢×¨×××ª ×××¡××× %{name}
@@ -1555,25 +1642,9 @@ he:
       save_button: ×©×××¨×ª ×©×× ××××
       visibility: '× Ö´×¨××Ö¼×ª:'
       visibility_help: ×× ×× ××××¨?
-    trace_form:
-      upload_gpx: '××¢×××ª ×§×××¥ GPX:'
-      description: '×ª××××¨:'
-      tags: '×ª×××:'
-      tags_help: ×××¤×¨× ××¤×¡××§××
-      visibility: '× Ö´×¨××Ö¼×ª:'
-      visibility_help: ×× ×× ××××¨?
-      upload_button: ××¢×××
-      help: ×¢××¨×
-    trace_header:
-      upload_trace: ××¢×××ª ××¡×××
-      see_all_traces: ××¦××ª ×× ×××¡×××××
-      see_your_traces: ××¦××ª ×××¡××××× ×©××
-      traces_waiting:
-        other: ××© ×× ××¡××× ×©×××× ×××¢×××. × × ××©×§×× ×××××ª ×¢× ×¡××× ××¢×××ª× ××¤× × ××¢×××ª
-          ××¡××××× × ××¡×¤××, ××× ×× ×××¡×× ××ª ××ª××¨ ×××©×ª××©×× ×××¨××.
     trace_optionals:
       tags: ×ª×××
-    view:
+    show:
       title: ××¦××ª ××¡××× %{name}
       heading: ××¦××ª ××¡××× %{name}
       pending: ××××ª× ×
@@ -1588,10 +1659,11 @@ he:
       description: '×ª××××¨:'
       tags: '×ª×××:'
       none: ×××
-      edit_track: ×¢×¨×××ª ×××¡××× ×××
-      delete_track: ××××§×ª ×××¡××× ×××
+      edit_trace: ×¢×¨×××ª ×××¡××× ×××
+      delete_trace: ××××§×ª ×××¡××× ×××
       trace_not_found: ×××¡××× ×× × ××¦×!
       visibility: '× ×¨××Ö¼×ª:'
+      confirm_delete: ×××××§ ××ª ×× ×ª×× ×××?
     trace_paging_nav:
       showing_page: ×××£ %{page}
       older: ××¡××××× ××©× ×× ×××ª×¨
@@ -1612,15 +1684,18 @@ he:
       by: ×××ª
       in: ×
       map: ××¤×
-    list:
+    index:
       public_traces: ××¡×××× GPS ×¦××××¨×××
-      your_traces: ××¡×××× GPS ×©××
+      my_traces: × ×ª××× ×Ö¾GPS ×©××
       public_traces_from: ××¡×××× GPS ×¦××××¨××× ×××ª %{user}
       description: ×¢××× ×××¢××××ª ×××¨×× ××ª ×©× × ×ª××× GPS
       tagged_with: ' ××ª××× ×¢× %{tags}'
       empty_html: ××× ×¤× ×¢×××× ×©×× ×××¨. ××¤×©×¨ <a href='%{upload_link}'>×××¢×××ª ××××¢
-        ×××©</a> ×× ××××× ×¢×× ×¢× ××¢×§× ××¡××××× ×Ö¾GPS ×<a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>××£
+        ×××©</a> ×× ××××× ×¢×× ×¢× ××¢×§× ××¡××××× ×Ö¾GPS ×<a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>××£
         ×××××§×</a>.
+      upload_trace: ××¢×××ª ××¡×××
+      see_all_traces: ××¦××ª ×× ×××¡×××××
+      see_my_traces: ××¦××ª ×× ×ª×××× ×©××
     delete:
       scheduled_for_deletion: ××¡××× ××××¢× ×××××§×
     make_public:
@@ -1644,11 +1719,13 @@ he:
     require_moderator:
       not_a_moderator: ×¦×¨×× ×××××ª ×× ×× ××× ×××¦×¢ ××ª ××¤×¢××× ××××ª.
     setup_user_auth:
+      blocked_zero_hour: ××© ×× ××¡×¨ ××××£ ×××ª×¨ OpenStreetMap. ×¢××× ××§×¨×× ××ª ×××××¢× ××¤× ×
+        ×©×××¨×ª ××¢×¨××××ª ×©××.
       blocked: ×××©×ª× ×Ö¾API × ××¡××. × × ××××× ×¡ ××××©×§ ×××× ×××××¢ × ××¡×£.
       need_to_see_terms: ×××©×ª× ×Ö¾API ×××©×¢××ª ××× ××ª. × × ××××× ×¡ ×××ª×¨ ××× ××¦×¤××ª ××ª× ××
         ××ª×¨×××. ××× ×¦××¨× ××§×× ×××ª×, ××× ×××× ×××¦×× ×××ª×.
   oauth:
-    oauthorize:
+    authorize:
       title: ×××©××¨ ××××©× ×××©××× ×©××
       request_access: ××××©×× %{app_name} ×××¨×© ×××©× ×××©××× ×, %{user}. × × ×××××§ ×××
         ××ª××× ×× ×©××××©×× ××§×× ××ª ×××××××ª ××××. ××¤×©×¨ ×××××¨ ×× ×× ×××××¨ ××ª ×× ×× ×©××ª×××
@@ -1662,16 +1739,18 @@ he:
       allow_write_gpx: ×××¢×××ª ××¡×××× GPS.
       allow_write_notes: ××©× ××ª ××¢×¨××ª
       grant_access: ××ª× ×××©×
-    oauthorize_success:
+    authorize_success:
       title: ××§×©×ª ×××©××¨ ×××©×¨×
       allowed: × ×ª×ª ××××©×× %{app_name} ×××©× ×××©××× ×.
       verification: ×§×× ××××××ª ××× %{code}.
-    oauthorize_failure:
+    authorize_failure:
       title: ××§×©×ª ×××©××¨ × ××©××
       denied: ×©×××ª ×××××©×× %{app_name} ××ª ××××©× ×××©××× ×©××.
       invalid: ×××¡×××× ××××©××¨ ××× × ×ª×§×£.
     revoke:
       flash: ×©×××ª ××ª ×××¡×××× ×××××©×× %{application}.
+    permissions:
+      missing: ×× × ×ª×ª ×××¨×©×× ×××©× ×××ª×§× ×××
   oauth_clients:
     new:
       title: ×¨××©×× ×××©×× ×××©
@@ -1732,18 +1811,18 @@ he:
       flash: ××××¢ ×××§×× ×¢×××× ×××¦×××
     destroy:
       flash: ×¨××©×× ×××©×× ×××§×× × ××¨×¡
-  user:
+  users:
     login:
       title: ×× ××¡×
       heading: ×× ××¡×
       email or username: '××ª×××ª ××××¨ ×××§××¨×× × ×× ×©× ××©×ª××©:'
-      password: '×¡×¡××:'
+      password: '×¡××¡××:'
       openid: '%{logo} OpenID:'
       remember: ×××××¨ ×××ª×
-      lost password link: ×××××ª ××ª ××¡×¡×× ×©××?
+      lost password link: ×××××ª ××ª ××¡××¡×× ×©××?
       login_button: ×× ××¡×
       register now: ××××¨×©× ×¢××©××
-      with username: '×××¨ ××© ×× ××©××× OpenStreetMap? × × ××××× ×¡ ×¢× ×©× ××©×ª××© ××¡×¡××:'
+      with username: '×××¨ ××© ×× ××©××× OpenStreetMap? × × ××××× ×¡ ×¢× ×©× ××©×ª××© ××¡××¡××:'
       with external: '×××××¤××, ××©×ª××©× ××¦× ×©×××©× ××× ××××× ×¡:'
       new to osm: ×××¢×ª ×¢××©×× ×Ö¾OpenStreetMap?
       to make changes: ××× ××©× ××ª ××ª × ×ª×× × OpenStreetMap, ×¦×¨×× ×©×××× ×× ××©×××.
@@ -1772,6 +1851,9 @@ he:
         github:
           title: ×× ××¡× ××××¦×¢××ª GitHub
           alt: ×× ××¡× ×¢× ××©××× GitHub
+        wikipedia:
+          title: ×× ××¡× ×¢× ×××§××¤×××
+          alt: ×× ××¡× ×¢× ××©××× ×××§××¤×××
         yahoo:
           title: ×× ××¡× ×¢× ××××
           alt: ×× ××¡× ×¢× OpenID ×©× ××××
@@ -1786,22 +1868,22 @@ he:
       heading: ××¦××× ×Ö¾OpenStreetMap
       logout_button: ××¦×××
     lost_password:
-      title: ××¡×¡×× ×××× ××××××
-      heading: ×©×××ª ×¡×¡××?
+      title: ××¡××¡×× ×××× ××××××
+      heading: ×©×××ª ×¡××¡××?
       email address: '××ª×××ª ××××´×:'
-      new password button: × × ××©××× ×× ×¡×¡×× ×××©×
+      new password button: × × ××©××× ×× ×¡××¡×× ×××©×
       help_text: × × ××××× ××ª ××ª×××ª ×××××´× ×©××©×ª××©×ª ×× ××× ××××¨×©×. ×× × × ×©×× ×××× ×§××©××¨
-        ×©××¤×©×¨ ×××©×ª××© ×× ××× ×××¤×¡ ××ª ×¡×¡××ª×.
+        ×©××¤×©×¨ ×××©×ª××© ×× ××× ×××¤×¡ ××ª ×¡××¡××ª×.
       notice email on way: ×× × ××¦××¢×¨×× ××©×××¢ ×©×××××ª ×××ª× :-( ××× × ×©×× ×××××¨ ××××§××¨×× ×
         ×©×× ×××ª× ×©××××¦×¢××ª× ××¤×©×¨ ×××¤×¡ ×××ª×.
       notice email cannot find: ×¡××××, ×××ª×××ª ××××ª ×× × ××¦××.
     reset_password:
-      title: ×××¤××¡ ×¡×¡××
+      title: ×××¤××¡ ×¡××¡××
       heading: ×××¤××¡ ××¡×¡×× ×¢×××¨ %{user}
-      password: '×¡×¡××:'
-      confirm password: '×××××ª ××¡×¡××:'
+      password: '×¡××¡××:'
+      confirm password: '×××××ª ××¡××¡××:'
       reset: ×××¤××¡ ××¡×¡××
-      flash changed: ×¡×¡××ª× ×©×× ×ª×.
+      flash changed: ×¡××¡××ª× ×©×× ×ª×.
       flash token bad: ×× ××¦×× × ××ª ×××¡×××× ××××, ×××× ××××§×ª ×××ª×××ª ×ª×¢×××¨?
     new:
       title: ××¨×©××
@@ -1814,22 +1896,21 @@ he:
           <p>×××××× ×××¤××ª ×××¨××ª, OpenStreetMap × ××¦×¨×ª ×××× ×¢×Ö¾××× ×× ×©×× ××××,
           ××××× ×××¤×©××× ××ª×§×, ××¢××× ×××××¨×× ×××ª× ××××©×ª××© ××.</p>
           <p>××× ×××ª××× ××ª×¨×× ××© ××××¨×©×. ×× × × ×©×× ××××¨ ×××§××¨×× × ××× ××××ª ××ª ××©××× ×.</p>
-      license_agreement: ×¢× ×××©××¨ ×××©××× ××© ××§×× ××ª <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">×ª× ××
+      license_agreement: ×¢× ×××©××¨ ×××©××× ××© ××§×× ××ª <a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">×ª× ××
         ××ª×¨×××</a>.
       email address: '××ª×××ª ××××´×:'
       confirm email address: '×××××ª ××ª×××ª ××××´×:'
-      not displayed publicly: ×× ×××¦× ××¤×××× (×¨×³ <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy"
-        title="wiki privacy policy including section on email addresses">××××× ×××ª
-        ×¤×¨××××ª</a>)
-      display name: '×©× ××ª×¦×××:'
-      display name description: ×©× ×××©×ª××© ×©××, ×©×××¦× ××¤××××. ××¤×©×¨ ××©× ××ª ××ª ×× ×××¢×¤××ª
+      not displayed publicly: ×××ª×××ª ×©×× ×× ×××¦××ª ××¤××××, ×××××¢ × ××¡×£ ×¨×× <a href="https://wiki.openstreetmap.org/wiki/Privacy_Policy"
+        title="OSMF privacy policy including section on email addresses">×××× ×××ª ×¤×¨××××ª</a>
+      display name: '×©× ×××¦××:'
+      display name description: ×©× ×××©×ª××© ×©××, ×©×××¦× ××¤××××. ××¤×©×¨ ××©× ××ª ××ª ×× ×××¢××¤××ª
         ×©××.
       external auth: '×××××ª ×¢× ×¦× ×©×××©×:'
-      password: '×¡×¡××:'
-      confirm password: '×××××ª ×¡×¡××:'
+      password: '×¡××¡××:'
+      confirm password: '×××××ª ×¡××¡××:'
       use external auth: '×××××¤××, ××©×ª××©× ××¦× ×©×××©× ××× ××××× ×¡:'
-      auth no password: ×¢× ×××××ª ×¦× ×©×××©× ××× ×¦××¨× ××¡×¡××, ××× ×××× × ××¡×¤×× ×× ×©×¨×ª ××××××
-        ×××××§×§ ××××.
+      auth no password: ×¢× ×××××ª ×¦× ×©×××©× ××× ×¦××¨× ××¡××¡××, ××× ×××× × ××¡×¤×× ×× ×©×¨×ª
+        ×××××× ×××××§×§ ××××.
       continue: ××¨×©××
       terms accepted: ×ª××× ×¢× ×§×××ª ×ª× ×× ××ª×¨××× ××××©××!
       terms declined: ×× ×× × ××¦××¢×¨×× ×©×××××ª ×× ××§×× ××ª ×ª× ×× ××ª×¨××× ××××©××. ×××××¢ × ××¡×£
@@ -1857,7 +1938,7 @@ he:
       heading: ×××©×ª××© %{user} ××× × ×§×××
       body: ×¡××××, ××× ××©××× ××©× %{user}. ×××× ×××××ª ×× × ××× ××××× ×××¦×ª ×¢× ×§××©××¨ ×©×××.
       deleted: × ×××§
-    view:
+    show:
       my diary: ××××× ×©××
       new diary entry: ×¨×©××× ×××©× ×××××
       my edits: ××¢×¨××××ª ×©××
@@ -1893,7 +1974,7 @@ he:
       if set location: ××××¨× ×©× ×××§×× ××××ª ×©×× ×××£ %{settings_link} ×ª××¤×©×¨ ×× ××¨×××ª
         ××©×ª××©×× ××¡××××ª×.
       settings_link_text: ××××¨××ª
-      your friends: ××××¨×× ×©××
+      my friends: ××××¨×× ×©××
       no friends: ×¢×××× ×× ×××¡×¤×ª ×××¨××.
       km away: ×××¨××§ %{count} ×§×´×
       m away: ×××¨××§ %{count} ××³
@@ -1935,12 +2016,12 @@ he:
       email never displayed publicly: (××¢××× ×× ×××¦××ª ××¤××××)
       external auth: '×××××ª ×××¦×× ×:'
       openid:
-        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link: https://wiki.openstreetmap.org/wiki/OpenID
         link text: ×× ××?
       public editing:
         heading: '×¢×¨××× ×¦××××¨××ª:'
         enabled: ×××¤×¢××ª. ×× ××××× × ××××× ××¢×¨×× ××××¢.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: ×× ××?
         disabled: ×× ×××¤×¢××ª, ××× ××¤×©×¨××ª ××¢×¨×× × ×ª×× ×× ××× ××¢×¨××××ª ××§×××××ª ××××× ×××ª.
         disabled link text: ××××¢ ××× × ×××× ××¢×¨××?
@@ -1949,10 +2030,10 @@ he:
         text: ××¢×ª ××¢×¨××××ª ×©×× ××××× ×××ª ××× ×©×× ×× ×××××× ××©××× ×× ××××¢××ª ×× ××¨×××ª ××ª
           ××××§×× ×©××. ××× ×××¦×× ×× ×¢×¨××ª ××××¤×©×¨ ××× ×©×× ×××¦××¨ ××ª× ×§×©×¨ ××¨× ×××ª×¨, ××© ×××××¥
           ×¢× ×××¤×ª××¨ ××××. <b>××× ××©×× ×× ×Ö¾API ×××¨×¡× 0.6, ×¨×§ ××©×ª××©×× ×¦××××¨××× ××××××
-          ××¢×¨×× × ×ª×× × ××¤×</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">××¡××¨
+          ××¢×¨×× × ×ª×× × ××¤×</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">××¡××¨
           ××× ×× ×××</a>).<ul><li>××ª×××ª ××××"× ×©×× ×× ×ª×××©×£ ××ª××¦×× ××× ×©×ª××× ××©×ª××©
           ×¦××××¨×.</li><li>×× × ××ª× ×××¤×× ××ª ××¤×¢××× ××××ª ××× ×××©×ª××©×× ××××©×× ×××× ××¢×ª×
-          ×¦××××¨××× ××¤× ××¨×¨×ª ×××××.</li></ul>
+          ×¦××××¨××× ××¤× ××¨××¨×ª ×××××.</li></ul>
       contributor terms:
         heading: '×ª× ×× ×ª×¨×××:'
         agreed: ××¡×××ª ××ª× ×× ××ª×¨××× ××××©××.
@@ -1969,6 +2050,8 @@ he:
         gravatar: ×××©×ª××© ×Ö¾Gravatar
         link: http://wiki.openstreetmap.org/wiki/Gravatar
         link text: ×× ××?
+        disabled: ×××¨×××××¨ ××××.
+        enabled: ××¦××ª ×××¨×××××¨ ×©×× ×××¤×¢××.
       new image: ×××¡×¤×ª ×ª××× ×
       keep image: ××©×××¨× ×¢× ××ª××× × ×× ×××××ª
       delete image: ×××¡×¨×ª ××ª××× × ×× ×××××ª
@@ -2028,7 +2111,7 @@ he:
       not_a_friend: '%{name} ×× ××× ×××××¨×× ×©××.'
     filter:
       not_an_administrator: ×¦×¨×× ×××××ª ×× ×× ××× ×××¦×¢ ××ª ××¤×¢××× ××××ª.
-    list:
+    index:
       title: ××©×ª××©××
       heading: ××©×ª××©××
       showing:
@@ -2062,7 +2145,7 @@ he:
       heading: ××××× ×©×× ×¢×××× ××× × ××©××× ×××©××× ×××©××× OpenStreetMap.
       option_1: ×× ××ª×××ª ×¨×§ ×¢××©×× ×¢× OpenStreetMap, × × ×××¦××¨ ××©××× ×××© ××××¦×¢××ª ××××¤×¡
         ××××.
-      option_2: ×× ×××¨ ××© ×× ××©×××, ××¤×©×¨ ××××× ×¡ ×××©××× ×©×× ××××¦×¢××ª ×©× ×××©×ª××© ×××¡×¡××
+      option_2: ×× ×××¨ ××© ×× ××©×××, ××¤×©×¨ ××××× ×¡ ×××©××× ×©×× ××××¦×¢××ª ×©× ×××©×ª××© ×××¡××¡××
         ×©×× ××× ××©××× ××ª ×××©××× ×©×× ××××× ×××××¨××ª ×××©×ª××© ×©××.
   user_role:
     filter:
@@ -2070,6 +2153,7 @@ he:
       not_a_role: ××××¨×××ª â%{role}â ××× × ×ª×¤×§×× ×ª×§××.
       already_has_role: ×××©×ª××© ×××¨ ××© ×ª×¤×§×× %{role}.
       doesnt_have_role: ×××©×ª××© ××× ×ª×¤×§×× %{role}.
+      not_revoke_admin_current_user: ×× × ××ª× ××©××× ××¨×©×××ª ××¤×¢×× ××××©×ª××© ×× ××××.
     grant:
       title: ×××©×¨ ××¢× ×§×ª ×ª×¤×§××
       heading: ×××©×¨ ××¢× ×§×ª ×ª×¤×§××
@@ -2084,7 +2168,7 @@ he:
       confirm: ×××©××¨
       fail: ×©××××ª ××ª×¤×§×× â%{role}â ××××©×ª××© â%{name}â × ××©××. × × ×××××§ ×©×××©×ª××© ×××ª×¤×§××
         ×ª×§×× ××.
-  user_block:
+  user_blocks:
     model:
       non_moderator_update: ×¦×¨×× ×××××ª ×× ×× ××× ×××¦××¨ ×× ××¢××× ××¡×××.
       non_moderator_revoke: ×¦×¨×× ×××××ª ×× ×× ××× ×××× ××¡×××.
@@ -2139,23 +2223,10 @@ he:
     period:
       one: ×©×¢× ×××ª
       other: '%{count} ×©×¢××ª'
-    partial:
-      show: ××¦××
-      edit: ×¢×¨×××
-      revoke: ××××!
-      confirm: ××××ª?
-      display_name: ××©×ª××© ××¡××
-      creator_name: ×××¦×¨
-      reason: ×¡××× ×××¡×××
-      status: ××¦×
-      revoker_name: ××××× ×¢×Ö¾×××
-      not_revoked: (×× ×××××)
-      showing_page: ×××£ %{page}
-      next: ××× Â»
-      previous: Â« ××§×××
     helper:
       time_future: ×ª×¡×ª××× ××¢×× %{time}
       until_login: ×¤×¢××× ×¢× ×©×××©×ª××© ×××× ×¡ ×××©×××.
+      time_future_and_until_login: ××¡×ª××× ×Ö¾%{time} ××××¨× ×©×××©×ª××© × ×× ×¡ ×××©×××.
       time_past: ××¡×ª×××× ××¤× × %{time}.
     blocks_on:
       title: ××¡××××ª ×©× %{name}
@@ -2181,8 +2252,22 @@ he:
       back: ×¦×¤××× ××× ×××¡××××ª
       revoker: '××××:'
       needs_view: ×××©×ª××© ×¦×¨×× ××××× ×¡ ×××©××× ××¤× × ×©×××¡××× ××××ª ××××× ×××ª×××.
-  note:
-    description:
+    block:
+      not_revoked: (×× ×××××)
+      show: ××¦××
+      edit: ×¢×¨×××
+      revoke: ××××!
+    blocks:
+      display_name: ××©×ª××© ××¡××
+      creator_name: ×××¦×¨
+      reason: ×¡××× ×××¡×××
+      status: ××¦×
+      revoker_name: ××××× ×¢×Ö¾×××
+      showing_page: ×××£ %{page}
+      next: ××× Â»
+      previous: Â« ××§×××
+  notes:
+    comment:
       opened_at_html: × ××¦×¨× ××¤× × %{when}
       opened_at_by_html: × ××¦×¨× ××¤× × %{when} ×¢×Ö¾××× %{user}
       commented_at_html: ×¢×××× × ××¤× × %{when}
@@ -2240,7 +2325,7 @@ he:
     key:
       title: ××¤×ª ××¤×ª×
       tooltip: ××¤×ª ××¤×ª×
-      tooltip_disabled: ××¤×ª× ××¤× ×××× ×¨×§ ××©××× ××ª×§× ××ª
+      tooltip_disabled: ××¤×ª× ××¤× ××× × ×××× ××©××× ××××ª
     map:
       zoom:
         in: ××ª×§×¨×××ª
@@ -2257,6 +2342,7 @@ he:
         header: ×©××××ª ×××¤×
         notes: ××¢×¨××ª ×××¤×
         data: × ×ª×× × ×××¤×
+        gps: ××¡×××× GPS ×¦××××¨×××
         overlays: ××¤×¢××ª ×©××××ª ××¤×ª×¨×× ×ª×§×××ª ×××¤×
         title: ×©××××ª
       copyright: Â© <a href='%{copyright_url}'>××ª× ××× OpenStreetMap</a>
@@ -2280,8 +2366,8 @@ he:
     notes:
       new:
         intro: ××© ×¤× ××¢××ª ×× ×©××¡×¨ ××©××? ×× × ×××§×©×× ××× ××¡×¤×¨ ××ª ×× ××××¤×× ×××¨××. ××©×
-          ×× ×¦×¨×× ××××× ××ª ××¡×× ×××§×× ×× ××× ××××ª×× ××¢×¨× ×©××¡×××¨× ××ª ×××¢××. (× × ×× ××¨×©××
-          ××××¢ ×××©× ×× ××××¢ ×××¤××ª ×× ×××¨×××× ×©××××××× ×××××××ª ×××¦×¨××.)
+          ×× ×¦×¨×× ××××× ××ª ××¡×× ×××§×× ×× ××× ××××ª×× ××¢×¨× ×©××¡×××¨× ××ª ×××¢××.
+        advice: /start
         add: ×××¡×¤×ª ××¢×¨×
       show:
         anonymous_warning: ×××¢×¨× ××××ª ×××××ª ×ª×××××ª ×××©×ª××©×× ××××× ××× ×©×¦×¨×× ××××ª ××××¤×
@@ -2293,36 +2379,50 @@ he:
         comment: ×××××
     edit_help: ××© ××××× ××ª ×××¤× ××××ª××§× ×¢× ×××§×× ×©××¨×¦×× × ××¢×¨×× ××× ×××××¥ ×××.
     directions:
+      ascend: ××¢××
       engines:
         graphhopper_bicycle: ××××¤× ××× (GraphHopper)
+        graphhopper_car: ××××× ××ª (GraphHopper)
         graphhopper_foot: ××¨×× (GraphHopper)
         mapquest_bicycle: ××××¤× ××× (MapQuest)
         mapquest_car: ××××× ××ª (MapQuest)
         mapquest_foot: ××¨×× (MapQuest)
         osrm_car: ××××× ××ª (ORSM)
-        mapzen_bicycle: ××××¤× ××× (Mapzen)
-        mapzen_car: ××××× ××ª (Mapzen)
-        mapzen_foot: ××¨×× (Mapzen)
+      descend: ×××
       directions: ××××× ××
       distance: ××¨××§
       errors:
         no_route: ×× ××¦×× × × ×ª×× ×©××××¨ ××× ×©× × ×××§××××ª ××××.
-        no_place: ×¡×××× â ×× ××¦×× × ××ª ×××§×× ×××.
+        no_place: ×¡×××× â ×× ××¦×× × ××ª %{place}.
       instructions:
         continue_without_exit: ××××©×× ×¢× %{name}
         slight_right_without_exit: ×§×¦×ª ×××× × ×× %{name}
+        offramp_right: ××©×ª×× ××¨××¤× ×××× ×
+        offramp_right_with_exit: ×¦× ×××¦××× %{exit} ×××××
+        offramp_right_with_exit_name: ×¦× ×××¦××× %{exit} ××××× ×× %{name}
+        offramp_right_with_exit_directions: ×¦× ×××¦××× %{exit} ××××× ×××××× %{directions}
+        offramp_right_with_name: ××¢×××ª ×××× × ×× %{name}
+        onramp_right_without_exit: ××¤× ××ª ×××× × ××¢×××× ×× %{name}
+        endofroad_right_without_exit: ××¡××£ ×××¨× ××¤× ××ª ×××× × ×× %{name}
+        merge_right_without_exit: ×××ª××× ×××× × ×× %{name}
+        fork_right_without_exit: ×××ª×¤×¦×××ª ××¤× ××ª ×××× × ×× %{name}
         turn_right_without_exit: ××¤× ××ª ×××× × ×× %{name}
         sharp_right_without_exit: ×¤× ××× ××× ×××× × ×× %{name}
         uturn_without_exit: ×¤× ×××ª ×¤×¨×¡× ×¢× %{name}
         sharp_left_without_exit: ×¤× ××× ××× ×©×××× ×× %{name}
         turn_left_without_exit: ×¤× ××× ×©×××× ×× %{name}
+        offramp_left_with_name: ××¢×××ª ×©×××× ×× %{name}
+        onramp_left_without_exit: ××¤× ××ª ×©×××× ××¢×××× ×× %{name}
+        endofroad_left_without_exit: ××¡××£ ×××¨× ××¤× ××ª ×©×××× ×× %{name}
+        merge_left_without_exit: ×××ª××× ×©×××× ×× %{name}
+        fork_left_without_exit: ×××ª×¤×¦×××ª ××¤× ××ª ×©×××× ×× %{name}
         slight_left_without_exit: ×§×¦×ª ×©×××× ×× %{name}
         via_point_without_exit: (××¨× × ×§×××)
         follow_without_exit: ××××©×× ×¢× %{name}
-        roundabout_without_exit: ×××××¨ ××§××ª ××ª %{name}
+        roundabout_without_exit: ×××××¨ ××§××ª ××ª ×××¦××× ×××××× %{name}
         leave_roundabout_without_exit: ××¦××ª ××××××¨ â %{name}
         stay_roundabout_without_exit: ××××©××¨ ×¢× ×××××¨ â %{name}
-        start_without_exit: ×××ª××× ××¡××£ ×©× %{name}
+        start_without_exit: ×××ª××× ×Ö¾%{name}
         destination_without_exit: ×××¢×ª ×××¢×
         against_oneway_without_exit: ×× ×¡××¢ × ×× ××××× ××ª× ××¢× ×¢× %{name}
         end_oneway_without_exit: ×¡××£ ×××Ö¾×¡××¨× ×¢× %{name}
@@ -2337,7 +2437,14 @@ he:
       nothing_found: ×× × ××¦×× ××©××××ª
       error: '×©×××× ×ª×§×©××¨×ª ×¢× %{server}, ××××¢ × ××¡×£: %{error}'
       timeout: ×¤× ××× ×××ª×§×©×¨××ª ×¢× %{server}
-  redaction:
+    context:
+      directions_from: ××××× ×× ××××
+      directions_to: ××××× ×× ×× ×
+      add_note: ××××¡××£ ××¢×¨× ×××
+      show_address: ×××¦×× ××ª×××ª
+      query_features: ××¤×©×¨××××ª ×©××××ª×
+      centre_map: ×××¨×× ××ª ×××¤× ×××
+  redactions:
     edit:
       description: ×ª××××¨
       heading: ×¢×¨×××ª ×××ª××
